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

Some minor adjustments in preparation for a couple AdminThemeUikit additions

Browse Source
This commit is contained in:
Ryan Cramer
2018-04-18 08:50:53 -04:00
parent d2ebb4cd56
commit c550c6678b
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wire/core/InputfieldWrapper.php
View File

@@ -381,7 +381,7 @@ class InputfieldWrapper extends Inputfield implements \Countable, \IteratorAggre
$useColumnWidth = $this->useColumnWidth; $useColumnWidth = $this->useColumnWidth;
$renderAjaxInputfield = $this->wire('config')->ajax ? $this->wire('input')->get('renderInputfieldAjax') : null; $renderAjaxInputfield = $this->wire('config')->ajax ? $this->wire('input')->get('renderInputfieldAjax') : null;
if(isset($_classes['form']) && strpos($_classes['form'], 'InputfieldFormNoWidths') !== false) { if($useColumnWidth === true && isset($_classes['form']) && strpos($_classes['form'], 'InputfieldFormNoWidths') !== false) {
$useColumnWidth = false; $useColumnWidth = false;
} }
@@ -555,7 +555,8 @@ class InputfieldWrapper extends Inputfield implements \Countable, \IteratorAggre
if(!$columnWidthTotal) $ffAttrs['class'] .= ' ' . $classes['item_column_width_first']; if(!$columnWidthTotal) $ffAttrs['class'] .= ' ' . $classes['item_column_width_first'];
if($useColumnWidth) { if($useColumnWidth) {
$ffAttrs['style'] = "width: $columnWidthAdjusted%;"; $ffAttrs['style'] = "width: $columnWidthAdjusted%;";
} else { }
if(!$useColumnWidth || $useColumnWidth > 1) {
$ffAttrs['data-colwidth'] = "$columnWidthAdjusted%"; $ffAttrs['data-colwidth'] = "$columnWidthAdjusted%";
} }
$columnWidthTotal += $columnWidth; $columnWidthTotal += $columnWidth;

4
wire/modules/Inputfield/InputfieldText.module
View File

