Updated templates to be more consistent and removed trailing spaces

Edit
This commit is contained in:
Arno Poot 2013-07-18 13:14:29 +02:00
parent ff18abb994
commit 184aeabcb4
21 changed files with 104 additions and 104 deletions

View File

@ -1,5 +1,5 @@
<% if Pages %>
<% loop Pages %>
<% if Last %>$MenuTitle.XML<% else %><a href="$Link" class="breadcrumb-$Pos">$MenuTitle.XML</a> &raquo;<% end_if %>
<% if $Pages %>
<% loop $Pages %>
<% if $Last %>$MenuTitle.XML<% else %><a href="$Link" class="breadcrumb-$Pos">$MenuTitle.XML</a> &raquo;<% end_if %>
<% end_loop %>
<% end_if %>

View File

@ -7,16 +7,16 @@
<th><% _t('CMSPageHistoryController_versions.ss.PUBLISHER','Publisher') %></th>
</tr>
</thead>
<tbody>
<% loop Versions %>
<% loop $Versions %>
<tr id="page-$RecordID-version-$Version" class="$EvenOdd $PublishedClass<% if not WasPublished %><% if not Active %> ui-helper-hidden<% end_if %><% end_if %><% if Active %> active<% end_if %>" data-published="<% if WasPublished %>true<% else %>false<% end_if %>">
<td class="ui-helper-hidden"><input type="checkbox" name="Versions[]" id="cms-version-{$Version}" value="$Version"<% if Active %> checked="checked"<% end_if %> /></td>
<% with LastEdited %>
<% with $LastEdited %>
<td class="last-edited first-column" title="$Ago - $Nice">$Nice</td>
<% end_with %>
<td><% if Author %>$Author.FirstName $Author.Surname.Initial<% else %><% _t('CMSPageHistoryController_versions.ss.UNKNOWN','Unknown') %><% end_if %></td>
<td class="last-column"><% if Published %><% if Publisher %>$Publisher.FirstName $Publisher.Surname.Initial<% else %><% _t('CMSPageHistoryController_versions.ss.UNKNOWN','Unknown') %><% end_if %><% else %><% _t('CMSPageHistoryController_versions.ss.NOTPUBLISHED','Not published') %><% end_if %></td>
<td><% if $Author %>$Author.FirstName $Author.Surname.Initial<% else %><% _t('CMSPageHistoryController_versions.ss.UNKNOWN','Unknown') %><% end_if %></td>
<td class="last-column"><% if $Published %><% if $Publisher %>$Publisher.FirstName $Publisher.Surname.Initial<% else %><% _t('CMSPageHistoryController_versions.ss.UNKNOWN','Unknown') %><% end_if %><% else %><% _t('CMSPageHistoryController_versions.ss.NOTPUBLISHED','Not published') %><% end_if %></td>
</tr>
<% end_loop %>
</tbody>

View File

@ -1,22 +1,22 @@
<div id="assetadmin-cms-content" class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
<% with EditForm %>
<% with $EditForm %>
<div class="cms-content-header north">
<div class="cms-content-header-info">
<% include BackLink_Button %>
<% with Controller %>
<% with $Controller %>
<% include CMSBreadcrumbs %>
<% end_with %>
</div>
<% if Fields.hasTabset %>
<% with Fields.fieldByName('Root') %>
<% if $Fields.hasTabset %>
<% with $Fields.fieldByName('Root') %>
<div class="cms-content-header-tabs">
<ul class="cms-tabset-nav-primary">
<% loop Tabs %>
<li<% if extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
<% loop $Tabs %>
<li<% if $extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
<% end_loop %>
</ul>
</div>
@ -29,5 +29,5 @@
$forTemplate
</div>
<% end_with %>
</div>

View File

@ -1,25 +1,25 @@
<form $FormAttributes>
<% if Message %>
<% 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 %>
<fieldset>
<% if Legend %><legend>$Legend</legend><% end_if %>
<% loop Fields %>
<% if $Legend %><legend>$Legend</legend><% end_if %>
<% loop $Fields %>
$FieldHolder
<% end_loop %>
<div class="clear"><!-- --></div>
</fieldset>
<% if Actions %>
<% if $Actions %>
<div class="Actions">
<% loop Actions %>
<% loop $Actions %>
$Field
<% end_loop %>
<% if CurrentPage.LinkPreview %>
<% if $CurrentPage.LinkPreview %>
<a href="$CurrentPage.LinkPreview" class="cms-preview-toggle-link ss-ui-button" data-icon="preview">
<% _t('LeftAndMain.PreviewButton', 'Preview') %> &raquo;
</a>

