Browse Source

fix display_one_col_template - refs #2681

Alex Aragón 6 years ago
parent
commit
2bfc8b9a80

+ 0 - 1
assets/css/scss/_sidebar.scss

@@ -4,7 +4,6 @@
 
 .sidebar {
   background-color: $sidebar-background;
-  border-right: 1px solid #cdcdcd;
   .nav-dropdown-items{
     background: #ffffff;
     .nav-item{

+ 2 - 4
main/admin/user_list.php

@@ -1241,7 +1241,5 @@ $toolbarActions = Display::toolbarAction(
 $tpl = new Template($tool_name);
 $tpl->assign('actions', $toolbarActions);
 $tpl->assign('message', $message);
-$tpl->assign('form_search', $form);
-$tpl->assign('content', $table_result);
-$tpl->assign('extra', $extra_search_options);
-$tpl->display_table_template();
+$tpl->assign('content', $form.$table_result.$extra_search_options);
+$tpl->display_one_col_template();

+ 0 - 9
main/inc/lib/template.lib.php

@@ -295,15 +295,6 @@ class Template
         $this->returnResponse($this->params, $template);
     }
 
-    /**
-     * Shortcut to display a 2 col layout (userportal.php).
-     */
-    public function display_table_template()
-    {
-        $template = '@ChamiloTheme/Layout/layout_table.html.twig';
-        $this->returnResponse($this->params, $template);
-    }
-
     /**
      * Displays an empty template.
      */

+ 0 - 45
src/ThemeBundle/Resources/views/Layout/layout_table.html.twig

@@ -1,45 +0,0 @@
-{% extends '@ChamiloTheme/Layout/base-layout.html.twig' %}
-
-{% block page_content %}
-    {% autoescape false %}
-
-        {% if js is defined %}
-            {% for item in js %}
-                {{ item }}
-            {% endfor %}
-        {% endif %}
-
-        <section class="section-content">
-
-            {% autoescape false %}
-
-                <section class="container-fluid">
-                    {% if actions != '' %}
-                        {{ actions }}
-                    {% endif %}
-                </section>
-
-                <section class="container-fluid">
-                    {% block chamilo_messages %}
-                        {% include '@ChamiloTheme/FlashMessage/render.html.twig' %}
-                    {% endblock %}
-                </section>
-
-                {# Content #}
-                {% block content %}
-                    <section class="container-fluid">
-                        {{ form_search }}
-                        <div class="card mb-4">
-                            <div class="card-body">
-                                {{ content }}
-                            </div>
-                        </div>
-                        {{ extra }}
-                    </section>
-                {% endblock %}
-            {% endautoescape %}
-
-        </section>
-
-    {% endautoescape %}
-{% endblock %}