Merge branch 'master-alchemy' into PHRAS-1512_PORT_PDFJS_TO_4.1

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';

resources/www/common/js/components/common.js

@@ -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 () {

resources/www/lightbox/styles/main-ie6.scss

@@ -402,6 +402,8 @@ table th i {
 #sc_wrapper .thumb_wrapper {
   position: absolute;
   top: 28px;
+  left: 0px;
+  right: 0px;
 }
 
 .record_display_box .notes_overlay {