sidebar avatar update template BT#9082

11 years ago · abc81f01f0
parent d15a617cd9
commit abc81f01f0
8 changed files with 285 additions and 17 deletions
--- a/main/messages/inbox.php
+++ b/main/messages/inbox.php
@ -126,10 +126,46 @@ if (isset($_GET['f']) && $_GET['f'] == 'social' || api_get_setting('allow_social
        $actions .= '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.Display::return_icon('outbox.png', get_lang('Outbox')).'</a>';
    }
 }
-
+$user_info    = UserManager::get_user_info_by_id($user_id);
 //LEFT CONTENT
 if (api_get_setting('allow_social_tool') == 'true') {
-    $social_avatar_block = SocialManager::show_social_avatar_block('messages');
+    //Block Social Avatar
+    $social_avatar_block = '<div class="panel panel-info social-avatar">';
+    $social_avatar_block .= SocialManager::show_social_avatar_block('messages');
+    $social_avatar_block .= '<div class="lastname">'.$user_info['lastname'].'</div>';
+    $social_avatar_block .= '<div class="firstname">'.$user_info['firstname'].'</div>';
+    /* $social_avatar_block .= '<div class="username">'.Display::return_icon('user.png','','',ICON_SIZE_TINY).$user_info['username'].'</div>'; */
+    $social_avatar_block .= '<div class="email">'.Display::return_icon('instant_message.png').'&nbsp;' .$user_info['email'].'</div>';
+    $chat_status = $user_info['extra'];
+    if(!empty($chat_status['user_chat_status'])){
+        $social_avatar_block.= '<div class="status">'.Display::return_icon('online.png').get_lang('Chat')." (".get_lang('Online').')</div>';
+    }else{
+        $social_avatar_block.= '<div class="status">'.Display::return_icon('offline.png').get_lang('Chat')." (".get_lang('Offline').')</div>';
+    }
+
+    $editProfileUrl = api_get_path(WEB_CODE_PATH) . 'auth/profile.php';
+
+    if (api_get_setting('sso_authentication') === 'true') {
+        $subSSOClass = api_get_setting('sso_authentication_subclass');
+        $objSSO = null;
+
+        if (!empty($subSSOClass)) {
+            require_once api_get_path(SYS_CODE_PATH) . 'auth/sso/sso.' . $subSSOClass . '.class.php';
+
+            $subSSOClass = 'sso' . $subSSOClass;
+            $objSSO = new $subSSOClass();
+        } else {
+            $objSSO = new sso();
+        }
+
+        $editProfileUrl = $objSSO->generateProfileEditingURL();
+    }
+    $social_avatar_block .= '<div class="edit-profile">
+                            <a class="btn" href="' . $editProfileUrl . '">' . get_lang('EditProfile') . '</a>
+                         </div>';
+    $social_avatar_block .= '</div>';
+
+    //Block Social Menu
    $social_menu_block = SocialManager::show_social_menu('messages');
 }

