diff --git a/modules/backend/reportwidgets/Welcome.php b/modules/backend/reportwidgets/Welcome.php
index 8cfa60bff..3c1857b79 100644
--- a/modules/backend/reportwidgets/Welcome.php
+++ b/modules/backend/reportwidgets/Welcome.php
@@ -28,7 +28,6 @@ class Welcome extends ReportWidgetBase
$this->loadData();
}
catch (Exception $ex) {
- traceLog($ex);
$this->vars['error'] = $ex->getMessage();
}
diff --git a/modules/cms/widgets/mediamanager/assets/js/mediamanager-browser-min.js b/modules/cms/widgets/mediamanager/assets/js/mediamanager-browser-min.js
index 28dba459d..2382b96e7 100644
--- a/modules/cms/widgets/mediamanager/assets/js/mediamanager-browser-min.js
+++ b/modules/cms/widgets/mediamanager/assets/js/mediamanager-browser-min.js
@@ -619,8 +619,8 @@ MediaManagerImageCropPopup.prototype.undoResizing=function(){this.updateImage(th
MediaManagerImageCropPopup.prototype.updateSelectionSizeLabel=function(width,height){if(width==0&&height==0){this.selectionSizeLabel.setAttribute('class','hide')
return}
this.selectionSizeLabel.setAttribute('class','')
-this.selectionSizeLabel.querySelector('[data-label=selection-width]').textContent=width
-this.selectionSizeLabel.querySelector('[data-label=selection-height]').textContent=height}
+this.selectionSizeLabel.querySelector('[data-label=selection-width]').textContent=parseInt(width)
+this.selectionSizeLabel.querySelector('[data-label=selection-height]').textContent=parseInt(height)}
MediaManagerImageCropPopup.prototype.onPopupHidden=function(event,element,popup){this.$popupElement.find('form').request(this.options.alias+'::onEndCroppingSession')
$(document).trigger('mousedown')
this.dispose()}
@@ -634,7 +634,8 @@ this.selectionSizeLabel=popup.find('[data-label="selection-size"]').get(0)
this.getWidthInput().on('change',this.proxy(this.onSizeInputChange))
this.getHeightInput().on('change',this.proxy(this.onSizeInputChange))
this.initRulers()
-this.initJCrop()}
+this.initJCrop()
+this.applySelectionMode()}
MediaManagerImageCropPopup.prototype.onSelectionModeChanged=function(){var mode=this.getSelectionMode(),$widthInput=this.getWidthInput(),$heightInput=this.getHeightInput()
if(mode==='normal'){$widthInput.attr('disabled','disabled')
$heightInput.attr('disabled','disabled')}
diff --git a/modules/system/assets/ui/js/datepicker.js b/modules/system/assets/ui/js/datepicker.js
index 372b6b7a4..a38e43e1a 100644
--- a/modules/system/assets/ui/js/datepicker.js
+++ b/modules/system/assets/ui/js/datepicker.js
@@ -224,16 +224,23 @@
}
DatePicker.prototype.isTimeTwelveHour = function() {
- var momentObj = moment()
+ return false
- if (this.locale) {
- momentObj = momentObj.locale(this.locale)
- }
+ // Disabled for now: The analog clock design is pretty good
+ // at representing time regardless of the format. If we want
+ // to enable this, there should be some way to disable it
+ // again via the form field options.
- return momentObj
- .localeData()
- .longDateFormat('LT')
- .indexOf('A') !== -1;
+ // var momentObj = moment()
+
+ // if (this.locale) {
+ // momentObj = momentObj.locale(this.locale)
+ // }
+
+ // return momentObj
+ // .localeData()
+ // .longDateFormat('LT')
+ // .indexOf('A') !== -1;
}
//
diff --git a/modules/system/assets/ui/less/datepicker.date.less b/modules/system/assets/ui/less/datepicker.date.less
index 87cca9138..ab5233d8b 100644
--- a/modules/system/assets/ui/less/datepicker.date.less
+++ b/modules/system/assets/ui/less/datepicker.date.less
@@ -3,16 +3,12 @@
// --------------------------------------------------
.pika-single {
- z-index: @zindex-datepicker;
display: block;
position: relative;
width: 240px;
padding: 8px;
color: #333;
background: #fff;
- border: 1px solid #ccc;
- border-bottom-color: #bbb;
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
&.is-hidden {
display: none;
diff --git a/modules/system/assets/ui/less/datepicker.less b/modules/system/assets/ui/less/datepicker.less
index 2045b7ddc..559039283 100644
--- a/modules/system/assets/ui/less/datepicker.less
+++ b/modules/system/assets/ui/less/datepicker.less
@@ -16,7 +16,6 @@
}
.pika-single {
- border: none;
border-radius: @border-radius-base;
font-size: 12px;
margin-top: 5px;
@@ -72,3 +71,47 @@
}
}
}
+
+.clockpicker-popover {
+ z-index: @zindex-datepicker;
+ .box-shadow(@overlay-box-shadow);
+ border-radius: @border-radius-base;
+
+ .popover-title {
+ font-size: 20px;
+ font-weight: normal;
+ border: none;
+ }
+
+ &.top {
+ margin-top: -5px;
+ }
+ &.right {
+ margin-left: 5px;
+ }
+ &.bottom {
+ margin-top: 5px;
+ }
+ &.left {
+ margin-left: -5px;
+ }
+
+ > .arrow {
+ display: none;
+ }
+}
+
+.clockpicker-plate {
+ border: none;
+}
+
+.clockpicker-hours .clockpicker-tick {
+ font-size: 12px;
+
+ &.tick-inner {
+ font-size: 16px;
+ }
+}
+.clockpicker-minutes .clockpicker-tick {
+ font-size: 16px;
+}
\ No newline at end of file
diff --git a/modules/system/assets/ui/less/datepicker.time.less b/modules/system/assets/ui/less/datepicker.time.less
index c43398fde..c78f278ce 100644
--- a/modules/system/assets/ui/less/datepicker.time.less
+++ b/modules/system/assets/ui/less/datepicker.time.less
@@ -10,7 +10,6 @@
position: absolute;
top: 0;
left: 0;
- z-index: @zindex-datepicker;
display: none;
max-width: 276px;
padding: 1px;
@@ -18,10 +17,7 @@
white-space: normal;
background-color: #fff;
background-clip: padding-box;
- border: 1px solid #ccc;
- border: 1px solid rgba(0, 0, 0, .2);
- border-radius: 6px;
- .box-shadow(0 5px 10px rgba(0, 0, 0, .2));
+
&.top {
margin-top: -10px;
}
@@ -48,6 +44,7 @@
.popover-content {
padding: 9px 14px;
}
+ /*
> .arrow,
> .arrow:after {
position: absolute;
@@ -139,6 +136,7 @@
border-right-width: 0;
border-left-color: #fff;
}
+ */
}
//
diff --git a/modules/system/assets/ui/storm-min.js b/modules/system/assets/ui/storm-min.js
index 35dc53f5e..f785fc880 100644
--- a/modules/system/assets/ui/storm-min.js
+++ b/modules/system/assets/ui/storm-min.js
@@ -2483,9 +2483,9 @@ function leadingZero(num){return(num<10?'0':'')+num;}
var idCounter=0;function uniqueId(prefix){var id=++idCounter+'';return prefix?prefix+id:id;}
var dialRadius=100,outerRadius=80,innerRadius=54,tickRadius=13,diameter=dialRadius*2,duration=transitionSupported?350:1;var tpl=['','
','
','',':',' ','','
','
','
','','','
'].join('');var amPmButtons=$(amPmButtonsTemplate);$('').on("click",function(){self.amOrPm="AM";$('.clockpicker-span-am-pm').empty().append('AM');}).appendTo(this.amPmBlock);$('').on("click",function(){self.amOrPm='PM';$('.clockpicker-span-am-pm').empty().append('PM');}).appendTo(this.amPmBlock);}
if(!options.autoclose){$('').click($.proxy(this.done,this)).appendTo(popover);}
-if((options.placement==='top'||options.placement==='bottom')&&(options.align==='top'||options.align==='bottom'))options.align='left';if((options.placement==='left'||options.placement==='right')&&(options.align==='left'||options.align==='right'))options.align='top';popover.addClass(options.placement);popover.addClass('clockpicker-align-'+options.align);this.spanHours.click($.proxy(this.toggleView,this,'hours'));this.spanMinutes.click($.proxy(this.toggleView,this,'minutes'));input.on('focus.clockpicker click.clockpicker',$.proxy(this.show,this));addon.on('click.clockpicker',$.proxy(this.toggle,this));var tickTpl=$(''),i,tick,radian,radius;if(options.twelvehour){for(i=1;i<13;i+=1){tick=tickTpl.clone();radian=i/6*Math.PI;radius=outerRadius;tick.css('font-size','120%');tick.css({left:dialRadius+Math.sin(radian)*radius-tickRadius,top:dialRadius-Math.cos(radian)*radius-tickRadius});tick.html(i===0?'00':i);hoursView.append(tick);tick.on(mousedownEvent,mousedown);}}else{for(i=0;i<24;i+=1){tick=tickTpl.clone();radian=i/6*Math.PI;var inner=i>0&&i<13;radius=inner?innerRadius:outerRadius;tick.css({left:dialRadius+Math.sin(radian)*radius-tickRadius,top:dialRadius-Math.cos(radian)*radius-tickRadius});if(inner){tick.css('font-size','120%');}
+if((options.placement==='top'||options.placement==='bottom')&&(options.align==='top'||options.align==='bottom'))options.align='left';if((options.placement==='left'||options.placement==='right')&&(options.align==='left'||options.align==='right'))options.align='top';popover.addClass(options.placement);popover.addClass('clockpicker-align-'+options.align);this.spanHours.click($.proxy(this.toggleView,this,'hours'));this.spanMinutes.click($.proxy(this.toggleView,this,'minutes'));input.on('focus.clockpicker click.clockpicker',$.proxy(this.show,this));addon.on('click.clockpicker',$.proxy(this.toggle,this));var tickTpl=$(''),i,tick,radian,radius;if(options.twelvehour){for(i=1;i<13;i+=1){tick=tickTpl.clone();radian=i/6*Math.PI;radius=outerRadius;tick.css('font-size','120%');tick.css({left:dialRadius+Math.sin(radian)*radius-tickRadius,top:dialRadius-Math.cos(radian)*radius-tickRadius});tick.html(i===0?'00':i);hoursView.append(tick);tick.on(mousedownEvent,mousedown);}}else{for(i=0;i<24;i+=1){tick=tickTpl.clone();radian=i/6*Math.PI;var inner=i>0&&i<13;radius=inner?innerRadius:outerRadius;tick.css({left:dialRadius+Math.sin(radian)*radius-tickRadius,top:dialRadius-Math.cos(radian)*radius-tickRadius});if(inner){tick.addClass('tick-inner');}
tick.html(i===0?'00':i);hoursView.append(tick);tick.on(mousedownEvent,mousedown);}}
-for(i=0;i<60;i+=5){tick=tickTpl.clone();radian=i/30*Math.PI;tick.css({left:dialRadius+Math.sin(radian)*outerRadius-tickRadius,top:dialRadius-Math.cos(radian)*outerRadius-tickRadius});tick.css('font-size','120%');tick.html(leadingZero(i));minutesView.append(tick);tick.on(mousedownEvent,mousedown);}
+for(i=0;i<60;i+=5){tick=tickTpl.clone();radian=i/30*Math.PI;tick.css({left:dialRadius+Math.sin(radian)*outerRadius-tickRadius,top:dialRadius-Math.cos(radian)*outerRadius-tickRadius});tick.html(leadingZero(i));minutesView.append(tick);tick.on(mousedownEvent,mousedown);}
plate.on(mousedownEvent,function(e){if($(e.target).closest('.clockpicker-tick').length===0){mousedown(e,true);}});function mousedown(e,space){var offset=plate.offset(),isTouch=/^touch/.test(e.type),x0=offset.left+dialRadius,y0=offset.top+dialRadius,dx=(isTouch?e.originalEvent.touches[0]:e).pageX-x0,dy=(isTouch?e.originalEvent.touches[0]:e).pageY-y0,z=Math.sqrt(dx*dx+dy*dy),moved=false;if(space&&(zouterRadius+tickRadius)){return;}
e.preventDefault();var movingTimer=setTimeout(function(){$body.addClass('clockpicker-moving');},200);if(svgSupported){plate.append(self.canvas);}
self.setHand(dx,dy,!space,true);$doc.off(mousemoveEvent).on(mousemoveEvent,function(e){e.preventDefault();var isTouch=/^touch/.test(e.type),x=(isTouch?e.originalEvent.touches[0]:e).pageX-x0,y=(isTouch?e.originalEvent.touches[0]:e).pageY-y0;if(!moved&&x===dx&&y===dy){return;}
@@ -2793,9 +2793,7 @@ DatePicker.prototype.getTimePickerValue=function(){var value=this.$timePicker.va
if(!this.hasTime||!value){return moment.tz(this.appTimezone).tz(this.timezone).format(this.dbTimeFormat)}
return moment(value,this.getTimeFormat()).format(this.dbTimeFormat)}
DatePicker.prototype.getTimeFormat=function(){return this.isTimeTwelveHour()?'hh:mm A':'HH:mm'}
-DatePicker.prototype.isTimeTwelveHour=function(){var momentObj=moment()
-if(this.locale){momentObj=momentObj.locale(this.locale)}
-return momentObj.localeData().longDateFormat('LT').indexOf('A')!==-1;}
+DatePicker.prototype.isTimeTwelveHour=function(){return false}
DatePicker.prototype.emptyValues=function(){this.$dataLocker.val('')
this.$datePicker.val('')
this.$timePicker.val('')}
diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css
index a151b7d49..4e8bb854e 100644
--- a/modules/system/assets/ui/storm.css
+++ b/modules/system/assets/ui/storm.css
@@ -2836,7 +2836,7 @@ ul.autocomplete.dropdown-menu.inspector-autocomplete li a{padding:5px 12px;white
.popup-backdrop .popup-loading-indicator:after{content:' ';display:block;background-size:50px 50px;background-repeat:no-repeat;background-position:50% 50%;background-image:url('images/loader-transparent.svg');-webkit-animation:spin 1s linear infinite;animation:spin 1s linear infinite;width:50px;height:50px;margin:25px 0 0 25px}
.popup-backdrop.loading .popup-loading-indicator{opacity:1;filter:alpha(opacity=100);-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}
.mac body.modal-open{margin-right:0}
-.pika-single{z-index:10100;display:block;position:relative;width:240px;padding:8px;color:#333;background:#fff;border:1px solid #ccc;border-bottom-color:#bbb;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}
+.pika-single{display:block;position:relative;width:240px;padding:8px;color:#333;background:#fff}
.pika-single.is-hidden{display:none}
.pika-single.is-bound{position:absolute;box-shadow:0 5px 15px -5px rgba(0,0,0,0.5)}
.pika-title,.pika-footer{position:relative;text-align:center}
@@ -2857,24 +2857,13 @@ ul.autocomplete.dropdown-menu.inspector-autocomplete li a{padding:5px 12px;white
.is-selected .pika-button{color:#fff;font-weight:bold;background:#33aaff;box-shadow:inset 0 1px 3px #178fe5;border-radius:3px}
.is-disabled .pika-button{pointer-events:none;cursor:default;color:#999;opacity:.3}
.pika-button:hover{color:#fff !important;background:#ff8000 !important;box-shadow:none !important;border-radius:3px !important}
-.clockpicker-popover{position:absolute;top:0;left:0;z-index:10100;display:none;max-width:276px;padding:1px;text-align:left;white-space:normal;background-color:#fff;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2)}
+.clockpicker-popover{position:absolute;top:0;left:0;display:none;max-width:276px;padding:1px;text-align:left;white-space:normal;background-color:#fff;background-clip:padding-box; }
.clockpicker-popover.top{margin-top:-10px}
.clockpicker-popover.right{margin-left:10px}
.clockpicker-popover.bottom{margin-top:10px}
.clockpicker-popover.left{margin-left:-10px}
.clockpicker-popover .popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}
.clockpicker-popover .popover-content{padding:9px 14px}
-.clockpicker-popover > .arrow,.clockpicker-popover > .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid;overflow:visible;margin:0;padding:0;z-index:auto;background-color:transparent;-webkit-box-shadow:none;box-shadow:none;bottom:auto;left:auto;right:auto;top:auto;-webkit-transform:none;-ms-transform:none;transform:none}
-.clockpicker-popover > .arrow{border-width:11px}
-.clockpicker-popover > .arrow:after{content:"";border-width:10px}
-.clockpicker-popover.top > .arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,0.25);border-bottom-width:0}
-.clockpicker-popover.top > .arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}
-.clockpicker-popover.right > .arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,0.25);border-left-width:0}
-.clockpicker-popover.right > .arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}
-.clockpicker-popover.bottom > .arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25)}
-.clockpicker-popover.bottom > .arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}
-.clockpicker-popover.left > .arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,0.25)}
-.clockpicker-popover.left > .arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}
.clockpicker .input-group-addon{cursor:pointer}
.clockpicker-moving{cursor:move}
.clockpicker-align-left.popover > .arrow{left:25px}
@@ -2902,7 +2891,7 @@ ul.autocomplete.dropdown-menu.inspector-autocomplete li a{padding:5px 12px;white
.clockpicker-canvas line{stroke:#0095dd;stroke-width:1;stroke-linecap:round}
.clockpicker-button.am-button{margin:1px;padding:5px;border:1px solid rgba(0,0,0,0.2);border-radius:4px}
.clockpicker-button.pm-button{margin:1px 1px 1px 136px;padding:5px;border:1px solid rgba(0,0,0,0.2);border-radius:4px}
-.pika-single{border:none;border-radius:3px;font-size:12px;margin-top:5px;z-index:10100;font-family:sans-serif;width:310px}
+.pika-single{border-radius:3px;font-size:12px;margin-top:5px;z-index:10100;font-family:sans-serif;width:310px}
.pika-single.is-bound{-webkit-box-shadow:0 1px 6px rgba(0,0,0,0.12),0 1px 4px rgba(0,0,0,0.24);box-shadow:0 1px 6px rgba(0,0,0,0.12),0 1px 4px rgba(0,0,0,0.24)}
.pika-single abbr{border-bottom:none}
.pika-single .pika-button{border-radius:999px !important;text-align:center;width:29px;height:29px;margin:3px;background:transparent}
@@ -2911,4 +2900,15 @@ ul.autocomplete.dropdown-menu.inspector-autocomplete li a{padding:5px 12px;white
.pika-single .pika-button:hover{color:#34495e !important;background:#f5f5f5 !important}
.pika-single .pika-label{font-weight:normal}
.pika-single .pika-table th{text-transform:uppercase;font-weight:normal;line-height:30px;font-size:11px}
-.pika-single .pika-footer .pika-label{font-size:11px}
\ No newline at end of file
+.pika-single .pika-footer .pika-label{font-size:11px}
+.clockpicker-popover{z-index:10100;-webkit-box-shadow:0 1px 6px rgba(0,0,0,0.12),0 1px 4px rgba(0,0,0,0.24);box-shadow:0 1px 6px rgba(0,0,0,0.12),0 1px 4px rgba(0,0,0,0.24);border-radius:3px}
+.clockpicker-popover .popover-title{font-size:20px;font-weight:normal;border:none}
+.clockpicker-popover.top{margin-top:-5px}
+.clockpicker-popover.right{margin-left:5px}
+.clockpicker-popover.bottom{margin-top:5px}
+.clockpicker-popover.left{margin-left:-5px}
+.clockpicker-popover > .arrow{display:none}
+.clockpicker-plate{border:none}
+.clockpicker-hours .clockpicker-tick{font-size:12px}
+.clockpicker-hours .clockpicker-tick.tick-inner{font-size:16px}
+.clockpicker-minutes .clockpicker-tick{font-size:16px}
\ No newline at end of file
diff --git a/modules/system/assets/ui/vendor/clockpicker/js/jquery-clockpicker.js b/modules/system/assets/ui/vendor/clockpicker/js/jquery-clockpicker.js
index 7d9afa7ae..48d5375e0 100644
--- a/modules/system/assets/ui/vendor/clockpicker/js/jquery-clockpicker.js
+++ b/modules/system/assets/ui/vendor/clockpicker/js/jquery-clockpicker.js
@@ -214,7 +214,7 @@
top: dialRadius - Math.cos(radian) * radius - tickRadius
});
if (inner) {
- tick.css('font-size', '120%');
+ tick.addClass('tick-inner');
}
tick.html(i === 0 ? '00' : i);
hoursView.append(tick);
@@ -230,7 +230,7 @@
left: dialRadius + Math.sin(radian) * outerRadius - tickRadius,
top: dialRadius - Math.cos(radian) * outerRadius - tickRadius
});
- tick.css('font-size', '120%');
+ // tick.css('font-size', '120%');
tick.html(leadingZero(i));
minutesView.append(tick);
tick.on(mousedownEvent, mousedown);