Author: jablko
Date: Sun Oct 24 17:58:49 2010
New Revision: 8447
Log:
Reorder date fields
Modified:
trunk/apps/qubit/modules/informationobject/templates/_event.php
trunk/apps/qubit/modules/term/actions/indexAction.class.php
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_event.php
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_relatedAuthorityRecord.php
trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/templates/_event.php
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedResource.php
Modified: trunk/apps/qubit/modules/informationobject/templates/_event.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/templates/_event.php Sun Oct
24 15:26:48 2010 (r8446)
+++ trunk/apps/qubit/modules/informationobject/templates/_event.php Sun Oct
24 17:58:49 2010 (r8447)
@@ -116,18 +116,18 @@
</td>
</tr><tr>
- <th colspan="2" style="width: 55%">
+ <th style="width: 40%">
<?php echo $form->type
->label(__('Event type'))
->renderLabel() ?>
- </th><th style="width: 40%">
+ </th><th colspan="2" style="width: 55%">
<?php echo $form->place->renderLabel() ?>
</th>
</tr><tr>
- <td colspan="2" class="noline">
+ <td class="noline">
<?php echo $form->type ?>
<?php echo $form->type->renderHelp() ?>
- </td><td class="noline">
+ </td><td colspan="2" class="noline">
<?php echo $form->place->render(array('class' => 'form-autocomplete'))
?>
@@ -141,26 +141,26 @@
</td>
</tr><tr>
<th>
+ <?php echo $form->dateDisplay
+ ->label(__('Date display (defaults to date range)'))
+ ->renderLabel() ?>
+ </th><th>
<?php echo $form->startDate
->label(__('Date'))
->renderLabel() ?>
</th><th>
<?php echo $form->endDate->renderLabel() ?>
- </th><th>
- <?php echo $form->dateDisplay
- ->label(__('Date display (defaults to date range)'))
- ->renderLabel() ?>
</th>
</tr><tr>
<td class="noline">
+ <?php echo $form->dateDisplay ?>
+ <?php echo $form->dateDisplay->renderHelp() ?>
+ </td><td class="noline">
<?php echo $form->startDate ?>
<?php echo $form->startDate->renderHelp() ?>
</td><td class="noline">
<?php echo $form->endDate ?>
<?php echo $form->endDate->renderHelp() ?>
- </td><td class="noline">
- <?php echo $form->dateDisplay ?>
- <?php echo $form->dateDisplay->renderHelp() ?>
</td>
</tr><tr>
<th colspan="3">
Modified: trunk/apps/qubit/modules/term/actions/indexAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/term/actions/indexAction.class.php Sun Oct 24
15:26:48 2010 (r8446)
+++ trunk/apps/qubit/modules/term/actions/indexAction.class.php Sun Oct 24
17:58:49 2010 (r8447)
@@ -22,9 +22,9 @@
public function checkForRepeatedNames($validator, $value)
{
$criteria = new Criteria;
- $criteria->addJoin(QubitTerm::ID, QubitTermI18n::ID);
$criteria->add(QubitTerm::ID, $this->resource->id, Criteria::NOT_EQUAL);
$criteria->add(QubitTerm::TAXONOMY_ID, $this->resource->taxonomyId);
+ $criteria->addJoin(QubitTerm::ID, QubitTermI18n::ID);
$criteria->add(QubitTermI18n::CULTURE, $this->context->user->getCulture());
$criteria->add(QubitTermI18n::NAME, $value);
Modified: trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_event.php
==============================================================================
--- trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_event.php
Sun Oct 24 15:26:48 2010 (r8446)
+++ trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_event.php
Sun Oct 24 17:58:49 2010 (r8447)
@@ -134,29 +134,33 @@
->renderHelp() ?>
</td>
</tr><tr>
- <th colspan="2" style="width: 60%">
+ <th style="width: 40%">
<?php echo $form->type
->label(__('Nature of relationship'))
->renderLabel() ?>
- </th><th style="width: 40%">
+ </th><th colspan="2" style="width: 60%">
<?php echo $form->resourceType
->label(__('Type of related resource'))
->renderLabel() ?>
</th>
</tr><tr>
- <td colspan="2" class="noline">
+ <td class="noline">
<?php echo $form->type ?>
<?php echo $form->type
->help(__('"Describe the nature of the relationships between the
corporate body, person or family and the related resource." (ISAAR 6.3) Select
the type of relationship from the drop-down menu; these values are drawn from
the Event Types taxonomy.'))
->renderHelp() ?>
- </td><td class="noline">
+ </td><td colspan="2" class="noline">
<?php echo $form->resourceType->render(array('disabled' => 'true',
'class' => 'disabled')) ?>
<?php echo $form->resourceType
->help(__('"Identify the type of related resources, e.g. Archival
materials (fonds, record series, etc), archival description, finding aid,
monograph, journal article, web site, photograph, museum collection,
documentary film, oral history recording." (ISAAR 6.2) In the current version
of the software, Archival material is provided as the only default value.'))
->renderHelp() ?>
</td>
</tr><tr>
- <th style="width: 25%">
+ <th style="width: 50%">
+ <?php echo $form->dateDisplay
+ ->label(__('Date display†'))
+ ->renderLabel() ?>
+ </th><th style="width: 25%">
<?php echo $form->startDate
->label(__('Date†'))
->renderLabel() ?>
@@ -164,23 +168,19 @@
<?php echo $form->endDate
->label(__('End date†'))
->renderLabel() ?>
- </th><th style="width: 50%">
- <?php echo $form->dateDisplay
- ->label(__('Date display†'))
- ->renderLabel() ?>
</th>
</tr><tr>
- <td style="width: 25%">
+ <td style="width: 50%">
+ <?php echo $form->dateDisplay ?>
+ <?php echo $form->dateDisplay
+ ->help(__('"Provide any relevant dates for the related resources
and/or the relationship between the corporate body, person or family and the
related resource." (ISAAR 6.4) Enter the date as you would like it to appear in
the show page for the authority record, using qualifiers and/or typographical
symbols to express uncertainty if desired.'))
+ ->renderHelp() ?>
+ </td><td style="width: 25%">
<?php echo $form->startDate ?>
<?php echo $form->startDate->renderHelp() ?>
</td><td style="width: 25%">
<?php echo $form->endDate ?>
<?php echo $form->endDate->renderHelp() ?>
- </td><td style="width: 50%">
- <?php echo $form->dateDisplay ?>
- <?php echo $form->dateDisplay
- ->help(__('"Provide any relevant dates for the related resources
and/or the relationship between the corporate body, person or family and the
related resource." (ISAAR 6.4) Enter the date as you would like it to appear in
the show page for the authority record, using qualifiers and/or typographical
symbols to express uncertainty if desired.'))
- ->renderHelp() ?>
</td>
</tr><tr>
<td colspan="3">
Modified:
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_relatedAuthorityRecord.php
==============================================================================
---
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_relatedAuthorityRecord.php
Sun Oct 24 15:26:48 2010 (r8446)
+++
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_relatedAuthorityRecord.php
Sun Oct 24 17:58:49 2010 (r8447)
@@ -201,7 +201,11 @@
->renderHelp() ?>
</td>
</tr><tr>
- <th style="width: 25%">
+ <th style="width: 50%">
+ <?php echo $form->dateDisplay
+ ->label(__('Date display†'))
+ ->renderLabel() ?>
+ </th><th style="width: 25%">
<?php echo $form->startDate
->label(__('Date†'))
->renderLabel() ?>
@@ -209,23 +213,19 @@
<?php echo $form->endDate
->label(__('End date†'))
->renderLabel() ?>
- </th><th style="width: 50%">
- <?php echo $form->dateDisplay
- ->label(__('Date display†'))
- ->renderLabel() ?>
</th>
</tr><tr>
- <td style="width: 25%">
+ <td style="width: 50%">
+ <?php echo $form->dateDisplay ?>
+ <?php echo $form->dateDisplay
+ ->help(__('"Record when relevant the commencement date of the
relationship or succession date and, when relevant, the cessation date of the
relationship." (ISAAR 5.3.4) Enter the date as you would like it to appear in
the show page for the authority record, using qualifiers and/or typographical
symbols to express uncertainty if desired.'))
+ ->renderHelp() ?>
+ </td><td style="width: 25%">
<?php echo $form->startDate ?>
<?php echo $form->startDate->renderHelp() ?>
</td><td style="width: 25%">
<?php echo $form->endDate ?>
<?php echo $form->endDate->renderHelp() ?>
- </td><td style="width: 50%">
- <?php echo $form->dateDisplay ?>
- <?php echo $form->dateDisplay
- ->help(__('"Record when relevant the commencement date of the
relationship or succession date and, when relevant, the cessation date of the
relationship." (ISAAR 5.3.4) Enter the date as you would like it to appear in
the show page for the authority record, using qualifiers and/or typographical
symbols to express uncertainty if desired.'))
- ->renderHelp() ?>
</td>
</tr><tr>
<td colspan="3">
Modified: trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/templates/_event.php
==============================================================================
--- trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/templates/_event.php
Sun Oct 24 15:26:48 2010 (r8446)
+++ trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/templates/_event.php
Sun Oct 24 17:58:49 2010 (r8447)
@@ -10,12 +10,12 @@
<tr>
<th style="width: 25%">
<?php echo __('Type') ?>
+ </th><th style="width: 30%">
+ <?php echo __('Date display') ?>
</th><th style="width: 20%">
<?php echo __('Date') ?>
</th><th style="width: 20%">
<?php echo __('End date') ?>
- </th><th style="width: 30%">
- <?php echo __('Date display') ?>
</th><th style="width: 5%">
<?php echo image_tag('delete', array('align' => 'top', 'class' =>
'deleteIcon')) ?>
</th>
@@ -34,15 +34,15 @@
</div>
</td><td>
<div class="animateNicely">
- <?php echo $form->getWidgetSchema()->renderField('startDate',
Qubit::renderDate($item->startDate)) ?>
+ <?php echo $form->getWidgetSchema()->renderField('dateDisplay',
$item->getDateDisplay(array('cultureFallback' => true))) ?>
</div>
</td><td>
<div class="animateNicely">
- <?php echo $form->getWidgetSchema()->renderField('endDate',
Qubit::renderDate($item->endDate)) ?>
+ <?php echo $form->getWidgetSchema()->renderField('startDate',
Qubit::renderDate($item->startDate)) ?>
</div>
</td><td>
<div class="animateNicely">
- <?php echo $form->getWidgetSchema()->renderField('dateDisplay',
$item->getDateDisplay(array('cultureFallback' => true))) ?>
+ <?php echo $form->getWidgetSchema()->renderField('endDate',
Qubit::renderDate($item->endDate)) ?>
</div>
</td><td style="text-align: right">
<div class="animateNicely">
@@ -61,12 +61,12 @@
<?php echo $form->type ?>
</div>
</td><td>
+ <?php echo $form->dateDisplay ?>
+ </td><td>
<?php echo $form->startDate ?>
</td><td>
<?php echo $form->endDate ?>
</td><td>
- <?php echo $form->dateDisplay ?>
- </td><td>
</td>
</tr>
@@ -75,7 +75,7 @@
</table>
<div class="description">
- <?php echo __('Identify and record the date(s) of the unit of description.
Identify the type of date given. Record as a single date or a range of dates as
appropriate. Use YYYY-MM-DD format for the <em>Date</em> field. The <em>End
Date</em> field can be used to indicate a date range. The <em>Date Display</em>
field can be used to enter free-text date information.') ?>
+ <?php echo __('Identify and record the date(s) of the unit of description.
Identify the type of date given. Record as a single date or a range of dates as
appropriate. Use YYYY-MM-DD format for the <em>Date</em> field. The <em>End
date</em> field can be used to indicate a date range. The <em>Date display</em>
field can be used to enter free-text date information.') ?>
</div>
</div>
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
Sun Oct 24 15:26:48 2010 (r8446)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
Sun Oct 24 17:58:49 2010 (r8447)
@@ -117,7 +117,11 @@
<?php echo $form->description->renderHelp() ?>
</td>
</tr><tr>
- <th style="width: 25%">
+ <th colspan="2" style="width: 50%">
+ <?php echo $form->dateDisplay
+ ->label(__('Date display†'))
+ ->renderLabel() ?>
+ </th><th style="width: 25%">
<?php echo $form->startDate
->label(__('Date†'))
->renderLabel() ?>
@@ -125,21 +129,17 @@
<?php echo $form->endDate
->label(__('End date†'))
->renderLabel() ?>
- </th><th colspan="2" style="width: 50%">
- <?php echo $form->dateDisplay
- ->label(__('Date display†'))
- ->renderLabel() ?>
</th>
</tr><tr>
- <td style="width: 25%">
+ <td colspan="2" style="width: 50%">
+ <?php echo $form->dateDisplay ?>
+ <?php echo $form->dateDisplay->renderHelp() ?>
+ </td><td style="width: 25%">
<?php echo $form->startDate ?>
<?php echo $form->startDate->renderHelp() ?>
</td><td style="width: 25%">
<?php echo $form->endDate ?>
<?php echo $form->endDate->renderHelp() ?>
- </td><td colspan="2" style="width: 50%">
- <?php echo $form->dateDisplay ?>
- <?php echo $form->dateDisplay->renderHelp() ?>
</td>
</tr><tr>
<td colspan="4">
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
Sun Oct 24 15:26:48 2010 (r8446)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
Sun Oct 24 17:58:49 2010 (r8447)
@@ -202,7 +202,11 @@
->renderHelp() ?>
</td>
</tr><tr>
- <th style="width: 25%">
+ <th colspan="2" style="width: 50%">
+ <?php echo $form->dateDisplay
+ ->label(__('Date display†'))
+ ->renderLabel() ?>
+ </th><th style="width: 25%">
<?php echo $form->startDate
->label(__('Date†'))
->renderLabel() ?>
@@ -210,21 +214,17 @@
<?php echo $form->endDate
->label(__('End date†'))
->renderLabel() ?>
- </th><th colspan="2" style="width: 50%">
- <?php echo $form->dateDisplay
- ->label(__('Date display†'))
- ->renderLabel() ?>
</th>
</tr><tr>
- <td style="width: 25%">
+ <td colspan="2" style="width: 50%">
+ <?php echo $form->dateDisplay ?>
+ <?php echo $form->dateDisplay->renderHelp() ?>
+ </td><td style="width: 25%">
<?php echo $form->startDate ?>
<?php echo $form->startDate->renderHelp() ?>
</td><td style="width: 25%">
<?php echo $form->endDate ?>
<?php echo $form->endDate->renderHelp() ?>
- </td><td colspan="2" style="width: 50%">
- <?php echo $form->dateDisplay ?>
- <?php echo $form->dateDisplay->renderHelp() ?>
</td>
</tr><tr>
<td colspan="4">
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedResource.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedResource.php
Sun Oct 24 15:26:48 2010 (r8446)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedResource.php
Sun Oct 24 17:58:49 2010 (r8447)
@@ -117,7 +117,11 @@
<?php echo $form->description->renderHelp() ?>
</td>
</tr><tr>
- <th style="width: 25%">
+ <th colspan="2" style="width: 50%">
+ <?php echo $form->dateDisplay
+ ->label(__('Date display†'))
+ ->renderLabel() ?>
+ </th><th style="width: 25%">
<?php echo $form->startDate
->label(__('Date†'))
->renderLabel() ?>
@@ -125,21 +129,17 @@
<?php echo $form->endDate
->label(__('End date†'))
->renderLabel() ?>
- </th><th colspan="2" style="width: 50%">
- <?php echo $form->dateDisplay
- ->label(__('Date display†'))
- ->renderLabel() ?>
</th>
</tr><tr>
- <td style="width: 25%">
+ <td colspan="2" style="width: 50%">
+ <?php echo $form->dateDisplay ?>
+ <?php echo $form->dateDisplay->renderHelp() ?>
+ </td><td style="width: 25%">
<?php echo $form->startDate ?>
<?php echo $form->startDate->renderHelp() ?>
</td><td style="width: 25%">
<?php echo $form->endDate ?>
<?php echo $form->endDate->renderHelp() ?>
- </td><td colspan="2" style="width: 50%">
- <?php echo $form->dateDisplay ?>
- <?php echo $form->dateDisplay->renderHelp() ?>
</td>
</tr><tr>
<td colspan="4">
--
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.com/group/qubit-commits?hl=en.