@ -169,7 +205,7 @@ if (api_get_setting('allow_social_tool') == 'true') {
    $tpl->assign('social_avatar_block', $social_avatar_block);
    $tpl->assign('social_menu_block', $social_menu_block);
    $tpl->assign('social_right_content', $social_right_content);
-    $social_layout = $tpl->get_template('social/home.tpl');
+    $social_layout = $tpl->get_template('social/inbox.tpl');
    $tpl->display($social_layout);
 } else {
    $content = $social_right_content;
--- a/main/messages/new_message.php
+++ b/main/messages/new_message.php
@ -301,8 +301,45 @@ if ($group_id != 0) {

 // LEFT COLUMN
 $social_left_content = null;
+$user_info    = UserManager::get_user_info_by_id($user_id);
 if (api_get_setting('allow_social_tool') == 'true') {
-    $social_avatar_block = SocialManager::show_social_avatar_block('messages');
+    //Block Social Avatar
+    $social_avatar_block = '<div class="panel panel-info social-avatar">';
+    $social_avatar_block .= SocialManager::show_social_avatar_block('messages');
+    $social_avatar_block .= '<div class="lastname">'.$user_info['lastname'].'</div>';
+    $social_avatar_block .= '<div class="firstname">'.$user_info['firstname'].'</div>';
+    /* $social_avatar_block .= '<div class="username">'.Display::return_icon('user.png','','',ICON_SIZE_TINY).$user_info['username'].'</div>'; */
+    $social_avatar_block .= '<div class="email">'.Display::return_icon('instant_message.png').'&nbsp;' .$user_info['email'].'</div>';
+    $chat_status = $user_info['extra'];
+    if(!empty($chat_status['user_chat_status'])){
+        $social_avatar_block.= '<div class="status">'.Display::return_icon('online.png').get_lang('Chat')." (".get_lang('Online').')</div>';
+    }else{
+        $social_avatar_block.= '<div class="status">'.Display::return_icon('offline.png').get_lang('Chat')." (".get_lang('Offline').')</div>';
+    }
+
+    $editProfileUrl = api_get_path(WEB_CODE_PATH) . 'auth/profile.php';
+
+    if (api_get_setting('sso_authentication') === 'true') {
+        $subSSOClass = api_get_setting('sso_authentication_subclass');
+        $objSSO = null;
+
+        if (!empty($subSSOClass)) {
+            require_once api_get_path(SYS_CODE_PATH) . 'auth/sso/sso.' . $subSSOClass . '.class.php';
+
+            $subSSOClass = 'sso' . $subSSOClass;
+            $objSSO = new $subSSOClass();
+        } else {
+            $objSSO = new sso();
+        }
+
+        $editProfileUrl = $objSSO->generateProfileEditingURL();
+    }
+    $social_avatar_block .= '<div class="edit-profile">
+                            <a class="btn" href="' . $editProfileUrl . '">' . get_lang('EditProfile') . '</a>
+                         </div>';
+    $social_avatar_block .= '</div>';
+
+    //Block Social Menu
    $social_menu_block = SocialManager::show_social_menu('messages');
    $social_right_content .= '<div class="span9">';
    $social_right_content .= '<div class="actions">';
@ -363,7 +400,7 @@ if (api_get_setting('allow_social_tool') == 'true') {
    $tpl->assign('social_avatar_block', $social_avatar_block);
    $tpl->assign('social_menu_block', $social_menu_block);
    $tpl->assign('social_right_content', $social_right_content);
-    $social_layout = $tpl->get_template('social/home.tpl');
+    $social_layout = $tpl->get_template('social/inbox.tpl');
    $tpl->display($social_layout);
 } else {
    $content = $social_right_content;
--- a/main/messages/outbox.php
+++ b/main/messages/outbox.php
@ -106,9 +106,44 @@ if (isset($_REQUEST['action'])) {
 }

 $social_right_content = '';
-
+$user_info    = UserManager::get_user_info_by_id($user_id);
 if (api_get_setting('allow_social_tool') == 'true') {
-    $social_avatar_block = SocialManager::show_social_avatar_block('messages');
+    //Block Social Avatar
+    $social_avatar_block = '<div class="panel panel-info social-avatar">';
+    $social_avatar_block .= SocialManager::show_social_avatar_block('messages');
+    $social_avatar_block .= '<div class="lastname">'.$user_info['lastname'].'</div>';
+    $social_avatar_block .= '<div class="firstname">'.$user_info['firstname'].'</div>';
+    /* $social_avatar_block .= '<div class="username">'.Display::return_icon('user.png','','',ICON_SIZE_TINY).$user_info['username'].'</div>'; */
+    $social_avatar_block .= '<div class="email">'.Display::return_icon('instant_message.png').'&nbsp;' .$user_info['email'].'</div>';
+    $chat_status = $user_info['extra'];
+    if(!empty($chat_status['user_chat_status'])){
+        $social_avatar_block.= '<div class="status">'.Display::return_icon('online.png').get_lang('Chat')." (".get_lang('Online').')</div>';
+    }else{
+        $social_avatar_block.= '<div class="status">'.Display::return_icon('offline.png').get_lang('Chat')." (".get_lang('Offline').')</div>';
+    }
+
+    $editProfileUrl = api_get_path(WEB_CODE_PATH) . 'auth/profile.php';
+
+    if (api_get_setting('sso_authentication') === 'true') {
+        $subSSOClass = api_get_setting('sso_authentication_subclass');
+        $objSSO = null;
+
+        if (!empty($subSSOClass)) {
+            require_once api_get_path(SYS_CODE_PATH) . 'auth/sso/sso.' . $subSSOClass . '.class.php';
+
+            $subSSOClass = 'sso' . $subSSOClass;
+            $objSSO = new $subSSOClass();
+        } else {
+            $objSSO = new sso();
+        }
+
+        $editProfileUrl = $objSSO->generateProfileEditingURL();
+    }
+    $social_avatar_block .= '<div class="edit-profile">
+                            <a class="btn" href="' . $editProfileUrl . '">' . get_lang('EditProfile') . '</a>
+                         </div>';
+    $social_avatar_block .= '</div>';
+    //Block Social Menu
    $social_menu_block = SocialManager::show_social_menu('messages');
    $social_right_content .= '<div class="span9">';
        $social_right_content .= '<div class="actions">';
--- a/main/messages/view_message.php
+++ b/main/messages/view_message.php
@ -53,8 +53,46 @@ if (empty($_GET['id'])) {
 $message  = '';

 //LEFT COLUMN
+$user_info    = UserManager::get_user_info_by_id($user_id);
 if (api_get_setting('allow_social_tool') == 'true') {
-    $social_avatar_block = SocialManager::show_social_avatar_block($show_menu);
+    //Block Social Avatar
+    $social_avatar_block = '<div class="panel panel-info social-avatar">';
+    $social_avatar_block .= SocialManager::show_social_avatar_block($show_menu);
+    $social_avatar_block .= '<div class="lastname">'.$user_info['lastname'].'</div>';
+    $social_avatar_block .= '<div class="firstname">'.$user_info['firstname'].'</div>';
+    /* $social_avatar_block .= '<div class="username">'.Display::return_icon('user.png','','',ICON_SIZE_TINY).$user_info['username'].'</div>'; */
+    $social_avatar_block .= '<div class="email">'.Display::return_icon('instant_message.png').'&nbsp;' .$user_info['email'].'</div>';
+    $chat_status = $user_info['extra'];
+    if(!empty($chat_status['user_chat_status'])){
+        $social_avatar_block.= '<div class="status">'.Display::return_icon('online.png').get_lang('Chat')." (".get_lang('Online').')</div>';
+    }else{
+        $social_avatar_block.= '<div class="status">'.Display::return_icon('offline.png').get_lang('Chat')." (".get_lang('Offline').')</div>';
+    }
+
+    $editProfileUrl = api_get_path(WEB_CODE_PATH) . 'auth/profile.php';
+
+    if (api_get_setting('sso_authentication') === 'true') {
+        $subSSOClass = api_get_setting('sso_authentication_subclass');
+        $objSSO = null;
+
+        if (!empty($subSSOClass)) {
+            require_once api_get_path(SYS_CODE_PATH) . 'auth/sso/sso.' . $subSSOClass . '.class.php';
+
+            $subSSOClass = 'sso' . $subSSOClass;
+            $objSSO = new $subSSOClass();
+        } else {
+            $objSSO = new sso();
+        }
+
+        $editProfileUrl = $objSSO->generateProfileEditingURL();
+    }
+    $social_avatar_block .= '<div class="edit-profile">
+                            <a class="btn" href="' . $editProfileUrl . '">' . get_lang('EditProfile') . '</a>
+                         </div>';
+    $social_avatar_block .= '</div>';
+
+
+    //Block Social Menu
    $social_menu_block = SocialManager::show_social_menu($show_menu);
    $message .='<div class="span9">';
 }
@ -75,7 +113,7 @@ if (api_get_setting('allow_social_tool') == 'true') {
    $tpl->assign('social_avatar_block', $social_avatar_block);
    $tpl->assign('social_menu_block', $social_menu_block);
    $tpl->assign('social_right_content', $social_right_content);
-    $social_layout = $tpl->get_template('social/home.tpl');
+    $social_layout = $tpl->get_template('social/inbox.tpl');
    $tpl->display($social_layout);
 } else {
    $content = $social_right_content;
--- a/main/social/groups.php
+++ b/main/social/groups.php
@ -218,22 +218,86 @@ if ($group_id != 0) {
    }
 }
 $create_thread_link = '';
-
+$user_info    = UserManager::get_user_info_by_id($user_id);
 if ($group_id != 0) {
-    $social_avatar_block = SocialManager::show_social_avatar_block(
+    //Block Social Avatar
+    $social_avatar_block = '<div class="panel panel-info social-avatar">';
+    $social_avatar_block .= SocialManager::show_social_avatar_block(
        'groups',
        $group_id
    );
+    $social_avatar_block .= '<div class="lastname">'.$user_info['lastname'].'</div>';
+    $social_avatar_block .= '<div class="firstname">'.$user_info['firstname'].'</div>';
+    $social_avatar_block .= '<div class="email">'.Display::return_icon('instant_message.png').'&nbsp;' .$user_info['email'].'</div>';
+    $chat_status = $user_info['extra'];
+    if(!empty($chat_status['user_chat_status'])){
+        $social_avatar_block.= '<div class="status">'.Display::return_icon('online.png').get_lang('Chat')." (".get_lang('Online').')</div>';
+    }else{
+        $social_avatar_block.= '<div class="status">'.Display::return_icon('offline.png').get_lang('Chat')." (".get_lang('Offline').')</div>';
+    }
+    $editProfileUrl = api_get_path(WEB_CODE_PATH) . 'auth/profile.php';
+
+    if (api_get_setting('sso_authentication') === 'true') {
+        $subSSOClass = api_get_setting('sso_authentication_subclass');
+        $objSSO = null;
+
+        if (!empty($subSSOClass)) {
+            require_once api_get_path(SYS_CODE_PATH) . 'auth/sso/sso.' . $subSSOClass . '.class.php';
+
+            $subSSOClass = 'sso' . $subSSOClass;
+            $objSSO = new $subSSOClass();
+        } else {
+            $objSSO = new sso();
+        }
+
+        $editProfileUrl = $objSSO->generateProfileEditingURL();
+    }
+    $social_avatar_block .= '<div class="edit-profile">
+                            <a class="btn" href="' . $editProfileUrl . '">' . get_lang('EditProfile') . '</a>
+                         </div>';
+    $social_avatar_block .= '</div>';
+
+    //Block Social Menu
    $social_menu_block = SocialManager::show_social_menu('groups', $group_id);
 } else {
    $show_menu = 'browse_groups';
    if (isset($_GET['view']) && $_GET['view'] == 'mygroups') {
        $show_menu = $_GET['view'];
    }
-    $social_avatar_block = SocialManager::show_social_avatar_block(
-        $show_menu,
-        $group_id
-    );
+    //Block Social Avatar
+    $social_avatar_block  = '<div class="panel panel-info social-avatar">';
+    $social_avatar_block .= SocialManager::show_social_avatar_block($show_menu,$group_id);
+    $social_avatar_block .= '<div class="lastname">'.$user_info['lastname'].'</div>';
+    $social_avatar_block .= '<div class="firstname">'.$user_info['firstname'].'</div>';
+    $social_avatar_block .= '<div class="email">'.Display::return_icon('instant_message.png').'&nbsp;' .$user_info['email'].'</div>';
+    $chat_status = $user_info['extra'];
+    if(!empty($chat_status['user_chat_status'])){
+        $social_avatar_block.= '<div class="status">'.Display::return_icon('online.png').get_lang('Chat')." (".get_lang('Online').')</div>';
+    }else{
+        $social_avatar_block.= '<div class="status">'.Display::return_icon('offline.png').get_lang('Chat')." (".get_lang('Offline').')</div>';
+    }
+    $editProfileUrl = api_get_path(WEB_CODE_PATH) . 'auth/profile.php';
+
+    if (api_get_setting('sso_authentication') === 'true') {
+        $subSSOClass = api_get_setting('sso_authentication_subclass');
+        $objSSO = null;
+
+        if (!empty($subSSOClass)) {
+            require_once api_get_path(SYS_CODE_PATH) . 'auth/sso/sso.' . $subSSOClass . '.class.php';
+
+            $subSSOClass = 'sso' . $subSSOClass;
+            $objSSO = new $subSSOClass();
+        } else {
+            $objSSO = new sso();
+        }
+
+        $editProfileUrl = $objSSO->generateProfileEditingURL();
+    }
+    $social_avatar_block .= '<div class="edit-profile">
+                            <a class="btn" href="' . $editProfileUrl . '">' . get_lang('EditProfile') . '</a>
+                         </div>';
+    $social_avatar_block .= '</div>';
+
    $social_menu_block = SocialManager::show_social_menu($show_menu, $group_id);
 }

@ -888,5 +952,5 @@ $tpl->assign('social_right_content', $social_right_content);

 $tpl->assign('message', $show_message);
 $tpl->assign('content', $content);
-$social_layout = $tpl->get_template('social/home.tpl');
+$social_layout = $tpl->get_template('social/groups.tpl');
 $tpl->display($social_layout);
--- a/main/social/invitations.php
+++ b/main/social/invitations.php
@ -217,5 +217,5 @@ $tpl->assign('social_right_content', $social_right_content);

 $tpl->assign('message', $show_message);
 $tpl->assign('content', $content);
-$social_layout = $tpl->get_template('social/home.tpl');
+$social_layout = $tpl->get_template('social/inbox.tpl');
 $tpl->display($social_layout);
--- a/main/template/default/social/groups.tpl
+++ b/main/template/default/social/groups.tpl
@ -0,0 +1,29 @@
+{% extends template ~ "/layout/layout_1_col.tpl" %}
+
+{% block content %}
+<div class="row">
+    <div class="span3">
+        <div class="social-menu">
+            {{ social_avatar_block }}
+            {{ social_menu_block }}
+        </div>
+    </div>
+    <div id="wallMessages" class="span5" style="min-height:1px">
+        <div class="row">
+            <div class="span5">
+                <div id="message_ajax_reponse" class=""></div>
+            </div>
+        </div>
+        <div class="row">
+            {{ social_right_content}}
+        </div>
+        <div id="display_response_id" class="span5"></div>
+        {{ socialAutoExtendLink }}
+    </div>
+    <div class="span4">
+        <div class="row">
+            {{ socialRightInformation}}
+        </div>
+    </div>
+</div>
+{% endblock %}
--- a/main/template/default/social/inbox.tpl
+++ b/main/template/default/social/inbox.tpl
@ -0,0 +1,29 @@
+{% extends template ~ "/layout/layout_1_col.tpl" %}
+
+{% block content %}
+<div class="row">
+    <div class="span3">
+        <div class="social-menu">
+            {{ social_avatar_block }}
+            {{ social_menu_block }}
+        </div>
+    </div>
+    <div id="wallMessages" class="span5" style="min-height:1px">
+        <div class="row">
+            <div class="span5">
+                <div id="message_ajax_reponse" class=""></div>
+            </div>
+        </div>
+        <div class="row">
+            {{ social_right_content}}
+        </div>
+        <div id="display_response_id" class="span5"></div>
+        {{ socialAutoExtendLink }}
+    </div>
+    <div class="span4">
+        <div class="row">
+            {{ socialRightInformation}}
+        </div>
+    </div>
+</div>
+{% endblock %}