tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +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/sapphire/trunk@77245 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2009-05-19 10:32:06 +00:00
parent 4e8735b10e
commit f7a974ccd4
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
css/Form.css
View File

@ -78,17 +78,17 @@ form button.minorAction {
/** /**
* Composite Fields - raw concatenation of fields for programmatic purposes. * Composite Fields - raw concatenation of fields for programmatic purposes.
*/ */
.right form div.field.CompositeField { .right form div.CompositeField {
margin-left: 7.5em; margin-left: 7.5em;
} }
.right form div.field.CompositeField div.field { .right form div.CompositeField div.field {
font-size: 1em; font-size: 1em;
} }
.right form div.field.CompositeField { .right form div.CompositeField {
clear: both; clear: both;
} }
.right form div.field.CompositeField label.left { .right form div.CompositeField label.left {
float: left; float: left;
width: 10em; width: 10em;
margin-left: -10em; margin-left: -10em;

4
css/TableListField.css
View File

@ -75,7 +75,7 @@ table.TableField tfoot td,
table.CMSList tbody td, table.CMSList tbody td,
table.CMSList tfoot td { table.CMSList tfoot td {
border: 1px solid #f1efe2; border: 1px solid #f1efe2;
padding: 0 5px; padding: 2px 4px;
} }
.TableListField table.data tfoot tr.addtogrouprow td { .TableListField table.data tfoot tr.addtogrouprow td {
@ -114,7 +114,7 @@ table.TableField tbody tr.over td,
.TableListField table.data tbody tr.over td, .TableListField table.data tbody tr.over td,
.TableListField table.data tbody tr.over td input, .TableListField table.data tbody tr.over td input,
table.CMSList tbody td.over td{ table.CMSList tbody td.over td{
background-color: #FFCC66; background-color: #FFFFBB;
} }
table.TableField tbody tr.current td, table.TableField tbody tr.current td,

6
forms/TableListField.php
View File

@ -314,6 +314,12 @@ JS
$XML_sort = (isset($_REQUEST['ctf'][$this->Name()]['dir'])) ? Convert::raw2xml($_REQUEST['ctf'][$this->Name()]['dir']) : null; $XML_sort = (isset($_REQUEST['ctf'][$this->Name()]['dir'])) ? Convert::raw2xml($_REQUEST['ctf'][$this->Name()]['dir']) : null;
$sortLink = HTTP::setGetVar("ctf[{$this->Name()}][dir]", $XML_sort, $sortLink); $sortLink = HTTP::setGetVar("ctf[{$this->Name()}][dir]", $XML_sort, $sortLink);
} }
if(isset($_REQUEST['ctf'][$this->Name()]['search'])) {
foreach($_REQUEST['ctf'][$this->Name()]['search'] as $parameter => $value) {
$XML_search = Convert::raw2xml($value);
$sortLink = HTTP::setGetVar("ctf[{$this->Name()}][search][$parameter]", $XML_search, $sortLink);
}
}
} else { } else {
$sortLink = '#'; $sortLink = '#';
} }

4
templates/TableField.ss
View File

@ -30,8 +30,8 @@
<% if Can(add) %> <% if Can(add) %>
<tr> <tr>
<td colspan="$ItemCount"> <td colspan="$ItemCount">
<a href="#" class="addrow" title="<% _t('ADD', 'Add a new row') %>"><img src="cms/images/add.gif" alt="<% _t('ADD') %>" /> <a href="#" class="addrow" title="<% _t('ADD', 'Add a new row') %>"><img src="cms/images/add.gif" alt="<% _t('ADD','Add a new row') %>" />
<% sprintf(_t('ADDITEM'),$Title) %> <% sprintf(_t('ADDITEM','Add %s'),$Title) %>
</a> </a>
</td> </td>
<td style="display: none"></td> <td style="display: none"></td>