Skip to content

Commit

Permalink
Twig templates: Fix path to other elements in default template so tha…
Browse files Browse the repository at this point in the history 
…t a copy uses local resources by default - refs #7506
  • Loading branch information
@ywarnier
ywarnier committed Feb 3, 2015
1 parent fa4d894 commit 8eb022a
Show file tree
Hide file tree
Showing 22 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion main/template/default/auth/sessions_catalog.tpl
View file
@@ -1,4 +1,4 @@
{% extends "default/layout/main.tpl" %}
{% extends template ~ "/layout/main.tpl" %}

{% block body %}
<script type="text/javascript">
Expand Down
2 changes: 1 addition & 1 deletion main/template/default/glossary/edit.tpl
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">
Expand Down
8 changes: 4 additions & 4 deletions main/template/default/glossary/index.tpl
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 %}
Expand Down Expand Up @@ -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 changes: 1 addition & 1 deletion main/template/default/glossary/upload.tpl
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">
Expand Down
2 changes: 1 addition & 1 deletion main/template/default/layout/hot_courses.tpl
View file
Expand Up @@ -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 changes: 2 additions & 2 deletions main/template/default/layout/layout_1_col.tpl
View file
@@ -1,4 +1,4 @@
{% extends "default/layout/main.tpl" %}
{% extends template ~ "/layout/main.tpl" %}

{# 1 column #}
{% block body %}
Expand All @@ -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">
Expand Down
8 changes: 4 additions & 4 deletions main/template/default/layout/layout_2_col.tpl
View file
@@ -1,4 +1,4 @@
{% extends "default/layout/main.tpl" %}
{% extends template ~ "/layout/main.tpl" %}

{% block body %}
{# Main content #}
Expand All @@ -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 %}

Expand Down Expand Up @@ -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 #}
Expand Down Expand Up @@ -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 %}
Expand Down
2 changes: 1 addition & 1 deletion main/template/default/layout/layout_3_col.tpl
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">
Expand Down
6 changes: 3 additions & 3 deletions main/template/default/layout/main.tpl
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 %}

Expand All @@ -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 changes: 1 addition & 1 deletion main/template/default/layout/main_footer.tpl
View file
@@ -1,5 +1,5 @@
{% if show_footer == true %}
{% include "default/layout/footer.tpl" %}
{% include template ~ "/layout/footer.tpl" %}
{% endif %}
</body>
</html>
8 changes: 4 additions & 4 deletions main/template/default/layout/main_header.tpl
View file
Expand Up @@ -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 }}">
Expand Down Expand Up @@ -53,7 +53,7 @@

{# topbar #}
{% block topbar %}
{% include "default/layout/topbar.tpl" %}
{% include template ~ "/layout/topbar.tpl" %}
{% endblock %}

<div id="main" class="container">
Expand Down Expand Up @@ -107,7 +107,7 @@

{# menu #}
{% block menu %}
{% include "default/layout/menu.tpl" %}
{% include template ~ "/layout/menu.tpl" %}
{% endblock %}

{# breadcrumb #}
Expand All @@ -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 changes: 1 addition & 1 deletion main/template/default/layout/no_layout.tpl
View file
Expand Up @@ -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%}
Expand Down
2 changes: 1 addition & 1 deletion main/template/default/layout/show_footer.tpl
View file
Expand Up @@ -25,4 +25,4 @@

{% endif %}

{% include "default/layout/main_footer.tpl" %}
{% include template ~ "/layout/main_footer.tpl" %}
4 changes: 2 additions & 2 deletions main/template/default/layout/show_header.tpl
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
Expand All @@ -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 changes: 1 addition & 1 deletion main/template/default/layout/social_layout.tpl
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">
Expand Down
2 changes: 1 addition & 1 deletion main/template/default/notebook/edit.tpl
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">
Expand Down
6 changes: 3 additions & 3 deletions main/template/default/notebook/index.tpl
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 %}
Expand Down Expand Up @@ -37,5 +37,5 @@
</div>
</div>

{% include 'default/notebook/list.tpl' %}
{% include template ~ '/notebook/list.tpl' %}

2 changes: 1 addition & 1 deletion main/template/default/notebook/upload.tpl
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">
Expand Down
2 changes: 1 addition & 1 deletion main/template/default/skill/skill_wheel.js.tpl
View file
@@ -1,5 +1,5 @@
{# topbar #}
{% include "default/layout/topbar.tpl" %}
{% include template ~ "/layout/topbar.tpl" %}
<script>
/* Skill wheel settings */
Expand Down
2 changes: 1 addition & 1 deletion main/template/default/skill/skill_wheel.tpl
View file
@@ -1,4 +1,4 @@
{% include 'default/skill/skill_wheel.js.tpl' %}
{% include template ~ '/skill/skill_wheel.js.tpl' %}

<script>
Expand Down
2 changes: 1 addition & 1 deletion main/template/default/skill/skill_wheel_student.tpl
View file
@@ -1,4 +1,4 @@
{% include 'default/skill/skill_wheel.js.tpl' %}
{% include template ~ '/skill/skill_wheel.js.tpl' %}

<script>
Expand Down
2 changes: 1 addition & 1 deletion main/template/default/work/view.tpl
View file
Expand Up @@ -19,4 +19,4 @@
</p>
{% endif %}

{% include 'default/work/comments.tpl' %}
{% include template ~ '/work/comments.tpl' %}

0 comments on commit 8eb022a

Please sign in to comment.