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

Twig templates: Fix path to other elements in default template so that a copy uses local resources by default - refs #7506

Browse Source
1.10.x
Yannick Warnier 10 years ago
parent fa4d89443f
commit 8eb022a526
22 changed files with 37 additions and 37 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. 2
      main/template/default/auth/sessions_catalog.tpl
  2. 2
      main/template/default/glossary/edit.tpl
  3. 8
      main/template/default/glossary/index.tpl
  4. 2
      main/template/default/glossary/upload.tpl
  5. 2
      main/template/default/layout/hot_courses.tpl
  6. 4
      main/template/default/layout/layout_1_col.tpl
  7. 8
      main/template/default/layout/layout_2_col.tpl
  8. 2
      main/template/default/layout/layout_3_col.tpl
  9. 6
      main/template/default/layout/main.tpl
  10. 2
      main/template/default/layout/main_footer.tpl
  11. 8
      main/template/default/layout/main_header.tpl
  12. 2
      main/template/default/layout/no_layout.tpl
  13. 2
      main/template/default/layout/show_footer.tpl
  14. 4
      main/template/default/layout/show_header.tpl
  15. 2
      main/template/default/layout/social_layout.tpl
  16. 2
      main/template/default/notebook/edit.tpl
  17. 6
      main/template/default/notebook/index.tpl
  18. 2
      main/template/default/notebook/upload.tpl
  19. 2
      main/template/default/skill/skill_wheel.js.tpl
  20. 2
      main/template/default/skill/skill_wheel.tpl
  21. 2
      main/template/default/skill/skill_wheel_student.tpl
  22. 2
      main/template/default/work/view.tpl

2
main/template/default/auth/sessions_catalog.tpl
Unescape View File

@ -1,4 +1,4 @@
{% extends "default/layout/main.tpl" %}
{% extends template ~ "/layout/main.tpl" %}
{% block body %}
<script type="text/javascript">

2
main/template/default/glossary/edit.tpl
Unescape View File

@ -1,5 +1,5 @@
{% include 'default/glossary/header.tpl' %}
{% include template ~ '/glossary/header.tpl' %}
<div class="actions-bar btn-toolbar" >
<a href = "{{root}}&amp;action=index" class="btn">

8
main/template/default/glossary/index.tpl
Unescape View File

@ -1,5 +1,5 @@
{% include 'default/glossary/header.tpl' %}
{% include 'default/glossary/javascript.tpl' %}
{% include template ~ '/glossary/header.tpl' %}
{% include template ~ '/glossary/javascript.tpl' %}
<div class="btn-toolbar actions-bar" >
{% if is_allowed_to_edit %}
@ -33,7 +33,7 @@
</div>
{% if view == 'table' %}
{% include 'default/glossary/table.tpl' %}
{% include template ~ '/glossary/table.tpl' %}
{% else %}
{% include 'default/glossary/list.tpl' %}
{% include template ~ '/glossary/list.tpl' %}
{% endif %}

2
main/template/default/glossary/upload.tpl
Unescape View File

@ -1,4 +1,4 @@
{% include 'default/glossary/header.tpl' %}
{% include template ~ '/glossary/header.tpl' %}
<div class="actions-bar btn-toolbar" >
<a href = "{{root}}&amp;action=index" class="btn">

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

