Author: jablko
Date: Wed Sep 16 14:43:45 2009
New Revision: 3352
Log:
Rollback commit 2969, drop edit section links from show ISAD page, hyperlink
section headings instead
Modified:
trunk/apps/qubit/modules/informationobject/templates/showIsadSuccess.php
trunk/plugins/qbAclPlugin/data/fixtures/fixtures.yml (props changed)
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editAction.class.php
(props changed)
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/listAction.class.php
(props changed)
trunk/plugins/qbAclPlugin/modules/aclGroup/templates/editSuccess.php
(props changed)
trunk/plugins/qbAclPlugin/modules/aclGroup/templates/listSuccess.php
(props changed)
trunk/web/css/graphic.css
Modified:
trunk/apps/qubit/modules/informationobject/templates/showIsadSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/templates/showIsadSuccess.php
Wed Sep 16 14:28:42 2009 (r3351)
+++ trunk/apps/qubit/modules/informationobject/templates/showIsadSuccess.php
Wed Sep 16 14:43:45 2009 (r3352)
@@ -37,10 +37,7 @@
|| 0 < strlen($informationObject->getLevelOfDescriptionId())
|| 0 < strlen($informationObject->getExtentAndMedium(array('cultureFallback'
=> true)))): ?>
<tr id="identityArea"><td colspan="2" class="subHeaderCell">
- <?php echo __('identity area') ?>
- <?php if (SecurityPriviliges::editCredentials($sf_user,
'informationObject')): ?>
- <?php echo link_to('Edit', array('module' => 'informationobject', 'action'
=> 'edit', 'id' => $informationObject->id), array('anchor' => 'identityArea'))
?>
- <?php endif; ?>
+ <?php echo link_to_if(SecurityPriviliges::editCredentials($sf_user,
'informationObject'), __('identity area'), array('module' =>
'informationobject', 'action' => 'edit', 'id' => $informationObject->id),
array('anchor' => 'identityArea', 'title' => __('Edit identity area'))) ?>
</td></tr>
<?php endif; ?>
@@ -98,10 +95,7 @@
|| 0 < strlen($informationObject->getArchivalHistory(array('cultureFallback'
=> true)))
|| 0 < strlen($informationObject->getAcquisition(array('cultureFallback' =>
true)))): ?>
<tr id="contextArea"><td colspan="2" class="subHeaderCell">
- <?php echo __('context area') ?>
- <?php if (SecurityPriviliges::editCredentials($sf_user,
'informationObject')): ?>
- <?php echo link_to('Edit', array('module' => 'informationobject', 'action'
=> 'edit', 'id' => $informationObject->id), array('anchor' => 'contextArea')) ?>
- <?php endif; ?>
+ <?php echo link_to_if(SecurityPriviliges::editCredentials($sf_user,
'informationObject'), __('context area'), array('module' =>
'informationobject', 'action' => 'edit', 'id' => $informationObject->id),
array('anchor' => 'contextArea', 'title' => __('Edit context area'))) ?>
</td></tr>
<?php endif; ?>
@@ -160,10 +154,7 @@
|| 0 < strlen($informationObject->getAccruals(array('cultureFallback' =>
true)))
|| 0 < strlen($informationObject->getArrangement(array('cultureFallback' =>
true)))): ?>
<tr id="contentAndStructureArea"><td colspan="2" class="subHeaderCell">
- <?php echo __('content and structure area') ?>
- <?php if (SecurityPriviliges::editCredentials($sf_user,
'informationObject')): ?>
- <?php echo link_to('Edit', array('module' => 'informationobject', 'action'
=> 'edit', 'id' => $informationObject->id), array('anchor' =>
'contentAndStructureArea')) ?>
- <?php endif; ?>
+ <?php echo link_to_if(SecurityPriviliges::editCredentials($sf_user,
'informationObject'), __('content and structure area'), array('module' =>
'informationobject', 'action' => 'edit', 'id' => $informationObject->id),
array('anchor' => 'contentAndStructureArea', 'title' => __('Edit content and
structure area'))) ?>
</td></tr>
<?php endif; ?>
@@ -206,10 +197,7 @@
|| 0 <
strlen($informationObject->getPhysicalCharacteristics(array('cultureFallback'
=> true)))
|| 0 < strlen($informationObject->getFindingAids(array('cultureFallback' =>
true)))): ?>
<tr id="conditionsOfAccessAndUseArea"><td colspan="2" class="subHeaderCell">
- <?php echo __('conditions of access and use area') ?>
- <?php if (SecurityPriviliges::editCredentials($sf_user,
'informationObject')): ?>
- <?php echo link_to('Edit', array('module' => 'informationobject', 'action'
=> 'edit', 'id' => $informationObject->id), array('anchor' =>
'conditionsOfAccessAndUseArea')) ?>
- <?php endif; ?>
+ <?php echo link_to_if(SecurityPriviliges::editCredentials($sf_user,
'informationObject'), __('conditions of access and use area'), array('module'
=> 'informationobject', 'action' => 'edit', 'id' => $informationObject->id),
array('anchor' => 'conditionsOfAccessAndUseArea', 'title' => __('Edit
conditions of access and use area'))) ?>
</td></tr>
<?php endif; ?>
@@ -278,10 +266,7 @@
|| 0 <
strlen($informationObject->getRelatedUnitsOfDescription(array('cultureFallback'
=> true)))
|| 0 < count($publicationNotes)): ?>
<tr id="alliedMaterialsArea"><td colspan="2" class="subHeaderCell">
- <?php echo __('allied materials area') ?>
- <?php if (SecurityPriviliges::editCredentials($sf_user,
'informationObject')): ?>
- <?php echo link_to('Edit', array('module' => 'informationobject', 'action'
=> 'edit', 'id' => $informationObject->id), array('anchor' =>
'alliedMaterialsArea')) ?>
- <?php endif; ?>
+ <?php echo link_to_if(SecurityPriviliges::editCredentials($sf_user,
'informationObject'), __('allied materials area'), array('module' =>
'informationobject', 'action' => 'edit', 'id' => $informationObject->id),
array('anchor' => 'alliedMaterialsArea', 'title' => __('Edit alied materials
area'))) ?>
</td></tr>
<?php endif; ?>
@@ -322,10 +307,7 @@
<?php if (0 < count($notes)): ?>
<tr id="notesArea"><td colspan="2" class="subHeaderCell">
- <?php echo __('notes area') ?>
- <?php if (SecurityPriviliges::editCredentials($sf_user,
'informationObject')): ?>
- <?php echo link_to('Edit', array('module' => 'informationobject', 'action'
=> 'edit', 'id' => $informationObject->id), array('anchor' => 'notesArea')) ?>
- <?php endif; ?>
+ <?php echo link_to_if(SecurityPriviliges::editCredentials($sf_user,
'informationObject'), __('notes area'), array('module' => 'informationobject',
'action' => 'edit', 'id' => $informationObject->id), array('anchor' =>
'notesArea', 'title' => __('Edit notes area'))) ?>
</td></tr>
<?php foreach ($notes as $note): ?>
@@ -407,10 +389,7 @@
|| 0 < count($informationObject->scriptOfDescription)
|| 0 < strlen($informationObject->getSources(array('cultureFallback' =>
true)))): ?>
<tr id="descriptionControlArea"><td colspan="2" class="subHeaderCell">
- <?php echo __('description control area') ?>
- <?php if (SecurityPriviliges::editCredentials($sf_user,
'informationObject')): ?>
- <?php echo link_to('Edit', array('module' => 'informationobject', 'action'
=> 'edit', 'id' => $informationObject->id), array('anchor' =>
'descriptionControlArea')) ?>
- <?php endif; ?>
+ <?php echo link_to_if(SecurityPriviliges::editCredentials($sf_user,
'informationObject'), __('description control area'), array('module' =>
'informationobject', 'action' => 'edit', 'id' => $informationObject->id),
array('anchor' => 'descriptionControlArea', 'title' => __('Edit description
control area'))) ?>
</td></tr>
<?php endif; ?>
Modified: trunk/web/css/graphic.css
==============================================================================
--- trunk/web/css/graphic.css Wed Sep 16 14:28:42 2009 (r3351)
+++ trunk/web/css/graphic.css Wed Sep 16 14:43:45 2009 (r3352)
@@ -445,11 +445,6 @@
color: #999999;
}
-.subHeaderCell a
-{
- float: right;
-}
-
table.detail td ul {
padding: 0 16px;
margin: 0;
@@ -981,4 +976,4 @@
bottom: 7px;
right: 10px;
z-index: 90;
-}
+}
\ No newline at end of file
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
