Explorar o código

Use login UI as in 1.11.x

jmontoyaa %!s(int64=8) %!d(string=hai) anos
pai
achega
548aceca9d

+ 1 - 1
src/Chamilo/ThemeBundle/Resources/views/Layout/layout_two_col.html.twig

@@ -30,7 +30,7 @@
                     {{ render(controller('ChamiloThemeBundle:Sidebar:userProfile', {'pathInfo': pathInfo })) }}
                 {% endif %}
 
-                {# Courses, Skills menu #}
+                {# Login, Courses, Skills menu #}
                 {{ render(controller('ChamiloThemeBundle:Sidebar:menuKnp', {'request' : app.request, pathInfo: pathInfo })) }}
             </section>
         {% endblock %}

+ 29 - 0
src/Chamilo/ThemeBundle/Resources/views/Sidebar/login.html.twig

@@ -0,0 +1,29 @@
+{{ locale_switcher(null, null, 'ChamiloCoreBundle:Admin:switcher_links.html.twig') }}
+
+<form class="form-horizontal" action="{{ path("fos_user_security_check") }}" method="post" name="formLogin" id="formLogin">
+    <input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}"/>
+    <fieldset>
+        <label for="login">{{ 'UserName' | trans }}</label>
+        <div class="input-group">
+            <div class="input-group-addon">
+                <em class="fa fa-user fa-fw"></em>
+            </div>
+            <input id="login" autofocus="autofocus" placeholder="Username"
+                   autocapitalize="none" class="form-control" name="_username"
+                   type="text">
+        </div>
+        <label for="password">{{ 'Pass' | trans }}</label>
+        <div class="input-group">
+            <div class="input-group-addon">
+                <em class="fa fa-lock fa-fw"></em>
+            </div>
+            <input id="password" placeholder="Pass" autocapitalize="none"
+                   class="form-control" name="_password" type="password">
+        </div>
+        <button class="btn-block btn btn-primary " name="submitAuth" type="submit">
+            {{ 'LoginEnter' | trans }}
+        </button>
+    </fieldset>
+    <input name="_qf__formLogin" type="hidden" value="">
+</form>
+{{ mopa_bootstrap_menu('ChamiloCoreBundle:SimpleMenuBuilder:notLoginMenu', {'automenu': 'pills', 'stacked':true}) }}

+ 1 - 20
src/Chamilo/ThemeBundle/Resources/views/Sidebar/menu_knp.html.twig

@@ -3,10 +3,6 @@
 {% autoescape false %}
 
 {% if is_granted('IS_AUTHENTICATED_FULLY') %}
-    {#{{ macro.panel(#}
-    {#'Profile' | trans,#}
-    {#mopa_bootstrap_menu('ChamiloCoreBundle:SimpleMenuBuilder:mainMenu', {'automenu': 'pills', 'stacked':true})) }}#}
-
     {{
         macro.panel(
             'Courses' | trans,
@@ -21,22 +17,7 @@
         )
     }}
 {% else %}
-    {{ locale_switcher(null, null, 'ChamiloCoreBundle:Admin:switcher_links.html.twig') }}
-    <div class="user-panel">
-    </div>
-    <form action="{{ path("fos_user_security_check") }}" method="post" role="form" class="sidebar-form">
-        <input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}"/>
-        <div class="form-group">
-            <label for="username">{{ 'security.login.username' | trans({}, 'FOSUserBundle') }}</label>
-            <input type="text" class="form-control" id="username" name="_username" >
-        </div>
-        <div class="form-group">
-            <label for="password">{{ 'security.login.password' | trans({}, 'FOSUserBundle') }}</label>
-            <input type="password" class="form-control" id="password" name="_password">
-        </div>
-        <button type="submit" class="btn btn-default">{{ 'security.login.submit' | trans({}, 'FOSUserBundle') }}</button>
-    </form>
-    {{ mopa_bootstrap_menu('ChamiloCoreBundle:SimpleMenuBuilder:notLoginMenu', {'automenu': 'pills', 'stacked':true}) }}
+    {% include '@ChamiloTheme/Sidebar/login.html.twig' %}
 {% endif %}
 
 {% endautoescape %}

BIN=BIN
web/img/login_as.gif