From 9e258cfae48cc5922d90733723e54223d9e4e286 Mon Sep 17 00:00:00 2001
From: Mike Ng <mike.esokia@gmail.com>
Date: Wed, 2 Aug 2017 17:18:53 +0400
Subject: [PATCH] fix navigation user list and refactor layout

---
 resources/www/admin/styles/main.scss |  9 ++++++++
 templates/web/admin/users.html.twig  | 31 +++++++++++++++++++++++-----
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/resources/www/admin/styles/main.scss b/resources/www/admin/styles/main.scss
index f04f92f2b7..f7570b2c95 100644
--- a/resources/www/admin/styles/main.scss
+++ b/resources/www/admin/styles/main.scss
@@ -327,6 +327,15 @@ div.switch_right.unchecked {
   text-decoration: none;
 }
 
+#users_page .user_modifier {
+  margin-top: 5px;
+  margin-left: 10px;
+}
+
+#users_page .user_deleter {
+  margin-top: 5px;
+}
+
 @import './databases';
 @import './fields';
 @import './tables';
diff --git a/templates/web/admin/users.html.twig b/templates/web/admin/users.html.twig
index 3c424a14e1..718c205d7a 100644
--- a/templates/web/admin/users.html.twig
+++ b/templates/web/admin/users.html.twig
@@ -54,6 +54,9 @@
             </fieldset>
         </form>
 
+        <button class="user_modifier btn">{{ 'boutton::modifier' | trans }}</button>
+        <button class="user_deleter btn">{{ 'Supprimer' | trans }}</button>
+
         <form id="users_apply_template" method="post" action="{{ path('admin_users_apply_template') }}" target="_self" class="form-inline pull-left no-ajax" style="margin:0">
             <fieldset class="admin_head_opts">
                 <span>{{ 'Apply a template' | trans }}</span>
@@ -207,8 +210,6 @@
                     {% set n_par_page = 50 %}
                     <option value="50" {% if parm['per_page'] == 50%}selected="selected"{% endif %}>{% trans with {'%n_par_page%' : n_par_page} %}%n_par_page% par page{% endtrans %}</option>
                 </select>
-                <button class="user_modifier btn">{{ 'boutton::modifier' | trans }}</button>
-                <button class="user_deleter btn">{{ 'Supprimer' | trans }}</button>
 
                 <input type="hidden" name="total_results" value="{{users.get_total()}}"/>
                 <input type="hidden" name="page" value="{{users.get_page()}}"/>
@@ -434,7 +435,7 @@
             });
 
             $('#users tbody tr, #users tbody td').on('dblclick', function (evt) {
-                $('#users_page_form .user_modifier').trigger('click');
+                $('.user_modifier').trigger('click');
             });
 
             $('#users tbody tr, #users tbody td').on('click', function (evt) {
@@ -543,7 +544,7 @@
                 return false;
             });
 
-            $('#users_page_form .user_modifier').on('click', function () {
+            $('.user_modifier').on('click', function () {
                 var users = p4.users.sel.join(';');
                 if (users === '') {
                     return false;
@@ -564,7 +565,7 @@
                 return false;
             });
 
-            $('#users_page_form .user_deleter').on('click', function () {
+            $('.user_deleter').on('click', function () {
                 var users = p4.users.sel.join(';');
                 if (users === '') {
                     return false;
@@ -649,6 +650,26 @@
                     });
                 }
             });
+
+            $("#users_page_form .input-mini").keydown(function (e) {
+                if (e.which == 13) {
+                    //prevent form from being submitted
+                    e.preventDefault();
+                }
+            });
+            $("#users_page_form .input-mini").keyup(function (e) {
+                if (e.which == 13) {
+                    e.preventDefault();
+                    var form = $('#users_page_form');
+                    var current_page = parseInt($('.input-mini').val());
+                    var perPage = parseInt($('select[name="per_page"]', form).val());
+                    current_page = isNaN(current_page) || current_page < 1
+                    || current_page > {{ pages|floor }} ? 1 : current_page;
+                    var offset_start = (current_page-1) * perPage;
+                    $('input[name="offset_start"]', form).val(offset_start);
+                    $('#users_page_form').trigger('submit');
+                }
+            });
         });
 
   function exportlist()