diff options
Diffstat (limited to 'mod/profile/views')
5 files changed, 30 insertions, 36 deletions
diff --git a/mod/profile/views/default/profile/profile_contents/activity.php b/mod/profile/views/default/profile/profile_contents/activity.php index 62fc747e3..6cb2c3a7e 100755 --- a/mod/profile/views/default/profile/profile_contents/activity.php +++ b/mod/profile/views/default/profile/profile_contents/activity.php @@ -3,7 +3,7 @@ * Elgg user display (details) * @uses $vars['entity'] The user entity */ -?> +?> <div id="profile_content"> <?php if(is_plugin_enabled('thewire')) { @@ -18,9 +18,3 @@ } ?> </div> - -<div id="profile_sidebar"> -<?php - echo elgg_view('profile/profile_ownerblock', array('smallicon' => true)); -?> -</div> diff --git a/mod/profile/views/default/profile/profile_contents/details.php b/mod/profile/views/default/profile/profile_contents/details.php index c61379974..7c5e6a0a4 100755 --- a/mod/profile/views/default/profile/profile_contents/details.php +++ b/mod/profile/views/default/profile/profile_contents/details.php @@ -21,7 +21,7 @@ $value = $vars['entity']->$shortname; if (!empty($value)) { //This function controls the alternating class - $even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even'; + $even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even'; ?> <p class="<?php echo $even_odd; ?>"> <b><?php @@ -37,27 +37,22 @@ } } ?> -<?php +<?php if (!get_plugin_setting('user_defined_fields', 'profile')) { ?> -<?php +<?php if ($vars['entity']->isBanned()) { echo "<div class='banned_user'>"; echo elgg_echo('profile:banned'); echo "</div>"; - }else{ - if($vars['entity']->description){ + }else{ + if($vars['entity']->description){ echo "<p class='aboutme_title'><b>" . elgg_echo("profile:aboutme") . "</b></p>"; - echo "<div class='aboutme_contents'>" .elgg_view('output/longtext', array('value' => $vars['entity']->description))."</div>"; + echo "<div class='aboutme_contents'>" .elgg_view('output/longtext', array('value' => $vars['entity']->description))."</div>"; } ?> <?php } ?> - <?php + <?php } - - echo "</div>"; - // profile sidebar - echo "<div id='profile_sidebar'>"; - echo elgg_view('profile/profile_ownerblock'); - echo "</div>"; -?> + + echo "</div>";
\ No newline at end of file diff --git a/mod/profile/views/default/profile/profile_contents/friends.php b/mod/profile/views/default/profile/profile_contents/friends.php index 4fa290a7f..a097f3830 100755 --- a/mod/profile/views/default/profile/profile_contents/friends.php +++ b/mod/profile/views/default/profile/profile_contents/friends.php @@ -12,10 +12,4 @@ if(!$friends) <?php echo $friends; ?> -</div> - -<div id="profile_sidebar"> -<?php - echo elgg_view('profile/profile_ownerblock', array('smallicon' => true)); -?> </div>
\ No newline at end of file diff --git a/mod/profile/views/default/profile/profile_contents/sidebar.php b/mod/profile/views/default/profile/profile_contents/sidebar.php new file mode 100644 index 000000000..49ca06484 --- /dev/null +++ b/mod/profile/views/default/profile/profile_contents/sidebar.php @@ -0,0 +1,16 @@ +<?php +/** + * Elgg profile icon edit form + * + * @package ElggProfile + * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 + * @author Curverider + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + */ +?> +<div id="profile_sidebar"> +<?php + echo elgg_view('profile/profile_ownerblock', array('smallicon' => true)); +?> +</div>
\ No newline at end of file diff --git a/mod/profile/views/default/profile/profile_contents/twitter.php b/mod/profile/views/default/profile/profile_contents/twitter.php index 75b6d0467..f9b6f5d54 100755 --- a/mod/profile/views/default/profile/profile_contents/twitter.php +++ b/mod/profile/views/default/profile/profile_contents/twitter.php @@ -2,9 +2,9 @@ /** * Elgg twitter view page */ - + $twitter_username = $vars['entity']->twitter; - + // if the twitter username is empty, then do not show if($twitter_username){ ?> @@ -14,11 +14,6 @@ if($twitter_username){ <script type="text/javascript" src="http://twitter.com/javascripts/blogger.js"></script> <script type="text/javascript" src="http://twitter.com/statuses/user_timeline/<?php echo $twitter_username; ?>.json?callback=twitterCallback2&count=10"></script> </div> -<div id="profile_sidebar"> + <?php - echo elgg_view('profile/profile_ownerblock', array('smallicon' => true)); -?> -</div> -<?php -} -?>
\ No newline at end of file +}
\ No newline at end of file |