mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com:octobercms/october into develop

Browse Source
This commit is contained in:
Aleksey Bobkov 2017-01-25 20:16:23 -08:00
commit 761b03ef16
11 changed files with 255 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/backend/assets/css/october.css
View File

@ -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}

2
modules/backend/assets/js/october-min.js vendored
View File

@ -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')

4
modules/backend/assets/js/october.layout.js
View File

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

17
modules/backend/assets/less/layout/flexlayout.less
View File

@ -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;}
&.layout-container { max-width: none; }
}

11
modules/backend/assets/less/layout/layout.less
View File

@ -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;
}

6
modules/backend/classes/Controller.php
View File

@ -153,8 +153,10 @@ class Controller extends Extendable
/*
* Media Manager widget is available on all back-end pages
*/
$manager = new MediaManager($this, 'ocmediamanager');
$manager->bindToController();
if (class_exists('Cms\Widgets\MediaManager')) {
$manager = new MediaManager($this, 'ocmediamanager');
$manager->bindToController();
}
}
/**

2
modules/backend/widgets/lists/partials/_list_body_row.htm
View File

@ -18,7 +18,7 @@
<?php $index = $url = 0; foreach ($columns as $key => $column): ?>
<?php $index++; ?>
<td data-title="<?= e(trans($column->label)) ?>" class="list-cell-index-<?= $index ?> list-cell-name-<?= $column->getName() ?> list-cell-type-<?= $column->type ?> <?= $column->clickable ? '' : 'nolink' ?> <?= $column->cssClass ?>">
<td class="list-cell-index-<?= $index ?> list-cell-name-<?= $column->getName() ?> list-cell-type-<?= $column->type ?> <?= $column->clickable ? '' : 'nolink' ?> <?= $column->cssClass ?>">
<?php if ($column->clickable && !$url && ($url = $this->getRecordUrl($record))): ?>
<a <?= $this->getRecordOnClick($record) ?> href="<?= $url ?>">
<?= $this->getColumnValue($record, $column) ?>

144
modules/system/assets/js/lang/lang.be.js Normal file
View File

File diff suppressed because one or more lines are too long

93
modules/system/assets/js/lang/lang.bg.js
View File

@ -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":"Откажи"}}
{"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;
}));

5
modules/system/assets/ui/less/form.less
View File

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

3
modules/system/assets/ui/storm.css
View File

@ -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}