From b2108c5cf61a10d68fa0b9dd56cfe629e55a19c9 Mon Sep 17 00:00:00 2001
From: Florian BLOUET <florian.blouet@gmail.com>
Date: Wed, 2 Dec 2015 11:22:04 +0100
Subject: [PATCH] PHRAS-837 - fix user add in push action, update bower
 dependencies

---
 bower.json                                    |   6 +-
 .../prod/skins/ui-components/_buttons.scss    |   6 +-
 .../prod/skins/ui-components/_jquery-ui.scss  |   3 +-
 templates/web/prod/User/Add.html.twig         | 109 +++++++++++-------
 templates/web/prod/actions/Push.html.twig     |   4 +-
 5 files changed, 76 insertions(+), 52 deletions(-)

diff --git a/bower.json b/bower.json
index b61ddf99af..357989f055 100644
--- a/bower.json
+++ b/bower.json
@@ -1,14 +1,14 @@
 {
   "name": "Phraseanet",
-  "version": "3.9.0",
+  "version": "4.0.0",
   "dependencies": {
     "jquery": "~1.11.3",
     "jquery-ui": "~1.10.4",
     "jquery-mobile-bower": "~1.3.0",
     "underscore": "~1.4.4",
     "font-awesome": "~3.2.1",
-    "modernizr": "~2.6.2",
-    "normalize-css": "~2.1.0",
+    "modernizr": "~2.8.3",
+    "normalize-css": "~2.1.3",
     "json2": "latest",
     "humane-js": "~3.0.6",
     "jquery-file-upload": "~8.3.2",
diff --git a/resources/www/prod/skins/ui-components/_buttons.scss b/resources/www/prod/skins/ui-components/_buttons.scss
index e66a223a1d..494c5830d7 100644
--- a/resources/www/prod/skins/ui-components/_buttons.scss
+++ b/resources/www/prod/skins/ui-components/_buttons.scss
@@ -13,12 +13,14 @@
 
 // @TODO .btn-primary
 
-.ui-dialog .btn {
-  font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
+.ui-dialog .btn, .ui-widget-content .btn {
+  // font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
   font-size: $mediumFontSize;
   font-weight: bold;
+  color: $btnColor;
 }
 
+
 .input-append button.btn {
   border-left: 1px solid $btnGrpSeparatorColor;
 }
diff --git a/resources/www/prod/skins/ui-components/_jquery-ui.scss b/resources/www/prod/skins/ui-components/_jquery-ui.scss
index 59070bf1f6..c80db21fc9 100644
--- a/resources/www/prod/skins/ui-components/_jquery-ui.scss
+++ b/resources/www/prod/skins/ui-components/_jquery-ui.scss
@@ -163,7 +163,8 @@ $tabDisabledTextColor: $mediumTextActiveColor !default;
 }
 
 .ui-accordion .ui-accordion-header.unread {
-  background-image: url('#{$iconsPath}bask_new_back_light.png');
+  background-color: $basketsColor;
+  //background-image: url('#{$iconsPath}bask_new_back_light.png');
 }
 
 .ui-accordion .ui-accordion-header.header {
diff --git a/templates/web/prod/User/Add.html.twig b/templates/web/prod/User/Add.html.twig
index 8255a883a7..23d6f34046 100644
--- a/templates/web/prod/User/Add.html.twig
+++ b/templates/web/prod/User/Add.html.twig
@@ -1,6 +1,6 @@
 {# designed to be printed in a small box #}
-<div id="QuickAddUser" class="PNB10" callback="{{ callback }}">
-    <form method="POST" action="{{ path('prod_push_do_add_user') }}">
+<div class="PNB10" callback="{{ callback }}">
+    <form  id="quickAddUser" method="POST" action="{{ path('prod_push_do_add_user') }}">
         <table>
             <tr>
                 <td>
@@ -53,59 +53,80 @@
             <tr>
                 <td></td>
                 <td>
-                    <button class="valid btn btn-inverse">{{ 'Add' | trans }}</button>
-                    <button class="cancel btn btn-inverse">{{ 'Cancel' | trans }}</button>
+                    <button class="valid btn btn-inverse" type="submit">{{ 'Add' | trans }}</button>
+                    <button class="cancel btn btn-inverse" type="button">{{ 'Cancel' | trans }}</button>
                 </td>
             </tr>
+            <tr>
+                <td></td>
+                <td class="messages"></td>
+            </tr>
         </table>
     </form>
 </div>
 
 <script type="text/javascript">
-        define([
-            "jquery",
-            "common/geonames"
-        ], function (geonames) {
-            $(document).ready(function() {
-                geonames.init($('#QuickAddUser input.geoname_field'), {
-                    "server": "{{ app['geonames.server-uri'] }}",
-                    "limit": 40
-                });
 
-                $quickAddUser = $("#QuickAddUser");
+    $addUserForm = $('#quickAddUser');
+    $addUserFormMessages = $addUserForm.find('.messages');
 
-                $("button", $quickAddUser).button();
+    var closeModal = function() {
+        var dialog = $addUserForm.closest('.ui-dialog-content');
+        if (dialog.data("ui-dialog")) {
+            dialog.dialog('destroy').remove();
+        }
+    };
 
-                $("form", $quickAddUser).bind('submit', function() {
-                    return false;
-                });
+    var submitAddUser = function() {
+        console.log('add user');
+        $addUserFormMessages.empty();
+        var method = $addUserForm.attr('method');
 
-                $("form button.cancel", $quickAddUser).bind('click', function() {
-                    var dialog = $(this).closest('.ui-dialog-content');
-                    if (dialog.data("ui-dialog")) {
-                        dialog.dialog('destroy');
+        method = $.inArray(method.toLowerCase(), ['post', 'get']) ? method : 'POST';
+        $.ajax({
+            type : method,
+            url : $addUserForm.attr('action'),
+            data : $addUserForm.serializeArray(),
+            beforeSend : function(){
+                $addUserForm.addClass('loading');
+            },
+            success : function(datas){
+                if( datas.success === true ) {
+                    p4.Feedback.addUser($addUserForm, closeModal);
+                } else {
+                    if( datas.message !== undefined ) {
+                        $addUserFormMessages.empty().append('<div class="alert alert-error">' + datas.message + '</div>');
                     }
-
-                    dialog.remove();
-
-                    return false;
-                });
-
-                $("form button.valid", $quickAddUser).bind('click', function() {
-                    var $form = $(this).closest('form');
-                    var $this = $(this);
-
-                    var callback = function() {
-                        var dialog = $this.closest('.ui-dialog-content');
-                        if (dialog.data("ui-dialog")) {
-                            dialog.dialog('destroy').remove();
-                        }
-                    };
-
-                    p4.Feedback.addUser($form, callback);
-
-                    return false;
-                });
-            });
+                }
+                $addUserForm.removeClass('loading');
+            },
+            error:function(){
+                $addUserForm.removeClass("loading");
+            },
+            timeout:function(){
+                $addUserForm.removeClass("loading");
+            }
         });
+    };
+
+    $addUserForm.find('.geoname_field').geocompleter({
+        "server": "{{ app['geonames.server-uri'] }}",
+        "limit": 40
+    });
+
+    $addUserForm.on('submit', function(event) {
+        event.preventDefault();
+        submitAddUser();
+    });
+
+    $addUserForm.on('click', '.validate', function(event) {
+        event.preventDefault();
+        submitAddUser();
+    });
+
+    $addUserForm.on('click', '.cancel', function(event) {
+        event.preventDefault();
+        closeModal();
+        return false;
+    });
     </script>
diff --git a/templates/web/prod/actions/Push.html.twig b/templates/web/prod/actions/Push.html.twig
index 149db16f0f..42ce0c2eae 100644
--- a/templates/web/prod/actions/Push.html.twig
+++ b/templates/web/prod/actions/Push.html.twig
@@ -48,7 +48,7 @@
                 <div style="padding:10px;">
                     <h1>{{ 'Lists' | trans }}</h1>
                     <span style="width:100%; display:block; text-align:center;">
-                        <a href="#" class="link list_manager">
+                        <a href="#" class="btn btn-inverse list_manager">
                             <b>{{ 'List Manager' | trans }}</b>
                         </a>
                     </span>
@@ -89,7 +89,7 @@
                                 {{ 'Select a user in the list' | trans }} <br/>
                                 {% if app.getAclForUser(app.getAuthenticatedUser()).has_right('manageusers') %}
                                     {{ 'or' | trans }}
-                                    <a href="{{ path('prod_push_add_user') }}" class="user_adder link">{{ 'Add user' | trans }}</a>
+                                    <a href="{{ path('prod_push_add_user') }}" class="user_adder btn btn-mini">{{ 'Add user' | trans }}</a>
                                 {% endif %}
                             </div>
                             <p id="recommanded-users">