View File

@ -24,5 +24,5 @@
<i>Not implemented yet</i>
</div>
</div>
</div>

View File

@ -1,10 +1,10 @@
<div id="pages-controller-cms-content" class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content" data-ignore-tab-state="true">
<div class="cms-content-header north">
<div class="cms-content-header-info">
<% include CMSBreadcrumbs %>
<div class="cms-content-header-info">
<% include CMSBreadcrumbs %>
</div>
<div class="cms-content-header-tabs">
<ul class="cms-tabset-nav-primary">
<li class="content-treeview<% if class == 'CMSPageEditController' %> ui-tabs-active<% end_if %>">
@ -29,5 +29,5 @@
$Tools
$EditForm
</div>

View File

@ -1,15 +1,15 @@
<form $FormAttributes data-layout-type="border">
<div class="cms-content-fields center">
<% if Message %>
<% 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 %>
<fieldset>
<% if Legend %><legend>$Legend</legend><% end_if %>
<% loop Fields %>
<% if $Legend %><legend>$Legend</legend><% end_if %>
<% loop $Fields %>
$FieldHolder
<% end_loop %>
<div class="clear"><!-- --></div>
@ -17,17 +17,17 @@
</div>
<div class="cms-content-actions cms-content-controls south">
<% if Actions %>
<% if $Actions %>
<div class="Actions">
<% loop Actions %>
<% loop $Actions %>
$Field
<% end_loop %>
<% if Controller.LinkPreview %>
<% if $Controller.LinkPreview %>
<a href="$Controller.LinkPreview" target="_cmsPreview" class="cms-preview-toggle-link ss-ui-button" data-icon="preview">
<% _t('LeftAndMain.PreviewButton', 'Preview') %> &raquo;
</a>
<% end_if %>
<% include LeftAndMain_ViewModeSelector SelectID="preview-mode-dropdown-in-content" %>
</div>
<% end_if %>

View File

@ -7,7 +7,7 @@
</div>
<div class="cms-panel-content center">
<% if TreeIsFiltered %>
<% if $TreeIsFiltered %>
<div class="cms-tree-filtered cms-notice">
<strong><% _t('CMSMain.ListFiltered', 'Filtered list.') %></strong>
<a href="$LinkPages" class="cms-panel-link">

View File

@ -10,7 +10,7 @@
$ExtraTreeTools
<div class="center">
<% if TreeIsFiltered %>
<% if $TreeIsFiltered %>
<div class="cms-tree-filtered cms-notice">
<strong><% _t('CMSMain.TreeFiltered', 'Filtered tree.') %></strong>
<a href="$LinkPages" class="cms-panel-link">

View File

@ -1,31 +1,31 @@
<div class="cms-content center $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
<% with AddForm %>
<% with $AddForm %>
<form $FormAttributes data-layout-type="border">
<div class="cms-content-header north">
<div class="cms-content-header-info">
<h2><% _t('CMSAddPageController.Title','Add page') %></h2>
</div>
</div>
<div class="cms-content-fields center cms-panel-content cms-panel-padded">
<% if Message %>
<% 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 %>
<fieldset>
<% if Legend %><legend>$Legend</legend><% end_if %>
<% loop Fields %>
<% if $Legend %><legend>$Legend</legend><% end_if %>
<% loop $Fields %>
$FieldHolder
<% end_loop %>
</fieldset>
</div>
<div class="cms-content-actions south">
<% if Actions %>
<% if $Actions %>
<div class="Actions">
<% loop Actions %>
<% loop $Actions %>
$Field
<% end_loop %>
</div>

View File

@ -1,5 +1,5 @@
<div class="cms-content-tools west cms-panel cms-panel-layout" data-expandOnClick="true" data-layout-type="border" id="cms-content-tools-CMSPageHistoryController">
<div class="cms-panel-content cms-helper-hide-actions center">
$VersionsForm
</div>

