diff --git a/wire/modules/Inputfield/InputfieldDatetime/InputfieldDatetime.css b/wire/modules/Inputfield/InputfieldDatetime/InputfieldDatetime.css
index f933d324..fae07950 100644
--- a/wire/modules/Inputfield/InputfieldDatetime/InputfieldDatetime.css
+++ b/wire/modules/Inputfield/InputfieldDatetime/InputfieldDatetime.css
@@ -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; }
diff --git a/wire/modules/Inputfield/InputfieldDatetime/InputfieldDatetime.js b/wire/modules/Inputfield/InputfieldDatetime/InputfieldDatetime.js
index d86fc511..fdc888a0 100644
--- a/wire/modules/Inputfield/InputfieldDatetime/InputfieldDatetime.js
+++ b/wire/modules/Inputfield/InputfieldDatetime/InputfieldDatetime.js
@@ -60,8 +60,22 @@ function InputfieldDatetimeDatepicker($t) {
$t.val(str);
});
}
+
+ // 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 = $("");
+ $button.after($a).hide();
+ $a.click(function() {
+ $button.click();
+ return false;
+ });
+ }
+ }
$t.addClass('initDatepicker');
+
}
jQuery(document).ready(function($) {
diff --git a/wire/modules/Inputfield/InputfieldDatetime/InputfieldDatetime.min.js b/wire/modules/Inputfield/InputfieldDatetime/InputfieldDatetime.min.js
index bcabc23f..b2010797 100644
--- a/wire/modules/Inputfield/InputfieldDatetime/InputfieldDatetime.min.js
+++ b/wire/modules/Inputfield/InputfieldDatetime/InputfieldDatetime.min.js
@@ -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=$("");f.after(b)}else{var b=f}var l={changeMonth:true,changeYear:true,showOn:k,buttonText:">",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))})});
\ No newline at end of file
+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=$("");h.after(c)}else{var c=h}var n={changeMonth:true,changeYear:true,showOn:m,buttonText:">",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.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))})});
\ No newline at end of file
diff --git a/wire/modules/Inputfield/InputfieldDatetime/InputfieldDatetime.module b/wire/modules/Inputfield/InputfieldDatetime/InputfieldDatetime.module
index 0201516d..3c9b36d8 100644
--- a/wire/modules/Inputfield/InputfieldDatetime/InputfieldDatetime.module
+++ b/wire/modules/Inputfield/InputfieldDatetime/InputfieldDatetime.module
@@ -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,
);
}
diff --git a/wire/modules/Inputfield/InputfieldDatetime/InputfieldDatetime.scss b/wire/modules/Inputfield/InputfieldDatetime/InputfieldDatetime.scss
index 269df804..655ba1ba 100644
--- a/wire/modules/Inputfield/InputfieldDatetime/InputfieldDatetime.scss
+++ b/wire/modules/Inputfield/InputfieldDatetime/InputfieldDatetime.scss
@@ -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;
}
diff --git a/wire/modules/Process/ProcessPageEdit/ProcessPageEdit.module b/wire/modules/Process/ProcessPageEdit/ProcessPageEdit.module
index cdfbccf5..309740f9 100644
--- a/wire/modules/Process/ProcessPageEdit/ProcessPageEdit.module
+++ b/wire/modules/Process/ProcessPageEdit/ProcessPageEdit.module
@@ -490,7 +490,7 @@ class ProcessPageEdit extends Process implements WirePageEditor, ConfigurableMod
$out .= "";
}
- if($viewable) {
+ if($viewable && !count($this->fields)) {
// this supports code in the buildFormView() method
$out .= "