Update tpls use "html.twig" extension instead of "tpl" #1990

pull/2487/head
jmontoyaa 7 years ago
parent 6a7eb36429
commit 3ed79fa8fb
  1. 10
      main/inc/lib/api.lib.php
  2. 32
      main/inc/lib/template.lib.php
  3. 0
      main/template/default/admin/career_dashboard.html.twig
  4. 0
      main/template/default/admin/email_tester.html.twig
  5. 0
      main/template/default/admin/gradebook_dependency.html.twig
  6. 0
      main/template/default/admin/gradebook_list.html.twig
  7. 0
      main/template/default/admin/pagination.html.twig
  8. 0
      main/template/default/admin/resource_sequence.html.twig
  9. 0
      main/template/default/admin/settings_index.html.twig
  10. 0
      main/template/default/admin/skill.html.twig
  11. 0
      main/template/default/admin/skill_level.html.twig
  12. 0
      main/template/default/admin/skill_profile.html.twig
  13. 0
      main/template/default/admin/teacher_time_report.html.twig
  14. 0
      main/template/default/admin/teachers_time_by_session_report.html.twig
  15. 0
      main/template/default/agenda/event_list.html.twig
  16. 0
      main/template/default/agenda/month.html.twig
  17. 0
      main/template/default/announcement/slider.html.twig
  18. 0
      main/template/default/announcement/view.html.twig
  19. 0
      main/template/default/auth/confirm_session_subscription.html.twig
  20. 0
      main/template/default/auth/hrm_courses.html.twig
  21. 2
      main/template/default/auth/inscription.html.twig
  22. 2
      main/template/default/auth/session_catalog.html.twig
  23. 0
      main/template/default/blog/blog.html.twig
  24. 0
      main/template/default/blog/layout.html.twig
  25. 0
      main/template/default/blog/post.html.twig
  26. 0
      main/template/default/chat/chat.html.twig
  27. 0
      main/template/default/chat/video.html.twig
  28. 0
      main/template/default/course_description/edit.html.twig
  29. 0
      main/template/default/course_description/index.html.twig
  30. 0
      main/template/default/course_description/upload.html.twig
  31. 0
      main/template/default/course_home/activity.html.twig
  32. 0
      main/template/default/course_home/vertical_activity.html.twig
  33. 0
      main/template/default/course_progress/layout.html.twig
  34. 0
      main/template/default/course_progress/pdf_general_thematic.html.twig
  35. 0
      main/template/default/course_progress/pdf_single_thematic.html.twig
  36. 0
      main/template/default/course_progress/progress.html.twig
  37. 0
      main/template/default/coursecopy/import_moodle.html.twig
  38. 0
      main/template/default/create_course/add_course.html.twig
  39. 0
      main/template/default/document/record_audio.html.twig
  40. 0
      main/template/default/document/recycle.html.twig
  41. 0
      main/template/default/exercise/oral_expression.html.twig
  42. 0
      main/template/default/exercise/reading_comprehension.html.twig
  43. 0
      main/template/default/exercise/submit.js.html.twig
  44. 0
      main/template/default/export/alt_pdf_footer.html.twig
  45. 0
      main/template/default/export/pdf_footer.html.twig
  46. 0
      main/template/default/export/pdf_header.html.twig
  47. 0
      main/template/default/export/table_pdf.html.twig
  48. 0
      main/template/default/extrafield/translate.html.twig
  49. 0
      main/template/default/forum/list.html.twig
  50. 0
      main/template/default/gamification/my_progress.html.twig
  51. 0
      main/template/default/glossary/export_pdf.html.twig
  52. 0
      main/template/default/glossary/glossary_auto.js.html.twig
  53. 0
      main/template/default/glossary/glossary_manual.js.html.twig
  54. 0
      main/template/default/gradebook/certificate_report.html.twig
  55. 0
      main/template/default/gradebook/custom_certificate.html.twig
  56. 0
      main/template/default/gradebook/my_certificates.html.twig
  57. 0
      main/template/default/gradebook/search.html.twig
  58. 0
      main/template/default/javascript/editor/ckeditor/config_js.html.twig
  59. 4
      main/template/default/javascript/editor/ckeditor/elfinder.html.twig
  60. 0
      main/template/default/javascript/editor/ckeditor/templates.html.twig
  61. 0
      main/template/default/javascript/editor/elfinder_standalone.html.twig
  62. 2
      main/template/default/layout/blank.html.twig
  63. 0
      main/template/default/layout/blank_no_header.html.twig
  64. 0
      main/template/default/layout/course_navigation.html.twig
  65. 2
      main/template/default/layout/footer.html.twig
  66. 0
      main/template/default/layout/footer.js.html.twig
  67. 2
      main/template/default/layout/head.html.twig
  68. 0
      main/template/default/layout/header.js.html.twig
  69. 0
      main/template/default/layout/hot_course_item.html.twig
  70. 0
      main/template/default/layout/hot_course_item_popup.html.twig
  71. 2
      main/template/default/layout/hot_courses.html.twig
  72. 4
      main/template/default/layout/layout_1_col.html.twig
  73. 47
      main/template/default/layout/layout_1_col.tpl
  74. 8
      main/template/default/layout/layout_2_col.html.twig
  75. 263
      main/template/default/layout/layout_2_col.tpl
  76. 2
      main/template/default/layout/layout_3_col.html.twig
  77. 0
      main/template/default/layout/login_form.html.twig
  78. 0
      main/template/default/layout/menu.html.twig
  79. 2
      main/template/default/layout/no_layout.html.twig
  80. 8
      main/template/default/layout/page.html.twig
  81. 0
      main/template/default/layout/page_body.html.twig
  82. 0
      main/template/default/layout/page_footer.html.twig
  83. 6
      main/template/default/layout/page_header.html.twig
  84. 9
      main/template/default/layout/show_footer.html.twig
  85. 9
      main/template/default/layout/show_footer.tpl
  86. 4
      main/template/default/layout/show_header.html.twig
  87. 0
      main/template/default/layout/topbar.html.twig
  88. 0
      main/template/default/layout/welcome_to_course.html.twig
  89. 0
      main/template/default/learnpath/impress.html.twig
  90. 0
      main/template/default/learnpath/list.html.twig
  91. 0
      main/template/default/learnpath/lp_upload_audio.html.twig
  92. 0
      main/template/default/learnpath/record_voice.html.twig
  93. 0
      main/template/default/learnpath/report.html.twig
  94. 0
      main/template/default/learnpath/scorm_list.html.twig
  95. 2
      main/template/default/learnpath/view.html.twig
  96. 0
      main/template/default/link/edit_category.html.twig
  97. 0
      main/template/default/link/edit_link.html.twig
  98. 0
      main/template/default/link/index.html.twig
  99. 0
      main/template/default/mail/content_registration_platform.html.twig
  100. 0
      main/template/default/mail/content_registration_platform_to_admin.html.twig
  101. Some files were not shown because too many files have changed in this diff Show More

