diff --git a/wire/core/Page.php b/wire/core/Page.php index c8be28a8..3fa03e24 100644 --- a/wire/core/Page.php +++ b/wire/core/Page.php @@ -1104,7 +1104,7 @@ class Page extends WireData implements \Countable, WireMatchable { */ public function getField($field) { $template = $this->template; - $fieldgroup = $template ? $this->template->fieldgroup : null; + $fieldgroup = $template ? $template->fieldgroup : null; if(!$fieldgroup) return null; if($this->outputFormatting && $fieldgroup->hasFieldContext($field)) { $value = $fieldgroup->getFieldContext($field); @@ -3826,5 +3826,23 @@ class Page extends WireData implements \Countable, WireMatchable { $result = $this->wire('pages')->$method($selector, $options); return $result; } + + /* + public function remove($key) { + parent::remove($key); + if(isset($this->data[$key])) { + $a = parent::get('_statusCorruptedFields'); + if(!is_array($a)) $a = array(); + $k = array_search($key, $a); + if($k !== false) { + unset($a[$k]); + if(empty($a)) $this->removeStatus(self::statusCorrupted); + parent::set('_statusCorruptedFields', $a); + } + } + return $this; + } + */ + } diff --git a/wire/core/ProcessWire.php b/wire/core/ProcessWire.php index 7bf886b6..7e045647 100644 --- a/wire/core/ProcessWire.php +++ b/wire/core/ProcessWire.php @@ -45,7 +45,7 @@ class ProcessWire extends Wire { * Reversion revision number * */ - const versionRevision = 54; + const versionRevision = 55; /** * Version suffix string (when applicable) diff --git a/wire/modules/AdminTheme/AdminThemeReno/styles/_common.scss b/wire/modules/AdminTheme/AdminThemeReno/styles/_common.scss index ad2d40e6..c23d8182 100644 --- a/wire/modules/AdminTheme/AdminThemeReno/styles/_common.scss +++ b/wire/modules/AdminTheme/AdminThemeReno/styles/_common.scss @@ -22,6 +22,7 @@ $mainnav-width: 210px; $mainnav-width-wide: 230px; // bigger sidebar for wide screen? $masthead-height: 52px; +//noinspection CssInvalidPropertyValue @mixin word-wrap() { overflow-wrap: break-word; word-break: break-word; @@ -1239,7 +1240,7 @@ body.pw-init .toggle-icon { @media only screen and (max-width: 480px) { - #branding,{ + #branding { width: 100%; } diff --git a/wire/modules/AdminTheme/AdminThemeReno/styles/_ui.scss b/wire/modules/AdminTheme/AdminThemeReno/styles/_ui.scss index 1bdd32be..20d07c36 100644 --- a/wire/modules/AdminTheme/AdminThemeReno/styles/_ui.scss +++ b/wire/modules/AdminTheme/AdminThemeReno/styles/_ui.scss @@ -104,7 +104,7 @@ .ui-state-highlight, .ui-widget-content .ui-state-highlight, -.ui-widget-header .ui-state-highlight,{ +.ui-widget-header .ui-state-highlight { color: $highlight-color; background: $highlight-bg; border: none; @@ -188,6 +188,7 @@ p span.ui-state-error { .ui-dialog-titlebar-close { top: 50%; right: 15px; + //noinspection CssInvalidPropertyValue background-color: none; color: $white; } diff --git a/wire/modules/Process/ProcessPageList/ProcessPageList.module b/wire/modules/Process/ProcessPageList/ProcessPageList.module index 68b1c914..aefe1468 100644 --- a/wire/modules/Process/ProcessPageList/ProcessPageList.module +++ b/wire/modules/Process/ProcessPageList/ProcessPageList.module @@ -444,7 +444,7 @@ class ProcessPageList extends Process implements ConfigurableModule { 'label' => $this->_('Show All') . ' ' . '' . sprintf($this->_('(%d pages)'), $items->getTotal()) . '', 'icon' => 'arrow-circle-right', - 'className' => 'separator', + 'className' => 'separator pw-pagelist-show-all', ); } @@ -453,7 +453,7 @@ class ProcessPageList extends Process implements ConfigurableModule { 'url' => $urls->admin . "page/add/?parent_id=$parentID", 'label' => __('Add New', '/wire/templates-admin/default.php'), 'icon' => 'plus-circle', - 'className' => 'separator', + 'className' => 'separator pw-nav-add', ); }