@@ -125,7 +125,9 @@ class InputfieldText extends Inputfield {
if(empty($attrs['size'])) { if(empty($attrs['size'])) {
unset($attrs['size']); unset($attrs['size']);
$attrs['class'] = (empty($attrs['class']) ? '' : $attrs['class'] . ' ') . 'InputfieldMaxWidth'; if(!$this->hasClass('InputfieldSetWidth')) {
$attrs['class'] = (empty($attrs['class']) ? '' : $attrs['class'] . ' ') . 'InputfieldMaxWidth';
}
} }
if(!strlen($attrs['value']) && $this->initValue) { if(!strlen($attrs['value']) && $this->initValue) {

2
wire/modules/Process/ProcessField/ProcessField.js
View File

@@ -45,7 +45,7 @@ $(document).ready(function() {
value: parseInt($columnWidth.val()), value: parseInt($columnWidth.val()),
slide: function(e, ui) { slide: function(e, ui) {
var val = ui.value + '%'; var val = ui.value + '%';
$columnWidth.val(val); $columnWidth.val(val).trigger('change');
setAsmListItemStatus(); setAsmListItemStatus();
} }
}); });

2
wire/modules/Process/ProcessField/ProcessField.min.js vendored
View File

@@ -1 +1 @@
$(document).ready(function(){var e=function(){$("#field_filter_form").submit()};$("#templates_id").change(e);$("#fieldtype").change(e);$("#show_system").click(e);var b=$("#asmListItemStatus");var d=$("#columnWidth");function a(){var i=b.attr("data-tpl");if(!i){return}var k=$("#Inputfield_showIf").val();var j=$("#Inputfield_required").is(":checked")?true:false;if(k&&k.length>0){i="<i class='fa fa-question-circle'></i>"+i}if(j){i="<i class='fa fa-asterisk'></i>"+i}var h=parseInt(d.val());if(h==100){h=0}if(h>0){h=h+"%"}else{h=""}i=i.replace("%",h);b.val(i)}$("#Inputfield_showIf").change(a);$("#Inputfield_required").change(a);a();if(d.length>0){var f=$("<div class='InputfieldColumnWidthSlider'></div>");var c=parseInt($("#columnWidth").val());d.val(c+"%");d.after(f);f.slider({range:"min",min:10,max:100,value:parseInt(d.val()),slide:function(i,h){var j=h.value+"%";d.val(j);a()}});d.change(function(){var h=parseInt($(this).val());if(h>100){h=100}if(h<10){h=10}$(this).val(h+"%");f.slider("option","value",h)})}var g=$("#ProcessFieldEdit");if(g.size()>0&&$("li.WireTab").size()>1){g.find("script").remove();g.WireTabs({items:$(".Inputfields li.WireTab"),id:"FieldEditTabs",skipRememberTabIDs:["delete"]})}$("#fieldgroupContextSelect").change(function(){var i=$("#Inputfield_id").val();var j=$(this).val();var h="./edit?id="+i;if(j>0){h+="&fieldgroup_id="+j}window.location=h});$("a.fieldFlag").click(function(){return false});$("#export_data").click(function(){$(this).select()});$(".import_toggle input[type=radio]").change(function(){var h=$(this).parents("p.import_toggle").next("table");var i=$(this).closest(".InputfieldFieldset");if($(this).is(":checked")&&$(this).val()==0){h.hide();i.addClass("ui-priority-secondary")}else{h.show();i.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").attr("checked","checked")}});$("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").attr("checked","checked")}});$(".override-select-all").click(function(){var h=$(this).closest("table").find("input[type=checkbox]");if($(this).hasClass("override-checked")){h.removeAttr("checked");$(this).removeClass("override-checked")}else{h.attr("checked","checked");$(this).addClass("override-checked")}return false})}); $(document).ready(function(){var e=function(){$("#field_filter_form").submit()};$("#templates_id").change(e);$("#fieldtype").change(e);$("#show_system").click(e);var b=$("#asmListItemStatus");var d=$("#columnWidth");function a(){var i=b.attr("data-tpl");if(!i){return}var k=$("#Inputfield_showIf").val();var j=$("#Inputfield_required").is(":checked")?true:false;if(k&&k.length>0){i="<i class='fa fa-question-circle'></i>"+i}if(j){i="<i class='fa fa-asterisk'></i>"+i}var h=parseInt(d.val());if(h==100){h=0}if(h>0){h=h+"%"}else{h=""}i=i.replace("%",h);b.val(i)}$("#Inputfield_showIf").change(a);$("#Inputfield_required").change(a);a();if(d.length>0){var f=$("<div class='InputfieldColumnWidthSlider'></div>");var c=parseInt($("#columnWidth").val());d.val(c+"%");d.after(f);f.slider({range:"min",min:10,max:100,value:parseInt(d.val()),slide:function(i,h){var j=h.value+"%";d.val(j).trigger("change");a()}});d.change(function(){var h=parseInt($(this).val());if(h>100){h=100}if(h<10){h=10}$(this).val(h+"%");f.slider("option","value",h)})}var g=$("#ProcessFieldEdit");if(g.size()>0&&$("li.WireTab").size()>1){g.find("script").remove();g.WireTabs({items:$(".Inputfields li.WireTab"),id:"FieldEditTabs",skipRememberTabIDs:["delete"]})}$("#fieldgroupContextSelect").change(function(){var i=$("#Inputfield_id").val();var j=$(this).val();var h="./edit?id="+i;if(j>0){h+="&fieldgroup_id="+j}window.location=h});$("a.fieldFlag").click(function(){return false});$("#export_data").click(function(){$(this).select()});$(".import_toggle input[type=radio]").change(function(){var h=$(this).parents("p.import_toggle").next("table");var i=$(this).closest(".InputfieldFieldset");if($(this).is(":checked")&&$(this).val()==0){h.hide();i.addClass("ui-priority-secondary")}else{h.show();i.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").attr("checked","checked")}});$("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").attr("checked","checked")}});$(".override-select-all").click(function(){var h=$(this).closest("table").find("input[type=checkbox]");if($(this).hasClass("override-checked")){h.removeAttr("checked");$(this).removeClass("override-checked")}else{h.attr("checked","checked");$(this).addClass("override-checked")}return false})});

5
wire/modules/Process/ProcessField/ProcessField.module
View File

@@ -1004,9 +1004,6 @@ class ProcessField extends Process implements ConfigurableModule {
'requiredIf', 'requiredIf',
'columnWidth', 'columnWidth',
'visibility', 'visibility',
'themeOffset',
'themeBorder',
'themeColor',
); );
$fieldtypeNames = $this->field->type->getConfigAllowContext($this->field); $fieldtypeNames = $this->field->type->getConfigAllowContext($this->field);
@@ -1027,7 +1024,7 @@ class ProcessField extends Process implements ConfigurableModule {
foreach($tabInputfield->getAll() as $f) { foreach($tabInputfield->getAll() as $f) {
$name = $f->name; $name = $f->name;
if(strpos($name, '_') === 0) continue; if(strpos($name, '_') === 0) continue;
if(in_array($name, $exclusions)) continue; if(in_array($name, $exclusions) || strpos($name, 'theme') === 0) continue;
if($f instanceof InputfieldWrapper || $f instanceof InputfieldMarkup || $f instanceof InputfieldHidden) continue; if($f instanceof InputfieldWrapper || $f instanceof InputfieldMarkup || $f instanceof InputfieldHidden) continue;
$typeName = str_replace('Inputfield', '', $f->className()); $typeName = str_replace('Inputfield', '', $f->className());
$label = str_replace('|', ' ', "$tabLabel $f->label") . $label = str_replace('|', ' ', "$tabLabel $f->label") .