mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-09-30 05:09:07 +02:00
BUGFIX: CMS UI site content > search > add criteria select element now returns back to prompt & tweaked layout
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70994 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
d04e908358
commit
d8687d4063
@ -370,7 +370,7 @@ ul.tree li.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 {
|
||||||
|
@ -291,6 +291,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 {
|
||||||
@ -340,10 +342,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;
|
||||||
|
@ -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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -13,8 +13,6 @@
|
|||||||
<li class="action" id="addpage"><button><% _t('CREATE','Create',PR_HIGH) %></button></li>
|
<li class="action" id="addpage"><button><% _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>
|
||||||
|
|
||||||
<% control AddPageOptionsForm %>
|
<% control AddPageOptionsForm %>
|
||||||
@ -22,40 +20,35 @@
|
|||||||
<% 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>
|
||||||
</form>
|
</form>
|
||||||
<% end_control %>
|
<% end_control %>
|
||||||
|
|
||||||
<form class="actionparams" style="display: none" id="search_options" action="admin/filterSiteTree">
|
<form class="actionparams" style="display: none" id="search_options" action="admin/filterSiteTree">
|
||||||
<div>
|
<div>
|
||||||
<input type="hidden" id="SiteTreeIsFiltered" value="0" />
|
<input type="hidden" id="SiteTreeIsFiltered" value="0" />
|
||||||
|
|
||||||
<div id="SearchBox">
|
<div id="SearchBox">
|
||||||
<input type="text" id="SiteTreeSearchTerm" name="SiteTreeSearchTerm" />
|
<input type="text" id="SiteTreeSearchTerm" name="SiteTreeSearchTerm" />
|
||||||
<input type="submit" id="SiteTreeSearchButton" class="action" value="<% _t('SEARCH') %>" title="<% _t('SEARCHTITLE','Search through URL, Title, Menu Title, & Content') %>" />
|
<input type="submit" id="SiteTreeSearchButton" class="action" value="<% _t('SEARCH') %>" title="<% _t('SEARCHTITLE','Search through URL, Title, Menu Title, & 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>
|
||||||
@ -63,7 +56,10 @@
|
|||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
|
|
||||||
<div id="batchactionsforms" style="display: none">
|
<div id="batchactionsforms" style="display: none">
|
||||||
<form class="actionparams" style="border:0" id="deletepage_options" action="admin/deleteitems">
|
<form class="actionparams" style="border:0" id="deletepage_options" action="admin/deleteitems">
|
||||||
<p><% _t('SELECTPAGESACTIONS','Select the pages that you want to change & then click an action:') %></p>
|
<p><% _t('SELECTPAGESACTIONS','Select the pages that you want to change & then click an action:') %></p>
|
||||||
|
Loading…
Reference in New Issue
Block a user