Selaa lähdekoodia

Updating 1.10 UI

Julio Montoya 11 vuotta sitten
vanhempi
commit
2372d8a39b
33 muutettua tiedostoa jossa 701 lisäystä ja 676 poistoa
  1. 35 19
      main/inc/lib/template.lib.php
  2. 1 9
      main/messages/inbox.php
  3. 2 9
      main/messages/new_message.php
  4. 4 22
      main/messages/outbox.php
  5. 5 30
      main/messages/view_message.php
  6. 1 5
      main/social/group_add.php
  7. 1 7
      main/social/group_edit.php
  8. 1 11
      main/social/group_invitation.php
  9. 1 4
      main/social/group_members.php
  10. 4 12
      main/social/group_topics.php
  11. 1 7
      main/social/group_waiting_list.php
  12. 11 27
      main/social/groups.php
  13. 1 6
      main/social/invitations.php
  14. 1 5
      main/social/profile.php
  15. 1 4
      main/social/search.php
  16. 14 10
      main/template/default/layout/block_menu.tpl
  17. 52 7
      main/template/default/layout/footer.tpl
  18. 7 0
      main/template/default/layout/head.tpl
  19. 29 21
      main/template/default/layout/layout_1_col.tpl
  20. 1 71
      main/template/default/layout/layout_2_col.tpl
  21. 1 1
      main/template/default/layout/login_form.tpl
  22. 6 8
      main/template/default/layout/main.tpl
  23. 0 5
      main/template/default/layout/main_footer.tpl
  24. 35 77
      main/template/default/layout/main_header.tpl
  25. 126 111
      main/template/default/layout/menu.tpl
  26. 3 10
      main/template/default/layout/no_layout.tpl
  27. 43 45
      main/template/default/layout/page_body.tpl
  28. 1 1
      main/template/default/layout/show_footer.tpl
  29. 170 0
      main/template/default/layout/sidebar.tpl
  30. 8 8
      src/ChamiloLMS/Controller/Admin/AdminController.php
  31. 2 2
      src/ChamiloLMS/Controller/IndexController.php
  32. 128 62
      web/ChamiloLMS/css/base.css
  33. 5 60
      web/ChamiloLMS/css/themes/chamilo/default.css

+ 35 - 19
main/inc/lib/template.lib.php

@@ -65,7 +65,8 @@ class Template
         global $tool_name;
 
         // Page title
-        $this->title = isset($app['title']) ? $app['title'] : $tool_name;
+        $title = isset($app['title']) ? $app['title'] : $tool_name;
+        $this->setTitle($title);
         $this->show_learnpath = $app['template.show_learnpath'];
 
         /* Current themes: cupertino, smoothness, ui-lightness.
@@ -90,7 +91,7 @@ class Template
 
         $this->assign('style', $app['template_style']);
 
-        //Chamilo plugins
+        // Chamilo plugins
         if ($this->show_header) {
             if ($app['template.load_plugins'] && !empty($app['plugins'])) {
 
@@ -112,6 +113,15 @@ class Template
         }
     }
 
+    /**
+     * @param string $title
+     */
+    public function setTitle($title)
+    {
+        $this->title = $title;
+        $this->assign('header', $this->title);
+    }
+
     /**
      * @param array $breadCrumb
      */
@@ -306,6 +316,8 @@ class Template
         $this->course_id = api_get_course_int_id();
         $this->app['course_code'] = api_get_course_id();
         $this->app['session_id'] = api_get_session_id();
+
+        //$this->app['page_controller']->return_welcome_to_course_block($this->app['template']);
     }
 
     /**
@@ -360,7 +372,7 @@ class Template
             'web_lib' => api_get_path(WEB_LIBRARY_PATH),
             'web_library_path' => api_get_path(WEB_LIBRARY_PATH),
             'web_library_js_path' => api_get_path(WEB_LIBRARY_JS_PATH),
-            'public_web' => api_get_path(WEB_PUBLIC_PATH)
+            'web_public' => api_get_path(WEB_PUBLIC_PATH)
         );
 
         $this->assign('_p', $_p);
@@ -423,6 +435,7 @@ class Template
 
         $css[] = api_get_path(WEB_LIBRARY_JS_PATH).'font-awesome/css/font-awesome.css';
         $css[] = api_get_path(WEB_LIBRARY_JS_PATH).'thickbox.css';
+        $css[] = api_get_path(WEB_LIBRARY_JS_PATH).'pace/pace.css';
         $css[] = api_get_path(WEB_LIBRARY_JS_PATH).'chosen/chosen.css';
         $css[] = api_get_path(WEB_LIBRARY_JS_PATH).'tag/style.css';
 
@@ -511,6 +524,7 @@ class Template
                 $jsFolder.'tag/jquery.fcbkcomplete.js',
                 $jsFolder.'bootstrap/js/bootstrap.js',
                 $jsFolder.'upload.js',
+                $jsFolder.'pace/pace.min.js',
                 $jsFolder.'calendar/tbl_change.js',
                 $jsFolder.'textareacounter/jquery.textareaCounter.plugin.js'
             );
@@ -578,7 +592,6 @@ class Template
 
         $nameTools = $this->title;
         $navigation = $this->navigation_array;
-
         $this->menu_navigation = $navigation['menu_navigation'];
 
         $this->assign('system_charset', api_get_system_encoding());
@@ -615,7 +628,7 @@ class Template
 
         $this->assign('title_string', $title_string);
 
-        //Setting the theme and CSS files
+        // Setting the theme and CSS files.
         $this->setCssFiles();
         $this->setJsFiles();
 
@@ -1068,8 +1081,8 @@ class Template
 
             if (!empty($roleTemplate)) {
                 if (api_get_setting('show_tabs', 'platform_administration') == 'true') {
-                    $navigation['admin']['url'] = api_get_path(WEB_PUBLIC_PATH).'admin';
-                    $navigation['admin']['title'] = get_lang('PlatformAdmin');
+                    //$navigation['admin']['url'] = api_get_path(WEB_PUBLIC_PATH).'admin';
+                    //$navigation['admin']['title'] = get_lang('PlatformAdmin');
                 }
             }
             $this->app['admin_toolbar_roles'] = $roleTemplate;
@@ -1227,13 +1240,14 @@ class Template
 
         if (api_get_user_id() && !api_is_anonymous()) {
             // My Courses
-            if (api_get_setting('show_tabs', 'my_courses') == 'true') {
+            /*if (api_get_setting('show_tabs', 'my_courses') == 'true') {
                 $navigation['mycourses'] = $possible_tabs['mycourses'];
             } else {
                 $menu_navigation['mycourses'] = $possible_tabs['mycourses'];
-            }
+            }*/
 
             // My Profile
+            /*
             if (api_get_setting('show_tabs', 'my_profile') == 'true' && api_get_setting('allow_social_tool') != 'true') {
                 if (isset($possible_tabs['myprofile'])) {
                     $navigation['myprofile'] = $possible_tabs['myprofile'];
@@ -1242,25 +1256,28 @@ class Template
                 if (isset($possible_tabs['myprofile'])) {
                     $menu_navigation['myprofile'] = $possible_tabs['myprofile'];
                 }
-            }
+            }*/
 
             // My Agenda
+            /*
             if (api_get_setting('show_tabs', 'my_agenda') == 'true') {
                 $navigation['myagenda'] = $possible_tabs['myagenda'];
             } else {
                 $menu_navigation['myagenda'] = $possible_tabs['myagenda'];
-            }
+            }*/
 
             // Gradebook
+            /*
             if (api_get_setting('gradebook_enable') == 'true') {
                 if (api_get_setting('show_tabs', 'my_gradebook') == 'true') {
                     $navigation['mygradebook'] = $possible_tabs['mygradebook'];
                 } else {
                     $menu_navigation['mygradebook'] = $possible_tabs['mygradebook'];
                 }
-            }
+            }*/
 
             // Reporting
+            /*
             if (api_get_setting('show_tabs', 'reporting') == 'true') {
                 if (api_is_allowed_to_create_course() || api_is_drh() || api_is_session_admin()) {
                     $navigation['session_my_space'] = $possible_tabs['session_my_space'];
@@ -1273,8 +1290,8 @@ class Template
                 } else {
                     $menu_navigation['session_my_space'] = $possible_tabs['session_my_progress'];
                 }
-            }
-
+            }*/
+/*
             // Social Networking
             if (api_get_setting('show_tabs', 'social') == 'true') {
                 if (api_get_setting('allow_social_tool') == 'true') {
@@ -1283,15 +1300,16 @@ class Template
             } else {
                 $menu_navigation['social'] = isset($possible_tabs['social']) ? $possible_tabs['social'] : null;
             }
-
+*/
             // Dashboard
