tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Merged from branches/2.3

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71277 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2009-02-03 03:52:06 +00:00
parent 34a50e3de6
commit 75f962b6e9
4 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/cms_left.css
View File

@ -376,7 +376,7 @@ ul.tree span.untranslated a:visited {
} }
#left form.actionparams input.SearchCriteria { #left form.actionparams input.SearchCriteria {
width: 41%; width: 43%;
float: left; float: left;
} }
#left form.actionparams #InputSiteTreeFilterDate .calendar { #left form.actionparams #InputSiteTreeFilterDate .calendar {

11
css/layout.css
View File

@ -295,6 +295,8 @@ body.stillLoading select {
} }
#bottom #switchView a { #bottom #switchView a {
background: none; background: none;
margin-left: 8px;
border-left: 1px solid;
} }
#bottom .bottomTabs a { #bottom .bottomTabs a {
@ -344,10 +346,19 @@ body.stillLoading select {
#SearchBox #SiteTreeSearchTerm { #SearchBox #SiteTreeSearchTerm {
padding: 1px 0 2px 0; padding: 1px 0 2px 0;
} }
.SearchCriteriaContainer {
float: left;
width: 100%;
padding-left: 5px;
margin-bottom: 4px;
}
#addCriteria { #addCriteria {
float: left; float: left;
width: 100%; width: 100%;
} }
#addCriteria label {
display: none;
}
#sitetree_ul, ul#sitetree { #sitetree_ul, ul#sitetree {
padding: 3px 0 0 3px; padding: 3px 0 0 3px;
clear: left; clear: left;

6
javascript/CMSMain_left.js
View File

@ -125,8 +125,10 @@ SiteTreeFilterAddCriteria = Class.create();
SiteTreeFilterAddCriteria.applyTo('#SiteTreeFilterAddCriteria'); SiteTreeFilterAddCriteria.applyTo('#SiteTreeFilterAddCriteria');
SiteTreeFilterAddCriteria.prototype = { SiteTreeFilterAddCriteria.prototype = {
onchange : function() { onchange : function() {
Element.show('Text' + this.value); Element.show('Container' + this.value);
Element.show('Input' + this.value); // Element.show('Text' + this.value);
// Element.show('Input' + this.value);
this.selectedIndex = 0; //reset selected criteria to prompt
} }
} }

26
templates/Includes/CMSMain_left.ss
View File

@ -12,8 +12,6 @@
<li class="action" id="addpage"><button<% if EditingLang %> disabled="disabled" class="disabled"<% end_if %>><% _t('CREATE','Create',PR_HIGH) %></button></li> <li class="action" id="addpage"><button<% if EditingLang %> disabled="disabled" class="disabled"<% end_if %>><% _t('CREATE','Create',PR_HIGH) %></button></li>
<li class="action" id="search"><button><% _t('SEARCH','Search',PR_HIGH) %></button></li> <li class="action" id="search"><button><% _t('SEARCH','Search',PR_HIGH) %></button></li>
<li class="action" id="batchactions"><button><% _t('BATCHACTIONS','Batch Actions',PR_HIGH) %></button></li> <li class="action" id="batchactions"><button><% _t('BATCHACTIONS','Batch Actions',PR_HIGH) %></button></li>
<!-- <li class="action" id="duplicate"><a href="#">Duplicate</a></li>
Sam: this should be put into the Create area, I think, so we don't stuff up the layout -->
</ul> </ul>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<% control AddPageOptionsForm %> <% control AddPageOptionsForm %>
@ -21,16 +19,6 @@
<% control Fields %> <% control Fields %>
$FieldHolder $FieldHolder
<% end_control %> <% end_control %>
<!--
<div>
<select name="Type">
<% control PageTypes %>
<option value="$ClassName">$AddAction</option>
<% end_control %>
</select>
<input type="hidden" name="ParentID" />
</div>
-->
<div> <div>
<input class="action" type="submit" value="<% _t('GO','Go') %>" /> <input class="action" type="submit" value="<% _t('GO','Go') %>" />
</div> </div>
@ -45,16 +33,20 @@
<input type="submit" id="SiteTreeSearchButton" class="action" value="<% _t('SEARCH') %>" title="<% _t('SEARCHTITLE','Search through URL, Title, Menu Title, &amp; Content') %>" /> <input type="submit" id="SiteTreeSearchButton" class="action" value="<% _t('SEARCH') %>" title="<% _t('SEARCHTITLE','Search through URL, Title, Menu Title, &amp; Content') %>" />
</div> </div>
<div style="display:none" id="TextSiteTreeFilterDate" class="SearchCriteria"><% _t('EDITEDSINCE','Edited Since') %>:</div> <div id="ContainerSiteTreeFilterDate" class="SearchCriteriaContainer" style="display:none">
<div style="display:none" id="InputSiteTreeFilterDate">$SiteTreeFilterDateField</div> <div id="TextSiteTreeFilterDate" class="SearchCriteria"><% _t('EDITEDSINCE','Edited Since') %>:</div>
<div id="InputSiteTreeFilterDate">$SiteTreeFilterDateField</div>
</div>
<% control SiteTreeFilterOptions %> <% control SiteTreeFilterOptions %>
<div style="display:none" id="Text$Column" class="SearchCriteria">$Title:</div> <div id="Container$Column" class="SearchCriteriaContainer" style="display:none">
<input style="display:none" id="Input$Column" name="$Column" class="SearchCriteria" /> <div id="Text$Column" class="SearchCriteria">$Title:</div>
<input id="Input$Column" name="$Column" class="SearchCriteria" />
</div>
<% end_control %> <% end_control %>
<div id="addCriteria"> <div id="addCriteria">
<select id="SiteTreeFilterAddCriteria"> <select id="SiteTreeFilterAddCriteria">
<option><% _t('ADDSEARCHCRITERIA','Add Criteria...') %></option> <option value=""><% _t('ADDSEARCHCRITERIA','Add Criteria...') %></option>
<option value="SiteTreeFilterDate"><% _t('EDITEDSINCE','Edited Since') %></option> <option value="SiteTreeFilterDate"><% _t('EDITEDSINCE','Edited Since') %></option>
<% control SiteTreeFilterOptions %> <% control SiteTreeFilterOptions %>
<option value="$Column">$Title</option> <option value="$Column">$Title</option>