Skip to content

Commit

Permalink
MINOR: added user friendly labels - should really be _t compatible I …
Browse files Browse the repository at this point in the history
…guess

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@71345 467b73ca-7a2a-4603-9d3b-597d59a354a9
  • Loading branch information
Will Rossiter authored and Sam Minnee committed Feb 2, 2011
1 parent b87a0ae commit 479f8c0
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 12 deletions.
6 changes: 3 additions & 3 deletions css/TableListField.css
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ table.CMSList thead th {
height : 24px;
border-right : 1px solid #aca899;
border-left : 1px solid #ffffff;
padding-left : 5px;
padding-left : 0 5px;
}

table.TableField thead th span,
Expand Down Expand Up @@ -75,8 +75,8 @@ table.TableField tfoot td,
.TableListField table.data tfoot td,
table.CMSList tbody td,
table.CMSList tfoot td {
border : 1px solid #f1efe2;
padding-left : 5px;
border: 1px solid #f1efe2;
padding: 5px;
}

.TableListField table.data tfoot tr.addtogrouprow td {
Expand Down
13 changes: 7 additions & 6 deletions forms/RequiredFields.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,14 @@ function debug() {
function javascript() {
$js = "";
$fields = $this->form->Fields();

foreach($this->form->Fields()->dataFields() as $field) {
//if the field type has some special specific specification for validation of itself
$validationFunc = $field->jsValidation();
if($validationFunc) $js .= $validationFunc . "\n";
$dataFields = $this->form->Fields()->dataFields();
if($dataFields) {
foreach($dataFields as $field) {
// if the field type has some special specific specification for validation of itself
$validationFunc = $field->jsValidation();
if($validationFunc) $js .= $validationFunc . "\n";
}
}

$useLabels = $this->useLabels ? 'true' : 'false';

if($this->required) {
Expand Down
6 changes: 3 additions & 3 deletions security/Member.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ class Member extends DataObject {
);

static $summary_fields = array(
'FirstName',
'Surname',
'Email',
'FirstName' => 'First Name',
'Surname' => 'Last Name',
'Email' => 'Email',
);

/**
Expand Down

0 comments on commit 479f8c0

Please sign in to comment.