Author: david
Date: Wed Sep 16 09:15:51 2009
New Revision: 3337

Log:
Standardize term edit and show buttons as per issue #917.

Modified:
   trunk/apps/qubit/modules/term/templates/editSuccess.php
   trunk/apps/qubit/modules/term/templates/showSuccess.php

Modified: trunk/apps/qubit/modules/term/templates/editSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/term/templates/editSuccess.php     Wed Sep 16 
09:09:05 2009        (r3336)
+++ trunk/apps/qubit/modules/term/templates/editSuccess.php     Wed Sep 16 
09:15:51 2009        (r3337)
@@ -140,14 +140,12 @@
 <!-- include empty div at bottom of form to bump the fixed button-block and 
allow user to scroll past it -->
 <div id="button-block-bump"></div>
 
-<div id="button-block">
-  <div class="menu-action">
+<ul class="actions">
   <?php if ($term->getId()): ?>
-    <?php echo link_to(__('cancel'), array('module' => 'term', 'action' => 
'show', 'id' => $term->id)) ?>
-    <?php echo submit_tag(__('save')) ?>
+    <li><?php echo link_to(__('Cancel'), array('module' => 'term', 'action' => 
'show', 'id' => $term->id)) ?></li>
+    <?php echo submit_tag(__('Save')) ?>
   <?php else: ?>
-    <?php echo link_to(__('cancel'), array('module' => 'term', 'action' => 
'list', 'taxonomyId' => $term->taxonomyId)) ?>
-    <?php echo submit_tag(__('create')) ?>
+    <li><?php echo link_to(__('Cancel'), array('module' => 'term', 'action' => 
'list', 'taxonomyId' => $term->taxonomyId)) ?></li>
+    <?php echo submit_tag(__('Create')) ?>
   <?php endif; ?>
-  </div>
-</form>
+</ul>

Modified: trunk/apps/qubit/modules/term/templates/showSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/term/templates/showSuccess.php     Wed Sep 16 
09:09:05 2009        (r3336)
+++ trunk/apps/qubit/modules/term/templates/showSuccess.php     Wed Sep 16 
09:15:51 2009        (r3337)
@@ -164,11 +164,13 @@
 <ul class="actions">
   <?php if (SecurityPriviliges::editCredentials($sf_user, 'term')): ?>
     <li><?php echo link_to(__('Add New'), array('module' => 'term', 'action' 
=> 'create', 'taxonomyId' => $term->getTaxonomy()->id)) ?></li>
-    <li><?php echo link_to (__('Edit'), array('module' => 'term', 'action' => 
'edit', 'id' => $term->id)) ?></li>
-
-    <?php if (!$term->isProtected()): ?>
+  <?php endif; ?>
+  
+  <?php if (!$term->isProtected()): ?>
     <li><?php echo link_to (__('Delete'), array('module' => 'term', 'action' 
=> 'delete', 'id' => $term->id), array('post' => true, 'confirm' => 
$deleteConfirm)) ?></li>
-    <?php endif; ?>
   <?php endif; ?>
-  <li><?php echo link_to(__('List'), array('module' => 'term', 'action' => 
'list', 'taxonomyId' => $term->taxonomyId)) ?></li>
+  
+  <?php if (SecurityPriviliges::editCredentials($sf_user, 'term')): ?>
+    <li><?php echo link_to (__('Edit'), array('module' => 'term', 'action' => 
'edit', 'id' => $term->id)) ?></li>
+  <?php endif; ?>
 </ul>

--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---

Reply via email to