From ba4662bf3dcce0fed67e2cd93709f1487437a360 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Fri, 17 Feb 2012 13:15:14 +0100 Subject: [PATCH] More fixes due recent HTML5 changes --- main/css/base.css | 953 +------------------ main/css/base_chamilo.css | 256 +---- main/css/chamilo/default.css | 1 - main/inc/lib/banner.lib.php | 76 +- main/inc/lib/main_api.lib.php | 2 +- main/inc/lib/template.lib.php | 24 +- main/template/default/layout/header.tpl | 28 +- main/template/default/layout/main_header.tpl | 14 +- 8 files changed, 93 insertions(+), 1261 deletions(-) diff --git a/main/css/base.css b/main/css/base.css index ee982df405..52ec7d46fe 100644 --- a/main/css/base.css +++ b/main/css/base.css @@ -24,6 +24,11 @@ select { border-radius: none; } +.secondary-nav { + float:right !important; + margin-right: 0px !important; +} + legend { margin-bottom: 10px; } @@ -32,6 +37,10 @@ legend { width:165px; } +#header2 .nav{ + margin-bottom:0px; +} + /* Fixing old chamilo forms */ form .label { @@ -214,949 +223,10 @@ html, body { padding: 0; } -/* top nav bar features */ - -.nav { - margin-left: 0; - margin-bottom: 18px; - list-style: none; -} -.nav > li > a { - display: block; -} -.nav > li > a:hover { - text-decoration: none; - background-color: #eeeeee; -} -.nav-list { - padding-left: 14px; - padding-right: 14px; - margin-bottom: 0; -} -.nav-list > li > a, .nav-list .nav-header { - display: block; - padding: 3px 15px; - margin-left: -15px; - margin-right: -15px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -} -.nav-list .nav-header { - font-size: 11px; - font-weight: bold; - line-height: 18px; - color: #999999; - text-transform: uppercase; -} -.nav-list > li + .nav-header { - margin-top: 9px; -} -.nav-list .active > a, .nav-list .active > a:hover { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #0088cc; -} -.nav-list [class^="icon-"] { - margin-right: 2px; -} -.nav-tabs, .nav-pills { - *zoom: 1; -} -.nav-tabs:before, -.nav-pills:before, -.nav-tabs:after, -.nav-pills:after { - display: table; - content: ""; -} -.nav-tabs:after, .nav-pills:after { - clear: both; -} -.nav-tabs > li, .nav-pills > li { - float: left; -} -.nav-tabs > li > a, .nav-pills > li > a { - padding-right: 12px; - padding-left: 12px; - margin-right: 2px; - line-height: 14px; -} -.nav-tabs { - border-bottom: 1px solid #ddd; -} -.nav-tabs > li { - margin-bottom: -1px; -} -.nav-tabs > li > a { - padding-top: 9px; - padding-bottom: 9px; - border: 1px solid transparent; - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} -.nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #dddddd; -} -.nav-tabs > .active > a, .nav-tabs > .active > a:hover { - color: #555555; - background-color: #ffffff; - border: 1px solid #ddd; - border-bottom-color: transparent; - cursor: default; -} -.nav-pills > li > a { - padding-top: 8px; - padding-bottom: 8px; - margin-top: 2px; - margin-bottom: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} -.nav-pills .active > a, .nav-pills .active > a:hover { - color: #ffffff; - background-color: #0088cc; -} -.nav-stacked > li { - float: none; -} -.nav-stacked > li > a { - margin-right: 0; -} -.nav-tabs.nav-stacked { - border-bottom: 0; -} -.nav-tabs.nav-stacked > li > a { - border: 1px solid #ddd; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.nav-tabs.nav-stacked > li:first-child > a { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} -.nav-tabs.nav-stacked > li:last-child > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} -.nav-tabs.nav-stacked > li > a:hover { - border-color: #ddd; - z-index: 2; -} -.nav-pills.nav-stacked > li > a { - margin-bottom: 3px; -} -.nav-pills.nav-stacked > li:last-child > a { - margin-bottom: 1px; -} -.nav-tabs .dropdown-menu, .nav-pills .dropdown-menu { - margin-top: 1px; - border-width: 1px; -} -.nav-pills .dropdown-menu { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.nav-tabs .dropdown-toggle .caret, .nav-pills .dropdown-toggle .caret { - border-top-color: #0088cc; - margin-top: 6px; -} -.nav-tabs .dropdown-toggle:hover .caret, .nav-pills .dropdown-toggle:hover .caret { - border-top-color: #005580; -} -.nav-tabs .active .dropdown-toggle .caret, .nav-pills .active .dropdown-toggle .caret { - border-top-color: #333333; -} -.nav > .dropdown.active > a:hover { - color: #000000; - cursor: pointer; -} -.nav-tabs .open .dropdown-toggle, .nav-pills .open .dropdown-toggle, .nav > .open.active > a:hover { - color: #ffffff; - background-color: #999999; - border-color: #999999; -} -.nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret { - border-top-color: #ffffff; - opacity: 1; - filter: alpha(opacity=100); -} -.tabs-stacked .open > a:hover { - border-color: #999999; -} -.tabbable { - *zoom: 1; -} -.tabbable:before, .tabbable:after { - display: table; - content: ""; -} -.tabbable:after { - clear: both; -} -.tabs-below .nav-tabs, .tabs-right .nav-tabs, .tabs-left .nav-tabs { - border-bottom: 0; -} -.tab-content > .tab-pane, .pill-content > .pill-pane { - display: none; -} -.tab-content > .active, .pill-content > .active { - display: block; -} -.tabs-below .nav-tabs { - border-top: 1px solid #ddd; -} -.tabs-below .nav-tabs > li { - margin-top: -1px; - margin-bottom: 0; -} -.tabs-below .nav-tabs > li > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} -.tabs-below .nav-tabs > li > a:hover { - border-bottom-color: transparent; - border-top-color: #ddd; -} -.tabs-below .nav-tabs .active > a, .tabs-below .nav-tabs .active > a:hover { - border-color: transparent #ddd #ddd #ddd; -} -.tabs-left .nav-tabs > li, .tabs-right .nav-tabs > li { - float: none; -} -.tabs-left .nav-tabs > li > a, .tabs-right .nav-tabs > li > a { - min-width: 74px; - margin-right: 0; - margin-bottom: 3px; -} -.tabs-left .nav-tabs { - float: left; - margin-right: 19px; - border-right: 1px solid #ddd; -} -.tabs-left .nav-tabs > li > a { - margin-right: -1px; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} -.tabs-left .nav-tabs > li > a:hover { - border-color: #eeeeee #dddddd #eeeeee #eeeeee; -} -.tabs-left .nav-tabs .active > a, .tabs-left .nav-tabs .active > a:hover { - border-color: #ddd transparent #ddd #ddd; - *border-right-color: #ffffff; -} -.tabs-right .nav-tabs { - float: right; - margin-left: 19px; - border-left: 1px solid #ddd; -} -.tabs-right .nav-tabs > li > a { - margin-left: -1px; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} -.tabs-right .nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #eeeeee #dddddd; -} -.tabs-right .nav-tabs .active > a, .tabs-right .nav-tabs .active > a:hover { - border-color: #ddd #ddd #ddd transparent; - border-left-color: #ffffff; -} -.navbar { - overflow: visible; - margin-bottom: 0px !important; -} -.navbar-inner { - padding-left: 20px; - padding-right: 20px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); -} - - #topbar { z-index:20000; } -.subbar-inner { - padding-left: 20px; - padding-right: 20px; - /* - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);*/ -} - -.btn-navbar { - display: none; - float: right; - padding: 7px 10px; - margin-left: 5px; - margin-right: 5px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - border-color: #222222 #222222 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - cursor:pointer; -} -.btn-navbar:hover, -.btn-navbar:active, -.btn-navbar.active, -.btn-navbar.disabled, -.btn-navbar[disabled] { - background-color: #222222; -} -.btn-navbar:active, .btn-navbar.active { - background-color: #080808 \9; -} -.btn-navbar .icon-bar { - display: block; - width: 18px; - height: 2px; - background-color: #f5f5f5; - -webkit-border-radius: 1px; - -moz-border-radius: 1px; - border-radius: 1px; - -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); -} -.btn-navbar .icon-bar + .icon-bar { - margin-top: 3px; -} -.nav-collapse.collapse { - height: auto; -} -.navbar .brand:hover { - text-decoration: none; -} -.navbar .brand { - float: left; - display: block; - padding: 8px 20px 12px; - margin-left: -20px; - font-size: 20px; - font-weight: 200; - line-height: 1; - color: #ffffff; -} -.navbar .navbar-text { - margin-bottom: 0; - line-height: 40px; - color: #999999; -} -.navbar .navbar-text a:hover { - color: #ffffff; - background-color: transparent; -} -.navbar .btn, .navbar .btn-group { - margin-top: 5px; -} -.navbar .btn-group .btn { - margin-top: 0; -} -.navbar-form { - margin-bottom: 0; - *zoom: 1; -} -.navbar-form:before, .navbar-form:after { - display: table; - content: ""; -} -.navbar-form:after { - clear: both; -} -.navbar-form input, .navbar-form select { - display: inline-block; - margin-top: 5px; - margin-bottom: 0; -} -.navbar-form .radio, .navbar-form .checkbox { - margin-top: 5px; -} -.navbar-form input[type="image"], .navbar-form input[type="checkbox"], .navbar-form input[type="radio"] { - margin-top: 3px; -} -.navbar-search { - position: relative; - float: left; - margin-top: 6px; - margin-bottom: 0; -} -.navbar-search .search-query { - padding: 4px 9px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - font-weight: normal; - line-height: 1; - color: #ffffff; - color: rgba(255, 255, 255, 0.75); - background: #666; - background: rgba(255, 255, 255, 0.3); - border: 1px solid #111; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); - -webkit-transition: none; - -moz-transition: none; - -ms-transition: none; - -o-transition: none; - transition: none; -} -.navbar-search .search-query :-moz-placeholder { - color: #eeeeee; -} -.navbar-search .search-query::-webkit-input-placeholder { - color: #eeeeee; -} -.navbar-search .search-query:hover { - color: #ffffff; - background-color: #999999; - background-color: rgba(255, 255, 255, 0.5); -} -.navbar-search .search-query:focus, .navbar-search .search-query.focused { - padding: 5px 10px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - outline: 0; -} -.navbar-fixed-top { - position: fixed; - top: 0; - right: 0; - left: 0; - z-index: 1030; -} -.navbar-fixed-top .navbar-inner { - padding-left: 0; - padding-right: 0; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.navbar .nav { - position: relative; - left: 0; - display: block; - float: left; - margin: 0 10px 0 0; -} -.navbar .nav.pull-right { - float: right; -} -.navbar .nav > li { - display: block; - float: left; -} -.navbar .nav > li > a { - float: none; - padding: 10px 10px 11px; - line-height: 19px; - color: #999999; - text-decoration: none; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.navbar .nav > li > a:hover { - background-color: transparent; - color: #ffffff; - text-decoration: none; -} -.navbar .nav .active > a, .navbar .nav .active > a:hover { - color: #ffffff; - text-decoration: none; - background-color: #222222; - background-color: rgba(0, 0, 0, 0.5); -} -.navbar .divider-vertical { - height: 40px; - width: 1px; - margin: 0 9px; - overflow: hidden; - background-color: #222222; - border-right: 1px solid #333333; -} -.navbar .nav.pull-right { - margin-left: 10px; - margin-right: 0; -} -.navbar .dropdown-menu { - margin-top: 1px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.navbar .dropdown-menu:before { - content: ''; - display: inline-block; - border-left: 7px solid transparent; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-bottom-color: rgba(0, 0, 0, 0.2); - position: absolute; - top: -7px; - left: 9px; -} -.navbar .dropdown-menu:after { - content: ''; - display: inline-block; - border-left: 6px solid transparent; - border-right: 6px solid transparent; - border-bottom: 6px solid #ffffff; - position: absolute; - top: -6px; - left: 10px; -} -.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret { - border-top-color: #ffffff; -} -.navbar .nav .active .caret { - opacity: 1; - filter: alpha(opacity=100); -} -.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle { - background-color: transparent; -} -.navbar .nav .active > .dropdown-toggle:hover { - color: #ffffff; -} -.navbar .nav.pull-right .dropdown-menu { - left: auto; - right: 0; -} -.navbar .nav.pull-right .dropdown-menu:before { - left: auto; - right: 12px; -} -.navbar .nav.pull-right .dropdown-menu:after { - left: auto; - right: 13px; -} - - - -[class*="span"] { - float: left; - margin-left: 20px; -} -.span1 { - width: 60px; -} -.span2 { - width: 140px; -} -.span3 { - width: 220px; -} -.span4 { - width: 300px; -} -.span5 { - width: 380px; -} -.span6 { - width: 460px; -} -.span7 { - width: 540px; -} -.span8 { - width: 620px; -} -.span9 { - width: 700px; -} -.span10 { - width: 780px; -} -.span11 { - width: 860px; -} -.span12, .container { - width: 940px; -} -.offset1 { - margin-left: 100px; -} -.offset2 { - margin-left: 180px; -} -.offset3 { - margin-left: 260px; -} -.offset4 { - margin-left: 340px; -} -.offset5 { - margin-left: 420px; -} -.offset6 { - margin-left: 500px; -} -.offset7 { - margin-left: 580px; -} -.offset8 { - margin-left: 660px; -} -.offset9 { - margin-left: 740px; -} -.offset10 { - margin-left: 820px; -} -.offset11 { - margin-left: 900px; -} -.row-fluid { - width: 100%; - *zoom: 1; -} -.row-fluid:before, .row-fluid:after { - display: table; - content: ""; -} -.row-fluid:after { - clear: both; -} -.row-fluid > [class*="span"] { - float: left; - margin-left: 2.127659574%; -} -.row-fluid > [class*="span"]:first-child { - margin-left: 0; -} -.row-fluid .span1 { - width: 6.382978723%; -} -.row-fluid .span2 { - width: 14.89361702%; -} -.row-fluid .span3 { - width: 23.404255317%; -} -.row-fluid .span4 { - width: 31.914893614%; -} -.row-fluid .span5 { - width: 40.425531911%; -} -.row-fluid .span6 { - width: 48.93617020799999%; -} -.row-fluid .span7 { - width: 57.446808505%; -} -.row-fluid .span8 { - width: 65.95744680199999%; -} -.row-fluid .span9 { - width: 74.468085099%; -} -.row-fluid .span10 { - width: 82.97872339599999%; -} -.row-fluid .span11 { - width: 91.489361693%; -} -.row-fluid .span12 { - width: 99.99999998999999%; -} -.container { - width: 940px; - margin-left: auto; - margin-right: auto; - *zoom: 1; -} -.container:before, .container:after { - display: table; - content: ""; -} -.container:after { - clear: both; -} -.container-fluid { - padding-left: 20px; - padding-right: 20px; - *zoom: 1; -} -.container-fluid:before, .container-fluid:after { - display: table; - content: ""; -} -.container-fluid:after { - clear: both; -} - - -li.menu, .dropdown { - position: relative; -} -a.menu:after, .dropdown-toggle:after { - width: 0; - height: 0; - display: inline-block; - content: "↓"; - text-indent: -99999px; - vertical-align: top; - margin-top: 8px; - margin-left: 4px; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid #ffffff; - filter: alpha(opacity=50); - -khtml-opacity: 0.5; - -moz-opacity: 0.5; - opacity: 0.5; -} -.menu-dropdown, .dropdown-menu { - background-color: #ffffff; - float: left; - display: none; - position: absolute; - top: 40px; - z-index: 900; - min-width: 160px; - max-width: 220px; - _width: 160px; - margin-left: 0; - margin-right: 0; - padding: 6px 0; - zoom: 1; - border-color: #999; - border-color: rgba(0, 0, 0, 0.2); - border-style: solid; - border-width: 0 1px 1px; - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} -.menu-dropdown li, .dropdown-menu li { - float: none; - display: block; - background-color: none; -} -.menu-dropdown .divider, .dropdown-menu .divider { - height: 1px; - margin: 5px 0; - overflow: hidden; - background-color: #eee; - border-bottom: 1px solid #ffffff; -} -.topbar .dropdown-menu a, .dropdown-menu a { - display: block; - padding: 4px 15px; - clear: both; - font-weight: normal; - line-height: 18px; - color: #808080; - text-shadow: 0 1px 0 #ffffff; -} -.topbar .dropdown-menu a:hover, .dropdown-menu a:hover { - background-color: #dddddd; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd)); - background-image: -moz-linear-gradient(top, #eeeeee, #dddddd); - background-image: -ms-linear-gradient(top, #eeeeee, #dddddd); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd)); - background-image: -webkit-linear-gradient(top, #eeeeee, #dddddd); - background-image: -o-linear-gradient(top, #eeeeee, #dddddd); - background-image: linear-gradient(top, #eeeeee, #dddddd); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0); - color: #404040; - text-decoration: none; - -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); -} -.open .menu, -.dropdown.open .menu, -.open .dropdown-toggle, -.dropdown.open .dropdown-toggle { - color: #ffffff; - background: #ccc; - background: rgba(0, 0, 0, 0.3); -} -.open .menu-dropdown, -.dropdown.open .menu-dropdown, -.open .dropdown-menu, -.dropdown.open .dropdown-menu { - display: block; -} -.tabs, .pills { - margin: 0 0 20px; - padding: 0; - list-style: none; - zoom: 1; -} -.tabs:before, -.pills:before, -.tabs:after, -.pills:after { - display: table; - content: ""; - zoom: 1; - display: inline; -} -.tabs:after, .pills:after { - clear: both; -} -.tabs > li, .pills > li { - float: left; -} -.tabs > li > a, .pills > li > a { - display: block; -} -.tabs { - float: left; - width: 100%; - border-bottom: 1px solid #ddd; -} -.tabs > li { - position: relative; - top: 1px; -} -.tabs > li > a { - padding: 0 15px; - margin-right: 2px; - line-height: 36px; - border: 1px solid transparent; - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} -.tabs > li > a:hover { - text-decoration: none; - background-color: #eee; - border-color: #eee #eee #ddd; -} -.tabs > li.active > a { - color: #808080; - background-color: #ffffff; - border: 1px solid #ddd; - border-bottom-color: transparent; -} -.tabs .menu-dropdown, .tabs .dropdown-menu { - top: 35px; - border-width: 1px; - -webkit-border-radius: 0 6px 6px 6px; - -moz-border-radius: 0 6px 6px 6px; - border-radius: 0 6px 6px 6px; -} -.tabs a.menu:after, .tabs .dropdown-toggle:after { - border-top-color: #999; - margin-top: 15px; - margin-left: 5px; -} -.tabs li.open.menu .menu, .tabs .open.dropdown .dropdown-toggle { - border-color: #999; -} -.tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after { - border-top-color: #555; -} -.tab-content { - clear: both; -} -.pills a { - margin: 5px 3px 5px 0; - padding: 0 15px; - text-shadow: 0 1px 1px #ffffff; - line-height: 30px; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} -.pills a:hover { - background: #00438a; - color: #ffffff; - text-decoration: none; - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); -} -.pills .active a { - background: #0069d6; - color: #ffffff; - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); -} -.tab-content > *, .pill-content > * { - display: none; -} -.tab-content > .active, .pill-content > .active { - display: block; -} - -.hero-unit { - background-color: #f5f5f5; - margin-bottom: 30px; - padding: 60px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} -.hero-unit h1 { - margin-bottom: 0; - font-size: 60px; - line-height: 1; - letter-spacing: -1px; -} -.hero-unit p { - font-size: 18px; - font-weight: 200; - line-height: 27px; -} footer { margin-top: 17px; padding-top: 17px; @@ -3410,13 +2480,10 @@ table.lp_build td.tree { #logo { /* height:85px; */ padding-top: 4px; - overflow:hidden; - margin-left:4%; + overflow:hidden; float:left; } - - div.system_announcement { background-color: #EEEEEE; } diff --git a/main/css/base_chamilo.css b/main/css/base_chamilo.css index 6f24cbd30e..c83a332bbb 100755 --- a/main/css/base_chamilo.css +++ b/main/css/base_chamilo.css @@ -38,14 +38,11 @@ body { /* End hide from IE5-mac */ #main { - position: relative; /* to avoid the IE peekabo bug*/ - margin: 0px auto; - width: 92%; + } #submain { - border: 1px solid #ccc; - + border: 1px solid #ccc; position: relative; /* to avoid the IE peekabo bug*/ margin: 0px auto; min-height: 320px; @@ -289,24 +286,20 @@ input.link_alike:hover { * HEADER STYLES * *****************************************************/ #header { - width: 100%; - padding: 0; - margin: 0; + } /******************************************************** * HEADER 1: Title, portal, organisation, course title * ********************************************************/ #header1 { padding:0px; - font-size:12px; - font-family:Tahoma, Geneva, sans-serif; + font-size:12px; color:#666666; height:53px; background-repeat:repeat-x; } #header1 a { - font-size:12px; - font-family:Tahoma, Geneva, sans-serif; + font-size:12px; font-weight:normal; color: #666666; text-decoration: none; @@ -333,59 +326,13 @@ input.link_alike:hover { * HEADER 2: Users online, help, student/teacher view * ********************************************************/ #header2 { - width:92%; - margin-left:auto; - margin-right:auto; - position: relative; /* to avoid the IE peekabo bug*/ - font-size: 1.0em; - font-weight: normal; - min-height: 18px; - padding: 0.2em 0.5em; - padding-bottom: 0.2em; - color: #666; + float:right; } #header2 a { - color: #666; - text-decoration: none; - font-weight:normal; } #header2 a:hover { text-decoration: underline; } -/* Header2Right: online users, student/teacher view, help */ -#Header2Right ul { - position: relative; /* to avoid the IE peekabo bug*/ - float: right; - width: 50%; - margin: 0; - padding: 0; - list-style-type: none; - text-align: right; -} -#Header2Right ul li { - display: inline; - font-family:Tahoma, Geneva, sans-serif; - font-size:12px; - font-style:normal; - color:#666666; -} -#Header2Right ul li a { - padding: 4px 6px 4px 4px; - font-family:Tahoma, Geneva, sans-serif; - font-size:12px; - font-style:normal; - color:#666666; -} - -/* HEADER 3: TABS OF THE HEADER */ - -#header3 { - -} - -#header3 li { - //float:left; /* important for ieX*/ -} #current { color:#FFFFFF; @@ -402,25 +349,6 @@ input.link_alike:hover { #header3 .banner_links { margin: 0; } -#header3 input.logout { - /* makes an input appear like a link in this header */ - margin: 0 0 0 0; - padding: 0 30px 0 0; - background-color: transparent; - border: none; - color: #fff; - font-size: 1.0em; - font-weight:bold; - font-family: verdana, arial, helvetica, sans-serif; - display: inline; - PADDING-RIGHT: 0px; - PADDING-TOP: 3px; - -moz-border-radius-bottomleft:5px; - -moz-border-radius-bottomright:5px; - -moz-border-radius-topleft:5px; - -moz-border-radius-topright:5px; - border:1px solid #E1E1E0; -} #header3 input:hover { color: #999; -moz-border-radius-bottomleft:5px; @@ -429,26 +357,6 @@ input.link_alike:hover { -moz-border-radius-topright:5px; border:1px solid #E1E1E0; } -#header3 input { - PADDING-RIGHT: 15px; - DISPLAY: block; - PADDING-LEFT: 6px; - -moz-border-radius-bottomleft:5px; - -moz-border-radius-bottomright:5px; - -moz-border-radius-topleft:5px; - -moz-border-radius-topright:5px; - border:1px solid #E1E1E0; -} - -#logout { - margin-bottom:0px; - padding-bottom:0px; - display: inline; - float: right; - width: auto; - text-align: right; - height:25px; -} /***************************************************** * HEADER 4: @@ -495,9 +403,7 @@ input.link_alike:hover { } /* -============================================================================== NAVIGATION MENU -============================================================================== */ #menu-wrapper { display: block; @@ -516,10 +422,6 @@ input.link_alike:hover { padding-bottom: 20px; } -#menu { - -} - .menucaption { font-size: 12px; font-weight: bold; @@ -540,10 +442,8 @@ input.link_alike:hover { } .menulist { margin: 0 20px; - list-style: none; - + list-style: none; padding: 0; - list-style-image:none; list-style-position:outside; list-style-type:none; @@ -593,9 +493,7 @@ input.link_alike:hover { } /* ------------------------------------------------------------------------------- course navigation menu as a definition list ------------------------------------------------------------------------------- */ #swap_menu_link { float: left; @@ -2441,13 +2339,8 @@ span.form_required { margin-left: auto; margin-right: auto; margin-top: 0; - padding-bottom: 0; - padding-left: 10px; - padding-right: 10px; - padding-top: 10px; + padding-bottom: 0; position: relative; - width: 92%; - min-width: 760px; } /* Scroll effect */ @@ -2469,7 +2362,6 @@ span.form_required { .subnav { width:100%; height: 36px; - -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -2490,7 +2382,7 @@ span.form_required { } .subnav .nav { - margin-bottom: 0; + margin-bottom: 0; } .subnav .nav > li > a { @@ -2534,149 +2426,25 @@ span.form_required { -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px; } - -.nav-tabs > li, .nav-pills > li { - float: left; -} - -li { - line-height: 18px; -} - -.nav { - list-style-image: none; - list-style-position: outside; - list-style-type: none; -} - -.nav-tabs:before, .nav-pills:before, .nav-tabs:after, .nav-pills:after { - content: ""; - display: table; -} -.nav-pills:after { - clear: both; -} -.nav-pills > li { - float: left; -} -.nav-pills > li > a { - line-height: 14px; - margin-right: 2px; - padding-left: 12px; - padding-right: 12px; -} - .subnav .nav > li:first-child > a, .subnav .nav > li:first-child > a:hover { -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } -.nav-pills > li > a { - padding-top: 8px; - padding-bottom: 8px; - margin-top: 2px; - margin-bottom: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} -.nav > li > a:hover { +.subnav .nav > li > a:hover { text-decoration: none; /*background-color: #eeeeee; */ } -.nav { +/* logout fix*/ +.subnav .nav { display: block; float: left; margin: 0 10px 0 0; position: relative; left: 0; } -.nav > li { - display: block; - float: left; -} - -.nav a { - display: block; - float: none; - padding: 10px 10px 11px; - line-height: 19px; - text-decoration: none; -} -.nav a:hover { - color: #ffffff; - text-decoration: none; -} -.nav .active > a { - background-color: #222; - background-color: rgba(0, 0, 0, 0.5); -} -.nav.secondary-nav { - float: right; - margin-left: 10px; - margin-right: 0; -} - -.nav.secondary-nav .menu-dropdown, -.nav.secondary-nav .dropdown-menu { - right: 0; - border: 0; -} -.nav a.menu:hover, -.nav li.open .menu, -.nav .dropdown-toggle:hover, -.nav .dropdown.open .dropdown-toggle { - background: #444; - background: rgba(255, 255, 255, 0.05); -} - -.nav .menu-dropdown, -.nav .dropdown-menu { - background-color: #333; -} -.nav .menu-dropdown a.menu, -.nav .dropdown-menu a.menu, -.nav .menu-dropdown .dropdown-toggle, -.nav .dropdown-menu .dropdown-toggle { - color: #ffffff; -} -.nav .menu-dropdown a.menu.open, -.nav .dropdown-menu a.menu.open, -.nav .menu-dropdown .dropdown-toggle.open, -.nav .dropdown-menu .dropdown-toggle.open { - background: #444; - background: rgba(255, 255, 255, 0.05); -} -.nav .menu-dropdown li a, -.nav .dropdown-menu li a { - color: #999; - text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); -} -.nav .menu-dropdown li a:hover, -.nav .dropdown-menu li a:hover { - background-color: #191919; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919)); - background-image: -moz-linear-gradient(top, #292929, #191919); - background-image: -ms-linear-gradient(top, #292929, #191919); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919)); - background-image: -webkit-linear-gradient(top, #292929, #191919); - background-image: -o-linear-gradient(top, #292929, #191919); - background-image: linear-gradient(top, #292929, #191919); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#292929', endColorstr='#191919', GradientType=0); - color: #ffffff; -} -.nav .menu-dropdown .active a, -.nav .dropdown-menu .active a { - color: #ffffff; -} -.nav .menu-dropdown .divider, -.nav .dropdown-menu .divider { - background-color: #222; - border-color: #444; -} /* New forum table */ diff --git a/main/css/chamilo/default.css b/main/css/chamilo/default.css index 0e6abf277b..2c53dec4c3 100644 --- a/main/css/chamilo/default.css +++ b/main/css/chamilo/default.css @@ -80,7 +80,6 @@ a:active { color: #fff; } - /***************************************************** * FOOTER STYLES * *****************************************************/ diff --git a/main/inc/lib/banner.lib.php b/main/inc/lib/banner.lib.php index ddf74c2243..4a88f47c94 100644 --- a/main/inc/lib/banner.lib.php +++ b/main/inc/lib/banner.lib.php @@ -2,6 +2,7 @@ /* For licensing terms, see /license.txt */ /** * Code + * @todo use globals or parameters or add this file in the template * @package chamilo.include */ @@ -113,34 +114,34 @@ function get_tabs() { function show_header_1($language_file, $nameTools, $theme) { global $noPHP_SELF; $_course = api_get_course_info(); - echo '
'; + $html = ''; $logo = api_get_path(SYS_CODE_PATH).'css/'.$theme.'/images/header-logo.png'; $site_name = api_get_setting('siteName'); if (file_exists($logo)) { $site_name = api_get_setting('Institution').' - '.$site_name; - echo ''; } else { - echo ''.$site_name.''; + $html .= ''.$site_name.''; $iurl = api_get_setting('InstitutionUrl'); $iname = api_get_setting('Institution'); if (!empty($iname)) { - echo '- '.$iname.''; + $html .= '- '.$iname.''; } // External link section a.k.a Department - Department URL if (isset($_course['extLink']) && $_course['extLink']['name'] != '') { - echo ' - '; + $html .= ' - '; if ($_course['extLink']['url'] != '') { - echo ''; - echo $_course['extLink']['name']; - echo ''; + $html .= ''; + $html .= $_course['extLink']['name']; + $html .= ''; } else { - echo $_course['extLink']['name']; + $html .= $_course['extLink']['name']; } } } @@ -148,35 +149,28 @@ function show_header_1($language_file, $nameTools, $theme) { /* Course title section */ if (!empty($_cid) and $_cid != -1 and isset($_course)) { //Put the name of the course in the header - echo '
'; - echo '
'; + $html .= '
'; + $html .= '
'; } elseif (isset($nameTools) && $language_file != 'course_home') { //Put the name of the user-tools in the header if (!isset($_user['user_id'])) { //echo '
'; } elseif (!$noPHP_SELF) { - echo ''; + $html .= ''; } else { - echo '
'.$nameTools.'
'; + $html .= '
'.$nameTools.'
'; } - } - - echo '
'; - api_plugin('header'); - echo '
'; - - echo '
'; + } + return $html; } function show_header_2() { + $_course = api_get_course_info(); $course_id = api_get_course_id(); $user_id = api_get_user_id(); - - echo '
'; - echo '
'; - - echo ''; - echo '
'; - echo '
'; + $html .= '
  • '; + $html .= 'A A A'; + $html .= '
    • '; + } + return $html; } function return_navigation_array() { diff --git a/main/inc/lib/main_api.lib.php b/main/inc/lib/main_api.lib.php index 9e13b32d07..8304eb3f3b 100644 --- a/main/inc/lib/main_api.lib.php +++ b/main/inc/lib/main_api.lib.php @@ -2295,7 +2295,7 @@ function api_display_tool_view_option() { } else { $output_string .= ''.get_lang('StudentView').''; } - echo $output_string; + return $output_string; } /** diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php index 11121b14b4..126751575a 100644 --- a/main/inc/lib/template.lib.php +++ b/main/inc/lib/template.lib.php @@ -248,15 +248,20 @@ class Template extends Smarty { $this->assign('style_print', $style_print); // Header 1 + + $header1 = show_header_1($language_file, $nameTools, $this->theme); + $this->assign('header1', $header1); + ob_start(); - show_header_1($language_file, $nameTools, $this->theme); - $header1 = ob_get_contents(); - ob_clean(); + echo '
    '; + api_plugin('header'); + echo '
    '; + ob_clean(); - $this->assign('header1', $header1); - } + $plugin_header = ob_get_contents(); + $this->assign('plugin_header', $plugin_header); + } - private function set_header_parameters() { $help = $this->help; $nameTools = $this->title; @@ -409,16 +414,11 @@ class Template extends Smarty { } $this->assign('bug_notification_link', $bug_notification_link); - - ob_start(); - show_header_2(); - $header2 = ob_get_contents(); - ob_clean(); + $header2 = show_header_2(); $header3 = show_header_3(); $header4 = show_header_4($interbreadcrumb, $language_file, $nameTools); - $this->assign('header2', $header2); $this->assign('header3', $header3); $this->assign('header4', $header4); diff --git a/main/template/default/layout/header.tpl b/main/template/default/layout/header.tpl index de07da0835..64ba2a68a5 100644 --- a/main/template/default/layout/header.tpl +++ b/main/template/default/layout/header.tpl @@ -2,7 +2,7 @@ {if $show_toolbar == 1}