View File

@ -1,10 +1,10 @@
<div id="pages-controller-cms-content" class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
<div class="cms-content-header north">
<div class="cms-content-header-info">
<% include CMSBreadcrumbs %>
<div class="cms-content-header-info">
<% include CMSBreadcrumbs %>
</div>
<div class="cms-content-header-tabs">
<ul class="cms-tabset-nav-primary">
<li class="content-treeview<% if ViewState == tree %> ui-tabs-active ss-tabs-force-active<% end_if %> cms-tabset-icon tree">
@ -25,11 +25,11 @@
$Tools
<div class="cms-content-fields center ui-widget-content cms-panel-padded">
<div class="cms-content-view cms-panel-deferred" id="cms-content-treeview" data-url="$LinkTreeView">
<%-- Lazy-loaded via ajax --%>
</div>
<div class="cms-content-view cms-panel-deferred" id="cms-content-listview" data-url="$LinkListView" data-deferred-no-cache="true">
<%-- Lazy-loaded via ajax --%>
</div>
@ -38,7 +38,7 @@
<i>Not implemented yet</i>
</div>
-->
</div>
</div>

View File

@ -1,18 +1,18 @@
<div id="settings-controller-cms-content" class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content CurrentForm">
<div class="cms-content-header north">
<% with EditForm %>
<div class="cms-content-header-info">
<% with Controller %>
<% with $EditForm %>
<div class="cms-content-header-info">
<% with $Controller %>
<% include CMSBreadcrumbs %>
<% end_with %>
<% end_with %>
</div>
<% if Fields.hasTabset %>
<% with Fields.fieldByName('Root') %>
<% if $Fields.hasTabset %>
<% with $Fields.fieldByName('Root') %>
<div class="cms-content-header-tabs">
<ul class="cms-tabset-nav-primary">
<% loop Tabs %>
<li<% if extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
<% loop $Tabs %>
<li<% if $extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
<% end_loop %>
</ul>
</div>

View File

@ -1,25 +1,25 @@
<form $FormAttributes>
<% if Message %>
<% 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 %>
<fieldset>
<% if Legend %><legend>$Legend</legend><% end_if %>
<% loop Fields %>
<% if $Legend %><legend>$Legend</legend><% end_if %>
<% loop $Fields %>
$FieldHolder
<% end_loop %>
<div class="clear"><!-- --></div>
</fieldset>
<% if Actions %>
<% if $Actions %>
<div class="Actions">
<% loop Actions %>
<% loop $Actions %>
$Field
<% end_loop %>
<% if Controller.LinkPreview %>
<% if $Controller.LinkPreview %>
<a href="$Controller.LinkPreview" class="cms-preview-toggle-link ss-ui-button" data-icon="preview">
<% _t('LeftAndMain.PreviewButton', 'Preview') %> &raquo;
</a>

View File

@ -1,10 +1,10 @@
<% if UnsuccessfulFiles %>
<% if $UnsuccessfulFiles %>
<p style=\"margin: 1em 0\">
<%t ContentController.UnableDeleteInstall "Unable to delete installation files. Please delete the files below manually" %>:
</p>
<ul>
<% loop UnsuccessfulFiles %>
<% loop $UnsuccessfulFiles %>
<li>$File</li>
<% end_loop %>
</ul>
@ -13,7 +13,7 @@
<%t ContentController.InstallFilesDeleted "Installation files have been successfully deleted." %>
</p>
<p style="margin: 1em 0">
<%t ContentController.StartEditing 'You can start editing your content by opening <a href="{link}">the CMS</a>.' link="admin/" %>
<%t ContentController.StartEditing 'You can start editing your content by opening <a href="{link}">the CMS</a>.' link="admin/" %>
<br />
&nbsp; &nbsp; <%t ContentController.Email "Email" %>: $Username<br />
&nbsp; &nbsp; <%t ContentController.Password "Password" %>: $Password<br />

View File

