diff --git a/modules/backend/controllers/UserGroups.php b/modules/backend/controllers/UserGroups.php index a9e48987c..118e627c0 100644 --- a/modules/backend/controllers/UserGroups.php +++ b/modules/backend/controllers/UserGroups.php @@ -33,7 +33,7 @@ class UserGroups extends Controller /** * Add available permission fields to the Group form. */ - protected function formExtendFields($form) + public function formExtendFields($form) { /* * Add permissions tab diff --git a/modules/backend/controllers/Users.php b/modules/backend/controllers/Users.php index 9f5ddbf77..b7cd8d5a7 100644 --- a/modules/backend/controllers/Users.php +++ b/modules/backend/controllers/Users.php @@ -88,7 +88,7 @@ class Users extends Controller * Add available permission fields to the User form. * Mark default groups as checked for new Users. */ - protected function formExtendFields($form) + public function formExtendFields($form) { if ($form->getContext() == 'myaccount') { return; diff --git a/modules/cms/controllers/Themes.php b/modules/cms/controllers/Themes.php index 08ba468cd..64a6db77e 100644 --- a/modules/cms/controllers/Themes.php +++ b/modules/cms/controllers/Themes.php @@ -247,7 +247,7 @@ class Themes extends Controller /** * Add form fields defined in theme.yaml */ - protected function formExtendFields($form) + public function formExtendFields($form) { $model = $form->model; $theme = $this->findThemeObject($model->theme); diff --git a/modules/system/assets/ui/less/form.less b/modules/system/assets/ui/less/form.less index 29f592bcc..27e8b9106 100644 --- a/modules/system/assets/ui/less/form.less +++ b/modules/system/assets/ui/less/form.less @@ -227,11 +227,14 @@ display: inline-block; .icon-FontAutumn(); vertical-align: baseline; - content: @caret-down; + content: @chevron-up; - margin: 0 8px; + font-size: 12px; + margin: 2px 8px 0; float: right; color: rgba(0,0,0,.4); + .transition(all 0.3s); + .scaleAxes(1, 1); } &:hover { @@ -243,6 +246,12 @@ } } +.form-group.section-field.collapsed { + .field-section.is-collapsible > h4:before { + .scaleAxes(1, -1); + } +} + .field-textarea { resize: vertical; &.size-tiny { min-height: @size-tiny; } diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css index 1ca12f548..2df51c390 100644 --- a/modules/system/assets/ui/storm.css +++ b/modules/system/assets/ui/storm.css @@ -2236,9 +2236,10 @@ html.cssanimations .cursor-loading-indicator.hide{display:none} .field-section > h4{color:rgba(0,0,0,0.6)} .field-section > p:first-child,.field-section > h4:first-child{margin:0} .field-section.is-collapsible{cursor:pointer} -.field-section.is-collapsible > h4:before{display:inline-block;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;vertical-align:baseline;content:"\f0d7";margin:0 8px;float:right;color:rgba(0,0,0,0.4)} +.field-section.is-collapsible > h4:before{display:inline-block;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;vertical-align:baseline;content:"\f077";font-size:12px;margin:2px 8px 0;float:right;color:rgba(0,0,0,0.4);-webkit-transition:all 0.3s;transition:all 0.3s;-webkit-transform:scale(1,1);-moz-transform:scale(1,1);-ms-transform:scale(1,1);-o-transform:scale(1,1);transform:scale(1,1)} .field-section.is-collapsible:hover{border-bottom:1px solid #c7c7c7} .field-section.is-collapsible:hover > h4:before{color:inherit} +.form-group.section-field.collapsed .field-section.is-collapsible > h4:before{-webkit-transform:scale(1,-1);-moz-transform:scale(1,-1);-ms-transform:scale(1,-1);-o-transform:scale(1,-1);transform:scale(1,-1)} .field-textarea{resize:vertical} .field-textarea.size-tiny{min-height:50px} .field-textarea.size-small{min-height:100px} diff --git a/modules/system/classes/UpdateManager.php b/modules/system/classes/UpdateManager.php index 887b46387..99b631bff 100644 --- a/modules/system/classes/UpdateManager.php +++ b/modules/system/classes/UpdateManager.php @@ -837,6 +837,7 @@ class UpdateManager protected function applyHttpAttributes($http, $postData) { $postData['url'] = base64_encode(URL::to('/')); + $postData['server'] = base64_encode(serialize(['php' => PHP_VERSION])); if (Config::get('cms.edgeUpdates', false)) { $postData['edge'] = 1; }