Author: sevein
Date: Mon Jul 23 21:02:55 2012
New Revision: 11962
Log:
Add visibility settings page and fixtures
Modified:
trunk/apps/qubit/modules/settings/actions/visibleElementsAction.class.php
trunk/apps/qubit/modules/settings/templates/visibleElementsSuccess.php
trunk/data/fixtures/menus.yml
trunk/data/fixtures/settings.yml
Modified:
trunk/apps/qubit/modules/settings/actions/visibleElementsAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/settings/actions/visibleElementsAction.class.php
Mon Jul 23 20:59:02 2012 (r11961)
+++ trunk/apps/qubit/modules/settings/actions/visibleElementsAction.class.php
Mon Jul 23 21:02:55 2012 (r11962)
@@ -28,41 +28,23 @@
class SettingsVisibleElementsAction extends sfAction
{
- public static
- $NAMES = array(
- 'visibilityImmediateSource',
- 'visibilityAppraisalDestruction',
- 'visibilityNotes',
- 'visibilityPhysicalCondition',
- 'visibilityGeneralNote',
- 'visibilityConservation',
- 'visibilityPhysicalCondition',
- 'visibilityDescriptionIdentifier',
- 'visibilityInstitutionIdentifier',
- 'visibilityRulesConventions',
- 'visibilityStatus',
- 'visibilityLevelOfDetail',
- 'visibilityDateRevisiondeletion',
- 'visibilityLanguage',
- 'visibilityScript',
- 'visibilitySources',
- 'visibilityUrl',
- 'visibilityFilename',
- 'visibilityMediaType',
- 'visibilityMimeType',
- 'visibilityFilesize',
- 'visibilityUploaded',
- 'visibilityPhysicalStorage'
- );
+ protected function addField(QubitSetting $setting)
+ {
+ $name = $setting->name;
+
+ $this->form->setDefault($name, (bool)
$setting->getValue(array('sourceCulture' => true)));
+ $this->form->setValidator($name, new sfValidatorBoolean);
+ $this->form->setWidget($name, new sfWidgetFormInputCheckbox);
+ }
protected function processForm()
{
foreach ($this->form as $field)
{
- if (isset($this->request[$field->getName()]))
- {
- $this->processField($field);
- }
+ // We do not check if the field is isset() in the request object
+ // because checkboxes won't be sent by the browser when they
+ // are not selected
+ $this->processField($field);
}
}
@@ -70,13 +52,20 @@
{
$name = $field->getName();
- if (null == $setting = QubitSetting::getSettingByName($name))
+ // Search by name and scope (='element_visibility')
+ // Create if it does not exist
+ if (null === $setting = QubitSetting::getByNameAndScope($name,
'element_visibility'))
{
$setting = new QubitSetting;
- $setting->deleteable = false;
+ $setting->name = $name;
+ $setting->scope = 'element_visibility';
+ $setting->culture = 'en';
}
- $setting->setValue($this->form->getValue($name),
array('sourceCulture'=>true));
+ // It may be better to use $this->form->getValue($name)
+ $value = isset($this->request[$name]) ? 1 : 0;
+
+ $setting->setValue($value, array('sourceCulture' => true));
$setting->save();
}
@@ -85,15 +74,10 @@
{
$this->form = new sfForm;
- $this->initializeDefaultPageElementsForm();
-
- $this->initializeDefaultPageElementsForm1();
-
- $this->initializeDefaultPageElementsForm2();
-
- $this->initializeDefaultPageElementsForm3();
-
- $this->initializeDefaultPageElementsForm4();
+ foreach (QubitSetting::getByScope('element_visibility') as $item)
+ {
+ $this->addField($item);
+ }
if ($request->isMethod('post'))
{
@@ -102,296 +86,4 @@
$this->redirect('settings/visibleElements');
}
}
-
- protected function initializeDefaultPageElementsForm()
- {
- $this->defaultPageElementsForm = new sfForm;
- $this->defaultPageElementsForm->setWidgets(array(
- 'visibilityDescriptionIdentifier' => new sfWidgetFormInputCheckbox,
- 'institutionIdentifier' => new sfWidgetFormInputCheckbox,
- 'rulesConventions' => new sfWidgetFormInputCheckbox,
- 'status' => new sfWidgetFormInputCheckbox,
- 'levelOfdetail' => new sfWidgetFormInputCheckbox,
- 'dateRevisiondeletion' => new sfWidgetFormInputCheckbox,
- 'language' => new sfWidgetFormInputCheckbox,
- 'script' => new sfWidgetFormInputCheckbox,
- 'sources' => new sfWidgetFormInputCheckbox));
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'VisibilityDescriptionIdentifier');
-
- if (1 == count($descriptionIdentifierQuery = QubitSetting::get($criteria)))
- {
- $descriptionIdentifierSetting = $descriptionIdentifierQuery[0];
-
$this->defaultPageElementsForm->setDefault('VisibilityDescriptionIdentifier',
$descriptionIdentifierSetting->__get('value', array('sourceCulture' => true)));
- }
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'institutionIdentifier');
-
- if (1 == count($institutionIdentifierQuery = QubitSetting::get($criteria)))
- {
- $institutionIdentifierSetting = $institutionIdentifierQuery[0];
- $this->defaultPageElementsForm->setDefault('institutionIdentifier',
$institutionIdentifierSetting->__get('value', array('sourceCulture' => true)));
- }
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'rulesConventions');
-
- if (1 == count($rulesConventionsQuery = QubitSetting::get($criteria)))
- {
- $rulesConventionsSetting = $rulesConventionsQuery[0];
- $this->defaultPageElementsForm->setDefault('rulesConventions',
$rulesConventionsSetting->__get('value', array('sourceCulture' => true)));
- }
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'status');
-
- if (1 == count($statusQuery = QubitSetting::get($criteria)))
- {
- $statusSetting = $statusQuery[0];
- $this->defaultPageElementsForm->setDefault('status',
$statusSetting->__get('value', array('sourceCulture' => true)));
- }
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'levelOfdetail');
-
- if (1 == count($levelOfdetailQuery = QubitSetting::get($criteria)))
- {
- $levelOfdetailSetting = $levelOfdetailQuery[0];
- $this->defaultPageElementsForm->setDefault('levelOfdetail',
$levelOfdetailSetting->__get('value', array('sourceCulture' => true)));
- }
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'dateRevisiondeletion');
-
- if (1 == count($dateRevisiondeletionQuery = QubitSetting::get($criteria)))
- {
- $dateRevisiondeletionSetting = $dateRevisiondeletionQuery[0];
- $this->defaultPageElementsForm->setDefault('dateRevisiondeletion',
$dateRevisiondeletionSetting->__get('value', array('sourceCulture' => true)));
- }
-
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'language');
-
- if (1 == count($languageQuery = QubitSetting::get($criteria)))
- {
- $languageSetting = $languageQuery[0];
- $this->defaultPageElementsForm->setDefault('language',
$languageSetting->__get('value', array('sourceCulture' => true)));
- }
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'script');
-
- if (1 == count($scriptQuery = QubitSetting::get($criteria)))
- {
- $scriptSetting = $scriptQuery[0];
- $this->defaultPageElementsForm->setDefault('script',
$scriptSetting->__get('value', array('sourceCulture' => true)));
- }
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'sources');
-
- if (1 == count($sourcesQuery = QubitSetting::get($criteria)))
- {
- $sourcesSetting = $sourcesQuery[0];
- $this->defaultPageElementsForm->setDefault('sources',
$sourcesSetting->__get('value', array('sourceCulture' => true)));
- }
-
-
- return $this;
- }
-
- protected function initializeDefaultPageElementsForm1()
- {
- $this->defaultPageElementsForm1 = new sfForm;
- $this->defaultPageElementsForm1->setWidgets(array(
- 'url' => new sfWidgetFormInputCheckbox,
- 'filename' => new sfWidgetFormInputCheckbox,
- 'mediatypes' => new sfWidgetFormInputCheckbox,
- 'mimetype' => new sfWidgetFormInputCheckbox,
- 'filesize' => new sfWidgetFormInputCheckbox,
- 'uploaded' => new sfWidgetFormInputCheckbox));
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'url');
-
- if (1 == count($urlQuery = QubitSetting::get($criteria)))
- {
- $urlSetting = $urlQuery[0];
- $this->defaultPageElementsForm1->setDefault('url',
$urlSetting->__get('value', array('sourceCulture' => true)));
- }
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'filename');
-
- if (1 == count($filenameQuery = QubitSetting::get($criteria)))
- {
- $filenameSetting = $filenameQuery[0];
- $this->defaultPageElementsForm1->setDefault('filename',
$filenameSetting->__get('value', array('sourceCulture' => true)));
- }
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'mediatypes');
-
- if (1 == count($mediatypesQuery = QubitSetting::get($criteria)))
- {
- $mediatypesSetting = $mediatypesQuery[0];
- $this->defaultPageElementsForm1->setDefault('mediatypes',
$mediatypesSetting->__get('value', array('sourceCulture' => true)));
- }
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'mimetype');
-
- if (1 == count($mimetypeQuery = QubitSetting::get($criteria)))
- {
- $mimetypeSetting = $mimetypeQuery[0];
- $this->defaultPageElementsForm1->setDefault('mimetype',
$mimetypeSetting->__get('value', array('sourceCulture' => true)));
- }
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'filesize');
-
- if (1 == count($filesizeQuery = QubitSetting::get($criteria)))
- {
- $filesizeSetting = $filesizeQuery[0];
- $this->defaultPageElementsForm1->setDefault('filesize',
$filesizeSetting->__get('value', array('sourceCulture' => true)));
- }
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'uploaded');
-
- if (1 == count($uploadedQuery = QubitSetting::get($criteria)))
- {
- $uploadedSetting = $uploadedQuery[0];
- $this->defaultPageElementsForm1->setDefault('uploaded',
$uploadedSetting->__get('value', array('sourceCulture' => true)));
- }
- return $this;
- }
-
- protected function initializeDefaultPageElementsForm2()
- {
- $this->defaultPageElementsForm2 = new sfForm;
- $this->defaultPageElementsForm2->setWidgets(array(
- 'ImmediateSource' => new sfWidgetFormInputCheckbox,
- 'AppraisalDestruction' => new sfWidgetFormInputCheckbox,
- 'PhysicalCondition' => new sfWidgetFormInputCheckbox,
- 'HideNotes' => new sfWidgetFormInputCheckbox));
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'ImmediateSource');
-
- if (1 == count($ImmediateSourceQuery = QubitSetting::get($criteria)))
- {
- $ImmediateSourceSetting = $ImmediateSourceQuery[0];
- $this->defaultPageElementsForm2->setDefault('ImmediateSource',
$ImmediateSourceSetting->__get('value', array('sourceCulture' => true)));
- }
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'AppraisalDestruction');
-
- if (1 == count($AppraisalDestructionQuery = QubitSetting::get($criteria)))
- {
- $AppraisalDestructionSetting = $AppraisalDestructionQuery[0];
- $this->defaultPageElementsForm2->setDefault('AppraisalDestruction',
$AppraisalDestructionSetting->__get('value', array('sourceCulture' => true)));
- }
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'HideNotes');
-
- if (1 == count($HideNotesQuery = QubitSetting::get($criteria)))
- {
- $HideNotesSetting = $HideNotesQuery[0];
- $this->defaultPageElementsForm2->setDefault('HideNotes',
$HideNotesSetting->__get('value', array('sourceCulture' => true)));
- }
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'PhysicalCondition');
-
- if (1 == count($PhysicalConditionQuery = QubitSetting::get($criteria)))
- {
- $PhysicalConditionSetting = $PhysicalConditionQuery[0];
- $this->defaultPageElementsForm2->setDefault('PhysicalCondition',
$PhysicalConditionSetting->__get('value', array('sourceCulture' => true)));
- }
- return $this;
- }
-
-
- protected function initializeDefaultPageElementsForm3()
- {
- $this->defaultPageElementsForm3 = new sfForm;
- $this->defaultPageElementsForm3->setWidgets(array(
- 'GeneralNote' => new sfWidgetFormInputCheckbox,
- 'PhysicalCondition' => new sfWidgetFormInputCheckbox,
- 'ImmediateSource' => new sfWidgetFormInputCheckbox,
- 'physicalstorage' => new sfWidgetFormInputCheckbox,
- 'Conservation' => new sfWidgetFormInputCheckbox));
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'GeneralNote');
-
- if (1 == count($GeneralNoteQuery = QubitSetting::get($criteria)))
- {
- $GeneralNoteSetting = $GeneralNoteQuery[0];
- $this->defaultPageElementsForm3->setDefault('GeneralNote',
$GeneralNoteSetting->__get('value', array('sourceCulture' => true)));
- }
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'Conservation');
-
- if (1 == count($ConservationQuery = QubitSetting::get($criteria)))
- {
- $ConservationSetting = $ConservationQuery[0];
- $this->defaultPageElementsForm3->setDefault('Conservation',
$ConservationSetting->__get('value', array('sourceCulture' => true)));
- }
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'PhysicalCondition');
-
- if (1 == count($PhysicalConditionQuery = QubitSetting::get($criteria)))
- {
- $PhysicalConditionSetting = $PhysicalConditionQuery[0];
- $this->defaultPageElementsForm3->setDefault('PhysicalCondition',
$PhysicalConditionSetting->__get('value', array('sourceCulture' => true)));
- }
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'ImmediateSource');
-
- if (1 == count($ImmediateSourceQuery = QubitSetting::get($criteria)))
- {
- $ImmediateSourceSetting = $ImmediateSourceQuery[0];
- $this->defaultPageElementsForm3->setDefault('ImmediateSource',
$ImmediateSourceSetting->__get('value', array('sourceCulture' => true)));
- }
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'physicalstorage');
-
- if (1 == count($physicalstorageQuery = QubitSetting::get($criteria)))
- {
- $physicalstorageSetting = $physicalstorageQuery[0];
- $this->defaultPageElementsForm3->setDefault('physicalstorage',
$physicalstorageSetting->__get('value', array('sourceCulture' => true)));
- }
-
- return $this;
- }
-
- protected function initializeDefaultPageElementsForm4()
- {
- $this->defaultPageElementsForm4 = new sfForm;
- $this->defaultPageElementsForm4->setWidgets(array(
- 'physicalstorage' => new sfWidgetFormInputCheckbox));
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'physicalstorage');
-
- if (1 == count($physicalstorageQuery = QubitSetting::get($criteria)))
- {
- $physicalstorageSetting = $physicalstorageQuery[0];
- $this->defaultPageElementsForm4->setDefault('physicalstorage',
$physicalstorageSetting->__get('value', array('sourceCulture' => true)));
- }
-
- return $this;
- }
-
-} // End class
+}
Modified: trunk/apps/qubit/modules/settings/templates/visibleElementsSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/settings/templates/visibleElementsSuccess.php
Mon Jul 23 20:59:02 2012 (r11961)
+++ trunk/apps/qubit/modules/settings/templates/visibleElementsSuccess.php
Mon Jul 23 21:02:55 2012 (r11962)
@@ -1,259 +1,104 @@
-<h1><?php echo __('Visible elements'); ?></h1>
+<style type="text/css">
-<fieldset class="collapsible collapsed">
- <legend><?php echo __('ISAD template') ?></legend>
- <form action="<?php echo url_for('fieldoptionsnew/list') ?>" method="post">
- <?php echo $defaultPageElementsForm2->renderGlobalErrors() ?>
- <div class="description">
- <p>
- <?php echo __('Enable or disable the display of certain descriptive
elements to public users. Unless they have been overridden by a specific theme,
these settings will be used site wide.') ?>
- </p>
- </div>
- <table class="list">
+ .form-item label { display: inline; }
- <thead>
- <tr>
- <th><?php echo __('Name')?></th>
- <th><?php echo __('Value')?></th>
- </tr>
- </thead>
-
- <tbody>
- <tr>
- <td width="80%"><?php echo
$defaultPageElementsForm2->ImmediateSource->label('Immediate source of
acquisition or transfer')->renderLabel() ?></td>
- <td width="20%"><?php echo
$defaultPageElementsForm2->ImmediateSource ?></td>
- </tr>
- <tr>
- <td width="80%"><?php echo
$defaultPageElementsForm2->AppraisalDestruction->label('Appraisal, destruction
and scheduling information')->renderLabel() ?></td>
- <td width="20%"><?php echo
$defaultPageElementsForm2->AppraisalDestruction ?></td>
- </tr>
- <tr>
- <td width="80%"><?php echo
$defaultPageElementsForm2->HideNotes->label('Notes')->renderLabel() ?></td>
- <td width="20%"><?php echo
$defaultPageElementsForm2->HideNotes?></td>
- </tr>
- <tr>
- <td width="80%"><?php echo
$defaultPageElementsForm2->PhysicalCondition->label('Physical characteristics
and technical requirements')->renderLabel() ?></td>
- <td width="20%"><?php echo
$defaultPageElementsForm2->PhysicalCondition?></td>
- </tr>
- <tr>
- <td width="80%"> </td>
- <td width="20%">
- <div style="float: right; margin: 3px 8px 0 0;">
- <input class="form-submit" type="submit" name="isad"
value="<?php echo __('Save') ?>"/>
- </div>
- </td>
- </tr>
- </tbody>
- </table>
- </form>
-</fieldset>
-
-<fieldset class="collapsible collapsed">
- <legend><?php echo __('RAD template') ?></legend>
- <form action="<?php echo url_for('fieldoptionsnew/list') ?>" method="post">
- <?php echo $defaultPageElementsForm3->renderGlobalErrors() ?>
- <div class="description">
- <p>
- <?php echo __('Enable or disable the display of certain descriptive
elements to unauthenticated users. Unless they have been overridden by a
specific theme, these settings will be used site wide.') ?>
- </p>
- </div>
- <table class="list">
+</style>
- <thead>
- <tr>
- <th><?php echo __('Name')?></th>
- <th><?php echo __('Value')?></th>
- </tr>
- </thead>
-
- <tbody>
- <tr>
- <td width="80%"><?php echo
$defaultPageElementsForm3->GeneralNote->label('General note')->renderLabel()
?></td>
- <td width="20%"><?php echo $defaultPageElementsForm3->GeneralNote
?></td>
- </tr>
- <tr>
- <td width="80%"><?php echo
$defaultPageElementsForm3->Conservation->label('Conservation')->renderLabel()
?></td>
- <td width="20%"><?php echo $defaultPageElementsForm3->Conservation
?></td>
- </tr>
- <tr>
- <td width="80%"><?php echo
$defaultPageElementsForm3->PhysicalCondition->label('Physical
condition')->renderLabel() ?></td>
- <td width="20%"><?php echo
$defaultPageElementsForm3->PhysicalCondition ?></td>
- </tr>
- <tr>
- <td width="80%"><?php echo
$defaultPageElementsForm3->ImmediateSource->label('Immediate source of
acquisition')->renderLabel() ?></td>
- <td width="20%"><?php echo
$defaultPageElementsForm3->ImmediateSource ?></td>
- </tr>
- <tr>
- <td width="80%"> </td>
- <td width="20%">
- <div style="float: right; margin: 3px 8px 0 0;">
- <input class="form-submit" type="submit" name="othernote"
value="<?php echo __('Save') ?>"/>
- </div>
- </td>
- </tr>
- </tbody>
- </table>
- </form>
-</fieldset>
-
-<fieldset class="collapsible collapsed">
- <legend><?php echo __('Control area') ?></legend>
- <form action="<?php echo url_for('fieldoptionsnew/list') ?>" method="post">
- <?php echo $defaultPageElementsForm->renderGlobalErrors() ?>
- <div class="description">
- <p>
- <?php echo __('Enable or disable the display of certain descriptive
elements to unauthenticated users. Unless they have been overridden by a
specific theme, these settings will be used site wide.') ?>
- </p>
- </div>
- <table class="list">
+<h1><?php echo __('Hide descriptive elements') ?></h1>
+
+<?php echo $form->renderFormTag(url_for(array('module' => 'settings', 'action'
=> 'visibleElements')), array('method' => 'post')) ?>
+
+ <fieldset class="collapsible collapsed">
+
+ <legend><?php echo __('ISAD template') ?></legend>
+
+ <?php foreach (array(
+ 'isad_immediate_source' => __('Immediate source of acquisition or
transfer'),
+ 'isad_appraisal_destruction' => __('Appraisal, destruction and
scheduling information'),
+ 'isad_notes' => __('Notes'),
+ 'isad_physical_condition' => __('Physical characteristics and technical
requirements')) as $key => $value): ?>
+
+ <div class="form-item">
+ <?php echo $form[$key] ?>
+ <?php echo $form[$key]
+ ->label($value)
+ ->renderLabel() ?>
+ </div>
+
+ <?php endforeach; ?>
+
+ </fieldset>
+
+ <fieldset class="collapsible collapsed">
+
+ <legend><?php echo __('RAD template') ?></legend>
+
+ <?php foreach (array(
+ 'rad_general_note' => __('General note'),
+ 'rad_conservation' => __('Conservation'),
+ 'rad_physical_condition' => __('Physical condition'),
+ 'rad_immediate_source' => __('Immediate source of acquisition')) as $key
=> $value): ?>
+
+ <div class="form-item">
+ <?php echo $form[$key] ?>
+ <?php echo $form[$key]
+ ->label($value)
+ ->renderLabel() ?>
+ </div>
+
+ <?php endforeach; ?>
- <thead>
- <tr>
- <th><?php echo __('Name')?></th>
- <th><?php echo __('Value')?></th>
- </tr>
- </thead>
-
- <tbody>
- <tr>
- <td width="80%"><?php echo
$defaultPageElementsForm->descriptionIdentifier->label('Description
identifier')->renderLabel() ?></td>
- <td width="20%"><?php echo
$defaultPageElementsForm->descriptionIdentifier ?></td>
- </tr>
- <tr>
- <td width="80%"><?php echo
$defaultPageElementsForm->institutionIdentifier->label('Institution
identifier')->renderLabel() ?></td>
- <td width="20%"><?php echo
$defaultPageElementsForm->institutionIdentifier ?></td>
- </tr>
- <tr>
- <td width="80%"><?php echo
$defaultPageElementsForm->rulesConventions->label('Rules or
conventions')->renderLabel() ?></td>
- <td width="20%"><?php echo
$defaultPageElementsForm->rulesConventions ?></td>
- </tr>
- <tr>
- <td width="80%"><?php echo
$defaultPageElementsForm->status->label('Status')->renderLabel() ?></td>
- <td width="20%"><?php echo $defaultPageElementsForm->status ?></td>
- </tr>
- <tr>
- <td width="80%"><?php echo
$defaultPageElementsForm->levelOfdetail->label('Level of
detail')->renderLabel() ?></td>
- <td width="20%"><?php echo $defaultPageElementsForm->levelOfdetail
?></td>
- </tr>
- <tr>
- <td width="80%"><?php echo
$defaultPageElementsForm->dateRevisiondeletion->label('Dates of creation,
revision and deletion')->renderLabel() ?></td>
- <td width="20%"><?php echo
$defaultPageElementsForm->dateRevisiondeletion ?></td>
- </tr>
- <tr>
- <td width="80%"><?php echo
$defaultPageElementsForm->language->label('Language')->renderLabel() ?></td>
- <td width="20%"><?php echo $defaultPageElementsForm->language ?></td>
- </tr>
- <tr>
- <td width="80%"><?php echo
$defaultPageElementsForm->script->label('Script')->renderLabel() ?></td>
- <td width="20%"><?php echo $defaultPageElementsForm->script ?></td>
- </tr>
- <tr>
- <td width="80%"><?php echo
$defaultPageElementsForm->sources->label('Sources')->renderLabel() ?></td>
- <td width="20%"><?php echo $defaultPageElementsForm->sources ?></td>
- </tr>
-
- <tr>
- <td width="80%"> </td>
- <td width="20%">
- <div style="float: right; margin: 3px 8px 0 0;">
- <input class="form-submit" type="submit" name="rads"
value="<?php echo __('Save') ?>"/>
- </div>
- </td>
- </tr>
- </tbody>
- </table>
- </form>
-</fieldset>
-
-<fieldset class="collapsible collapsed">
- <legend><?php echo __('Digital object metadata') ?></legend>
- <form action="<?php echo url_for('fieldoptionsnew/list') ?>" method="post">
- <?php echo $defaultPageElementsForm1->renderGlobalErrors() ?>
- <div class="description">
- <p>
- <?php echo __('Enable or disable the display of certain descriptive
elements to unauthenticated users. Unless they have been overridden by a
specific theme, these settings will be used site wide.') ?>
- </p>
+ </fieldset>
+
+ <fieldset class="collapsible collapsed">
+
+ <legend><?php echo __('Digital object metadata area') ?></legend>
+
+ <?php foreach (array(
+ 'digital_object_url' => __('URL'),
+ 'digital_object_file_name' => __('File name'),
+ 'digital_object_media_type' => __('Media type'),
+ 'digital_object_mime_type' => __('MIME type'),
+ 'digital_object_file_size' => __('File size'),
+ 'digital_object_uploaded' => __('Uploaded')) as $key => $value): ?>
+
+ <div class="form-item">
+ <?php echo $form[$key] ?>
+ <?php echo $form[$key]
+ ->label($value)
+ ->renderLabel() ?>
+ </div>
+
+ <?php endforeach; ?>
+
+ </fieldset>
+
+ <fieldset class="collapsible collapsed">
+
+ <legend><?php echo __('Physical storage') ?></legend>
+
+ <div class="form-item">
+ <?php echo $form['physical_storage'] ?>
+ <?php echo $form['physical_storage']
+ ->label('Physical storage')
+ ->renderLabel() ?>
</div>
- <table class="list">
- <thead>
- <tr>
- <th><?php echo __('Name')?></th>
- <th><?php echo __('Value')?></th>
- </tr>
-
- </thead>
-
- <tbody>
- <tr>
- <td width="80%"><?php echo
$defaultPageElementsForm1->url->label('URL')->renderLabel() ?></td>
- <td width="20%"><?php echo $defaultPageElementsForm1->url ?></td>
- </tr>
- <tr>
- <td width="80%"><?php echo
$defaultPageElementsForm1->filename->label('File name')->renderLabel() ?></td>
- <td width="20%"><?php echo $defaultPageElementsForm1->filename
?></td>
- </tr>
- <tr>
- <td width="80%"><?php echo
$defaultPageElementsForm1->mediatypes->label('Media Type')->renderLabel()
?></td>
- <td width="20%"><?php echo
$defaultPageElementsForm1->mediatypes?></td>
- </tr>
- <tr>
- <td width="80%"><?php echo
$defaultPageElementsForm1->mimetype->label('Mime Type')->renderLabel() ?></td>
- <td width="20%"><?php echo $defaultPageElementsForm1->mimetype
?></td>
- </tr>
- <tr>
- <td width="80%"><?php echo
$defaultPageElementsForm1->filesize->label('File Size')->renderLabel() ?></td>
- <td width="20%"><?php echo $defaultPageElementsForm1->filesize
?></td>
- </tr>
- <tr>
- <td width="80%"><?php echo
$defaultPageElementsForm1->uploaded->label('Uploaded')->renderLabel() ?></td>
- <td width="20%"><?php echo $defaultPageElementsForm1->uploaded
?></td>
- </tr>
-
- <tr>
- <td width="80%"> </td>
- <td width="20%">
- <div style="float: right; margin: 3px 8px 0 0;">
- <input class="form-submit" type="submit" name="digitalobject"
value="<?php echo __('Save') ?>"/>
- </div>
- </td>
- </tr>
- </tbody>
- </table>
- </form>
-</fieldset>
-
-<fieldset class="collapsible collapsed">
- <legend><?php echo __('Physical storage') ?></legend>
- <form action="<?php echo url_for('fieldoptionsnew/list') ?>" method="post">
- <?php echo $defaultPageElementsForm4->renderGlobalErrors() ?>
- <div class="description">
- <p>
- <?php echo __('Enable or disable the display of certain descriptive
elements to unauthenticated users. Unless they have been overridden by a
specific theme, these settings will be used site wide.') ?>
- </p>
+ </fieldset>
+
+ <div class="actions section">
+
+ <h2 class="element-invisible"><?php echo __('Actions') ?></h2>
+
+ <div class="content">
+ <ul class="clearfix links">
+
+ <li><?php echo link_to(__('Cancel'), '@homepage') ?></li>
+ <li><input class="form-submit" type="submit" value="<?php echo
__('Save') ?>"/></li>
+
+ </ul>
</div>
- <table class="list">
- <thead>
- <tr>
- <th><?php echo __('Name')?></th>
- <th><?php echo __('Value')?></th>
- </tr>
- </thead>
-
- <tbody>
- <tr>
- <td width="80%"><?php echo
$defaultPageElementsForm4->physicalstorage->label('Physical
storage')->renderLabel() ?></td>
- <td width="20%"><?php echo
$defaultPageElementsForm4->physicalstorage ?></td>
- </tr>
- <td width="80%"> </td>
- <td width="20%">
- <div style="float: right; margin: 3px 8px 0 0;">
- <input class="form-submit" type="submit" name="storage"
value="<?php echo __('Save') ?>"/>
- </div>
- </td>
- </tr>
- </tbody>
- </table>
- </form>
-</fieldset>
+ </div>
+
+</form>
Modified: trunk/data/fixtures/menus.yml
==============================================================================
--- trunk/data/fixtures/menus.yml Mon Jul 23 20:59:02 2012 (r11961)
+++ trunk/data/fixtures/menus.yml Mon Jul 23 21:02:55 2012 (r11962)
@@ -594,5 +594,5 @@
source_culture: en
name: visibleElements
label:
- en: 'Visible Elements'
+ en: 'Visible elements'
path: settings/visibleElements
Modified: trunk/data/fixtures/settings.yml
==============================================================================
--- trunk/data/fixtures/settings.yml Mon Jul 23 20:59:02 2012 (r11961)
+++ trunk/data/fixtures/settings.yml Mon Jul 23 21:02:55 2012 (r11962)
@@ -342,7 +342,6 @@
editable: 1
deleteable: 0
value: 1
- # Visible elements
toggleDescription:
name: toggleDescription
value: 1
@@ -389,72 +388,63 @@
QubitSetting_limitAdminIp:
name: limit_admin_ip
value: ''
- Qubit_Settings_visibleElements_ImmediateSource:
- name: visibilityImmediateSource
- value: 1
- Qubit_Settings_visibleElements_AppraisalDestruction:
- name: visibilityAppraisalDestruction
- value: 1
- Qubit_Settings_visibleElements_Notes:
- name: visibilityNotes
- value: 1
- Qubit_Settings_visibleElements_PhysicalCondition:
- name: visibilityPhysicalCondition
- value: 1
- Qubit_Settings_visibleElements_GeneralNote:
- name: visibilityGeneralNote
- value: 1
- Qubit_Settings_visibleElements_Conservation:
- name: visibilityConservation
- value: 1
- Qubit_Settings_visibleElements_PhysicalCondition:
- name: visibilityPhysicalCondition
- value: 1
- Qubit_Settings_visibleElements_descriptionIdentifier:
- name: visibilityDescriptionIdentifier
- value: 1
- Qubit_Settings_visibleElements_institutionIdentifier:
- name: visibilityInstitutionIdentifier
- value: 1
- Qubit_Settings_visibleElements_rulesConventions:
- name: visibilityRulesConventions
- value: 1
- Qubit_Settings_visibleElements_status:
- name: visibilityStatus
- value: 1
- Qubit_Settings_visibleElements_levelOfdetail:
- name: visibilityLevelOfDetail
- value: 1
- Qubit_Settings_visibleElements_dateRevisiondeletion:
- name: visibilityDateRevisiondeletion
- value: 1
- Qubit_Settings_visibleElements_language:
- name: visibilityLanguage
- value: 1
- Qubit_Settings_visibleElements_script:
- name: visibilityScript
- value: 1
- Qubit_Settings_visibleElements_sources:
- name: visibilitySources
- value: 1
- Qubit_Settings_visibleElements_url:
- name: visibilityUrl
- value: 1
- Qubit_Settings_visibleElements_filename:
- name: visibilityFilename
- value: 1
- Qubit_Settings_visibleElements_mediatype:
- name: visibilityMediaType
- value: 1
- Qubit_Settings_visibleElements_mimetype:
- name: visibilityMimeType
- value: 1
- Qubit_Settings_visibleElements_filesize:
- name: visibilityFilesize
- value: 1
- Qubit_Settings_visibleElements_uploaded:
- name: visibilityUploaded
- value: 1
- Qubit_Settings_visibleElements_physicalstorage:
- name: visibilityPhysicalStorage
+ Qubit_Settings_visibleElements_IsadImmediateSource:
+ name: isad_immediate_source
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_IsadAppraisalDestruction:
+ name: isad_appraisal_destruction
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_IsadNotes:
+ name: isad_notes
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_IsadPhysicalCondition:
+ name: isad_physical_condition
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_RadGeneralNote:
+ name: rad_general_note
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_RadConservation:
+ name: rad_conservation
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_RadPhysicalCondition:
+ name: rad_physical_condition
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_RadImmediateSource:
+ name: rad_immediate_source
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_digitalObjectUrl:
+ name: digital_object_url
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_digitalObjectFileName:
+ name: digital_object_file_name
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_digitalObjectMediaType:
+ name: digital_object_media_type
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_digitalObjectMimeType:
+ name: digital_object_mime_type
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_digitalObjectFilesize:
+ name: digital_object_file_size
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_digitalObjectUploaded:
+ name: digital_object_uploaded
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_physicalStorage:
+ name: physical_storage
+ scope: element_visibility
value: 1
--
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.
