Merge changes for responsive design by @aragonc

1.9.x
Alex Aragon 11 years ago committed by Yannick Warnier
parent f88328637e
commit 9272bbc7ee
  1. 18
      main/css/chamilo/default.css
  2. 30
      main/css/responsive.css
  3. 9
      main/inc/lib/userportal.lib.php
  4. 4
      main/template/default/layout/layout_2_col.tpl

@ -515,6 +515,24 @@ RESPONSIVE CSS
background: url("images/perfil.png") no-repeat left center;
padding-left: 30px;
}
.add-course{
background: url("images/course.png") no-repeat left center;
padding-left: 30px;
}
.history-course{
background: url("images/history.png") no-repeat left center;
padding-left: 30px;
}
.list-course{
background: url("images/list-course.png") no-repeat left center;
padding-left: 30px;
}
.order-course{
background: url("images/order-course.png") no-repeat left center;
padding-left: 30px;
}
}

@ -301,13 +301,14 @@ The more frequent ones have been marked with *
width: 97%;
}
#top_main_content .menu-column .block_user_info{
width: 715px;
width: 390px;
clear: both;
float: left;
}
#top_main_content .menu-column .block_tools_info{
width: 715px;
clear: both;
width: 225px;
float: left;
}
#top_main_content .menu-column .block_tools_info #help_block{
@ -321,6 +322,11 @@ The more frequent ones have been marked with *
background: none;
border:none;
}
#top_main_content .menu-column #course_block{
float: left;
background: none;
border:none;
}
#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);
@ -329,23 +335,27 @@ The more frequent ones have been marked with *
}
#top_main_content .menu-column #profile_block{
float: left;
width: 520px;
width: 250px;
margin-left: 10px;
background: none;
border:none;
}
#top_main_content .menu-column #reservation_block{
clear: both;
display: inline-block;
width: 98%;
}
#top_main_content .menu-column .well{
padding: 5px;
}
.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");
font-size: 16px;
}
/* only for the course tools */
#course_tools .row > [class*="span"], #course_tools .row-fluid > [class*="span"] {

@ -898,7 +898,7 @@ class IndexManager
$my_account_content = '<ul class="nav nav-list">';
if ($show_create_link) {
$my_account_content .= '<li><a href="main/create_course/add_course.php" class="add course">';
$my_account_content .= '<li class="add-course"><a href="main/create_course/add_course.php">';
if (api_get_setting('course_validation') == 'true' && !api_is_platform_admin()) {
$my_account_content .= get_lang('CreateCourseRequest');
} else {
@ -909,19 +909,20 @@ class IndexManager
//Sort courses
$url = api_get_path(WEB_CODE_PATH).'auth/courses.php?action=sortmycourses';
$my_account_content .= '<li>'.Display::url(get_lang('SortMyCourses'), $url, array('class' => 'sort course')).'</li>';
$my_account_content .= '<li class="order-course">'.Display::url(get_lang('SortMyCourses'), $url, array('class' => 'sort course')).'</li>';
// Session history
if (isset($_GET['history']) && intval($_GET['history']) == 1) {
$my_account_content .= '<li><a href="user_portal.php">'.get_lang('DisplayTrainingList').'</a></li>';
} else {
$my_account_content .= '<li><a href="user_portal.php?history=1" class="history course">'.get_lang('HistoryTrainingSessions').'</a></li>';
$my_account_content .= '<li class="history-course"><a href="user_portal.php?history=1" >'.get_lang('HistoryTrainingSessions').'</a></li>';
}
// Course catalog
if ($show_course_link) {
if (!api_is_drh()) {
$my_account_content .= '<li><a href="main/auth/courses.php" class="list course">'.get_lang('CourseCatalog').'</a></li>';
$my_account_content .= '<li class="list-course"><a href="main/auth/courses.php" >'.get_lang('CourseCatalog').'</a></li>';
} else {
$my_account_content .= '<li><a href="main/dashboard/index.php">'.get_lang('Dashboard').'</a></li>';
}

@ -36,7 +36,7 @@
{# Course block - teacher #}
{{ teacher_block }}
</div>
{# Notice #}
{{ notice_block }}
@ -57,7 +57,7 @@
{# Skills #}
{{ skills_block }}
</div>
{# Plugin courses sidebar #}
{# Plugins for footer section #}

Loading…
Cancel
Save