Browse Source

Update ThemeBundle

Julio 9 years ago
parent
commit
f09b0a1811

+ 1 - 0
src/Chamilo/ThemeBundle/Controller/SidebarController.php

@@ -30,6 +30,7 @@ class SidebarController extends Controller
         if (!$this->getDispatcher()->hasListeners(ThemeEvents::THEME_SIDEBAR_USER)) {
             return new Response();
         }
+
         $userEvent = $this->getDispatcher()->dispatch(ThemeEvents::THEME_SIDEBAR_USER, new ShowUserEvent());
 
         return $this->render(

+ 1 - 2
src/Chamilo/ThemeBundle/Resources/config/bower/bower.json

@@ -24,8 +24,7 @@
         "ionicons": "*",
         "fullcalendar": "*",
         "jqgrid": "*",
-        "adminlte": "1.3",
-        "select2": "*",
+        "select2": "4.0",
         "chosen-bower": "*",
         "ckeditor": "*",
         "iCheck": "*",

+ 57 - 83
src/Chamilo/ThemeBundle/Resources/views/Layout/base-layout.html.twig

@@ -16,9 +16,9 @@
     <title>{% block title %}Chamilo{% endblock %}</title>
     <link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}" />
 
-    {#{%- stylesheets '@chamilo_css' -%}#}
-    {#<link rel="stylesheet" href="{{ asset_url }}" />#}
-    {#{% endstylesheets %}#}
+    {%- stylesheets '@chamilo_css' -%}
+    <link rel="stylesheet" href="{{ asset_url }}" />
+    {% endstylesheets %}
 
     {# Chamilo base #}
     {#{% set theme = chamilo_settings_get('platform.theme') %}#}
@@ -33,24 +33,26 @@
     {% set accessibility = '' %}
     {% set containerClass = '' %}
     {% set breadcrumb = '' %}
+    {% set user_notifications = '' %}
+    {% 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') }}"/>
     <link rel="stylesheet" href="{{ asset('bundles/chamilocore/css/themes/'~ theme ~'/default.css') }}"/>
     <link rel="stylesheet" href="{{ asset('bundles/chamilocore/css/themes/'~ theme ~'/learnpath.css') }}"/>
     <link rel="stylesheet" media="print" href="{{ asset('bundles/chamilocore/css/themes/'~ theme ~'/print.css') }}"/>
-    <link rel="stylesheet" href="{{ asset('bundles/chamilocore/css/themes/'~ theme ~'/scorm.css') }}"/>
-    <link rel="stylesheet" href="{{ asset('bundles/chamilocore/css/themes/'~ theme ~'/scormfs.css') }}"/>
-    <link rel="stylesheet" href="{{ asset('bundles/chamilocore/js/tag/style.css') }}"/>
 
     <script src="{{ asset('bundles/chamilotheme/components/modernizr/modernizr.js') }}"></script>
     {% block javascripts %}
-    {#{%- javascripts '@chamilo_js' -%}#}
-    {#<script src="{{ asset_url }}"></script>#}
-    {#{% endjavascripts %}#}
+    {%- javascripts '@chamilo_js' -%}
+    <script src="{{ asset_url }}"></script>
+    {% endjavascripts %}
 
-    <script src="{{ asset('bundles/ivoryckeditor/ckeditor.js') }}" type="text/javascript"></script>
-    <script src="{{ asset('bundles/fosjsrouting/js/router.js') }}"></script>
+    {#<script src="{{ asset('bundles/ivoryckeditor/ckeditor.js') }}" type="text/javascript"></script>#}
+    {#<script src="{{ asset('bundles/fosjsrouting/js/router.js') }}"></script>#}
     {#<script src="{{ path('fos_js_routing_js', {"callback": "fos.Router.setData"}) }}"></script>#}
 </head>
 <body class="{{ admin_skin|default('skin-blue')}}">
@@ -86,6 +88,7 @@
             <div class="row">
                 <div class="col-lg-3">
                     <div class="logo">
+                        Chamilo
                         {{ logo }}
                     </div>
                 </div>
@@ -142,85 +145,56 @@
 {% endif %}
 
 {% block chamilo_admin_header %}
-    <header class="header">
-        {% block chamilo_logo %}
-        <a href="#" class="logo">
-            Chamilo
-            {#{{- chamilo_settings_get('platform.institution') -}}#}
-        </a>
-        {% endblock %}
-        {% block chamilo_main_navbar %}
-        <!-- Header Navbar: style can be found in header.less -->
-        <nav class="navbar navbar-static-top" role="navigation">
-            <!-- Sidebar toggle button-->
-            <a href="#" class="navbar-btn sidebar-toggle" data-toggle="offcanvas" role="button">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </a>
-            {% if app.user is not null and is_granted('IS_AUTHENTICATED_FULLY') %}
-            <div class="navbar-right">
-                <ul class="nav navbar-nav">
-                    {% block chamilo_navbar %}
-                        {{ render(controller('ChamiloThemeBundle:Navbar:messages')) }}
-                        {{ render(controller('ChamiloThemeBundle:Navbar:notifications')) }}
-                        {# Not yet implemented #}
-                        {#{{ render(controller('ChamiloThemeBundle:Navbar:tasks')) }}#}
-                        {{ render(controller('ChamiloThemeBundle:Navbar:user')) }}
-                    {% endblock %}
-                </ul>
-            </div>
-            {% endif %}
-        </nav>
-        {% endblock %}
-    </header>
+    {#<header class="header">#}
+        {#{% block chamilo_logo %}#}
+        {#<a href="#" class="logo">#}
+            {#Chamilo#}
+            {#&#123;&#35;{{- chamilo_settings_get('platform.institution') -}}&#35;&#125;#}
+        {#</a>#}
+        {#{% endblock %}#}
+        {#{% block chamilo_main_navbar %}#}
+        {#<!-- Header Navbar: style can be found in header.less -->#}
+        {#{% endblock %}#}
+    {#</header>#}
 {% endblock %}
 
-<div class="wrapper row-offcanvas row-offcanvas-left">
-    <!-- Left side column. contains the logo and sidebar -->
-    <aside class="left-side sidebar-offcanvas">
-        <!-- sidebar: style can be found in sidebar.less -->
-        <section class="sidebar">
-            {% block chamilo_sidebar %}
-                {% if app.user is not null and is_granted('IS_AUTHENTICATED_FULLY') %}
-                    {{ render(controller('ChamiloThemeBundle:Sidebar:userPanel')) }}
-                    {{ render(controller('ChamiloThemeBundle:Sidebar:searchForm')) }}
-                {% endif %}
-                {# Sidebar menu #}
-                {{ render(controller('ChamiloThemeBundle:Sidebar:menuKnp', {'request' : app.request})) }}
-            {% endblock %}
-        </section>
-        <!-- /.sidebar -->
-    </aside>
+<div class="col-md-3 menu-column">
+    {% block chamilo_sidebar %}
+        {% if app.user is not null and is_granted('IS_AUTHENTICATED_FULLY') %}
+            {{ render(controller('ChamiloThemeBundle:Sidebar:userPanel')) }}
+            {{ render(controller('ChamiloThemeBundle:Sidebar:searchForm')) }}
+        {% endif %}
+        {# Sidebar menu #}
+        {{ render(controller('ChamiloThemeBundle:Sidebar:menuKnp', {'request' : app.request })) }}
+    {% endblock %}
+</div>
 
-    <!-- Right side column. Contains the navbar and content of the page -->
-    <aside class="right-side">
-        <!-- Content Header (Page header) -->
-        {% block content_header %}
-        <section class="content-header">
-            {% block content_header_title %}
-                <h1>
-                    {% block page_title %}{% endblock %}
-                    <small>{% block page_subtitle %}{% endblock %}</small>
-                </h1>
-            {% endblock %}
+<!-- Right side column. Contains the navbar and content of the page -->
+<div class="col-md-9">
+    <!-- Content Header (Page header) -->
+    {% block content_header %}
+    <section class="content-header">
+        {% block content_header_title %}
+            <h1>
+                {% block page_title %}{% endblock %}
+                <small>{% block page_subtitle %}{% endblock %}</small>
+            </h1>
+        {% endblock %}
 
-            {% block chamilo_breadcrumb %}
-            {{ render(controller('ChamiloThemeBundle:Breadcrumb:breadcrumb', {'request':app.request, 'title' : block('page_title')})) }}
-            {% endblock %}
-        </section>
+        {% block chamilo_breadcrumb %}
+        {{ render(controller('ChamiloThemeBundle:Breadcrumb:breadcrumb', {'request':app.request, 'title' : block('page_title')})) }}
         {% endblock %}
+    </section>
+    {% endblock %}
 
-        <!-- Main content -->
-        <section class="content">
-            {% block page_content %}{% endblock %}
-        </section>
-        <!-- /.content -->
-    </aside>
-    <!-- /.right-side -->
+    <!-- Main content -->
+    <section class="content">
+        {% block page_content %}{% endblock %}
+    </section>
+    <!-- /.content -->
 </div>
-<!-- ./wrapper -->
+<!-- /.right-side -->
+
 
 {% endblock %}
 </body>

+ 2 - 1
src/Chamilo/ThemeBundle/Resources/views/Sidebar/menu.html.twig

@@ -26,4 +26,5 @@
     </form>
     {{ mopa_bootstrap_menu('ChamiloCoreBundle:SimpleMenuBuilder:notLoginMenu', {'automenu': 'pills', 'stacked':true}) }}
 {% endif %}
-{#{{ mopa_bootstrap_menu('ChamiloCoreBundle:SimpleMenuBuilder:helpMenu', {'automenu': 'pills', 'stacked':true}) }}#}
+
+{{ mopa_bootstrap_menu('ChamiloCoreBundle:SimpleMenuBuilder:helpMenu', {'automenu': 'pills', 'stacked':true}) }}

+ 2 - 0
src/Chamilo/ThemeBundle/Resources/views/Sidebar/menu_knp.html.twig

@@ -11,6 +11,8 @@
 
 {% if is_granted('IS_AUTHENTICATED_FULLY') %}
     {{ mopa_bootstrap_menu('ChamiloCoreBundle:SimpleMenuBuilder:mainMenu', {'automenu': 'pills', 'stacked':true}) }}
+    {{ mopa_bootstrap_menu('ChamiloCoreBundle:CourseMenuBuilder:courseMenu', {'automenu': 'pills', 'stacked':true}) }}
+
 {% else %}
     <div class="user-panel">
     </div>