Modified:
development/trunk/administrator/components/com_banners/views/banners/view.html.php
development/trunk/administrator/components/com_banners/views/clients/view.html.php
development/trunk/administrator/components/com_banners/views/tracks/view.html.php
development/trunk/administrator/components/com_categories/views/categories/view.html.php
development/trunk/administrator/components/com_contact/views/contacts/view.html.php
development/trunk/administrator/components/com_content/views/articles/view.html.php
development/trunk/administrator/components/com_content/views/featured/view.html.php
development/trunk/administrator/components/com_languages/views/languages/view.html.php
development/trunk/administrator/components/com_modules/views/modules/view.html.php
development/trunk/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php
development/trunk/administrator/components/com_redirect/views/links/view.html.php
development/trunk/administrator/components/com_templates/views/styles/view.html.php
development/trunk/administrator/components/com_templates/views/templates/view.html.php
development/trunk/administrator/components/com_users/views/groups/view.html.php
development/trunk/administrator/components/com_users/views/levels/view.html.php
development/trunk/administrator/components/com_users/views/users/view.html.php
development/trunk/administrator/components/com_weblinks/views/weblinks/view.html.php
development/trunk/installation/CHANGELOG
Log:
# [#22149] Tool bar clean up focused on users with delete only. Thanks Elin.
Modified: development/trunk/administrator/components/com_banners/views/banners/view.html.php
===================================================================
--- development/trunk/administrator/components/com_banners/views/banners/view.html.php 2010-09-02 05:16:04 UTC (rev 18758)
+++ development/trunk/administrator/components/com_banners/views/banners/view.html.php 2010-09-02 11:04:00 UTC (rev 18759)
@@ -85,14 +85,15 @@
}
if ($this->state->get('filter.state') == -2 && $canDo->get('core.delete')) {
JToolBarHelper::deleteList('', 'banners.delete','JTOOLBAR_EMPTY_TRASH');
+ JToolBarHelper::divider();
} else if ($canDo->get('core.edit.state')) {
JToolBarHelper::trash('banners.trash','JTOOLBAR_TRASH');
+ JToolBarHelper::divider();
}
if ($canDo->get('core.admin')) {
+ JToolBarHelper::preferences('com_banners');
JToolBarHelper::divider();
- JToolBarHelper::preferences('com_banners');
}
- JToolBarHelper::divider();
JToolBarHelper::help('JHELP_COMPONENTS_BANNERS_BANNERS');
}
}
Modified: development/trunk/administrator/components/com_banners/views/clients/view.html.php
===================================================================
--- development/trunk/administrator/components/com_banners/views/clients/view.html.php 2010-09-02 05:16:04 UTC (rev 18758)
+++ development/trunk/administrator/components/com_banners/views/clients/view.html.php 2010-09-02 11:04:00 UTC (rev 18759)
@@ -71,15 +71,17 @@
}
if ($this->state->get('filter.state') == -2 && $canDo->get('core.delete')) {
JToolBarHelper::deleteList('', 'clients.delete','JTOOLBAR_EMPTY_TRASH');
+ JToolBarHelper::divider();
} else if ($canDo->get('core.edit.state')) {
JToolBarHelper::trash('clients.trash','JTOOLBAR_TRASH');
+ JToolBarHelper::divider();
}
if ($canDo->get('core.admin')) {
+ JToolBarHelper::preferences('com_banners');
JToolBarHelper::divider();
- JToolBarHelper::preferences('com_banners');
}
- JToolBarHelper::divider();
+
JToolBarHelper::help('JHELP_COMPONENTS_BANNERS_CLIENTS');
}
}
Modified: development/trunk/administrator/components/com_banners/views/tracks/view.html.php
===================================================================
--- development/trunk/administrator/components/com_banners/views/tracks/view.html.php 2010-09-02 05:16:04 UTC (rev 18758)
+++ development/trunk/administrator/components/com_banners/views/tracks/view.html.php 2010-09-02 11:04:00 UTC (rev 18759)
@@ -57,18 +57,17 @@
JToolBarHelper::title(JText::_('COM_BANNERS_MANAGER_TRACKS'), 'banners-tracks.png');
$bar = JToolBar::getInstance('toolbar');
- $bar->appendButton('Popup', 'export', 'JTOOLBAR_EXPORT', 'index.php?option=com_banners&view=download&tmpl=component',600,250);
-
+ $bar->appendButton('Popup', 'export', 'JTOOLBAR_EXPORT', 'index.php?option=com_banners&view=download&tmpl=component',600,250);
$document = JFactory::getDocument();
$app = JFactory::getApplication();
if ($canDo->get('core.delete')) {
$bar->appendButton('Confirm','COM_BANNERS_DELETE_MSG', 'delete', 'COM_BANNERS_TRACKS_DELETE', 'tracks.delete',false);
+ JToolBarHelper::divider();
}
if ($canDo->get('core.admin')) {
- JToolBarHelper::divider();
JToolBarHelper::preferences('com_banners');
+ JToolBarHelper::divider();
}
- JToolBarHelper::divider();
JToolBarHelper::help('JHELP_COMPONENTS_BANNERS_TRACKS');
}
}
Modified: development/trunk/administrator/components/com_categories/views/categories/view.html.php
===================================================================
--- development/trunk/administrator/components/com_categories/views/categories/view.html.php 2010-09-02 05:16:04 UTC (rev 18758)
+++ development/trunk/administrator/components/com_categories/views/categories/view.html.php 2010-09-02 11:04:00 UTC (rev 18759)
@@ -90,17 +90,18 @@
}
if ($this->state->get('filter.published') == -2 && JFactory::getUser()->authorise('core.delete', 'com_content')) {
JToolBarHelper::deleteList('', 'categories.delete','JTOOLBAR_EMPTY_TRASH');
+ JToolBarHelper::divider();
} else {
if(JFactory::getUser()->authorise('core.edit.state')) {
JToolBarHelper::trash('categories.trash','JTOOLBAR_TRASH');
+ JToolBarHelper::divider();
}
}
-
- JToolBarHelper::divider();
if(JFactory::getUser()->authorise('core.edit.state')) {
JToolBarHelper::custom('categories.rebuild', 'refresh.png', 'refresh_f2.png', 'JTOOLBAR_REBUILD', false);
+ JToolBarHelper::divider();
}
- JToolBarHelper::divider();
+
JToolBarHelper::help('JHELP_COMPONENTS_'.strtoupper(substr($component,4)).'_CATEGORIES');
}
}
Modified: development/trunk/administrator/components/com_contact/views/contacts/view.html.php
===================================================================
--- development/trunk/administrator/components/com_contact/views/contacts/view.html.php 2010-09-02 05:16:04 UTC (rev 18758)
+++ development/trunk/administrator/components/com_contact/views/contacts/view.html.php 2010-09-02 11:04:00 UTC (rev 18759)
@@ -79,14 +79,17 @@
}
if ($this->state->get('filter.published') == -2 && $canDo->get('core.delete')) {
JToolBarHelper::deleteList('', 'contacts.delete','JTOOLBAR_EMPTY_TRASH');
+ JToolBarHelper::divider();
} else if ($canDo->get('core.edit.state')) {
JToolBarHelper::trash('contacts.trash','JTOOLBAR_TRASH');
+ JToolBarHelper::divider();
+ JToolBarHelper::divider();
}
if ($canDo->get('core.admin')) {
+
+ JToolBarHelper::preferences('com_contact');
JToolBarHelper::divider();
- JToolBarHelper::preferences('com_contact');
}
- JToolBarHelper::divider();
JToolBarHelper::help('JHELP_COMPONENTS_CONTACTS_CONTACTS');
}
}
Modified: development/trunk/administrator/components/com_content/views/articles/view.html.php
===================================================================
--- development/trunk/administrator/components/com_content/views/articles/view.html.php 2010-09-02 05:16:04 UTC (rev 18758)
+++ development/trunk/administrator/components/com_content/views/articles/view.html.php 2010-09-02 11:04:00 UTC (rev 18759)
@@ -66,21 +66,20 @@
JToolBarHelper::custom('articles.unpublish', 'unpublish.png', 'unpublish_f2.png', 'JTOOLBAR_UNPUBLISH', true);
JToolBarHelper::divider();
JToolBarHelper::archiveList('articles.archive','JTOOLBAR_ARCHIVE');
- }
- if ($canDo->get('core.edit.state')) {
JToolBarHelper::custom('articles.checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true);
}
if ($state->get('filter.published') == -2 && $canDo->get('core.delete')) {
JToolBarHelper::deleteList('', 'articles.delete','JTOOLBAR_EMPTY_TRASH');
+ JToolBarHelper::divider();
} else if ($canDo->get('core.edit.state')) {
JToolBarHelper::trash('articles.trash','JTOOLBAR_TRASH');
+ JToolBarHelper::divider();
}
if ($canDo->get('core.admin')) {
- JToolBarHelper::divider();
JToolBarHelper::preferences('com_content');
+ JToolBarHelper::divider();
}
- JToolBarHelper::divider();
JToolBarHelper::help('JHELP_CONTENT_ARTICLE_MANAGER');
}
}
Modified: development/trunk/administrator/components/com_content/views/featured/view.html.php
===================================================================
--- development/trunk/administrator/components/com_content/views/featured/view.html.php 2010-09-02 05:16:04 UTC (rev 18758)
+++ development/trunk/administrator/components/com_content/views/featured/view.html.php 2010-09-02 11:04:00 UTC (rev 18759)
@@ -46,6 +46,7 @@
*/
protected function addToolbar()
{
+ $state = $this->get('State');
$canDo = ContentHelper::getActions($this->state->get('filter.category_id'));
JToolBarHelper::title(JText::_('COM_CONTENT_FEATURED_TITLE'), 'featured.png');
@@ -56,23 +57,29 @@
if ($canDo->get('core.edit')) {
JToolBarHelper::custom('article.edit', 'edit.png', 'edit_f2.png','JTOOLBAR_EDIT', true);
}
- JToolBarHelper::divider();
+
if ($canDo->get('core.edit.state')) {
+ JToolBarHelper::divider();
JToolBarHelper::custom('articles.publish', 'publish.png', 'publish_f2.png','JTOOLBAR_PUBLISH', true);
JToolBarHelper::custom('articles.unpublish', 'unpublish.png', 'unpublish_f2.png','JTOOLBAR_UNPUBLISH', true);
JToolBarHelper::divider();
JToolBarHelper::archiveList('articles.archive','JTOOLBAR_ARCHIVE');
JToolBarHelper::custom('articles.checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true);
- }
- if ($canDo->get('core.edit.state')) {
JToolBarHelper::custom('featured.delete','remove.png','remove_f2.png','JTOOLBAR_REMOVE', true);
-
}
+
+ if ($state->get('filter.published') == -2 && $canDo->get('core.delete')) {
+ JToolBarHelper::deleteList('', 'articles.delete','JTOOLBAR_EMPTY_TRASH');
+ JToolBarHelper::divider();
+ } else if ($canDo->get('core.edit.state')) {
+ JToolBarHelper::divider();
+ JToolBarHelper::trash('articles.trash','JTOOLBAR_TRASH');
+ }
+
if ($canDo->get('core.admin')) {
+ JToolBarHelper::preferences('com_content');
JToolBarHelper::divider();
- JToolBarHelper::preferences('com_content');
}
- JToolBarHelper::divider();
JToolBarHelper::help('JHELP_CONTENT_FEATURED_ARTICLES');
}
}
Modified: development/trunk/administrator/components/com_languages/views/languages/view.html.php
===================================================================
--- development/trunk/administrator/components/com_languages/views/languages/view.html.php 2010-09-02 05:16:04 UTC (rev 18758)
+++ development/trunk/administrator/components/com_languages/views/languages/view.html.php 2010-09-02 11:04:00 UTC (rev 18759)
@@ -50,7 +50,6 @@
protected function addToolbar()
{
require_once JPATH_COMPONENT.'/helpers/languages.php';
-
$canDo = LanguagesHelper::getActions();
JToolBarHelper::title(JText::_('COM_MODULES_MANAGER_MODULES'), 'module.png');
@@ -67,13 +66,13 @@
}
if ($canDo->get('core.edit.state')) {
- if ($this->state->get('filter.state') != 2) {
+ if ($this->state->get('filter.published') != 2) {
JToolBarHelper::publishList('languages.publish','JTOOLBAR_PUBLISH');
JToolBarHelper::unpublishList('languages.unpublish','JTOOLBAR_UNPUBLISH');
}
}
- if ($this->state->get('filter.state') == -2 && $canDo->get('core.delete')) {
+ if ($this->state->get('filter.published') == -2 && $canDo->get('core.delete')) {
JToolBarHelper::deleteList('', 'languages.delete','JTOOLBAR_EMPTY_TRASH');
JToolBarHelper::divider();
} else if ($canDo->get('core.edit.state')) {
Modified: development/trunk/administrator/components/com_modules/views/modules/view.html.php
===================================================================
--- development/trunk/administrator/components/com_modules/views/modules/view.html.php 2010-09-02 05:16:04 UTC (rev 18758)
+++ development/trunk/administrator/components/com_modules/views/modules/view.html.php 2010-09-02 11:04:00 UTC (rev 18759)
@@ -78,16 +78,16 @@
if ($state->get('filter.state') == -2 && $canDo->get('core.delete')) {
JToolBarHelper::deleteList('', 'modules.delete','JTOOLBAR_EMPTY_TRASH');
+ JToolBarHelper::divider();
} else if ($canDo->get('core.edit.state')) {
JToolBarHelper::trash('modules.trash','JTOOLBAR_TRASH');
+ JToolBarHelper::divider();
}
if ($canDo->get('core.admin')) {
+ JToolBarHelper::preferences('com_modules');
JToolBarHelper::divider();
- JToolBarHelper::preferences('com_modules');
}
-
- JToolBarHelper::divider();
JToolBarHelper::help('JHELP_EXTENSIONS_MODULE_MANAGER');
}
}
Modified: development/trunk/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php
===================================================================
--- development/trunk/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php 2010-09-02 05:16:04 UTC (rev 18758)
+++ development/trunk/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php 2010-09-02 11:04:00 UTC (rev 18759)
@@ -67,16 +67,20 @@
JToolBarHelper::archiveList('newsfeeds.archive','JTOOLBAR_ARCHIVE');
JToolBarHelper::custom('newsfeeds.checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true);
}
+ if ($canDo->get('core.admin')) {
+ JToolBarHelper::custom('newsfeeds.checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true);
+ }
if ($state->get('filter.state') == -2 && $canDo->get('core.delete')) {
JToolBarHelper::deleteList('', 'newsfeeds.delete','JTOOLBAR_EMPTY_TRASH');
+ JToolBarHelper::divider();
} else if ($canDo->get('core.edit.state')) {
JToolBarHelper::trash('newsfeeds.trash','JTOOLBAR_TRASH');
+ JToolBarHelper::divider();
}
if ($canDo->get('core.admin')) {
+ JToolBarHelper::preferences('com_newsfeeds');
JToolBarHelper::divider();
- JToolBarHelper::preferences('com_newsfeeds');
}
- JToolBarHelper::divider();
JToolBarHelper::help('JHELP_COMPONENTS_NEWSFEEDS_FEEDS');
}
}
Modified: development/trunk/administrator/components/com_redirect/views/links/view.html.php
===================================================================
--- development/trunk/administrator/components/com_redirect/views/links/view.html.php 2010-09-02 05:16:04 UTC (rev 18758)
+++ development/trunk/administrator/components/com_redirect/views/links/view.html.php 2010-09-02 11:04:00 UTC (rev 18759)
@@ -83,12 +83,12 @@
JToolBarHelper::deleteList('', 'links.delete','JTOOLBAR_EMPTY_TRASH');
} else if ($canDo->get('core.edit.state')) {
JToolBarHelper::trash('links.trash','JTOOLBAR_TRASH');
+ JToolBarHelper::divider();
}
if ($canDo->get('core.admin')) {
+ JToolBarHelper::preferences('com_redirect');
JToolBarHelper::divider();
- JToolBarHelper::preferences('com_redirect');
}
- JToolBarHelper::divider();
JToolBarHelper::help('JHELP_COMPONENTS_REDIRECT_MANAGER');
}
}
Modified: development/trunk/administrator/components/com_templates/views/styles/view.html.php
===================================================================
--- development/trunk/administrator/components/com_templates/views/styles/view.html.php 2010-09-02 05:16:04 UTC (rev 18758)
+++ development/trunk/administrator/components/com_templates/views/styles/view.html.php 2010-09-02 11:04:00 UTC (rev 18759)
@@ -65,19 +65,18 @@
}
if ($canDo->get('core.create') && $isSite) {
JToolBarHelper::addNew('styles.duplicate', 'JTOOLBAR_DUPLICATE');
+ JToolBarHelper::divider();
}
if ($canDo->get('core.delete') && $isSite) {
- JToolBarHelper::divider();
JToolBarHelper::deleteList('', 'styles.delete','JTOOLBAR_DELETE');
+ JToolBarHelper::divider();
}
if ($canDo->get('core.admin')) {
- JToolBarHelper::divider();
JToolBarHelper::preferences('com_templates');
+ JToolBarHelper::divider();
}
-
- JToolBarHelper::divider();
JToolBarHelper::help('JHELP_EXTENSIONS_TEMPLATE_MANAGER_STYLES');
}
}
Modified: development/trunk/administrator/components/com_templates/views/templates/view.html.php
===================================================================
--- development/trunk/administrator/components/com_templates/views/templates/view.html.php 2010-09-02 05:16:04 UTC (rev 18758)
+++ development/trunk/administrator/components/com_templates/views/templates/view.html.php 2010-09-02 11:04:00 UTC (rev 18759)
@@ -76,9 +76,8 @@
JToolBarHelper::title(JText::_('COM_TEMPLATES_MANAGER_TEMPLATES'), 'thememanager');
if ($canDo->get('core.admin')) {
JToolBarHelper::preferences('com_templates');
+ JToolBarHelper::divider();
}
-
- JToolBarHelper::divider();
JToolBarHelper::help('JHELP_EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES');
}
}
Modified: development/trunk/administrator/components/com_users/views/groups/view.html.php
===================================================================
--- development/trunk/administrator/components/com_users/views/groups/view.html.php 2010-09-02 05:16:04 UTC (rev 18758)
+++ development/trunk/administrator/components/com_users/views/groups/view.html.php 2010-09-02 11:04:00 UTC (rev 18759)
@@ -58,18 +58,17 @@
}
if ($canDo->get('core.edit')) {
JToolBarHelper::custom('group.edit', 'edit.png', 'edit_f2.png','JTOOLBAR_EDIT', true);
+ JToolBarHelper::divider();
}
if ($canDo->get('core.delete')) {
- JToolBarHelper::divider();
JToolBarHelper::deleteList('', 'groups.delete','JTOOLBAR_DELETE');
+ JToolBarHelper::divider();
}
if ($canDo->get('core.admin')) {
- JToolBarHelper::divider();
JToolBarHelper::preferences('com_users');
+ JToolBarHelper::divider();
}
-
- JToolBarHelper::divider();
JToolBarHelper::help('JHELP_USERS_GROUPS');
}
}
Modified: development/trunk/administrator/components/com_users/views/levels/view.html.php
===================================================================
--- development/trunk/administrator/components/com_users/views/levels/view.html.php 2010-09-02 05:16:04 UTC (rev 18758)
+++ development/trunk/administrator/components/com_users/views/levels/view.html.php 2010-09-02 11:04:00 UTC (rev 18759)
@@ -57,20 +57,16 @@
}
if ($canDo->get('core.edit')) {
JToolBarHelper::custom('level.edit', 'edit.png', 'edit_f2.png','JTOOLBAR_EDIT', true);
+ JToolBarHelper::divider();
}
-
if ($canDo->get('core.delete')) {
- JToolBarHelper::divider();
JToolBarHelper::deleteList('', 'level.delete','JTOOLBAR_DELETE');
+ JToolBarHelper::divider();
}
-
-
if ($canDo->get('core.admin')) {
- JToolBarHelper::divider();
JToolBarHelper::preferences('com_users');
+ JToolBarHelper::divider();
}
-
- JToolBarHelper::divider();
JToolBarHelper::help('JHELP_USERS_ACCESS_LEVELS');
}
}
Modified: development/trunk/administrator/components/com_users/views/users/view.html.php
===================================================================
--- development/trunk/administrator/components/com_users/views/users/view.html.php 2010-09-02 05:16:04 UTC (rev 18758)
+++ development/trunk/administrator/components/com_users/views/users/view.html.php 2010-09-02 11:04:00 UTC (rev 18759)
@@ -65,19 +65,19 @@
JToolBarHelper::custom('users.activate', 'publish.png', 'publish_f2.png', 'COM_USERS_TOOLBAR_ACTIVATE', true);
JToolBarHelper::custom('users.block', 'unpublish.png', 'unpublish_f2.png', 'COM_USERS_TOOLBAR_BLOCK', true);
JToolBarHelper::custom('users.unblock', 'unblock.png', 'unblock_f2.png', 'COM_USERS_TOOLBAR_UNBLOCK', true);
+ JToolBarHelper::divider();
}
if ($canDo->get('core.delete')) {
+ JToolBarHelper::deleteList('', 'users.delete','JTOOLBAR_DELETE');
JToolBarHelper::divider();
- JToolBarHelper::deleteList('', 'users.delete','JTOOLBAR_DELETE');
}
if ($canDo->get('core.admin')) {
+ JToolBarHelper::preferences('com_users');
JToolBarHelper::divider();
- JToolBarHelper::preferences('com_users');
}
- JToolBarHelper::divider();
JToolBarHelper::help('JHELP_USERS_USER_MANAGER');
}
}
Modified: development/trunk/administrator/components/com_weblinks/views/weblinks/view.html.php
===================================================================
--- development/trunk/administrator/components/com_weblinks/views/weblinks/view.html.php 2010-09-02 05:16:04 UTC (rev 18758)
+++ development/trunk/administrator/components/com_weblinks/views/weblinks/view.html.php 2010-09-02 11:04:00 UTC (rev 18759)
@@ -74,14 +74,16 @@
}
if ($state->get('filter.state') == -2 && $canDo->get('core.delete')) {
JToolBarHelper::deleteList('', 'weblinks.delete','JTOOLBAR_EMPTY_TRASH');
+ JToolBarHelper::divider();
} else if ($canDo->get('core.edit.state')) {
JToolBarHelper::trash('weblinks.trash','JTOOLBAR_TRASH');
+ JToolBarHelper::divider();
}
if ($canDo->get('core.admin')) {
+ JToolBarHelper::preferences('com_weblinks');
JToolBarHelper::divider();
- JToolBarHelper::preferences('com_weblinks');
}
- JToolBarHelper::divider();
+
JToolBarHelper::help('JHELP_COMPONENTS_WEBLINKS_LINKS');
}
}
Modified: development/trunk/installation/CHANGELOG
===================================================================
--- development/trunk/installation/CHANGELOG 2010-09-02 05:16:04 UTC (rev 18758)
+++ development/trunk/installation/CHANGELOG 2010-09-02 11:04:00 UTC (rev 18759)
@@ -27,6 +27,9 @@
- -> Removed
! -> Note
+02-Sep-2010 Jean-Marie Simonet
+ # [#22149] Tool bar clean up focused on users with delete only. Thanks Elin.
+
02-Sep-2010 Andrew Eddie
# Fixed issue [#22210] module latest users (Bill Richardson).
# Fixed issue [#22211] module - latest news - typo error (Bill Richardson).
_______________________________________________
Joomla-commits mailing list
Joomla-...@joomlacode.org
http://joomlacode.org/mailman/listinfo/joomla-commits