@ -788,7 +788,7 @@ function api_get_path($path = '', $configuration = [])
REL_HOME_PATH => 'app/home/', REL_HOME_PATH => 'app/home/',
SYS_APP_PATH => 'var/', SYS_APP_PATH => 'var/',
WEB_APP_PATH => 'app/', WEB_APP_PATH => 'app/',
SYS_UPLOAD_PATH => 'app/upload/', SYS_UPLOAD_PATH => 'var/upload/',
SYS_INC_PATH => 'inc/', SYS_INC_PATH => 'inc/',
CONFIGURATION_PATH => 'app/config/', CONFIGURATION_PATH => 'app/config/',
LIBRARY_PATH => 'inc/lib/', LIBRARY_PATH => 'inc/lib/',
@ -1351,10 +1351,12 @@ function _api_format_user($user, $add_password = false, $loadAvatars = true)
$result['firstname'] = null; $result['firstname'] = null;
$result['lastname'] = null; $result['lastname'] = null;
if (isset($user['firstname']) && isset($user['lastname'])) { // with only lowercase if (isset($user['firstname']) && isset($user['lastname'])) {
// with only lowercase
$result['firstname'] = $user['firstname']; $result['firstname'] = $user['firstname'];
$result['lastname'] = $user['lastname']; $result['lastname'] = $user['lastname'];
} elseif (isset($user['firstName']) && isset($user['lastName'])) { // with uppercase letters } elseif (isset($user['firstName']) && isset($user['lastName'])) {
// with uppercase letters
$result['firstname'] = isset($user['firstName']) ? $user['firstName'] : null; $result['firstname'] = isset($user['firstName']) ? $user['firstName'] : null;
$result['lastname'] = isset($user['lastName']) ? $user['lastName'] : null; $result['lastname'] = isset($user['lastName']) ? $user['lastName'] : null;
} }
@ -3448,8 +3450,8 @@ function api_is_anonymous($user_id = null, $db_check = false)
if (!isset($user_id)) { if (!isset($user_id)) {
$user_id = api_get_user_id(); $user_id = api_get_user_id();
} }
$info = api_get_user_info($user_id);
$info = api_get_user_info($user_id);
if ($info['status'] == 6 || $user_id == 0 || empty($info)) { if ($info['status'] == 6 || $user_id == 0 || empty($info)) {
return true; return true;
} }

