chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #1489

Browse Source 
Group breadcrumb with View As Student link

Minor - Format code

Fix and improve page header and nav layout

Fix menubar alignment
remotes/angel/1.11.x
Angel Fernando Quiroz Campos 8 years ago
parent 46196b6d61
commit 6c3ab1a15e
8 changed files with 114 additions and 95 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 20
      app/Resources/public/css/base.css
  2. 4
      main/inc/lib/banner.lib.php
  3. 2
      main/template/default/layout/layout_1_col.tpl
  4. 2
      main/template/default/layout/layout_2_col.tpl
  5. 99
      main/template/default/layout/menu.tpl
  6. 4
      main/template/default/layout/page.tpl
  7. 74
      main/template/default/layout/page_header.tpl
  8. 4
      main/template/default/layout/show_header.tpl

20
app/Resources/public/css/base.css
Unescape View File

@ -6429,3 +6429,23 @@ input.form-control[type="color"] {
padding: 2px; padding: 2px;
} }
/* Extra small devices (phones, less than 768px) */
/* No media query since this is the default in Bootstrap */
/* Small devices (tablets, 768px and up) */
@media (min-width: 768px) {
}
/* Medium devices (desktops, 992px and up) */
@media (min-width: 992px) {
div.navbar-collapse {
padding-left: 0;
}
}
/* Large devices (large desktops, 1200px and up) */
@media (min-width: 1200px) {
}

4
main/inc/lib/banner.lib.php
Unescape View File

@ -702,9 +702,8 @@ function return_breadcrumb($interbreadcrumb, $language_file, $nameTools)
} }
// View as student/teacher link // View as student/teacher link
$view = null;
if (!empty($view_as_student_link)) { if (!empty($view_as_student_link)) {
$view .= Display::tag('div', $view_as_student_link, array('id' => 'view_as_link','class' => 'pull-right')); $html .= Display::tag('div', $view_as_student_link, array('id' => 'view_as_link','class' => 'pull-right'));
} }
if (!empty($navigation_right)) { if (!empty($navigation_right)) {
@ -715,7 +714,6 @@ function return_breadcrumb($interbreadcrumb, $language_file, $nameTools)
} }
if (!empty($lis)) { if (!empty($lis)) {
$html .= $view;
$html .= Display::tag('ul', $lis, array('class'=>'breadcrumb')); $html .= Display::tag('ul', $lis, array('class'=>'breadcrumb'));
} }

2
main/template/default/layout/layout_1_col.tpl
Unescape View File

@ -1,6 +1,7 @@
{% extends template ~ "/layout/page.tpl" %} {% extends template ~ "/layout/page.tpl" %}
{% block body %} {% block body %}
<div class="row">
{% if plugin_main_top %} {% if plugin_main_top %}
<div id="plugin_main_top" class="col-md-12"> <div id="plugin_main_top" class="col-md-12">
{{ plugin_main_top }} {{ plugin_main_top }}
@ -35,4 +36,5 @@
{{ plugin_main_bottom }} {{ plugin_main_bottom }}
</div> </div>
{% endif %} {% endif %}
</div>
{% endblock %} {% endblock %}

2
main/template/default/layout/layout_2_col.tpl
Unescape View File

@ -1,6 +1,7 @@
{% extends template ~ "/layout/page.tpl" %} {% extends template ~ "/layout/page.tpl" %}
{% block body %} {% block body %}
<div class="row">
{% if plugin_main_top %} {% if plugin_main_top %}
<div id="plugin_main_top" class="col-md-12"> <div id="plugin_main_top" class="col-md-12">
{{ plugin_main_top }} {{ plugin_main_top }}
@ -93,4 +94,5 @@
{{ plugin_main_bottom }} {{ plugin_main_bottom }}
</div> </div>
{% endif %} {% endif %}
</div>
{% endblock %} {% endblock %}

99
main/template/default/layout/menu.tpl
Unescape View File

