fix tpl header and toolbar admin refs - BT#7683

remotes/angel/1.11.x
Alex Aragon 9 years ago
parent 804191e351
commit ac100744a2
  1. 80
      app/Resources/public/css/base.css
  2. 105
      app/Resources/public/css/themes/chamilo/default.css
  3. BIN
      main/img/icons/22/icon-chamilo.png
  4. 133
      main/img/icons/svg/icon-chamilo.svg
  5. 8
      main/inc/lib/template.lib.php
  6. 9
      main/template/default/layout/header.js.tpl
  7. 54
      main/template/default/layout/main_header.tpl
  8. 17
      main/template/default/layout/topbar.tpl
  9. 62
      plugin/tour/intro.js/introjs.min.css

@ -17,9 +17,6 @@ html,body {
padding: 0;
height: 100%;
}
header{
padding-top: 20px;
}
#page-wrap{
min-height: 100%;
margin-bottom: 0;
@ -221,43 +218,22 @@ a.thumbnail:hover{
padding-top: 10px;
margin-bottom: 20px;
}
ul#navigation {
/* notifications help and bug */
.notification-panel {
position: fixed;
margin: 0px;
padding: 0px;
top: 280px;
right: -10px;
list-style: none;
z-index:9999;
}
ul#navigation li {
width: 73px;
}
ul#navigation li a {
.notification-panel div a{
display: block;
margin-left: 1px;
width: 65px;
opacity: 0.6;
filter:progid:DXImageTransform.Microsoft.Alpha(opacity=60);
-webkit-box-shadow: 0px 4px 3px #000;
}
#touch-button.btn-touch{
background-color: #C2C2C2;
}
#touch-button.btn-touch:hover{
background-color: #E9E9F0;
opacity: 0.8;
filter:progid:DXImageTransform.Microsoft.Alpha(opacity=80);
}
#touch-button.btn-touch{
background-color: #EFEFEF;
-webkit-border-top-right-radius: 5px;
-webkit-border-bottom-right-radius: 5px;
-moz-border-radius-topright: 5px;
-moz-border-radius-bottomright: 5px;
border-top-right-radius: 5px;
border-bottom-right-radius: 5px;
}
ul#navigation .help a {
.notification-panel .help a {
background-color:#879DAA;
border:1px solid #FFFFFF;
display:block;
@ -266,7 +242,7 @@ ul#navigation .help a {
width:65px;
padding: 6px 0 8px 6px;
}
ul#navigation .report a {
.notification-panel .report a {
background-color:#8fd400;
border:1px solid #FFFFFF;
display:block;
@ -275,6 +251,33 @@ ul#navigation .report a {
width:65px;
padding: 6px 0 8px 6px;
}
.cookieUsageValidation {
padding: 5px;
text-align:center;
}
.toolbar-cookie{
bottom: 0;
position: fixed;
z-index: 100;
width: 100%;
}
/* notifications help and bug */
#touch-button.btn-touch{
background-color: #C2C2C2;
}
#touch-button.btn-touch:hover{
background-color: #E9E9F0;
}
#touch-button.btn-touch{
background-color: #EFEFEF;
-webkit-border-top-right-radius: 5px;
-webkit-border-bottom-right-radius: 5px;
-moz-border-radius-topright: 5px;
-moz-border-radius-bottomright: 5px;
border-top-right-radius: 5px;
border-bottom-right-radius: 5px;
}
#gradebook_list .centered {
text-align:center;
vertical-align:middle;
@ -3431,17 +3434,6 @@ i.size-32.icon-new-work{
}
/* display the cookie usage warning validation */
.cookieUsageValidation {
padding: 5px;
background-color: #333333;
color:#E0E0E0;
text-align:center;
}
.displayUnderToolbar
{
height: 52px;
}
#settings .panel .admin-edit-block {
display: none;
@ -3450,10 +3442,6 @@ i.size-32.icon-new-work{
display: block;
}
#settings .span6:nth-child(2n+1) {
clear:left
}
/***** Survey *****/
#list-survey p{
display: inline-block;

