Prechádzať zdrojové kódy

Merge pull request #1245 from aragonc/tplnew

Nueva estructura para entender mejor el TPL :P
Yannick Warnier 8 rokov pred
rodič
commit
1f455aa876

+ 16 - 21
app/Resources/public/css/base.css

@@ -9,29 +9,21 @@
         yannik.warnier@beeznest.com
     Version: 1.0
 */
-pre {
-    margin-top:50px !important;
-}
-html,body {
-  margin: 0;
-  padding: 0;
-  height: 100%;
-}
-#page-wrap{
-  min-height: 100%;
-  margin-bottom: 0;
-}
-#page-wrap:after{
-  content: "";
-  display: block;
-  clear: both;
+html{
+    position: relative;
+    min-height: 100%;
 }
-footer {
-  padding-top: 15px;
+body{
+    margin-bottom: 60px;
 }
-footer #footer_right{
-  text-align: right;
+/* Sticky footer style */
+.sticky-footer{
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    height: 60px;
 }
+/* End Sticky footer style */
 select {
   width : auto;
 }
@@ -51,6 +43,9 @@ a.thumbnail:hover{
   -webkit-border-radius: 5px;
   text-align: justify;
 }
+#content-section{
+    margin-bottom: 90px;
+}
 .version-checking{
   padding: 10px;
   width: 100%;
@@ -5917,7 +5912,7 @@ a.sessionView {
 }
 @media (min-width:320px) and (max-width: 479px){
     footer {
-        height: 12em;
+        
         padding-top: 15px;
     }
     footer #footer_right{

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 11
app/Resources/public/css/csshover3.htc


+ 0 - 1
app/Resources/public/css/themes/chamilo/default.css

@@ -141,7 +141,6 @@ a:focus {
 /* End Jquery UI */
 footer{
   background-color:#1A2226;
-  border-top: 2px solid #D2D6DE;
 }
 footer{
   color: #ffffff;

+ 39 - 47
main/template/default/layout/footer.tpl

@@ -1,69 +1,61 @@
-{#  Plugins for pref footer section #}
-{% if plugin_pre_footer is not null %}
-    <div id="plugin_pre_footer">
-        {{ plugin_pre_footer }}
-    </div>
-{% endif %}
-
-<footer> <!-- start of #footer section -->
+<footer id="footer-section" class="sticky-footer">
     <div class="container">
-        <div class="row">
-            <div id="footer_left" class="col-md-4">
-                {% if session_teachers is not null %}
-                    <div id="session_teachers">
+        <div class="pre-footer">
+            {% if plugin_pre_footer is not null %}
+            <div id="plugin_pre_footer">
+                {{ plugin_pre_footer }}
+            </div>
+            {% endif %}
+        </div>
+        <div class="sub-footer">
+            <div class="row">
+                <div class="col-md-4">
+                    {% if session_teachers is not null %}
+                    <div class="session-teachers">
                         {{ session_teachers }}
                     </div>
-                {% endif %}
-
-                {% if teachers is not null %}
-                    <div id="teachers">
+                    {% endif %}
+                    {% if teachers is not null %}
+                    <div class="teachers">
                         {{ teachers }}
                     </div>
-                {% endif %}
-
-                {#  Plugins for footer section #}
-                {% if plugin_footer_left is not null %}
+                    {% endif %}
+                    {% if plugin_footer_left is not null %}
                     <div id="plugin_footer_left">
                         {{ plugin_footer_left }}
                     </div>
-                {% endif %}
-                &nbsp;
-            </div>
-
-            <div id="footer_center" class="col-md-4">
-                {#   Plugins for footer section  #}
-                {% if plugin_footer_center is not null %}
+                    {% endif %}
+                </div>
+                <div class="col-md-4">
+                    {% if plugin_footer_center is not null %}
                     <div id="plugin_footer_center">
                         {{ plugin_footer_center }}
                     </div>
-                {% endif %}
-                &nbsp;
-            </div>
-
-            <div id="footer_right" class="col-md-4">
-                {% if administrator_name is not null %}
-                    <div id="admin_name">
+                    {% endif %}
+                </div>
+                <div class="col-md-4">
+                    {% if administrator_name is not null %}
+                    <div class="administrator-name">
                         {{ administrator_name }}
                     </div>
-                {% endif %}
-
-                <div id="software_name">
-	                <a href="{{_p.web}}" target="_blank">{{ "PoweredByX" |get_lang | format(_s.software_name) }}</a>
-                    &copy; {{ "now"|date("Y") }}
-                </div>
-                {#   Plugins for footer section  #}
-                {% if plugin_footer_right is not null %}
+                    {% endif %}
+                    <div class="software-name">
+	                <a href="{{_p.web}}" target="_blank">
+                            {{ "PoweredByX" |get_lang | format(_s.software_name) }}
+                        </a>&copy; {{ "now"|date("Y") }}
+                    </div>
+                    {% if plugin_footer_right is not null %}
                     <div id="plugin_footer_right">
                         {{ plugin_footer_right }}
                     </div>
-                {% endif %}
-                &nbsp;
-            </div><!-- end of #footer_right -->
-        </div><!-- end of #row -->
+                    {% endif %}
+                </div>
+            </div>
+        </div>
         <div class="extra-footer">
             {{ footer_extra_content }}
         </div>
-    </div><!-- end of #container -->
+    </div>
 </footer>
 
 <div class="modal fade" id="expand-image-modal" tabindex="-1" role="dialog" aria-labelledby="expand-image-modal-title" aria-hidden="true">

+ 0 - 2
main/template/default/layout/head.tpl

@@ -6,7 +6,6 @@
 <!--[if IE]>
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <![endif]-->
-
 {{ prefetch }}
 {{ favico }}
 <link rel="apple-touch-icon" href="{{ _p.web }}apple-touch-icon.png" />
@@ -34,5 +33,4 @@ var disconnect_lang = '{{ "ChatDisconnected"|get_lang }}';
 
 {{ css_custom_file_to_string }}
 {{ css_style_print }}
-{# Extra header configured in admin section, only shown to non-admins #}
 {{ header_extra_content }}

+ 6 - 16
main/template/default/layout/header.js.tpl

@@ -82,15 +82,11 @@ $(document).ready(function(){
         $("#student-list-work").fadeOut(300);
     });
     check_brand();
-    
-    
-    
-    
-var id;
-$(window).resize(function() {
-    clearTimeout(id);
-    id = setTimeout(doneResizing, 200);
-});
+    var id;
+    $(window).resize(function() {
+        clearTimeout(id);
+        id = setTimeout(doneResizing, 200);
+    });
 
 function doneResizing(){
   var widhtWindow = $(window).width();
@@ -108,13 +104,7 @@ function doneResizing(){
         $("#user_image_block").addClass("invisible");
     }
 };
-    /* if($('#toolbar-admin').length){
-        var heigthToolBar= $('#toolbar-admin').height();
-        $('header').css('margin-top', heigthToolBar+'px');
-        $('#page-back').css('padding-top', heigthToolBar+20+'px');
-    } */
-
-    // Removes the yellow input in Chrome
+// Removes the yellow input in Chrome
     if (navigator.userAgent.toLowerCase().indexOf("chrome") >= 0) {
         $(window).load(function(){
             $('input:-webkit-autofill').each(function(){

+ 2 - 8
main/template/default/layout/layout_1_col.tpl

@@ -1,17 +1,13 @@
-{% extends template ~ "/layout/main.tpl" %}
+{% extends template ~ "/layout/page.tpl" %}
 
-{#  1 column  #}
 {% block body %}
-    {# Plugin main top #}
     {% if plugin_main_top %}
         <div id="plugin_main_top" class="col-md-12">
             {{ plugin_main_top }}
         </div>
     {% endif %}
-
-    {#  Plugin top  #}
     {% if plugin_content_top %}
-        <div id="plugin_content_top" class="col-md-12 movil">
+        <div id="plugin_content_top" class="col-md-12">
             {{ plugin_content_top }}
         </div>
     {% endif %}
@@ -28,14 +24,12 @@
         &nbsp;
     </div>
 
-    {#  Plugin bottom  #}
     {% if plugin_content_bottom %}
         <div id="plugin_content_bottom" class="col-md-12">
             {{ plugin_content_bottom }}
         </div>
     {% endif %}
 
-    {# Plugin main bottom #}
     {% if plugin_main_bottom %}
         <div id="plugin_main_bottom" class="col-md-12">
             {{ plugin_main_bottom }}

+ 48 - 95
main/template/default/layout/layout_2_col.tpl

@@ -1,98 +1,59 @@
-{% extends template ~ "/layout/main.tpl" %}
+{% extends template ~ "/layout/page.tpl" %}
 
 {% block body %}
-	{# Main content #}
-
-    {# Plugin main top #}
-    {% if plugin_main_top %}
-        <div id="plugin_main_top" class="col-md-12">
-            {{ plugin_main_top }}
-        </div>
+{% if plugin_main_top %}
+    <div id="plugin_main_top" class="col-md-12">
+        {{ plugin_main_top }}
+    </div>
     {% endif %}
-
-	{#  Right column #}
 	<div class="col-md-3 menu-column">
-        {% if plugin_menu_top %}
-            <div id="plugin_menu_top">
-                {{plugin_menu_top}}
-            </div>
-        {% endif %}
-
-	    {# if user is not login show the login form #}
-        {% block login_form %}
-		{% if _u.logged  == 0 %}
-			{% include template ~ "/layout/login_form.tpl" %}
-		{% endif %}
-        {% endblock %}
-
-		{# User picture #}
-        {% if _u.logged  == 1 %}
-            {{ user_image_block }}
-        {% endif %}
-        {# User Profile links #}
-		{{ profile_block }}
-
-
-        {# Course block - admin #}
-		{{ course_block }}
-
-        {# Course block - teacher #}
-		{{ teacher_block }}
-
-        {# Skills #}
-        {{ skills_block }}
-
-        {# Certificates search block #}
-        {{ certificates_search_block }}
-
-		{# Notice #}
-		{{ notice_block }}
-
-        {# Help #}
-		{{ help_block }}
-
-		{# Links that are not added in the tabs #}
-		{{ navigation_course_links }}
-
-		{# Search (xapian) #}
-		{{ search_block }}
-
-		{# Classes #}
-		{{ classes_block }}
-
-		{# Plugin courses sidebar #}
-        {# Plugins for footer section #}
-
-        {% if plugin_menu_bottom %}
-            <div id="plugin_menu_bottom">
-                {{ plugin_menu_bottom }}
-            </div>
-        {% endif %}
+    {% if plugin_menu_top %}
+        <div id="plugin_menu_top">
+            {{plugin_menu_top}}
+        </div>
+    {% endif %}
+	
+    {% include template ~ "/layout/login_form.tpl" %}
+        
+    {% if _u.logged  == 1 %}
+        {{ user_image_block }}
+    {% endif %}
+        
+    {{ profile_block }}
+	{{ course_block }}
+	{{ teacher_block }}
+    {{ skills_block }}
+    {{ certificates_search_block }}
+	{{ notice_block }}
+	{{ help_block }}
+	{{ navigation_course_links }}
+	{{ search_block }}
+	{{ classes_block }}
+        
+    {% if plugin_menu_bottom %}
+        <div id="plugin_menu_bottom">
+            {{ plugin_menu_bottom }}
+        </div>
+    {% endif %}
 	</div>
-
 	<div class="col-md-9">
-        {# Plugin bottom #}
         {% if plugin_content_top %}
             <div id="plugin_content_top">
                 {{ plugin_content_top }}
             </div>
         {% endif %}
-
-		{# Portal homepage #}
         {% if home_page_block %}
             <section id="homepage-home">
                 {{ home_page_block }}
             </section>
         {% endif %}
-
-		{#  ??  #}
-		{{ sniff_notification }}
-
+        
+        {{ sniff_notification }}
+        
         {% block page_body %}
-        {% include template ~ "/layout/page_body.tpl" %}
+            {% include template ~ "/layout/page_body.tpl" %}
         {% endblock %}
-
-        {# Welcome to course block  #}
+        
         {% if welcome_to_course_block %}
             <section id="homepage-course">
             {{ welcome_to_course_block }}
@@ -107,37 +68,29 @@
         {% endif %}
         {% endblock %}
 
-		{# Announcements  #}
         {% if announcements_block %}
             <section id="homepage-announcements">
             {{ announcements_block }}
             </section>
         {% endif %}
 
-        {# Course categories (must be turned on in the admin settings) #}
         {% if course_category_block %}
             <section id="homepage-course-category">
                 {{ course_category_block }}
             </section>
         {% endif %}
 
-		{# Hot courses template  #}
-		{% include template ~ "/layout/hot_courses.tpl" %}
+	{% include template ~ "/layout/hot_courses.tpl" %}
 
-        {# Content bottom  #}
-        {% if plugin_content_bottom %}
-            <div id="plugin_content_bottom">
-                {{plugin_content_bottom}}
-            </div>
-        {% endif %}
-        &nbsp;
-	</div>
-
-    {# Plugin main bottom #}
-    {% if plugin_main_bottom %}
-        <div id="plugin_main_bottom" class="col-md-12">
-            {{ plugin_main_bottom }}
+    {% if plugin_content_bottom %}
+        <div id="plugin_content_bottom">
+            {{plugin_content_bottom}}
         </div>
     {% endif %}
-
+</div>
+{% if plugin_main_bottom %}
+    <div id="plugin_main_bottom" class="col-md-12">
+        {{ plugin_main_bottom }}
+    </div>
+{% endif %}
 {% endblock %}

+ 19 - 22
main/template/default/layout/layout_3_col.tpl

@@ -1,24 +1,21 @@
-{#  This template is NOT used in chamilo 1.9 #}
-{% extends template ~ "/layout/main.tpl" %}
-
+{% extends template ~ "/layout/page.tpl" %}
 {% block body %}
-	<div id="maincontent" class="maincontent">
-		{{ plugin_courses_block}}
-		{{ home_page_block}}
-		{{ message}}
-		{{ content}}
-		{{ announcements_block}}
-	</div>
-
-	<div id="menu-wrapper">
-		{{ login_block}}
-		{{ profile_block}}
-		{{ account_block}}
-		{{ teacher_block}}
-		{{ notice_block}}
-		{{ navigation_course_links}}
-		{{ plugin_courses_right_block}}
-		{{ search_block}}
-		{{ classes_block}}
-	</div>
+<div id="maincontent" class="maincontent">
+    {{ plugin_courses_block}}
+    {{ home_page_block}}
+    {{ message}}
+    {{ content}}
+    {{ announcements_block}}
+</div>
+<div id="menu-wrapper">
+    {{ login_block}}
+    {{ profile_block}}
+    {{ account_block}}
+    {{ teacher_block}}
+    {{ notice_block}}
+    {{ navigation_course_links}}
+    {{ plugin_courses_right_block}}
+    {{ search_block}}
+    {{ classes_block}}
+</div>
 {% endblock %}

+ 3 - 1
main/template/default/layout/login_form.tpl

@@ -1,8 +1,9 @@
+{% if _u.logged  == 0 %}
 {% if login_form %}
     <div id="login_block" class="panel panel-default">
         <div class="panel-body">
         {{ login_language_form }}
-
+        
         {% if plugin_login_top is not null %}
             <div id="plugin_login_top">
                 {{ plugin_login_top }}
@@ -33,3 +34,4 @@
         </div>
     </div>
 {% endif %}
+{% endif %}

+ 0 - 19
main/template/default/layout/main.tpl

@@ -1,19 +0,0 @@
-{% block header %}
-{% include template ~ "/layout/main_header.tpl" %}
-{% endblock %}
-
-{% block body %}
-	{% if show_sniff == 1 %}
-	 	{% include template ~ "/layout/sniff.tpl" %}
-	{% endif %}
-{% endblock %}
-
-{% block footer %}
-    {#  Footer  #}
-    {% if show_footer == true %}
-        </div> <!-- end of #col" -->
-        </div> <!-- end of #row" -->
-        </div> <!-- end of #container" -->
-    {% endif %}
-    {% include template ~ "/layout/main_footer.tpl" %}
-{% endblock %}

+ 0 - 21
main/template/default/layout/main_footer.tpl

@@ -1,21 +0,0 @@
-{% if show_footer == true %}
-    {% include template ~ "/layout/footer.tpl" %}
-{% endif %}
-
-    {# Global modal, load content by AJAX call to href attribute on anchor tag with 'ajax' class #}
-    <div class="modal fade" id="global-modal" tabindex="-1" role="dialog" aria-labelledby="global-modal-title" aria-hidden="true">
-        <div class="modal-dialog modal-lg">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="{{ "Close" | get_lang }}">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                    <h4 class="modal-title" id="global-modal-title">&nbsp;</h4>
-                </div>
-                <div class="modal-body">
-                </div>
-            </div>
-        </div>
-    </div>
-</body>
-</html>

+ 0 - 108
main/template/default/layout/main_header.tpl

@@ -1,108 +0,0 @@
-<!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]-->
-<!--[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>
-{% block head %}
-{% include template ~ "/layout/head.tpl" %}
-{% endblock %}
-</head>
-<body dir="{{ text_direction }}" class="{{ section_name }} {{ login_class }}">
-<noscript>{{ "NoJavascript"|get_lang }}</noscript>
-
-<!-- Display the Chamilo Uses Cookies Warning Validation if needed -->
-{% if displayCookieUsageWarning == true %}
-<div class="toolbar-cookie alert-warning">
-    <form onSubmit="$(this).toggle('slow')" action="" method="post">
-        <input value=1 type="hidden" name="acceptCookies"/>
-        <div class="cookieUsageValidation">
-            {{ "YouAcceptCookies" | get_lang }}
-            <span style="margin-left:20px;" onclick="$(this).next().toggle('slow'); $(this).toggle('slow')">
-                ({{"More" | get_lang }})
-            </span>
-            <div style="display:none; margin:20px 0;">
-                {{ "HelpCookieUsageValidation" | get_lang}}
-            </div>
-            <span style="margin-left:20px;" onclick="$(this).parent().parent().submit()">
-                ({{"Accept" | get_lang }})
-            </span>
-        </div>
-    </form>
-</div>
-{% endif %}
-{% if show_header == true %}
-<div id="page-wrap"><!-- page section -->
-    <div id="navigation" class="notification-panel">
-        {{ help_content }}
-        {{ bug_notification }}
-    </div>
-    {% block topbar %}
-        {% include template ~ "/layout/topbar.tpl" %}
-    {% endblock %}
-    <div class="extra-header">{{ header_extra_content }}</div>
-        <header>
-            <section id="main" class="container">
-                {% if plugin_header_main %}
-                <div class="row">
-                    <div class="col-lg-12">
-                        {{ plugin_header_main }}
-                    </div>
-                </div>
-                {% endif %}
-                <div class="row">
-                    <div class="col-lg-3">
-                        <div class="logo">
-                            {{ logo }}
-                        </div>
-                    </div>
-                    <div class="col-lg-9">
-                        <div class="col-sm-4">
-                            {% if plugin_header_left is not null %}
-                            <div id="plugin_header_left">
-                                {{ plugin_header_left }}
-                            </div>
-                            {% endif %}
-                        </div>
-                        <div class="col-sm-4">
-                            {% if plugin_header_center is not null %}
-                            <div id="plugin_header_center">
-                                {{ plugin_header_center }}
-                            </div>
-                            {% endif %}
-                        </div>
-                        <div class="col-sm-4">
-                            {% if plugin_header_right is not null %}
-                            <div id="plugin_header_right">
-                                {{ plugin_header_right }}
-                            </div>
-                            {% endif %}
-                            <div class="section-notifications">
-                                <ul id="notifications" class="nav nav-pills pull-right">
-                                    {{ notification_menu }}
-                                </ul>
-                            </div>
-                            {{ accessibility }}
-                        </div>
-                    </div>
-                </div>
-            </section>
-        </header>
-<section id="menu-bar">
-    {# menu #}
-    {% block menu %}
-        {% include template ~ "/layout/menu.tpl" %}
-    {% endblock %}
-</section>
-<section id="breadcrumb-bar">
-    <div class="container">
-        {# breadcrumb #}
-        {% block breadcrumb %}
-            {{ breadcrumb }}
-        {% endblock %}
-    </div>
-</section>
-    <div id="top_main_content" class="container">
-    <div class="row">
-    {% include template ~ "/layout/course_navigation.tpl" %}
-{% endif %}

+ 3 - 4
main/template/default/layout/menu.tpl

@@ -1,4 +1,4 @@
-<nav class="navbar navbar-default">
+<nav id="menubar" class="navbar navbar-default">
     <div class="container">
         <!-- Brand and toggle get grouped for better mobile display -->
         <div class="navbar-header">
@@ -9,7 +9,6 @@
                 <span class="icon-bar"></span>
             </button>
         </div>
-        <!-- Collect the nav links, forms, and other content for toggling -->
         <div class="collapse navbar-collapse" id="menuone">
             <ul class="nav navbar-nav">
                 {% for item in menu %}
@@ -51,6 +50,6 @@
                {% endif %}
             </ul>
             {% endif %}
-        </div><!-- /.navbar-collapse -->
-    </div><!-- /.container-fluid -->
+        </div>
+    </div>
 </nav>

+ 46 - 13
main/template/default/layout/no_layout.tpl

@@ -1,16 +1,49 @@
 <!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]-->
-<!--[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 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]-->
+<!--[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 template ~ "/layout/head.tpl" %}
-</head>
-<body dir="{{text_direction}}" class="{{section_name}}">
-{% block name%}
-{% endblock %}
-{% block body %}
-    {{ content }}
-{% endblock %}
-</body>
+    {% block head %}
+        {% include template ~ "/layout/head.tpl" %}
+    {% endblock %}
+  </head>
+<body dir="{{ text_direction }}" class="{{ section_name }} {{ login_class }}">
+<noscript>{{ "NoJavascript"|get_lang }}</noscript>
+    <div class="wrap">
+        <!-- Display Cookies validation -->
+        {% if displayCookieUsageWarning == true %}
+        <div class="toolbar-cookie alert-warning">
+            <form onSubmit="$(this).toggle('slow')" action="" method="post">
+                <input value=1 type="hidden" name="acceptCookies"/>
+                <div class="cookieUsageValidation">
+                    {{ "YouAcceptCookies" | get_lang }}
+                    <span style="margin-left:20px;" onclick="$(this).next().toggle('slow'); $(this).toggle('slow')">
+                        ({{"More" | get_lang }})
+                    </span>
+                    <div style="display:none; margin:20px 0;">
+                        {{ "HelpCookieUsageValidation" | get_lang}}
+                    </div>
+                    <span style="margin-left:20px;" onclick="$(this).parent().parent().submit()">
+                        ({{"Accept" | get_lang }})
+                    </span>
+                </div>
+            </form>
+        </div>
+        {% endif %}
+    	{% include template ~ "/layout/page_header.tpl" %}
+		<section id="content-section">
+			<div class="container">
+                                {% block breadcrumb %}
+                                    {{ breadcrumb }}
+                                {% endblock %}
+				{% block body %}
+                                    {{ content }}
+                                {% endblock %}
+			</div>
+		</section>
+	{% include template ~ "/layout/page_footer.tpl" %}	
+    </div>
+  </body>
 </html>

+ 53 - 0
main/template/default/layout/page.tpl

@@ -0,0 +1,53 @@
+<!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]-->
+<!--[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>
+{% block head %}
+    {% include template ~ "/layout/head.tpl" %}
+{% endblock %}
+</head>
+<body dir="{{ text_direction }}" class="{{ section_name }} {{ login_class }}">
+<noscript>{{ "NoJavascript"|get_lang }}</noscript>
+<div class="wrap">   
+    {% if displayCookieUsageWarning == true %}
+    <!-- Display Cookies validation -->
+    <div class="toolbar-cookie alert-warning">
+        <form onSubmit="$(this).toggle('slow')" action="" method="post">
+            <input value=1 type="hidden" name="acceptCookies"/>
+            <div class="cookieUsageValidation">
+                {{ "YouAcceptCookies" | get_lang }}
+                <span style="margin-left:20px;" onclick="$(this).next().toggle('slow'); $(this).toggle('slow')">
+                    ({{"More" | get_lang }})
+                </span>
+                <div style="display:none; margin:20px 0;">
+                    {{ "HelpCookieUsageValidation" | get_lang}}
+                </div>
+                <span style="margin-left:20px;" onclick="$(this).parent().parent().submit()">
+                    ({{"Accept" | get_lang }})
+                </span>
+            </div>
+        </form>
+    </div>
+    {% endif %}
+    	{% include template ~ "/layout/page_header.tpl" %}
+	<section id="content-section">
+            <div class="container">
+                {% block breadcrumb %}
+                    {{ breadcrumb }}
+                {% endblock %}
+                {% include template ~ "/layout/course_navigation.tpl" %}
+                {% block body %}
+                    {{ content }}
+                {% endblock %} 
+            </div>
+	</section>
+    {% if show_sniff == 1 %}
+            {% include template ~ "/layout/sniff.tpl" %}
+    {% endif %}
+	{% include template ~ "/layout/page_footer.tpl" %}	
+    </div>
+  </body>
+</html>

+ 0 - 9
main/template/default/layout/page_body.tpl

@@ -1,17 +1,10 @@
-{#  Actions  #}
 {% if actions != '' %}
     <div class="actions">
         {{ actions }}
     </div>
-{% else %}
-    <div class="actions-line">
-        {{ actions }}
-    </div>
 {% endif %}
 {{ flash_messages }}
 <span id="js_alerts"></span>
-
-{#  Page header #}
 {% if header != '' %}
     <div class="section-page">
         <div class="page-header">
@@ -19,8 +12,6 @@
         </div>
     </div>
 {% endif %}
-
-{#  Show messages #}
 {% if message != '' %}
     <section id="messages">
         {{ message}}

+ 76 - 0
main/template/default/layout/page_footer.tpl

@@ -0,0 +1,76 @@
+<footer id="footer-section" class="sticky-footer">
+    <div class="container">
+        <div class="pre-footer">
+            {% if plugin_pre_footer is not null %}
+            <div id="plugin_pre_footer">
+                {{ plugin_pre_footer }}
+            </div>
+            {% endif %}
+        </div>
+        <div class="sub-footer">
+            <div class="row">
+                <div class="col-md-4">
+                    {% if session_teachers is not null %}
+                    <div class="session-teachers">
+                        {{ session_teachers }}
+                    </div>
+                    {% endif %}
+                    {% if teachers is not null %}
+                    <div class="teachers">
+                        {{ teachers }}
+                    </div>
+                    {% endif %}
+                    {% if plugin_footer_left is not null %}
+                    <div id="plugin_footer_left">
+                        {{ plugin_footer_left }}
+                    </div>
+                    {% endif %}
+                </div>
+                <div class="col-md-4">
+                    {% if plugin_footer_center is not null %}
+                    <div id="plugin_footer_center">
+                        {{ plugin_footer_center }}
+                    </div>
+                    {% endif %}
+                </div>
+                <div class="col-md-4">
+                    {% if administrator_name is not null %}
+                    <div class="administrator-name">
+                        {{ administrator_name }}
+                    </div>
+                    {% endif %}
+                    <div class="software-name">
+	                <a href="{{_p.web}}" target="_blank">
+                            {{ "PoweredByX" |get_lang | format(_s.software_name) }}
+                        </a>&copy; {{ "now"|date("Y") }}
+                    </div>
+                    {% if plugin_footer_right is not null %}
+                    <div id="plugin_footer_right">
+                        {{ plugin_footer_right }}
+                    </div>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
+        <div class="extra-footer">
+            {{ footer_extra_content }}
+        </div>
+    </div>
+</footer>
+
+<div class="modal fade" id="expand-image-modal" tabindex="-1" role="dialog" aria-labelledby="expand-image-modal-title" aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="{{ "Close" | get_lang }}"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="expand-image-modal-title">&nbsp;</h4>
+            </div>
+            <div class="modal-body">
+            </div>
+        </div>
+    </div>
+</div>
+                
+{% include template ~ '/layout/footer.js.tpl' %}
+
+{{ execution_stats }}

+ 53 - 0
main/template/default/layout/page_header.tpl

@@ -0,0 +1,53 @@
+<div id="navigation" class="notification-panel">
+    {{ help_content }}
+    {{ bug_notification }}
+</div>
+    {% block topbar %}
+        {% include template ~ "/layout/topbar.tpl" %}
+    {% endblock %}
+<div class="extra-header">{{ header_extra_content }}</div>
+<header id="header-section">
+<section>
+    <div class="container">
+	<div class="row">
+	    <div class="col-md-3">
+	    	<div class="logo">
+                {{ logo }}
+            </div>
+	    </div>
+            <div class="col-md-9">
+                <div class="col-sm-4">
+                    {% if plugin_header_left is not null %}
+                    <div id="plugin_header_left">
+                        {{ plugin_header_left }}
+                    </div>
+                    {% endif %}
+                </div>
+                <div class="col-sm-4">
+                    {% if plugin_header_center is not null %}
+                    <div id="plugin_header_center">
+                        {{ plugin_header_center }}
+                    </div>
+                    {% endif %}
+                </div>
+                <div class="col-sm-4">
+                    {% if plugin_header_right is not null %}
+                    <div id="plugin_header_right">
+                        {{ plugin_header_right }}
+                    </div>
+                    {% endif %}
+                    <div class="section-notifications">
+                        <ul id="notifications" class="nav nav-pills pull-right">
+                            {{ notification_menu }}
+                        </ul>
+                    </div>
+                    {{ accessibility }}
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
+{% block menu %}
+    {% include template ~ "/layout/menu.tpl" %}
+{% endblock %}
+</header>

+ 5 - 25
main/template/default/layout/show_footer.tpl

@@ -1,26 +1,6 @@
-{#
-    show_header and show_footer templates are only called when using the
-    Display::display_header and Display::display_footer
-    for backward compatibility we suppose that the default layout is one column
-    which means using a div with class span12
-#}
-{% if show_header == true %}
-    </section>
-</div>
-{% endif %}
-
-{# Plugin bottom  #}
-{% if plugin_content_bottom is not null %}
-    <div id="plugin_content_bottom" class="col-md-12">
-        {{ plugin_content_bottom}}
     </div>
-{% endif %}
-
-{% if show_footer == true %}
-    </div> <!-- end of #col" -->
-    </div> <!-- end of #row" -->
-    </div> <!-- end of #container" -->
-
-{% endif %}
-
-{% include template ~ "/layout/main_footer.tpl" %}
+</section>
+{% include template ~ "/layout/page_footer.tpl" %}
+</div>
+</body>
+</html>

+ 37 - 16
main/template/default/layout/show_header.tpl

@@ -1,17 +1,38 @@
-{% 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
-    for backward compatibility we suppose that the default layout is one column
-    which means using a div with class span12
-#}
-{% if show_header == true %}
-    {% if plugin_content_top is not null %}
-        <div id="plugin_content_top" class="col-md-12">
-            {{ plugin_content_top }}
-        </div>
-    {% endif %}
-    <div class="col-md-12">
-        {% include template ~ "/layout/page_body.tpl" %}
-        <section id="main_content">
+<!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]-->
+<!--[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>
+{% block head %}
+    {% include template ~ "/layout/head.tpl" %}
+{% endblock %}
+</head>
+<body dir="{{ text_direction }}" class="{{ section_name }} {{ login_class }}">
+<noscript>{{ "NoJavascript"|get_lang }}</noscript>
+<div class="wrap">   
+    {% if displayCookieUsageWarning == true %}
+    <!-- Display Cookies validation -->
+    <div class="toolbar-cookie alert-warning">
+        <form onSubmit="$(this).toggle('slow')" action="" method="post">
+            <input value=1 type="hidden" name="acceptCookies"/>
+            <div class="cookieUsageValidation">
+                {{ "YouAcceptCookies" | get_lang }}
+                <span style="margin-left:20px;" onclick="$(this).next().toggle('slow'); $(this).toggle('slow')">
+                    ({{"More" | get_lang }})
+                </span>
+                <div style="display:none; margin:20px 0;">
+                    {{ "HelpCookieUsageValidation" | get_lang}}
+                </div>
+                <span style="margin-left:20px;" onclick="$(this).parent().parent().submit()">
+                    ({{"Accept" | get_lang }})
+                </span>
+            </div>
+        </form>
+    </div>
 {% endif %}
+{% include template ~ "/layout/page_header.tpl" %}
+<section id="content-section">
+    <div class="container">
+        

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov