mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Fix protection level on formExtendFields

Browse Source 
Improve styling on collapsible sections
This commit is contained in:
Samuel Georges 2015-09-10 20:42:24 +10:00
parent 3e58759f7b
commit 9812e1f4ec
6 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/backend/controllers/UserGroups.php
View File

@ -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

2
modules/backend/controllers/Users.php
View File

@ -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;

2
modules/cms/controllers/Themes.php
View File

@ -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);

13
modules/system/assets/ui/less/form.less
View File

@ -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; }

3
modules/system/assets/ui/storm.css
View File

@ -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}

1
modules/system/classes/UpdateManager.php
View File

@ -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;
}