Browse Source

Update templates

Julio Montoya 9 years ago
parent
commit
c768c238c5

+ 12 - 12
app/config/assetic.yml

@@ -39,18 +39,18 @@ assetic:
                 - bundles/chamilotheme/components/jqgrid/css/ui.jqgrid.css
                 - bundles/chamilotheme/components/select2/dist/css/select2.css
 #                - bundles/chamilotheme/components/select2/select2-bootstrap.css
-                - bundles/chamilotheme/components/adminlte/css/jvectormap/*
-                - bundles/chamilotheme/components/adminlte/css/morris/*
-                - bundles/chamilotheme/components/adminlte/css/bootstrap-wysihtml5/bootstrap3-wysihtml5.css
-                - bundles/chamilotheme/components/adminlte/css/bootstrap-slider/slider.css
-                - bundles/chamilotheme/components/adminlte/css/colorpicker/bootstrap-colorpicker.css
-                - bundles/chamilotheme/components/adminlte/css/datatables/dataTables.bootstrap.css
-                - bundles/chamilotheme/components/adminlte/css/daterangepicker/daterangepicker-bs3.css
-                - bundles/chamilotheme/components/adminlte/css/iCheck/all.css
-                - bundles/chamilotheme/components/adminlte/css/ionslider/ion.rangeSlider.css
-                - bundles/chamilotheme/components/adminlte/css/timepicker/bootstrap-timepicker.css
+#                - bundles/chamilotheme/components/adminlte/css/jvectormap/*
+#                - bundles/chamilotheme/components/adminlte/css/morris/*
+#                - bundles/chamilotheme/components/adminlte/css/bootstrap-wysihtml5/bootstrap3-wysihtml5.css
+#                - bundles/chamilotheme/components/adminlte/css/bootstrap-slider/slider.css
+#                - bundles/chamilotheme/components/adminlte/css/colorpicker/bootstrap-colorpicker.css
+#                - bundles/chamilotheme/components/adminlte/css/datatables/dataTables.bootstrap.css
+#                - bundles/chamilotheme/components/adminlte/css/daterangepicker/daterangepicker-bs3.css
+#                - bundles/chamilotheme/components/adminlte/css/iCheck/all.css
+#                - bundles/chamilotheme/components/adminlte/css/ionslider/ion.rangeSlider.css
+#                - bundles/chamilotheme/components/adminlte/css/timepicker/bootstrap-timepicker.css
                 - bundles/chamilotheme/components/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.css
-                - bundles/chamilotheme/components/adminlte/css/AdminLTE.css
+#                - bundles/chamilotheme/components/adminlte/css/AdminLTE.css
             output: js/chamilo.css
 
         chamilo_js:
@@ -64,7 +64,7 @@ assetic:
                 - bundles/chamilotheme/components/jqgrid/js/jquery.jqGrid.js
                 - bundles/chamilotheme/components/select2/dist/js/select2.js
                 - bundles/chamilotheme/components/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js
-                - bundles/chamilotheme/components/adminlte/js/plugins/daterangepicker/daterangepicker.js
+#                - bundles/chamilotheme/components/adminlte/js/plugins/daterangepicker/daterangepicker.js
 
 #                - @ChamiloCoreBundle/Resources/public/js/app.js
             output: js/chamilo.js

+ 0 - 4
src/Chamilo/CoreBundle/Resources/views/layout.html.twig

@@ -1,9 +1,5 @@
 {% extends "@ChamiloTheme/Layout/base-layout.html.twig" %}
 
-{% block title %}
-{#{{- chamilo_settings_get('platform.site_name') -}}#}
-{% endblock %}
-
  {% block page_title %}
      {% if course is defined %}
         {# This value is set in the CourseListener #}

+ 26 - 12
src/Chamilo/ThemeBundle/Resources/views/Layout/base-layout.html.twig

@@ -3,17 +3,34 @@
 {% import "ChamiloThemeBundle:Macros:buttons.html.twig" as macro_buttons %}
 {% import "ChamiloThemeBundle:Macros:image.html.twig" as macro_image %}
 <!doctype html>
-<!--[if lt IE 7 ]><html lang="en" class="no-js ie6"> <![endif]-->
-<!--[if IE 7 ]><html lang="en" class="no-js ie7"> <![endif]-->
-<!--[if IE 8 ]><html lang="en" class="no-js ie8"> <![endif]-->
-<!--[if IE 9 ]><html lang="en" class="no-js ie9"> <![endif]-->
-<!--[if (gt IE 9)|!(IE)]><!--><html lang="en" class="no-js"> <!--<![endif]-->
+<!--[if lt IE 7 ]>
+<html lang="{{ app.request.locale }}" class="no-js ie6"> <![endif]-->
+<!--[if IE 7 ]>
+<html lang="{{ app.request.locale }}" class="no-js ie7"> <![endif]-->
+<!--[if IE 8 ]>
+<html lang="{{ app.request.locale }}" class="no-js ie8"> <![endif]-->
+<!--[if IE 9 ]>
+<html lang="{{ app.request.locale }}" class="no-js ie9"> <![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!-->
+<html lang="{{ app.request.locale }}" class="no-js"> <!--<![endif]-->
 <head>
     <meta charset="utf-8">
     <meta name="author" content="">
     <meta name="keywords" content="">
+
+    <link href="https://chamilo.org/chamilo-lms/" rel="help"/>
+    <link href="https://chamilo.org/the-association/" rel="author"/>
+    <link href="https://chamilo.org/the-association/" rel="copyright"/>
+    <link rel="apple-touch-icon" href="{{ asset('apple-touch-icon.png') }}"/>
+    <meta name="apple-mobile-web-app-capable" content="yes"/>
+    {#<meta name="Generator" content="{{ _s.software_name }} {{ _s.system_version|slice(0,1) }}" />#}
+
     <meta name="viewport" content="width=device-width,initial-scale=1">
-    <title>{% block title %}Chamilo{% endblock %}</title>
+    <title>
+        {% block title %}
+            {{ chamilo_settings_get('platform.institution') }} - {{ chamilo_settings_get('platform.site_name') }}
+        {% endblock %}
+    </title>
     <link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}" />
 
     {%- stylesheets '@chamilo_css' -%}
@@ -21,13 +38,12 @@
     {% endstylesheets %}
 
     {# Chamilo base #}
-    {#{% set theme = chamilo_settings_get('platform.theme') %}#}
-    {% set theme = 'chamilo' %}
+    {% set theme = chamilo_settings_get('platform.theme') %}
     {% set show_header = true %}
     {% set bug_notification_link = '' %}
     {% set help_content = '' %}
     {% set header_extra_content = '' %}
-    {% set logo = '' %}
+
     {% set template = 'default' %}
     {% set notification_menu = '' %}
     {% set accessibility = '' %}
@@ -37,7 +53,6 @@
     {% set message_url = '' %}
     {% set profile_link = '' %}
     {% set message_link = '' %}
-    {% set logout_link = '' %}
 
     <link rel="stylesheet" href="{{ asset('bundles/chamilocore/css/base.css') }}"/>
     <link rel="stylesheet" media="print" href="{{ asset('bundles/chamilocore/css/print.css') }}"/>
@@ -88,8 +103,7 @@
             <div class="row">
                 <div class="col-lg-3">
                     <div class="logo">
-                        Chamilo
-
+                        <img src="{{ asset('bundles/chamilocore/css/themes/'~ theme ~'/images/header-logo.png') }}"/>
                     </div>
                 </div>
                 <div class="col-lg-9">

+ 0 - 0
apple-touch-icon.png → web/apple-touch-icon.png