+            /*
             if (api_get_setting('show_tabs', 'dashboard') == 'true') {
                 if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) {
                     $navigation['dashboard'] = $possible_tabs['dashboard'];
                 }
             } else {
                 $menu_navigation['dashboard'] = isset($possible_tabs['dashboard']) ? $possible_tabs['dashboard'] : null;
-            }
+            }*/
 
             if (isset($possible_tabs['admin'])) {
                 $navigation['platform_admin'] = $possible_tabs['admin'];
@@ -1346,8 +1364,6 @@ class Template
         $session_id = api_get_session_id();
         $session_name = api_get_session_name($session_id);
         $_course = api_get_course_info();
-        $user_id = api_get_user_id();
-        $course_id = api_get_course_id();
 
         /*  Plugins for banner section */
         $web_course_path = api_get_path(WEB_COURSE_PATH);
@@ -1447,6 +1463,7 @@ class Template
 
         $final_navigation = array();
         $counter = 0;
+        $navigation[] = array('url' => '#', 'title' => strip_tags($this->title));
 
         foreach ($navigation as $index => $navigation_info) {
             if (!empty($navigation_info['title'])) {
@@ -1463,7 +1480,6 @@ class Template
         if (!empty($final_navigation)) {
             $lis = '';
             $i = 0;
-            $final_navigation_count = count($final_navigation);
 
             if (!empty($final_navigation)) {
                 if (!empty($home_link)) {

+ 1 - 9
main/messages/inbox.php

@@ -103,15 +103,7 @@ if (isset($_GET['form_reply']) || isset($_GET['form_delete'])) {
     }
 }
 
-if (isset($_GET['f']) && $_GET['f'] == 'social') {
-    $this_section = SECTION_SOCIAL;
-    $interbreadcrumb[] = array('url' => api_get_path(WEB_PATH).'main/social/home.php', 'name' => get_lang('SocialNetwork'));
-    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Inbox'));
-} else {
-    $this_section = SECTION_MYPROFILE;
-    $interbreadcrumb[] = array('url' => api_get_path(WEB_PATH).'main/auth/profile.php', 'name' => get_lang('Profile'));
-}
-
+$interbreadcrumb[] = array('url' => api_get_path(WEB_PATH).'main/messages/inbox.php', 'name' => get_lang('Messages'));
 $social_parameter = '';
 
 if (isset($_GET['f']) && $_GET['f'] == 'social' || api_get_setting('allow_social_tool') == 'true') {

+ 2 - 9
main/messages/new_message.php

@@ -259,14 +259,7 @@ function manage_form($default, $select_from_user_list = null, $sent_to = null)
     return $html;
 }
 
-/* MAIN SECTION */
-if ($_GET['f']=='social') {
-	$this_section = SECTION_SOCIAL;
-	$interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/home.php','name' => get_lang('SocialNetwork'));
-} else {
-	$this_section = SECTION_MYPROFILE;
-	$interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/auth/profile.php','name' => get_lang('Profile'));
-}
+$interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/messages/inbox.php','name' => get_lang('Messages'));
 
 $social_right_content = null;
 $group_id = isset($_REQUEST['group_id']) ? intval($_REQUEST['group_id']) : null;
@@ -343,8 +336,8 @@ if (!isset($_POST['compose'])) {
 if (api_get_setting('allow_social_tool') == 'true') {
     $social_right_content .=  '</div>';
 }
-$app['title'] = get_lang('ComposeMessage');
 $tpl = $app['template'];
+$tpl->setTitle(get_lang('ComposeMessage'));
 
 $content = $social_right_content;
 $tpl->assign('actions', $actions);

+ 4 - 22
main/messages/outbox.php

@@ -61,17 +61,7 @@ function deselect_all(formita)
 */
 
 //$nameTools = get_lang('Messages');
-
-//api_display_tool_title(api_xml_http_response_encode(get_lang('Inbox')));
-if ($_GET['f']=='social') {
-	$this_section = SECTION_SOCIAL;
-	$interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/home.php','name' => get_lang('Social'));
-	$interbreadcrumb[]= array ('url' => '#','name' => get_lang('Outbox'));
-} else {
-	$this_section = SECTION_MYPROFILE;
-	$interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/auth/profile.php','name' => get_lang('Profile'));
-	$interbreadcrumb[]= array ('url' => '#','name' => get_lang('Outbox'));
-}
+$interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/messages/inbox.php','name' => get_lang('Messages'));
 
 if ($_GET['f']=='social') {
 
@@ -98,11 +88,7 @@ if( trim($info_delete_outbox[0])=='delete' ) {
 	for ($i=1;$i<=$count_delete_outbox;$i++) {
 		MessageManager::delete_message_by_user_sender(api_get_user_id(),$info_delete_outbox[$i]);
 	}
-    $message_box=get_lang('SelectedMessagesDeleted').
-        '&nbsp
-        <br><a href="../social/index.php?#remote-tab-3">'.
-        get_lang('BackToOutbox').
-        '</a>';
+    $message_box=get_lang('SelectedMessagesDeleted');
     Display::display_normal_message(api_xml_http_response_encode($message_box),false);
     exit;
 }
@@ -114,11 +100,7 @@ if (isset($_REQUEST['action'])) {
 
 if (api_get_setting('allow_social_tool') == 'true') {
     $social_left_content = SocialManager::show_social_menu('messages');
-    $social_right_content .= '<div class="span9">';
-        $social_right_content .= '<div class="actions">';
-        $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('back.png', get_lang('Back'), array(), 32).'</a>';
-        $social_right_content .= '</div>';
-    $social_right_content .= '</div>';
+
     $social_right_content .= '<div class="span9">';
 }
 //MAIN CONTENT
@@ -150,8 +132,8 @@ if (api_get_setting('allow_social_tool') == 'true') {
     $social_right_content .= '</div>';
 }
 
-$app['title'] = get_lang('ComposeMessage');
 $tpl = $app['template'];
+$tpl->setTitle(get_lang('Outbox'));
 
 $content = $social_right_content;
 $tpl->assign('actions', $actions);

+ 5 - 30
main/messages/view_message.php

@@ -16,14 +16,7 @@ if (api_get_setting('allow_message_tool')!='true') {
 
 /*		HEADER  */
 
-if (isset($_REQUEST['f']) && $_REQUEST['f'] == 'social') {
-	$this_section = SECTION_SOCIAL;
-	$interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/home.php','name' => get_lang('Social'));
-	$interbreadcrumb[]= array ('url' => 'inbox.php?f=social','name' => get_lang('Inbox'));
-} else {
-	$this_section = SECTION_MYPROFILE;
-	$interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/auth/profile.php','name' => get_lang('Profile'));
-}
+$interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/messages/inbox.php','name' => get_lang('Messages'));
 
 $social_right_content = null;
 
@@ -57,33 +50,15 @@ if (empty($_GET['id'])) {
     $show_menu = 'messages_inbox';
 }
 
-$message  = '';
-
-//LEFT COLUMN
-if (api_get_setting('allow_social_tool') == 'true') {
-    $social_left_content = SocialManager::show_social_menu($show_menu);
-    $message .='<div class="span9">';
-}
-//MAIN CONTENT
-$message .= MessageManager::show_message_box($id_message,$source);
-
-if (api_get_setting('allow_social_tool') == 'true') {
-    $message .='</div>';
-}
+$message = MessageManager::show_message_box($id_message, $source);
 
-if (!empty($message)) {
-    $social_right_content .= $message;
-} else {
+if (empty($message)) {
     api_not_allowed();
 }
 
-
-$app['title'] = get_lang('View');
 $tpl = $app['template'];
-
-$content = $social_right_content;
-
+//$tpl->setTitle(get_lang('Read'));
 $tpl->assign('actions', $actions);
 $tpl->assign('message', $message);
-$tpl->assign('content', $content);
+$tpl->assign('content', $social_right_content);
 $tpl->display_one_col_template();

+ 1 - 5
main/social/group_add.php

@@ -48,8 +48,4 @@ $social_right_content .= '</div>';
 
 $tpl = $app['template'];
 $tpl->setHelp('Groups');
-$tpl->assign('social_left_content', $social_left_content);
-$tpl->assign('social_right_content', $social_right_content);
-
-$social_layout = $tpl->get_template('layout/social_layout.tpl');
-$tpl->display($social_layout);
+$tpl->assign('content', $social_right_content);

+ 1 - 7
main/social/group_edit.php

@@ -22,7 +22,6 @@ $this_section = SECTION_SOCIAL;
 $group_id = isset($_GET['id']) ? intval($_GET['id']) : intval($_POST['id']);
 $tool_name = get_lang('GroupEdit');
 
-$interbreadcrumb[] = array('url' => 'home.php', 'name' => get_lang('Social'));
 $interbreadcrumb[] = array('url' => 'groups.php', 'name' => get_lang('Groups'));
 
 $usergroup = new UserGroup();
@@ -69,10 +68,5 @@ $social_right_content .= '</div>';
 
 $app['title'] = $tool_name;
 $tpl = $app['template'];
-
 $tpl->setHelp('Groups');
-$tpl->assign('social_left_content', $social_left_content);
-$tpl->assign('social_right_content', $social_right_content);
-
-$social_layout = $tpl->get_template('layout/social_layout.tpl');
-$tpl->display($social_layout);
+$tpl->assign('content', $social_right_content);

+ 1 - 11
main/social/group_invitation.php

@@ -13,10 +13,6 @@ $language_file=array('userInfo');
 // resetting the course id
 $cidReset=true;
 
-// including some necessary dokeos files
-require_once '../inc/global.inc.php';
-require_once '../inc/lib/xajax/xajax.inc.php';
-
 api_block_anonymous_users();
 
 $xajax = new xajax();
@@ -28,7 +24,6 @@ $this_section = SECTION_PLATFORM_ADMIN;
 // setting breadcrumbs
 $this_section = SECTION_SOCIAL;
 
-$interbreadcrumb[]= array ('url' =>'home.php','name' => get_lang('Social'));
 $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
 
 // Database Table Definitions
@@ -516,9 +511,4 @@ $app['title'] = $tool_name;
 $tpl = $app['template'];
 
 $tpl->setHelp('Groups');
-$tpl->assign('social_left_content', $social_left_content);
-$tpl->assign('social_right_content', $social_right_content);
-
-$tpl->assign('content', $content);
-$social_layout = $tpl->get_template('layout/social_layout.tpl');
-$tpl->display($social_layout);
+$tpl->assign('content', $social_right_content);

+ 1 - 4
main/social/group_members.php

@@ -125,8 +125,5 @@ $app['title'] = get_lang('Social');
 $tpl = $app['template'];
 
 $tpl->setHelp('Groups');
-$tpl->assign('social_left_content', $social_left_content);
-$tpl->assign('social_right_content', $social_right_content);
+$tpl->assign('content', $social_right_content);
 $tpl->assign('message', $show_message);
-$social_layout = $tpl->get_template('layout/social_layout.tpl');
-$tpl->display($social_layout);

+ 4 - 12
main/social/group_topics.php

@@ -174,15 +174,11 @@ $(document).ready(function() {
 </script>';
 
 $this_section = SECTION_SOCIAL;
-$interbreadcrumb[] = array ('url' =>'home.php',      'name' => get_lang('Social'));
 $interbreadcrumb[] = array('url' => 'groups.php',   'name' => get_lang('Groups'));
-$interbreadcrumb[] = array('url' => '#',            'name' => get_lang('Thread'));
+$interbreadcrumb[] = array('url' => 'groups.php?id='.$group_id, 'name' => Security::remove_XSS($group_info['name']));
+//$interbreadcrumb[] = array('url' => 'groups.php?id='.$group_id.'#tabs_2',  'name' => get_lang('Discussions'));
+$interbreadcrumb[] = array('url' => '#',  'name' => get_lang('Discussions'));
 
-$social_right_content = '<div class="breadcrumb">
-                           <a href="groups.php?id='.$group_id.'">'.Security::remove_XSS($group_info['name'], STUDENT, true).'</a>
-                           <span class="divider">/</span>
-                           <a href="groups.php?id='.$group_id.'#tabs_2">'.get_lang('Discussions').'</a>
-                         </div> ';
 $social_left_content = SocialManager::show_social_menu('member_list', $group_id);
 $show_message = null;
 if (!empty($show_message)) {
@@ -195,9 +191,5 @@ $app['title'] = get_lang('Social');
 $tpl = $app['template'];
 
 $tpl->setHelp('Groups');
-$tpl->assign('social_left_content', $social_left_content);
-$tpl->assign('social_right_content', $social_right_content);
 $tpl->assign('message', $show_message);
-$tpl->assign('content', $content);
-$social_layout = $tpl->get_template('layout/social_layout.tpl');
-$tpl->display($social_layout);
+$tpl->assign('content', $social_right_content);

+ 1 - 7
main/social/group_waiting_list.php

@@ -17,7 +17,6 @@ if (api_get_setting('allow_social_tool') !='true') {
 }
 
 $this_section = SECTION_SOCIAL;
-$interbreadcrumb[]= array ('url' =>'home.php','name' => get_lang('Social'));
 $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
 $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('WaitingList'));
 
@@ -106,9 +105,4 @@ $social_right_content .= '</div>';
 $tpl = $app['template'];
 
 $tpl->setHelp('Groups');
-$tpl->assign('social_left_content', $social_left_content);
-$tpl->assign('social_right_content', $social_right_content);
-
-$tpl->assign('message', $show_message);
-$social_layout = $tpl->get_template('layout/social_layout.tpl');
-$tpl->display($social_layout);
+$tpl->assign('content', $social_right_content);

+ 11 - 27
main/social/groups.php

@@ -117,7 +117,6 @@ jQuery(document).ready(function() {
 </script>';
 
 $allowed_views = array('mygroups','newest','pop');
-$interbreadcrumb[]= array ('url' =>'home.php','name' => get_lang('SocialNetwork'));
 $content = null;
 
 if (isset($_GET['view']) && in_array($_GET['view'],$allowed_views)) {
@@ -149,12 +148,14 @@ $my_group_role = 0;
 
 $usergroup = new UserGroup();
 
-if ($group_id != 0 ) {
+if ($group_id != 0) {
 	$user_leave_message = false;
 	$user_added_group_message = false;
 	$user_invitation_sent = false;
 	$group_info = $usergroup->get($group_id);
 
+    $interbreadcrumb[]= array ('url' =>'#','name' => $group_info['name']);
+
 	if (isset($_GET['action']) && $_GET['action']=='leave') {
 		$user_leaved = intval($_GET['u']);
 		//I can "leave me myself"
@@ -181,7 +182,7 @@ if ($group_id != 0 ) {
 $create_thread_link = '';
 
 if ($group_id != 0 ) {
-    $social_left_content = SocialManager::show_social_menu('groups',$group_id);
+    $social_left_content = SocialManager::show_social_menu('groups', $group_id);
 } else {
     $show_menu = 'browse_groups';
     if (isset($_GET['view']) && $_GET['view'] == 'mygroups') {
@@ -192,10 +193,12 @@ if ($group_id != 0 ) {
 
 $social_right_content = null;
 
-if ($group_id != 0 ) {
+if ($group_id != 0) {
 
 	$group_info = $usergroup->get($group_id);
 
+    $social_right_content .= $social_left_content;
+
 	//Loading group information
 	if (isset($_GET['status']) && $_GET['status']=='sent') {
 		$social_right_content .= Display::return_message(get_lang('MessageHasBeenSent'), 'confirmation', false);
@@ -204,7 +207,6 @@ if ($group_id != 0 ) {
 	if ($user_leave_message) {
 		$social_right_content .= Display::return_message(get_lang('UserIsNotSubscribedToThisGroup'), 'confirmation', false);
 	}
-
 	if ($user_added_group_message) {
 		$social_right_content .= Display::return_message(get_lang('UserIsSubscribedToThisGroup'), 'confirmation', false);
 	}
@@ -216,13 +218,13 @@ if ($group_id != 0 ) {
     $is_group_member = $usergroup->is_group_member($group_id);
 
 	// details about the current group
-	$social_right_content = '<div class="span9">';
+	$social_right_content .= '<div class="span9">';
 	$social_right_content .=  '<div id="social-group-details">';
 
     //Group's title
     $social_right_content .=  Display::tag('h4', Security::remove_XSS($group_info['name'], STUDENT, true));
 
-    //Privacy
+    // Privacy
     if (!$is_group_member) {
         $social_right_content .=  '<div class="social-group-details-info">';
             $social_right_content .=  '<span>'.get_lang('Privacy').' : </span>';
@@ -241,20 +243,7 @@ if ($group_id != 0 ) {
         }
     }
 
-    if (!empty($relation_group_title)) {
-        /*
-        echo '<div class="social-group-details-info">';
-        echo '<span>'.get_lang('StatusInThisGroup').' : </span>';
-        echo $relation_group_title;
-        echo '</div>';*/
-    }
-
-    //Group's tags
-    /*
-    if (!empty($tags)) {
-        $social_right_content .=  '<div id="social-group-details-info"><span>'.get_lang('Tags').' : </span>'.$tags.'</div>';
-    }*/
-		$social_right_content .=  '</div>';
+    $social_right_content .=  '</div>';
 	$social_right_content .=  '</div>';
 
 	//-- Show message groups
@@ -536,10 +525,5 @@ if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'show_message' && isset
 $tpl = $app['template'];
 
 $tpl->setHelp('Groups');
-$tpl->assign('social_left_content', $social_left_content);
-$tpl->assign('social_right_content', $social_right_content);
-
 $tpl->assign('message', $show_message);
-$tpl->assign('content', $content);
-$social_layout = $tpl->get_template('layout/social_layout.tpl');
-$tpl->display($social_layout);
+$tpl->assign('content', $social_right_content);

+ 1 - 6
main/social/invitations.php

@@ -188,10 +188,5 @@ $social_right_content = Display::div($social_right_content, array('class' => 'sp
 
 $tpl = $app['template'];
 
-$tpl->assign('social_left_content', $social_left_content);
-$tpl->assign('social_right_content', $social_right_content);
-
+$tpl->assign('content', $social_right_content);
 $tpl->assign('message', $show_message);
-$tpl->assign('content', $content);
-$social_layout = $tpl->get_template('layout/social_layout.tpl');
-$tpl->display($social_layout);

+ 1 - 5
main/social/profile.php

@@ -668,8 +668,4 @@ $social_right_content .= MessageManager::generate_invitation_form('send_invitati
 
 $app['title'] = get_lang('Social');
 $tpl = $app['template'];
-
-$tpl->assign('social_left_content', $social_left_content);
-$tpl->assign('social_right_content', $social_right_content);
-$social_layout = $tpl->get_template('layout/social_layout.tpl');
-$tpl->display($social_layout);
+$tpl->assign('content', $social_right_content);

+ 1 - 4
main/social/search.php

@@ -114,7 +114,4 @@ if ($query !='') {
 
 $app['title'] = $tool_name;
 $tpl = $app['template'];
-$tpl->assign('social_left_content', $social_left_content);
-$tpl->assign('social_right_content', $social_right_content);
-$social_layout = $tpl->get_template('layout/social_layout.tpl');
-$tpl->display($social_layout);
+$tpl->assign('content', $social_right_content);

+ 14 - 10
main/template/default/layout/block_menu.tpl

@@ -1,19 +1,23 @@
 {% if block_menu is not empty %}
-<div id="{{ block_menu.id }}" class="well sidebar-nav">
+<div id="{{ block_menu.id }}" class="">
     {% block block_menu_item %}
-        {% if block_menu.title is not empty %}
-            <h4>{{ block_menu.title }}</h4>
-        {% endif %}
-
         {% if block_menu.elements is not empty %}
 
         <ul class="nav nav-list">
-            {% for item in block_menu.elements %}
-                <li><a href="{{ item.href }}"> {{ item.title }}</a></li>
-            {% endfor %}
-        </ul>
+            {% if block_menu.title is not empty %}
+                <li class="submenu">
+                    <a>{{ block_menu.title }} <i class="arrow fa fa-chevron-right"></i>
+                    </a>
+                    <ul class="nav nav-list" style="display:none">
+                        {% for item in block_menu.elements %}
+                            <li><a href="{{ item.href }}"> {{ item.title }}</a></li>
+                        {% endfor %}
+                    </ul>
+                </li>
+            {% endif %}
         {% endif %}
         {{ block_menu.content }}
+        </ul>
     {% endblock %}
 </div>
-{% endif %}
+{% endif %}

+ 52 - 7
main/template/default/layout/footer.tpl

@@ -137,9 +137,9 @@ function mysort(a, b) {
 // Global loading for ajax calls.
 
 $(document).bind("ajaxSend", function(){
-    $("#loading_block").show();
+    //$("#loading_block").show();
 }).bind("ajaxComplete", function(){
-    $("#loading_block").hide();
+    //$("#loading_block").hide();
 });
 
 // Support for AJAX loaded modal window.
@@ -156,8 +156,22 @@ $('[data-toggle="modal"]').click(function(e) {
         }).success(function() { $('input:text:visible:first').focus(); });
     }
 });*/
+/**
+ * Fixes content height
+ **/
+function sizeContent() {
+    var newHeight = $("html").height() - $("header").height() - $("footer").height() + "px";
+    if ($("#main_content").css("height") < newHeight) {
+        $("#main_content").css("height", newHeight);
+    }
+}
+
+$(window).resize(sizeContent);
 
 $(document).ready( function() {
+
+    sizeContent();
+
     /**
     * Advanced options
     * Usage
@@ -197,9 +211,38 @@ $(document).ready( function() {
         interval: 10000
     });
 
+    $('.hidden-sidebar').click(function() {
+       $('#sidebar-left').toggle();
+        var display = $('#sidebar-left').css('display');
+        if (display == 'block') {
+           $('#main_content').addClass('col-lg-10 col-sm-11');
+        } else {
+           $('#main_content').removeClass('col-lg-10 col-sm-11');
+        }
+    });
+
+    // Fixes forms inside actions.
+    $('.actions form').removeClass('form-horizontal').addClass('form-inline');
+
+    $('#template_settings').click(function() {
+        /*$('body').css('background-color', 'white');
+        $('html').css('background-color', 'white');*/
+        $('#main').removeClass('container-fluid');
+        $('#main').addClass('container');
+    });
+
     $('.actions').addClass('btn-group');
+    $('.actions a').addClass('btn btn-icon');
 
-    $('.actions a').addClass('btn btn-default');
+    $('.submenu').click(function(e) {
+        //$(this).find('ul').toggle();
+
+        $(this).find('ul').toggle(function(){
+            $(this).animate({},200);
+        },function(){
+            $(this).animate({},200);
+        });
+    });
 
     // Tooltip.
     $(function() {
@@ -223,7 +266,7 @@ $(document).ready( function() {
         disable_search_threshold: 10
     });
 
-    // Adv multiselect text inputs.
+    // Adv multi-select text inputs.
     $('.select_class_filter').each(function(){
         var inputId = $(this).attr('id');
 
@@ -252,13 +295,15 @@ $(document).ready( function() {
     /* For IOS users */
     $('.autocapitalize_off').attr('autocapitalize', 'off');
 
-    //Tool tip (in exercises)
-    var tip_options = {
+    // Tool tip (in exercises)
+    var tipOptions = {
         placement : 'right'
     }
-    $('.boot-tooltip').tooltip(tip_options);
+    $('.boot-tooltip').tooltip(tipOptions);
 
 });
 </script>
 {% endraw %}
 {{ execution_stats }}
+</body>
+</html>

+ 7 - 0
main/template/default/layout/head.tpl

@@ -1,3 +1,9 @@
+<!DOCTYPE html>
+<!--[if lt IE 7]> <html lang="{{ document_language }}" class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
+<!--[if IE 7]>    <html lang="{{ document_language }}" class="no-js lt-ie9 lt-ie8"> <![endif]-->
+<!--[if IE 8]>    <html lang="{{ document_language }}" class="no-js lt-ie9"> <![endif]-->
+<!--[if gt IE 8]><!--><html lang="{{ document_language }}" class="no-js"> <!--<![endif]-->
+<head>
 <meta charset="{{ system_charset }}" />
 <link href="http://www.chamilo.org/documentation.php" rel="help" />
 <link href="http://www.chamilo.org/team.php" rel="author" />
@@ -294,3 +300,4 @@ $(function() {
 {% block extraHead %}
 {% endblock %}
 {{ header_extra_content }}
+</head>

+ 29 - 21
main/template/default/layout/layout_1_col.tpl

@@ -2,38 +2,46 @@
 
 {#  1 column  #}
 {% block body %}
-
     {#  Plugin top  #}
     {% if plugin_content_top %}
-        <div id="plugin_content_top" class="col-md-12">
+        <div id="plugin_content_top" class="col-lg-10 col-sm-11">
             {{ plugin_content_top}}
         </div>
     {% endif %}
 
     {% if app.template.show_header == true %}
-        <div class="col-lg-10 col-sm-11">
+        <div id="main_content" class="col-lg-10 col-sm-11">
     {% endif %}
 
-    {% include app.template_style ~ "/layout/page_body.tpl" %}
-
-    {% block content %}
-        {% if content is not null %}
-            <section id="main_content">
-            {{ content }}
-            </section>
-        {% endif %}
-    {% endblock %}
-
-    {% if app.template.show_header == true %}
-        &nbsp;
+    {# Breadcrumb #}
+    {% include app.template_style ~ "/layout/breadcrumb.tpl" %}
+
+    <div class="row">
+        <div class="col-sm-12 col-md-12">
+            {% include app.template_style ~ "/layout/page_body.tpl" %}
+
+            {% block content %}
+                {% if content is not null %}
+                    <section id="section_content">
+                    {{ content }}
+                    </section>
+                {% endif %}
+            {% endblock %}
+
+            {% if app.template.show_header == true %}
+            </div>
+            {% endif %}
+
+            {#  Plugin bottom  #}
+            {% if plugin_content_bottom %}
+                <div id="plugin_content_bottom" class="col-md-12">
+                    {{ plugin_content_bottom }}
+                </div>
+            {% endif %}
+        </div>
     </div>
-    {% endif %}
 
-    {#  Plugin bottom  #}
-    {% if plugin_content_bottom %}
-        <div id="plugin_content_bottom" class="col-md-12">
-            {{ plugin_content_bottom }}
+    {% if app.template.show_header == true %}
         </div>
     {% endif %}
-
 {% endblock %}

+ 1 - 71
main/template/default/layout/layout_2_col.tpl

@@ -1,76 +1,7 @@
 {% extends app.template_style ~ "/layout/main.tpl" %}
 
 {% block body %}
-	{# Main content #}
-
-	{#  Left column  #}
-	<div class="col-md-3 menu-column">
-        {% block left_column %}
-
-            {% if plugin_menu_top %}
-                <div id="plugin_menu_top">
-                    {{plugin_menu_top}}
-                </div>
-            {% endif %}
-
-            {# if user is not login show the login form #}
-            {% if _u.logged  == 0 %}
-                {% include app.template_style ~ "/layout/login_form.tpl" %}
-            {% endif %}
-
-            {#  course_session_block #}
-            {% include app.template_style ~ "/index/course_session_block.tpl" %}
-
-            {#  User picture  #}
-            {% include app.template_style ~ "/index/user_image_block.tpl" %}
-
-            {#  User Profile links #}
-            {% include app.template_style ~ "/index/profile_block.tpl" %}
-
-            {#  Social links #}
-            {% include app.template_style ~ "/index/profile_social_block.tpl" %}
-
-            {#  Course block - admin #}
-            {% include app.template_style ~ "/index/course_block.tpl" %}
-
-            {#  Course block - teacher #}
-            {% include app.template_style ~ "/index/teacher_block.tpl" %}
-
-            {#  Session block #}
-            {% include app.template_style ~ "/index/session_block.tpl" %}
-
-            {#  Notice  #}
-            {% include app.template_style ~ "/index/notice_block.tpl" %}
-
-            {#  Help #}
-            {% include app.template_style ~ "/index/help_block.tpl" %}
-
-            {#  Links that are not added in the tabs #}
-            {% include app.template_style ~ "/index/navigation_block.tpl" %}
-
-            {#  Reservation block  #}
-            {{ reservation_block }}
-
-            {#  Search (xapian) #}
-            {{ search_block }}
-
-            {#  Classes  #}
-            {{ classes_block }}
-
-            {#  Skills #}
-            {% include app.template_style ~ "/index/skills_block.tpl" %}
-
-            {#  Plugin courses sidebar  #}
-            {#  Plugins for footer section  #}
-
-            {% if plugin_menu_bottom %}
-                <div id="plugin_menu_bottom">
-                    {{ plugin_menu_bottom }}
-                </div>
-            {% endif %}
-        {% endblock %}
-	</div>
-	<div class="col-md-6 content-column">
+	<div id="main_content" class="col-lg-10 col-sm-11">
         {% block right_column %}
 
             {#  Plugin bottom  #}
@@ -134,5 +65,4 @@
         {% endblock %}
         &nbsp;
 	</div>
-
 {% endblock %}

+ 1 - 1
main/template/default/layout/login_form.tpl

@@ -1,4 +1,4 @@
-<div id="login_block" class="well sidebar-nav">
+<div id="login_block" >
 
 	{{ login_language_form }}
 

+ 6 - 8
main/template/default/layout/main.tpl

@@ -1,22 +1,20 @@
 {% block header %}
 {% include app.template_style ~ "/layout/main_header.tpl" %}
 {% endblock %}
+
 {% block body %}
     {% block content %}
     {% endblock %}
-
-	{% if show_sniff == 1 %}
-	 	{% include app.template_style ~ "/layout/sniff.tpl" %}
-	{% endif %}
 {% endblock %}
 
 {% block footer %}
     {#  Footer  #}
     {% if show_footer == true %}
-        </div> <!-- end of #row" -->
-        </div> <!-- end of #main" -->
-        </div> <!-- end of #wrapper section -->
+        </div> <!-- end of row -->
+    </div> <!-- end of main -->
+    {% endif %}
+    {% if show_footer == true %}
+        {% include app.template_style ~ "/layout/footer.tpl" %}
     {% endif %}
-{% include app.template_style ~ "/layout/main_footer.tpl" %}
 {{ xhprof }}
 {% endblock %}

+ 0 - 5
main/template/default/layout/main_footer.tpl

@@ -1,5 +0,0 @@
-{% if show_footer == true %}
-    {% include app.template_style ~ "/layout/footer.tpl" %}
-{% endif %}
-</body>
-</html>

+ 35 - 77
main/template/default/layout/main_header.tpl

@@ -1,21 +1,17 @@
-<!DOCTYPE html>
-<!--[if lt IE 7]> <html lang="{{ document_language }}" class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
-<!--[if IE 7]>    <html lang="{{ document_language }}" class="no-js lt-ie9 lt-ie8"> <![endif]-->
-<!--[if IE 8]>    <html lang="{{ document_language }}" class="no-js lt-ie9"> <![endif]-->
-<!--[if gt IE 8]><!--><html lang="{{ document_language }}" class="no-js"> <!--<![endif]-->
-<head>
 {% include app.template_style ~ "/layout/head.tpl" %}
-</head>
-<body dir="{{ text_direction }}" class="{{ section_name }}">
+{% set classBody = 'no-sidebar' %}
+{% if app.template.show_header == true %}
+    {% set classBody = '' %}
+{% endif %}
+<body dir="{{ text_direction }}" class="{{ section_name }} {{ classBody }}">
 <noscript>{{ "NoJavascript"|get_lang }}</noscript>
-
 {% set classMain = '' %}
 {% if show_toolbar == 1 %}
     {% set classMain = 'with-toolbar' %}
     {% set classMain = '' %}
 {% endif %}
 
-{% set containerClass = 'container' %}
+{% set containerClass = 'container-fluid' %}
 
 {% if app.template.show_header == true %}
     <div class="skip">
@@ -75,76 +71,38 @@
         {% include app.template_style ~ "/layout/menu.tpl" %}
     </header>
 
-    <div id="wrapper">
-        {# Bug and help notifications #}
-
-        <ul id="navigation" class="notification-panel">
-            {% if ("enable_help_link" | get_setting) == 'true' %}
-                <li class="help">
-                    <a href="{{ _p.web_main }}help/help.php?open={{ help_content }}&height=400&width=600" class="ajax" title="{{ "help"|get_lang }}">
-                        <img src="{{ _p.web_img }}help.large.png" alt="{{ "help"|get_lang }}" title="{{ "help"|get_lang }}" />
-                    </a>
-                </li>
-            {% endif %}
-
-            {% if ("show_link_bug_notification" | get_setting) == 'true' and _u.logged != 0 %}
-            <li class="report">
-                {% set bugLink = ("bug_report_link" | get_setting) %}
-                {% if ("bug_report_link" | get_setting) is empty %}
-                    {% set bugLink = 'http://support.chamilo.org/projects/chamilo-18/wiki/How_to_report_bugs' %}
-                {% endif %}
-                <a href="{{ bugLink }}" target="_blank">
-                    <img src="{{ _p.web_img }}bug.large.png" alt="{{ "ReportABug"|get_lang }}" title="{{ "ReportABug"|get_lang }}"/>
+    {# Bug and help notifications #}
+    {% if 0 %}
+    <ul id="navigation" class="notification-panel">
+        {% if ("enable_help_link" | get_setting) == 'true' %}
+            <li class="help">
+                <a href="{{ _p.web_main }}help/help.php?open={{ help_content }}&height=400&width=600" class="ajax" title="{{ "help"|get_lang }}">
+                    <img src="{{ _p.web_img }}help.large.png" alt="{{ "help"|get_lang }}" title="{{ "help"|get_lang }}" />
                 </a>
             </li>
+        {% endif %}
+
+        {% if ("show_link_bug_notification" | get_setting) == 'true' and _u.logged != 0 %}
+        <li class="report">
+            {% set bugLink = ("bug_report_link" | get_setting) %}
+            {% if ("bug_report_link" | get_setting) is empty %}
+                {% set bugLink = 'http://support.chamilo.org/projects/chamilo-18/wiki/How_to_report_bugs' %}
             {% endif %}
-        </ul>
+            <a href="{{ bugLink }}" target="_blank">
+                <img src="{{ _p.web_img }}bug.large.png" alt="{{ "ReportABug"|get_lang }}" title="{{ "ReportABug"|get_lang }}"/>
+            </a>
+        </li>
+        {% endif %}
+    </ul>
+    {% endif %}
 
-        {# topbar #}
-        {% include app.template_style ~ "/layout/topbar.tpl" %}
+    {# topbar #}
+    {% include app.template_style ~ "/layout/topbar.tpl" %}
 
-        {% block main_div_container %}
-            <div id="main" class="{{ containerClass }} {{ classMain }}">
-        {% endblock main_div_container %}
-            <div id="top_main_content" class="row">
-                {% if _u.logged == 1 %}
-                <div class="col-lg-2 col-sm-1 sidebar">
-                    <div id="sidebar">
-                        <div class="shortcuts">
-                            <div class="shortcuts-large">
-                                <a class="btn btn-success" href="{{ _p.web_main }}calendar/agenda_js.php?type=personal">
-                                    <i class="fa fa-calendar"></i>
-                                </a>
-                                <a class="btn btn-info" href="{{ _p.web_main }}mySpace/index.php">
-                                    <i class="fa fa-signal"></i>
-                                </a>
-                                <a class="btn btn-warning" href="{{ _p.web_main }}social/home.php">
-                                    <i class="fa fa-users"></i>
-                                </a>
-                                <a class="btn btn-danger" href="{{ settings_link }}">
-                                    <i class="fa fa-cogs"></i>
-                                </a>
-                            </div>
-                            <div class="shortcuts-mini" style="display:none">
-                                c
-                            </div>
-                        </div>
-                        <ul class="nav main-menu">
-                            <li class="active">
-                                <a href="#">
-                                    <i class="fa fa-home fa-lg"></i>
-                                    <span class="text">Dashboard</span>
-                                </a>
-                            </li>
-                            <li><a href="#"><i class="fa fa-user fa-lg"></i> <span class="text">Users</a></span></li>
-                            <li><a href="#"><i class="fa fa-book fa-lg"></i> <span class="text">Courses</a></span></li>
-                        </ul>
-                        <span class="minify">
-                            <i class="fa fa-arrow-circle-left hit"></i>
-                        </span>
-                    </div>
-                </div>
-                {% endif %}
-            {# course navigation links/shortcuts need to be activated by the admin #}
-            {% include app.template_style ~ "/layout/course_navigation.tpl" %}
+    <div id="main" class="{{ containerClass }}">
+        <div class="row">
+            {% include app.template_style ~ "/layout/sidebar.tpl" %}
+
+    {# course navigation links/shortcuts need to be activated by the admin #}
+    {% include app.template_style ~ "/layout/course_navigation.tpl" %}
 {% endif %}

+ 126 - 111
main/template/default/layout/menu.tpl

@@ -1,135 +1,150 @@
+<div class="navbar navbar-default navbar-static-top" class="hidden-xs">
+    <div class="{{ containerClass }}">
 
+    <div class="navbar-header">
+        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#menu-collapse">
+            <span class="sr-only"> {{ "Toggle navigation" | trans }}</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+        </button>
+    </div>
+    <div id="menu-collapse" class="collapse navbar-collapse">
+        <a class="navbar-brand col-lg-2 col-sm-1 col-xs-12" href="{{ _p.web }}">Chamilo</a>
 
-    <div class="navbar navbar-default navbar-static-top">
-        <div class="{{ containerClass }}">
+        <ul class="nav navbar-nav">
+            <li>
+            <a id="main-menu-toggle" class="hidden-sidebar"><i class="fa fa-bars"></i></a>
+            </li>
+        </ul>
 
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#menu-collapse">
-                <span class="sr-only"> {{ "Toggle navigation" | trans }}</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-        </div>
+        {% if menu is not null %}
+        <ul class="nav navbar-nav">
+            {{ menu }}
+        </ul>
+        {% endif %}
 
-        <div id="menu-collapse" class="collapse navbar-collapse">
-            <a class="navbar-brand" href="{{ _p.web }}">Chamilo</a>
-            {% if menu is not null %}
-            <ul class="nav navbar-nav">
-                {{ menu }}
-            </ul>
-            {% endif %}
+        {% if _u.logged == 1 %}
+        <ul class="nav navbar-nav navbar-right">
+            <li class="dropdown">
+                <a data-toggle="dropdown" class="dropdown-toggle" href="#">
+                    <i class="fa fa-cog fa-lg"></i>
+                </a>
 
-            {% if _u.logged == 1 %}
-            <ul class="nav navbar-nav navbar-right">
+                <ul class="pull-right dropdown-navbar navbar-pink dropdown-menu dropdown-caret dropdown-close">
+                    <li class="dropdown-header">
+                        <a href="#" id="template_settings"></a>
+                    </li>
+                </ul>
 
-                <li class="purple dropdown">
-                    <a data-toggle="dropdown" class="dropdown-toggle" href="#">
-                        <i class="fa fa-bell fa-lg"></i>
-                        <span class="badge badge-important">{{ news_counter }}</span>
-                    </a>
+            </li>
+            <li class="purple dropdown">
+                <a data-toggle="dropdown" class="dropdown-toggle" href="#">
+                    <i class="fa fa-bell fa-lg"></i>
+                    <span class="badge badge-important">{{ news_counter }}</span>
+                </a>
 
-                    <ul class="pull-right dropdown-navbar navbar-pink dropdown-menu dropdown-caret dropdown-close">
-                        <li class="dropdown-header">
-                            <i class="icon-warning-sign"></i>
-                            {{ news_counter }} Notifications
-                        </li>
-
-                        {% for new in news_list %}
-                            <li>
-                                <a href="#">
-                                    <div class="clearfix">
-                                    <span class="pull-left">
-                                        <i class="btn btn-xs no-hover btn-pink icon-comment"></i>
-                                        {{ new.title }}
-                                    </span>
-                                        <span class="pull-right badge badge-info"></span>
-                                    </div>
-                                </a>
-                            </li>
-                        {% endfor %}
-                        <li>
-                            <a href=" {{ url('portal_news') }}">
-                                {{ 'SeeAllNotifications' | trans }}
-                                <i class="fa fa-arrow-right"></i>
-                            </a>
-                        </li>
-                    </ul>
-                </li>
+                <ul class="pull-right dropdown-navbar navbar-pink dropdown-menu dropdown-caret dropdown-close">
+                    <li class="dropdown-header">
+                        <i class="icon-warning-sign"></i>
+                        {{ news_counter }} Notifications
+                    </li>
 
-                <li class="green dropdown">
-                    <a data-toggle="dropdown" class="dropdown-toggle" href="#">
-                        <i class="fa fa-envelope fa-lg"></i>
-                        <span class="badge badge-success">{{ messages_count }}</span>
-                    </a>
-                    <ul class="pull-right dropdown-navbar dropdown-menu dropdown-caret dropdown-close">
-                        <li class="dropdown-header">
-                            <i class="icon-envelope-alt"></i>
-                            5 Messages
-                        </li>
+                    {% for new in news_list %}
                         <li>
                             <a href="#">
-                                <span class="msg-body">
-                                    <span class="msg-title">
-                                        <span class="blue">joe doe:</span>
-                                        Test message
-                                    </span>
-                                    <span class="msg-time">
-                                        <i class="icon-time"></i>
-                                        <span>a moment ago</span>
-                                    </span>
+                                <div class="clearfix">
+                                <span class="pull-left">
+                                    <i class="btn btn-xs no-hover btn-pink icon-comment"></i>
+                                    {{ new.title }}
                                 </span>
+                                    <span class="pull-right badge badge-info"></span>
+                                </div>
                             </a>
                         </li>
-                        <li>
-                            <a href=" {{ message_link }}">
-                                {{ 'SeeAllMessages' | trans }}
-                                <i class="fa fa-arrow-right"></i>
-                            </a>
-                        </li>
-                    </ul>
-                </li>
+                    {% endfor %}
+                    <li>
+                        <a href=" {{ url('portal_news') }}">
+                            {{ 'SeeAllNotifications' | trans }}
+                            <i class="fa fa-arrow-right"></i>
+                        </a>
+                    </li>
+                </ul>
+            </li>
 
-                {% if is_profile_editable == true %}
-                    <li class="dropdown">
-                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                            {% if ('allow_message_tool' | get_setting) == 'true' %}
-                                {{ _u.messages_count }}
-                            {% endif %}
-                            <img class="user-photo-nav" src="{{ _u.avatar_small }}"/>
-                            {{ _u.complete_name }}
-                            <b class="caret"></b>
+            <li class="green dropdown">
+                <a data-toggle="dropdown" class="dropdown-toggle" href="#">
+                    <i class="fa fa-envelope fa-lg"></i>
+                    <span class="badge badge-success">{{ messages_count }}</span>
+                </a>
+                <ul class="pull-right dropdown-navbar dropdown-menu dropdown-caret dropdown-close">
+                    <li class="dropdown-header">
+                        <i class="icon-envelope-alt"></i>
+                        5 Messages
+                    </li>
+                    <li>
+                        <a href="#">
+                            <span class="msg-body">
+                                <span class="msg-title">
+                                    <span class="blue">joe doe:</span>
+                                    Test message
+                                </span>
+                                <span class="msg-time">
+                                    <i class="icon-time"></i>
+                                    <span>a moment ago</span>
+                                </span>
+                            </span>
                         </a>
-                        <ul class="dropdown-menu">
-                            <li>
-                                <a href="{{ profile_link }}">
-                                    <i class="fa fa-user"></i>
-                                    {{ 'Profile' | trans }}
-                                </a>
-                                <a href="{{ settings_link }}">
-                                    <i class="fa fa-cogs"></i>
-                                    {{ 'Settings' | trans }}
-                                </a>
-                            </li>
-                        </ul>
                     </li>
-                {% else %}
                     <li>
-                        <a>
-                            {% if ('allow_message_tool' | get_setting) == 'true' %}
-                                {{ _u.messages_count }}
-                            {% endif %}
-                            <img src="{{ _u.avatar_small }}"/>
-                            {{ _u.complete_name }}
+                        <a href=" {{ message_link }}">
+                            {{ 'SeeAllMessages' | trans }}
+                            <i class="fa fa-arrow-right"></i>
                         </a>
                     </li>
-                {% endif %}
+                </ul>
+            </li>
+
+            {% if is_profile_editable == true %}
+                <li class="dropdown">
+                    <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+                        {% if ('allow_message_tool' | get_setting) == 'true' %}
+                            {{ _u.messages_count }}
+                        {% endif %}
+                        <img class="user-photo-nav" src="{{ _u.avatar_small }}"/>
+                        {{ _u.complete_name }}
+                        <b class="caret"></b>
+                    </a>
+                    <ul class="dropdown-menu">
+                        <li>
+                            <a href="{{ profile_link }}">
+                                <i class="fa fa-user"></i>
+                                {{ 'Profile' | trans }}
+                            </a>
+                            <a href="{{ settings_link }}">
+                                <i class="fa fa-cogs"></i>
+                                {{ 'Settings' | trans }}
+                            </a>
+                        </li>
+                    </ul>
+                </li>
+            {% else %}
                 <li>
-                    <a id="logout_button" class="logout" title="{{ "Logout"|get_lang }}" href="{{ url('logout') }}" >
-                        <i class="fa fa-power-off"></i>
+                    <a>
+                        {% if ('allow_message_tool' | get_setting) == 'true' %}
+                            {{ _u.messages_count }}
+                        {% endif %}
+                        <img src="{{ _u.avatar_small }}"/>
+                        {{ _u.complete_name }}
                     </a>
                 </li>
-            </ul>
             {% endif %}
-        </div>
+            <li>
+                <a id="logout_button" class="logout" title="{{ "Logout"|get_lang }}" href="{{ url('logout') }}" >
+                    <i class="fa fa-power-off"></i>
+                </a>
+            </li>
+        </ul>
+        {% endif %}
     </div>
+</div>

+ 3 - 10
main/template/default/layout/no_layout.tpl

@@ -1,16 +1,9 @@
-<!DOCTYPE html>
-<!--[if lt IE 7]> <html lang="{{document_language}}" class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
-<!--[if IE 7]>    <html lang="{{document_language}}" class="no-js lt-ie9 lt-ie8"> <![endif]-->
-<!--[if IE 8]>    <html lang="{{document_language}}" class="no-js lt-ie9"> <![endif]-->
-<!--[if gt IE 8]><!--><html lang="{{document_language}}" class="no-js"> <!--<![endif]-->
-<head>
 {% include app.template_style ~ "/layout/head.tpl" %}
-</head>
-<body dir="{{text_direction}}" class="{{section_name}}">
+<body dir="{{text_direction}}" class="{{section_name}} no-sidebar">
 {% block name %}
 {% endblock %}
 {% block body %}
-    {{ content }}
+{{ content }}
 {% endblock %}
 </body>
-</html>
+</html>

+ 43 - 45
main/template/default/layout/page_body.tpl

@@ -1,45 +1,43 @@
-{# Breadcrumb #}
-{% include app.template_style ~ "/layout/breadcrumb.tpl" %}
-
-{# Actions #}
-{% if actions != '' %}
-    <div class="actions">
-        {{ actions }}
-    </div>
-{% endif %}
-
-{% if actions_menu != '' %}
-    {{ knp_menu_render('actions_menu', { 'currentClass': 'active'}) }}
-{% endif %}
-
-<span id="loading_block" style="display:none">Loading ...</span>
-
-{# Page header #}
-{% if header != '' %}
-    <div class="page-header">
-        <h1>{{ header }}</h1>
-    </div>
-{% endif %}
-
-{# Check if security exists #}
-{% if app.security.token and is_granted('ROLE_PREVIOUS_ADMIN') %}
-    <div class="alert">
-        <a href="{{ path('index', {'_switch_user': '_exit'}) }}">{{ 'Exit impersonation' | trans }}</a>
-    </div>
-{% endif %}
-
-{# Show messages #}
-{% if message != '' %}
-    <section id="messages">
-        {{ message}}
-    </section>
-{% endif %}
-
-{% include app.template_style ~ "/layout/messages.tpl" %}
-
-{# Welcome to course block  #}
-{% if welcome_to_course_block %}
-    <section id="welcome_to_course">
-        {% include app.template_style ~ "/layout/welcome_to_course.tpl" %}
-    </section>
-{% endif %}
+<div id="page">
+    {# Actions #}
+    {% if actions != '' %}
+        <div class="actions">
+            {{ actions }}
+        </div>
+    {% endif %}
+
+    {% if actions_menu != '' %}
+        {{ knp_menu_render('actions_menu', { 'currentClass': 'active'}) }}
+    {% endif %}
+
+    <span id="loading_block" style="display:none">Loading ...</span>
+
+    {# Page header #}
+    {% if header is not empty %}
+        <div class="page-header">
+            <h1>{{ header }}</h1>
+        </div>
+    {% endif %}
+
+    {# Check if security exists #}
+    {% if app.security.token and is_granted('ROLE_PREVIOUS_ADMIN') %}
+        <div class="alert">
+            <a href="{{ path('index', {'_switch_user': '_exit'}) }}">{{ 'Exit impersonation' | trans }}</a>
+        </div>
+    {% endif %}
+
+    {# Show messages #}
+    {% if message != '' %}
+        <section id="messages">
+            {{ message}}
+        </section>
+    {% endif %}
+    {% include app.template_style ~ "/layout/messages.tpl" %}
+
+    {# Welcome to course block  #}
+    {% if welcome_to_course_block %}
+        <section id="welcome_to_course">
+            {% include app.template_style ~ "/layout/welcome_to_course.tpl" %}
+        </section>
+    {% endif %}
+</div>

+ 1 - 1
main/template/default/layout/show_footer.tpl

@@ -1,7 +1,7 @@
 {#
     show_header and show_footer templates are only called when using the Display::display_header and Display::display_footer
     for backward compatibility we suppose that the default layout is one column which means using a div with class span12
- #}
+#}
 {% if app.template.show_header == true %}
     </section>
 </div>

+ 170 - 0
main/template/default/layout/sidebar.tpl

@@ -0,0 +1,170 @@
+<div id="sidebar-left" class="col-lg-2 col-sm-1">
+    <nav class="nav nav-tabs nav-stacked main-menu">
+        <div id="sidebar" class="sidebar-collapse">
+            {% if 0 %}
+                <div class="shortcuts">
+                    <div class="shortcuts-large">
+                        <a class="btn btn-success" href="{{ _p.web_main }}calendar/agenda_js.php?type=personal">
+                            <i class="fa fa-calendar"></i>
+                        </a>
+                        <a class="btn btn-info" href="{{ _p.web_main }}mySpace/index.php">
+                            <i class="fa fa-signal"></i>
+                        </a>
+                        <a class="btn btn-warning" href="{{ _p.web_main }}social/home.php">
+                            <i class="fa fa-users"></i>
+                        </a>
+                        <a class="btn btn-danger" href="{{ settings_link }}">
+                            <i class="fa fa-cogs"></i>
+                        </a>
+                    </div>
+                    <div class="shortcuts-mini" style="display:none">
+                        c
+                    </div>
+                </div>
+            {% endif %}
+
+            {% if _u.logged  == 1 %}
+            <ul class="nav main-menu">
+                <li class="active">
+                    <a href="{{ _p.web }}">
+                        <i class="fa fa-home fa-lg"></i>
+                        <span class="text">{{ 'Home' | get_lang }}</span>
+                    </a>
+                </li>
+
+                <li class="active">
+                    <a href="{{ _p.web }}main/social/home.php">
+                        <i class="fa fa-user fa-lg"></i>
+                        <span class="text">{{ 'Profile' | get_lang }}</span>
+                    </a>
+                </li>
+
+                <li class="active">
+                    <a href="{{ _p.web }}main/social/groups.php">
+                        <i class="fa fa-users fa-lg"></i>
+                        <span class="text">{{ 'Groups' | get_lang }}</span>
+                    </a>
+                </li>
+
+                <li class="active">
+                    <a href="{{ _p.web }}main/calendar">
+                        <i class="fa fa-calendar fa-lg"></i>
+                        <span class="text">{{ 'Agenda' | get_lang }}</span>
+                    </a>
+                </li>
+
+                <li class="active">
+                    <a href="{{ _p.web_main }}mySpace/index.php">
+                        <i class="fa  fa-bar-chart-o fa-lg"></i>
+                        <span class="text">{{ 'Reporting' | get_lang }}</span>
+                    </a>
+                </li>
+
+                {% if _u.is_admin  == 1 %}
+                    <li class="submenu">
+                        <a href="#">
+                            <i class="fa fa-cogs"></i>
+                            <span class="text">{{ 'Administration' | get_lang }}
+                            </span>
+                            <i class="arrow fa fa-chevron-right"></i>
+                        </a>
+                        <ul class="nav nav-list" style="display:none">
+                            <li>
+                                <a href="{{ _p.web_main }}admin/index.php">
+                                    <i class="fa fa-dashboard fa-lg"></i> {{ 'Dashboard' }}
+                                </a>
+                            </li>
+
+                            <li>
+                                <a href="{{ _p.web_main }}admin/user_list.php">
+                                    <i class="fa fa-user fa-lg"></i> {{ 'Users' }}
+                                </a>
+                            </li>
+                            <li>
+                                <a href="{{ _p.web_main }}admin/usergroups.php">
+                                    <i class="fa fa-users fa-lg"></i>{{ 'Groups' }}
+                                </a>
+                            </li>
+                            <li>
+                                <a href="{{ _p.web_main }}admin/course_list.php">
+                                    <i class="fa fa-book fa-lg"></i> {{ 'Courses' }}
+                                </a>
+                            </li>
+                            <li>
+                                <a href="{{ _p.web_main }}session/session_list.php">
+                                    <i class="fa fa-sitemap fa-lg"></i>{{ 'Sessions' }}
+                                </a>
+                            </li>
+
+                        </ul>
+                    </li>
+                    {{ block_menu.title }}
+                {% endif %}
+            </ul>
+            {% endif %}
+
+            {#  Left column  #}
+            {% if plugin_menu_top %}
+                <div id="plugin_menu_top">
+                    {{plugin_menu_top}}
+                </div>
+            {% endif %}
+
+            {# if user is not login show the login form #}
+            {% if _u.logged  == 0 %}
+                {% include app.template_style ~ "/layout/login_form.tpl" %}
+            {% endif %}
+
+            {#  course_session_block #}
+            {% include app.template_style ~ "/index/course_session_block.tpl" %}
+
+            {#  User picture  #}
+            {# include app.template_style ~ "/index/user_image_block.tpl" #}
+
+            {#  User Profile links #}
+            {# include app.template_style ~ "/index/profile_block.tpl" #}
+
+            {#  Social links #}
+            {# include app.template_style ~ "/index/profile_social_block.tpl" #}
+
+            {#  Course block - admin #}
+            {% include app.template_style ~ "/index/course_block.tpl" %}
+
+            {#  Course block - teacher #}
+            {% include app.template_style ~ "/index/teacher_block.tpl" %}
+
+            {#  Session block #}
+            {% include app.template_style ~ "/index/session_block.tpl" %}
+
+            {#  Notice  #}
+            {% include app.template_style ~ "/index/notice_block.tpl" %}
+
+            {#  Help #}
+            {% include app.template_style ~ "/index/help_block.tpl" %}
+
+            {#  Links that are not added in the tabs #}
+            {% include app.template_style ~ "/index/navigation_block.tpl" %}
+
+            {#  Reservation block  #}
+            {{ reservation_block }}
+
+            {#  Search (xapian) #}
+            {{ search_block }}
+
+            {#  Classes  #}
+            {{ classes_block }}
+
+            {#  Skills #}
+            {% include app.template_style ~ "/index/skills_block.tpl" %}
+
+            {#  Plugin courses sidebar  #}
+            {#  Plugins for footer section  #}
+
+            {% if plugin_menu_bottom %}
+                <div id="plugin_menu_bottom">
+                    {{ plugin_menu_bottom }}
+                </div>
+            {% endif %}
+        </div>
+    </nav>
+</div>

+ 8 - 8
src/ChamiloLMS/Controller/Admin/AdminController.php

@@ -71,10 +71,8 @@ class AdminController extends CommonController
             register_site();
             $message = \Display::return_message(get_lang('VersionCheckEnabled'), 'confirmation');
         }
-
-        $blocks = array();
-
         $adminUrl = api_get_path(WEB_CODE_PATH).'admin/';
+        $blocks = array();
 
         /* Users */
         $blocks['users']['icon'] = \Display::return_icon('members.gif', get_lang('Users'), array(), ICON_SIZE_SMALL, false);
@@ -84,16 +82,16 @@ class AdminController extends CommonController
             $search_form = $this->getSearchForm($adminUrl.'user_list.php')->return_form();
             $blocks['users']['search_form'] = $search_form;
             $items = array(
-                array('url'=>$adminUrl.'user_list.php', 	'label' => get_lang('UserList')),
+                array('url' => $adminUrl.'user_list.php', 	'label' => get_lang('UserList')),
                 array('url' => $adminUrl.'user_add.php', 	'label' => get_lang('AddUsers')),
                 array('url' => $adminUrl.'user_export.php', 'label' => get_lang('ExportUserListXMLCSV')),
                 array('url' => $adminUrl.'user_import.php', 'label' => get_lang('ImportUserListXMLCSV')),
             );
             if (isset($extAuthSource) && isset($extAuthSource['ldap']) && count($extAuthSource['ldap']) > 0) {
-                $items[] = array('url' => $adminUrl.'ldap_users_list.php', 	'label' => get_lang('ImportLDAPUsersIntoPlatform'));
+                $items[] = array('url' => $adminUrl.'ldap_users_list.php', 'label' => get_lang('ImportLDAPUsersIntoPlatform'));
             }
-            $items[] = array('url' => $adminUrl.'extra_fields.php?type=user', 	'label' => get_lang('ManageUserFields'));
-            $items[] = array('url'=> api_get_path(WEB_PUBLIC_PATH).'admin/administrator/roles', 	'label' => get_lang('Roles'));
+            $items[] = array('url' => $adminUrl.'extra_fields.php?type=user', 'label' => get_lang('ManageUserFields'));
+            $items[] = array('url'=> api_get_path(WEB_PUBLIC_PATH).'admin/administrator/roles', 'label' => get_lang('Roles'));
         } else {
             $items = array(
                 array('url' => $adminUrl.'user_list.php', 	'label' => get_lang('UserList')),
@@ -101,6 +99,9 @@ class AdminController extends CommonController
                 array('url' => $adminUrl.'user_import.php', 'label' => get_lang('ImportUserListXMLCSV')),
             );
         }
+
+        $items[] = array('url' => $adminUrl.'usergroups.php', 	'label' => get_lang('Classes'));
+
         $blocks['users']['items'] = $items;
         $blocks['users']['extra'] = null;
 
@@ -206,7 +207,6 @@ class AdminController extends CommonController
             $items[] = array('url' => $adminUrl.'career_dashboard.php', 	'label' => get_lang('CareersAndPromotions'));
         }
 
-        $items[] = array('url' => $adminUrl.'usergroups.php', 	'label' => get_lang('Classes'));
         $items[] = array('url' => $adminUrl.'exercise_report.php', 	'label' => get_lang('ExerciseReport'));
         $items[] = array('url' => $adminUrl.'extra_fields.php?type=session', 	'label' => get_lang('ManageSessionFields'));
 

+ 2 - 2
src/ChamiloLMS/Controller/IndexController.php

@@ -114,8 +114,8 @@ class IndexController extends CommonController
         $this->setLoginForm($app);
 
         if (!api_is_anonymous()) {
-            $pageController->setProfileBlock();
-            $pageController->setUserImageBlock();
+            //$pageController->setProfileBlock();
+            //$pageController->setUserImageBlock();
 
             if (api_is_platform_admin()) {
                 $pageController->setCourseBlock();

+ 128 - 62
web/ChamiloLMS/css/base.css

@@ -2,6 +2,38 @@
  * Common CSS for all themes
 */
 
+
+/* Sticky footer*/
+html {
+    position: relative;
+    min-height: 100%;
+}
+
+body {
+    margin-bottom: 60px;
+    background-color: #383e4b;
+    /* The html and body elements cannot have any padding or margin. */
+}
+
+/* background-color: #0191C7; */
+/* border-color: #0073A0; */
+/* border-color: transparent; */
+
+/* Wrapper for page content to push down footer */
+#wrapper {
+    min-height: 100%;
+    height: auto;
+    /* Negative indent footer by its height */
+    margin: 0 auto -60px;
+    /* Pad bottom by footer height */
+    padding: 0 0 60px;
+}
+
+/* Set the fixed height of the footer here */
+footer {
+    bottom: 0;
+}
+
 /* some changes to the bootstrap.css */
 
 /* when doing a var_dump*/
@@ -37,15 +69,6 @@ header #logo {
     padding: 0px 0px 15px 0px;
 }
 
-.breadcrumb {
-    margin-bottom: 0px;
-}
-
-.breadcrumb a, .breadcrumb li {
-    text-shadow:none;
-    font-size: 13px;
-}
-
 .badge-group {
     width: 200px;
     position: relative;
@@ -154,32 +177,9 @@ header #logo {
     width: 110px;
 }
 
-/* Sticky footer*/
-
-html,
-body {
-    height: 100%;
-    /* The html and body elements cannot have any padding or margin. */
-}
-
-/* Wrapper for page content to push down footer */
-#wrapper {
-    min-height: 100%;
-    height: auto;
-    /* Negative indent footer by its height */
-    margin: 0 auto -60px;
-    /* Pad bottom by footer height */
-    padding: 0 0 60px;
-}
-
-/* Set the fixed height of the footer here */
-footer {
-    height: 150px;
-    background-color: #f5f5f5;
-}
 
 footer .container .row {
-    padding-top:50px;
+    /* padding-top:50px; */
 }
 
 .with-toolbar {
@@ -191,6 +191,7 @@ footer .container .row {
 }
 
 .page-header {
+    margin: 0px 0 20px;
     padding-bottom: 10px;
     border-bottom: 1px solid #ddd;
     -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
@@ -204,7 +205,7 @@ footer .container .row {
 }
 
 .actions form {
-    margin-left: 10px;
+    padding-top: 6px;
     float:right;
 }
 
@@ -4550,7 +4551,10 @@ i.size-32.icon-new-note {
     text-align: right;
     font-style: italic
 }
+#learning_path_main {
+    background-color: white;
 
+}
 #learning_path_main #control {
     text-align: center;
     background-image: -webkit-gradient(linear, left top, left bottom, from(#ececec), to(#fff));
@@ -5215,7 +5219,7 @@ a.invisible:link, a.invisible:visited {
 }
 
 footer a:link, footer a:visited {
-    color:#f1d40d;
+
 }
 /*
     NAVIGATION MENU
@@ -6626,37 +6630,10 @@ div.new_html_code {
     bottom:40px;
 }
 
-.sidebar {
-    float: left;
-    position: relative;
-    border: 1px solid #ccc;
-    border-width: 0 1px 0 0;
-    background-color: #f2f2f2;
-    padding: 0px;
-}
-
 header .navbar {
     margin-bottom: 0px;
 }
 
-.breadcrumbs {
-    position: relative;
-    border-bottom: 1px solid #e5e5e5;
-    background-color: #f5f5f5;
-    min-height: 41px;
-    line-height: 40px;
-    padding: 0 12px 0 0;
-    display: block;
-}
-
-.breadcrumb {
-    padding: 0 12px 0 0;
-}
-.breadcrumb img {
-    padding-left:10px;
-    padding-right:2px;
-}
-
 .shortcuts {
     background-color: #fafafa;
     border-bottom: 1px solid #ddd;
@@ -6725,3 +6702,92 @@ header .navbar {
 .minified .shortcuts-mini {
     display: block !important;
 }
+
+#main .breadcrumb {
+    /* margin: 0px -30px 30px -30px; */
+    margin: 0px -30px 5px -30px;
+    padding: 10px 30px;
+}
+
+.breadcrumb {
+    -webkit-border-radius: 0;
+    -moz-border-radius: 0;
+    border-radius: 0;
+    height: 40px;
+    position: relative;
+    border-bottom: 1px solid #dbdee0;
+}
+
+#sidebar-left nav ul  li > a:hover, #sidebar-left nav ul li  > a:focus {
+    background-color: rgba(44, 62, 80, .4);
+}
+#sidebar-left nav ul  li > a:hover, #sidebar-left nav ul  li > a:focus {
+    text-decoration: none;
+}
+
+#sidebar-left nav ul li .fa {
+    margin-right: 10px;
+}
+#sidebar-left nav ul  a {
+    color: #ecf0f1;
+}
+
+.navbar-static-side {
+    z-index: 1;
+    position: absolute;
+}
+
+#main #sidebar-left {
+    /*width: 14.422%; */
+}
+
+#main #main_content {
+    padding: 0px 30px;
+    margin: 0;
+    height: 100%;
+    /* width: 85.578%;*/
+    background-color: white;
+}
+
+.no-sidebar {
+    background-color: white;
+}
+
+#main {
+    /* background-color: rgba(52, 73, 94, .9);*/
+/*    position: inherit;
+    margin: 0 0 0 250px;
+    padding: 0 30px;
+    min-height: 1300px;
+    border-left: 1px solid #e7e7e7;*/
+}
+
+#sidebar-left {
+    padding: 10px;
+}
+
+footer {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    height: 60px;
+    background-color: #f5f5f5;
+}
+
+.navbar-brand , .navbar-brand :hover {
+    background: #1e8fc6;
+    text-align: center;
+}
+
+a#main-menu-toggle {
+    color: white;
+    position: absolute;
+    z-index: 1000;
+    top: 0;
+    left: 5px;
+    padding: 10px 12px;
+    font-size: 16px;
+    text-shadow: none;
+    text-decoration: none;
+    cursor: pointer;
+}

+ 5 - 60
web/ChamiloLMS/css/themes/chamilo/default.css

@@ -20,9 +20,13 @@ a:active {
 }
 
 /** Navbar */
+html,
+body {
+
+}
 
 .navbar-default {
-    background-color: #0191C7;
+    background-color: #3498DB;
     /*border-color: #0073A0;*/
     border-color: transparent;
 }
@@ -92,10 +96,6 @@ a:active {
  *  FOOTER STYLES                                    *
  *****************************************************/
 footer {
-    background-color: #037fb2;
-    background-image: url(images/bg-footer.gif);
-    background-repeat:repeat-x;
-    color:#ffffff;
 }
 
 /*****************************************************
@@ -149,61 +149,6 @@ footer {
     background:transparent url('images/textologo.jpg') no-repeat;
 }
 
-/*including "login" image*/
-button.login {
-    /* background-image:url(images/bg-button.gif); */
-}
-/* including "save" image*/
-button.save {
-    /* background-image:url(images/button_accept.gif); */
-}
-/*including "add" image*/
-button.add {
-    /* background-image:url(images/button_add.gif); */
-}
-/*including "cancel" image*/
-button.cancel {
-    /* background-image:url(images/button_delete.gif); */
-}
-/*including "search" image*/
-button.search {
-    /* background-image:url(images/bg-button.gif); */
-}
-/*including "plus" image*/
-button.plus {
-    /* background-image:url(images/button_plus.gif); */
-}
-/*including "minus" image*/
-button.minus {
-    /* background-image:url(images/button_minus.gif); */
-}
-/*including "next" image*/
-button.next {
-    /* background-image:url(images/button_next.gif) !important; */
-}
-/*including "back" image*/
-button.back {
-    /* background-image:url(images/button_back.gif); */
-}
-/*including "refresh" image*/
-button.refresh {
-    /* background-image:url(images/button_refresh.gif); */
-}
-/*including "upload" image*/
-button.upload {
-    /* background-image:url(images/button_upload.gif); */
-}
-
-button.arrowr, input.arrowr {
-	/* background-image:url(images/2rightarrow.gif); */
-}
-button.arrowl, input.arrowl {
-    /* background-image:url(images/2leftarrow.gif); */
-}
-.refresh {
-    /* background-image:url(images/refresh.png); */
-}
-
 .portal {
     background-image:url(images/portal.png);
 }