@ -29,18 +29,10 @@
font-weight: 700;
src: local('Open Sans Bold'), local('OpenSans-Bold'), url(fonts/OpenSans-Bold.woff2) format('woff2'), url(fonts/OpenSans-Bold.woff) format('woff');
}
html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
}
body {
margin: 0;
font-family: 'Open Sans', sans-serif;
line-height: 1.72222;
}
a {
color: #00829C;
text-decoration: none;
@ -58,35 +50,14 @@ a:focus {
-moz-border-radius: 0;
-webkit-border-radius: 0;
}
.navbar {
.navbar-collapse{
overflow: hidden !important;
}
.navbar-default {
background: #2E75A3;
-webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
}
.navbar-inverse{
background-image: -webkit-linear-gradient(#484e55, #3a3f44 60%, #313539);
background-image: -o-linear-gradient(#484e55, #3a3f44 60%, #313539);
background-image: -webkit-gradient(linear, left top, left bottom, from(#484e55), color-stop(60%, #3a3f44), to(#313539));
background-image: linear-gradient(#484e55, #3a3f44 60%, #313539);
background-repeat: no-repeat;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff484e55', endColorstr='#ff313539', GradientType=0);
-webkit-filter: none;
filter: none;
border: 1px solid rgba(0, 0, 0, 0.6);
text-shadow: none;
}
.nav li a{
padding: 10px 15px;
}
.navbar-nav li a{
font-weight: normal;
line-height: 22px;
padding-top: 12.5px;
padding-bottom: 12.5px;
}
.navbar-collapse{
overflow: hidden !important;
}
.navbar-default .navbar-nav > li > a:focus,
.navbar-default .navbar-nav > li > a:hover {
color: #A4DC2D;
@ -131,55 +102,25 @@ a:focus {
.nav > li > a:hover, .nav > li > a:focus{
background-color: transparent;
}
.navbar-inverse li a{
line-height: 30px;
background: none !important;
font-size: 12px;
font-weight: normal;
padding-top: 5px;
padding-right: 10px;
padding-left: 10px;
padding-bottom: 5px;
}
.navbar-fixed-top .navbar-collapse{
min-height:auto;
}
.navbar-inverse .navbar-brand{
padding: 10px;
font-size: 14px;
height: auto;
}
.navbar-form .form-control{
height: 25px;
padding: 6px;
}
.navbar-fixed-top{
min-height: 40px;
.navbar-default .navbar-brand {
color:white;
}
.navbar-fixed-top .dropdown-menu li a{
line-height: 20px;
.navbar-default .navbar-collapse, .navbar-default .navbar-form{
border-color: #00677C;
}
.navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus{
color: #ffffff;
.navbar-default .navbar-toggle{
border-color: #00677C;
}
.navbar-inverse li a:hover {
background-image: -webkit-linear-gradient(#020202, #101112 40%, #191b1d) !important;
background-image: -o-linear-gradient(#020202, #101112 40%, #191b1d) !important;
background-image: -webkit-gradient(linear, left top, left bottom, from(#020202), color-stop(40%, #101112), to(#191b1d)) !important;
background-image: linear-gradient(#020202, #101112 40%, #191b1d) !important;
background-repeat: no-repeat !important;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff020202', endColorstr='#ff191b1d', GradientType=0) !important;
-webkit-filter: none !important;
filter: none !important;
border-left-color: transparent !important;
}
.navbar-inverse .dropdown-menu li a:hover,
.navbar-inverse .dropdown-menu li a:focus{
background:#3C4147 !important;
color: #fff;
.navbar-default .navbar-toggle .icon-bar{
background-color: #ffffff;
}
.navbar-default .navbar-toggle:focus, .navbar-default .navbar-toggle:hover{
background-color: #00677C;
}
.badge-warning{
background-color: #FD6600;
}
@ -220,22 +161,6 @@ footer{
footer a{
color: #ffffff;
}
.navbar-default .navbar-brand {
color:white;
}
.navbar-default .navbar-collapse, .navbar-default .navbar-form{
border-color: #00677C;
}
.navbar-default .navbar-toggle{
border-color: #00677C;
}
.navbar-default .navbar-toggle .icon-bar{
background-color: #ffffff;
}
.navbar-default .navbar-toggle:focus, .navbar-default .navbar-toggle:hover{
background-color: #00677C;
}
.page-header{
margin: 10px 0 10px;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 544 B

@ -0,0 +1,133 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="128"
height="128"
viewBox="0 0 128 128"
id="svg5350"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="icon-chamilo.svg">
<defs
id="defs5352" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.2298387"
inkscape:cx="-34.733336"
inkscape:cy="21.255317"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
inkscape:window-width="1325"
inkscape:window-height="747"
inkscape:window-x="41"
inkscape:window-y="21"
inkscape:window-maximized="1" />
<metadata
id="metadata5355">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Capa 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-924.36216)">
<g
transform="matrix(5.8181818,0,0,5.8181818,-1494.0532,503.26784)"
id="g5317"
inkscape:export-filename="/var/www/chamilo11/main/img/icons/22/icon-chamilo.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<rect
y="72.463745"
x="256.68115"
height="22"
width="22"
id="rect5271"
style="opacity:0;fill:#e6e6e6;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<g
style="fill:#ffffff"
transform="matrix(0.29854428,0,0,0.29854428,156.15111,63.156854)"
id="g5260">
<path
inkscape:connector-curvature="0"
id="path5211"
d="m 403.13306,76.03732 c 0,0 0.49099,-0.247707 0.64215,-1.09779 2.4e-4,-0.05003 6.9e-4,-0.100102 6.9e-4,-0.15015 l 7e-4,-0.15015 c -0.045,-0.801055 -0.82386,-1.756075 -1.70067,-2.711613 -1.02325,-1.056392 -1.9023,-1.561478 -1.9023,-1.561478 0,0 -0.43032,-2.104388 -2.27693,-5.016965 -1.79762,-2.912325 -4.91682,-5.981664 -6.63542,-5.089678 -1.71859,0.89199 -0.21283,3.40238 -0.11861,4.153636 0.14294,0.801566 0.87108,2.106677 0.62622,2.105406 -0.2936,-0.0516 -3.98009,-7.22807 -13.29525,-5.27446 -2.40251,0.538072 -4.46468,1.578433 -6.13654,2.92112 l -0.0832,16.716688 c 0.59068,-0.597543 0.83705,-0.896568 0.83705,-0.896568 0,0 0.62174,3.006304 1.7904,4.363767 1.16868,1.357458 2.58497,2.165647 3.03072,1.166936 0.4455,-0.948656 -0.90538,-5.059882 -0.90538,-5.059882 0,0 2.53425,2.515739 3.26588,3.12016 0.73163,0.604418 2.14817,1.362552 2.54669,0.01324 0.34954,-1.349565 -0.66872,-3.406965 -1.49955,-3.761646 -0.78185,-0.354425 -1.2716,-0.356966 -1.2716,-0.356966 0,0 -0.48651,-0.653194 -0.73039,-0.854669 -0.29285,-0.201738 -0.34183,-0.201983 -0.34183,-0.201983 0,0 0.44202,-0.247962 1.81306,-0.190777 1.42003,0.05743 2.5462,0.11334 2.5462,0.11334 0,0 1.26388,1.908518 2.04449,2.513194 0.73139,0.654466 2.63369,2.215947 3.3161,2.870157 0.63343,0.653972 1.02373,0.956298 1.27135,0.407028 0.19863,-0.549533 -0.13697,-2.002767 -1.01329,-3.0584 -0.92554,-1.005841 -1.9023,-1.561479 -2.24263,-2.06376 -0.29086,-0.602125 -0.48452,-1.0536 -0.48452,-1.0536 0,0 1.80535,1.360774 2.24388,1.813516 0.48776,0.402946 3.70988,2.471799 4.24686,2.82495 0.53674,0.403202 0.78285,0.154228 0.78285,0.154228 0,0 0.39031,0.302329 0.53822,0.102899 0.14792,-0.199438 0.54645,-1.548744 -0.47804,-2.354892 -1.07321,-0.856458 -1.70789,-1.260168 -1.60945,-1.359759 0.0494,-0.09985 1.12518,0.256108 1.2736,-0.04345 0.0992,-0.249741 -0.0457,-0.650905 -0.19216,-0.751767 -0.0972,-0.150657 0.29608,-0.448919 0.29608,-0.448919 0,0 0.39181,0.0021 2.00722,0.160588 1.61542,0.15855 5.68731,-1.221708 6.52136,-1.517681 0.83408,-0.295977 1.27584,-0.493881 1.27584,-0.493881 l 0,0 z m -30.96118,21.361053 c 3.39046,-2.234673 3.56577,-7.939607 1.71021,-9.050381 -0.53698,-0.353154 -1.07446,-0.606203 -1.66141,-0.759409 l -0.0129,2.602603 c 0.14643,0.100858 0.29261,0.251771 0.38931,0.502534 0.29086,0.602124 0.14021,1.352113 0.14021,1.352113 0,0 -0.0442,-0.951204 -0.38459,-1.453486 -0.0487,-0.05029 -0.0974,-0.10061 -0.14618,-0.150913 l -0.0346,6.956939 z m 0.16532,-33.233179 c -0.73736,0.546736 -1.37727,1.19407 -1.9682,1.841668 L 370.2866,82.5734 c 0.49124,-0.297751 0.93351,-0.595757 1.3273,-0.994125 0.24612,-0.248978 0.44327,-0.498204 0.64016,-0.697389 l 0.0832,-16.716692 0,0 z m -2.12855,34.073847 c 0.73538,-0.146331 1.42251,-0.443063 1.96323,-0.840668 l 0.0346,-6.956939 C 371.91463,90.039503 371.671,89.78798 371.671,89.78798 c 0,0 0.24438,0.10137 0.53673,0.403202 l 0.0129,-2.602602 c -0.63568,-0.203509 -1.32083,-0.307171 -1.95825,-0.160329 l -0.0217,4.354344 0,0 c 0.14742,-0.09934 0.39254,-0.148109 0.29285,0.20173 -0.05,0.199942 -0.1969,0.199179 -0.29484,0.198668 l 0,0 -0.0127,2.552547 c 0.0979,7.1e-4 0.24488,0.0011 0.34307,-0.04825 0,0 -0.0985,0.09959 -0.34382,0.198412 l -0.0167,3.35335 z M 370.369,66.006862 c -3.44666,3.685873 -4.98704,8.132429 -5.33485,9.13164 -0.54643,1.548744 -4.05153,7.136264 -4.36181,10.438037 -0.26156,3.352073 -0.35112,11.509971 7.08757,12.649774 0.8808,0.154728 1.71337,0.159058 2.44874,0.01274 l 0.0167,-3.353351 c -0.68664,0.196634 -2.20585,0.388945 -3.91002,-1.621971 -2.28837,-2.714665 -1.14003,-7.113207 0.6795,-8.605281 1.18038,-0.994892 2.30954,-1.539576 3.29177,-2.085038 l 0.0824,-16.566541 0,0 z m -0.10657,21.421389 -0.0217,4.354344 c -0.14743,0.09933 -0.24537,0.09882 -0.34259,-0.05185 -0.0994,0.299796 0.0957,0.450953 0.3406,0.452227 l -0.0127,2.552552 c -1.56794,0.141997 -3.71586,-1.270606 -3.16618,-3.469996 0.64912,-2.499196 1.82999,-3.594176 3.20253,-3.837297 z"
style="fill:#ffffff;fill-opacity:1;stroke:none" />
<g
id="g5213"
transform="matrix(0.23443739,0.00121897,-0.00119185,0.23958417,306.12344,-66.967199)"
inkscape:transform-center-y="-65.497173"
style="fill:#ffffff;fill-opacity:1">
<path
style="fill:#ffffff;fill-opacity:1;stroke:none"
d="m 317.497,435.66599 13.283,-0.49733 c 7.12992,-0.26696 16.9201,4.73977 16.36027,13.87359 l -3.48135,56.79988 c -0.43649,7.12156 -3.50599,10.88958 -9.1489,10.88958 l -17.51036,0 c -7.13493,0 -10.13574,-4.51857 -10.6409,-11.63558 l -3.97869,-56.05388 c -0.50516,-7.11701 4.99786,-12.99738 15.11693,-13.37626 z"
id="path5215"
inkscape:connector-curvature="0"
sodipodi:nodetypes="sssssssss" />
</g>
<g
inkscape:transform-center-y="-53.403829"
transform="matrix(0.19126402,-0.15841187,0.1550096,0.19546362,227.02322,12.309117)"
id="g5217"
inkscape:transform-center-x="43.829697"
style="fill:#ffffff;fill-opacity:0.70301753">
<path
sodipodi:nodetypes="sssssssss"
inkscape:connector-curvature="0"
id="path5219"
d="m 317.497,435.66599 13.283,-0.49733 c 7.12992,-0.26696 16.9201,4.73977 16.36027,13.87359 l -3.48135,56.79988 c -0.43649,7.12156 -3.50599,10.88958 -9.1489,10.88958 l -17.51036,0 c -7.13493,0 -10.13574,-4.51857 -10.6409,-11.63558 l -3.97869,-56.05388 c -0.50516,-7.11701 4.99786,-12.99738 15.11693,-13.37626 z"
style="fill:#ffffff;fill-opacity:1;stroke:none" />
</g>
<g
inkscape:transform-center-x="63.28487"
id="g5222"
transform="matrix(0.04913467,-0.23215378,0.22716682,0.05021428,228.90202,123.11317)"
inkscape:transform-center-y="-14.415814"
style="fill:#ffffff;fill-opacity:1">
<path
style="fill:#ffffff;fill-opacity:1;stroke:none"
d="m 317.497,435.66599 13.283,-0.49733 c 7.12992,-0.26696 16.9201,4.73977 16.36027,13.87359 l -3.48135,56.79988 c -0.43649,7.12156 -3.50599,10.88958 -9.1489,10.88958 l -17.51036,0 c -7.13493,0 -10.13574,-4.51857 -10.6409,-11.63558 l -3.97869,-56.05388 c -0.50516,-7.11701 4.99786,-12.99738 15.11693,-13.37626 z"
id="path5224"
inkscape:connector-curvature="0"
sodipodi:nodetypes="sssssssss" />
</g>
<g
inkscape:transform-center-y="24.205256"
transform="matrix(-0.08438242,-0.16656022,0.16298181,-0.08623427,301.10084,184.33833)"
id="g5226"
inkscape:transform-center-x="45.418014"
style="fill:#ffffff;fill-opacity:1">
<path
sodipodi:nodetypes="sssssssss"
inkscape:connector-curvature="0"
id="path5228"
d="m 317.497,435.66599 13.283,-0.49733 c 7.12992,-0.26696 16.9201,4.73977 16.36027,13.87359 l -3.48135,56.79988 c -0.43649,7.12156 -3.50599,10.88958 -9.1489,10.88958 l -17.51036,0 c -7.13493,0 -10.13574,-4.51857 -10.6409,-11.63558 l -3.97869,-56.05388 c -0.50516,-7.11701 4.99786,-12.99738 15.11693,-13.37626 z"
style="fill:#ffffff;fill-opacity:1;stroke:none" />
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 9.4 KiB

@ -883,17 +883,17 @@ class Template
$this->setHelp();
//@todo move this in the template
$bug_notification_link = '';
$bugLink = '';
$iconBug = Display::return_icon('bug.png', get_lang('ReportABug'), null, ICON_SIZE_LARGE);
if (api_get_setting('show_link_bug_notification') == 'true' && $this->user_is_logged_in) {
$bug_notification_link = '<li class="report">
$bugLink = '<div class="report">
<a href="http://support.chamilo.org/projects/chamilo-18/wiki/How_to_report_bugs" target="_blank">
'. $iconBug . '
</a>
</li>';
</div>';
}
$this->assign('bug_notification_link', $bug_notification_link);
$this->assign('bug_notification', $bugLink);
$notification = return_notification_menu();
$this->assign('notification_menu', $notification);

@ -77,15 +77,12 @@ $(document).ready(function(){
$("#closed-view-list").click(function(){
$("#student-list-work").fadeOut(300);
});
check_brand();
//if exists the toolbar admin
if($('#toolbar-admin').length){
/* if($('#toolbar-admin').length){
var heigthToolBar= $('#toolbar-admin').height();
$('header').css('margin-top', heigthToolBar+'px');
$('#page-back').css('padding-top', heigthToolBar+20+'px');
}
} */
// Removes the yellow input in Chrome
if (navigator.userAgent.toLowerCase().indexOf("chrome") >= 0) {
@ -171,7 +168,7 @@ $(document).ready(function(){
'marginLeft':'50px'
},1000);
$('#navigation > li').hover(
$('#navigation div').hover(
function () {
$('a',$(this)).stop().animate({
'marginLeft':'1px'

@ -13,10 +13,7 @@
<!-- Display the Chamilo Uses Cookies Warning Validation if needed -->
{% if displayCookieUsageWarning == true %}
<!-- If toolbar is displayed, we have to display this block bellow it -->
{% if toolBarDisplayed == true %}
<div class="displayUnderToolbar" >&nbsp;</div>
{% endif %}
<div class="toolbar-cookie alert-warning">
<form onSubmit="$(this).toggle('slow')" action="" method="post">
<input value=1 type="hidden" name="acceptCookies"/>
<div class="cookieUsageValidation">
@ -32,29 +29,19 @@
</span>
</div>
</form>
</div>
{% endif %}
{% if show_header == true %}
<div id="page-wrap"><!-- page section -->
{# Bug and help notifications #}
{% block help_notifications %}
<ul id="navigation" class="notification-panel">
<div id="navigation" class="notification-panel">
{{ help_content }}
{{ bug_notification_link }}
</ul>
{% endblock %}
{# topbar #}
{{ bug_notification }}
</div>
{% block topbar %}
{% include template ~ "/layout/topbar.tpl" %}
{% if show_toolbar == 1 %}
<div class="clear-header"></div>
{% endif %}
{% endblock %}
<div class="extra-header">{{ header_extra_content }}</div>
<header>
<div class="extra-header">{{ header_extra_content }}</div>
<section id="main" class="container">
{% if plugin_header_main %}
<div class="row">
@ -100,23 +87,22 @@
</div>
</div>
</section>
<section id="menu-bar">
{# menu #}
{% block menu %}
{% include template ~ "/layout/menu.tpl" %}
{% endblock %}
</section>
<section id="breadcrumb-bar">
<div class="container">
{# breadcrumb #}
{% block breadcrumb %}
{{ breadcrumb }}
{% endblock %}
</div>
</section>
</header>
<section id="menu-bar">
{# menu #}
{% block menu %}
{% include template ~ "/layout/menu.tpl" %}
{% endblock %}
</section>
<section id="breadcrumb-bar">
<div class="container">
{# breadcrumb #}
{% block breadcrumb %}
{{ breadcrumb }}
{% endblock %}
</div>
</section>
<div id="top_main_content" class="container">
<div class="row">
{# course navigation links/shortcuts need to be activated by the admin #}
{% include template ~ "/layout/course_navigation.tpl" %}
{% endif %}

@ -1,8 +1,7 @@
<!-- Topbar -->
{% if show_toolbar == 1 %}
<nav id="toolbar-admin" class="navbar navbar-inverse navbar-fixed-top">
<nav id="toolbar-admin" class="navbar navbar-inverse">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#toolbar">
<span class="sr-only">Toggle navigation</span>
@ -11,23 +10,13 @@
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{{ _p.web }}">
{{ "siteName" | get_setting }}
<img src="{{ "icon-chamilo.png"|icon(22) }}" title="{{ "siteName" | get_setting }}">
</a>
</div>
{% if _u.logged %}
<div class="collapse navbar-collapse" id="toolbar">
<ul class="nav navbar-nav">
<li class="active"><a href="{{ _p.web }}user_portal.php"> {{ "MyCourses"|get_lang }}</a></li>
{#
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">{{'Teaching'|get_lang }}<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="{{ _p.web_main }}create_course/add_course.php">{{ "AddCourse"|get_lang }}</a></li>
<li><a href="{{ _p.web_main }}auth/courses.php">{{ "Catalog"|get_lang }}</a></li>
</ul>
</li>
#}
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">{{'Tracking'|get_lang }}<b class="caret"></b></a>
<ul class="dropdown-menu">
@ -80,8 +69,6 @@
<li><a href="{{ _p.web_main }}calendar/agenda_js.php?type=personal">{{ "MyAgenda"|get_lang }}</a></li>
<li><a href="{{ _p.web_main }}messages/inbox.php">{{ "Inbox"|get_lang }}</a></li>
<li><a href="{{ _p.web_main }}auth/my_progress.php">{{ "MyReporting"|get_lang }}</a></li>
<!--<li class="divider"></li>
<li><a href="{{ _p.web_main }}social/invitations.php">{{ "PendingInvitations"|get_lang }}</a></li> -->
</ul>
</li>
<li><a href="{{ _p.web }}index.php?logout=logout&uid={{_u.user_id}}">{{ "Logout"|get_lang }}</a></li>

@ -236,70 +236,14 @@
left: 50%;
top: 50%
}
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 900;
src: url('../fonts/lato-black.eot');
src: url('../fonts/lato-black.eot?#iefix') format('embedded-opentype'), url('../fonts/lato/lato-black.woff') format('woff'), url('../fonts/lato/lato-black.ttf') format('truetype'), url('../fonts/lato/lato-black.svg#latoblack') format('svg');
}
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: bold;
src: url('../fonts/lato-bold.eot');
src: url('../fonts/lato-bold.eot?#iefix') format('embedded-opentype'), url('../fonts/lato/lato-bold.woff') format('woff'), url('../fonts/lato/lato-bold.ttf') format('truetype'), url('../fonts/lato/lato-bold.svg#latobold') format('svg');
}
@font-face {
font-family: 'Lato';
font-style: italic;
font-weight: bold;
src: url('../fonts/lato-bolditalic.eot');
src: url('../fonts/lato-bolditalic.eot?#iefix') format('embedded-opentype'), url('../fonts/lato/lato-bolditalic.woff') format('woff'), url('../fonts/lato/lato-bolditalic.ttf') format('truetype'), url('../fonts/lato/lato-bolditalic.svg#latobold-italic') format('svg');
}
@font-face {
font-family: 'Lato';
font-style: italic;
font-weight: normal;
src: url('../fonts/lato-italic.eot');
src: url('../fonts/lato-italic.eot?#iefix') format('embedded-opentype'), url('../fonts/lato/lato-italic.woff') format('woff'), url('../fonts/lato/lato-italic.ttf') format('truetype'), url('../fonts/lato/lato-italic.svg#latoitalic') format('svg');
}
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 300;
src: url('../fonts/lato-light.eot');
src: url('../fonts/lato-light.eot?#iefix') format('embedded-opentype'), url('../fonts/lato/lato-light.woff') format('woff'), url('../fonts/lato/lato-light.ttf') format('truetype'), url('../fonts/lato/lato-light.svg#latolight') format('svg');
}
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: normal;
src: url('../fonts/lato-regular.eot');
src: url('../fonts/lato-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/lato/lato-regular.woff') format('woff'), url('../fonts/lato/lato-regular.ttf') format('truetype'), url('../fonts/lato/lato-regular.svg#latoregular') format('svg');
}
.tour-warning {
color: #fff;
font-weight: 400;
background-color: #E95D4E;
border: none;
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
font-size: 18px;
font-size: 14px;
line-height: 1.72222;
padding-left: 1em;
padding-right: 1em;
border-bottom: 2px solid #C0392B;
border-right: 2px solid #C0392B;
font-family: "Lato",Helvetica,Arial,sans-serif;
}
.tour-warning img{
padding-right: .5em;
@ -312,15 +256,11 @@
.open > .dropdown-toggle.btn-warning {
color: #fff;
background-color: #EC7063;
border-bottom: 2px solid #C0392B;
border-right: 2px solid #C0392B;
}
.tour-warning:active,
.tour-warning.active,
.open > .dropdown-toggle.tour-warning {
background: #EC7063;
border-bottom: 2px solid #C0392B;
border-right: 2px solid #C0392B;
}
.tour-warning.disabled,
.tour-warning[disabled],

Loading…
Cancel
Save