hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix navigation user list and refactor layout

Browse Source
This commit is contained in:
Mike Ng
2017-08-02 17:18:53 +04:00
parent bc53f83db8
commit 9e258cfae4
2 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
resources/www/admin/styles/main.scss
View File

@@ -327,6 +327,15 @@ div.switch_right.unchecked {
text-decoration: none; text-decoration: none;
} }
#users_page .user_modifier {
margin-top: 5px;
margin-left: 10px;
}
#users_page .user_deleter {
margin-top: 5px;
}
@import './databases'; @import './databases';
@import './fields'; @import './fields';
@import './tables'; @import './tables';

31
templates/web/admin/users.html.twig
View File

@@ -54,6 +54,9 @@
</fieldset> </fieldset>
</form> </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"> <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"> <fieldset class="admin_head_opts">
<span>{{ 'Apply a template' | trans }}</span> <span>{{ 'Apply a template' | trans }}</span>
@@ -207,8 +210,6 @@
{% set n_par_page = 50 %} {% 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> <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> </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="total_results" value="{{users.get_total()}}"/>
<input type="hidden" name="page" value="{{users.get_page()}}"/> <input type="hidden" name="page" value="{{users.get_page()}}"/>
@@ -434,7 +435,7 @@
}); });
$('#users tbody tr, #users tbody td').on('dblclick', function (evt) { $('#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) { $('#users tbody tr, #users tbody td').on('click', function (evt) {
@@ -543,7 +544,7 @@
return false; return false;
}); });
$('#users_page_form .user_modifier').on('click', function () { $('.user_modifier').on('click', function () {
var users = p4.users.sel.join(';'); var users = p4.users.sel.join(';');
if (users === '') { if (users === '') {
return false; return false;
@@ -564,7 +565,7 @@
return false; return false;
}); });
$('#users_page_form .user_deleter').on('click', function () { $('.user_deleter').on('click', function () {
var users = p4.users.sel.join(';'); var users = p4.users.sel.join(';');
if (users === '') { if (users === '') {
return false; 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() function exportlist()