MINOR tweaks to SecurityAdmin layout

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

View File

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

View File

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

View File

@ -1,38 +1,76 @@
<div class="cms-content center $BaseCSSClasses" data-layout="{type: 'border'}">
<div class="cms-content-header north">
<div>
<h2><% _t('SECGROUPS','Security Groups') %></h2>
<div class="cms-content-tools west">
<div class="cms-content-header north">
<div>
<h2><% _t('SECGROUPS','Security Groups') %></h2>
</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 class="cms-content-tools west">
<div id="treepanes">
<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>
<% with EditForm %>
<div class="cms-content-fields center ui-widget-content ss-tabset">
<% if IncludeFormTag %>
<form $FormAttributes data-layout="{type: 'border'}">
<% end_if %>
<div class="cms-content-header north">
<% if Fields.hasTabset %>
<% with Fields.fieldByName('Root') %>
<div class="cms-content-header-tabs">
<ul>
<% control Tabs %>
<li><a href="#$id">$Title</a></li>
<% end_control %>
</ul>
</div>
<% end_with %>
<% end_if %>
</div>
</div>
</div>
<div class="cms-content-fields center">
<% if Message %>
<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">
$EditForm
</div>
<fieldset>
<% if Legend %><legend>$Legend</legend><% end_if %>
<% 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>

View File

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

View File

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