Author: jablko
Date: Thu Aug 13 14:12:25 2009
New Revision: 3027
Log:
Switch to label() everywhere
Modified:
trunk/apps/qubit/modules/informationobject/templates/editDcSuccess.php
trunk/apps/qubit/modules/informationobject/templates/editIsadSuccess.php
trunk/apps/qubit/modules/informationobject/templates/editModsSuccess.php
trunk/apps/qubit/modules/informationobject/templates/editRadSuccess.php
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/configureSiteSuccess.php
trunk/plugins/sfThemePlugin/modules/sfThemePlugin/templates/indexSuccess.php
Modified: trunk/apps/qubit/modules/informationobject/templates/editDcSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/templates/editDcSuccess.php
Thu Aug 13 11:03:47 2009 (r3026)
+++ trunk/apps/qubit/modules/informationobject/templates/editDcSuccess.php
Thu Aug 13 14:12:25 2009 (r3027)
@@ -61,7 +61,7 @@
<?php echo include_component('informationobject', 'eventForm') ?>
</div>
- <?php echo $form->typeIds->renderRow(null, __('Type')) ?>
+ <?php echo $form->typeIds->label(__('Type'))->renderRow() ?>
<?php echo render_field($form->extentAndMedium->label(__('Format')),
$informationObject, array('class' => 'resizable')) ?>
Modified:
trunk/apps/qubit/modules/informationobject/templates/editIsadSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/templates/editIsadSuccess.php
Thu Aug 13 11:03:47 2009 (r3026)
+++ trunk/apps/qubit/modules/informationobject/templates/editIsadSuccess.php
Thu Aug 13 14:12:25 2009 (r3027)
@@ -108,9 +108,9 @@
<fieldset class="collapsible collapsed" id="contextArea">
<legend><?php echo __('context area') ?></legend>
- <?php echo $form->creatorIds->renderRow(null, __('Name of creator(s)')) ?>
+ <?php echo $form->creatorIds->label(__('Name of creator(s)'))->renderRow()
?>
- <?php echo $form->repositoryId->renderRow(null, __('Repository')) ?>
+ <?php echo $form->repositoryId->label(__('Repository'))->renderRow() ?>
<?php echo render_field($form->archivalHistory, $informationObject,
array('class' => 'resizable')) ?>
@@ -333,15 +333,15 @@
</table>
</div>
- <?php echo $form->descriptionIdentifier->renderRow(null, __('Description
record identifier')) ?>
+ <?php echo $form->descriptionIdentifier->label(__('Description record
identifier'))->renderRow() ?>
<?php echo
render_field($form->institutionResponsibleIdentifier->label(__('Institution
identifier')), $informationObject) ?>
<?php echo render_field($form->rules->label(__('Rules or conventions')),
$informationObject, array('class' => 'resizable')) ?>
- <?php echo $form->descriptionStatusId->renderRow(null, __('Status')) ?>
+ <?php echo $form->descriptionStatusId->label(__('Status'))->renderRow() ?>
- <?php echo $form->descriptionDetailId->renderRow(null, __('Level of
detail')) ?>
+ <?php echo $form->descriptionDetailId->label(__('Level of
detail'))->renderRow() ?>
<?php echo render_field($form->revisionHistory->label(__('Dates of
creation, revision and deletion')), $informationObject, array('class' =>
'resizable')) ?>
Modified:
trunk/apps/qubit/modules/informationobject/templates/editModsSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/templates/editModsSuccess.php
Thu Aug 13 11:03:47 2009 (r3026)
+++ trunk/apps/qubit/modules/informationobject/templates/editModsSuccess.php
Thu Aug 13 14:12:25 2009 (r3027)
@@ -62,7 +62,7 @@
<?php echo include_component('informationobject', 'eventForm') ?>
</div>
- <?php echo $form->typeIds->renderRow(null, __('Type of resource')) ?>
+ <?php echo $form->typeIds->label(__('Type of resource'))->renderRow() ?>
<?php echo $form->language->renderRow() ?>
Modified:
trunk/apps/qubit/modules/informationobject/templates/editRadSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/templates/editRadSuccess.php
Thu Aug 13 11:03:47 2009 (r3026)
+++ trunk/apps/qubit/modules/informationobject/templates/editRadSuccess.php
Thu Aug 13 14:12:25 2009 (r3027)
@@ -24,7 +24,7 @@
<legend><?php echo __('title and statement of responsibility area')
?></legend>
<?php echo render_field($form->title->label(__('Title proper')),
$informationObject) ?>
- <?php echo $form->typeIds->renderRow(null, __('General material
designation')) ?>
+ <?php echo $form->typeIds->label(__('General material
designation'))->renderRow() ?>
<?php echo render_field($form->alternateTitle->label(__('Parallel
title')), $informationObject) ?>
@@ -76,7 +76,7 @@
</tr>
</table>
- <?php echo $form->repositoryId->renderRow(null, __('Repository')) ?>
+ <?php echo $form->repositoryId->label(__('Repository'))->renderRow() ?>
<?php echo $form->identifier->renderRow() ?>
@@ -343,9 +343,9 @@
<?php echo render_field($form->rules->label(__('Rules or conventions')),
$informationObject, array('class' => 'resizable')) ?>
- <?php echo $form->descriptionStatusId->renderRow(null, __('Status')) ?>
+ <?php echo $form->descriptionStatusId->label(__('Status'))->renderRow() ?>
- <?php echo $form->descriptionDetailId->renderRow(null, __('Level of
detail')) ?>
+ <?php echo $form->descriptionDetailId->label(__('Level of
detail'))->renderRow() ?>
<?php echo render_field($form->revisionHistory->label(__('Dates of
creation, revision and deletion')), $informationObject, array('class' =>
'resizable')) ?>
Modified:
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/configureSiteSuccess.php
==============================================================================
---
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/configureSiteSuccess.php
Thu Aug 13 11:03:47 2009 (r3026)
+++
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/configureSiteSuccess.php
Thu Aug 13 14:12:25 2009 (r3027)
@@ -28,7 +28,7 @@
</div>
<?php echo $form->username->renderRow() ?>
- <?php echo $form->email->renderRow(null, 'E-mail address') ?>
+ <?php echo $form->email->label('E-mail address')->renderRow() ?>
<div>
<?php $settings = json_encode(array('password' => array('strengthTitle'
=> 'Password strength:', 'hasWeaknesses' => 'To make your password stronger:',
'tooShort' => 'Make it at least six characters', 'addLowerCase' => 'Add
lowercase letters', 'addUpperCase' => 'Add uppercase letters', 'addNumbers' =>
'Add numbers', 'addPunctuation' => 'Add punctuation', 'sameAsUsername' => 'Make
it different from your username', 'confirmSuccess' => 'yes', 'confirmFailure'
=> 'no', 'confirmTitle' => 'Passwords match:', 'username' => ''))) ?>
Modified:
trunk/plugins/sfThemePlugin/modules/sfThemePlugin/templates/indexSuccess.php
==============================================================================
---
trunk/plugins/sfThemePlugin/modules/sfThemePlugin/templates/indexSuccess.php
Thu Aug 13 11:03:47 2009 (r3026)
+++
trunk/plugins/sfThemePlugin/modules/sfThemePlugin/templates/indexSuccess.php
Thu Aug 13 14:12:25 2009 (r3027)
@@ -11,9 +11,9 @@
<?php echo __('Enable or disable the display of certain page elements.
Unless they have been overridden by a specific theme, these settings will be
used site wide.') ?>
</p>
</div>
- <?php echo $form->toggleLogo->renderRow(null, 'Logo') ?>
- <?php echo $form->toggleTitle->renderRow(null, 'Title') ?>
- <?php echo $form->toggleDescription->renderRow(null, 'Description') ?>
+ <?php echo $form->toggleLogo->label('Logo')->renderRow() ?>
+ <?php echo $form->toggleTitle->label('Title')->renderRow() ?>
+ <?php echo $form->toggleDescription->label('Description')->renderRow() ?>
</fieldset>
<?php echo submit_tag('Save settings') ?>
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
