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

Merge branch 'master-alchemy' into PHRAS-1525_port_PHRAS-1434_1435_1436_1437_1457

Browse Source
This commit is contained in:
Mike Ng
2017-11-15 11:23:51 +04:00
parent 9ed6a0210f 43a629169a
commit 8f8d9bb706
12 changed files with 941 additions and 899 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;
}
#users_page .user_modifier {
margin-top: 5px;
margin-left: 10px;
}
#users_page .user_deleter {
margin-top: 5px;
}
@import './databases';
@import './fields';
@import './tables';

4
resources/www/common/js/components/common.js
View File

@@ -1,4 +1,5 @@
var p4 = p4 || {};
var datepickerLang = [];
var commonModule = (function ($, p4) {
$(document).ready(function () {
@@ -13,7 +14,7 @@ var commonModule = (function ($, p4) {
var locale = $.cookie('locale');
var jq_date = p4.lng = typeof locale !== "undefined" ? locale.split('_').reverse().pop() : 'en';
var jq_date = p4.lng = typeof locale !== "undefined" ? locale.split('_').reverse().pop() : $('html').attr('lang');
if (jq_date == 'en') {
jq_date = 'en-GB';
@@ -21,6 +22,7 @@ var commonModule = (function ($, p4) {
$.datepicker.setDefaults({showMonthAfterYear: false});
$.datepicker.setDefaults($.datepicker.regional[jq_date]);
datepickerLang = $.datepicker.regional[jq_date];
var cache = $('#mainMenu .helpcontextmenu');
$('.context-menu-item', cache).hover(function () {