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

Minor - update templates with new structure

Browse Source
pull/2528/head
jmontoyaa 7 years ago
parent 1532879a1f
commit b6123bf337
6 changed files with 176 additions and 240 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. 95
      main/template/default/layout/menu.html.twig
  2. 70
      main/template/default/layout/topbar.html.twig
  3. 74
      src/CoreBundle/EventListener/LegacyListener.php
  4. 84
      src/ThemeBundle/Resources/views/Layout/base-layout.html.twig
  5. 0
      src/ThemeBundle/Resources/views/Layout/course_navigation.html.twig
  6. 93
      src/ThemeBundle/Resources/views/Layout/menu.html.twig

95
main/template/default/layout/menu.html.twig
Unescape View File

@ -1,95 +0,0 @@
<nav id="menubar" class="navbar navbar-default">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<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="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{{ _p.web }}">{{ _s.site_name }}</a>
</div>
<div class="collapse navbar-collapse" id="menuone">
{{ mopa_bootstrap_menu('ChamiloCoreBundle:NavBuilder:leftMenu', {'automenu': 'navbar', 'stacked' : false}) }}
{#<ul class="nav navbar-nav">#}
{#{% for item in menu %}#}
{#<li class="{{ item.key }} {{ item.current }}">#}
{#<a href="{{ item.url }}" {{ item.target ? 'target="' ~ item.target ~ '"' : '' }} title="{{ item.title }}">#}
{#{{ item.title }}#}
{#</a>#}
{#</li>#}
{#{% endfor %}#}
{#</ul>#}
{% if _u.logged == 1 %}
<script>
$(document).ready(function () {
$.get('{{ _p.web_main }}inc/ajax/message.ajax.php?a=get_count_message', function(data) {
if (data === '0') {
$("#count_message_li").addClass('hidden');
} else {
$("#count_message_li").removeClass('hidden');
$("#count_message").append(data);
}
});
});
</script>
<ul class="nav navbar-nav navbar-right">
<li id="count_message_li" class="hidden">
<a href="{{ message_url }}">
<span id="count_message" class="badge badge-warning"></span>
</a>
</li>
{% if language_form %}
<li class="dropdown language">
{{ language_form }}
</li>
{% endif %}
{% if _u.status != 6 %}
<li class="dropdown avatar-user">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
aria-expanded="false">
<img class="img-circle" src="{{ _u.avatar_small }}" alt="{{ _u.complete_name }}"/>
<span class="username-movil">{{ _u.complete_name }}</span>
<span class="caret"></span>
</a>
<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>
</li>
{% if certificate_url %}
<li class="user-body">
<a title="{{ "MyCertificates"|get_lang }}" href="{{ certificate_url }}">
<em class="fa fa-graduation-cap"
aria-hidden="true"></em> {{ "MyCertificates"|get_lang }}
</a>
</li>
{% endif %}
<li class="user-body">
<a id="logout_button" title="{{ "Logout"|get_lang }}" href="{{ logout_link }}">
<em class="fa fa-sign-out"></em> {{ "Logout"|get_lang }}
</a>
</li>
</ul>
</li>
{% endif %}
</ul>
{% endif %}
</div>
</div>
</nav>

70
main/template/default/layout/topbar.html.twig
Unescape View File

@ -1,70 +0,0 @@
<!-- Topbar -->
{% if show_toolbar == 1 %}
<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>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{{ _p.web }}">
<img src="{{ "icon-chamilo.png"|icon(22) }}" title="{{ "siteName" | api_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="#">{{'Tracking'|get_lang }}<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="{{ _p.web_main }}mySpace/">{{ "CoursesReporting"|get_lang }}</a></li>
<li><a href="{{ _p.web_main }}mySpace/index.php?view=admin">{{ "AdminReports"|get_lang }}</a></li>
<li><a href="{{ _p.web_main }}tracking/exams.php">{{ "ExamsReporting"|get_lang }}</a></li>
<li class="divider"></li>
<li><a href="{{ _p.web_main }}dashboard/">{{ "Dashboard"|get_lang }}</a></li>
</ul>
</li>
{% if _u.is_admin == 1 %}
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">{{'Administration'|get_lang }}<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="{{ _p.web_main }}admin/">{{ "Home"|get_lang }}</a></li>
<li><a href="{{ _p.web_main }}admin/user_list.php">{{ "UserList"|get_lang }}</a></li>
<li><a href="{{ _p.web_main }}admin/course_list.php">{{ "CourseList"|get_lang }}</a></li>
<li><a href="{{ _p.web_main }}session/session_list.php">{{ "SessionList"|get_lang }}</a></li>
<li class="divider"></li>
<li><a href="{{ _p.web_main }}admin/settings.php">{{ "Settings"|get_lang }}</a></li>
<li class="divider"></li>
<li><a href="{{ _p.web_main }}admin/settings.php?category=Plugins">{{ "Plugins"|get_lang }}</a></li>
<li><a href="{{ _p.web_main }}admin/settings.php?category=Regions">{{ "Regions"|get_lang }}</a></li>
</ul>
</li>
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">{{ 'Add'|get_lang }}<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="{{ _p.web_main }}admin/user_add.php">{{ "User"|get_lang }}</a></li>
<li><a href="{{ _p.web_main }}admin/course_add.php">{{ "Course"|get_lang }}</a></li>
<li><a href="{{ _p.web_main }}session/session_add.php">{{ "Session"|get_lang }}</a></li>
</ul>
</li>
{% endif %}
</ul>
{% if _u.is_admin == 1 %}
<form class="navbar-form navbar-left" role="search" action="{{ _p.web_main }}admin/user_list.php" method="get">
<input type="text" class="form-control" placeholder="{{'SearchUsers'|get_lang }}" name="keyword">
</form>
{% endif %}
<ul class="nav navbar-nav navbar-right">
<li><a href="{{ _p.web }}index.php?logout=logout&uid={{_u.user_id}}">{{ "Logout"|get_lang }}</a></li>
</ul>
</div> <!-- /nav collapse -->
{% endif %}
</div> <!-- /container-->
</nav><!-- /topbar -->
{% endif %}

74
src/CoreBundle/EventListener/LegacyListener.php
Unescape View File

@ -92,10 +92,12 @@ class LegacyListener
}
}
$twig = $container->get('twig');
// Set legacy twig globals _p, _u, _s
$globals = \Template::getGlobals();
foreach ($globals as $index => $value) {
$container->get('twig')->addGlobal($index, $value);
$twig->addGlobal($index, $value);
}
$_admin = [
@ -105,16 +107,16 @@ class LegacyListener
'telephone' => api_get_setting('administratorTelephone'),
];
$container->get('twig')->addGlobal('_admin', $_admin);
$twig->addGlobal('_admin', $_admin);
$theme = api_get_visual_theme();
$container->get('twig')->addGlobal('favico', \Template::getPortalIcon($theme));
$twig->addGlobal('favico', \Template::getPortalIcon($theme));
$extraFooter = trim(api_get_setting('footer_extra_content'));
$container->get('twig')->addGlobal('footer_extra_content', $extraFooter);
$twig->addGlobal('footer_extra_content', $extraFooter);
$extraHeader = trim(api_get_setting('header_extra_content'));
$container->get('twig')->addGlobal('header_extra_content', $extraHeader);
$twig->addGlobal('header_extra_content', $extraHeader);
$languages = api_get_languages();
$languageList = [];
@ -122,8 +124,66 @@ class LegacyListener
$languageList[languageToCountryIsoCode($isoCode)] = $language;
}
$container->get('twig')->addGlobal('current_locale_iso',languageToCountryIsoCode($request->getLocale()));
$container->get('twig')->addGlobal('available_locales', $languages);
$twig->addGlobal('current_locale_iso',languageToCountryIsoCode($request->getLocale()));
$twig->addGlobal('available_locales', $languages);
$twig->addGlobal('show_toolbar', \Template::isToolBarDisplayedForUser() ? 1 : 0);
// Extra content
$extraHeader = '';
if (!api_is_platform_admin()) {
$extraHeader = trim(api_get_setting('header_extra_content'));
}
$twig->addGlobal('header_extra_content', $extraHeader);
$user = api_get_user_info();
$rightFloatMenu = '';
$iconBug = \Display::return_icon(
'bug.png',
get_lang('ReportABug'),
[],
ICON_SIZE_LARGE
);
$allow = $user['status'] != ANONYMOUS;
if (api_get_setting('show_link_bug_notification') == 'true' && $allow) {
$rightFloatMenu = '<div class="report">
<a href="https://github.com/chamilo/chamilo-lms/wiki/How-to-report-issues" target="_blank">
'.$iconBug.'
</a>
</div>';
}
if (api_get_setting('show_link_ticket_notification') == 'true' &&
$allow
) {
// by default is project_id = 1
$defaultProjectId = 1;
$allow = \TicketManager::userIsAllowInProject(api_get_user_info(), $defaultProjectId);
if ($allow) {
$iconTicket = \Display::return_icon(
'help.png',
get_lang('Ticket'),
[],
ICON_SIZE_LARGE
);
$courseInfo = api_get_course_info();
$courseParams = '';
if (!empty($courseInfo)) {
$courseParams = api_get_cidreq();
}
$url = api_get_path(WEB_CODE_PATH).
'ticket/tickets.php?project_id='.$defaultProjectId.'&'.$courseParams;
$rightFloatMenu .= '<div class="help">
<a href="'.$url.'" target="_blank">
'.$iconTicket.'
</a>
</div>';
}
}
$twig->addGlobal('bug_notification', $rightFloatMenu);
}
// We set cid_reset = true if we enter inside a main/admin url

84
src/ThemeBundle/Resources/views/Layout/base-layout.html.twig
Unescape View File

@ -100,32 +100,27 @@
</head>
<body class="{{section_name}}">
{#{{ url('legacy_index') }}#}
{#<br />#}
{#{{ url('main', { 'name' : 'messages/inbox.php' }) }}#}
{#{{ url('main', {'name': ' '}) }}#}
<noscript>{{ "NoJavascript" | trans }}</noscript>
{#{% if show_header == true %}#}
{% block chamilo_wrap %}
{% autoescape false %}
<div id="page-wrap">
<!-- page section -->
{# Bug and help notifications #}
{#{% block help_notifications %}#}
{#<ul id="navigation" class="notification-panel">#}
{#{{ help_content }}#}
{#{{ bug_notification_link }}#}
{#</ul>#}
{#{% endblock %}#}
<div id="navigation" class="notification-panel">
{{ help_content }}
{{ bug_notification }}
</div>
{# topbar #}
{% block topbar %}
{#{% include "@template_style/layout/topbar.html.twig" %}#}
{% include "@ChamiloTheme/Layout/topbar.html.twig" %}
{#{% 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 }}
@ -142,9 +137,9 @@
<div class="row">
<div class="col-lg-3">
<div class="logo">
{#<a href="{{ url('index') }}">#}
<a href="{{ url('legacy_index') }}">
<img src="{{ asset('build/css/themes/'~ theme ~'/images/header-logo.png') }}"/>
{#</a>#}
</a>
</div>
</div>
<div class="col-lg-9">
@ -178,65 +173,19 @@
</div>
</div>
</section>
<section id="menu-bar">
{# menu #}
{% block menu %}
<nav class="navbar navbar-default">
<div class="container">
<div class="collapse navbar-collapse">
{{ mopa_bootstrap_menu('ChamiloCoreBundle:NavBuilder:leftMenu', {'automenu': 'navbar', 'stacked' : false}) }}
{% if app.user is not null and is_granted('IS_AUTHENTICATED_FULLY') %}
<div class="navbar-custom-menu">
<ul class="nav navbar-nav navbar-right">
<li class="dropdown user user-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
<img class="img-circle" src="{{ asset(app.user.avatarOrAnonymous(32)) }}"
alt="{{ app.user.completeName }}" />
<span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
<li class="user-header">
<div class="text-center">
<img class="img-circle" src="{{ asset(app.user.avatarOrAnonymous(64)) }}" alt="{{ app.user.completeName }}" />
<p class="name">
<a href="{{ url('legacy_main', { 'name' : 'social/home.php' })}}">
{{ app.user.completeName }}
</a>
</p>
<p><i class="fa fa-envelope-o" aria-hidden="true"></i> {{ app.user.email }}</p>
</div>
</li>
<li role="separator" class="divider"></li>
<li class="user-body">
<a title="{{ "Inbox"|trans }}" href="{{ url('legacy_main', { 'name' : 'messages/inbox.php' }) }}">
<em class="fa fa-envelope" aria-hidden="true"></em> {{ "Inbox"|get_lang }}
</a>
<a title="{{ "MyCertificates"|trans }}" href="{{ url('legacy_main', { 'name' : 'gradebook/my_certificates.php' }) }}">
<em class="fa fa-graduation-cap" aria-hidden="true"></em> {{ "MyCertificates"|get_lang }}
</a>
<a id="logout_button" title="{{ "Logout"|trans }}" href="{{ path('legacy_main', { 'name' : '../public/logout'}) }}" >
<em class="fa fa-sign-out"></em> {{ "Logout"|trans }}
</a>
</li>
</ul>
</li>
</ul>
</div>
{% endif %}
</div>
</div>
</nav>
{#{% include "@template_style/layout/menu.html.twig" %}#}
{% endblock %}
{# course navigation links/shortcuts need to be activated by the admin #}
{% include "@ChamiloTheme/Layout/menu.html.twig" %}
{% endblock %}
</section>
</header>
<div id="top_main_content" class="container">
{# course navigation links/shortcuts need to be activated by the admin #}
{#{% include "@template_style/layout/course_navigation.html.twig" %}#}
{#{% endif %}#}
{% include "@ChamiloTheme/Layout/course_navigation.html.twig" %}
{% block chamilo_header %}
{#<header class="header">#}
@ -293,7 +242,6 @@
</div> {# end top_main_content #}
</div> {# End page-wrap div #}
{% block chamilo_footer %}
{% include '@ChamiloTheme/Layout/footer.html.twig' %}
{% endblock %}

0
main/template/default/layout/course_navigation.html.twig → src/ThemeBundle/Resources/views/Layout/course_navigation.html.twig
Unescape View File

93
src/ThemeBundle/Resources/views/Layout/menu.html.twig
Unescape View File

@ -0,0 +1,93 @@
{% autoescape false %}
<nav id="menubar" class="navbar navbar-default">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<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="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{{ _p.web }}">{{ _s.site_name }}</a>
</div>
<div class="collapse navbar-collapse" id="menuone">
{{ mopa_bootstrap_menu('ChamiloCoreBundle:NavBuilder:leftMenu', {'automenu': 'navbar', 'stacked' : false}) }}
{% if app.user is not null and is_granted('IS_AUTHENTICATED_FULLY') %}
<script>
$(document).ready(function () {
$.get(
'{{ url('legacy_main', { name : 'inc/ajax/message.ajax.php'}) }}', {'a': 'get_count_message'}, function(data) {
if (data === '0') {
$("#count_message_li").addClass('hidden');
} else {
$("#count_message_li").removeClass('hidden');
$("#count_message").append(data);
}
});
});
</script>
<ul class="nav navbar-nav navbar-right">
<li id="count_message_li" class="hidden">
<a href="{{ message_url }}">
<span id="count_message" class="badge badge-warning"></span>
</a>
</li>
{% if language_form %}
<li class="dropdown language">
{{ language_form }}
</li>
{% endif %}
<div class="navbar-custom-menu">
<ul class="nav navbar-nav navbar-right">
<li class="dropdown user user-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
<img class="img-circle" src="{{ asset(app.user.avatarOrAnonymous(32)) }}"
alt="{{ app.user.completeName }}" />
<span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
<li class="user-header">
<div class="text-center">
<img class="img-circle" src="{{ asset(app.user.avatarOrAnonymous(64)) }}" alt="{{ app.user.completeName }}" />
<p class="name">
<a href="{{ url('legacy_main', { 'name' : 'social/home.php' })}}">
{{ app.user.completeName }}
</a>
</p>
<p><i class="fa fa-envelope-o" aria-hidden="true"></i> {{ app.user.email }}</p>
</div>
</li>
<li role="separator" class="divider"></li>
<li class="user-body">
<a title="{{ "Inbox"|trans }}" href="{{ url('legacy_main', { 'name' : 'messages/inbox.php' }) }}">
<em class="fa fa-envelope" aria-hidden="true"></em> {{ "Inbox"|get_lang }}
</a>
<a href="{{ url('legacy_main', { 'name' : 'survey/pending.php' }) }} ">
<em class="fa fa-pie-chart"></em> {{ 'PendingSurveys'|get_lang }}
</a>
<a title="{{ "MyCertificates"|trans }}" href="{{ url('legacy_main', { 'name' : 'gradebook/my_certificates.php' }) }}">
<em class="fa fa-graduation-cap" aria-hidden="true"></em> {{ "MyCertificates"|get_lang }}
</a>
<a id="logout_button" title="{{ "Logout"|trans }}" href="{{ path('legacy_main', { 'name' : '../public/logout'}) }}" >
<em class="fa fa-sign-out"></em> {{ "Logout"|trans }}
</a>
</li>
</ul>
</li>
</ul>
</div>
</ul>
{% endif %}
</div>
</div>
</nav>
{% endautoescape %}
Write Preview
Loading…
Cancel
Save