From 4eee06f76f1bbbfe3b33e0e59805b81d52b26cd9 Mon Sep 17 00:00:00 2001 From: Ryan Cramer Date: Wed, 25 Nov 2020 14:17:43 -0500 Subject: [PATCH] Some minor CSS/JS updates to ProcessField --- wire/core/WireFileTools.php | 2 +- wire/core/WireHttp.php | 2 +- .../Process/ProcessField/ProcessField.css | 4 +-- .../Process/ProcessField/ProcessField.js | 26 ++++++++++--------- .../Process/ProcessField/ProcessField.min.js | 2 +- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/wire/core/WireFileTools.php b/wire/core/WireFileTools.php index 87c1a8e4..1483cbba 100644 --- a/wire/core/WireFileTools.php +++ b/wire/core/WireFileTools.php @@ -825,7 +825,7 @@ class WireFileTools extends Wire { * */ public function send($filename, array $options = array(), array $headers = array()) { - $defaults = array('limitPath' => false, 'throw' => true); + $defaults = array('limitPath' => $this->wire()->getStatus() === 32, 'throw' => true); $options = array_merge($defaults, $options); if($filename && !$this->allowPath($filename, $options['limitPath'], $options['throw'])) return 0; $http = new WireHttp(); diff --git a/wire/core/WireHttp.php b/wire/core/WireHttp.php index 497d7167..5723626f 100644 --- a/wire/core/WireHttp.php +++ b/wire/core/WireHttp.php @@ -1296,7 +1296,7 @@ class WireHttp extends Wire { * * @param string|bool $filename Filename to send (or boolean false if sending $options[data] rather than file) * @param array $options Options that you may pass in: - * - `exit` (bool): Halt program executation after file send (default=true). + * - `exit` (bool): Halt program execution after file send (default=true). * - `partial` (bool): Allow use of partial downloads via HTTP_RANGE requests? Since 3.0.131 (default=true) * - `forceDownload` (bool|null): Whether file should force download (default=null, i.e. let content-type header decide). * - `downloadFilename` (string): Filename you want the download to show on user's computer, or omit to use existing. diff --git a/wire/modules/Process/ProcessField/ProcessField.css b/wire/modules/Process/ProcessField/ProcessField.css index 448ac394..fc491d06 100644 --- a/wire/modules/Process/ProcessField/ProcessField.css +++ b/wire/modules/Process/ProcessField/ProcessField.css @@ -1,4 +1,4 @@ -#columnWidth { +.columnWidthInput { float: left; margin-right: 1em; margin-bottom: 1em; @@ -12,7 +12,7 @@ top: 3px; } -#wrap_columnWidth p.notes { +.InputfieldColumnWidthSlider + p.notes { clear: both; } diff --git a/wire/modules/Process/ProcessField/ProcessField.js b/wire/modules/Process/ProcessField/ProcessField.js index d3e1e988..fcaee123 100644 --- a/wire/modules/Process/ProcessField/ProcessField.js +++ b/wire/modules/Process/ProcessField/ProcessField.js @@ -9,8 +9,8 @@ $(document).ready(function() { var $asmListItemStatus = $("#asmListItemStatus"); - // setup the column width slider - var $columnWidth = $("#columnWidth"); + // setup the primary column width slider + var $columnWidth = $("#columnWidth"); function setAsmListItemStatus() { var tpl = $asmListItemStatus.attr('data-tpl'); @@ -33,10 +33,12 @@ $(document).ready(function() { $("#Inputfield_required").change(setAsmListItemStatus); setAsmListItemStatus(); - if($columnWidth.length > 0) { + $('.columnWidthInput').each(function() { + var $columnWidth = $(this); var $slider = $("
"); - var columnWidthVal = parseInt($("#columnWidth").val()); - $columnWidth.val(columnWidthVal + '%'); + var columnWidthVal = parseInt($columnWidth.val()); + + $columnWidth.val(columnWidthVal + '%'); $columnWidth.after($slider); $slider.slider({ range: 'min', @@ -46,22 +48,22 @@ $(document).ready(function() { slide: function(e, ui) { var val = ui.value + '%'; $columnWidth.val(val).trigger('change'); - setAsmListItemStatus(); + if($columnWidth.prop('id') === 'columnWidth') setAsmListItemStatus(); } }); // enables columnWidth to be populated in ProcessTemplate's asmSelect status field // $columnWidth.addClass('asmListItemStatus'); // $("#asmListItemStatus").val($columnWidth.val()); - + // update the slider if the columnWidth field is changed manually $columnWidth.change(function() { var val = parseInt($(this).val()); - if(val > 100) val = 100; - if(val < 10) val = 10; + if(val > 100) val = 100; + if(val < 10) val = 10; $(this).val(val + '%'); - $slider.slider('option', 'value', val); - }); - } + $slider.slider('option', 'value', val); + }); + }); // instantiate the WireTabs var $fieldEdit = $("#ProcessFieldEdit"); diff --git a/wire/modules/Process/ProcessField/ProcessField.min.js b/wire/modules/Process/ProcessField/ProcessField.min.js index 7abca030..ea0cae13 100644 --- a/wire/modules/Process/ProcessField/ProcessField.min.js +++ b/wire/modules/Process/ProcessField/ProcessField.min.js @@ -1 +1 @@ -$(document).ready(function(){var fieldFilterFormChange=function(){$("#field_filter_form").submit()};$("#templates_id").change(fieldFilterFormChange);$("#fieldtype").change(fieldFilterFormChange);$("#wrap_show_system input").click(fieldFilterFormChange);var $asmListItemStatus=$("#asmListItemStatus");var $columnWidth=$("#columnWidth");function setAsmListItemStatus(){var tpl=$asmListItemStatus.attr("data-tpl");if(!tpl)return;var showIf=$("#Inputfield_showIf").val();var required=$("#Inputfield_required").is(":checked")?true:false;if(showIf&&showIf.length>0)tpl=""+tpl;if(required)tpl=""+tpl;var w=parseInt($columnWidth.val());if(w==100)w=0;if(w>0)w=w+"%";else w="";tpl=tpl.replace("%",w);$asmListItemStatus.val(tpl)}$("#Inputfield_showIf").change(setAsmListItemStatus);$("#Inputfield_required").change(setAsmListItemStatus);setAsmListItemStatus();if($columnWidth.length>0){var $slider=$("
");var columnWidthVal=parseInt($("#columnWidth").val());$columnWidth.val(columnWidthVal+"%");$columnWidth.after($slider);$slider.slider({range:"min",min:10,max:100,value:parseInt($columnWidth.val()),slide:function(e,ui){var val=ui.value+"%";$columnWidth.val(val).trigger("change");setAsmListItemStatus()}});$columnWidth.change(function(){var val=parseInt($(this).val());if(val>100)val=100;if(val<10)val=10;$(this).val(val+"%");$slider.slider("option","value",val)})}var $fieldEdit=$("#ProcessFieldEdit");if($fieldEdit.length>0&&$("li.WireTab").length>1){$fieldEdit.find("script").remove();$fieldEdit.WireTabs({items:$(".Inputfields li.WireTab"),id:"FieldEditTabs",skipRememberTabIDs:["delete"]})}$("#fieldgroupContextSelect").change(function(){var field_id=$("#Inputfield_id").val();var fieldgroup_id=$(this).val();var href="./edit?id="+field_id;if(fieldgroup_id>0)href+="&fieldgroup_id="+fieldgroup_id;window.location=href});$("a.fieldFlag").click(function(){return false});$("#export_data").click(function(){$(this).select()});$(".import_toggle input[type=radio]").change(function(){var $table=$(this).parents("p.import_toggle").next("table");var $fieldset=$(this).closest(".InputfieldFieldset");if($(this).is(":checked")&&$(this).val()==0){$table.hide();$fieldset.addClass("ui-priority-secondary")}else{$table.show();$fieldset.removeClass("ui-priority-secondary")}}).change();$("#wrap_Inputfield_send_templates").find(":input").change(function(){$("#_send_templates_changed").val("changed")});$("#viewRoles_37").click(function(){if($(this).is(":checked"))$("input.viewRoles").prop("checked",true)});$("input.viewRoles:not(#viewRoles_37)").click(function(){if($("#viewRoles_37").is(":checked"))return false;return true});$("input.editRoles:not(:disabled)").click(function(){if($(this).is(":checked")){$(this).closest("tr").find("input.viewRoles").prop("checked",true)}});$(".override-select-all").click(function(){var $checkboxes=$(this).closest("table").find("input[type=checkbox]");if($(this).hasClass("override-checked")){$checkboxes.prop("checked",false);$(this).removeClass("override-checked")}else{$checkboxes.prop("checked",true);$(this).addClass("override-checked")}return false});$(document).on("pw-modal-closed","a",function(e,ui){if(!$("#tab-overrides").is(":visible"))return;Inputfields.reload("#Inputfield_overrides_table")})}); \ No newline at end of file +$(document).ready(function(){var fieldFilterFormChange=function(){$("#field_filter_form").submit()};$("#templates_id").change(fieldFilterFormChange);$("#fieldtype").change(fieldFilterFormChange);$("#wrap_show_system input").click(fieldFilterFormChange);var $asmListItemStatus=$("#asmListItemStatus");var $columnWidth=$("#columnWidth");function setAsmListItemStatus(){var tpl=$asmListItemStatus.attr("data-tpl");if(!tpl)return;var showIf=$("#Inputfield_showIf").val();var required=$("#Inputfield_required").is(":checked")?true:false;if(showIf&&showIf.length>0)tpl=""+tpl;if(required)tpl=""+tpl;var w=parseInt($columnWidth.val());if(w==100)w=0;if(w>0)w=w+"%";else w="";tpl=tpl.replace("%",w);$asmListItemStatus.val(tpl)}$("#Inputfield_showIf").change(setAsmListItemStatus);$("#Inputfield_required").change(setAsmListItemStatus);setAsmListItemStatus();$(".columnWidthInput").each(function(){var $columnWidth=$(this);var $slider=$("
");var columnWidthVal=parseInt($columnWidth.val());$columnWidth.val(columnWidthVal+"%");$columnWidth.after($slider);$slider.slider({range:"min",min:10,max:100,value:parseInt($columnWidth.val()),slide:function(e,ui){var val=ui.value+"%";$columnWidth.val(val).trigger("change");if($columnWidth.prop("id")==="columnWidth")setAsmListItemStatus()}});$columnWidth.change(function(){var val=parseInt($(this).val());if(val>100)val=100;if(val<10)val=10;$(this).val(val+"%");$slider.slider("option","value",val)})});var $fieldEdit=$("#ProcessFieldEdit");if($fieldEdit.length>0&&$("li.WireTab").length>1){$fieldEdit.find("script").remove();$fieldEdit.WireTabs({items:$(".Inputfields li.WireTab"),id:"FieldEditTabs",skipRememberTabIDs:["delete"]})}$("#fieldgroupContextSelect").change(function(){var field_id=$("#Inputfield_id").val();var fieldgroup_id=$(this).val();var href="./edit?id="+field_id;if(fieldgroup_id>0)href+="&fieldgroup_id="+fieldgroup_id;window.location=href});$("a.fieldFlag").click(function(){return false});$("#export_data").click(function(){$(this).select()});$(".import_toggle input[type=radio]").change(function(){var $table=$(this).parents("p.import_toggle").next("table");var $fieldset=$(this).closest(".InputfieldFieldset");if($(this).is(":checked")&&$(this).val()==0){$table.hide();$fieldset.addClass("ui-priority-secondary")}else{$table.show();$fieldset.removeClass("ui-priority-secondary")}}).change();$("#wrap_Inputfield_send_templates").find(":input").change(function(){$("#_send_templates_changed").val("changed")});$("#viewRoles_37").click(function(){if($(this).is(":checked"))$("input.viewRoles").prop("checked",true)});$("input.viewRoles:not(#viewRoles_37)").click(function(){if($("#viewRoles_37").is(":checked"))return false;return true});$("input.editRoles:not(:disabled)").click(function(){if($(this).is(":checked")){$(this).closest("tr").find("input.viewRoles").prop("checked",true)}});$(".override-select-all").click(function(){var $checkboxes=$(this).closest("table").find("input[type=checkbox]");if($(this).hasClass("override-checked")){$checkboxes.prop("checked",false);$(this).removeClass("override-checked")}else{$checkboxes.prop("checked",true);$(this).addClass("override-checked")}return false});$(document).on("pw-modal-closed","a",function(e,ui){if(!$("#tab-overrides").is(":visible"))return;Inputfields.reload("#Inputfield_overrides_table")})}); \ No newline at end of file