Author: david
Date: Tue Sep 15 16:58:45 2009
New Revision: 3329

Log:
Standardize user buttons as per issue #917.

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

Modified: trunk/apps/qubit/modules/user/templates/editSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/user/templates/editSuccess.php     Tue Sep 15 
16:42:33 2009        (r3328)
+++ trunk/apps/qubit/modules/user/templates/editSuccess.php     Tue Sep 15 
16:58:45 2009        (r3329)
@@ -124,16 +124,14 @@
 <!-- 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">
+    <li><?php echo link_to(__('cancel'), array('module' => 'user', 'action' => 
'show', 'id' => $user->getId())) ?></li>
+
     <?php if ($user->getId()): ?>
-      <?php echo submit_tag(__('save')) ?>
+      <li><?php echo submit_tag(__('Save')) ?></li>
     <?php else: ?>
-      <?php echo submit_tag(__('create')) ?>
+      <li><?php echo submit_tag(__('Create')) ?></li>
     <?php endif; ?>
-
-    <?php echo link_to(__('cancel'), array('module' => 'user', 'action' => 
'show', 'id' => $user->getId())) ?>
-  </div>
-</div>
+</ul>
 
 </form>

Modified: trunk/apps/qubit/modules/user/templates/showSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/user/templates/showSuccess.php     Tue Sep 15 
16:42:33 2009        (r3328)
+++ trunk/apps/qubit/modules/user/templates/showSuccess.php     Tue Sep 15 
16:58:45 2009        (r3329)
@@ -36,14 +36,19 @@
 </tbody>
 </table>
 
+<!-- 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>
+
 <ul class="actions">
   <?php if (SecurityCheck::HasPermission($sf_user, array('module' => 'user', 
'action' => 'edit'))): ?>
-    <li><?php echo link_to (__('edit'), array('module' => 'user', 'action' => 
'edit', 'id' => $user->id)) ?></li>
-
-    <?php if (SecurityCheck::HasPermission($sf_user, array('module' => 'user', 
'action' => 'delete'))): ?>
-    <li><?php echo link_to (__('delete'), array('module' => 'user', 'action' 
=> 'delete', 'id' => $user->id),
-      array('post' => true, 'confirm' => 'are you sure?')) ?></li>
-    <?php endif; ?>
+    <li><?php echo link_to (__('Add'), array('module' => 'user', 'action' => 
'create')) ?></li>
+  <?php endif; ?>
+  <?php if (SecurityCheck::HasPermission($sf_user, array('module' => 'user', 
'action' => 'delete'))): ?>
+    <li><?php echo link_to (__('Delete'), array('module' => 'user', 'action' 
=> 'delete', 'id' => $user->id),
+          array('post' => true, 'confirm' => 'are you sure?')) ?></li>
+  <?php endif; ?>
+  <?php if (SecurityCheck::HasPermission($sf_user, array('module' => 'user', 
'action' => 'edit'))): ?>
+    <li><?php echo link_to (__('Edit'), array('module' => 'user', 'action' => 
'edit', 'id' => $user->id)) ?></li>
   <?php endif; ?>
-  <li><?php echo link_to(__('list'), array('module' => 'user', 'action' => 
'list')) ?></li>
+  <li><?php echo link_to(__('List'), array('module' => 'user', 'action' => 
'list')) ?></li>
 </ul>
\ 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
-~----------~----~----~----~------~----~------~--~---

Reply via email to