tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-26 06:29:24 +02:00
Code Issues Projects Releases Wiki Activity

MINOR tweaks to SecurityAdmin layout

Browse Source
This commit is contained in:
Will Rossiter 2011-10-29 15:41:40 +13:00
parent a08a08eaa0
commit 01bfdbeb90
5 changed files with 73 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/code/SecurityAdmin.php
View File

@ -111,7 +111,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
$memberList->setPermissions(array('edit', 'delete', 'add')); $memberList->setPermissions(array('edit', 'delete', 'add'));
$fields = new FieldList( $fields = new FieldList(
new TabSet( $root = new TabSet(
'Root', 'Root',
new Tab('Members', singleton('Member')->i18n_plural_name(), new Tab('Members', singleton('Member')->i18n_plural_name(),
$memberList, $memberList,
@ -137,7 +137,9 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
// necessary for tree node selection in LeftAndMain.EditForm.js // necessary for tree node selection in LeftAndMain.EditForm.js
new HiddenField('ID', false, 0) new HiddenField('ID', false, 0)
); );
$root->setTemplate('CMSTabSet');
// Add roles editing interface // Add roles editing interface
if(Permission::check('APPLY_ROLES')) { if(Permission::check('APPLY_ROLES')) {
$rolesCTF = new ComplexTableField( $rolesCTF = new ComplexTableField(

3
admin/templates/Includes/LeftAndMain_EditForm.ss
View File

@ -13,8 +13,8 @@
<li><a href="#$id">$Title</a></li> <li><a href="#$id">$Title</a></li>
<% end_control %> <% end_control %>
</ul> </ul>
<% end_with %>
</div> </div>
<% end_with %>
<% end_if %> <% end_if %>
<!-- <div class="cms-content-search">...</div> --> <!-- <div class="cms-content-search">...</div> -->
@ -40,7 +40,6 @@
<% end_control %> <% end_control %>
<div class="clear"><!-- --></div> <div class="clear"><!-- --></div>
</fieldset> </fieldset>
</div> </div>
<div class="cms-content-actions south"> <div class="cms-content-actions south">

96
admin/templates/Includes/SecurityAdmin_Content.ss
View File

@ -1,38 +1,76 @@
<div class="cms-content center $BaseCSSClasses" data-layout="{type: 'border'}"> <div class="cms-content center $BaseCSSClasses" data-layout="{type: 'border'}">
<div class="cms-content-tools west">
<div class="cms-content-header north"> <div class="cms-content-header north">
<div> <div>
<h2><% _t('SECGROUPS','Security Groups') %></h2> <h2><% _t('SECGROUPS','Security Groups') %></h2>
</div>
</div> </div>
$AddForm
<div class="checkboxAboveTree">
<input type="checkbox" id="sortitems" />
<label for="sortitems">
<% _t('ENABLEDRAGGING','Allow drag &amp; drop reordering', PR_HIGH) %>
</label>
</div>
<div data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)" class="cms-tree jstree jstree-apple">
$SiteTreeAsUL
</div>
</div> </div>
<% with EditForm %>
<div class="cms-content-tools west"> <div class="cms-content-fields center ui-widget-content ss-tabset">
<div id="treepanes"> <% if IncludeFormTag %>
<form $FormAttributes data-layout="{type: 'border'}">
<div> <% end_if %>
$AddForm
<div class="cms-content-header north">
<div class="checkboxAboveTree"> <% if Fields.hasTabset %>
<input type="checkbox" id="sortitems" /> <% with Fields.fieldByName('Root') %>
<label for="sortitems"> <div class="cms-content-header-tabs">
<% _t('ENABLEDRAGGING','Allow drag &amp; drop reordering', PR_HIGH) %> <ul>
</label> <% control Tabs %>
</div> <li><a href="#$id">$Title</a></li>
<% end_control %>
<div data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)" class="cms-tree jstree jstree-apple"> </ul>
$SiteTreeAsUL </div>
</div> <% end_with %>
<% end_if %>
</div> </div>
</div> <div class="cms-content-fields center">
<% if Message %>
</div> <p id="{$FormName}_error" class="message $MessageType">$Message</p>
<% else %>
<p id="{$FormName}_error" class="message $MessageType" style="display: none"></p>
<% end_if %>
<div class="cms-content-fields center ui-widget-content"> <fieldset>
$EditForm <% if Legend %><legend>$Legend</legend><% end_if %>
</div> <% control Fields %>
$FieldHolder
<% end_control %>
<div class="clear"><!-- --></div>
</fieldset>
</div>
<div class="cms-content-actions south">
<% if Actions %>
<div class="Actions">
<% control Actions %>
$Field
<% end_control %>
</div>
<% end_if %>
</div>
<% if IncludeFormTag %>
</form>
<% end_if %>
</div>
<% end_with %>
</div> </div>

3
forms/TabSet.php
View File

@ -153,5 +153,4 @@ class TabSet extends CompositeField {
public function removeByName( $tabName, $dataFieldOnly = false ) { public function removeByName( $tabName, $dataFieldOnly = false ) {
parent::removeByName( $tabName, $dataFieldOnly ); parent::removeByName( $tabName, $dataFieldOnly );
} }
} }
?>

1
view/SSViewer.php
View File

@ -185,7 +185,6 @@ class SSViewer_DataPresenter extends SSViewer_Scope {
* *
* @see http://doc.silverstripe.org/themes * @see http://doc.silverstripe.org/themes
* @see http://doc.silverstripe.org/themes:developing * @see http://doc.silverstripe.org/themes:developing
* *
* @package sapphire * @package sapphire
* @subpackage view * @subpackage view