mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-27 00:25:05 +02:00
Code Issues Releases Wiki Activity

Tweak to InputfieldDatetime datepicker button option, plus adjustment to ProcessPageEdit when in modal field edit

Browse Source
This commit is contained in:
Ryan Cramer
2017-03-06 08:43:25 -05:00
parent a12cb029bb
commit d5971733f2
6 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wire/modules/Inputfield/InputfieldDatetime/InputfieldDatetime.css
View File

@@ -47,7 +47,8 @@
line-height: 14px;
display: none; }
button.ui-datepicker-trigger {
button.ui-datepicker-trigger,
a.pw-ui-datepicker-trigger {
/* tweak to datepicker trigger */
margin: 0 0 0 0.5em; }

14
wire/modules/Inputfield/InputfieldDatetime/InputfieldDatetime.js
View File

@@ -61,7 +61,21 @@ function InputfieldDatetimeDatepicker($t) {
});
}
// if using a trigger button, replace with a link icon
if(showOn == 'button') {
var $button = $t.next('button.ui-datepicker-trigger');
if($button.length) {
var $a = $("<a class='pw-ui-datepicker-trigger' href='#'><i class='fa fa-calendar'></i></a>");
$button.after($a).hide();
$a.click(function() {
$button.click();
return false;
});
}
}
$t.addClass('initDatepicker');
}
jQuery(document).ready(function($) {

2
wire/modules/Inputfield/InputfieldDatetime/InputfieldDatetime.min.js vendored
View File

@@ -1 +1 @@
function InputfieldDatetimeDatepicker(f){var g=f.is(".InputfieldDatetimeDatepicker2");var i=parseInt(f.attr("data-ts"));var c=null;var a=f.attr("data-dateformat");var e=f.attr("data-timeformat");var d=parseInt(f.attr("data-timeselect"));var h=e.length>0&&!g;var k=f.is(".InputfieldDatetimeDatepicker3")?"focus":"button";var j=parseInt(f.attr("data-ampm"))>0;var m=f.attr("data-yearrange");if(i>1){c=new Date(i)}if(g){var b=$("<div></div>");f.after(b)}else{var b=f}var l={changeMonth:true,changeYear:true,showOn:k,buttonText:"&gt;",showAnim:"fadeIn",dateFormat:a,gotoCurrent:true,defaultDate:c};if(m&&m.length){l.yearRange=m}if(h){l.ampm=j;l.timeFormat=e;if(d>0){l.controlType="select";l.oneLine=true}if(e.indexOf("ss")>-1){l.showSecond=true}if(e.indexOf("m")==-1){l.showMinute=false}b.datetimepicker(l)}else{b.datepicker(l)}if(g){b.change(function(n){var p=b.datepicker("getDate");var o=$.datepicker.formatDate(a,p);f.val(o)})}f.addClass("initDatepicker")}jQuery(document).ready(function(a){a("input.InputfieldDatetimeDatepicker:not(.InputfieldDatetimeDatepicker3):not(.initDatepicker)").each(function(b){InputfieldDatetimeDatepicker(a(this))});a(document).on("focus","input.InputfieldDatetimeDatepicker3:not(.hasDatepicker)",function(){InputfieldDatetimeDatepicker(a(this))})});
function InputfieldDatetimeDatepicker(h){var i=h.is(".InputfieldDatetimeDatepicker2");var k=parseInt(h.attr("data-ts"));var d=null;var b=h.attr("data-dateformat");var g=h.attr("data-timeformat");var f=parseInt(h.attr("data-timeselect"));var j=g.length>0&&!i;var m=h.is(".InputfieldDatetimeDatepicker3")?"focus":"button";var l=parseInt(h.attr("data-ampm"))>0;var o=h.attr("data-yearrange");if(k>1){d=new Date(k)}if(i){var c=$("<div></div>");h.after(c)}else{var c=h}var n={changeMonth:true,changeYear:true,showOn:m,buttonText:"&gt;",showAnim:"fadeIn",dateFormat:b,gotoCurrent:true,defaultDate:d};if(o&&o.length){n.yearRange=o}if(j){n.ampm=l;n.timeFormat=g;if(f>0){n.controlType="select";n.oneLine=true}if(g.indexOf("ss")>-1){n.showSecond=true}if(g.indexOf("m")==-1){n.showMinute=false}c.datetimepicker(n)}else{c.datepicker(n)}if(i){c.change(function(p){var r=c.datepicker("getDate");var q=$.datepicker.formatDate(b,r);h.val(q)})}if(m=="button"){var a=h.next("button.ui-datepicker-trigger");if(a.length){var e=$("<a class='pw-ui-datepicker-trigger' href='#'><i class='fa fa-calendar'></i></a>");a.after(e).hide();e.click(function(){a.click();return false})}}h.addClass("initDatepicker")}jQuery(document).ready(function(a){a("input.InputfieldDatetimeDatepicker:not(.InputfieldDatetimeDatepicker3):not(.initDatepicker)").each(function(b){InputfieldDatetimeDatepicker(a(this))});a(document).on("focus","input.InputfieldDatetimeDatepicker3:not(.hasDatepicker)",function(){InputfieldDatetimeDatepicker(a(this))})});

2
wire/modules/Inputfield/InputfieldDatetime/InputfieldDatetime.module
View File

@@ -34,7 +34,7 @@ class InputfieldDatetime extends Inputfield {
return array(
'title' => __('Datetime', __FILE__), // Module Title
'summary' => __('Inputfield that accepts date and optionally time', __FILE__), // Module Summary
'version' => 105,
'version' => 106,
'permanent' => true,
);
}

3
wire/modules/Inputfield/InputfieldDatetime/InputfieldDatetime.scss
View File

@@ -58,7 +58,8 @@
display: none;
}
button.ui-datepicker-trigger {
button.ui-datepicker-trigger,
a.pw-ui-datepicker-trigger {
/* tweak to datepicker trigger */
margin: 0 0 0 0.5em;
}

2
wire/modules/Process/ProcessPageEdit/ProcessPageEdit.module
View File

@@ -490,7 +490,7 @@ class ProcessPageEdit extends Process implements WirePageEditor, ConfigurableMod
$out .= "</ul>";
}
if($viewable) {
if($viewable && !count($this->fields)) {
// this supports code in the buildFormView() method
$out .= "<ul id='_ProcessPageEditViewDropdown' class='pw-dropdown-menu pw-dropdown-menu-rounded' data-my='left top' data-at='left top-9'>";
foreach($this->getViewActions() as $name => $action) {