Author: peter
Date: Tue Sep 22 14:53:30 2009
New Revision: 3469
Log:
make the action button block display and options consistent across all modules.
fixes issue #917
Modified:
trunk/apps/qubit/modules/actor/templates/showIsaarSuccess.php
trunk/apps/qubit/modules/menu/templates/editSuccess.php
trunk/apps/qubit/modules/menu/templates/listSuccess.php
trunk/apps/qubit/modules/oai/templates/harvesterListSuccess.php
trunk/apps/qubit/modules/repository/templates/showIsdiahSuccess.php
trunk/apps/qubit/modules/staticpage/templates/editSuccess.php
trunk/apps/qubit/modules/staticpage/templates/listSuccess.php
trunk/apps/qubit/modules/term/templates/listTaxonomySuccess.php
trunk/apps/qubit/modules/term/templates/showSuccess.php
trunk/apps/qubit/modules/user/templates/showSuccess.php
Modified: trunk/apps/qubit/modules/actor/templates/showIsaarSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/actor/templates/showIsaarSuccess.php Tue Sep
22 13:55:16 2009 (r3468)
+++ trunk/apps/qubit/modules/actor/templates/showIsaarSuccess.php Tue Sep
22 14:53:30 2009 (r3469)
@@ -214,10 +214,11 @@
<ul class="actions">
<?php if (SecurityPriviliges::editCredentials($sf_user, 'actor')): ?>
- <li><?php echo link_to(__('Delete'), array('module' => 'actor', 'action'
=> 'delete', 'id' => $actor->id), array('title' => __('Delete authority
record'))) ?></li>
- <?php endif; ?>
+ <li><?php echo link_to(__('Edit'), array('module' => 'actor', 'action' =>
'edit', 'id' => $actor->id), array('title' => __(''))) ?></li><?php endif; ?>
<?php if (SecurityPriviliges::editCredentials($sf_user, 'actor')): ?>
- <li><?php echo link_to(__('Edit'), array('module' => 'actor', 'action' =>
'edit', 'id' => $actor->id), array('title' => __('Edit authority record')))
?></li>
- <?php endif; ?>
- <li><?php echo link_to(__('List'), array('module' => 'actor', 'action' =>
'list')) ?></li>
+ <li><?php echo link_to(__('Delete'), array('module' => 'actor', 'action'
=> 'delete', 'id' => $actor->id), array('title' => __(''))) ?></li><?php endif;
?>
+ <br /><div class="menu-extra">
+ <?php if (SecurityPriviliges::editCredentials($sf_user, 'actor')): ?>
+ <li><?php echo link_to(__('Add new'), array('module' => 'actor', 'action'
=> 'create'), array('title' => __(''))) ?></li><?php endif; ?>
+ <li><?php echo link_to(__('List all'), array('module' => 'actor', 'action'
=> 'list'), array('title' => __(''))) ?></li>
</ul>
Modified: trunk/apps/qubit/modules/menu/templates/editSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/menu/templates/editSuccess.php Tue Sep 22
13:55:16 2009 (r3468)
+++ trunk/apps/qubit/modules/menu/templates/editSuccess.php Tue Sep 22
14:53:30 2009 (r3469)
@@ -108,16 +108,11 @@
<div id="button-block">
<div class="menu-action">
+ <?php echo link_to(__('cancel'), 'menu/list?page='.$page) ?>
<?php if (!$menu->isProtected()): ?>
- <?php echo link_to(__('delete'), 'menu/delete?id='.$menu->getId(),
'post=true&confirm='.__('this action will delete this menu and all it\'s
descendants. Are you sure?')) ?>
+ <?php echo link_to(__('delete'), 'menu/delete?id='.$menu->getId(),
'post=true&confirm='.__('this action will delete this menu and all it\'s
descendants. Are you sure?')) ?>
<?php endif; ?>
- <?php echo link_to(__('cancel'), 'menu/list?page='.$page) ?>
<?php echo submit_tag(__('save')) ?>
</div>
-
- <div class="menu-extra">
- <?php echo link_to(__('add new'), 'menu/create'); ?>
- <?php echo link_to(__('list all'), 'menu/list?page='.$page); ?>
- </div>
</div>
-</form>
\ No newline at end of file
+</form>
Modified: trunk/apps/qubit/modules/menu/templates/listSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/menu/templates/listSuccess.php Tue Sep 22
13:55:16 2009 (r3468)
+++ trunk/apps/qubit/modules/menu/templates/listSuccess.php Tue Sep 22
14:53:30 2009 (r3469)
@@ -39,6 +39,3 @@
<?php endforeach; ?>
</tbody>
</table>
-<div class="menu-action" style="padding-top: 10px;">
-<?php echo link_to (__('add new menu'), 'menu/create') ?>
-</div>
\ No newline at end of file
Modified: trunk/apps/qubit/modules/oai/templates/harvesterListSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/oai/templates/harvesterListSuccess.php Tue Sep
22 13:55:16 2009 (r3468)
+++ trunk/apps/qubit/modules/oai/templates/harvesterListSuccess.php Tue Sep
22 14:53:30 2009 (r3469)
@@ -50,7 +50,7 @@
<td> </td>
<td>
<div style="float: right; margin: 3px 8px 0 0;">
- <?php echo submit_tag(__('Add')) ?>
+ <?php echo submit_tag(__('Save')) ?>
</div>
</td>
</tr>
Modified: trunk/apps/qubit/modules/repository/templates/showIsdiahSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/repository/templates/showIsdiahSuccess.php Tue Sep
22 13:55:16 2009 (r3468)
+++ trunk/apps/qubit/modules/repository/templates/showIsdiahSuccess.php Tue Sep
22 14:53:30 2009 (r3469)
@@ -259,10 +259,12 @@
<ul class="actions">
<?php if (SecurityPriviliges::editCredentials($sf_user, 'repository')): ?>
- <li><?php echo link_to(__('Delete'), array('module' => 'repository',
'action' => 'delete', 'id' => $repository->id), array('title' => __('Delete
repository'))) ?></li>
- <?php endif; ?>
+ <li><?php echo link_to(__('Edit'), array('module' => 'repository',
'action' => 'edit', 'id' => $repository->id), array('title' => __('')))
?></li><?php endif; ?>
<?php if (SecurityPriviliges::editCredentials($sf_user, 'repository')): ?>
- <li><?php echo link_to(__('Edit'), array('module' => 'repository',
'action' => 'edit', 'id' => $repository->id), array('title' => __('Edit
repository'))) ?></li>
- <?php endif; ?>
- <li><?php echo link_to(__('List'), array('module' => 'repository', 'action'
=> 'list')) ?></li>
+ <li><?php echo link_to(__('Delete'), array('module' => 'repository',
'action' => 'delete', 'id' => $repository->id), array('title' => __('')))
?></li><?php endif; ?>
+ <br /><div class="menu-extra">
+ <?php if (SecurityPriviliges::editCredentials($sf_user, 'repository')): ?>
+ <li><?php echo link_to(__('Add new'), array('module' => 'repository',
'action' => 'create'), array('title' => __(''))) ?></li><?php endif; ?>
+ <li><?php echo link_to(__('List all'), array('module' => 'repository',
'action' => 'list')) ?></li>
+ </div>
</ul>
Modified: trunk/apps/qubit/modules/staticpage/templates/editSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/staticpage/templates/editSuccess.php Tue Sep
22 13:55:16 2009 (r3468)
+++ trunk/apps/qubit/modules/staticpage/templates/editSuccess.php Tue Sep
22 14:53:30 2009 (r3469)
@@ -39,23 +39,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" style="height: 8em;">
+<div id="button-block">
<div class="menu-action">
+ <?php echo link_to(__('Cancel'), 'staticpage/list') ?>
<?php if ($staticPage->getId()): ?>
-  <?php echo link_to(__('delete'),
'staticpage/delete?id='.$staticPage->getId(), 'post=true&confirm='.__('are you
sure?')) ?>
-  <?php echo link_to(__('cancel'), 'staticpage/list') ?>
+ <?php echo submit_tag(__('Save')) ?>
<?php else: ?>
-  <?php echo link_to(__('cancel'), 'staticpage/list') ?>
+ <?php echo submit_tag(__('Create')) ?>
<?php endif; ?>
- <?php if ($staticPage->getId()): ?>
- <?php echo submit_tag(__('save')) ?>
- <?php else: ?>
- <?php echo submit_tag(__('create')) ?>
- <?php endif; ?>
-</div>
-
-<div class="menu-extra" style="padding-top: 5px;">
-<?php echo link_to(__('add new static page'), 'staticpage/create') ?>
</div>
</div>
Modified: trunk/apps/qubit/modules/staticpage/templates/listSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/staticpage/templates/listSuccess.php Tue Sep
22 13:55:16 2009 (r3468)
+++ trunk/apps/qubit/modules/staticpage/templates/listSuccess.php Tue Sep
22 14:53:30 2009 (r3469)
@@ -3,21 +3,18 @@
<table class="list">
<thead>
<tr>
- <th><?php echo __('title'); ?></th>
+ <th><?php echo __('title'); ?>
+ <span class="th-link"><?php echo link_to(__('add new'), array('module' =>
'staticpage', 'action' => 'create')); ?></span>
+ </th>
<th><?php echo __('permalink'); ?></th>
</tr>
</thead>
<tbody>
<?php foreach ($staticPages as $staticPage): ?>
<tr>
- <td><?php echo link_to($staticPage->getTitle(array('cultureFallback' =>
'true')), 'staticpage/edit?id='.$staticPage->getId()) ?>
- </td>
+ <td><?php echo link_to($staticPage->getTitle(array('cultureFallback' =>
'true')), 'staticpage/edit?id='.$staticPage->getId()) ?></td>
<td><?php echo link_to($staticPage->getPermalink(), array('module' =>
'staticpage', 'action' => 'static', 'permalink' =>
$staticPage->getPermalink())) ?>
</tr>
<?php endforeach; ?>
</tbody>
</table>
-
-<div class="menu-action" style="padding-top: 10px;">
-<?php echo link_to(__('add new static page'), 'staticpage/create') ?>
-</div>
Modified: trunk/apps/qubit/modules/term/templates/listTaxonomySuccess.php
==============================================================================
--- trunk/apps/qubit/modules/term/templates/listTaxonomySuccess.php Tue Sep
22 13:55:16 2009 (r3468)
+++ trunk/apps/qubit/modules/term/templates/listTaxonomySuccess.php Tue Sep
22 14:53:30 2009 (r3469)
@@ -72,7 +72,8 @@
<?php if ($editCredentials): ?>
<div style="height: 40px"><!-- Make room to scroll past floating menu --></div>
<ul class="actions">
- <li><?php echo link_to(__('Add new'),
'term/create?taxonomyId='.$taxonomy->getId()) ?>
+ <br /><div class="menu-extra">
<li><?php echo link_to(__('List all taxonomies'), 'term/list') ?>
+ </div>
</ul>
<?php endif; ?>
Modified: trunk/apps/qubit/modules/term/templates/showSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/term/templates/showSuccess.php Tue Sep 22
13:55:16 2009 (r3468)
+++ trunk/apps/qubit/modules/term/templates/showSuccess.php Tue Sep 22
14:53:30 2009 (r3469)
@@ -163,14 +163,15 @@
<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 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; ?>
-
+ <br /><div class="menu-extra">
<?php if (SecurityPriviliges::editCredentials($sf_user, 'term')): ?>
- <li><?php echo link_to (__('Edit'), array('module' => 'term', 'action' =>
'edit', 'id' => $term->id)) ?></li>
- <?php endif; ?>
+ <li><?php echo link_to(__('Add New'), array('module' => 'term', 'action'
=> 'create', 'taxonomyId' => $term->getTaxonomy()->id)) ?></li><?php endif; ?>
+ <li><?php echo link_to(__('List all'), array('module' => 'term', 'action' =>
'list', 'taxonomyId' => $term->getTaxonomy()->id)) ?></li>
+ </div>
+
</ul>
Modified: trunk/apps/qubit/modules/user/templates/showSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/user/templates/showSuccess.php Tue Sep 22
13:55:16 2009 (r3468)
+++ trunk/apps/qubit/modules/user/templates/showSuccess.php Tue Sep 22
14:53:30 2009 (r3469)
@@ -46,15 +46,17 @@
<div id="button-block-bump"></div>
<ul class="actions">
- <?php if (QubitAcl::check($user, QubitAclAction::CREATE_ID)): ?>
- <li><?php echo link_to (__('Add'), array('module' => 'user', 'action' =>
'create')) ?></li>
+ <?php if (QubitAcl::check($user, QubitAclAction::UPDATE_ID)): ?>
+ <li><?php echo link_to (__('Edit'), array('module' => 'user', 'action' =>
'edit', 'id' => $user->id)) ?></li>
<?php endif; ?>
<?php if (QubitAcl::check($user, QubitAclAction::DELETE_ID)): ?>
<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 (QubitAcl::check($user, QubitAclAction::UPDATE_ID)): ?>
- <li><?php echo link_to (__('Edit'), array('module' => 'user', 'action' =>
'edit', 'id' => $user->id)) ?></li>
+ <br /><div class="menu-extra">
+ <?php if (QubitAcl::check($user, QubitAclAction::CREATE_ID)): ?>
+ <li><?php echo link_to (__('Add new'), array('module' => 'user', 'action'
=> 'create')) ?></li>
<?php endif; ?>
- <li><?php echo link_to(__('List'), array('module' => 'user', 'action' =>
'list')) ?></li>
+ <li><?php echo link_to(__('List all'), array('module' => 'user', 'action' =>
'list')) ?></li>
+ </div>
</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
-~----------~----~----~----~------~----~------~--~---
