Browse Source

fix session catalog - refs #2681

Alex Aragón 6 years ago
parent
commit
4872150ae0

+ 0 - 7
assets/css/base.css

@@ -5756,13 +5756,6 @@ div#chat-remote-video video {
     width: 100%;
 }
 
-.title-session,
-.title-courses {
-    text-align: center;
-    font-weight: bold;
-    margin-bottom: 25px;
-}
-
 /*************** SCROLLBAR BASE CSS ***************/
 
 .scroll-wrapper {

+ 4 - 3
main/auth/courses_controller.php

@@ -683,9 +683,10 @@ class CoursesController
         $tpl->assign('sessions', $sessionsBlocks);
         $tpl->assign('already_subscribed_label', $this->getAlreadyRegisteredInSessionLabel());
 
-        $contentTemplate = $tpl->get_template('auth/session_catalog.tpl');
-
-        $tpl->display($contentTemplate);
+        $layout = $tpl->get_template('auth/session_catalog.html.twig');
+        $content = $tpl->fetch($layout);
+        $tpl->assign('content', $content);
+        $tpl->display_one_col_template();
     }
 
     /**

+ 33 - 57
main/template/default/auth/session_catalog.html.twig

@@ -1,5 +1,3 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
-
 {% block content %}
 {% autoescape false %}
     <script>
@@ -9,69 +7,48 @@
             });
         });
     </script>
-    <div class="row">
-        <div class="col-md-12">
-        <!-- header catalog session -->
-        <h2 class="title-session">{{ 'Sessions'|get_lang }}</h2>
-       	<div class="search-session">
-                <div class="row">
-                {% if show_courses %}
-                    <div class="col-md-4">
-                        <div class="return-catalog">
-                            <a class="btn btn-default btn-lg btn-block" href="{{ _p.web_self }}">
-                                <em class="fa fa-arrow-left"></em> {{ "CourseManagement"|get_lang }}
-                            </a>
-                        </div>
-                    </div>
-                {% endif %}
-
-                {% if show_courses %}
-                    <div class="col-md-4">
-                {% else %}
-                    <div class="col-md-6">
-                {% endif %}
-                        <form method="post" action="{{ _p.web_self }}?action=display_sessions">
-                            <div class="form-group">
-                                <label>{{ "ByDate"|get_lang }}</label>
-                                <div class="input-group">
-                                    <input type="date" name="date" id="date" title="{{ 'Date'|get_lang }}"
-                                           class="form-control" value="{{ search_date }}" readonly>
-                                    <span class="input-group-btn">
-                                        <button class="btn btn-default" type="submit">
-                                            <em class="fa fa-search"></em> {{ 'Search'|get_lang }}
-                                        </button>
-                                    </span>
-                                </div>
-                            </div>
-                        </form>
-                    </div>
-                {% if show_courses %}
-                    <div class="col-md-4">
-                {% else %}
-                    <div class="col-md-6">
-                {% endif %}
-                        <form method="post" action="{{ _p.web_self }}?action=search_tag">
-                            <label>{{ "ByTag"|get_lang }}</label>
+<div class="catalog" style="width: 100%;">
+    <div class="search">
+        <h2>{{ 'Catalog Sessions'|get_lang }}</h2>
+        <div class="search-session">
+            <div class="row">
+                <div class="col-md-6">
+                    <form method="post" action="{{ _p.web_self }}?action=display_sessions">
+                        <div class="form-group">
+                            <label>{{ "ByDate"|get_lang }}</label>
                             <div class="input-group">
-                                <input type="text" name="search_tag" title="{{ 'ByTag'|get_lang }}" class="form-control"
-                                       value="{{ search_tag }}"/>
+                                <input type="date" name="date" id="date" title="{{ 'Date'|get_lang }}"
+                                       class="form-control" value="{{ search_date }}" readonly>
                                 <span class="input-group-btn">
                                     <button class="btn btn-default" type="submit">
                                         <em class="fa fa-search"></em> {{ 'Search'|get_lang }}
                                     </button>
                                 </span>
                             </div>
-                        </form>
-                    </div>
+                        </div>
+                    </form>
+                </div>
+                <div class="col-md-6">
+                    <form method="post" action="{{ _p.web_self }}?action=search_tag">
+                        <label>{{ "ByTag"|get_lang }}</label>
+                        <div class="input-group">
+                            <input type="text" name="search_tag" title="{{ 'ByTag'|get_lang }}" class="form-control"
+                                   value="{{ search_tag }}"/>
+                            <span class="input-group-btn">
+                                <button class="btn btn-default" type="submit">
+                                    <em class="fa fa-search"></em> {{ 'Search'|get_lang }}
+                                </button>
+                            </span>
+                        </div>
+                    </form>
                 </div>
             </div>
         </div>
     </div>
-    <!-- new view session grib -->
-    <div class="row">
-        <div class="grid-courses col-md-12">
-            <div class="row">
-                {% for item in sessions %}
+
+    <div class="grid-courses">
+        <div class="row">
+            {% for item in sessions %}
                     <div class="col-md-4 col-sm-6 col-xs-12">
                         <div id="session-{{ item.id }}" class="items items-courses items-sessions">
                             <div class="image">
@@ -211,15 +188,14 @@
                     </div>
                 {% else %}
                     <div class="col-xs-12">
-                        <div class="alert alert-warning">
+                        <div class="alert alert-warning" role="alert">
                             {{ 'NoResults'|get_lang }}
                         </div>
                     </div>
                 {% endfor %}
-            </div>
         </div>
     </div>
-    <!-- end view session grib -->
+</div>
     {{ catalog_pagination }}
 {% endautoescape %}
 {% endblock %}