Fixing wrong subnav CSS attributes see #4807

skala
Julio Montoya 13 years ago
parent 3b3df9e25b
commit 740544157b
  1. 5
      main/css/academica/default.css
  2. 5
      main/css/baby_orange/default.css
  3. 44
      main/css/base.css
  4. 10
      main/css/base_chamilo.css
  5. 5
      main/css/corporate/default.css
  6. 27
      main/inc/lib/banner.lib.php
  7. 3
      main/inc/lib/plugin.lib.php
  8. 8
      main/inc/lib/template.lib.php
  9. 4
      main/inc/lib/userportal.lib.php
  10. 4
      main/template/default/layout/layout_1_col.tpl
  11. 12
      main/template/default/layout/layout_2_col.tpl
  12. 26
      main/template/default/layout/main_header.tpl

@ -37,11 +37,6 @@ a:active {
float: right;
font-weight: bold;
}
/* header 3 styles */
.subnav {
border-bottom: 1px solid #aeaeae;
font-weight: bold;
}
.subnav li a:hover {
float:left;

@ -40,11 +40,6 @@ a:active {
font-weight: bold;
}
/* header 3 styles */
.subnav {
border-bottom: 1px solid #aeaeae;
font-weight: bold;
}
/* The tool shortcuts */
#toolshortcuts {

@ -166,10 +166,6 @@ form .formw input {
width: 110px;
}
* {
/* outline :none; */
}
html, body {
margin: 0;
padding: 0;
@ -3527,25 +3523,25 @@ a.forum_group_link {
/* Subnav */
.subnav {
height: 36px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
/* default subnav color */
background-color: #eeeeee; /* Old browsers */
background-repeat: repeat-x; /* Repeat the gradient */
background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(100%,#eeeeee)); /* Chrome,Safari4+ */
background-image: -webkit-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Chrome 10+,Safari 5.1+ */
background-image: -ms-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* IE10+ */
background-image: -o-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Opera 11.10+ */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */
background-image: linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* W3C */
border: 1px solid #e5e5e5;
/* end default subnav background colors */
.subnav {
height: 36px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
/* default subnav color */
background-color: #eeeeee; /* Old browsers */
background-repeat: repeat-x; /* Repeat the gradient */
background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(100%,#eeeeee)); /* Chrome,Safari4+ */
background-image: -webkit-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Chrome 10+,Safari 5.1+ */
background-image: -ms-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* IE10+ */
background-image: -o-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Opera 11.10+ */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */
background-image: linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* W3C */
border: 1px solid #e5e5e5;
/* end default subnav background colors */
}
/* fixing gray border next the logout button */
@ -3554,7 +3550,7 @@ a.forum_group_link {
}
.subnav .nav {
margin-bottom: 0;
/* margin-bottom: 0; */
}
.subnav .nav > li > a {

@ -201,15 +201,6 @@ a.invisible:link, a.invisible:visited {
height:16px;
padding-right:4%;
}
#current {
color:#FFFFFF;
cursor:pointer;
display:block;
overflow:hidden;
padding-bottom:6px;
margin-right:-3px;
margin-right: 2px;
}
/* The tool shortcuts */
#toolshortcuts {
@ -219,6 +210,7 @@ a.invisible:link, a.invisible:visited {
text-align:right;
width:92%;
}
footer a:link, footer a:visited {
color:#f1d40d;
}

@ -58,7 +58,10 @@ input[type=button], input[type=submit] {
border: 1px solid #CCCCCC;
}
.subnav a {
color:#333;
color:#fff;
}
.subnav a :hover {
color:#000;
}
.subnav #current a {

@ -329,6 +329,7 @@ function return_menu() {
// Displaying the tabs
$lang = ''; //el for "Edit Language"
if (!empty($_SESSION['user_language_choice'])) {
$lang = $_SESSION['user_language_choice'];
} elseif (!empty($_SESSION['_user']['language'])) {
@ -356,7 +357,7 @@ function return_menu() {
} else {
$homep = api_get_path(SYS_PATH).'home/';
}
$ext = '.html';
$menutabs = 'home_tabs';
$home_top = '';
@ -367,7 +368,7 @@ function return_menu() {
$home_top = @(string)file_get_contents($homep.$menutabs.$lang.$ext);
} else {
//$errorMsg = get_lang('HomePageFilesNotReadable');
}
}
$home_top = api_to_system_encoding($home_top, api_detect_encoding(strip_tags($home_top)));
@ -459,20 +460,20 @@ function return_breadcrumb($interbreadcrumb, $language_file, $nameTools) {
$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();
$course_id = api_get_course_id();
/* Plugins for banner section */
$web_course_path = api_get_path(WEB_COURSE_PATH);
/*
* if the user is a coach he can see the users who are logged in its session
*/
/* If the user is a coach he can see the users who are logged in its session */
$navigation = array();
// part 1: Course Homepage. If we are in a course then the first breadcrumb is a link to the course homepage
// hide_course_breadcrumb the parameter has been added to hide the name of the course, that appeared in the default $interbreadcrumb
$session_name = cut($session_name, MAX_LENGTH_BREADCRUMB);
$session_name = cut($session_name, MAX_LENGTH_BREADCRUMB);
$my_session_name = is_null($session_name) ? '' : ' ('.$session_name.')';
if (!empty($_course) && !isset($_GET['hide_course_breadcrumb'])) {
$navigation_item['url'] = $web_course_path . $_course['path'].'/index.php'.(!empty($session_id) ? '?id_session='.$session_id : '');
@ -570,8 +571,8 @@ function return_breadcrumb($interbreadcrumb, $language_file, $nameTools) {
$html = '';
$view_as_student_link = null;
//User view as student
/* Part 4 . Show the teacher view/student view button at the right of the breadcrumb */
$view_as_student_link = null;
if ($user_id && isset($course_id)) {
if ((api_is_course_admin() || api_is_platform_admin()) && api_get_setting('student_view_enabled') == 'true') {
$view_as_student_link = api_display_tool_view_option();
@ -581,8 +582,7 @@ function return_breadcrumb($interbreadcrumb, $language_file, $nameTools) {
if (!empty($final_navigation)) {
$lis = '';
$i = 0;
//$home_link = Display::url(Display::img(api_get_path(WEB_CSS_PATH).'home.png', get_lang('Homepage'), array('align'=>'middle')), api_get_path(WEB_PATH), array('class'=>'home'));
//$home_link = Display::url(Display::img(api_get_path(WEB_CSS_PATH).'home.png', get_lang('Homepage'), array('align'=>'middle')), api_get_path(WEB_PATH), array('class'=>'home'));
//$lis.= Display::tag('li', Display::url(get_lang('Homepage').'<span class="divider">/</span>', api_get_path(WEB_PATH)));
$final_navigation_count = count($final_navigation);
@ -594,8 +594,7 @@ function return_breadcrumb($interbreadcrumb, $language_file, $nameTools) {
if (!empty($bread_check)) {
if ($final_navigation_count-1 > $i) {
$bread .= '<span class="divider">/</span>';
}
}
$lis.= Display::tag('li', $bread);
$i++;
}
@ -604,7 +603,7 @@ function return_breadcrumb($interbreadcrumb, $language_file, $nameTools) {
$lis.= Display::tag('li', $home_link);
}
// view as student
// View as student/teacher link
if (!empty($view_as_student_link)) {
$lis.= Display::tag('li', $view_as_student_link, array('class' => 'pull-right'));
}

@ -213,7 +213,8 @@ class AppPlugin {
$_template['plugin_info'] = $plugin_info;
}
//Setting the plugin info available in the template if exists
//Setting the plugin info available in the template if exists
$template->assign($plugin_name, $_template);
//Loading the Twig template plugin files if exists

@ -647,9 +647,13 @@ class Template {
/* Sets the plugin content in a template variable */
function set_plugin_region($plugin_region) {
if (!empty($plugin_region)) {
if (!empty($plugin_region)) {
$content = $this->plugin->load_region($plugin_region, $this, $this->force_plugin_load);
$this->assign('plugin_'.$plugin_region, $content);
if (!empty($content)) {
$this->assign('plugin_'.$plugin_region, $content);
} else {
$this->assign('plugin_'.$plugin_region, null);
}
}
return null;
}

@ -1,10 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
require_once api_get_path(LIBRARY_PATH).'system_announcements.lib.php';
require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
require_once api_get_path(SYS_CODE_PATH).'survey/survey.lib.php';
class IndexManager {
var $tpl = false; //An instance of the template engine
var $name = '';

@ -4,7 +4,7 @@
{% block body %}
{# Plugin top #}
{% if plugin_content_top is not null %}
{% if plugin_content_top %}
<div id="plugin_content_top" class="span12">
{{ plugin_content_top}}
</div>
@ -22,7 +22,7 @@
</div>
{# Plugin bottom #}
{% if plugin_content_bottom is not null %}
{% if plugin_content_bottom %}
<div id="plugin_content_bottom" class="span12">
{{ plugin_content_bottom }}
</div>

@ -6,14 +6,14 @@
<div class="span9">
{# Plugin bottom #}
{% if plugin_content_top is not null %}
{% if plugin_content_top %}
<div id="plugin_content_top">
{{ plugin_content_top }}
</div>
{% endif %}
{# ?? #}
{% if home_page_block is not null %}
{% if home_page_block %}
<section id="home_page">
{{ home_page_block}}
</section>
@ -31,7 +31,7 @@
{% endif %}
{# Announcements #}
{% if announcements_block is not null %}
{% if announcements_block %}
<section id="announcements_page">
{{ announcements_block }}
</section>
@ -41,7 +41,7 @@
{% include "default/layout/hot_courses.tpl" %}
{# Content bottom #}
{% if plugin_content_bottom is not null %}
{% if plugin_content_bottom %}
<div id="plugin_content_bottom">
{{plugin_content_bottom}}
</div>
@ -51,7 +51,7 @@
{# Right column #}
<div class="span3">
{% if plugin_menu_top is not null %}
{% if plugin_menu_top %}
<div id="plugin_menu_top">
{{plugin_menu_top}}
</div>
@ -95,7 +95,7 @@
{# Plugin courses sidebar #}
{# Plugins for footer section #}
{% if plugin_menu_bottom is not null %}
{% if plugin_menu_bottom %}
<div id="plugin_menu_bottom">
{{ plugin_menu_bottom }}
</div>

@ -32,16 +32,15 @@
{# logo #}
{{ logo }}
{# plugin_header #}
{# plugin_header left #}
{% if plugin_header_left is not null %}
<div id="plugin_header_left">
{{ plugin_header_left }}
</div>
{% endif %}
</div>
<div id="header_center" class="span3">
{# plugin_header #}
<div id="header_center" class="span3">
{# plugin_header center #}
{% if plugin_header_center is not null %}
<div id="plugin_header_center">
{{ plugin_header_center }}
@ -49,13 +48,12 @@
{% endif %}
&nbsp;
</div>
<div id="header_right" class="span5">
{# header right (notifications) #}
<div id="header_right" class="span5">
<ul id="notifications" class="nav nav-pills pull-right">
{{ notification_menu }}
</ul>
{# plugin_header #}
{# plugin_header right #}
{% if plugin_header_right is not null %}
<div id="plugin_header_right">
{{ plugin_header_right }}
@ -65,7 +63,7 @@
</div>
</div>
{% if plugin_header_main is not null %}
{% if plugin_header_main %}
<div class="row">
<div class="span12">
<div id="plugin_header_main">
@ -74,17 +72,21 @@
</div>
</div>
{% endif %}
</header>
{# menu #}
{# menu #}
{% if menu is not null %}
<div class="subnav">
{{ menu }}
</div>
{% endif %}
</header>
{# breadcrumb #}
{{ breadcrumb}}
{{ breadcrumb }}
<div class="row">
{# course navigation links/shortcuts need to be activated by the admin #}
{% include "default/layout/course_navigation.tpl" %}
{% endif %}
Loading…
Cancel
Save