@ -2,7 +2,8 @@
<div class="container"> <div class="container">
<!-- Brand and toggle get grouped for better mobile display --> <!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#menuone" aria-expanded="false"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#menuone"
aria-expanded="false">
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
@ -18,59 +19,57 @@
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
{% if _u.logged == 1 %} {% if _u.logged == 1 %}
<script> <script>
$(document).ready(function() { $(document).ready(function () {
$.ajax({ $("#count_message")
type: "GET", .load('{{ _p.web_main }}inc/ajax/message.ajax.php?a=get_count_message', function () {
url: "{{ _p.web_main }}inc/ajax/message.ajax.php?a=get_count_message", $("#count_message_li").removeClass('hidden');
success: function(data) { });
if (data != '') {
$("#count_message_li").show();
$("#count_message").html(data);
}
}
}); });
}); </script>
</script> <ul class="nav navbar-nav navbar-right">
<ul class="nav navbar-nav navbar-right"> <li id="count_message_li" class="hidden">
<li id="count_message_li" style="display: none"> <a href="{{ message_url }}">
<a href="{{ message_url }}"> <span id="count_message"></span>
<span id="count_message"></span> </a>
</a> </li>
</li> {% if _u.status != 6 %}
{% if _u.status != 6 %} <li class="dropdown avatar-user">
<li class="dropdown avatar-user"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"> aria-expanded="false">
<img class="img-circle" src="{{ _u.avatar_small }}" alt="{{ _u.complete_name }}" /> <span class="caret"></span> <img class="img-circle" src="{{ _u.avatar_small }}" alt="{{ _u.complete_name }}"/> <span
</a> class="caret"></span>
<ul class="dropdown-menu" role="menu">
<li class="user-header">
<div class="text-center">
<img class="img-circle" src="{{ _u.avatar_medium }}" alt="{{ _u.complete_name }}" />
<p class="name"><a href="{{ profile_url }}">{{ _u.complete_name }}</a></p>
<p><i class="fa fa-envelope-o" aria-hidden="true"></i> {{ _u.email }}</p>
</div>
</li>
<li role="separator" class="divider"></li>
<li class="user-body">
<a title="{{ "Inbox"|get_lang }}" href="{{ message_url }}">
<em class="fa fa-envelope" aria-hidden="true"></em> {{ "Inbox"|get_lang }}
</a>
{% if certificate_url %}
<a title="{{ "MyCertificates"|get_lang }}" href="{{ certificate_url }}">
<em class="fa fa-graduation-cap" aria-hidden="true"></em> {{ "MyCertificates"|get_lang }}
</a> </a>
{% endif %} <ul class="dropdown-menu" role="menu">
<li class="user-header">
<div class="text-center">
<img class="img-circle" src="{{ _u.avatar_medium }}"
alt="{{ _u.complete_name }}"/>
<p class="name"><a href="{{ profile_url }}">{{ _u.complete_name }}</a></p>
<p><i class="fa fa-envelope-o" aria-hidden="true"></i> {{ _u.email }}</p>
</div>
</li>
<li role="separator" class="divider"></li>
<li class="user-body">
<a title="{{ "Inbox"|get_lang }}" href="{{ message_url }}">
<em class="fa fa-envelope" aria-hidden="true"></em> {{ "Inbox"|get_lang }}
</a>
{% if certificate_url %}
<a title="{{ "MyCertificates"|get_lang }}" href="{{ certificate_url }}">
<em class="fa fa-graduation-cap"
aria-hidden="true"></em> {{ "MyCertificates"|get_lang }}
</a>
{% endif %}
<a id="logout_button" title="{{ "Logout"|get_lang }}" href="{{ logout_link }}" > <a id="logout_button" title="{{ "Logout"|get_lang }}" href="{{ logout_link }}">
<em class="fa fa-sign-out"></em> {{ "Logout"|get_lang }} <em class="fa fa-sign-out"></em> {{ "Logout"|get_lang }}
</a> </a>
</li>
</ul>
</li> </li>
</ul> {% endif %}
</li> </ul>
{% endif %}
</ul>
{% endif %} {% endif %}
</div> </div>
</div> </div>

4
main/template/default/layout/page.tpl
Unescape View File

@ -44,7 +44,9 @@
<section id="content-section"> <section id="content-section">
<div class="container"> <div class="container">
{% block breadcrumb %} {% block breadcrumb %}
{{ breadcrumb }} <div id="page-breadcrumb">
{{ breadcrumb }}
</div>
{% endblock %} {% endblock %}
{% block body %} {% block body %}

74
main/template/default/layout/page_header.tpl
Unescape View File

@ -7,58 +7,52 @@
{% endblock %} {% endblock %}
<div class="extra-header">{{ header_extra_content }}</div> <div class="extra-header">{{ header_extra_content }}</div>
<header id="header-section"> <header id="header-section">
<section>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<div class="logo"> <div class="logo">
{{ logo }} {{ logo }}
</div>
</div> </div>
</div>
<div class="col-md-9"> <div class="col-md-9">
<div class="col-sm-4"> <div class="row">
{% if plugin_header_left is not null %} <div class="col-sm-4">
<div id="plugin_header_left"> {% if plugin_header_left is not null %}
{{ plugin_header_left }} <div id="plugin_header_left">
</div> {{ plugin_header_left }}
{% endif %} </div>
</div> {% endif %}
<div class="col-sm-4">
{% if plugin_header_center is not null %}
<div id="plugin_header_center">
{{ plugin_header_center }}
</div> </div>
{% endif %} <div class="col-sm-4">
</div> {% if plugin_header_center is not null %}
<div class="col-sm-4"> <div id="plugin_header_center">
{% if plugin_header_right is not null %} {{ plugin_header_center }}
<div id="plugin_header_right"> </div>
{{ plugin_header_right }} {% endif %}
</div> </div>
{% endif %} <div class="col-sm-4">
<script> {% if plugin_header_right is not null %}
$(document).ready(function() { <div id="plugin_header_right">
$.ajax({ {{ plugin_header_right }}
type: "GET", </div>
url: "{{ _p.web_main }}inc/ajax/online.ajax.php?a=get_users_online", {% endif %}
success: function(data) { <script>
$("#notifications").append(data); $(document).on('ready', function () {
} $("#notifications").load("{{ _p.web_main }}inc/ajax/online.ajax.php?a=get_users_online");
}); });
}); </script>
</script> <div class="section-notifications">
<div class="section-notifications"> <ul id="notifications" class="nav nav-pills pull-right">
<ul id="notifications" class="nav nav-pills pull-right"> </ul>
</ul> </div>
{{ accessibility }}
</div> </div>
{{ accessibility }}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</section> </header>
{% block menu %} {% block menu %}
{% include template ~ "/layout/menu.tpl" %} {% include template ~ "/layout/menu.tpl" %}
{% endblock %} {% endblock %}
</header>
{% include template ~ "/layout/course_navigation.tpl" %} {% include template ~ "/layout/course_navigation.tpl" %}

4
main/template/default/layout/show_header.tpl
Unescape View File

@ -37,7 +37,9 @@
<section id="content-section"> <section id="content-section">
<div class="container"> <div class="container">
{% block breadcrumb %} {% block breadcrumb %}
{{ breadcrumb }} <div id="page-breadcrumb">
{{ breadcrumb }}
</div>
{% endblock %} {% endblock %}
{{ flash_messages }} {{ flash_messages }}
{% endif %} {% endif %}
Write Preview
Loading…
Cancel
Save