Merge pull request #386 from IbeVanmeenen/issue_380

[AdminBundle] Cleanup and fix styling FOS Change Password form
Kunstmaan · May 4, 2015 · c224514 · c224514
2 parents 5aeb6d9 + 6790fa1
commit c224514
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 12 deletions.
diff --git a/src/Kunstmaan/AdminBundle/Resources/ui/scss/default-theme/general/_login.scss b/src/Kunstmaan/AdminBundle/Resources/ui/scss/default-theme/general/_login.scss
@@ -70,3 +70,26 @@
     bottom: 2rem;
     transform: translateX(-50%);
 }
+
+
+
+/* FOS - User change password overwrites
+   ========================================================================== */
+.fos_user_change_password {
+
+    label {
+        @extend .label--lighter;
+    }
+
+    input[type="text"], input[type="password"] {
+        @extend .form-control;
+
+        margin-bottom: 1rem;
+    }
+
+    input[type="submit"] {
+        @extend .btn;
+        @extend .btn-primary;
+        @extend .btn-block;
+    }
+}
diff --git a/src/Kunstmaan/AdminBundle/Resources/views/Resetting/checkEmail.html.twig b/src/Kunstmaan/AdminBundle/Resources/views/Resetting/checkEmail.html.twig
@@ -1,8 +1,10 @@
 {% extends "FOSUserBundle::layout.html.twig" %}
 
 {% block fos_user_content %}
-    <div class="alert fade in">
-        <a class="close" href="{{ path('fos_user_security_login') }}">×</a>
+    <div class="alert alert-success">
         {{ 'We have sent you an email with a link to reset your password.' | trans }}
+        <a class="btn alert__action" href="{{ path('fos_user_security_login') }}">
+            <i class="fa fa-times"></i>
+        </a>
     </div>
 {% endblock %}
diff --git a/src/Kunstmaan/AdminBundle/Resources/views/Resetting/passwordAlreadyRequested.html.twig b/src/Kunstmaan/AdminBundle/Resources/views/Resetting/passwordAlreadyRequested.html.twig
@@ -1,9 +1,10 @@
 {% extends "FOSUserBundle::layout.html.twig" %}
 
 {% block fos_user_content %}
-    <div class="alert fade in alert-error">
-        <a class="close" href="{{ path('fos_user_security_login') }}">×</a>
-        <strong>{{ 'form.error' | trans }}: </strong>
-        {{ 'The password for this user has already been requested.' |trans }}
+    <div class="alert alert-error">
+        <strong>{{ 'form.error' | trans }}:</strong> {{ 'The password for this user has already been requested.' |trans }}
+        <a class="btn alert__action" href="{{ path('fos_user_security_login') }}">
+            <i class="fa fa-times"></i>
+        </a>
     </div>
 {% endblock fos_user_content %}
diff --git a/src/Kunstmaan/AdminBundle/Resources/views/Resetting/request_content.html.twig b/src/Kunstmaan/AdminBundle/Resources/views/Resetting/request_content.html.twig
@@ -4,11 +4,11 @@
 
 {% if invalid_username is defined %}
     <div class="alert alert-error">
+        <strong>{{ 'form.error' | trans }}: </strong>
+        {{ 'The username or email address does not exist.' | trans }}
         <button type="button" class="close" data-dismiss="alert">
             <i class="fa fa-times"></i>
         </button>
-        <strong>{{ 'form.error' | trans }}: </strong>
-        {{ 'The username or email address does not exist.' | trans }}
     </div>
 {% endif %}
 

diff --git a/src/Kunstmaan/AdminBundle/Resources/views/layout.html.twig b/src/Kunstmaan/AdminBundle/Resources/views/layout.html.twig
@@ -11,8 +11,8 @@
         {% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
             <div class="alert alert-warning">
                 <strong>{{ 'form.warning' | trans }}: </strong>
-                {{ 'layout.logged_in_as'|trans({'%username%': app.user.username}, 'FOSUserBundle') }} |
-                <a href="{{ path('fos_user_security_logout') }}" class="alert__action">
+                {{ 'layout.logged_in_as'|trans({'%username%': app.user.username}, 'FOSUserBundle') }}
+                <a href="{{ path('fos_user_security_logout') }}" class="btn btn-warning alert__action">
                     {{ 'layout.logout'|trans({}, 'FOSUserBundle') }}
                 </a>
             </div>

diff --git a/src/Kunstmaan/UserManagementBundle/Resources/views/Users/edit.html.twig b/src/Kunstmaan/UserManagementBundle/Resources/views/Users/edit.html.twig
@@ -45,8 +45,6 @@
         </div>
 
         <!-- Fields -->
-
-
         <fieldset class="form__fieldset--padded">
             {% if tabPane is defined %}
                 {{ tabs_widget(tabPane) }}