Browse Source

Merge changes for responsive design by @aragonc

Alex Aragon 11 years ago
parent
commit
f49b14a636

+ 21 - 0
main/css/chamilo/default.css

@@ -497,6 +497,27 @@ RESPONSIVE CSS
   padding-top: 8px;
 }
 
+@media (min-width: 481px) and (max-width: 800px) {
+/*CSS ICON BLOCK USER*/
+   .inbox-social{
+        background: url("images/inbox.png") no-repeat left center;
+        padding-left: 30px;
+    }
+    .new-message-social{
+        background: url("images/new.png") no-repeat left center;
+        padding-left: 30px;
+    }
+    .invitations-social{
+        background: url("images/invitation.png") no-repeat left center;
+        padding-left: 30px;
+    }
+    .profile-social{
+        background: url("images/perfil.png") no-repeat left center;
+        padding-left: 30px;
+    }
+
+
+}
 /*+++++++++++++++++++++++++++++++++
 END RESPONSIVE CSS
 +++++++++++++++++++++++++++++++++*/

+ 46 - 3
main/css/responsive.css

@@ -296,14 +296,57 @@ The more frequent ones have been marked with *
     header{
         margin-top: 15px;
     }
+    
     #top_main_content .menu-column {
+        width: 97%;
+    }
+    #top_main_content .menu-column .block_user_info{
+        width: 715px;
+        clear: both;
+        
+    }
+     #top_main_content .menu-column .block_tools_info{
+        width: 715px;
+        clear: both;
+        
+     }
+     #top_main_content .menu-column .block_tools_info #help_block{
+       display: none;
+       visibility: hidden;
+        
+     }
+    #top_main_content .menu-column #user_image_block{
         float: left;
-        width: 100%;
+        width: 100px;
+        background: none;
+        border:none;
     }
-    .menu-column .group-one{
-        width: 100%;
+    #top_main_content .menu-column #user_image_block img{
+        border: 3px solid #FFFFFF;
+        -webkit-box-shadow: 1px 0px 9px 0px rgba(50, 50, 50, 0.71);
+        -moz-box-shadow:    1px 0px 9px 0px rgba(50, 50, 50, 0.71);
+            box-shadow:         1px 0px 9px 0px rgba(50, 50, 50, 0.71);
     }
+     #top_main_content .menu-column #profile_block{
+        float: left;
+        width: 520px;
+        margin-left: 10px;
+        background: none;
+        border:none;
+     }
     
+     .nav-list > li > a {
+      padding-bottom: 10px;
+      padding-left: 15px;
+      padding-right: 15px;
+      padding-top: 10px;
+      font-size: 18px;
+    }
+    /*CSS ICON BLOCK USER*/
+   .inbox-social{
+        background-image: url("images/inbox.png");
+    }
+
     /* only for the course tools */
     #course_tools .row > [class*="span"], #course_tools  .row-fluid > [class*="span"] {
         float: left;

+ 5 - 5
main/inc/lib/userportal.lib.php

@@ -827,19 +827,19 @@ class IndexManager
             if (api_get_setting('allow_social_tool') == 'true') {
                 $link = '?f=social';
             }
-            $profile_content .= '<li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php'.$link.'">'.get_lang('Inbox').$cant_msg.' </a></li>';
-            $profile_content .= '<li><a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php'.$link.'">'.get_lang('Compose').' </a></li>';
+            $profile_content .= '<li class="inbox-social"><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php'.$link.'">'.get_lang('Inbox').$cant_msg.' </a></li>';
+            $profile_content .= '<li class="new-message-social"><a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php'.$link.'">'.get_lang('Compose').' </a></li>';
 
             if (api_get_setting('allow_social_tool') == 'true') {
                 $total_invitations = Display::badge($total_invitations);
-                $profile_content .= '<li><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.get_lang('PendingInvitations').$total_invitations.'</a></li>';
+                $profile_content .= '<li class="invitations-social"><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.get_lang('PendingInvitations').$total_invitations.'</a></li>';
             }
 
             if (isset($_configuration['allow_my_files_link_in_homepage']) && $_configuration['allow_my_files_link_in_homepage']) {
-                $profile_content .= '<li><a href="'.api_get_path(WEB_PATH).'main/social/myfiles.php">'.get_lang('MyFiles').'</a></li>';
+                $profile_content .= '<li class="myfiles-social"><a href="'.api_get_path(WEB_PATH).'main/social/myfiles.php">'.get_lang('MyFiles').'</a></li>';
             }
         }
-        $profile_content .= '<li><a href="'.api_get_path(WEB_PATH).'main/auth/profile.php">'.get_lang('EditProfile').'</a></li>';
+        $profile_content .= '<li class="profile-social"><a href="'.api_get_path(WEB_PATH).'main/auth/profile.php">'.get_lang('EditProfile').'</a></li>';
         $profile_content .= '</ul>';
         $html = self::show_right_block(get_lang('Profile'), $profile_content, 'profile_block');
         return $html;

+ 5 - 3
main/template/default/layout/layout_2_col.tpl

@@ -22,13 +22,15 @@
 		{% if _u.logged  == 0 %}
 			{% include "default/layout/login_form.tpl" %}
 		{% endif %}
-        
+        <div class="block_user_info">
 		{# User picture #}
         {{ user_image_block }}
+        
 
         {# User Profile links #}
 		{{ profile_block }}
-
+        </div>
+        <div class="block_tools_info">
         {# Course block - admin #}
 		{{ course_block }}
 
@@ -55,7 +57,7 @@
 
 		{# Skills #}
 		{{ skills_block }}
-
+        </div>
 		{# Plugin courses sidebar #}
         {# Plugins for footer section #}