WIP - Update tpls with new structure #2328

pull/2487/head
jmontoyaa 7 years ago
parent 3b2830ea34
commit 2c6833e41e
  1. 29
      main/inc/lib/template.lib.php
  2. 2
      main/template/default/layout/footer.tpl
  3. 2
      main/template/default/layout/head.tpl
  4. 49
      main/template/default/layout/layout_1_col.html.twig
  5. 266
      main/template/default/layout/layout_2_col.html.twig
  6. 4
      main/template/default/layout/login_form.tpl
  7. 20
      main/template/default/layout/menu.tpl
  8. 4
      main/template/default/layout/page.tpl
  9. 2
      main/template/default/layout/page_body.tpl
  10. 4
      main/template/default/layout/page_footer.tpl
  11. 2
      main/template/default/layout/page_header.tpl

@ -352,8 +352,11 @@ class Template
* */
public function display_one_col_template()
{
$tpl = $this->get_template('layout/layout_1_col.tpl');
$this->display($tpl);
$tpl = $this->get_template('layout/layout_1_col.html.twig');
echo \Chamilo\CoreBundle\Framework\Container::getTemplating()->render($tpl, $this->params);
/*$tpl = $this->get_template('layout/layout_1_col.tpl');
$this->display($tpl);*/
}
/**
@ -361,8 +364,10 @@ class Template
**/
public function display_two_col_template()
{
$tpl = $this->get_template('layout/layout_2_col.tpl');
$this->display($tpl);
$tpl = $this->get_template('layout/layout_2_col.html.twig');
echo \Chamilo\CoreBundle\Framework\Container::getTemplating()->render($tpl, $this->params);
//$this->display($tpl);
}
/**
@ -868,10 +873,9 @@ class Template
//$js_file_to_string .= '<script type="text/javascript" src="'.api_get_path(WEB_PUBLIC_PATH).'assets/'.$file.'"></script>'."\n";
}
$js_file_to_string .= '<script type="text/javascript" src="'.api_get_path(WEB_PUBLIC_PATH).'build/chamilo.js"></script>'."\n";
$js_file_to_string .= '<script type="text/javascript" src="'.api_get_path(WEB_PUBLIC_PATH).'libs/ckeditor/ckeditor.js"></script>'."\n";
$js_file_to_string .= '<script type="text/javascript" src="'.api_get_path(WEB_PUBLIC_PATH).'libs/readmore/readmore.js"></script>'."\n";
$js_file_to_string .= '<script type="text/javascript" src="'.api_get_path(WEB_PUBLIC_PATH).'libs/readmore-js/readmore.js"></script>'."\n";
foreach ($js_files as $file) {
//$js_file_to_string .= api_get_js($file);
@ -1063,7 +1067,7 @@ class Template
if (api_get_setting('show_link_ticket_notification') == 'true' && $this->user_is_logged_in) {
// by default is project_id = 1
$iconTicket = Display::return_icon(
'bug.png',
'help.png',
get_lang('Ticket'),
[],
ICON_SIZE_LARGE
@ -1074,7 +1078,7 @@ class Template
$courseParams = api_get_cidreq();
}
$url = api_get_path(WEB_CODE_PATH).'ticket/tickets.php?project_id=1&'.$courseParams;
$rightFloatMenu .= '<div class="report">
$rightFloatMenu .= '<div class="help">
<a href="'.$url.'" target="_blank">
'.$iconTicket.'
</a>
@ -1170,6 +1174,15 @@ class Template
'X-Powered-By: '.$_configuration['software_name'].' '.substr($_configuration['system_version'], 0, 1)
);
self::addHTTPSecurityHeaders();
$responseCode = $this->getResponseCode();
if (!empty($responseCode)) {
switch ($responseCode) {
case '404':
header("HTTP/1.0 404 Not Found");
break;
}
}
}
$socialMeta = '';

@ -1,3 +1,4 @@
{% autoescape false %}
<footer id="footer-section" class="sticky-footer bgfooter">
<div class="container">
<div class="pre-footer">
@ -78,3 +79,4 @@
{% include template ~ '/layout/footer.js.tpl' %}
{{ execution_stats }}
{% endautoescape %}

@ -1,3 +1,4 @@
{% autoescape false %}
<meta charset="{{ system_charset }}" />
<link href="https://chamilo.org/chamilo-lms/" rel="help" />
<link href="https://chamilo.org/the-association/" rel="author" />
@ -48,3 +49,4 @@ $(document).ready(function () {
{{ css_custom_file_to_string }}
{{ css_style_print }}
{% endautoescape %}

@ -0,0 +1,49 @@
{% extends template ~ "/layout/page.tpl" %}
{% block body %}
{% autoescape false %}
{% if plugin_main_top %}
<div class="row">
<div id="plugin_main_top" class="col-md-12">
{{ plugin_main_top }}
</div>
</div>
{% endif %}
{% if plugin_content_top %}
<div class="row">
<div id="plugin_content_top" class="col-md-12">
{{ plugin_content_top }}
</div>
</div>
{% endif %}
<div class="row">
<div class="col-xs-12 col-md-12">
{% include template ~ "/layout/page_body.tpl" %}
{% block content %}
{% if content is not null %}
<section id="main_content">
{{ content }}
</section>
{% endif %}
{% endblock %}
</div>
</div>
{% if plugin_content_bottom %}
<div class="row">
<div id="plugin_content_bottom" class="col-md-12">
{{ plugin_content_bottom }}
</div>
</div>
{% endif %}
{% if plugin_main_bottom %}
<div class="row">
<div id="plugin_main_bottom" class="col-md-12">
{{ plugin_main_bottom }}
</div>
</div>
{% endif %}
{% endautoescape %}
{% endblock %}

@ -0,0 +1,266 @@
{% extends template ~ "/layout/page.tpl" %}
{% block body %}
{% autoescape false %}
{% if plugin_main_top %}
<div class="row">
<div class="page-main-top" class="col-md-12">
{{ plugin_main_top }}
</div>
</div>
{% endif %}
<div class="row">
<div class="col-md-9 col-md-push-3">
<div class="page-content">
{% if plugin_content_top %}
<div class="page-content-top">
{{ plugin_content_top }}
</div>
{% endif %}
{{ sniff_notification }}
{% if home_page_block %}
<article id="homepage-home">
{{ home_page_block }}
</article>
{% endif %}
{% block page_body %}
{% include template ~ "/layout/page_body.tpl" %}
{% endblock %}
{% if welcome_to_course_block %}
<article id="homepage-course">
{{ welcome_to_course_block }}
</article>
{% endif %}
{% block content %}
{% if content is not null %}
<section id="page" class="{{ course_history_page }}">
{{ content }}
</section>
{% endif %}
{% endblock %}
{% if announcements_block %}
<article id="homepage-announcements">
{{ announcements_block }}
</article>
{% endif %}
{% if course_category_block %}
<article id="homepage-course-category">
{{ course_category_block }}
</article>
{% endif %}
{% include template ~ "/layout/hot_courses.tpl" %}
{% if plugin_content_bottom %}
<div id="plugin_content_bottom">
{{ plugin_content_bottom }}
</div>
{% endif %}
</div>
</div>
<div class="col-md-3 col-md-pull-9">
<div class="sidebar">
{% if plugin_menu_top %}
<div class="siderbar-menu-top">
{{ plugin_menu_top }}
</div>
{% endif %}
{% include template ~ "/layout/login_form.tpl" %}
{% if _u.logged == 1 %}
{{ user_image_block }}
{% endif %}
{% if profile_block %}
<!-- block profile -->
<div class="panel-group" id="profile" role="tablist" aria-multiselectable="true">
<div class="panel panel-default" id="profile_block">
<div class="panel-heading" role="tab">
<h4 class="panel-title">
<a role="button" data-toggle="collapse" data-parent="#profile" href="#profileCollapse" aria-expanded="true" aria-controls="profileCollapse">
{{ 'Profile' | get_lang }}
</a>
</h4>
</div>
<div style="" aria-expanded="true" id="profileCollapse" class="panel-collapse collapse in" role="tabpanel">
<div class="panel-body">
<ul class="list-group">
{% for item in profile_block %}
<li class="list-group-item {{ item.class }}">
<span class="item-icon">
{{ item.icon }}
</span>
<a href="{{ item.link }}">{{ item.title }}</a>
</li>
{% endfor %}
</ul>
</div>
</div>
</div>
</div>
<!-- end block profile -->
{% endif %}
{% if course_block %}
<!-- block course -->
<div class="panel-group" id="course" role="tablist" aria-multiselectable="true">
<div class="panel panel-default" id="course_block">
<div class="panel-heading" role="tab">
<h4 class="panel-title">
<a role="button" data-toggle="collapse" data-parent="#course" href="#courseCollapse" aria-expanded="true" aria-controls="courseCollapse">
{{ 'Courses' | get_lang }}
</a>
</h4>
</div>
<div style="" aria-expanded="true" id="courseCollapse" class="panel-collapse collapse in" role="tabpanel">
<div class="panel-body">
<ul class="list-group">
{% for item in course_block %}
<li class="list-group-item {{ item.class }}">
<span class="item-icon">
{{ item.icon }}
</span>
<a href="{{ item.link }}">{{ item.title }}</a>
</li>
{% endfor %}
</ul>
</div>
</div>
</div>
</div>
<!-- end block course -->
{% endif %}
{% if grade_book_sidebar %}
<div class="panel-group" id="skill" role="tablist" aria-multiselectable="true">
<div class="panel panel-default" id="gradebook_block">
<div class="panel-heading" role="tab">
<h4 class="panel-title">
<a role="button" data-toggle="collapse" data-parent="#skill" href="#skillCollapse" aria-expanded="true" aria-controls="skillCollapse">
{{ 'Gradebook' | get_lang }}
</a>
</h4>
</div>
<div style="" aria-expanded="true" id="skillCollapse" class="panel-collapse collapse in" role="tabpanel">
<div class="panel-body">
<ul class="list-group">
<li class="list-group-item {{ item.class }}">
{{ 'Progress' | get_lang }} : {{ grade_book_progress }} %
<br />
{% for badge in grade_book_badge_list %}
<div class="badge_sidebar">
{% for skill in badge.skills %}
{% if badge.finished %}
<img class="badge_sidebar_image " src ="{{ skill.icon_big }}" />
{% else %}
<img class="badge_sidebar_image badge_sidebar_image_transparency" src = "{{ skill.icon_big }}" />
{% endif %}
<div class="badge_sidebar_title">
{{ skill.name }}
</div>
{% endfor %}
</div>
{#<div class="badge_sidebar_title">#}
{#{{ badge.name }}#}
{#</div>#}
{% endfor %}
</li>
</ul>
</div>
</div>
</div>
</div>
{% endif %}
{% if skills_block %}
<!-- block skills -->
<div class="panel-group" id="skill" role="tablist" aria-multiselectable="true">
<div class="panel panel-default" id="skill_block">
<div class="panel-heading" role="tab">
<h4 class="panel-title">
<a role="button" data-toggle="collapse" data-parent="#skill" href="#skillCollapse" aria-expanded="true" aria-controls="skillCollapse">
{{ 'Skills' | get_lang }}
</a>
</h4>
</div>
<div style="" aria-expanded="true" id="skillCollapse" class="panel-collapse collapse in" role="tabpanel">
<div class="panel-body">
<ul class="list-group">
{% for item in skills_block %}
<li class="list-group-item {{ item.class }}">
<span class="item-icon">
{{ item.icon }}
</span>
<a href="{{ item.link }}">{{ item.title }}</a>
</li>
{% endfor %}
</ul>
</div>
</div>
</div>
</div>
<!-- end block skills -->
{% endif %}
{{ teacher_block }}
{{ certificates_search_block }}
{{ notice_block }}
{{ help_block }}
<!-- block navigation -->
{% if navigation_course_links %}
<div class="panel-group" id="menu" role="tablist" aria-multiselectable="true">
<div class="panel panel-default" id="menu_block">
<div class="panel-heading" role="tab">
<h4 class="panel-title">
<a role="button" data-toggle="collapse" data-parent="#menu" href="#menuCollapse" aria-expanded="true" aria-controls="menuCollapse">
{{ 'MainNavigation' | get_lang }}
</a>
</h4>
</div>
<div style="" aria-expanded="true" id="menuCollapse" class="panel-collapse collapse in" role="tabpanel">
<div class="panel-body">
<ul class="nav nav-pills nav-stacked">
{% for item in navigation_course_links %}
<li>
<a href="{{ item.link }}">{{ item.title }}</a>
</li>
{% endfor %}
</ul>
</div>
</div>
</div>
</div>
{% endif %}
<!-- end block navigation -->
{{ search_block }}
{{ classes_block }}
{% if plugin_menu_bottom %}
<div class="sidebar-menu-bottom">
{{ plugin_menu_bottom }}
</div>
{% endif %}
</div>
</div>
</div>
{% if plugin_main_bottom %}
<div class="row">
<div class="page-main-bottom" class="col-md-12">
{{ plugin_main_bottom }}
</div>
</div>
{% endif %}
{% endautoescape %}
{% endblock %}

@ -1,3 +1,4 @@
{% autoescape false %}
{% if _u.logged == 0 %}
{% if login_form %}
<div id="login_block" class="panel panel-default">
@ -32,4 +33,5 @@
</div>
</div>
{% endif %}
{% endif %}
{% endif %}
{% endautoescape %}

@ -12,15 +12,17 @@
<a class="navbar-brand" href="{{ _p.web }}">{{ _s.site_name }}</a>
</div>
<div class="collapse navbar-collapse" id="menuone">
<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>
{{ 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 () {

@ -1,3 +1,4 @@
{% autoescape false %}
<!DOCTYPE html>
<!--[if lt IE 7]> <html lang="{{ document_language }}" class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
<!--[if IE 7]> <html lang="{{ document_language }}" class="no-js lt-ie9 lt-ie8"> <![endif]-->
@ -62,4 +63,5 @@
{% include template ~ '/layout/footer.js.tpl' %}
</div>
</body>
</html>
</html>
{% endautoescape %}

@ -1,3 +1,4 @@
{% autoescape false %}
{% if actions != '' %}
{{ actions }}
{% endif %}
@ -25,3 +26,4 @@
{{ message}}
</section>
{% endif %}
{% endautoescape %}

@ -1,3 +1,4 @@
{% autoescape false %}
<footer id="footer-section" class="sticky-footer bgfooter">
<div class="container">
<div class="pre-footer">
@ -90,4 +91,5 @@
</div>
</div>
{{ execution_stats }}
{{ execution_stats }}
{% endautoescape %}

@ -1,3 +1,4 @@
{% autoescape false %}
<div id="navigation" class="notification-panel">
{{ help_content }}
{{ bug_notification }}
@ -56,3 +57,4 @@
{% include template ~ "/layout/menu.tpl" %}
{% endblock %}
{% include template ~ "/layout/course_navigation.tpl" %}
{% endautoescape %}
Loading…
Cancel
Save