diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css index 23b2dcc4f..df7898441 100644 --- a/modules/backend/assets/css/october.css +++ b/modules/backend/assets/css/october.css @@ -600,13 +600,6 @@ body{font-family:sans-serif;background:#f9f9f9;-webkit-font-smoothing:antialiase .layout{display:table;table-layout:fixed;height:100%;width:100%} .layout > .layout-row{display:table-row;vertical-align:top;height:100%} .layout > .layout-row > .layout-cell{display:table-cell;vertical-align:top;height:100%} -.layout > .layout-row > .layout-cell.width-100{width:100px} -.layout > .layout-row > .layout-cell.width-120{width:120px} -.layout > .layout-row > .layout-cell.width-130{width:130px} -.layout > .layout-row > .layout-cell.width-140{width:140px} -.layout > .layout-row > .layout-cell.width-200{width:200px} -.layout > .layout-row > .layout-cell.width-300{width:300px} -.layout > .layout-row > .layout-cell.width-350{width:350px} .layout > .layout-row > .layout-cell.layout-container,.layout > .layout-row > .layout-cell .layout-container,.layout > .layout-row > .layout-cell.padded-container,.layout > .layout-row > .layout-cell .padded-container{padding:20px 20px 0 20px} .layout > .layout-row > .layout-cell.layout-container .container-flush,.layout > .layout-row > .layout-cell .layout-container .container-flush,.layout > .layout-row > .layout-cell.padded-container .container-flush,.layout > .layout-row > .layout-cell .padded-container .container-flush{padding-top:0} .layout > .layout-row > .layout-cell .layout-relative{position:relative;height:100%} @@ -615,13 +608,6 @@ body{font-family:sans-serif;background:#f9f9f9;-webkit-font-smoothing:antialiase .layout > .layout-row > .layout-cell.min-height{height:0} .layout > .layout-row > .layout-cell.center{text-align:center} .layout > .layout-row > .layout-cell.middle{vertical-align:middle} -.layout > .layout-row > .layout-cell.width-100{width:100px} -.layout > .layout-row > .layout-cell.width-120{width:120px} -.layout > .layout-row > .layout-cell.width-130{width:130px} -.layout > .layout-row > .layout-cell.width-140{width:140px} -.layout > .layout-row > .layout-cell.width-200{width:200px} -.layout > .layout-row > .layout-cell.width-300{width:300px} -.layout > .layout-row > .layout-cell.width-350{width:350px} .layout > .layout-row > .layout-cell.layout-container,.layout > .layout-row > .layout-cell .layout-container,.layout > .layout-row > .layout-cell.padded-container,.layout > .layout-row > .layout-cell .padded-container{padding:20px 20px 0 20px} .layout > .layout-row > .layout-cell.layout-container .container-flush,.layout > .layout-row > .layout-cell .layout-container .container-flush,.layout > .layout-row > .layout-cell.padded-container .container-flush,.layout > .layout-row > .layout-cell .padded-container .container-flush{padding-top:0} .layout > .layout-row > .layout-cell .layout-relative{position:relative;height:100%} @@ -632,13 +618,6 @@ body{font-family:sans-serif;background:#f9f9f9;-webkit-font-smoothing:antialiase .layout > .layout-row > .layout-cell.middle{vertical-align:middle} .layout > .layout-row.min-size{height:0} .layout > .layout-cell{display:table-cell;vertical-align:top;height:100%} -.layout > .layout-cell.width-100{width:100px} -.layout > .layout-cell.width-120{width:120px} -.layout > .layout-cell.width-130{width:130px} -.layout > .layout-cell.width-140{width:140px} -.layout > .layout-cell.width-200{width:200px} -.layout > .layout-cell.width-300{width:300px} -.layout > .layout-cell.width-350{width:350px} .layout > .layout-cell.layout-container,.layout > .layout-cell .layout-container,.layout > .layout-cell.padded-container,.layout > .layout-cell .padded-container{padding:20px 20px 0 20px} .layout > .layout-cell.layout-container .container-flush,.layout > .layout-cell .layout-container .container-flush,.layout > .layout-cell.padded-container .container-flush,.layout > .layout-cell .padded-container .container-flush{padding-top:0} .layout > .layout-cell .layout-relative{position:relative;height:100%} @@ -649,7 +628,7 @@ body{font-family:sans-serif;background:#f9f9f9;-webkit-font-smoothing:antialiase .layout > .layout-cell.middle{vertical-align:middle} .whiteboard{background:white} .layout-fill-container{position:absolute;left:0;top:0;width:100%;height:100%} -.layout-cell.width-fix > form,[data-calculate-width] > form,.layout-cell.width-fix > div,[data-calculate-width] > div{display:inline-block} +[data-calculate-width] > form,[data-calculate-width] > div{display:inline-block} body.compact-container .layout.layout-container,body.compact-container .layout .layout-container{padding:0 !important} body.slim-container .layout.layout-container,body.slim-container .layout .layout-container{padding-left:0 !important;padding-right:0 !important} @media (max-width:768px){.layout .hide-on-small{display:none} @@ -673,9 +652,6 @@ body.slim-container .layout.layout-container,body.slim-container .layout .layout .flex-layout-item.center{-webkit-align-self:center;-moz-align-self:center;-ms-align-self:center;align-self:center} .flex-layout-item.relative{position:relative} .flex-layout-item.layout-container{max-width:none} -.flex-layout-item.width-100{width:100px} -.flex-layout-item.width-200{width:200px} -.flex-layout-item.width-300{width:300px} body.mainmenu-open{overflow:hidden} .mainmenu-tooltip .tooltip-inner{font-size:13px;padding:6px 16px} nav#layout-mainmenu{background-color:#000000;padding:0 0 0 20px;line-height:0;white-space:nowrap;vertical-align:top} diff --git a/modules/backend/assets/js/october-min.js b/modules/backend/assets/js/october-min.js index 1912b09d8..b8f1fa276 100644 --- a/modules/backend/assets/js/october-min.js +++ b/modules/backend/assets/js/october-min.js @@ -907,7 +907,7 @@ if(this.pageTitleTemplate===undefined) this.pageTitleTemplate=$title.data('titleTemplate') $title.text(this.pageTitleTemplate.replace('%s',title))} OctoberLayout.prototype.updateLayout=function(title){var $children,$el,fixedWidth,margin -$('.layout-cell.width-fix, [data-calculate-width]').each(function(){$children=$(this).children() +$('[data-calculate-width]').each(function(){$children=$(this).children() if($children.length>0){fixedWidth=0 $children.each(function(){$el=$(this) margin=$el.data('oc.layoutMargin') diff --git a/modules/backend/assets/js/october.layout.js b/modules/backend/assets/js/october.layout.js index 8cbdd88d4..6c2420830 100644 --- a/modules/backend/assets/js/october.layout.js +++ b/modules/backend/assets/js/october.layout.js @@ -15,9 +15,7 @@ OctoberLayout.prototype.updateLayout = function(title) { var $children, $el, fixedWidth, margin - // The entire 'width-fix' class can probably be removed if year >= 2017 - // After checking that it isn't being used anywhere -sg - $('.layout-cell.width-fix, [data-calculate-width]').each(function(){ + $('[data-calculate-width]').each(function(){ $children = $(this).children() if ($children.length > 0) { diff --git a/modules/backend/assets/less/layout/flexlayout.less b/modules/backend/assets/less/layout/flexlayout.less index 461751a75..fe00e05b8 100644 --- a/modules/backend/assets/less/layout/flexlayout.less +++ b/modules/backend/assets/less/layout/flexlayout.less @@ -39,17 +39,12 @@ .flex-layout-item { margin: 0; - &.fix {.flex-fix();} - &.stretch {.flex-stretch();} - &.stretch-constrain {.flex-stretch-constrain();} - &.center {.align-self(center);} + &.fix { .flex-fix(); } + &.stretch { .flex-stretch(); } + &.stretch-constrain { .flex-stretch-constrain(); } + &.center { .align-self(center); } - &.relative {position: relative;} + &.relative { position: relative; } - &.layout-container {max-width: none;} - - // @deprecated Remove if year >= 2017 (3 lines below) - &.width-100 {width: 100px;} - &.width-200 {width: 200px;} - &.width-300 {width: 300px;} -} \ No newline at end of file + &.layout-container { max-width: none; } +} diff --git a/modules/backend/assets/less/layout/layout.less b/modules/backend/assets/less/layout/layout.less index a386db67e..fea57dac7 100644 --- a/modules/backend/assets/less/layout/layout.less +++ b/modules/backend/assets/less/layout/layout.less @@ -85,15 +85,6 @@ body { vertical-align: top; height: 100%; - // @deprecated Remove if year >= 2017 (7 lines below) - &.width-100 { width: 100px; } - &.width-120 { width: 120px; } - &.width-130 { width: 130px; } - &.width-140 { width: 140px; } - &.width-200 { width: 200px; } - &.width-300 { width: 300px; } - &.width-350 { width: 350px; } - &.layout-container, .layout-container, &.padded-container, .padded-container { padding: @padding-standard @padding-standard 0 @padding-standard; @@ -171,7 +162,7 @@ body { // Calculated fixed width // -.layout-cell.width-fix, [data-calculate-width] { +[data-calculate-width] { > form, > div { display: inline-block; } @@ -228,4 +219,4 @@ body.slim-container { } } } -} \ No newline at end of file +} diff --git a/modules/system/assets/js/lang/lang.be.js b/modules/system/assets/js/lang/lang.be.js new file mode 100644 index 000000000..2c573da5d --- /dev/null +++ b/modules/system/assets/js/lang/lang.be.js @@ -0,0 +1,144 @@ +/* + * This file has been compiled from: /modules/system/lang/be/client.php + */ +if ($.oc === undefined) $.oc = {} +if ($.oc.langMessages === undefined) $.oc.langMessages = {} +$.oc.langMessages['be'] = $.extend( + $.oc.langMessages['be'] || {}, + {"markdowneditor":{"formatting":"\u0424\u0430\u0440\u043c\u0430\u0442\u0430\u0432\u0430\u043d\u043d\u0435","quote":"\u0426\u044b\u0442\u0430\u0442\u0430","code":"\u041a\u043e\u0434","header1":"\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 1","header2":"\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 2","header3":"\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 3","header4":"\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 4","header5":"\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 5","header6":"\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 6","bold":"\u0422\u043e\u045e\u0441\u0442\u044b \u0448\u0440\u044b\u0444\u0442","italic":"\u041a\u0443\u0440\u0441\u0456\u045e","unorderedlist":"\u041d\u0435\u0441\u0430\u0440\u0442\u0430\u0432\u0430\u043d\u044b \u043b\u0456\u0441\u0442","orderedlist":"\u0421\u0430\u0440\u0442\u0430\u0432\u0430\u043d\u044b \u043b\u0456\u0441\u0442","video":"\u0412\u0456\u0434\u044d\u0430","image":"\u0412\u044b\u044f\u0432\u0430","link":"\u0421\u043f\u0430\u0441\u044b\u043b\u043a\u0430","horizontalrule":"Insert Horizontal Rul","fullscreen":"\u041f\u043e\u045e\u043d\u044b \u044d\u043a\u0440\u0430\u043d","preview":"\u041f\u0440\u0430\u0434\u043f\u0440\u0430\u0433\u043b\u044f\u0434"},"mediamanager":{"insert_link":"\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u043c\u0435\u0434\u044b\u044f \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443","insert_image":"\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u043c\u0435\u0434\u044b\u044f \u0432\u044b\u044f\u0432\u0443","insert_video":"\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u043c\u0435\u0434\u044b\u044f \u0432\u0456\u0434\u044d\u0430","insert_audio":"\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u043c\u0435\u0434\u044b\u044f \u0430\u045e\u0434\u044b\u0451","invalid_file_empty_insert":"\u041a\u0430\u043b\u0456 \u043b\u0430\u0441\u043a\u0430, \u0432\u044b\u0431\u0435\u0440\u044b\u0446\u0435 \u0444\u0430\u0439\u043b, \u043a\u0430\u0431 \u0443\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443","invalid_file_single_insert":"\u041a\u0430\u043b\u0456 \u043b\u0430\u0441\u043a\u0430, \u0432\u044b\u0431\u0435\u0440\u044b\u0446\u0435 \u0430\u0434\u0437\u0456\u043d \u0444\u0430\u0439\u043b","invalid_image_empty_insert":"\u041a\u0430\u043b\u0456 \u043b\u0430\u0441\u043a\u0430, \u0432\u044b\u0431\u0435\u0440\u044b\u0446\u0435 \u0432\u044b\u044f\u0432\u044b, \u043a\u0430\u0431 \u0443\u0441\u0442\u0430\u0432\u0456\u0446\u044c","invalid_video_empty_insert":"\u041a\u0430\u043b\u0456 \u043b\u0430\u0441\u043a\u0430, \u0432\u044b\u0431\u0435\u0440\u044b\u0446\u0435 \u0432\u0456\u0434\u044d\u0430 \u0444\u0430\u0439\u043b, \u043a\u0430\u0431 \u0443\u0441\u0442\u0430\u0432\u0456\u0446\u044c","invalid_audio_empty_insert":"\u041a\u0430\u043b\u0456 \u043b\u0430\u0441\u043a\u0430, \u0432\u044b\u0431\u0435\u0440\u044b\u0446\u0435 \u0430\u045e\u0434\u044b\u0451 \u0444\u0430\u0439\u043b, \u043a\u0430\u0431 \u0443\u0441\u0442\u0430\u0432\u0456\u0446\u044c"},"alert":{"confirm_button_text":"\u0414\u043e\u0431\u0440\u0430","cancel_button_text":"\u0410\u0434\u043c\u0435\u043d\u0430","widget_remove_confirm":"Remove this widget?"},"datepicker":{"previousMonth":"\u041f\u0430\u043f\u044f\u0440\u044d\u0434\u043d\u0456 \u043c\u0435\u0441\u044f\u0446","nextMonth":"\u041d\u0430\u0441\u0442\u0443\u043f\u043d\u044b \u043c\u0435\u0441\u044f\u0446","months":["\u0421\u0442\u0443\u0434\u0437\u0435\u043d\u044c","\u041b\u044e\u0442\u044b","\u0421\u0430\u043a\u0430\u0432\u0456\u043a","\u041a\u0440\u0430\u0441\u0430\u0432\u0456\u043a","\u0422\u0440\u0430\u0432\u0435\u043d\u044c","\u0427\u044d\u0440\u0432\u0435\u043d\u044c","\u041b\u0456\u043f\u0435\u043d\u044c","\u0416\u043d\u0456\u0432\u0435\u043d\u044c","\u0412\u0435\u0440\u0430\u0441\u0435\u043d\u044c","\u041a\u0430\u0441\u0442\u0440\u044b\u0447\u043d\u0456\u043a","\u041b\u0456\u0441\u0442\u0430\u043f\u0430\u0434","\u0421\u043d\u0435\u0436\u0430\u043d\u044c"],"weekdays":["\u041d\u044f\u0434\u0437\u0435\u043b\u044f","\u041f\u0430\u043d\u044f\u0434\u0437\u0435\u043b\u0430\u043a","\u0410\u045e\u0442\u043e\u0440\u0430\u043a","\u0421\u0435\u0440\u0430\u0434\u0430","\u0427\u0430\u0446\u0432\u0435\u0440","\u041f\u044f\u0442\u043d\u0456\u0446\u0430","\u0421\u0443\u0431\u043e\u0442\u0430"],"weekdaysShort":["\u041d\u0434","\u041f\u043d","\u0410\u045e\u0442","\u0421\u0440","\u0427\u0430\u0446\u0432","\u041f\u043d","\u0421\u0431"]},"filter":{"group":{"all":"\u045e\u0441\u0435"},"dates":{"all":"\u045e\u0441\u0435","filter_button_text":"\u0424\u0456\u043b\u044c\u0442\u0440","reset_button_text":"\u0421\u043a\u0456\u043d\u0443\u0446\u044c","date_placeholder":"\u0414\u0430\u0442\u0430","after_placeholder":"\u041f\u0430\u043f\u044f\u0440\u044d\u0434\u043d\u044f\u044f","before_placeholder":"\u041d\u0430\u0441\u0442\u0443\u043f\u043d\u0430\u044f"}},"eventlog":{"show_stacktrace":"\u041f\u0430\u043a\u0430\u0437\u0430\u0446\u044c \u0442\u0440\u0430\u0441\u0456\u0440\u043e\u045e\u043a\u0443 \u0441\u0442\u044d\u043a\u0430","hide_stacktrace":"Hide the stacktrace","tabs":{"formatted":"\u0410\u0434\u0444\u0430\u0440\u043c\u0430\u0442\u0430\u0432\u0430\u043d\u0430","raw":"\u0421\u044b\u0440\u0430"},"editor":{"title":"\u0420\u044d\u0434\u0430\u043a\u0442\u0430\u0440 \u0437\u044b\u0445\u043e\u0434\u043d\u0430\u0433\u0430 \u043a\u043e\u0434\u0443","description":"\u0412\u0430\u0448\u0430 \u0430\u043f\u0435\u0440\u0430\u0446\u044b\u0439\u043d\u0430\u044f \u0441\u0456\u0441\u0442\u044d\u043c\u0430 \u043f\u0430\u0432\u0456\u043d\u043d\u0430 \u0431\u044b\u0446\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d\u0430 \u043d\u0430 \u043f\u0440\u0430\u0441\u043b\u0443\u0445\u043e\u045e\u0432\u0430\u043d\u043d\u0435 \u0430\u0434\u043d\u043e\u0439 \u0437 \u0433\u044d\u0442\u044b\u0445 \u0441\u0445\u0435\u043c URL","openWith":"\u0410\u0434\u0447\u044b\u043d\u0456\u0446\u044c \u0437 \u0434\u0430\u043f\u0430\u043c\u043e\u0433\u0430\u0439","remember_choice":"\u0417\u0430\u043f\u043e\u043c\u043d\u0456\u0446\u044c \u0430\u0431\u0440\u0430\u043d\u044b \u0432\u0430\u0440\u044b\u044f\u043d\u0442 \u0434\u043b\u044f \u0433\u044d\u0442\u0430\u0439 \u0441\u0435\u0441\u0456\u0456","open":"\u0410\u0434\u0447\u044b\u043d\u0456\u0446\u044c","cancel":"\u0410\u0434\u043c\u044f\u043d\u0456\u0446\u044c"}}} +); + +//! moment.js locale configuration +//! locale : belarusian (be) +//! author : Dmitry Demidov : https://github.com/demidov91 +//! author: Praleska: http://praleska.pro/ +//! Author : Menelion Elensúle : https://github.com/Oire + +;(function (global, factory) { + typeof exports === 'object' && typeof module !== 'undefined' + && typeof require === 'function' ? factory(require('../moment')) : + typeof define === 'function' && define.amd ? define(['moment'], factory) : + factory(global.moment) +}(this, function (moment) { 'use strict'; + + + function plural(word, num) { + var forms = word.split('_'); + return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]); + } + function relativeTimeWithPlural(number, withoutSuffix, key) { + var format = { + 'mm': withoutSuffix ? 'хвіліна_хвіліны_хвілін' : 'хвіліну_хвіліны_хвілін', + 'hh': withoutSuffix ? 'гадзіна_гадзіны_гадзін' : 'гадзіну_гадзіны_гадзін', + 'dd': 'дзень_дні_дзён', + 'MM': 'месяц_месяцы_месяцаў', + 'yy': 'год_гады_гадоў' + }; + if (key === 'm') { + return withoutSuffix ? 'хвіліна' : 'хвіліну'; + } + else if (key === 'h') { + return withoutSuffix ? 'гадзіна' : 'гадзіну'; + } + else { + return number + ' ' + plural(format[key], +number); + } + } + + var be = moment.defineLocale('be', { + months : { + format: 'студзеня_лютага_сакавіка_красавіка_траўня_чэрвеня_ліпеня_жніўня_верасня_кастрычніка_лістапада_снежня'.split('_'), + standalone: 'студзень_люты_сакавік_красавік_травень_чэрвень_ліпень_жнівень_верасень_кастрычнік_лістапад_снежань'.split('_') + }, + monthsShort : 'студ_лют_сак_крас_трав_чэрв_ліп_жнів_вер_каст_ліст_снеж'.split('_'), + weekdays : { + format: 'нядзелю_панядзелак_аўторак_сераду_чацвер_пятніцу_суботу'.split('_'), + standalone: 'нядзеля_панядзелак_аўторак_серада_чацвер_пятніца_субота'.split('_'), + isFormat: /\[ ?[Вв] ?(?:мінулую|наступную)? ?\] ?dddd/ + }, + weekdaysShort : 'нд_пн_ат_ср_чц_пт_сб'.split('_'), + weekdaysMin : 'нд_пн_ат_ср_чц_пт_сб'.split('_'), + longDateFormat : { + LT : 'HH:mm', + LTS : 'HH:mm:ss', + L : 'DD.MM.YYYY', + LL : 'D MMMM YYYY г.', + LLL : 'D MMMM YYYY г., HH:mm', + LLLL : 'dddd, D MMMM YYYY г., HH:mm' + }, + calendar : { + sameDay: '[Сёння ў] LT', + nextDay: '[Заўтра ў] LT', + lastDay: '[Учора ў] LT', + nextWeek: function () { + return '[У] dddd [ў] LT'; + }, + lastWeek: function () { + switch (this.day()) { + case 0: + case 3: + case 5: + case 6: + return '[У мінулую] dddd [ў] LT'; + case 1: + case 2: + case 4: + return '[У мінулы] dddd [ў] LT'; + } + }, + sameElse: 'L' + }, + relativeTime : { + future : 'праз %s', + past : '%s таму', + s : 'некалькі секунд', + m : relativeTimeWithPlural, + mm : relativeTimeWithPlural, + h : relativeTimeWithPlural, + hh : relativeTimeWithPlural, + d : 'дзень', + dd : relativeTimeWithPlural, + M : 'месяц', + MM : relativeTimeWithPlural, + y : 'год', + yy : relativeTimeWithPlural + }, + meridiemParse: /ночы|раніцы|дня|вечара/, + isPM : function (input) { + return /^(дня|вечара)$/.test(input); + }, + meridiem : function (hour, minute, isLower) { + if (hour < 4) { + return 'ночы'; + } else if (hour < 12) { + return 'раніцы'; + } else if (hour < 17) { + return 'дня'; + } else { + return 'вечара'; + } + }, + ordinalParse: /\d{1,2}-(і|ы|га)/, + ordinal: function (number, period) { + switch (period) { + case 'M': + case 'd': + case 'DDD': + case 'w': + case 'W': + return (number % 10 === 2 || number % 10 === 3) && (number % 100 !== 12 && number % 100 !== 13) ? number + '-і' : number + '-ы'; + case 'D': + return number + '-га'; + default: + return number; + } + }, + week : { + dow : 1, // Monday is the first day of the week. + doy : 7 // The week that contains Jan 1st is the first week of the year. + } + }); + + return be; + +})); diff --git a/modules/system/assets/js/lang/lang.bg.js b/modules/system/assets/js/lang/lang.bg.js index 9cb69b646..2099a3263 100644 --- a/modules/system/assets/js/lang/lang.bg.js +++ b/modules/system/assets/js/lang/lang.bg.js @@ -5,5 +5,96 @@ if ($.oc === undefined) $.oc = {} if ($.oc.langMessages === undefined) $.oc.langMessages = {} $.oc.langMessages['bg'] = $.extend( $.oc.langMessages['bg'] || {}, - {"markdowneditor":{"formatting":"Formatting","quote":"Quote","code":"Code","header1":"Header 1","header2":"Header 2","header3":"Header 3","header4":"Header 4","header5":"Header 5","header6":"Header 6","bold":"Bold","italic":"Italic","unorderedlist":"Unordered List","orderedlist":"Ordered List","video":"Video","image":"Image","link":"Link","horizontalrule":"Insert Horizontal Rule","fullscreen":"Full screen","preview":"Preview"},"mediamanager":{"insert_link":"Insert Media Link","insert_image":"Insert Media Image","insert_video":"Insert Media Video","insert_audio":"Insert Media Audio","invalid_file_empty_insert":"Please select file to insert a links to.","invalid_file_single_insert":"Please select a single file.","invalid_image_empty_insert":"Please select image(s) to insert.","invalid_video_empty_insert":"Please select a video file to insert.","invalid_audio_empty_insert":"Please select an audio file to insert."},"alert":{"confirm_button_text":"Ок","cancel_button_text":"Откажи"}} -); \ No newline at end of file + {"markdowneditor":{"formatting":"\u0424\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d\u0435","quote":"\u0426\u0438\u0442\u0430\u0442","code":"\u041a\u043e\u0434","header1":"\u0425\u0435\u0434\u044a\u0440 1","header2":"\u0425\u0435\u0434\u044a\u0440 2","header3":"\u0425\u0435\u0434\u044a\u0440 3","header4":"\u0425\u0435\u0434\u044a\u0440 4","header5":"\u0425\u0435\u0434\u044a\u0440 5","header6":"\u0425\u0435\u0434\u044a\u0440 6","bold":"\u041f\u043e\u0434\u0447\u0435\u0440\u0442\u0430\u043d","italic":"\u041d\u0430\u043a\u043b\u043e\u043d\u0435\u043d","unorderedlist":"\u041d\u0435\u043f\u043e\u0434\u0440\u0435\u0434\u0435\u043d \u0421\u043f\u0438\u0441\u044a\u043a","orderedlist":"\u041f\u043e\u0434\u0440\u0435\u0434\u0435\u043d \u0421\u043f\u0438\u0441\u044a\u043a","video":"\u0412\u0438\u0434\u0435\u043e","image":"\u0418\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435","link":"\u0412\u0440\u044a\u0437\u043a\u0430","horizontalrule":"\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u0445\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u043d\u0430 \u043b\u0438\u043d\u0438\u044f","fullscreen":"\u041d\u0430 \u0446\u044f\u043b \u0435\u043a\u0440\u0430\u043d","preview":"\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u0435\u043d \u043f\u0440\u0435\u0433\u043b\u0435\u0434"},"mediamanager":{"insert_link":"\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u043b\u0438\u043d\u043a","insert_image":"\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435","insert_video":"\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u0432\u0438\u0434\u0435\u043e \u0444\u0430\u0439\u043b","insert_audio":"\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u0437\u0432\u0443\u043a\u043e\u0432 \u0444\u0430\u0439\u043b","invalid_file_empty_insert":"\u041c\u043e\u043b\u044f, \u0438\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u0444\u0430\u0439\u043b \u0437\u0430 \u0434\u0430 \u0433\u043e \u0432\u043c\u044a\u043a\u043d\u0435\u0442\u0435 \u043a\u0430\u0442\u043e \u043b\u0438\u043d\u043a.","invalid_file_single_insert":"\u041c\u043e\u043b\u044f, \u0438\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u0435\u0434\u0438\u043d \u0444\u0430\u0439\u043b.","invalid_image_empty_insert":"\u041c\u043e\u043b\u044f, \u0438\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435(\u044f) \u0437\u0430 \u0434\u0430 \u0432\u043c\u044a\u043a\u043d\u0435\u0442\u0435.","invalid_video_empty_insert":"\u041c\u043e\u043b\u044f, \u0438\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u0432\u0438\u0434\u0435\u043e \u0444\u0430\u0439\u043b \u0437\u0430 \u0432\u043c\u044a\u043a\u0432\u0430\u043d\u0435.","invalid_audio_empty_insert":"\u041c\u043e\u043b\u044f, \u0438\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u0437\u0432\u0443\u043a\u043e\u0432 \u0444\u0430\u0439\u043b \u0437\u0430 \u0432\u043c\u044a\u043a\u0432\u0430\u043d\u0435."},"alert":{"confirm_button_text":"\u041f\u043e\u0442\u0432\u044a\u0440\u0434\u0438","cancel_button_text":"\u041e\u0442\u043a\u0430\u0436\u0438","widget_remove_confirm":"Remove this widget?"},"datepicker":{"previousMonth":"Previous Month","nextMonth":"Next Month","months":["January","February","March","April","May","June","July","August","September","October","November","December"],"weekdays":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"weekdaysShort":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"]},"filter":{"group":{"all":"all"},"dates":{"all":"all","filter_button_text":"Filter","reset_button_text":"Reset","date_placeholder":"Date","after_placeholder":"After","before_placeholder":"Before"}},"eventlog":{"show_stacktrace":"Show the stacktrace","hide_stacktrace":"Hide the stacktrace","tabs":{"formatted":"Formatted","raw":"Raw"},"editor":{"title":"Source code editor","description":"Your operating system should be configured to listen to one of these URL schemes.","openWith":"Open with","remember_choice":"Remember selected option for this session","open":"Open","cancel":"Cancel"}}} +); + +//! moment.js locale configuration +//! locale : bulgarian (bg) +//! author : Krasen Borisov : https://github.com/kraz + +;(function (global, factory) { + typeof exports === 'object' && typeof module !== 'undefined' + && typeof require === 'function' ? factory(require('../moment')) : + typeof define === 'function' && define.amd ? define(['moment'], factory) : + factory(global.moment) +}(this, function (moment) { 'use strict'; + + + var bg = moment.defineLocale('bg', { + months : 'януари_февруари_март_април_май_юни_юли_август_септември_октомври_ноември_декември'.split('_'), + monthsShort : 'янр_фев_мар_апр_май_юни_юли_авг_сеп_окт_ное_дек'.split('_'), + weekdays : 'неделя_понеделник_вторник_сряда_четвъртък_петък_събота'.split('_'), + weekdaysShort : 'нед_пон_вто_сря_чет_пет_съб'.split('_'), + weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'), + longDateFormat : { + LT : 'H:mm', + LTS : 'H:mm:ss', + L : 'D.MM.YYYY', + LL : 'D MMMM YYYY', + LLL : 'D MMMM YYYY H:mm', + LLLL : 'dddd, D MMMM YYYY H:mm' + }, + calendar : { + sameDay : '[Днес в] LT', + nextDay : '[Утре в] LT', + nextWeek : 'dddd [в] LT', + lastDay : '[Вчера в] LT', + lastWeek : function () { + switch (this.day()) { + case 0: + case 3: + case 6: + return '[В изминалата] dddd [в] LT'; + case 1: + case 2: + case 4: + case 5: + return '[В изминалия] dddd [в] LT'; + } + }, + sameElse : 'L' + }, + relativeTime : { + future : 'след %s', + past : 'преди %s', + s : 'няколко секунди', + m : 'минута', + mm : '%d минути', + h : 'час', + hh : '%d часа', + d : 'ден', + dd : '%d дни', + M : 'месец', + MM : '%d месеца', + y : 'година', + yy : '%d години' + }, + ordinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/, + ordinal : function (number) { + var lastDigit = number % 10, + last2Digits = number % 100; + if (number === 0) { + return number + '-ев'; + } else if (last2Digits === 0) { + return number + '-ен'; + } else if (last2Digits > 10 && last2Digits < 20) { + return number + '-ти'; + } else if (lastDigit === 1) { + return number + '-ви'; + } else if (lastDigit === 2) { + return number + '-ри'; + } else if (lastDigit === 7 || lastDigit === 8) { + return number + '-ми'; + } else { + return number + '-ти'; + } + }, + week : { + dow : 1, // Monday is the first day of the week. + doy : 7 // The week that contains Jan 1st is the first week of the year. + } + }); + + return bg; + +})); diff --git a/modules/system/assets/ui/less/form.less b/modules/system/assets/ui/less/form.less index 0509fe372..cec36ffb9 100644 --- a/modules/system/assets/ui/less/form.less +++ b/modules/system/assets/ui/less/form.less @@ -452,11 +452,6 @@ body.slim-container { .form-control { display: inline-block; margin-right: 15px; - - // @deprecated Remove if year >= 2017 (3 lines below) - &.width-50 { width: 50px; } - &.width-100 { width: 100px; } - &.width-150 { width: 150px;} } input[type=text].form-control, label { @@ -490,4 +485,4 @@ body.slim-container { select.form-control.custom-select { display: none; } -} \ No newline at end of file +} diff --git a/modules/system/assets/ui/storm-min.js b/modules/system/assets/ui/storm-min.js index 330fa9bc7..b36fb5eba 100644 --- a/modules/system/assets/ui/storm-min.js +++ b/modules/system/assets/ui/storm-min.js @@ -3898,10 +3898,10 @@ if(prefix===undefined) prefix='' if($el.val().length&&$el.val()!=prefix) return -$el.val(prefix) +$el.val(prefix).trigger('oc.inputPreset.afterUpdate') this.$src=$(options.inputPreset,parent),this.$src.on('keyup',function(){if(self.cancelled) return -$el.val(prefix+self.formatValue())}) +$el.val(prefix+self.formatValue()).trigger('oc.inputPreset.afterUpdate')}) this.$el.on('change',function(){self.cancelled=true})} InputPreset.prototype.formatNamespace=function(){var value=toCamel(this.$src.val()) return value.substr(0,1).toUpperCase()+value.substr(1)} diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css index 4a69feef7..6d6e1704d 100644 --- a/modules/system/assets/ui/storm.css +++ b/modules/system/assets/ui/storm.css @@ -2518,9 +2518,6 @@ body.slim-container .form-buttons{padding:0 20px 20px} .select2-container--default .select2-selection--single .select2-selection__arrow b{border:none} .select2-dropdown{z-index:10400} [data-control=toolbar] .form-control{display:inline-block;margin-right:15px} -[data-control=toolbar] .form-control.width-50{width:50px} -[data-control=toolbar] .form-control.width-100{width:100px} -[data-control=toolbar] .form-control.width-150{width:150px} [data-control=toolbar] input[type=text].form-control,[data-control=toolbar] label{position:relative;top:5px} [data-control=toolbar] label{margin-right:7px} [data-control=toolbar] label.standalone{margin-right:15px}