@ -2,7 +2,7 @@
<%t ContentController.InstallSuccessCongratulations "SilverStripe has been successfully installed!" %>
</p>
<% if Project == 'tutorial' %>
<% if $Project == 'tutorial' %>
<%t ContentController.PostInstallTutorialIntro 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.' link='<a href="http://doc.silverstripe.org/framework/en/tutorials">our tutorials</a>' %>
<% end_if %>
@ -10,7 +10,7 @@
<strong>&nbsp; &nbsp; <%t ContentController.Password "Password" %>: $Password</strong></p>
<p>
<%t ContentController.StartEditing 'You can start editing your content by opening <a href="{link}">the CMS</a>.' link="admin/" %>
<%t ContentController.StartEditing 'You can start editing your content by opening <a href="{link}">the CMS</a>.' link="admin/" %>
</p>
<div style="background:#fcf8f2; border-radius:4px; border: 1px solid #ffc28b; padding:5px; margin:5px;">

View File

@ -1,20 +1,20 @@
<div id="reportadmin-cms-content" class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
<div class="cms-content-header north">
<% with EditForm %>
<% with $EditForm %>
<div class="cms-content-header-info">
<% include BackLink_Button %>
<% with Controller %>
<% include BackLink_Button %>
<% with $Controller %>
<% include CMSBreadcrumbs %>
<% end_with %>
<% end_with %>
</div>
<% end_with %>
</div>
<div class="cms-content-fields center ui-widget-content" data-layout-type="border">
$EditForm
</div>
</div>

View File

@ -1,41 +1,41 @@
<form $FormAttributes>
<p style="display: none;" class="message " id="Form_EditForm_error"/>
<div id="ScrollPanel">
<fieldset>
$FieldMap.ReportTitle.FieldHolder
$FieldMap.ReportDescription.FieldHolder
<% if FieldMap.Filters.Children %>
<% if $FieldMap.Filters.Children %>
<h4><% _t('ReportAdminForm.FILTERBY', 'Filter by') %></h4>
<div class="filters">
<% loop FieldMap.Filters %>
<% loop Children %>
<% loop $FieldMap.Filters %>
<% loop $Children %>
$FieldHolder
<% end_loop %>
<% end_loop %>
</div>
<div id="action_updatereport">
<% if FieldMap.action_updatereport %>
<% if $FieldMap.action_updatereport %>
$FieldMap.action_updatereport.Field
<% end_if %>
</div>
<div style="clear: both">&nbsp;</div>
<% end_if %>
$FieldMap.ReportContent.FieldHolder
<% loop HiddenFields %>$Field<% end_loop %>
<% loop $HiddenFields %>$Field<% end_loop %>
</fieldset>
</div>
<div class="clear"><!-- --></div>
</form>

View File

@ -8,13 +8,13 @@
<%-- <body onload="window.print();"> --%>
<body>
<% with Form.Controller %>
<% with $Form.Controller %>
<h1 style="margin-bottom: 0">$CurrentReport.Title</h1>
<% with CurrentReport.getCmsFields %>
<% if Name == Filters %>
<% with $CurrentReport.getCmsFields %>
<% if $Name == Filters %>
<h2 style="margin-bottom: 0; margin-top: 0;">Filters</h2>
<ul style="margin-top: 0">
<% loop FieldSet %>
<% loop $FieldSet %>
<li>$Title = $performReadonlyTransformation.Field</li>
<% end_loop %>
</ul>

View File

@ -1,6 +1,6 @@
<div class='cms-sitetree-information'>
<p class="meta-info"><% _t('SiteTree.LASTSAVED', 'Last saved') %> $LastEdited.Ago(0)
<% if ExistsOnLive %>
<% if $ExistsOnLive %>
<br /><% _t('SiteTree.LASTPUBLISHED', 'Last published') %> $Live.LastEdited.Ago(0)
<% else %>
<br /><em><% _t('SiteTree.NOTPUBLISHED', 'Not published') %></em>

View File

@ -7,12 +7,12 @@
</button>
</div>
<div class="edit-holder">
<input $AttributesHTML />
<input $AttributesHTML />
<button class="update ss-ui-button-small">
<% _t('URLSegmentField.OK', 'OK') %>
</button>
<button class="cancel ss-ui-button-small ss-ui-action-minor">
<% _t('URLSegmentField.Cancel', 'Cancel') %>
</button>
<% if HelpText %><p class="help">$HelpText</p><% end_if %>
<% if $HelpText %><p class="help">$HelpText</p><% end_if %>
</div>