@ -35,7 +35,7 @@ $(document).ready( function() {
{{ "HottestCourses"|display_page_subheader }}
</div>
{% include 'default/layout/hot_course_item.tpl' %}
{% include template ~ '/layout/hot_course_item.tpl' %}
</div>
</section>
{% endif %}

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

@ -1,4 +1,4 @@
{% extends "default/layout/main.tpl" %}
{% extends template ~ "/layout/main.tpl" %}
{# 1 column #}
{% block body %}
@ -17,7 +17,7 @@
{% endif %}
<div class="span12">
{% include "default/layout/page_body.tpl" %}
{% include template ~ "/layout/page_body.tpl" %}
{% block content %}
{% if content is not null %}
<section id="main_content">

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

@ -1,4 +1,4 @@
{% extends "default/layout/main.tpl" %}
{% extends template ~ "/layout/main.tpl" %}
{% block body %}
{# Main content #}
@ -21,7 +21,7 @@
{# if user is not login show the login form #}
{% block login_form %}
{% if _u.logged == 0 %}
{% include "default/layout/login_form.tpl" %}
{% include template ~ "/layout/login_form.tpl" %}
{% endif %}
{% endblock %}
@ -94,7 +94,7 @@
{{ sniff_notification }}
{% block page_body %}
{% include "default/layout/page_body.tpl" %}
{% include template ~ "/layout/page_body.tpl" %}
{% endblock %}
{# Welcome to course block #}
@ -131,7 +131,7 @@
{% endif %}
{# Hot courses template #}
{% include "default/layout/hot_courses.tpl" %}
{% include template ~ "/layout/hot_courses.tpl" %}
{# Content bottom #}
{% if plugin_content_bottom %}

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

@ -1,5 +1,5 @@
{# This template is NOT used in chamilo 1.9 #}
{{ extends "default/layout/main.tpl" }}
{% extends template ~ "/layout/main.tpl" %}
{% block body %}
<div id="maincontent" class="maincontent">

6
main/template/default/layout/main.tpl
Unescape View File

@ -1,10 +1,10 @@
{% block header %}
{% include "default/layout/main_header.tpl" %}
{% include template ~ "/layout/main_header.tpl" %}
{% endblock %}
{% block body %}
{% if show_sniff == 1 %}
{% include "default/layout/sniff.tpl" %}
{% include template ~ "/layout/sniff.tpl" %}
{% endif %}
{% endblock %}
@ -17,5 +17,5 @@
</div> <!-- end of #page section -->
</div> <!-- end of #wrapper section -->
{% endif %}
{% include "default/layout/main_footer.tpl" %}
{% include template ~ "/layout/main_footer.tpl" %}
{% endblock %}

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

@ -1,5 +1,5 @@
{% if show_footer == true %}
{% include "default/layout/footer.tpl" %}
{% include template ~ "/layout/footer.tpl" %}
{% endif %}
</body>
</html>

8
main/template/default/layout/main_header.tpl
Unescape View File

@ -5,7 +5,7 @@
<!--[if gt IE 8]><!--><html lang="{{ document_language }}" class="no-js"> <!--<![endif]-->
<head>
{% block head %}
{% include "default/layout/head.tpl" %}
{% include template ~ "/layout/head.tpl" %}
{% endblock %}
</head>
<body dir="{{ text_direction }}" class="{{ section_name }} {{ login_class }}">
@ -53,7 +53,7 @@
{# topbar #}
{% block topbar %}
{% include "default/layout/topbar.tpl" %}
{% include template ~ "/layout/topbar.tpl" %}
{% endblock %}
<div id="main" class="container">
@ -107,7 +107,7 @@
{# menu #}
{% block menu %}
{% include "default/layout/menu.tpl" %}
{% include template ~ "/layout/menu.tpl" %}
{% endblock %}
{# breadcrumb #}
@ -118,5 +118,5 @@
<div id="top_main_content" class="row">
{# course navigation links/shortcuts need to be activated by the admin #}
{% include "default/layout/course_navigation.tpl" %}
{% include template ~ "/layout/course_navigation.tpl" %}
{% endif %}

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

@ -4,7 +4,7 @@
<!--[if IE 8]> <html lang="{{document_language}}" class="no-js lt-ie9"> <![endif]-->
<!--[if gt IE 8]><!--><html lang="{{document_language}}" class="no-js"> <!--<![endif]-->
<head>
{% include "default/layout/head.tpl" %}
{% include template ~ "/layout/head.tpl" %}
</head>
<body dir="{{text_direction}}" class="{{section_name}}">
{% block name%}

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

@ -25,4 +25,4 @@
{% endif %}
{% include "default/layout/main_footer.tpl" %}
{% include template ~ "/layout/main_footer.tpl" %}

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

@ -1,4 +1,4 @@
{% include "default/layout/main_header.tpl" %}
{% include template ~ "/layout/main_header.tpl" %}
{#
show_header and show_footer templates are only called when using the
Display::display_header and Display::display_footer
@ -12,6 +12,6 @@
</div>
{% endif %}
<div class="span12">
{% include "default/layout/page_body.tpl" %}
{% include template ~ "/layout/page_body.tpl" %}
<section id="main_content">
{% endif %}

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

@ -1,4 +1,4 @@
{% extends "default/layout/layout_1_col.tpl" %}
{% extends template ~ "/layout/layout_1_col.tpl" %}
{% block content %}
<div class="row">

2
main/template/default/notebook/edit.tpl
Unescape View File

@ -1,5 +1,5 @@
{% include 'default/notebook/header.tpl' %}
{% include template ~ '/notebook/header.tpl' %}
<div class="actions-bar btn-toolbar" >
<a href = "{{root}}&amp;action=index" class="btn back">

6
main/template/default/notebook/index.tpl
Unescape View File

@ -1,5 +1,5 @@
{% include 'default/notebook/header.tpl' %}
{% include 'default/notebook/javascript.tpl' %}
{% include template ~ '/notebook/header.tpl' %}
{% include template ~ '/notebook/javascript.tpl' %}
<div class="btn-toolbar actions-bar" >
{% if is_allowed_to_edit %}
@ -37,5 +37,5 @@
</div>
</div>
{% include 'default/notebook/list.tpl' %}
{% include template ~ '/notebook/list.tpl' %}

2
main/template/default/notebook/upload.tpl
Unescape View File

@ -1,4 +1,4 @@
{% include 'default/notebook/header.tpl' %}
{% include template ~ '/notebook/header.tpl' %}
<div class="actions-bar btn-toolbar" >
<a href = "{{root}}&amp;action=index" class="btn back">

2
main/template/default/skill/skill_wheel.js.tpl
Unescape View File

@ -1,5 +1,5 @@
{# topbar #}
{% include "default/layout/topbar.tpl" %}
{% include template ~ "/layout/topbar.tpl" %}
<script>
/* Skill wheel settings */

2
main/template/default/skill/skill_wheel.tpl
Unescape View File

@ -1,4 +1,4 @@
{% include 'default/skill/skill_wheel.js.tpl' %}
{% include template ~ '/skill/skill_wheel.js.tpl' %}
<script>

2
main/template/default/skill/skill_wheel_student.tpl
Unescape View File

@ -1,4 +1,4 @@
{% include 'default/skill/skill_wheel.js.tpl' %}
{% include template ~ '/skill/skill_wheel.js.tpl' %}
<script>

2
main/template/default/work/view.tpl
Unescape View File

@ -19,4 +19,4 @@
</p>
{% endif %}
{% include 'default/work/comments.tpl' %}
{% include template ~ '/work/comments.tpl' %}

Write Preview
Loading…
Cancel
Save