@ -3,6 +3,7 @@
use Chamilo\CoreBundle\Entity\SessionRelCourseRelUser; use Chamilo\CoreBundle\Entity\SessionRelCourseRelUser;
use Chamilo\UserBundle\Entity\User; use Chamilo\UserBundle\Entity\User;
use Chamilo\CoreBundle\Framework\Container;
/** /**
* Class Template * Class Template
@ -91,15 +92,13 @@ class Template
]; ];
$urlId = api_get_current_access_url_id(); $urlId = api_get_current_access_url_id();
$cache_folder = api_get_path(SYS_ARCHIVE_PATH).'twig/'.$urlId.'/'; $cache_folder = api_get_path(SYS_ARCHIVE_PATH).'twig/'.$urlId.'/';
if (!is_dir($cache_folder)) { if (!is_dir($cache_folder)) {
mkdir($cache_folder, api_get_permissions_for_new_directories(), true); //mkdir($cache_folder, api_get_permissions_for_new_directories(), true);
} }
$loader = new Twig_Loader_Filesystem($template_paths); $loader = new Twig_Loader_Filesystem($template_paths);
$isTestMode = api_get_setting('server_type') === 'test'; $isTestMode = api_get_setting('server_type') === 'test';
//Setting Twig options depending on the server see http://twig.sensiolabs.org/doc/api.html#environment-options //Setting Twig options depending on the server see http://twig.sensiolabs.org/doc/api.html#environment-options
@ -354,7 +353,7 @@ class Template
public function display_one_col_template() public function display_one_col_template()
{ {
$tpl = $this->get_template('layout/layout_1_col.html.twig'); $tpl = $this->get_template('layout/layout_1_col.html.twig');
echo \Chamilo\CoreBundle\Framework\Container::getTemplating()->render($tpl, $this->params); echo Container::getTemplating()->render($tpl, $this->params);
} }
/** /**
@ -363,7 +362,7 @@ class Template
public function display_two_col_template() public function display_two_col_template()
{ {
$tpl = $this->get_template('layout/layout_2_col.html.twig'); $tpl = $this->get_template('layout/layout_2_col.html.twig');
echo \Chamilo\CoreBundle\Framework\Container::getTemplating()->render($tpl, $this->params); echo Container::getTemplating()->render($tpl, $this->params);
} }
/** /**
@ -494,6 +493,7 @@ class Template
return 'default/'.$name; return 'default/'.$name;
} }
} }
$name = str_replace('tpl', 'html.twig', $name);
return $this->templateFolder.'/'.$name; return $this->templateFolder.'/'.$name;
} }
@ -744,11 +744,11 @@ class Template
{ {
global $disable_js_and_css_files; global $disable_js_and_css_files;
// chamilo CSS // chamilo CSS
$css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'../chamilo.css'); //$css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'../chamilo.css');
// Base CSS // Base CSS
$css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'base.css'); //$css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'base.css');
$css = [];
if ($this->show_learnpath) { if ($this->show_learnpath) {
$css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'scorm.css'); $css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'scorm.css');
if (is_file(api_get_path(SYS_CSS_PATH).$this->themeDir.'learnpath.css')) { if (is_file(api_get_path(SYS_CSS_PATH).$this->themeDir.'learnpath.css')) {
@ -756,11 +756,10 @@ class Template
} }
} }
$css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).$this->themeDir.'default.css'); //$css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).$this->themeDir.'default.css');
$css_file_to_string = '';
$css_file_to_string = null;
foreach ($css as $file) { foreach ($css as $file) {
// $css_file_to_string .= api_get_css($file); $css_file_to_string .= api_get_css($file);
} }
// @todo move this somewhere else. Special fix when using tablets in order to see the text near icons // @todo move this somewhere else. Special fix when using tablets in order to see the text near icons
@ -1419,8 +1418,15 @@ class Template
if ($clearFlashMessages) { if ($clearFlashMessages) {
Display::cleanFlashMessages(); Display::cleanFlashMessages();
} }
$template = str_replace('tpl', 'html.twig', $template);
$templateFile = api_get_path(SYS_PATH).'main/template/'.$template;
echo $this->twig->render($template, $this->params); if (!file_exists($templateFile)) {
$e = new \Gaufrette\Exception\FileNotFound($templateFile);
echo $e->getMessage();
exit;
}
echo Container::getTemplating()->render($template, $this->params);
} }
/** /**

@ -1,6 +1,6 @@
{% {%
extends hide_header == true extends hide_header == true
? template ~ "/layout/blank.tpl" ? template ~ "/layout/blank.html.twig"
: template ~ "/layout/layout_1_col.html.twig" : template ~ "/layout/layout_1_col.html.twig"
%} %}

@ -1,4 +1,4 @@
{% extends template ~ "/layout/page.tpl" %} {% extends template ~ "/layout/page.html.twig" %}
{% block body %} {% block body %}
<script> <script>

@ -1,5 +1,5 @@
{% extends template ~ "/layout/no_layout.tpl" %} {% extends template ~ "/layout/no_layout.html.twig" %}
{% block body %} {% block body %}
{% include template ~ '/javascript/editor/elfinder_standalone.tpl' %} {% include template ~ '/javascript/editor/elfinder_standalone.html.twig' %}
{% endblock %} {% endblock %}

@ -4,7 +4,7 @@
<!--[if IE 8]> <html lang="{{document_language}}" class="no-js lt-ie9"> <![endif]--> <!--[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]--> <!--[if gt IE 8]><!--><html lang="{{document_language}}" class="no-js"> <!--<![endif]-->
<head> <head>
{% include template ~ "/layout/head.tpl" %} {% include template ~ "/layout/head.html.twig" %}
</head> </head>
<body dir="{{text_direction}}" class="{{section_name}}"> <body dir="{{text_direction}}" class="{{section_name}}">
<div class="page-blank"> <div class="page-blank">

@ -76,7 +76,7 @@
</div> </div>
</div> </div>
{% include template ~ '/layout/footer.js.tpl' %} {% include template ~ '/layout/footer.js.html.twig' %}
{{ execution_stats }} {{ execution_stats }}
{% endautoescape %} {% endautoescape %}

@ -55,7 +55,7 @@ $(document).ready(function () {
</script> </script>
{% include template ~ '/layout/header.js.tpl' %} {% include template ~ '/layout/header.js.html.twig' %}
{{ css_custom_file_to_string }} {{ css_custom_file_to_string }}
{{ css_style_print }} {{ css_style_print }}

@ -35,7 +35,7 @@ $(document).ready( function() {
</div> </div>
<div id="list-hot-courses" class="grid-courses"> <div id="list-hot-courses" class="grid-courses">
<div class="row"> <div class="row">
{% include template ~ '/layout/hot_course_item.tpl' %} {% include template ~ '/layout/hot_course_item.html.twig' %}
</div> </div>
</div> </div>
</section> </section>

@ -1,4 +1,4 @@
{% extends template ~ "/layout/page.tpl" %} {% extends template ~ "/layout/page.html.twig" %}
{% block body %} {% block body %}
{% autoescape false %} {% autoescape false %}
@ -19,7 +19,7 @@
<div class="row"> <div class="row">
<div class="col-xs-12 col-md-12"> <div class="col-xs-12 col-md-12">
{% include template ~ "/layout/page_body.tpl" %} {% include template ~ "/layout/page_body.html.twig" %}
{% block content %} {% block content %}
{% if content is not null %} {% if content is not null %}
<section id="main_content"> <section id="main_content">

@ -1,47 +0,0 @@
{% extends template ~ "/layout/page.tpl" %}
{% block body %}
{% 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 %}
{% endblock %}

@ -1,4 +1,4 @@
{% extends template ~ "/layout/page.tpl" %} {% extends template ~ "/layout/page.html.twig" %}
{% block body %} {% block body %}
{% autoescape false %} {% autoescape false %}
@ -27,7 +27,7 @@
{% endif %} {% endif %}
{% block page_body %} {% block page_body %}
{% include template ~ "/layout/page_body.tpl" %} {% include template ~ "/layout/page_body.html.twig" %}
{% endblock %} {% endblock %}
{% if welcome_to_course_block %} {% if welcome_to_course_block %}
@ -56,7 +56,7 @@
</article> </article>
{% endif %} {% endif %}
{% include template ~ "/layout/hot_courses.tpl" %} {% include template ~ "/layout/hot_courses.html.twig" %}
{% if plugin_content_bottom %} {% if plugin_content_bottom %}
<div id="plugin_content_bottom"> <div id="plugin_content_bottom">
@ -73,7 +73,7 @@
</div> </div>
{% endif %} {% endif %}
{% include template ~ "/layout/login_form.tpl" %} {% include template ~ "/layout/login_form.html.twig" %}
{% if _u.logged == 1 %} {% if _u.logged == 1 %}
{{ user_image_block }} {{ user_image_block }}

@ -1,263 +0,0 @@
{% extends template ~ "/layout/page.tpl" %}
{% block body %}
{% 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 %}
{% endblock %}

@ -1,4 +1,4 @@
{% extends template ~ "/layout/page.tpl" %} {% extends template ~ "/layout/page.html.twig" %}
{% block body %} {% block body %}
<div id="maincontent" class="maincontent"> <div id="maincontent" class="maincontent">
{{ plugin_courses_block }} {{ plugin_courses_block }}

@ -4,7 +4,7 @@
<!--[if IE 8]> <html lang="{{document_language}}" class="no-js lt-ie9"> <![endif]--> <!--[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]--> <!--[if gt IE 8]><!--><html lang="{{document_language}}" class="no-js"> <!--<![endif]-->
<head> <head>
{% include template ~ "/layout/head.tpl" %} {% include template ~ "/layout/head.html.twig" %}
</head> </head>
<body dir="{{text_direction}}" class="{{section_name}}"> <body dir="{{text_direction}}" class="{{section_name}}">
<section id="content-scorm"> <section id="content-scorm">

@ -7,7 +7,7 @@
<html lang="{{ document_language }}" class="no-js"> <!--<![endif]--> <html lang="{{ document_language }}" class="no-js"> <!--<![endif]-->
<head> <head>
{% block head %} {% block head %}
{% include template ~ "/layout/head.tpl" %} {% include template ~ "/layout/head.html.twig" %}
{% endblock %} {% endblock %}
</head> </head>
<body dir="{{ text_direction }}" class="{{ section_name }} {{ login_class }}"> <body dir="{{ text_direction }}" class="{{ section_name }} {{ login_class }}">
@ -35,7 +35,7 @@
{% endif %} {% endif %}
{% if show_header == true %} {% if show_header == true %}
{% include template ~ "/layout/page_header.tpl" %} {% include template ~ "/layout/page_header.html.twig" %}
{% endif %} {% endif %}
{% if show_course_shortcut is not null %} {% if show_course_shortcut is not null %}
<div class="nav-tools"> <div class="nav-tools">
@ -57,10 +57,10 @@
</section> </section>
{% if show_footer == true %} {% if show_footer == true %}
{% include template ~ "/layout/page_footer.tpl" %} {% include template ~ "/layout/page_footer.html.twig" %}
{% endif %} {% endif %}
{% include template ~ '/layout/footer.js.tpl' %} {% include template ~ '/layout/footer.js.html.twig' %}
</div> </div>
</body> </body>
</html> </html>

@ -4,7 +4,7 @@
{{ bug_notification }} {{ bug_notification }}
</div> </div>
{% block topbar %} {% block topbar %}
{% include template ~ "/layout/topbar.tpl" %} {% include template ~ "/layout/topbar.html.twig" %}
{% endblock %} {% endblock %}
<div class="extra-header">{{ header_extra_content }}</div> <div class="extra-header">{{ header_extra_content }}</div>
<header id="header-section" class="header-movil"> <header id="header-section" class="header-movil">
@ -54,7 +54,7 @@
</div> </div>
</header> </header>
{% block menu %} {% block menu %}
{% include template ~ "/layout/menu.tpl" %} {% include template ~ "/layout/menu.html.twig" %}
{% endblock %} {% endblock %}
{% include template ~ "/layout/course_navigation.tpl" %} {% include template ~ "/layout/course_navigation.html.twig" %}
{% endautoescape %} {% endautoescape %}

@ -0,0 +1,9 @@
{% if show_footer == true %}
</div>
</section>
{% include template ~ "/layout/page_footer.html.twig" %}
{% endif %}
</div>
{% include template ~ '/layout/footer.js.html.twig' %}
</body>
</html>

@ -1,9 +0,0 @@
{% if show_footer == true %}
</div>
</section>
{% include template ~ "/layout/page_footer.tpl" %}
{% endif %}
</div>
{% include template ~ '/layout/footer.js.tpl' %}
</body>
</html>

@ -9,7 +9,7 @@
<html lang="{{ document_language }}" class="no-js"> <!--<![endif]--> <html lang="{{ document_language }}" class="no-js"> <!--<![endif]-->
<head> <head>
{% block head %} {% block head %}
{% include template ~ "/layout/head.tpl" %} {% include template ~ "/layout/head.html.twig" %}
{% endblock %} {% endblock %}
</head> </head>
<body dir="{{ text_direction }}" class="{{ section_name }} {{ login_class }}"> <body dir="{{ text_direction }}" class="{{ section_name }} {{ login_class }}">
@ -36,7 +36,7 @@
</form> </form>
</div> </div>
{% endif %} {% endif %}
{% include template ~ "/layout/page_header.tpl" %} {% include template ~ "/layout/page_header.html.twig" %}
{% if show_course_shortcut is not null %} {% if show_course_shortcut is not null %}
<div class="nav-tools"> <div class="nav-tools">
{{ show_course_shortcut }} {{ show_course_shortcut }}

@ -66,7 +66,7 @@
</div> </div>
{# TOC layout #} {# TOC layout #}
<div id="toc_id" class="scorm-body" name="toc_name"> <div id="toc_id" class="scorm-body" name="toc_name">
{% include template ~ '/learnpath/scorm_list.tpl' %} {% include template ~ '/learnpath/scorm_list.html.twig' %}
</div> </div>
{# end TOC layout #} {# end TOC layout #}
</div> </div>

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save