[Joomla-commits] r18740 - in development/branches/jcamp/administrator: components/com_admin/views/help/tmpl components/com_admin/views/sysinfo/tmpl components/com_banners components/com_banners/models/forms components/com_banners/views/banner components/com_banners/views/banner/tmpl components/com_banners/views/banners components/com_banners/views/banners/tmpl components/com_banners/views/client components/com_banners/views/client/tmpl components/com_banners/views/clients components/com_banners/views/clients/tmpl components/com_banners/views/tracks/tmpl components/com_categories components/com_categories/helpers components/com_categories/models components/com_categories/views/categories components/com_categories/views/categories/tmpl components/com_categories/views/category/tmpl components/com_config/controllers components/com_config/models/forms components/com_config/views/application/tmpl components/com_contact components/com_contact/models/forms components/com_contact/views/contact components/com_contact/views/contact/tmpl components/com_contact/views/contacts components/com_contact/views/contacts/tmpl components/com_content components/com_content/controllers components/com_content/models components/com_content/models/fields/modal components/com_content/models/forms components/com_content/views/article components/com_content/views/article/tmpl components/com_content/views/articles components/com_content/views/articles/tmpl components/com_content/views/featured components/com_content/views/featured/tmpl components/com_installer components/com_installer/helpers components/com_installer/models/fields components/com_installer/models/forms components/com_installer/views/discover/tmpl components/com_installer/views/install/tmpl components/com_installer/views/manage components/com_installer/views/manage/tmpl components/com_installer/views/update/tmpl components/com_installer/views/warnings/tmpl components/com_languages components/com_languages/helpers components/com_languages/views/installed components/com_languages! /views/installed/tmpl components/com_languages/views/language components/com_languages/views/language/tmpl components/com_languages/views/languages components/com_languages/views/languages/tmpl components/com_menus components/com_menus/controllers components/com_m
3den...@jcode001.directrouter.com
Date: 2010-08-31 14:21:09 -0500 (Tue, 31 Aug 2010)
New Revision: 18740
Modified:
development/branches/jcamp/administrator/components/com_admin/views/help/tmpl/default.php
development/branches/jcamp/administrator/components/com_admin/views/sysinfo/tmpl/default.php
development/branches/jcamp/administrator/components/com_banners/config.xml
development/branches/jcamp/administrator/components/com_banners/controller.php
development/branches/jcamp/administrator/components/com_banners/models/forms/client.xml
development/branches/jcamp/administrator/components/com_banners/views/banner/tmpl/edit.php
development/branches/jcamp/administrator/components/com_banners/views/banner/view.html.php
development/branches/jcamp/administrator/components/com_banners/views/banners/tmpl/default.php
development/branches/jcamp/administrator/components/com_banners/views/banners/view.html.php
development/branches/jcamp/administrator/components/com_banners/views/client/tmpl/edit.php
development/branches/jcamp/administrator/components/com_banners/views/client/view.html.php
development/branches/jcamp/administrator/components/com_banners/views/clients/tmpl/default.php
development/branches/jcamp/administrator/components/com_banners/views/clients/view.html.php
development/branches/jcamp/administrator/components/com_banners/views/tracks/tmpl/default.php
development/branches/jcamp/administrator/components/com_categories/controller.php
development/branches/jcamp/administrator/components/com_categories/helpers/categories.php
development/branches/jcamp/administrator/components/com_categories/models/categories.php
development/branches/jcamp/administrator/components/com_categories/models/category.php
development/branches/jcamp/administrator/components/com_categories/views/categories/tmpl/default.php
development/branches/jcamp/administrator/components/com_categories/views/categories/view.html.php
development/branches/jcamp/administrator/components/com_categories/views/category/tmpl/edit.php
development/branches/jcamp/administrator/components/com_config/controllers/component.php
development/branches/jcamp/administrator/components/com_config/models/forms/application.xml
development/branches/jcamp/administrator/components/com_config/views/application/tmpl/default_ftplogin.php
development/branches/jcamp/administrator/components/com_contact/controller.php
development/branches/jcamp/administrator/components/com_contact/models/forms/contact.xml
development/branches/jcamp/administrator/components/com_contact/views/contact/tmpl/edit.php
development/branches/jcamp/administrator/components/com_contact/views/contact/view.html.php
development/branches/jcamp/administrator/components/com_contact/views/contacts/tmpl/default.php
development/branches/jcamp/administrator/components/com_contact/views/contacts/tmpl/modal.php
development/branches/jcamp/administrator/components/com_contact/views/contacts/view.html.php
development/branches/jcamp/administrator/components/com_content/config.xml
development/branches/jcamp/administrator/components/com_content/controller.php
development/branches/jcamp/administrator/components/com_content/controllers/article.php
development/branches/jcamp/administrator/components/com_content/models/article.php
development/branches/jcamp/administrator/components/com_content/models/fields/modal/article.php
development/branches/jcamp/administrator/components/com_content/models/forms/article.xml
development/branches/jcamp/administrator/components/com_content/views/article/tmpl/edit.php
development/branches/jcamp/administrator/components/com_content/views/article/tmpl/pagebreak.php
development/branches/jcamp/administrator/components/com_content/views/article/view.html.php
development/branches/jcamp/administrator/components/com_content/views/articles/tmpl/default.php
development/branches/jcamp/administrator/components/com_content/views/articles/tmpl/modal.php
development/branches/jcamp/administrator/components/com_content/views/articles/view.html.php
development/branches/jcamp/administrator/components/com_content/views/featured/tmpl/default.php
development/branches/jcamp/administrator/components/com_content/views/featured/view.html.php
development/branches/jcamp/administrator/components/com_installer/config.xml
development/branches/jcamp/administrator/components/com_installer/controller.php
development/branches/jcamp/administrator/components/com_installer/helpers/installer.php
development/branches/jcamp/administrator/components/com_installer/models/fields/type.php
development/branches/jcamp/administrator/components/com_installer/models/forms/manage.xml
development/branches/jcamp/administrator/components/com_installer/views/discover/tmpl/default.php
development/branches/jcamp/administrator/components/com_installer/views/install/tmpl/default_form.php
development/branches/jcamp/administrator/components/com_installer/views/manage/tmpl/default.php
development/branches/jcamp/administrator/components/com_installer/views/manage/view.html.php
development/branches/jcamp/administrator/components/com_installer/views/update/tmpl/default.php
development/branches/jcamp/administrator/components/com_installer/views/warnings/tmpl/default.php
development/branches/jcamp/administrator/components/com_languages/controller.php
development/branches/jcamp/administrator/components/com_languages/helpers/languages.php
development/branches/jcamp/administrator/components/com_languages/views/installed/tmpl/default.php
development/branches/jcamp/administrator/components/com_languages/views/installed/view.html.php
development/branches/jcamp/administrator/components/com_languages/views/language/tmpl/edit.php
development/branches/jcamp/administrator/components/com_languages/views/language/view.html.php
development/branches/jcamp/administrator/components/com_languages/views/languages/tmpl/default.php
development/branches/jcamp/administrator/components/com_languages/views/languages/view.html.php
development/branches/jcamp/administrator/components/com_menus/controller.php
development/branches/jcamp/administrator/components/com_menus/controllers/item.php
development/branches/jcamp/administrator/components/com_menus/helpers/menus.php
development/branches/jcamp/administrator/components/com_menus/models/fields/menutype.php
development/branches/jcamp/administrator/components/com_menus/models/item.php
development/branches/jcamp/administrator/components/com_menus/models/menu.php
development/branches/jcamp/administrator/components/com_menus/views/item/tmpl/edit.php
development/branches/jcamp/administrator/components/com_menus/views/item/view.html.php
development/branches/jcamp/administrator/components/com_menus/views/items/tmpl/default.php
development/branches/jcamp/administrator/components/com_menus/views/items/view.html.php
development/branches/jcamp/administrator/components/com_menus/views/menu/tmpl/edit.php
development/branches/jcamp/administrator/components/com_menus/views/menu/view.html.php
development/branches/jcamp/administrator/components/com_menus/views/menus/tmpl/default.php
development/branches/jcamp/administrator/components/com_menus/views/menus/view.html.php
development/branches/jcamp/administrator/components/com_messages/views/message/tmpl/default.php
development/branches/jcamp/administrator/components/com_modules/controller.php
development/branches/jcamp/administrator/components/com_modules/helpers/modules.php
development/branches/jcamp/administrator/components/com_modules/models/modules.php
development/branches/jcamp/administrator/components/com_modules/views/module/tmpl/edit.php
development/branches/jcamp/administrator/components/com_modules/views/module/tmpl/modal.php
development/branches/jcamp/administrator/components/com_modules/views/module/view.html.php
development/branches/jcamp/administrator/components/com_modules/views/modules/tmpl/default.php
development/branches/jcamp/administrator/components/com_modules/views/modules/view.html.php
development/branches/jcamp/administrator/components/com_newsfeeds/controller.php
development/branches/jcamp/administrator/components/com_newsfeeds/models/forms/newsfeed.xml
development/branches/jcamp/administrator/components/com_newsfeeds/views/newsfeed/view.html.php
development/branches/jcamp/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php
development/branches/jcamp/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php
development/branches/jcamp/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php
development/branches/jcamp/administrator/components/com_plugins/controller.php
development/branches/jcamp/administrator/components/com_plugins/views/plugin/tmpl/edit.php
development/branches/jcamp/administrator/components/com_plugins/views/plugins/tmpl/default.php
development/branches/jcamp/administrator/components/com_plugins/views/plugins/view.html.php
development/branches/jcamp/administrator/components/com_redirect/controller.php
development/branches/jcamp/administrator/components/com_redirect/views/links/tmpl/default.php
development/branches/jcamp/administrator/components/com_search/controller.php
development/branches/jcamp/administrator/components/com_search/helpers/site.php
development/branches/jcamp/administrator/components/com_templates/config.xml
development/branches/jcamp/administrator/components/com_templates/controller.php
development/branches/jcamp/administrator/components/com_templates/models/style.php
development/branches/jcamp/administrator/components/com_templates/views/prevuuw/tmpl/default.php
development/branches/jcamp/administrator/components/com_templates/views/source/tmpl/edit.php
development/branches/jcamp/administrator/components/com_templates/views/style/tmpl/edit.php
development/branches/jcamp/administrator/components/com_templates/views/styles/tmpl/default.php
development/branches/jcamp/administrator/components/com_templates/views/templates/tmpl/default.php
development/branches/jcamp/administrator/components/com_templates/views/templates/view.html.php
development/branches/jcamp/administrator/components/com_users/controller.php
development/branches/jcamp/administrator/components/com_users/models/mail.php
development/branches/jcamp/administrator/components/com_users/models/user.php
development/branches/jcamp/administrator/components/com_users/views/group/tmpl/edit.php
development/branches/jcamp/administrator/components/com_users/views/group/view.html.php
development/branches/jcamp/administrator/components/com_users/views/groups/tmpl/default.php
development/branches/jcamp/administrator/components/com_users/views/level/tmpl/edit.php
development/branches/jcamp/administrator/components/com_users/views/level/view.html.php
development/branches/jcamp/administrator/components/com_users/views/levels/tmpl/default.php
development/branches/jcamp/administrator/components/com_users/views/mail/tmpl/default.php
development/branches/jcamp/administrator/components/com_users/views/user/tmpl/edit.php
development/branches/jcamp/administrator/components/com_users/views/user/view.html.php
development/branches/jcamp/administrator/components/com_users/views/users/tmpl/default.php
development/branches/jcamp/administrator/components/com_users/views/users/tmpl/modal.php
development/branches/jcamp/administrator/components/com_users/views/users/view.html.php
development/branches/jcamp/administrator/components/com_weblinks/controller.php
development/branches/jcamp/administrator/components/com_weblinks/views/weblink/tmpl/edit.php
development/branches/jcamp/administrator/components/com_weblinks/views/weblink/view.html.php
development/branches/jcamp/administrator/components/com_weblinks/views/weblinks/tmpl/default.php
development/branches/jcamp/administrator/components/com_weblinks/views/weblinks/view.html.php
development/branches/jcamp/administrator/language/en-GB/en-GB.com_banners.ini
development/branches/jcamp/administrator/language/en-GB/en-GB.com_categories.ini
development/branches/jcamp/administrator/language/en-GB/en-GB.com_config.ini
development/branches/jcamp/administrator/language/en-GB/en-GB.com_contact.ini
development/branches/jcamp/administrator/language/en-GB/en-GB.com_content.ini
development/branches/jcamp/administrator/language/en-GB/en-GB.com_installer.ini
development/branches/jcamp/administrator/language/en-GB/en-GB.com_menus.ini
development/branches/jcamp/administrator/language/en-GB/en-GB.com_modules.ini
development/branches/jcamp/administrator/language/en-GB/en-GB.com_templates.ini
development/branches/jcamp/administrator/language/en-GB/en-GB.com_users.ini
development/branches/jcamp/administrator/language/en-GB/en-GB.com_weblinks.ini
development/branches/jcamp/administrator/language/en-GB/en-GB.ini
development/branches/jcamp/administrator/language/en-GB/en-GB.mod_menu.ini
development/branches/jcamp/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini
development/branches/jcamp/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini
development/branches/jcamp/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini
development/branches/jcamp/administrator/language/en-GB/en-GB.plg_user_joomla.ini
development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_banners.ini
development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_categories.ini
development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_config.ini
development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_contact.ini
development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_content.ini
development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_installer.ini
development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_menus.ini
development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_modules.ini
development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_templates.ini
development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_users.ini
development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_weblinks.ini
development/branches/jcamp/administrator/language/xx-XX/xx-XX.ini
development/branches/jcamp/administrator/language/xx-XX/xx-XX.plg_authentication_ldap.ini
development/branches/jcamp/administrator/language/xx-XX/xx-XX.plg_content_emailcloak.ini
development/branches/jcamp/administrator/language/xx-XX/xx-XX.plg_content_emailcloak.sys.ini
development/branches/jcamp/administrator/modules/mod_login/tmpl/default.php
development/branches/jcamp/administrator/modules/mod_menu/menu.php
development/branches/jcamp/administrator/modules/mod_menu/mod_menu.xml
development/branches/jcamp/administrator/modules/mod_menu/tmpl/default_disabled.php
development/branches/jcamp/administrator/modules/mod_menu/tmpl/default_enabled.php
development/branches/jcamp/administrator/templates/bluestork/css/template.css
development/branches/jcamp/administrator/templates/bluestork/login.php
development/branches/jcamp/administrator/templates/hathor/css/template.css
development/branches/jcamp/administrator/templates/hathor/css/template_rtl.css
development/branches/jcamp/administrator/templates/hathor/html/com_banners/banners/default.php
development/branches/jcamp/administrator/templates/hathor/html/com_banners/clients/default.php
development/branches/jcamp/administrator/templates/hathor/html/com_banners/tracks/default.php
development/branches/jcamp/administrator/templates/hathor/html/com_categories/categories/default.php
development/branches/jcamp/administrator/templates/hathor/html/com_contact/contacts/default.php
development/branches/jcamp/administrator/templates/hathor/html/com_contact/contacts/modal.php
development/branches/jcamp/administrator/templates/hathor/html/com_content/article/edit.php
development/branches/jcamp/administrator/templates/hathor/html/com_content/articles/default.php
development/branches/jcamp/administrator/templates/hathor/html/com_content/articles/modal.php
development/branches/jcamp/administrator/templates/hathor/html/com_content/featured/default.php
development/branches/jcamp/administrator/templates/hathor/html/com_installer/discover/default.php
development/branches/jcamp/administrator/templates/hathor/html/com_installer/manage/default.php
development/branches/jcamp/administrator/templates/hathor/html/com_installer/update/default.php
development/branches/jcamp/administrator/templates/hathor/html/com_languages/installed/default.php
development/branches/jcamp/administrator/templates/hathor/html/com_languages/language/edit.php
development/branches/jcamp/administrator/templates/hathor/html/com_languages/languages/default.php
development/branches/jcamp/administrator/templates/hathor/html/com_menus/item/edit.php
development/branches/jcamp/administrator/templates/hathor/html/com_menus/items/default.php
development/branches/jcamp/administrator/templates/hathor/html/com_menus/menus/default.php
development/branches/jcamp/administrator/templates/hathor/html/com_messages/messages/default.php
development/branches/jcamp/administrator/templates/hathor/html/com_modules/modules/default.php
development/branches/jcamp/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/default.php
development/branches/jcamp/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/modal.php
development/branches/jcamp/administrator/templates/hathor/html/com_plugins/plugins/default.php
development/branches/jcamp/administrator/templates/hathor/html/com_redirect/links/default.php
development/branches/jcamp/administrator/templates/hathor/html/com_templates/styles/default.php
development/branches/jcamp/administrator/templates/hathor/html/com_templates/templates/default.php
development/branches/jcamp/administrator/templates/hathor/html/com_users/groups/default.php
development/branches/jcamp/administrator/templates/hathor/html/com_users/levels/default.php
development/branches/jcamp/administrator/templates/hathor/html/com_users/users/default.php
development/branches/jcamp/administrator/templates/hathor/html/com_users/users/modal.php
development/branches/jcamp/administrator/templates/hathor/html/com_weblinks/weblinks/default.php
Log:
Modified: development/branches/jcamp/administrator/components/com_admin/views/help/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_admin/views/help/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_admin/views/help/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -12,7 +12,7 @@
jimport('joomla.language.help');
?>
-<form action="<?php echo JRoute::_('index.php?option=com_admin&view=help'); ?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_admin&view=help'); ?>" method="post" name="adminForm" id="adminForm">
<div class="width-40 fltlft">
<fieldset class="adminform">
<legend><?php echo JText::_('COM_ADMIN_SEARCH'); ?></legend>
Modified: development/branches/jcamp/administrator/components/com_admin/views/sysinfo/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_admin/views/sysinfo/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_admin/views/sysinfo/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -16,7 +16,7 @@
JHtml::_('behavior.switcher');
?>
-<form action="<?php echo JRoute::_('index.php'); ?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php'); ?>" method="post" name="adminForm" id="adminForm">
<div id="config-document">
<div id="page-site" class="tab">
<div class="noshow">
Modified: development/branches/jcamp/administrator/components/com_banners/config.xml
===================================================================
--- development/branches/jcamp/administrator/components/com_banners/config.xml 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_banners/config.xml 2010-08-31 19:21:09 UTC (rev 18740)
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Id$ -->
<config>
- <fieldset name="component">
+ <fieldset name="component"
+ label="COM_BANNERS_FIELDSET_CONFIG_CLIENT_OPTIONS_LABEL"
+ description="COM_BANNERS_FIELDSET_CONFIG_CLIENT_OPTIONS_DESC">
<field
id="purchase_type"
name="purchase_type"
Modified: development/branches/jcamp/administrator/components/com_banners/controller.php
===================================================================
--- development/branches/jcamp/administrator/components/com_banners/controller.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_banners/controller.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -32,12 +32,12 @@
{
require_once JPATH_COMPONENT.'/helpers/banners.php';
BannersHelper::updateReset();
+
+ // Load the submenu.
+ BannersHelper::addSubmenu(JRequest::getWord('view', 'banners'));
parent::display();
- // Load the submenu.
- BannersHelper::addSubmenu(JRequest::getWord('view', 'banners'));
-
return $this;
}
}
Modified: development/branches/jcamp/administrator/components/com_banners/models/forms/client.xml
===================================================================
--- development/branches/jcamp/administrator/components/com_banners/models/forms/client.xml 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_banners/models/forms/client.xml 2010-08-31 19:21:09 UTC (rev 18740)
@@ -38,8 +38,7 @@
label="COM_BANNERS_FIELD_PURCHASETYPE_LABEL" description="COM_BANNERS_FIELD_PURCHASETYPE_DESC"
default="0" class="inputbox"
>
- <option value="-1">COM_BANNERS_FIELD_VALUE_USECLIENTDEFAULT
- </option>
+ <option value="">JGLOBAL_USE_GLOBAL</option>
<option value="1">COM_BANNERS_FIELD_VALUE_1</option>
<option value="2">COM_BANNERS_FIELD_VALUE_2</option>
<option value="3">COM_BANNERS_FIELD_VALUE_3</option>
@@ -51,8 +50,7 @@
label="COM_BANNERS_FIELD_TRACKIMPRESSION_LABEL"
description="COM_BANNERS_FIELD_TRACKIMPRESSION_DESC"
>
- <option value="-1">COM_BANNERS_FIELD_VALUE_USECOMPONENTDEFAULT
- </option>
+ <option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
@@ -60,8 +58,7 @@
<field name="track_clicks" type="list" default="0"
label="COM_BANNERS_FIELD_TRACKCLICK_LABEL" description="COM_BANNERS_FIELD_TRACKCLICK_DESC"
>
- <option value="-1">COM_BANNERS_FIELD_VALUE_USECOMPONENTDEFAULT
- </option>
+ <option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
Modified: development/branches/jcamp/administrator/components/com_banners/views/banner/tmpl/edit.php
===================================================================
--- development/branches/jcamp/administrator/components/com_banners/views/banner/tmpl/edit.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_banners/views/banner/tmpl/edit.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -40,7 +40,7 @@
});
</script>
-<form action="<?php JRoute::_('index.php?option=com_banners'); ?>" method="post" name="adminForm" id="banner-form" class="form-validate">
+<form action="<?php echo JRoute::_('index.php?option=com_banners'); ?>" method="post" name="adminForm" id="banner-form" class="form-validate">
<div class="width-60 fltlft">
<fieldset class="adminform">
<legend><?php echo empty($this->item->id) ? JText::_('COM_BANNERS_NEW_BANNER') : JText::sprintf('COM_BANNERS_BANNER_DETAILS', $this->item->id); ?></legend>
Modified: development/branches/jcamp/administrator/components/com_banners/views/banner/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_banners/views/banner/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_banners/views/banner/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -60,9 +60,11 @@
JToolBarHelper::title($isNew ? JText::_('COM_BANNERS_MANAGER_BANNER_NEW') : JText::_('COM_BANNERS_MANAGER_BANNER_EDIT'), 'banners.png');
// If not checked out, can save the item.
- if (!$checkedOut && $canDo->get('core.edit')) {
+ if (!$checkedOut && ($canDo->get('core.edit')||$canDo->get('core.create'))) {
JToolBarHelper::apply('banner.apply', 'JTOOLBAR_APPLY');
JToolBarHelper::save('banner.save', 'JTOOLBAR_SAVE');
+ }
+ if (!$checkedOut && $canDo->get('core.create')) {
JToolBarHelper::custom('banner.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
}
// If an existing item, can save to a copy.
Modified: development/branches/jcamp/administrator/components/com_banners/views/banners/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_banners/views/banners/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_banners/views/banners/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -33,18 +33,16 @@
<select name="filter_state" class="inputbox" onchange="this.form.submit()">
<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.state'), true);?>
+ </select>
+
+ <select name="filter_client_id" class="inputbox" onchange="this.form.submit()">
+ <option value=""><?php echo JText::_('COM_BANNERS_SELECT_CLIENT');?></option>
+ <?php echo JHtml::_('select.options', JFormFieldBannerClient::getOptions(), 'value', 'text', $this->state->get('filter.client_id'));?>
</select>
-
<select name="filter_category_id" class="inputbox" onchange="this.form.submit()">
<option value=""><?php echo JText::_('JOPTION_SELECT_CATEGORY');?></option>
<?php echo JHtml::_('select.options', JHtml::_('category.options', 'com_banners'), 'value', 'text', $this->state->get('filter.category_id'));?>
</select>
-
- <select name="filter_client_id" class="inputbox" onchange="this.form.submit()">
- <option value=""><?php echo JText::_('COM_BANNERS_SELECT_CLIENT');?></option>
- <?php echo JHtml::_('select.options', JFormFieldBannerClient::getOptions(), 'value', 'text', $this->state->get('filter.client_id'));?>
- </select>
-
<select name="filter_language" class="inputbox" onchange="this.form.submit()">
<option value=""><?php echo JText::_('JOPTION_SELECT_LANGUAGE');?></option>
<?php echo JHtml::_('select.options', JHtml::_('contentlanguage.existing', true, true), 'value', 'text', $this->state->get('filter.language'));?>
@@ -124,7 +122,7 @@
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'banners.', $canCheckin); ?>
<?php endif; ?>
- <?php if ($canCreate || $canEdit) : ?>
+ <?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_banners&task=banner.edit&id='.(int) $item->id); ?>">
<?php echo $this->escape($item->name); ?></a>
<?php else : ?>
@@ -148,8 +146,13 @@
<td class="order">
<?php if ($canChange) : ?>
<?php if ($saveOrder) : ?>
- <span><?php echo $this->pagination->orderUpIcon($i, (@$this->items[$i-1]->catid == $item->catid), 'banners.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
- <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, (@$this->items[$i+1]->catid == $item->catid), 'banners.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php if ($listDirn == 'asc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, (@$this->items[$i-1]->catid == $item->catid), 'banners.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, (@$this->items[$i+1]->catid == $item->catid), 'banners.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php elseif ($listDirn == 'desc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, (@$this->items[$i-1]->catid == $item->catid), 'banners.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, (@$this->items[$i+1]->catid == $item->catid), 'banners.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php endif; ?>
<?php endif; ?>
<?php $disabled = $saveOrder ? '' : 'disabled="disabled"'; ?>
<input type="text" name="order[]" size="5" value="<?php echo $item->ordering;?>" <?php echo $disabled;?> class="text-area-order" />
Modified: development/branches/jcamp/administrator/components/com_banners/views/banners/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_banners/views/banners/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_banners/views/banners/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -80,7 +80,7 @@
}
}
}
- if(JFactory::getUser()->authorise('core.manage','com_checkin')) {
+ if ($canDo->get('core.edit.state')) {
JToolBarHelper::custom('banners.checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true);
}
if ($this->state->get('filter.state') == -2 && $canDo->get('core.delete')) {
Modified: development/branches/jcamp/administrator/components/com_banners/views/client/tmpl/edit.php
===================================================================
--- development/branches/jcamp/administrator/components/com_banners/views/client/tmpl/edit.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_banners/views/client/tmpl/edit.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -23,7 +23,7 @@
}
</script>
-<form action="<?php JRoute::_('index.php?option=com_banners'); ?>" method="post" name="adminForm" id="client-form" class="form-validate">
+<form action="<?php echo JRoute::_('index.php?option=com_banners'); ?>" method="post" name="adminForm" id="client-form" class="form-validate">
<div class="width-60 fltlft">
<fieldset class="adminform">
Modified: development/branches/jcamp/administrator/components/com_banners/views/client/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_banners/views/client/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_banners/views/client/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -60,11 +60,14 @@
JToolBarHelper::title($isNew ? JText::_('COM_BANNERS_MANAGER_CLIENT_NEW') : JText::_('COM_BANNERS_MANAGER_CLIENT_EDIT'), 'banners-clients.png');
// If not checked out, can save the item.
- if (!$checkedOut && $canDo->get('core.edit')) {
+ if (!$checkedOut && ($canDo->get('core.edit')||$canDo->get('core.create'))) {
JToolBarHelper::apply('client.apply', 'JTOOLBAR_APPLY');
JToolBarHelper::save('client.save', 'JTOOLBAR_SAVE');
- JToolBarHelper::custom('client.save2new', 'JTOOLBAR_SAVE_AND_NEW', false);
}
+ if (!$checkedOut && $canDo->get('core.create')) {
+
+ JToolBarHelper::custom('client.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+ }
// If an existing item, can save to a copy.
if (!$isNew && $canDo->get('core.create')) {
JToolBarHelper::custom('client.save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false);
Modified: development/branches/jcamp/administrator/components/com_banners/views/clients/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_banners/views/clients/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_banners/views/clients/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -89,7 +89,7 @@
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'clients.', $canCheckin); ?>
<?php endif; ?>
- <?php if ($canCreate || $canEdit) : ?>
+ <?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_banners&task=client.edit&id='.(int) $item->id); ?>">
<?php echo $this->escape($item->name); ?></a>
<?php else : ?>
Modified: development/branches/jcamp/administrator/components/com_banners/views/clients/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_banners/views/clients/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_banners/views/clients/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -62,22 +62,11 @@
JToolBarHelper::editList('client.edit','JTOOLBAR_EDIT');
}
if ($canDo->get('core.edit.state')) {
- if ($this->state->get('filter.published') != 2){
- JToolBarHelper::divider();
- JToolBarHelper::custom('clients.publish', 'publish.png', 'publish_f2.png','JTOOLBAR_PUBLISH', true);
- JToolBarHelper::custom('clients.unpublish', 'unpublish.png', 'unpublish_f2.png', 'JTOOLBAR_UNPUBLISH', true);
- }
- if ($this->state->get('filter.published') != -1 ) {
- JToolBarHelper::divider();
- if ($this->state->get('filter.published') != 2) {
- JToolBarHelper::archiveList('clients.archive','JTOOLBAR_ARCHIVE');
- }
- else if ($this->state->get('filter.published') == 2) {
- JToolBarHelper::unarchiveList('clients.publish', 'JTOOLBAR_UNARCHIVE');
- }
- }
- }
- if(JFactory::getUser()->authorise('core.manage','com_checkin')) {
+ JToolBarHelper::divider();
+ JToolBarHelper::custom('clients.publish', 'publish.png', 'publish_f2.png','JTOOLBAR_PUBLISH', true);
+ JToolBarHelper::custom('clients.unpublish', 'unpublish.png', 'unpublish_f2.png', 'JTOOLBAR_UNPUBLISH', true);
+ JToolBarHelper::divider();
+ JToolBarHelper::archiveList('clients.archive','JTOOLBAR_ARCHIVE');
JToolBarHelper::custom('clients.checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true);
}
if ($this->state->get('filter.state') == -2 && $canDo->get('core.delete')) {
Modified: development/branches/jcamp/administrator/components/com_banners/views/tracks/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_banners/views/tracks/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_banners/views/tracks/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -31,8 +31,9 @@
</div>
<div class="filter-select fltrt">
- <select name="filter_type" class="inputbox" onchange="this.form.submit()">
- <?php echo JHtml::_('select.options', array(JHtml::_('select.option', '0', JText::_('COM_BANNERS_SELECT_TYPE')), JHtml::_('select.option', 1, JText::_('COM_BANNERS_IMPRESSION')), JHtml::_('select.option', 2, JText::_('COM_BANNERS_CLICK'))), 'value', 'text', $this->state->get('filter.type'));?>
+ <select name="filter_client_id" class="inputbox" onchange="this.form.submit()">
+ <option value=""><?php echo JText::_('COM_BANNERS_SELECT_CLIENT');?></option>
+ <?php echo JHtml::_('select.options', JFormFieldBannerClient::getOptions(), 'value', 'text', $this->state->get('filter.client_id'));?>
</select>
<?php $category = $this->state->get('filter.category_id');?>
@@ -40,10 +41,9 @@
<option value=""><?php echo JText::_('JOPTION_SELECT_CATEGORY');?></option>
<?php echo JHtml::_('select.options', JHtml::_('category.options', 'com_banners'), 'value', 'text', $category);?>
</select>
-
- <select name="filter_client_id" class="inputbox" onchange="this.form.submit()">
- <option value=""><?php echo JText::_('COM_BANNERS_SELECT_CLIENT');?></option>
- <?php echo JHtml::_('select.options', JFormFieldBannerClient::getOptions(), 'value', 'text', $this->state->get('filter.client_id'));?>
+
+ <select name="filter_type" class="inputbox" onchange="this.form.submit()">
+ <?php echo JHtml::_('select.options', array(JHtml::_('select.option', '0', JText::_('COM_BANNERS_SELECT_TYPE')), JHtml::_('select.option', 1, JText::_('COM_BANNERS_IMPRESSION')), JHtml::_('select.option', 2, JText::_('COM_BANNERS_CLICK'))), 'value', 'text', $this->state->get('filter.type'));?>
</select>
</div>
</fieldset>
Modified: development/branches/jcamp/administrator/components/com_categories/controller.php
===================================================================
--- development/branches/jcamp/administrator/components/com_categories/controller.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_categories/controller.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -40,6 +40,7 @@
// Get and render the view.
if ($view = $this->getView($vName, $vFormat)) {
+
// Get the model for the view.
$model = $this->getModel($vName);
@@ -49,12 +50,10 @@
// Push document object into the view.
$view->assignRef('document', $document);
-
- $view->display();
-
// Load the submenu.
require_once JPATH_COMPONENT.'/helpers/categories.php';
CategoriesHelper::addSubmenu($model->getState('filter.extension'));
+ $view->display();
}
return $this;
Modified: development/branches/jcamp/administrator/components/com_categories/helpers/categories.php
===================================================================
--- development/branches/jcamp/administrator/components/com_categories/helpers/categories.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_categories/helpers/categories.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -56,9 +56,9 @@
// loading language file from the administrator/language directory then
// loading language file from the administrator/components/*extension*/language directory
$lang->load($component, JPATH_BASE, null, false, false)
- || $lang->load($component, JPath::clean(JPATH_ADMINISTRATOR.'/components/'.$extension), null, false, false)
+ || $lang->load($component, JPath::clean(JPATH_ADMINISTRATOR.'/components/'.$component), null, false, false)
|| $lang->load($component, JPATH_BASE, $lang->getDefault(), false, false)
- || $lang->load($component, JPath::clean(JPATH_ADMINISTRATOR.'/components/'.$extension), $lang->getDefault(), false, false);
+ || $lang->load($component, JPath::clean(JPATH_ADMINISTRATOR.'/components/'.$component), $lang->getDefault(), false, false);
call_user_func(array($cName, 'addSubmenu'), 'categories'.(isset($section)?'.'.$section:''));
}
}
Modified: development/branches/jcamp/administrator/components/com_categories/models/categories.php
===================================================================
--- development/branches/jcamp/administrator/components/com_categories/models/categories.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_categories/models/categories.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -1,6 +1,8 @@
<?php
/**
* @version $Id$
+ * @package Joomla.Administrator
+ * @subpackage com_categories
* @copyright Copyright (C) 2005 - 2010 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
@@ -36,7 +38,8 @@
$app = JFactory::getApplication();
$context = $this->context;
- $extension = $app->getUserStateFromRequest($this->context.'.filter.extension', 'extension');
+ $extension = $app->getUserStateFromRequest($this->context.'.filter.extension', 'extension', 'com_content');
+
$this->setState('filter.extension', $extension);
$parts = explode('.',$extension);
// extract the component name
@@ -74,6 +77,7 @@
* @param string $id A prefix for the store id.
*
* @return string A store id.
+ * @since 1.6
*/
protected function getStoreId($id = '')
{
@@ -87,11 +91,10 @@
}
/**
- * @param boolean True to join selected foreign information
- *
* @return string
+ * @since 1.6
*/
- function getListQuery($resolveFKs = true)
+ function getListQuery()
{
// Create a new query object.
$db = $this->getDbo();
@@ -139,7 +142,8 @@
$published = $this->getState('filter.published');
if (is_numeric($published)) {
$query->where('a.published = ' . (int) $published);
- } else if ($published === '') {
+ }
+ else if ($published === '') {
$query->where('(a.published IN (0, 1))');
}
@@ -148,10 +152,12 @@
if (!empty($search)) {
if (stripos($search, 'id:') === 0) {
$query->where('a.id = '.(int) substr($search, 3));
- } else if (stripos($search, 'author:') === 0) {
+ }
+ else if (stripos($search, 'author:') === 0) {
$search = $db->Quote('%'.$db->getEscaped(substr($search, 7), true).'%');
$query->where('(ua.name LIKE '.$search.' OR ua.username LIKE '.$search.')');
- } else {
+ }
+ else {
$search = $db->Quote('%'.$db->getEscaped($search, true).'%');
$query->where('(a.title LIKE '.$search.' OR a.alias LIKE '.$search.' OR a.note LIKE '.$search.')');
}
Modified: development/branches/jcamp/administrator/components/com_categories/models/category.php
===================================================================
--- development/branches/jcamp/administrator/components/com_categories/models/category.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_categories/models/category.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -171,6 +171,20 @@
return $form;
}
+
+ /**
+ * A protected method to get the where clause for the reorder
+ * This ensures that the row will be moved relative to a row with the same extension
+ *
+ * @param JCategoryTable current table instance
+ *
+ * @return array An array of conditions to add to add to ordering queries.
+ * @since 1.6
+ */
+ protected function getReorderConditions($table)
+ {
+ return 'extension = ' . $this->_db->Quote($table->extension);
+ }
/**
* Method to get the data that should be injected in the form.
Modified: development/branches/jcamp/administrator/components/com_categories/views/categories/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_categories/views/categories/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_categories/views/categories/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -20,10 +20,11 @@
$listOrder = $this->state->get('list.ordering');
$listDirn = $this->state->get('list.direction');
$ordering = ($listOrder == 'a.lft');
-$canOrder = $user->authorise('core.edit.state', 'com_categories');
+$canOrder = $user->authorise('core.edit.state');
+$canEdit = $user->authorise('core.edit');
$saveOrder = ($listOrder == 'a.lft' && $listDirn == 'asc');
?>
-<form action="<?php echo JRoute::_('index.php?option=com_categories&view=categories');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_categories&view=categories');?>" method="post" name="adminForm" id="adminForm">
<fieldset id="filter-bar">
<div class="filter-search fltlft">
@@ -94,20 +95,26 @@
$originalOrders = array();
foreach ($this->items as $i => $item) :
$orderkey = array_search($item->id, $this->ordering[$item->parent_id]);
- $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out==$user->get('id');
+ $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out==$user->get('id');
$canChange = $canCheckin;
?>
<tr class="row<?php echo $i % 2; ?>">
<td class="center">
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
</td>
- <td class="indent-<?php echo intval(($item->level-1)*15)+4; ?>">
+ <td>
+ <?php echo str_repeat('<span class="gi">|—</span>', $item->level-1) ?>
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'categories.', $canCheckin); ?>
<?php endif; ?>
- <a href="<?php echo JRoute::_('index.php?option=com_categories&task=category.edit&cid[]='.$item->id.'&extension='.$extension);?>">
- <?php echo $this->escape($item->title); ?></a>
+ <?php if ($canEdit) : ?>
+ <a href="<?php echo JRoute::_('index.php?option=com_categories&task=category.edit&cid[]='.$item->id.'&extension='.$extension);?>">
+ <?php echo $this->escape($item->title); ?></a>
+ <?php else : ?>
+ <?php echo $this->escape($item->title); ?>
+ <?php endif; ?>
<p class="smallsub" title="<?php echo $this->escape($item->path);?>">
+ <?php echo str_repeat('<span class="gtr">|—</span>', $item->level-1) ?>
<?php if (empty($item->note)) : ?>
<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias));?>
<?php else : ?>
Modified: development/branches/jcamp/administrator/components/com_categories/views/categories/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_categories/views/categories/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_categories/views/categories/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -74,34 +74,33 @@
$title = JText::_('COM_CATEGORIES_CATEGORIES_BASE_TITLE');
}
JToolBarHelper::title($title, 'categories.png');
- JToolBarHelper::custom('category.edit', 'new.png', 'new_f2.png', 'JTOOLBAR_NEW', false);
- JToolBarHelper::custom('category.edit', 'edit.png', 'edit_f2.png', 'JTOOLBAR_EDIT', true);
- if ($this->state->get('filter.published') != 2){
- JToolBarHelper::divider();
- JToolBarHelper::custom('categories.publish', 'publish.png', 'publish_f2.png', 'JTOOLBAR_PUBLISH', true);
- JToolBarHelper::custom('categories.unpublish', 'unpublish.png', 'unpublish_f2.png', 'JTOOLBAR_UNPUBLISH', true);
+ if(JFactory::getUser()->authorise('core.create')) {
+ JToolBarHelper::custom('category.edit', 'new.png', 'new_f2.png', 'JTOOLBAR_NEW', false);
}
- if ($this->state->get('filter.published') != -1 ) {
- JToolBarHelper::divider();
- if ($this->state->get('filter.published') != 2) {
- JToolBarHelper::archiveList('categories.archive','JTOOLBAR_ARCHIVE');
- }
- else if ($this->state->get('filter.published') == 2) {
- JToolBarHelper::unarchiveList('categories.publish', 'JTOOLBAR_UNARCHIVE');
- }
+ if(JFactory::getUser()->authorise('core.edit')) {
+ JToolBarHelper::custom('category.edit', 'edit.png', 'edit_f2.png', 'JTOOLBAR_EDIT', true);
}
- if(JFactory::getUser()->authorise('core.manage','com_checkin')) {
+ if(JFactory::getUser()->authorise('core.edit.state')) {
+ JToolBarHelper::custom('categories.publish', 'publish.png', 'publish_f2.png', 'JTOOLBAR_PUBLISH', true);
+ JToolBarHelper::custom('categories.unpublish', 'unpublish.png', 'unpublish_f2.png', 'JTOOLBAR_UNPUBLISH', true);
+ JToolBarHelper::divider();
+ JToolBarHelper::archiveList('categories.archive','JTOOLBAR_ARCHIVE');
+
JToolBarHelper::custom('categories.checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true);
}
if ($this->state->get('filter.published') == -2 && JFactory::getUser()->authorise('core.delete', 'com_content')) {
JToolBarHelper::deleteList('', 'categories.delete','JTOOLBAR_EMPTY_TRASH');
} else {
+ if(JFactory::getUser()->authorise('core.edit.state')) {
JToolBarHelper::trash('categories.trash','JTOOLBAR_TRASH');
+ }
}
JToolBarHelper::divider();
- JToolBarHelper::custom('categories.rebuild', 'refresh.png', 'refresh_f2.png', 'JTOOLBAR_REBUILD', false);
- JToolBarHelper::divider();
+ if(JFactory::getUser()->authorise('core.edit.state')) {
+ JToolBarHelper::custom('categories.rebuild', 'refresh.png', 'refresh_f2.png', 'JTOOLBAR_REBUILD', false);
+ }
+ JToolBarHelper::divider();
JToolBarHelper::help('JHELP_COMPONENTS_'.strtoupper(substr($component,4)).'_CATEGORIES');
}
}
Modified: development/branches/jcamp/administrator/components/com_categories/views/category/tmpl/edit.php
===================================================================
--- development/branches/jcamp/administrator/components/com_categories/views/category/tmpl/edit.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_categories/views/category/tmpl/edit.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -33,7 +33,7 @@
}
</script>
-<form action="<?php JRoute::_('index.php?option=com_menus'); ?>" method="post" name="adminForm" id="item-form" class="form-validate">
+<form action="<?php echo JRoute::_('index.php?option=com_categories&extension='.JRequest::getCmd('extension', 'com_content')); ?>" method="post" name="adminForm" id="item-form" class="form-validate">
<div class="width-60 fltlft">
<fieldset class="adminform">
<legend><?php echo JText::_('COM_CATEGORIES_FIELDSET_DETAILS');?></legend>
Modified: development/branches/jcamp/administrator/components/com_config/controllers/component.php
===================================================================
--- development/branches/jcamp/administrator/components/com_config/controllers/component.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_config/controllers/component.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -7,6 +7,9 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
+// no direct access
+defined('_JEXEC') or die;
+
/**
* Note: this view is intended only to be opened in a popup
* @package Joomla.Administrator
Modified: development/branches/jcamp/administrator/components/com_config/models/forms/application.xml
===================================================================
--- development/branches/jcamp/administrator/components/com_config/models/forms/application.xml 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_config/models/forms/application.xml 2010-08-31 19:21:09 UTC (rev 18740)
@@ -165,19 +165,6 @@
<option
value="0">JNO</option>
</field>
-
- <field
- name="debug_modules"
- type="radio"
- default="0"
- label="COM_CONFIG_FIELD_DEBUG_MODULES_LABEL"
- description="COM_CONFIG_FIELD_DEBUG_MODULES_DESC"
- filter="integer">
- <option
- value="1">JYES</option>
- <option
- value="0">JNO</option>
- </field>
</fieldset>
<fieldset
@@ -425,7 +412,7 @@
<field
name="sef"
type="radio"
- default="0"
+ default="1"
label="COM_CONFIG_FIELD_SEF_URL_LABEL"
description="COM_CONFIG_FIELD_SEF_URL_DESC"
filter="integer">
Modified: development/branches/jcamp/administrator/components/com_config/views/application/tmpl/default_ftplogin.php
===================================================================
--- development/branches/jcamp/administrator/components/com_config/views/application/tmpl/default_ftplogin.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_config/views/application/tmpl/default_ftplogin.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -11,7 +11,7 @@
defined('_JEXEC') or die;
?>
<div class="width-100">
- <fieldset title="<?php echo JText::_('COM_CONGIG_FTP_DETAILS'); ?>" class="adminform">
+ <fieldset title="<?php echo JText::_('COM_CONFIG_FTP_DETAILS'); ?>" class="adminform">
<legend><?php echo JText::_('COM_CONFIG_FTP_DETAILS'); ?></legend>
<?php echo JText::_('COM_CONFIG_FTP_DETAILS_TIP'); ?>
Modified: development/branches/jcamp/administrator/components/com_contact/controller.php
===================================================================
--- development/branches/jcamp/administrator/components/com_contact/controller.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_contact/controller.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -37,10 +37,10 @@
{
require_once JPATH_COMPONENT.'/helpers/contact.php';
- parent::display();
-
// Load the submenu.
ContactHelper::addSubmenu(JRequest::getWord('view', 'contacts'));
+
+ parent::display();
return $this;
}
Modified: development/branches/jcamp/administrator/components/com_contact/models/forms/contact.xml
===================================================================
--- development/branches/jcamp/administrator/components/com_contact/models/forms/contact.xml 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_contact/models/forms/contact.xml 2010-08-31 19:21:09 UTC (rev 18740)
@@ -101,7 +101,7 @@
<field name="email_to" type="text"
label="COM_CONTACT_FIELD_INFORMATION_EMAIL_LABEL"
description="COM_CONTACT_FIELD_INFORMATION_EMAIL_DESC"
- class="inputbox"
+ class="inputbox validate-email"
size="30"
/>
@@ -577,8 +577,7 @@
</fieldset>
<fieldset name="email"
- label="COM_CONTACT_FIELDSET_CONTACT_FORM"
- description="COM_CONTACT_EMAIL_FORM_DETAILS"
+ label="COM_CONTACT_FIELDSET_CONTACT_FORM"
>
<field name="show_email_form" type="list"
@@ -640,8 +639,8 @@
<field name="redirect"
type="text"
size="30"
- label="COM_CONTACT_FIELD_EMAIL_REDIRECT_LABEL"
- description="COM_CONTACT_FIELD_EMAIL_REDIRECT_DESC" />
+ label="COM_CONTACT_FIELD_CONFIG_REDIRECT_LABEL"
+ description="COM_CONTACT_FIELD_CONFIG_REDIRECT_DESC" />
</fieldset>
</fields>
<fields name="metadata">
Modified: development/branches/jcamp/administrator/components/com_contact/views/contact/tmpl/edit.php
===================================================================
--- development/branches/jcamp/administrator/components/com_contact/views/contact/tmpl/edit.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_contact/views/contact/tmpl/edit.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -28,7 +28,7 @@
}
</script>
-<form action="<?php JRoute::_('index.php?option=com_contact'); ?>" method="post" name="adminForm" id="contact-form" class="form-validate">
+<form action="<?php echo JRoute::_('index.php?option=com_contact'); ?>" method="post" name="adminForm" id="contact-form" class="form-validate">
<div class="width-60 fltlft">
<fieldset class="adminform">
<legend><?php echo empty($this->item->id) ? JText::_('COM_CONTACT_NEW_CONTACT') : JText::sprintf('COM_CONTACT_EDIT_CONTACT', $this->item->id); ?></legend>
Modified: development/branches/jcamp/administrator/components/com_contact/views/contact/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_contact/views/contact/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_contact/views/contact/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -54,15 +54,20 @@
$user = JFactory::getUser();
$isNew = ($this->item->id == 0);
$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id'));
+ $canDo = ContactHelper::getActions($this->state->get('filter.category_id'));
JRequest::setVar('hidemainmenu', 1);
JToolBarHelper::title(JText::_('COM_CONTACT_MANAGER_CONTACT'), 'contact.png');
+ if (!$checkedOut && ($canDo->get('core.edit')||$canDo->get('core.create'))) {
JToolBarHelper::apply('contact.apply','JTOOLBAR_APPLY');
JToolBarHelper::save('contact.save','JTOOLBAR_SAVE');
+ }
+ if (!$checkedOut && $canDo->get('core.create')) {
JToolBarHelper::custom('contact.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
- // If an existing item, can save to a copy.
- if (!$isNew) {
- JToolBarHelper::custom('contact.save2copy','save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY',false );
+ // If an existing item, can save to a copy.
+ if (!$isNew) {
+ JToolBarHelper::custom('contact.save2copy','save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY',false );
+ }
}
if (empty($this->item->id)) {
Modified: development/branches/jcamp/administrator/components/com_contact/views/contacts/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_contact/views/contacts/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_contact/views/contacts/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -30,10 +30,7 @@
<button type="button" onclick="document.id('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
</div>
<div class="filter-select fltrt">
- <select name="filter_access" class="inputbox" onchange="this.form.submit()">
- <option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
- <?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
- </select>
+
<select name="filter_published" class="inputbox" onchange="this.form.submit()">
<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true);?>
@@ -42,6 +39,10 @@
<option value=""><?php echo JText::_('JOPTION_SELECT_CATEGORY');?></option>
<?php echo JHtml::_('select.options', JHtml::_('category.options', 'com_contact'), 'value', 'text', $this->state->get('filter.category_id'));?>
</select>
+ <select name="filter_access" class="inputbox" onchange="this.form.submit()">
+ <option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
+ <?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
+ </select>
<select name="filter_language" class="inputbox" onchange="this.form.submit()">
<option value=""><?php echo JText::_('JOPTION_SELECT_LANGUAGE');?></option>
<?php echo JHtml::_('select.options', JHtml::_('contentlanguage.existing', true, true), 'value', 'text', $this->state->get('filter.language'));?>
@@ -112,7 +113,7 @@
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'contacts.', $canCheckin); ?>
<?php endif; ?>
- <?php if ($canCreate || $canEdit) : ?>
+ <?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_contact&task=contact.edit&id='.(int) $item->id); ?>">
<?php echo $this->escape($item->name); ?></a>
<?php else : ?>
@@ -133,8 +134,13 @@
<td class="order">
<?php if ($canChange) : ?>
<?php if ($saveOrder) :?>
- <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid),'contacts.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
- <span><?php echo $this->pagination->orderDownIcon($i, $n, ($item->catid == @$this->items[$i+1]->catid), 'contacts.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php if ($listDirn == 'asc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid),'contacts.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $n, ($item->catid == @$this->items[$i+1]->catid), 'contacts.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php elseif ($listDirn == 'desc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid),'contacts.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $n, ($item->catid == @$this->items[$i+1]->catid), 'contacts.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php endif; ?>
<?php endif; ?>
<?php $disabled = $saveOrder ? '' : 'disabled="disabled"'; ?>
<input type="text" name="order[]" size="5" value="<?php echo $item->ordering;?>" <?php echo $disabled ?> class="text-area-order" />
Modified: development/branches/jcamp/administrator/components/com_contact/views/contacts/tmpl/modal.php
===================================================================
--- development/branches/jcamp/administrator/components/com_contact/views/contacts/tmpl/modal.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_contact/views/contacts/tmpl/modal.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -17,7 +17,7 @@
$listOrder = $this->state->get('list.ordering');
$listDirn = $this->state->get('list.direction');
?>
-<form action="<?php echo JRoute::_('index.php?option=com_contact&view=contacts&layout=modal&tmpl=component');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_contact&view=contacts&layout=modal&tmpl=component');?>" method="post" name="adminForm" id="adminForm">
<fieldset class="filter clearfix">
<div class="left">
<label for="filter_search">
Modified: development/branches/jcamp/administrator/components/com_contact/views/contacts/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_contact/views/contacts/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_contact/views/contacts/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -75,8 +75,6 @@
JToolBarHelper::custom('contacts.unpublish', 'unpublish.png', 'unpublish_f2.png', 'JTOOLBAR_UNPUBLISH', true);
JToolBarHelper::divider();
JToolBarHelper::archiveList('contacts.archive','JTOOLBAR_ARCHIVE');
- }
- if(JFactory::getUser()->authorise('core.manage','com_checkin')) {
JToolBarHelper::custom('contacts.checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true);
}
if ($this->state->get('filter.published') == -2 && $canDo->get('core.delete')) {
Modified: development/branches/jcamp/administrator/components/com_content/config.xml
===================================================================
--- development/branches/jcamp/administrator/components/com_content/config.xml 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_content/config.xml 2010-08-31 19:21:09 UTC (rev 18740)
@@ -3,7 +3,7 @@
<fieldset
name="articles"
label="JGLOBAL_ARTICLES"
- description="COM_CONTENT_CONFIG_CATEGORY_SETTINGS_DESC">
+ description="COM_CONTENT_CONFIG_ARTICLE_SETTINGS_DESC">
<field
name="show_title"
@@ -89,7 +89,6 @@
value="1">JYes</option>
</field>
-
<field
name="spacer1"
type="spacer"
@@ -232,51 +231,206 @@
<option
value="1">JSHOW</option>
</field>
+
+ <field
+ name="show_noauth"
+ type="radio"
+ default="0"
+ label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
+ description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC">
+ <option
+ value="0">JNO</option>
+ <option
+ value="1">JYES</option>
+ </field>
</fieldset>
- <fieldset
- name="blog_default_parameters"
+ <fieldset name="category"
+ label="COM_CONTENT_CONFIG_CATEGORY_SETTINGS_LABEL"
+ description="COM_CONTENT_CONFIG_CATEGORY_SETTINGS_DESC"
+ >
+
+ <field name="show_category_title" type="radio"
+ label="JGLOBAL_SHOW_CATEGORY_TITLE"
+ description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
+ default="1"
+ >
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="show_description"
+ type="radio"
+ default="1"
+ label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
+ description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC">
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="show_description_image"
+ type="radio"
+ default="0"
+ label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
+ description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC">
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="maxLevel" type="list"
+ description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+ label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+ default="-1"
+ >
+ <option value="0">JNONE</option>
+ <option value="-1">JALL</option>
+ <option value="1">J1</option>
+ <option value="2">J2</option>
+ <option value="3">J3</option>
+ <option value="4">J4</option>
+ <option value="5">J5</option>
+ </field>
+
+ <field name="show_empty_categories" type="radio"
+ label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+ description="COM_CONTENT_SHOW_EMPTY_CATEGORIES_DESC"
+ default="0"
+ >
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="show_subcat_desc" type="radio"
+
+ label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+ description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+ default="1"
+ >
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="show_cat_num_articles" type="radio"
+ label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL"
+ description="COM_CONTENT_NUMBER_CATEGORY_ITEMS_DESC"
+ default="1"
+ >
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ </fieldset>
+
+ <fieldset name="categories"
+ label="COM_CONTENT_CONFIG_CATEGORIES_SETTINGS_LABEL"
+ description="COM_CONTENT_CONFIG_CATEGORIES_SETTINGS_DESC"
+ >
+ <field name="show_base_description" type="radio"
+ default="1"
+ label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
+ description="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC"
+ >
+
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="maxLevelcat" type="list"
+ default="-1"
+ description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+ label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+ >
+
+ <option value="-1">JALL</option>
+ <option value="1">J1</option>
+ <option value="2">J2</option>
+ <option value="3">J3</option>
+ <option value="4">J4</option>
+ <option value="5">J5</option>
+ </field>
+
+ <field name="show_empty_categories_cat" type="radio"
+ default="0"
+ label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+ description="COM_CONTENT_SHOW_EMPTY_CATEGORIES_DESC"
+ >
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="show_subcat_desc_cat" type="radio"
+ default="1"
+ label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+ description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+ >
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="show_cat_num_articles_cat" type="radio"
+ default="1"
+ label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL"
+ description="COM_CONTENT_NUMBER_CATEGORY_ITEMS_DESC"
+ >
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="spacer1"
+ type="spacer"
+ hr="true"
+ />
+
+ <field name="subslider" type="spacer"
+ label="COM_CONTENT_DRILL_CATEGORIES_LABEL"
+ />
+
+ <field
+ name="drill_down_layout"
+ type="radio"
+ default="0"
+ label="COM_CONTENT_DRILL_DOWN_LAYOUT_LABEL"
+ description="COM_CONTENT_DRILL_DOWN_LAYOUT_DESC">
+ <option value="0">JGLOBAL_LIST</option>
+ <option value="1">JGLOBAL_BLOG</option>
+ </field>
+
+ </fieldset>
+ <fieldset name="blog_default_parameters"
label="COM_CONTENT_CONFIG_BLOG_SETTINGS_LABEL"
description="COM_CONTENT_CONFIG_BLOG_SETTINGS_DESC"
>
- <field
- name="num_leading_articles"
+ <field name="num_leading_articles"
type="text"
default="1"
label="JGLOBAL_NUM_LEADING_ARTICLES_LABEL"
description="JGLOBAL_NUM_LEADING_ARTICLES_DESC">
</field>
- <field
- name="num_intro_articles"
+ <field name="num_intro_articles"
type="text"
default="4"
label="JGLOBAL_NUM_INTRO_ARTICLES_LABEL"
description="JGLOBAL_NUM_INTRO_ARTICLES_DESC">
</field>
- <field
- name="num_columns"
+ <field name="num_columns"
type="text"
default="2"
label="JGLOBAL_NUM_COLUMNS_LABEL"
description="JGLOBAL_NUM_COLUMNS_DESC">
</field>
- <field
- name="num_links"
+ <field name="num_links"
type="text"
default="4"
label="JGLOBAL_NUM_LINKS_LABEL"
description="JGLOBAL_NUM_LINKS_DESC">
</field>
-
-
- <field
- name="multi_column_order"
+ <field name="multi_column_order"
type="radio"
default="0"
label="JGLOBAL_MULTI_COLUMN_ORDER_LABEL"
@@ -286,55 +440,90 @@
<option
value="1">JGLOBAL_ACROSS</option>
</field>
-
- <field
- name="show_pagination"
+
+ <field name="spacer1"
+ type="spacer"
+ hr="true"
+ />
+
+ <field name="orderby_pri"
type="list"
- default="2"
- label="JGLOBAL_Pagination_Label"
- description="JGLOBAL_Pagination_Desc">
- <option value="0">JHIDE</option>
- <option value="1">JSHOW</option>
- <option value="2">JGLOBAL_AUTO</option>
+ default="none"
+ label="JGLOBAL_CATEGORY_ORDER_LABEL"
+ description="JGLOBAL_CATEGORY_ORDER_DESC">
+ <option
+ value="none">JGLOBAL_NO_ORDER</option>
+ <option
+ value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+ <option
+ value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+ <option
+ value="order">JGLOBAL_CATEGORY_MANAGER_ORDER</option>
</field>
- <field
- name="show_pagination_results"
- type="radio"
- default="1"
- label="JGLOBAL_PAGINATION_RESULTS_LABEL"
- description="JGLOBAL_PAGINATION_RESULTS_DESC">
- <option value="0">JHIDE</option>
- <option value="1">JSHOW</option>
+ <field name="orderby_sec"
+ type="list"
+ default="rdate"
+ label="JGLOBAL_Article_Order_Label"
+ description="JGLOBAL_Article_Order_Desc">
+ <option
+ value="rdate">JGLOBAL_MOST_RECENT_FIRST</option>
+ <option
+ value="date">JGLOBAL_OLDEST_FIRST</option>
+ <option
+ value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+ <option
+ value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+ <option
+ value="author">JGLOBAL_AUTHOR_ALPHABETICAL</option>
+ <option
+ value="rauthor">JGLOBAL_AUTHOR_REVERSE_ALPHABETICAL</option>
+ <option
+ value="hits">JGLOBAL_MOST_HITS</option>
+ <option
+ value="rhits">JGLOBAL_LEAST_HITS</option>
+ <option
+ value="order">JGLOBAL_ARTICLE_MANAGER_ORDER</option>
</field>
+
+ <field name="order_date" type="list"
+ default="published"
+ description="JGLOBAL_ORDERING_DATE_DESC"
+ label="JGLOBAL_ORDERING_DATE_LABEL"
+ >
+
+ <option value="created">JGLOBAL_CREATED</option>
+ <option value="modified">JGLOBAL_MODIFIED</option>
+ <option value="published">JPUBLISHED</option>
+ </field>
</fieldset>
- <fieldset
- name="list_default_parameters"
+ <fieldset name="list_default_parameters"
label="COM_CONTENT_CONFIG_LIST_SETTINGS_LABEL"
description="COM_CONTENT_CONFIG_LIST_SETTINGS_DESC"
>
- <field
- name="display_num"
+ <field name="show_pagination_limit"
+ type="radio" default="1"
+ label="JGLOBAL_DISPLAY_SELECT_LABEL"
+ description="JGLOBAL_DISPLAY_SELECT_DESC">
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="filter_field"
type="list"
- default="10"
- label="JGLOBAL_NUMBER_ITEMS_LIST_LABEL"
- description="JGLOBAL_NUMBER_ITEMS_LIST_DESC">
- <option value="5">J5</option>
- <option value="10">J10</option>
- <option value="15">J15</option>
- <option value="20">J20</option>
- <option value="25">J25</option>
- <option value="30">J30</option>
- <option value="50">J50</option>
- <option value="100">J100</option>
- <option value="0">JALL</option>
+ default="hide"
+ label="JGLOBAL_FILTER_FIELD_LABEL"
+ description="JGLOBAL_FILTER_FIELD_DESC">
+ <option value="hide">JHIDE</option>
+ <option value="title">JGLOBAL_TITLE</option>
+ <option value="author">JAUTHOR</option>
+ <option value="hits">JGLOBAL_HITS</option>
</field>
-
- <field
- name="show_headings"
+
+ <field name="show_headings"
type="radio"
default="1"
label="JGLOBAL_SHOW_HEADINGS_LABEL"
@@ -345,17 +534,9 @@
value="1">JSHOW</option>
</field>
- <field name="list_show_title" type="radio"
- description="JGLOBAL_LIST_TITLE_DESC"
- label="JGLOBAL_LIST_TITLE_LABEL"
- default="0"
- >
- <option value="0">JHIDE</option>
- <option value="1">JSHOW</option>
- </field>
+
- <field
- name="list_show_date"
+ <field name="list_show_date"
type="list"
default="0"
label="JGLOBAL_SHOW_DATE_LABEL"
@@ -372,8 +553,7 @@
label="JGLOBAL_DATE_FORMAT_LABEL"
description="JGLOBAL_DATE_FORMAT_DESC" />
- <field
- name="list_hits"
+ <field name="list_show_hits"
type="radio" default="1"
label="JGLOBAL_LIST_HITS_LABEL"
description="JGLOBAL_LIST_HITS_DESC">
@@ -381,8 +561,7 @@
<option value="1">JSHOW</option>
</field>
- <field
- name="list_author"
+ <field name="list_show_author"
type="radio" default="1"
label="JGLOBAL_LIST_AUTHOR_LABEL"
description="JGLOBAL_LIST_AUTHOR_DESC">
@@ -390,164 +569,28 @@
<option value="1">JSHOW</option>
</field>
- <field
- name="filter_field"
+ <field name="show_pagination"
type="list"
- default="hide"
- label="JGLOBAL_FILTER_FIELD_LABEL"
- description="JGLOBAL_FILTER_FIELD_DESC">
- <option value="hide">JHIDE</option>
- <option value="title">JGLOBAL_TITLE</option>
- <option value="author">JAUTHOR</option>
- <option value="hits">JGLOBAL_HITS</option>
- </field>
-
- <field
- name="show_pagination_limit"
- type="radio" default="1"
- label="JGLOBAL_DISPLAY_SELECT_LABEL"
- description="JGLOBAL_DISPLAY_SELECT_DESC">
+ default="2"
+ label="JGLOBAL_Pagination_Label"
+ description="JGLOBAL_Pagination_Desc">
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
+ <option value="2">JGLOBAL_AUTO</option>
</field>
- </fieldset>
-
- <fieldset
- name="categories"
- label="COM_CONTENT_CONFIG_CATEGORY_SETTINGS_LABEL"
- description="COM_CONTENT_CONFIG_CATEGORY_SETTINGS_DESC"
- >
-
- <field name="maxLevel" type="list"
- description="JGLOBAL_MAXLEVEL_DESC"
- label="JGLOBAL_MAXLEVEL_LABEL"
- default="1"
- >
- <option value="0">JNONE</option>
- <option value="1">J1</option>
- <option value="2">J2</option>
- <option value="3">J3</option>
- <option value="4">J4</option>
- <option value="5">J5</option>
- </field>
-
- <field name="show_category_title" type="list"
- label="JGLOBAL_SHOW_CATEGORY_TITLE"
- description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
- default="0"
- >
- <option value="0">JHIDE</option>
- <option value="1">JSHOW</option>
- </field>
-
- <field name="show_empty_categories" type="radio"
- label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
- description="JGLOBAL_SHOW_EMPTY_CATEGORIES_DESC"
- default="0"
- >
- <option value="0">JHIDE</option>
- <option value="1">JSHOW</option>
- </field>
-
- <field
- name="show_description"
- type="radio"
- default="0"
- label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
- description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC">
- <option value="0">JHIDE</option>
- <option value="1">JSHOW</option>
- </field>
-
- <field
- name="show_description_image"
+ <field name="show_pagination_results"
type="radio"
- default="0"
- label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
- description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC">
- <option value="0">JHIDE</option>
- <option value="1">JSHOW</option>
- </field>
-
-
- <field name="show_cat_num_articles" type="radio"
- label="JGLOBAL_NUMBER_CATEGORY_ITEMS_LABEL"
- description="JGLOBAL_NUMBER_CATEGORY_ITEMS_DESC"
- default="0"
- >
+ default="1"
+ label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+ description="JGLOBAL_PAGINATION_RESULTS_DESC">
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
- </field>
-
- <field
- name="drill_down_layout"
- type="radio"
- default="0"
- label="JGLOBAL_DRILL_DOWN_LAYOUT_LABEL"
- description="JGLOBAL_DRILL_DOWN_LAYOUT_DESC">
- <option value="0">JGLOBAL_LIST</option>
- <option value="1">JGLOBAL_BLOG</option>
- </field>
-
- <field
- name="orderby_pri"
- type="list"
- default="none"
- label="JGLOBAL_CATEGORY_ORDER_LABEL"
- description="JGLOBAL_CATEGORY_ORDER_DESC">
- <option
- value="none">JGLOBAL_NO_ORDER</option>
- <option
- value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
- <option
- value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
- <option
- value="order">JGLOBAL_CATEGORY_MANAGER_ORDER</option>
- </field>
-
- <field
- name="orderby_sec"
- type="list"
- default="rdate"
- label="JGLOBAL_Article_Order_Label"
- description="JGLOBAL_Article_Order_Desc">
- <option
- value="rdate">JGLOBAL_MOST_RECENT_FIRST</option>
- <option
- value="date">JGLOBAL_OLDEST_FIRST</option>
- <option
- value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
- <option
- value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
- <option
- value="author">JGLOBAL_AUTHOR_ALPHABETICAL</option>
- <option
- value="rauthor">JGLOBAL_AUTHOR_REVERSE_ALPHABETICAL</option>
- <option
- value="hits">JGLOBAL_MOST_HITS</option>
- <option
- value="rhits">JGLOBAL_LEAST_HITS</option>
- <option
- value="order">JGLOBAL_ARTICLE_MANAGER_ORDER</option>
- </field>
-
- <field
- name="show_noauth"
- type="radio"
- default="0"
- label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
- description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC">
- <option
- value="0">JNO</option>
- <option
- value="1">JYES</option>
- </field>
-
+ </field>
+
</fieldset>
-
- <fieldset
- name="integration"
+
+ <fieldset name="integration"
label="COM_CONTENT_CONFIG_INTEGRATION_SETTINGS_LABEL"
description="COM_CONTENT_CONFIG_INTEGRATION_SETTINGS_DESC"
>
Modified: development/branches/jcamp/administrator/components/com_content/controller.php
===================================================================
--- development/branches/jcamp/administrator/components/com_content/controller.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_content/controller.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -37,11 +37,11 @@
{
require_once JPATH_COMPONENT.'/helpers/content.php';
- parent::display();
-
// Load the submenu.
ContentHelper::addSubmenu(JRequest::getWord('view', 'articles'));
+ parent::display();
+
return $this;
}
}
\ No newline at end of file
Modified: development/branches/jcamp/administrator/components/com_content/controllers/article.php
===================================================================
--- development/branches/jcamp/administrator/components/com_content/controllers/article.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_content/controllers/article.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -1,6 +1,8 @@
<?php
/**
* @version $Id$
+ * @package Joomla.Administrator
+ * @subpackage com_content
* @copyright Copyright (C) 2005 - 2010 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
@@ -17,6 +19,26 @@
class ContentControllerArticle extends JControllerForm
{
/**
+ * Class constructor.
+ *
+ * @param array $config A named array of configuration variables.
+ *
+ * @return JControllerForm
+ * @since 1.6
+ */
+ function __construct($config = array())
+ {
+ // An article edit form can come from the articles or featured view.
+ // Adjust the redirect view on the value of 'return' in the request.
+ if (JRequest::getCmd('return') == 'featured') {
+ $this->view_list = 'featured';
+ $this->view_item = 'article&return=featured';
+ }
+
+ parent::__construct($config);
+ }
+
+ /**
* Method override to check if you can add a new record.
*
* @param array An array of input data.
@@ -30,13 +52,12 @@
$categoryId = JArrayHelper::getValue($data, 'catid', JRequest::getInt('filter_category_id'), 'int');
$allow = null;
- if ($categoryId)
- {
+ if ($categoryId) {
// If the category has been passed in the URL check it.
$allow = $user->authorise('core.create', 'com_content.category.'.$categoryId);
}
- if ($allow === null)
- {
+
+ if ($allow === null) {
// In the absense of better information, revert to the component permissions.
return parent::allowAdd();
}
Modified: development/branches/jcamp/administrator/components/com_content/models/article.php
===================================================================
--- development/branches/jcamp/administrator/components/com_content/models/article.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_content/models/article.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -178,9 +178,6 @@
return true;
}
- $cache = JFactory::getCache('com_content');
- $cache->clean();
-
return false;
}
Modified: development/branches/jcamp/administrator/components/com_content/models/fields/modal/article.php
===================================================================
--- development/branches/jcamp/administrator/components/com_content/models/fields/modal/article.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_content/models/fields/modal/article.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -72,7 +72,7 @@
// The current user display field.
$html[] = '<div class="fltlft">';
- $html[] = ' <input type="text" id="'.$this->id.'_name" value="'.$title.'" disabled="disabled" />';
+ $html[] = ' <input type="text" id="'.$this->id.'_name" value="'.$title.'" disabled="disabled" size="35" />';
$html[] = '</div>';
// The user select button.
Modified: development/branches/jcamp/administrator/components/com_content/models/forms/article.xml
===================================================================
--- development/branches/jcamp/administrator/components/com_content/models/forms/article.xml 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_content/models/forms/article.xml 2010-08-31 19:21:09 UTC (rev 18740)
@@ -123,134 +123,203 @@
<fields name="attribs">
<fieldset name="basic" label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL">
- <field name="show_title" type="list"
- label="JGLOBAL_SHOW_TITLE_LABEL" description="JGLOBAL_SHOW_TITLE_DESC"
- >
+ <field
+ name="show_title"
+ type="list"
+ label="JGLOBAL_SHOW_TITLE_LABEL"
+ description="JGLOBAL_SHOW_TITLE_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
- <field name="link_titles" type="list"
- label="JGLOBAL_LINKED_TITLES_LABEL" description="JGLOBAL_LINKED_TITLES_DESC"
- >
+ <field
+ name="link_titles"
+ type="list"
+ label="JGLOBAL_LINKED_TITLES_LABEL"
+ description="JGLOBAL_LINKED_TITLES_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
- <option value="0">JNO</option>
+ <option value="0">JNO</option>
<option value="1">JYES</option>
</field>
+
<field name="show_intro" type="list"
- label="JGLOBAL_SHOW_INTRO_LABEL" description="JGLOBAL_SHOW_INTRO_DESC"
- >
+ description="JGLOBAL_SHOW_INTRO_DESC"
+ label="JGLOBAL_SHOW_INTRO_LABEL"
+ >
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
- <field name="show_category" type="list"
- label="JGLOBAL_SHOW_CATEGORY_LABEL" description="JGLOBAL_SHOW_CATEGORY_DESC"
- >
+ <field
+ name="show_category"
+ type="list"
+ label="JGLOBAL_SHOW_CATEGORY_LABEL"
+ description="JGLOBAL_SHOW_CATEGORY_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
- <option value="0">JHIDE</option>
- <option value="1">JSHOW</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
</field>
- <field name="link_category" type="list"
- label="JGLOBAL_LINK_CATEGORY_LABEL" description="JGLOBAL_LINK_CATEGORY_DESC"
- >
+ <field
+ name="link_category"
+ type="list"
+ label="JGLOBAL_LINK_CATEGORY_LABEL"
+ description="JGLOBAL_LINK_CATEGORY_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
- <option value="0">JNO</option>
- <option value="1">JYES</option>
+ <option value="0">JNO</option>
+ <option value="1">JYES</option>
</field>
- <field name="show_parent_category" type="list"
- label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL" description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC"
- >
- <option value="">JGLOBAL_USE_GLOBAL</option>
- <option value="0">JHIDE</option>
- <option value="1">JSHOW</option>
+ <field
+ name="show_parent_category"
+ type="list"
+ label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
+ description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC">
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
</field>
- <field name="link_parent_category" type="list"
- label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL" description="JGLOBAL_LINK_PARENT_CATEGORY_DESC"
- >
+ <field
+ name="link_parent_category"
+ type="list"
+ label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
+ description="JGLOBAL_LINK_PARENT_CATEGORY_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
- <option value="0">JNO</option>
- <option value="1">JYES</option>
+ <option value="0">JNO</option>
+ <option value="1">JYES</option>
</field>
- <field name="show_author" type="list"
- label="JGLOBAL_SHOW_AUTHOR_LABEL" description="JGLOBAL_SHOW_AUTHOR_DESC"
- >
- <option value="">JGLOBAL_USE_GLOBAL</option>
- <option value="0">JHIDE</option>
- <option value="1">JSHOW</option>
+ <field
+ name="show_author"
+ type="list"
+ label="JGLOBAL_SHOW_AUTHOR_LABEL"
+ description="JGLOBAL_SHOW_AUTHOR_DESC">
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
</field>
- <field name="show_create_date" type="list"
- label="JGLOBAL_SHOW_CREATE_DATE_LABEL" description="JGLOBAL_SHOW_CREATE_DATE_DESC"
- >
- <option value="">JGLOBAL_USE_GLOBAL</option>
- <option value="0">JHIDE</option>
- <option value="1">JSHOW</option>
+ <field
+ name="link_author"
+ type="list"
+ label="JGLOBAL_LINK_AUTHOR_LABEL"
+ description="JGLOBAL_LINK_AUTHOR_DESC">
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JNO</option>
+ <option value="1">JYES</option>
</field>
- <field name="show_modify_date" type="list"
- label="JGLOBAL_SHOW_MODIFY_DATE_LABEL" description="JGLOBAL_SHOW_MODIFY_DATE_DESC"
- >
- <option value="">JGLOBAL_USE_GLOBAL</option>
- <option value="0">JHIDE</option>
- <option value="1">JSHOW</option>
+ <field
+ name="show_create_date"
+ type="list"
+ label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
+ description="JGLOBAL_SHOW_CREATE_DATE_DESC">
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
</field>
- <field name="show_publish_date" type="list"
- label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL" description="JGLOBAL_SHOW_PUBLISH_DATE_DESC"
- >
- <option value="">JGLOBAL_USE_GLOBAL</option>
- <option value="0">JHIDE</option>
- <option value="1">JSHOW</option>
+ <field
+ name="show_modify_date"
+ type="list"
+ label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
+ description="JGLOBAL_SHOW_MODIFY_DATE_DESC">
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
</field>
- <field name="show_readmore" type="list"
- label="JGLOBAL_SHOW_READMORE_LABEL" description="JGLOBAL_SHOW_READMORE_DESC"
- >
+ <field
+ name="show_publish_date"
+ type="list"
+ label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
+ description="JGLOBAL_SHOW_PUBLISH_DATE_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
- <option value="0">JHIDE</option>
- <option value="1">JSHOW</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
</field>
- <field name="show_print_icon" type="list"
- label="JGLOBAL_SHOW_PRINT_ICON_LABEL" description="JGLOBAL_SHOW_PRINT_ICON_DESC"
- >
+ <field
+ name="show_item_navigation"
+ type="list"
+ label="JGLOBAL_SHOW_NAVIGATION_LABEL"
+ description="JGLOBAL_SHOW_NAVIGATION_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="0">JHIDE</option>
- <option value="1">JSHOW</option>
+ <option value="1">JSHOW</option>
</field>
- <field name="show_email_icon" type="list"
- label="JGLOBAL_SHOW_EMAIL_ICON_LABEL" description="JGLOBAL_SHOW_EMAIL_ICON_DESC"
- >
+ <field
+ name="show_icons"
+ type="list"
+ label="JGLOBAL_SHOW_ICONS_LABEL"
+ description="JGLOBAL_SHOW_ICONS_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
- <option value="0">JHIDE</option>
- <option value="1">JSHOW</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
</field>
- <field name="show_hits" type="list"
- label="JGLOBAL_SHOW_HITS_LABEL" description="JGLOBAL_SHOW_HITS_DESC"
- >
+ <field
+ name="show_print_icon"
+ type="list"
+ label="JGLOBAL_SHOW_PRINT_ICON_LABEL"
+ description="JGLOBAL_SHOW_PRINT_ICON_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
- <option value="0">JHIDE</option>
- <option value="1">JSHOW</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
</field>
+ <field
+ name="show_email_icon"
+ type="list"
+ label="JGLOBAL_SHOW_EMAIL_ICON_LABEL"
+ description="JGLOBAL_SHOW_EMAIL_ICON_DESC">
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field
+ name="show_hits"
+ type="list"
+ label="JGLOBAL_SHOW_HITS_LABEL"
+ description="JGLOBAL_SHOW_HITS_DESC">
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field
+ name="show_noauth"
+ type="list"
+ label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
+ description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC">
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JNO</option>
+ <option value="1">JYES</option>
+ </field>
+
+ <field
+ name="spacer2"
+ type="spacer"
+ hr="true"
+ />
+
<field name="page_title" type="text"
- label="JFIELD_ALT_PAGE_TITLE_LABEL" description="JFIELD_ALT_PAGE_TITLE_DESC"
+ label="JFIELD_ALT_PAGE_TITLE_LABEL"
+ description="JFIELD_ALT_PAGE_TITLE_DESC"
size="25" />
<field name="alternative_readmore" type="inputbox"
- label="JFIELD_READMORE_LABEL" description="JFIELD_READMORE_DESC"
+ label="JFIELD_READMORE_LABEL"
+ description="JFIELD_READMORE_DESC"
class="inputbox" size="25" />
- <field name="layout" type="componentlayout" label="JFIELD_ALT_LAYOUT_LABEL"
+ <field name="layout" type="componentlayout"
+ label="JFIELD_ALT_LAYOUT_LABEL"
description="JFIELD_ALT_COMPONENT_LAYOUT_DESC"
extension="com_content" view="article" />
Modified: development/branches/jcamp/administrator/components/com_content/views/article/tmpl/edit.php
===================================================================
--- development/branches/jcamp/administrator/components/com_content/views/article/tmpl/edit.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_content/views/article/tmpl/edit.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -31,7 +31,7 @@
}
</script>
-<form action="<?php JRoute::_('index.php?option=com_content'); ?>" method="post" name="adminForm" id="item-form" class="form-validate">
+<form action="<?php echo JRoute::_('index.php?option=com_content'); ?>" method="post" name="adminForm" id="item-form" class="form-validate">
<div class="width-60 fltlft">
<fieldset class="adminform">
<legend><?php echo empty($this->item->id) ? JText::_('COM_CONTENT_NEW_ARTICLE') : JText::sprintf('COM_CONTENT_EDIT_ARTICLE', $this->item->id); ?></legend>
@@ -132,6 +132,7 @@
<?php echo JHtml::_('sliders.end'); ?>
<input type="hidden" name="task" value="" />
+ <input type="hidden" name="return" value="<?php echo JRequest::getCmd('return');?>" />
<?php echo JHtml::_('form.token'); ?>
</div>
</form>
Modified: development/branches/jcamp/administrator/components/com_content/views/article/tmpl/pagebreak.php
===================================================================
--- development/branches/jcamp/administrator/components/com_content/views/article/tmpl/pagebreak.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_content/views/article/tmpl/pagebreak.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -8,32 +8,27 @@
*/
defined('_JEXEC') or die;
-?>
- <script type="text/javascript">
- function insertPagebreak()
- {
- // Get the pagebreak title
- var title = document.getElementById("title").value;
- if (title != '') {
- title = "title=\""+title+"\" ";
- }
+$script = 'function insertPagebreak() {'."\n\t";
+// Get the pagebreak title
+$script .= 'var title = document.getElementById("title").value;'."\n\t";
+$script .= 'if (title != \'\') {'."\n\t\t";
+$script .= 'title = "title=\""+title+"\" ";'."\n\t";
+$script .= '}'."\n\t";
+// Get the pagebreak toc alias -- not inserting for now
+// don't know which attribute to use...
+$script .= 'var alt = document.getElementById("alt").value;'."\n\t";
+$script .= 'if (alt != \'\') {'."\n\t\t";
+$script .= 'alt = "alt=\""+alt+"\" ";'."\n\t";
+$script .= '}'."\n\t";
+$script .= 'var tag = "<hr class=\"system-pagebreak\" "+title+" "+alt+"/>";'."\n\t";
+$script .= 'window.parent.jInsertEditorText(tag, \''.$this->eName.'\');'."\n\t";
+$script .= 'window.parent.SqueezeBox.close();'."\n\t";
+$script .= 'return false;'."\n";
+$script .= '}'."\n";
- // Get the pagebreak toc alias -- not inserting for now
- // don't know which attribute to use...
- var alt = document.getElementById("alt").value;
- if (alt != '') {
- alt = "alt=\""+alt+"\" ";
- }
-
- var tag = "<hr class=\"system-pagebreak\" "+title+" "+alt+"/>";
-
- window.parent.jInsertEditorText(tag, '<?php echo $this->eName; ?>');
- window.parent.SqueezeBox.close();
- return false;
- }
- </script>
-
+JFactory::getDocument()->addScriptDeclaration($script);
+?>
<form>
<table width="100%" align="center">
<tr width="40%">
@@ -58,4 +53,4 @@
</tr>
</table>
</form>
- <button onclick="insertPagebreak();"><?php echo JText::_( 'COM_CONTENT_PAGEBREAK_INSERT_BUTTON' ); ?></button>
\ No newline at end of file
+ <button onclick="insertPagebreak();"><?php echo JText::_( 'COM_CONTENT_PAGEBREAK_INSERT_BUTTON' ); ?></button>
Modified: development/branches/jcamp/administrator/components/com_content/views/article/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_content/views/article/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_content/views/article/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -68,9 +68,11 @@
JToolBarHelper::title(JText::_('COM_CONTENT_PAGE_'.($checkedOut ? 'VIEW_ARTICLE' : ($isNew ? 'ADD_ARTICLE' : 'EDIT_ARTICLE'))), 'article-add.png');
// If not checked out, can save the item.
- if (!$checkedOut && $canDo->get('core.edit')) {
+ if (!$checkedOut && ($canDo->get('core.edit') || $canDo->get('core.create'))) {
JToolBarHelper::apply('article.apply', 'JTOOLBAR_APPLY');
JToolBarHelper::save('article.save', 'JTOOLBAR_SAVE');
+ }
+ if (!$checkedOut && $canDo->get('core.create')) {
JToolBarHelper::custom('article.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
}
Modified: development/branches/jcamp/administrator/components/com_content/views/articles/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_content/views/articles/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_content/views/articles/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -19,7 +19,7 @@
$canOrder = $user->authorise('core.edit.state', 'com_content.article');
$saveOrder = $listOrder == 'a.ordering';
?>
-<form action="<?php echo JRoute::_('index.php?option=com_content&view=articles');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_content&view=articles');?>" method="post" name="adminForm" id="adminForm">
<fieldset id="filter-bar">
<div class="filter-search fltlft">
<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
@@ -110,7 +110,7 @@
$item->max_ordering = 0; //??
$ordering = ($listOrder == 'a.ordering');
$canCreate = $user->authorise('core.create', 'com_content.category.'.$item->catid);
- $canEdit = $user->authorise('core.edit', 'com_content.article.'.$item->id);
+ $canEdit = $user->authorise('core.edit', 'com_content.category.article.'.$item->id);
$canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out==$user->get('id') || $item->checked_out==0;
$canChange = $user->authorise('core.edit.state', 'com_content.article.'.$item->id) && $canCheckin;
?>
@@ -122,7 +122,7 @@
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'articles.', $canCheckin); ?>
<?php endif; ?>
- <?php if ($canCreate || $canEdit) : ?>
+ <?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_content&task=article.edit&id='.$item->id);?>">
<?php echo $this->escape($item->title); ?></a>
<?php else : ?>
@@ -143,8 +143,13 @@
<td class="order">
<?php if ($canChange) : ?>
<?php if ($saveOrder) :?>
- <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid), 'articles.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
- <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, ($item->catid == @$this->items[$i+1]->catid), 'articles.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php if ($listDirn == 'asc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid), 'articles.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, ($item->catid == @$this->items[$i+1]->catid), 'articles.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php elseif ($listDirn == 'desc') :?>
+ <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid), 'articles.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, ($item->catid == @$this->items[$i+1]->catid), 'articles.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php endif; ?>
<?php endif; ?>
<?php $disabled = $saveOrder ? '' : 'disabled="disabled"'; ?>
<input type="text" name="order[]" size="5" value="<?php echo $item->ordering;?>" <?php echo $disabled ?> class="text-area-order" />
Modified: development/branches/jcamp/administrator/components/com_content/views/articles/tmpl/modal.php
===================================================================
--- development/branches/jcamp/administrator/components/com_content/views/articles/tmpl/modal.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_content/views/articles/tmpl/modal.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -17,7 +17,7 @@
$listOrder = $this->state->get('list.ordering');
$listDirn = $this->state->get('list.direction');
?>
-<form action="<?php echo JRoute::_('index.php?option=com_content&view=articles&layout=modal&tmpl=component&function='.$function);?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_content&view=articles&layout=modal&tmpl=component&function='.$function);?>" method="post" name="adminForm" id="adminForm">
<fieldset class="filter clearfix">
<div class="left">
<label for="filter_search">
Modified: development/branches/jcamp/administrator/components/com_content/views/articles/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_content/views/articles/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_content/views/articles/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -67,7 +67,7 @@
JToolBarHelper::divider();
JToolBarHelper::archiveList('articles.archive','JTOOLBAR_ARCHIVE');
}
- if(JFactory::getUser()->authorise('core.manage','com_checkin')) {
+ 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')) {
Modified: development/branches/jcamp/administrator/components/com_content/views/featured/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_content/views/featured/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_content/views/featured/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -19,7 +19,7 @@
$canOrder = $user->authorise('core.edit.state', 'com_content.article');
$saveOrder = $listOrder == 'fp.ordering';
?>
-<form action="<?php echo JRoute::_('index.php?option=com_content&view=featured');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_content&view=featured');?>" method="post" name="adminForm" id="adminForm">
<fieldset id="filter-bar">
<div class="filter-search fltlft">
<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
@@ -28,15 +28,16 @@
<button type="button" onclick="document.id('filter_search').value='';this.form.submit();"><?php echo JText::_('JSearch_Filter_Clear'); ?></button>
</div>
<div class="filter-select fltrt">
- <select name="filter_access" class="inputbox" onchange="this.form.submit()">
- <option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
- <?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
- </select>
<select name="filter_published" class="inputbox" onchange="this.form.submit()">
<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true);?>
</select>
+
+ <select name="filter_access" class="inputbox" onchange="this.form.submit()">
+ <option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
+ <?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?> </select>
+
<select name="filter_language" class="inputbox" onchange="this.form.submit()">
<option value=""><?php echo JText::_('JOPTION_SELECT_LANGUAGE');?></option>
<?php echo JHtml::_('select.options', JHtml::_('contentlanguage.existing', true, true), 'value', 'text', $this->state->get('filter.language'));?>
@@ -111,8 +112,8 @@
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'featured.', $canCheckin); ?>
<?php endif; ?>
- <?php if ($canCreate || $canEdit) : ?>
- <a href="<?php echo JRoute::_('index.php?option=com_content&task=article.edit&id='.$item->id);?>">
+ <?php if ($canEdit) : ?>
+ <a href="<?php echo JRoute::_('index.php?option=com_content&task=article.edit&return=featured&id='.$item->id);?>">
<?php echo $this->escape($item->title); ?></a>
<?php else : ?>
<?php echo $this->escape($item->title); ?>
@@ -129,8 +130,13 @@
<td class="order">
<?php if ($canChange) : ?>
<?php if ($saveOrder) :?>
- <span><?php echo $this->pagination->orderUpIcon($i, true, 'featured.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
- <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'featured.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php if ($listDirn == 'asc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, true, 'featured.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'featured.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php elseif ($listDirn == 'desc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, true, 'featured.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'featured.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php endif; ?>
<?php endif; ?>
<?php $disabled = $saveOrder ? '' : 'disabled="disabled"'; ?>
<input type="text" name="order[]" size="5" value="<?php echo $item->ordering;?>" <?php echo $disabled ?> class="text-area-order" />
@@ -167,6 +173,7 @@
<div>
<input type="hidden" name="task" value="" />
+ <input type="hidden" name="featured" value="1" />
<input type="hidden" name="boxchecked" value="0" />
<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
Modified: development/branches/jcamp/administrator/components/com_content/views/featured/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_content/views/featured/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_content/views/featured/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -61,11 +61,7 @@
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();
- if ($this->state->get('filter.published') != -1) {
- JToolBarHelper::archiveList('articles.archive','JTOOLBAR_ARCHIVE');
- }
- }
- if(JFactory::getUser()->authorise('core.manage','com_checkin')) {
+ JToolBarHelper::archiveList('articles.archive','JTOOLBAR_ARCHIVE');
JToolBarHelper::custom('articles.checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true);
}
if ($canDo->get('core.edit.state')) {
Modified: development/branches/jcamp/administrator/components/com_installer/config.xml
===================================================================
--- development/branches/jcamp/administrator/components/com_installer/config.xml 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_installer/config.xml 2010-08-31 19:21:09 UTC (rev 18740)
@@ -23,10 +23,6 @@
title="JACTION_MANAGE"
description="JACTION_MANAGE_COMPONENT_DESC" />
<action
- name="core.create"
- title="JACTION_CREATE"
- description="JACTION_CREATE_COMPONENT_DESC" />
- <action
name="core.delete"
title="JACTION_DELETE"
description="JACTION_DELETE_COMPONENT_DESC" />
Modified: development/branches/jcamp/administrator/components/com_installer/controller.php
===================================================================
--- development/branches/jcamp/administrator/components/com_installer/controller.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_installer/controller.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -56,11 +56,9 @@
// Push document object into the view.
$view->assignRef('document', $document);
-
- $view->display();
-
// Load the submenu.
InstallerHelper::addSubmenu($vName);
+ $view->display();
}
return $this;
Modified: development/branches/jcamp/administrator/components/com_installer/helpers/installer.php
===================================================================
--- development/branches/jcamp/administrator/components/com_installer/helpers/installer.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_installer/helpers/installer.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -67,7 +67,7 @@
$assetName = 'com_installer';
$actions = array(
- 'core.admin', 'core.manage', 'core.create', 'core.edit.state', 'core.delete'
+ 'core.admin', 'core.manage', 'core.edit.state', 'core.delete'
);
foreach ($actions as $action) {
Modified: development/branches/jcamp/administrator/components/com_installer/models/fields/type.php
===================================================================
--- development/branches/jcamp/administrator/components/com_installer/models/fields/type.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_installer/models/fields/type.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -41,13 +41,19 @@
foreach ($this->element->children() as $option) {
$options[] = JHtml::_('select.option', $option->attributes('value'), JText::_(trim($option->data())));
}
- $options[] = JHtml::_('select.option', 'component', JText::sprintf('COM_INSTALLER_TYPE_COMPONENT'));
- $options[] = JHtml::_('select.option', 'module', JText::sprintf('COM_INSTALLER_TYPE_MODULE'));
- $options[] = JHtml::_('select.option', 'plugin', JText::sprintf('COM_INSTALLER_TYPE_PLUGIN'));
- $options[] = JHtml::_('select.option', 'template', JText::sprintf('COM_INSTALLER_TYPE_TEMPLATE'));
- $options[] = JHtml::_('select.option', 'language', JText::sprintf('COM_INSTALLER_TYPE_LANGUAGE'));
- $options[] = JHtml::_('select.option', 'library', JText::sprintf('COM_INSTALLER_TYPE_LIBRARY'));
+
+ $db = JFactory::getDBO();
+ $query = $db->getQuery(true);
+ $query->select('type')->from('#__extensions');
+ $db->setQuery($query);
+ $types = array_unique($db->loadResultArray());
+ foreach($types as $type)
+ {
+ $options[] = JHtml::_('select.option', $type, JText::_('COM_INSTALLER_TYPE_'. strtoupper($type)));
+ }
+
$return = JHtml::_('select.genericlist', $options, $this->name, $onchange, 'value', 'text', $this->value, $this->id);
+
return $return;
}
}
\ No newline at end of file
Modified: development/branches/jcamp/administrator/components/com_installer/models/forms/manage.xml
===================================================================
--- development/branches/jcamp/administrator/components/com_installer/models/forms/manage.xml 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_installer/models/forms/manage.xml 2010-08-31 19:21:09 UTC (rev 18740)
@@ -24,6 +24,16 @@
name="select"
>
<field type="list"
+ name="client_id"
+ hidden="true"
+ onchange="this.form.submit();"
+ >
+ <option value="">COM_INSTALLER_VALUE_CLIENT_SELECT</option>
+ <option value="0">JSITE</option>
+ <option value="1">JADMINISTRATOR</option>
+ </field>
+
+ <field type="list"
name="enabled"
hidden="true"
onchange="this.form.submit();"
@@ -48,15 +58,6 @@
<option value="">COM_INSTALLER_VALUE_FOLDER_SELECT</option>
<option value="*">COM_INSTALLER_VALUE_FOLDER_NONAPPLICABLE</option>
</field>
- <field type="list"
- name="client_id"
- hidden="true"
- onchange="this.form.submit();"
- >
- <option value="">COM_INSTALLER_VALUE_CLIENT_SELECT</option>
- <option value="0">JSITE</option>
- <option value="1">JADMINISTRATOR</option>
- </field>
</fieldset>
</fields>
</form>
Modified: development/branches/jcamp/administrator/components/com_installer/views/discover/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_installer/views/discover/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_installer/views/discover/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -14,7 +14,7 @@
$listOrder = $this->state->get('list.ordering');
$listDirn = $this->state->get('list.direction');
?>
-<form action="<?php echo JRoute::_('index.php?option=com_installer&view=discover');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_installer&view=discover');?>" method="post" name="adminForm" id="adminForm">
<?php if ($this->showMessage) : ?>
<?php echo $this->loadTemplate('message'); ?>
<?php endif; ?>
Modified: development/branches/jcamp/administrator/components/com_installer/views/install/tmpl/default_form.php
===================================================================
--- development/branches/jcamp/administrator/components/com_installer/views/install/tmpl/default_form.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_installer/views/install/tmpl/default_form.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -37,7 +37,7 @@
}
</script>
-<form enctype="multipart/form-data" action="<?php echo JRoute::_('index.php?option=com_installer&view=install');?>" method="post" name="adminForm">
+<form enctype="multipart/form-data" action="<?php echo JRoute::_('index.php?option=com_installer&view=install');?>" method="post" name="adminForm" id="adminForm">
<?php if ($this->ftp) : ?>
<?php echo $this->loadTemplate('ftp'); ?>
Modified: development/branches/jcamp/administrator/components/com_installer/views/manage/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_installer/views/manage/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_installer/views/manage/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -14,7 +14,7 @@
$listOrder = $this->state->get('list.ordering');
$listDirn = $this->state->get('list.direction');
?>
-<form action="<?php echo JRoute::_('index.php?option=com_installer&view=manage');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_installer&view=manage');?>" method="post" name="adminForm" id="adminForm">
<?php if ($this->showMessage) : ?>
<?php echo $this->loadTemplate('message'); ?>
<?php endif; ?>
@@ -34,11 +34,14 @@
</th>
<th class="nowrap">
<?php echo JHTML::_('grid.sort', 'COM_INSTALLER_HEADING_NAME', 'name', $listDirn, $listOrder); ?>
- </th>
+ </th>
+ <th>
+ <?php echo JHTML::_('grid.sort', 'COM_INSTALLER_HEADING_LOCATION', 'client_id', $listDirn, $listOrder); ?>
+ </th>
<th width="10%" class="center">
<?php echo JHTML::_('grid.sort', 'JENABLED', 'enabled', $listDirn, $listOrder); ?>
</th>
- <th>
+ <th>
<?php echo JHTML::_('grid.sort', 'COM_INSTALLER_HEADING_TYPE', 'type', $listDirn, $listOrder); ?>
</th>
<th width="10%" class="center">
@@ -47,15 +50,12 @@
<th width="10%">
<?php echo JText::_('JDATE'); ?>
</th>
+ <th width="15%">
+ <?php echo JText::_('JAUTHOR'); ?>
+ </th>
<th>
<?php echo JHTML::_('grid.sort', 'COM_INSTALLER_HEADING_FOLDER', 'folder', $listDirn, $listOrder); ?>
</th>
- <th>
- <?php echo JHTML::_('grid.sort', 'COM_INSTALLER_HEADING_LOCATION', 'client_id', $listDirn, $listOrder); ?>
- </th>
- <th width="15%">
- <?php echo JText::_('JAUTHOR'); ?>
- </th>
<th width="10">
<?php echo JHTML::_('grid.sort', 'COM_INSTALLER_HEADING_ID', 'extension_id', $listDirn, $listOrder); ?>
</th>
@@ -77,15 +77,18 @@
<td>
<span class="bold hasTip" title="<?php echo htmlspecialchars($item->name.'::'.$item->description); ?>">
<?php echo $item->name; ?></span>
- </td>
+ </td>
<td class="center">
+ <?php echo $item->client; ?>
+ </td>
+ <td class="center">
<?php if (!$item->element) : ?>
<strong>X</strong>
<?php else : ?>
<?php echo JHtml::_('jgrid.published', $item->enabled, $i, 'manage.');?>
<?php endif; ?>
</td>
- <td class="center">
+ <td class="center">
<?php echo JText::_('COM_INSTALLER_TYPE_' . $item->type); ?>
</td>
<td class="center">
@@ -95,15 +98,12 @@
<?php echo @$item->creationDate != '' ? $item->creationDate : ' '; ?>
</td>
<td class="center">
- <?php echo @$item->folder != '' ? $item->folder : JText::_('COM_INSTALLER_TYPE_NONAPPLICABLE'); ?>
+ <span class="editlinktip hasTip" title="<?php echo addslashes(htmlspecialchars(JText::_('COM_INSTALLER_AUTHOR_INFORMATION').'::'.$item->author_info)); ?>">
+ <?php echo @$item->author != '' ? $item->author : ' '; ?></span>
</td>
<td class="center">
- <?php echo $item->client; ?>
+ <?php echo @$item->folder != '' ? $item->folder : JText::_('COM_INSTALLER_TYPE_NONAPPLICABLE'); ?>
</td>
- <td class="center">
- <span class="editlinktip hasTip" title="<?php echo addslashes(htmlspecialchars(JText::_('COM_INSTALLER_AUTHOR_INFORMATION').'::'.$item->author_info)); ?>">
- <?php echo @$item->author != '' ? $item->author : ' '; ?></span>
- </td>
<td>
<?php echo $item->extension_id ?>
</td>
Modified: development/branches/jcamp/administrator/components/com_installer/views/manage/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_installer/views/manage/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_installer/views/manage/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -63,8 +63,8 @@
{
$canDo = InstallerHelper::getActions();
if ($canDo->get('core.edit.state')) {
- JToolBarHelper::custom('manage.publish', 'publish.png', 'publish_f2.png', 'JTOOLBAR_PUBLISH', true);
- JToolBarHelper::custom('manage.unpublish', 'unpublish.png', 'unpublish_f2.png', 'JTOOLBAR_UNPUBLISH', true);
+ JToolBarHelper::custom('manage.publish', 'publish.png', 'publish_f2.png', 'JTOOLBAR_ENABLE', true);
+ JToolBarHelper::custom('manage.unpublish', 'unpublish.png', 'unpublish_f2.png', 'JTOOLBAR_DISABLE', true);
JToolBarHelper::divider();
}
JToolBarHelper::custom('manage.refresh', 'refresh', 'refresh','JTOOLBAR_REFRESH_CACHE',true);
Modified: development/branches/jcamp/administrator/components/com_installer/views/update/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_installer/views/update/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_installer/views/update/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -14,7 +14,7 @@
$listOrder = $this->state->get('list.ordering');
$listDirn = $this->state->get('list.direction');
?>
-<form action="<?php echo JRoute::_('index.php?option=com_installer&view=update');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_installer&view=update');?>" method="post" name="adminForm" id="adminForm">
<?php if ($this->showMessage) : ?>
<?php echo $this->loadTemplate('message'); ?>
<?php endif; ?>
Modified: development/branches/jcamp/administrator/components/com_installer/views/warnings/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_installer/views/warnings/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_installer/views/warnings/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -11,7 +11,7 @@
// no direct access
defined('_JEXEC') or die;
?>
-<form action="<?php echo JRoute::_('index.php?option=com_installer&view=warnings');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_installer&view=warnings');?>" method="post" name="adminForm" id="adminForm">
<?php
if (!count($this->messages)) {
Modified: development/branches/jcamp/administrator/components/com_languages/controller.php
===================================================================
--- development/branches/jcamp/administrator/components/com_languages/controller.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_languages/controller.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -8,6 +8,8 @@
// Check to ensure this file is included in Joomla!
defined('_JEXEC') or die;
+jimport('joomla.application.component.controller');
+
/**
* Languages Controller
*
@@ -36,11 +38,11 @@
{
require_once JPATH_COMPONENT.'/helpers/languages.php';
- parent::display();
-
// Load the submenu.
LanguagesHelper::addSubmenu(JRequest::getWord('view', 'installed'));
+ parent::display();
+
return $this;
}
Modified: development/branches/jcamp/administrator/components/com_languages/helpers/languages.php
===================================================================
--- development/branches/jcamp/administrator/components/com_languages/helpers/languages.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_languages/helpers/languages.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -35,4 +35,25 @@
$vName == 'languages'
);
}
+
+ /**
+ * Gets a list of the actions that can be performed.
+ *
+ * @return JObject
+ */
+ public static function getActions()
+ {
+ $user = JFactory::getUser();
+ $result = new JObject;
+
+ $actions = array(
+ 'core.admin', 'core.manage', 'core.create', 'core.edit', 'core.edit.state', 'core.delete'
+ );
+
+ foreach ($actions as $action) {
+ $result->set($action, $user->authorise($action, 'com_languages'));
+ }
+
+ return $result;
+ }
}
Modified: development/branches/jcamp/administrator/components/com_languages/views/installed/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_languages/views/installed/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_languages/views/installed/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -10,9 +10,11 @@
defined('_JEXEC') or die;
// Add specific helper files for html generation
-JHtml::addIncludePath(JPATH_COMPONENT.DS.'helpers'.DS.'html');
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+$user = JFactory::getUser();
+$userId = $user->get('id');
?>
-<form action="<?php echo JRoute::_('index.php?option=com_languages&view=installed'); ?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_languages&view=installed'); ?>" method="post" id="adminForm" name="adminForm">
<?php if ($this->ftp): ?>
<?php echo $this->loadTemplate('ftp');?>
@@ -66,7 +68,11 @@
</tr>
</tfoot>
<tbody>
- <?php foreach ($this->rows as $i => $row):?>
+ <?php foreach ($this->rows as $i => $row) :
+ $canCreate = $user->authorise('core.create', 'com_languages');
+ $canEdit = $user->authorise('core.edit', 'com_languages');
+ $canChange = $user->authorise('core.edit.state', 'com_languages');
+ ?>
<tr class="row<?php echo $i % 2; ?>">
<td width="20">
<?php echo $this->pagination->getRowOffset($i); ?>
@@ -78,7 +84,7 @@
<?php echo $row->name;?>
</td>
<td width="5%" align="center">
- <?php echo JHtml::_('jgrid.isdefault', $row->published, $i, 'installed.', !$row->published);?>
+ <?php echo JHtml::_('jgrid.isdefault', $row->published, $i, 'installed.', !$row->published && $canChange);?>
</td>
<td align="center">
<?php echo $row->version; ?>
Modified: development/branches/jcamp/administrator/components/com_languages/views/installed/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_languages/views/installed/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_languages/views/installed/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -72,11 +72,22 @@
*/
protected function addToolbar()
{
+ require_once JPATH_COMPONENT.'/helpers/languages.php';
+
+ $canDo = LanguagesHelper::getActions();
+
JToolBarHelper::title(JText::_('COM_LANGUAGES_VIEW_INSTALLED_TITLE'), 'langmanager.png');
- JToolBarHelper::makeDefault('installed.setDefault','JTOOLBAR_DEFAULT');
- JToolBarHelper::divider();
- JToolBarHelper::preferences('com_languages');
- JToolBarHelper::divider();
+
+ if ($canDo->get('core.edit.state')) {
+ JToolBarHelper::makeDefault('installed.setDefault','JTOOLBAR_DEFAULT');
+ JToolBarHelper::divider();
+ }
+
+ if ($canDo->get('core.admin')) {
+ JToolBarHelper::preferences('com_languages');
+ JToolBarHelper::divider();
+ }
+
JToolBarHelper::help('JHELP_EXTENSIONS_LANGUAGE_MANAGER_INSTALLED');
}
}
Modified: development/branches/jcamp/administrator/components/com_languages/views/language/tmpl/edit.php
===================================================================
--- development/branches/jcamp/administrator/components/com_languages/views/language/tmpl/edit.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_languages/views/language/tmpl/edit.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -23,7 +23,7 @@
}
</script>
-<form action="<?php JRoute::_('index.php?option=com_languages'); ?>" method="post" name="adminForm" id="language-form" class="form-validate">
+<form action="<?php echo JRoute::_('index.php?option=com_languages'); ?>" method="post" name="adminForm" id="language-form" class="form-validate">
<div class="width-60 fltlft">
<fieldset class="adminform">
<?php if ($this->item->lang_id) : ?>
Modified: development/branches/jcamp/administrator/components/com_languages/views/language/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_languages/views/language/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_languages/views/language/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -49,19 +49,33 @@
*/
protected function addToolbar()
{
+ require_once JPATH_COMPONENT.'/helpers/languages.php';
+
JRequest::setVar('hidemainmenu', 1);
$isNew = empty($this->item->lang_id);
+ $canDo = LanguagesHelper::getActions();
JToolBarHelper::title(JText::_($isNew ? 'COM_LANGUAGES_VIEW_LANGUAGE_EDIT_NEW_TITLE' : 'COM_LANGUAGES_VIEW_LANGUAGE_EDIT_EDIT_TITLE'), 'langmanager.png');
- JToolBarHelper::save('language.save','JTOOLBAR_SAVE');
- JToolBarHelper::apply('language.apply','JTOOLBAR_APPLY');
- JToolBarHelper::custom('language.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
- if ($isNew) {
+
+ // If a new item, can save.
+ if ($isNew && $canDo->get('core.create')) {
+ JToolBarHelper::save('language.save','JTOOLBAR_SAVE');
+ }
+
+ //If an existing item, allow to Apply and Save & New.
+ if (!$isNew && $canDo->get('core.edit')) {
+ JToolBarHelper::save('language.save','JTOOLBAR_SAVE');
+ JToolBarHelper::apply('language.apply','JTOOLBAR_APPLY');
+ JToolBarHelper::custom('language.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+ }
+
+ if ($isNew) {
JToolBarHelper::cancel('language.cancel','JTOOLBAR_CANCEL');
}
else {
- JToolBarHelper::cancel('language.cancel', 'JToolbar_Close');
+ JToolBarHelper::cancel('language.cancel', 'JTOOLBAR_CLOSE');
}
+
JToolBarHelper::divider();
JToolBarHelper::help('JHELP_EXTENSIONS_LANGUAGE_MANAGER_EDIT');
}
Modified: development/branches/jcamp/administrator/components/com_languages/views/languages/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_languages/views/languages/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_languages/views/languages/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -12,8 +12,9 @@
JHtml::addIncludePath(JPATH_COMPONENT.DS.'helpers'.DS.'html');
JHtml::_('behavior.tooltip');
+$user = JFactory::getUser();
+$userId = $user->get('id');
$n = count($this->items);
-
$listOrder = $this->state->get('list.ordering');
$listDirn = $this->state->get('list.direction');
?>
@@ -80,7 +81,10 @@
<tbody>
<?php
foreach ($this->items as $i => $item) :
- ?>
+ $canCreate = $user->authorise('core.create', 'com_languages');
+ $canEdit = $user->authorise('core.edit', 'com_languages');
+ $canChange = $user->authorise('core.edit.state', 'com_languages');
+ ?>
<tr class="row<?php echo $i % 2; ?>">
<td>
<?php echo $this->pagination->getRowOffset($i); ?>
@@ -90,8 +94,13 @@
</td>
<td>
<span class="editlinktip hasTip" title="<?php echo JText::_('JGLOBAL_EDIT_ITEM');?>::<?php echo $item->title; ?>">
+ <?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_languages&task=language.edit&id='.(int) $item->lang_id); ?>">
- <?php echo $item->title; ?></a></span>
+ <?php echo $item->title; ?></a>
+ <?php else : ?>
+ <?php echo $item->title; ?>
+ <?php endif; ?>
+ </span>
</td>
<td class="center">
<?php echo $item->title_native; ?>
@@ -106,7 +115,7 @@
<?php echo $item->image; ?>
</td>
<td class="center">
- <?php echo JHtml::_('jgrid.published', $item->published, $i, 'languages.');?>
+ <?php echo JHtml::_('jgrid.published', $item->published, $i, 'languages.', $canChange);?>
</td>
<td class="center">
<?php echo $item->lang_id; ?>
Modified: development/branches/jcamp/administrator/components/com_languages/views/languages/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_languages/views/languages/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_languages/views/languages/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -49,20 +49,43 @@
*/
protected function addToolbar()
{
+ require_once JPATH_COMPONENT.'/helpers/languages.php';
+
+ $canDo = LanguagesHelper::getActions();
+
+ JToolBarHelper::title(JText::_('COM_MODULES_MANAGER_MODULES'), 'module.png');
+
JToolBarHelper::title(JText::_('COM_LANGUAGES_VIEW_LANGUAGES_TITLE'), 'langmanager.png');
- JToolBarHelper::addNew('language.add','JTOOLBAR_NEW');
- JToolBarHelper::editList('language.edit','JTOOLBAR_EDIT');
- JToolBarHelper::divider();
- JToolBarHelper::publishList('languages.publish','JTOOLBAR_PUBLISH');
- JToolBarHelper::unpublishList('languages.unpublish','JTOOLBAR_UNPUBLISH');
- if ($this->state->get('filter.published') == -2) {
- JToolBarHelper::deleteList('', 'languages.delete', 'JTOOLBAR_EMPTY_TRASH');
- } else {
+
+ if ($canDo->get('core.create')) {
+ JToolBarHelper::addNew('language.add','JTOOLBAR_NEW');
+ }
+
+ if ($canDo->get('core.edit')) {
+ JToolBarHelper::editList('language.edit','JTOOLBAR_EDIT');
+ JToolBarHelper::divider();
+ }
+
+ if ($canDo->get('core.edit.state')) {
+ if ($this->state->get('filter.state') != 2) {
+ JToolBarHelper::publishList('languages.publish','JTOOLBAR_PUBLISH');
+ JToolBarHelper::unpublishList('languages.unpublish','JTOOLBAR_UNPUBLISH');
+ }
+ }
+
+ if ($this->state->get('filter.state') == -2 && $canDo->get('core.delete')) {
+ JToolBarHelper::deleteList('', 'languages.delete','JTOOLBAR_EMPTY_TRASH');
+ JToolBarHelper::divider();
+ } else if ($canDo->get('core.edit.state')) {
JToolBarHelper::trash('languages.trash','JTOOLBAR_TRASH');
+ JToolBarHelper::divider();
}
- JToolBarHelper::divider();
- JToolBarHelper::preferences('com_languages');
- JToolBarHelper::divider();
+
+ if ($canDo->get('core.admin')) {
+ JToolBarHelper::preferences('com_languages');
+ JToolBarHelper::divider();
+ }
+
JToolBarHelper::help('JHELP_EXTENSIONS_LANGUAGE_MANAGER_CONTENT');
}
}
Modified: development/branches/jcamp/administrator/components/com_menus/controller.php
===================================================================
--- development/branches/jcamp/administrator/components/com_menus/controller.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_menus/controller.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -32,11 +32,11 @@
{
require_once JPATH_COMPONENT.'/helpers/menus.php';
- parent::display();
-
// Load the submenu.
MenusHelper::addSubmenu(JRequest::getWord('view'));
+ parent::display();
+
return $this;
}
}
\ No newline at end of file
Modified: development/branches/jcamp/administrator/components/com_menus/controllers/item.php
===================================================================
--- development/branches/jcamp/administrator/components/com_menus/controllers/item.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_menus/controllers/item.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -301,8 +301,12 @@
// Initialise variables.
$app = JFactory::getApplication();
+ // Get the posted values from the request.
+ $data = JRequest::getVar('jform', array(), 'post', 'array');
+
// Get the type.
- $type = JRequest::getVar('type');
+ $type = $data['type'];
+
$type = json_decode(base64_decode($type));
$title = isset($type->title) ? $type->title : null;
if ($title != 'alias' && $title != 'separator' && $title != 'url') {
@@ -312,6 +316,8 @@
$app->setUserState('com_menus.edit.item.type', $title);
if ($title == 'component') {
if (isset($type->request)) {
+ $component = JComponentHelper::getComponent($type->request->option);
+ $data['component_id'] = $component->id;
if (isset($type->request->layout)) {
$app->setUserState(
'com_menus.edit.item.link',
@@ -329,6 +335,13 @@
$app->setUserState('com_menus.edit.item.link', 'index.php?Itemid=');
}
+ unset($data['request']);
+ $data['type'] = $title;
+ $data['link'] = $app->getUserState('com_menus.edit.item.link');
+
+ //Save the data in the session.
+ $app->setUserState('com_menus.edit.item.data', $data);
+
$this->type = $type;
$this->setRedirect('index.php?option=com_menus&view=item&layout=edit');
}
Modified: development/branches/jcamp/administrator/components/com_menus/helpers/menus.php
===================================================================
--- development/branches/jcamp/administrator/components/com_menus/helpers/menus.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_menus/helpers/menus.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -42,6 +42,36 @@
}
/**
+ * Gets a list of the actions that can be performed.
+ *
+ * @param int The menu ID.
+ *
+ * @return JObject
+ * @since 1.6
+ */
+ public static function getActions($parentId = 0)
+ {
+ $user = JFactory::getUser();
+ $result = new JObject;
+
+ if (empty($parentId)) {
+ $assetName = 'com_menus';
+ } else {
+ $assetName = 'com_menus.item.'.(int) $parentId;
+ }
+
+ $actions = array(
+ 'core.admin', 'core.manage', 'core.create', 'core.edit', 'core.edit.state', 'core.delete'
+ );
+
+ foreach ($actions as $action) {
+ $result->set($action, $user->authorise($action, $assetName));
+ }
+
+ return $result;
+ }
+
+ /**
* Gets a standard form of a link for lookups.
*
* @param mixed A link string or array of request variables.
Modified: development/branches/jcamp/administrator/components/com_menus/models/fields/menutype.php
===================================================================
--- development/branches/jcamp/administrator/components/com_menus/models/fields/menutype.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_menus/models/fields/menutype.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -120,9 +120,9 @@
foreach ($list as $item)
{
$html[] = ' <li>';
- $html[] = ' <a class="choose_type" href="index.php?option=com_menus&task=item.setType&type='.base64_encode(json_encode(array('title'=>$item->title, 'request'=>$item->request))).'" title="'.JText::_($item->description).'">'.JText::_($item->title).'</a>';
+ $html[] = ' <a class="choose_type" href="#" onclick="javascript:submitbutton(\'item.setType\', \''.base64_encode(json_encode(array('title'=>$item->title, 'request'=>$item->request))).'\')" title="'.JText::_($item->description).'">'.JText::_($item->title).'</a>';
$html[] = ' </li>';
- }
+ }
$html[] = ' </ul>';
$html[] = ' </dd>';
$html[] = '</dl>';
@@ -136,13 +136,13 @@
// $html[] = ' '.JText::_('COM_MENUS_TYPE_SYSTEM_DESC');
$html[] = ' <ul>';
$html[] = ' <li>';
- $html[] = ' <a class="choose_type" href="index.php?option=com_menus&task=item.setType&type='.base64_encode(json_encode(array('title'=>'url'))).'" title="'.JText::_('COM_MENUS_TYPE_EXTERNAL_URL_DESC').'">'.JText::_('COM_MENUS_TYPE_EXTERNAL_URL').'</a>';
+ $html[] = ' <a class="choose_type" href="#" onclick="javascript:submitbutton(\'item.setType\', \''.base64_encode(json_encode(array('title'=>'url'))).'\')" title="'.JText::_('COM_MENUS_TYPE_EXTERNAL_URL_DESC').'">'.JText::_('COM_MENUS_TYPE_EXTERNAL_URL').'</a>';
$html[] = ' </li>';
$html[] = ' <li>';
- $html[] = ' <a class="choose_type" href="index.php?option=com_menus&task=item.setType&type='.base64_encode(json_encode(array('title'=>'alias'))).'" title="'.JText::_('COM_MENUS_TYPE_ALIAS_DESC').'">'.JText::_('COM_MENUS_TYPE_ALIAS').'</a>';
+ $html[] = ' <a class="choose_type" href="#" onclick="javascript:submitbutton(\'item.setType\', \''.base64_encode(json_encode(array('title'=>'alias'))).'\')" title="'.JText::_('COM_MENUS_TYPE_ALIAS_DESC').'">'.JText::_('COM_MENUS_TYPE_ALIAS').'</a>';
$html[] = ' </li>';
$html[] = ' <li>';
- $html[] = ' <a class="choose_type" href="index.php?option=com_menus&task=item.setType&type='.base64_encode(json_encode(array('title'=>'separator'))).'" title="'.JText::_('COM_MENUS_TYPE_SEPARATOR_DESC').'">'.JText::_('COM_MENUS_TYPE_SEPARATOR').'</a>';
+ $html[] = ' <a class="choose_type" href="#" onclick="javascript:submitbutton(\'item.setType\', \''.base64_encode(json_encode(array('title'=>'separator'))).'\')" title="'.JText::_('COM_MENUS_TYPE_SEPARATOR_DESC').'">'.JText::_('COM_MENUS_TYPE_SEPARATOR').'</a>';
$html[] = ' </li>';
$html[] = ' </ul>';
$html[] = ' </dd>';
Modified: development/branches/jcamp/administrator/components/com_menus/models/item.php
===================================================================
--- development/branches/jcamp/administrator/components/com_menus/models/item.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_menus/models/item.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -46,6 +46,36 @@
protected $helpLocal = false;
/**
+ * Method to test whether a record can be deleted.
+ *
+ * @param object A record object.
+ *
+ * @return boolean True if allowed to delete the record. Defaults to the permission set in the component.
+ * @since 1.6
+ */
+ protected function canDelete($record)
+ {
+ $user = JFactory::getUser();
+
+ return $user->authorise('core.delete', 'com_menus.item.'.(int) $record->id);
+ }
+
+ /**
+ * Method to test whether a record can be deleted.
+ *
+ * @param object A record object.
+ *
+ * @return boolean True if allowed to change the state of the record. Defaults to the permission set in the component.
+ * @since 1.6
+ */
+ protected function canEditState($record)
+ {
+ $user = JFactory::getUser();
+
+ return $user->authorise('core.edit.state', 'com_menus.item.'.(int) $record->id);
+ }
+
+ /**
* Method to perform batch operations on an item or a set of items.
*
* @param array $commands An array of commands to perform.
@@ -627,6 +657,20 @@
}
/**
+ * A protected method to get the where clause for the reorder
+ * This ensures that the row will be moved relative to a row with the same menutype
+ *
+ * @param JTableMenu $table instance
+ *
+ * @return array An array of conditions to add to add to ordering queries.
+ * @since 1.6
+ */
+ protected function getReorderConditions($table)
+ {
+ return 'menutype = ' . $this->_db->Quote($table->menutype);
+ }
+
+ /**
* Returns a Table object, always creating it
*
* @param type $type The table type to instantiate
@@ -926,7 +970,14 @@
$cache = JFactory::getCache('com_modules');
$cache->clean();
$cache->clean('mod_menu');
-
+
+ if (isset($data['link'])) {
+ $base = JURI::base();
+ $juri = JURI::getInstance($base.$data['link']);
+ $com = $juri->getVar('option');
+ $cache->clean($com);
+ }
+
return true;
}
Modified: development/branches/jcamp/administrator/components/com_menus/models/menu.php
===================================================================
--- development/branches/jcamp/administrator/components/com_menus/models/menu.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_menus/models/menu.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -33,6 +33,36 @@
protected $_context = 'com_menus.menu';
/**
+ * Method to test whether a record can be deleted.
+ *
+ * @param object A record object.
+ *
+ * @return boolean True if allowed to delete the record. Defaults to the permission set in the component.
+ * @since 1.6
+ */
+ protected function canDelete($record)
+ {
+ $user = JFactory::getUser();
+
+ return $user->authorise('core.delete', 'com_menus.menu.'.(int) $record->id);
+ }
+
+ /**
+ * Method to test whether a record can be deleted.
+ *
+ * @param object A record object.
+ *
+ * @return boolean True if allowed to change the state of the record. Defaults to the permission set in the component.
+ * @since 1.6
+ */
+ protected function canEditState($record)
+ {
+ $user = JFactory::getUser();
+
+ return $user->authorise('core.edit.state', 'com_menus.menu.'.(int) $record->id);
+ }
+
+ /**
* Returns a Table object, always creating it
*
* @param type The table type to instantiate
Modified: development/branches/jcamp/administrator/components/com_menus/views/item/tmpl/edit.php
===================================================================
--- development/branches/jcamp/administrator/components/com_menus/views/item/tmpl/edit.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_menus/views/item/tmpl/edit.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -19,10 +19,13 @@
?>
<script type="text/javascript">
- function submitbutton(task)
+ function submitbutton(task, type)
{
- if (task == 'item.cancel' || document.formvalidator.isValid(document.id('item-form'))) {
+ if (task == 'item.setType') {
+ document.id('item-form').elements['jform[type]'].value = type;
submitform(task);
+ } else if (task == 'item.cancel' || document.formvalidator.isValid(document.id('item-form'))) {
+ submitform(task);
} else {
// special case for modal popups validation response
$$('#item-form .modal-value.invalid').each(function(field){
@@ -35,7 +38,7 @@
}
</script>
-<form action="<?php JRoute::_('index.php?option=com_menus'); ?>" method="post" name="adminForm" id="item-form" class="form-validate">
+<form action="<?php echo JRoute::_('index.php?option=com_menus'); ?>" method="post" name="adminForm" id="item-form" class="form-validate">
<div class="width-60 fltlft">
<fieldset class="adminform">
Modified: development/branches/jcamp/administrator/components/com_menus/views/item/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_menus/views/item/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_menus/views/item/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -55,28 +55,40 @@
$user = JFactory::getUser();
$isNew = ($this->item->id == 0);
$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id'));
-
+ $canDo = MenusHelper::getActions($this->state->get('filter.parent_id'));
+
JToolBarHelper::title(JText::_($isNew ? 'COM_MENUS_VIEW_NEW_ITEM_TITLE' : 'COM_MENUS_VIEW_EDIT_ITEM_TITLE'), 'menu-add');
+ // If a new item, can save the item. Allow users with edit permissions to apply changes to prevent returning to grid.
+ if ($isNew && $canDo->get('core.create')) {
+ if ($canDo->get('core.edit')) {
+ JToolBarHelper::apply('item.apply','JTOOLBAR_APPLY');
+ }
+ JToolBarHelper::save('item.save', 'JTOOLBAR_SAVE');
+ }
+
// If not checked out, can save the item.
- if ($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id')) {
+ if (!$isNew && !$checkedOut && $canDo->get('core.edit')) {
JToolBarHelper::apply('item.apply','JTOOLBAR_APPLY');
JToolBarHelper::save('item.save','JTOOLBAR_SAVE');
JToolBarHelper::custom('item.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
}
+
// If an existing item, can save to a copy.
- if (!$isNew) {
+ if (!$isNew && $canDo->get('core.create')) {
JToolBarHelper::custom('item.save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false);
}
- if ($isNew) {
+
+ if (empty($this->item->id)) {
JToolBarHelper::cancel('item.cancel','JTOOLBAR_CANCEL');
} else {
JToolBarHelper::cancel('item.cancel', 'JTOOLBAR_CLOSE');
}
+
JToolBarHelper::divider();
// Get the help information for the menu item.
$help = $this->get('Help');
JToolBarHelper::help($help->key, $help->local, $help->url);
}
-}
\ No newline at end of file
+}
Modified: development/branches/jcamp/administrator/components/com_menus/views/items/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_menus/views/items/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_menus/views/items/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -23,7 +23,7 @@
$saveOrder = ($listOrder == 'a.lft' && $listDirn == 'asc');
?>
<?php //Set up the filter bar. ?>
-<form action="<?php echo JRoute::_('index.php?option=com_menus&view=items');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_menus&view=items');?>" method="post" name="adminForm" id="adminForm">
<fieldset id="filter-bar">
<div class="filter-search fltlft">
<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
@@ -110,6 +110,8 @@
$originalOrders = array();
foreach ($this->items as $i => $item) :
$orderkey = array_search($item->id, $this->ordering[$item->parent_id]);
+ $canCreate = $user->authorise('core.create', 'com_menus');
+ $canEdit = $user->authorise('core.edit', 'com_menus');
$canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out==$user->get('id')|| $item->checked_out==0;
$canChange = $user->authorise('core.edit.state', 'com_menus') && $canCheckin;
?>
@@ -117,15 +119,19 @@
<td class="center">
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
</td>
- <td class="indent-<?php echo intval(($item->level-1)*15)+4; ?>">
-
+ <td>
+ <?php echo str_repeat('<span class="gi">|—</span>', $item->level-1) ?>
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'items.', $canCheckin); ?>
<?php endif; ?>
- <a href="<?php echo JRoute::_('index.php?option=com_menus&task=item.edit&cid[]='.$item->id);?>">
- <?php echo $this->escape($item->title); ?></a>
-
+ <?php if ($canEdit) : ?>
+ <a href="<?php echo JRoute::_('index.php?option=com_menus&task=item.edit&cid[]='.$item->id);?>">
+ <?php echo $this->escape($item->title); ?></a>
+ <?php else : ?>
+ <?php echo $this->escape($item->title); ?>
+ <?php endif; ?>
<p class="smallsub" title="<?php echo $this->escape($item->path);?>">
+ <?php echo str_repeat('<span class="gtr">|—</span>', $item->level-1) ?>
<?php if (empty($item->note)) : ?>
<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias));?>
<?php else : ?>
Modified: development/branches/jcamp/administrator/components/com_menus/views/items/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_menus/views/items/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_menus/views/items/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -127,6 +127,13 @@
$options[] = JHtml::_('select.option', '2');
$options[] = JHtml::_('select.option', '3');
$options[] = JHtml::_('select.option', '4');
+ $options[] = JHtml::_('select.option', '5');
+ $options[] = JHtml::_('select.option', '6');
+ $options[] = JHtml::_('select.option', '7');
+ $options[] = JHtml::_('select.option', '8');
+ $options[] = JHtml::_('select.option', '9');
+ $options[] = JHtml::_('select.option', '10');
+
$this->assign('f_levels', $options);
parent::display($tpl);
@@ -140,28 +147,37 @@
*/
protected function addToolbar()
{
- JToolBarHelper::title(JText::_('COM_MENUS_VIEW_ITEMS_TITLE'), 'menumgr.png');
+ require_once JPATH_COMPONENT.'/helpers/menus.php';
+ $canDo = MenusHelper::getActions($this->state->get('filter.parent_id'));
- JToolBarHelper::custom('item.add', 'new.png', 'new_f2.png','JTOOLBAR_NEW', false);
- JToolBarHelper::custom('item.edit', 'edit.png', 'edit_f2.png','JTOOLBAR_EDIT', true);
+ JToolBarHelper::title(JText::_('COM_MENUS_VIEW_ITEMS_TITLE'), 'menumgr.png');
- JToolBarHelper::divider();
-
- JToolBarHelper::custom('items.publish', 'publish.png', 'publish_f2.png','JTOOLBAR_PUBLISH', true);
- JToolBarHelper::custom('items.unpublish', 'unpublish.png', 'unpublish_f2.png','JTOOLBAR_UNPUBLISH', true);
- if ($this->state->get('filter.published') == -2) {
+ if ($canDo->get('core.create')) {
+ JToolBarHelper::custom('item.add', 'new.png', 'new_f2.png','JTOOLBAR_NEW', false);
+ }
+ if ($canDo->get('core.edit')) {
+ JToolBarHelper::custom('item.edit', 'edit.png', 'edit_f2.png','JTOOLBAR_EDIT', true);
+ }
+ if ($canDo->get('core.edit.state')) {
JToolBarHelper::divider();
- JToolBarHelper::deleteList('', 'items.delete','JTOOLBAR_EMPTY_TRASH');
- } else {
+ JToolBarHelper::custom('items.publish', 'publish.png', 'publish_f2.png','JTOOLBAR_PUBLISH', true);
+ JToolBarHelper::custom('items.unpublish', 'unpublish.png', 'unpublish_f2.png','JTOOLBAR_UNPUBLISH', true);
+ }
+ if ($this->state->get('filter.published') == -2 && $canDo->get('core.delete')) {
+ JToolBarHelper::deleteList('', 'items.delete','JTOOLBAR_EMPTY_TRASH');
+ }
+ else if ($canDo->get('core.edit.state')) {
+ JToolBarHelper::trash('items.trash','JTOOLBAR_TRASH');
+ }
+ if (JFactory::getUser()->authorise('core.manage','com_checkin')) {
JToolBarHelper::divider();
- JToolBarHelper::trash('items.trash','JTOOLBAR_TRASH');
- }
- if(JFactory::getUser()->authorise('core.manage','com_checkin')) {
JToolBarHelper::custom('items.checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true);
}
- JToolBarHelper::makeDefault('items.setDefault', 'COM_MENUS_TOOLBAR_SET_HOME');
-
+
+ if ($canDo->get('core.edit.state')) {
+ JToolBarHelper::makeDefault('items.setDefault', 'COM_MENUS_TOOLBAR_SET_HOME');
+ }
JToolBarHelper::divider();
JToolBarHelper::custom('items.rebuild', 'refresh.png', 'refresh_f2.png', 'JToolbar_Rebuild', false);
Modified: development/branches/jcamp/administrator/components/com_menus/views/menu/tmpl/edit.php
===================================================================
--- development/branches/jcamp/administrator/components/com_menus/views/menu/tmpl/edit.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_menus/views/menu/tmpl/edit.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -26,7 +26,7 @@
}
</script>
-<form action="<?php JRoute::_('index.php?option=com_menus'); ?>" method="post" name="adminForm" id="item-form">
+<form action="<?php echo JRoute::_('index.php?option=com_menus'); ?>" method="post" name="adminForm" id="item-form">
<div class="width-40">
<fieldset class="adminform">
<legend><?php echo JText::_('COM_MENUS_MENU_DETAILS');?></legend>
Modified: development/branches/jcamp/administrator/components/com_menus/views/menu/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_menus/views/menu/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_menus/views/menu/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -50,12 +50,27 @@
{
JRequest::setVar('hidemainmenu', true);
- $isNew = ($this->item->id == 0);
+ $user = JFactory::getUser();
+ $isNew = ($this->item->id == 0);
+ $canDo = MenusHelper::getActions($this->state->get('filter.parent_id'));
+
JToolBarHelper::title(JText::_($isNew ? 'COM_MENUS_VIEW_NEW_MENU_TITLE' : 'COM_MENUS_VIEW_EDIT_MENU_TITLE'), 'menu.png');
- JToolBarHelper::apply('menu.apply','JTOOLBAR_APPLY');
- JToolBarHelper::save('menu.save','JTOOLBAR_SAVE');
- JToolBarHelper::custom('menu.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+ // If a new item, can save the item. Allow users with edit permissions to apply changes to prevent returning to grid.
+ if ($isNew && $canDo->get('core.create')) {
+ if ($canDo->get('core.edit')) {
+ JToolBarHelper::apply('menu.apply','JTOOLBAR_APPLY');
+ }
+ JToolBarHelper::save('menu.save', 'JTOOLBAR_SAVE');
+ }
+
+ // If user can edit, can save the item.
+ if (!$isNew && $canDo->get('core.edit')) {
+ JToolBarHelper::apply('menu.apply','JTOOLBAR_APPLY');
+ JToolBarHelper::save('menu.save','JTOOLBAR_SAVE');
+ JToolBarHelper::custom('menu.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+ }
+
if ($isNew) {
JToolBarHelper::cancel('menu.cancel', 'JTOOLBAR_CANCEL');
} else {
Modified: development/branches/jcamp/administrator/components/com_menus/views/menus/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_menus/views/menus/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_menus/views/menus/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -17,6 +17,8 @@
$uri = JFactory::getUri();
$return = base64_encode($uri);
+$user = JFactory::getUser();
+$userId = $user->get('id');
$listOrder = $this->state->get('list.ordering');
$listDirn = $this->state->get('list.direction');
?>
@@ -27,7 +29,7 @@
}
}
</script>
-<form action="<?php echo JRoute::_('index.php?option=com_menus&view=menus');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_menus&view=menus');?>" method="post" name="adminForm" id="adminForm">
<table class="adminlist">
<thead>
<tr>
@@ -67,7 +69,11 @@
</tr>
</tfoot>
<tbody>
- <?php foreach ($this->items as $i => $item) : ?>
+ <?php foreach ($this->items as $i => $item) :
+ $canCreate = $user->authorise('core.create', 'com_menus');
+ $canEdit = $user->authorise('core.edit', 'com_menus');
+ $canChange = $user->authorise('core.edit.state', 'com_menus');
+ ?>
<tr class="row<?php echo $i % 2; ?>">
<td class="center">
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
@@ -76,8 +82,13 @@
<a href="<?php echo JRoute::_('index.php?option=com_menus&view=items&menutype='.$item->menutype) ?> ">
<?php echo $this->escape($item->title); ?></a>
<p class="smallsub">(<span><?php echo JText::_('COM_MENUS_MENU_MENUTYPE_LABEL') ?></span>
- <?php echo '<a href="'. JRoute::_('index.php?option=com_menus&task=menu.edit&cid[]='.$item->id).' title='.$this->escape($item->description).'">'.
- $this->escape($item->menutype).'</a>'; ?>)</p>
+ <?php if ($canEdit) : ?>
+ <?php echo '<a href="'. JRoute::_('index.php?option=com_menus&task=menu.edit&cid[]='.$item->id).' title='.$this->escape($item->description).'">'.
+ $this->escape($item->menutype).'</a>'; ?>)
+ <?php else : ?>
+ <?php echo $this->escape($item->menutype)?>)
+ <?php endif; ?>
+ </p>
</td>
<td class="center btns">
<a href="<?php echo JRoute::_('index.php?option=com_menus&view=items&menutype='.$item->menutype.'&filter_published=1');?>">
@@ -97,9 +108,14 @@
if (isset($this->modules[$item->menutype])) :
foreach ($this->modules[$item->menutype] as &$module) :
?>
-
- <li><a class="modal" href="<?php echo JRoute::_('index.php?option=com_modules&task=module.edit&id='.$module->id.'&return='.$return.'&tmpl=component&layout=modal');?>" rel="{handler: 'iframe', size: {x: 1024, y: 450}}" title="<?php echo JText::_('COM_MENUS_EDIT_MODULE_SETTINGS');?>">
- <?php echo JText::sprintf('COM_MENUS_MODULE_ACCESS_POSITION', $this->escape($module->title), $this->escape($module->access_title), $this->escape($module->position)); ?></a></li>
+ <li>
+ <?php if ($canEdit) : ?>
+ <a class="modal" href="<?php echo JRoute::_('index.php?option=com_modules&task=module.edit&id='.$module->id.'&return='.$return.'&tmpl=component&layout=modal');?>" rel="{handler: 'iframe', size: {x: 1024, y: 450}}" title="<?php echo JText::_('COM_MENUS_EDIT_MODULE_SETTINGS');?>">
+ <?php echo JText::sprintf('COM_MENUS_MODULE_ACCESS_POSITION', $this->escape($module->title), $this->escape($module->access_title), $this->escape($module->position)); ?></a>
+ <?php else :?>
+ <?php echo JText::sprintf('COM_MENUS_MODULE_ACCESS_POSITION', $this->escape($module->title), $this->escape($module->access_title), $this->escape($module->position)); ?>
+ <?php endif; ?>
+ </li>
<?php
endforeach;
endif;
Modified: development/branches/jcamp/administrator/components/com_menus/views/menus/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_menus/views/menus/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_menus/views/menus/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -50,17 +50,29 @@
*/
protected function addToolbar()
{
+ require_once JPATH_COMPONENT.'/helpers/menus.php';
+
+ $canDo = MenusHelper::getActions($this->state->get('filter.parent_id'));
+
JToolBarHelper::title(JText::_('COM_MENUS_VIEW_MENUS_TITLE'), 'menumgr.png');
- JToolBarHelper::custom('menu.add', 'new.png', 'new_f2.png', 'JTOOLBAR_NEW', false);
- JToolBarHelper::custom('menu.edit', 'edit.png', 'edit_f2.png', 'JTOOLBAR_EDIT', true);
- JToolBarHelper::divider();
- JToolBarHelper::deleteList('', 'menus.delete','JTOOLBAR_DELETE');
- JToolBarHelper::divider();
+ if ($canDo->get('core.create')) {
+ JToolBarHelper::custom('menu.add', 'new.png', 'new_f2.png', 'JTOOLBAR_NEW', false);
+ }
+ if ($canDo->get('core.edit')) {
+ JToolBarHelper::custom('menu.edit', 'edit.png', 'edit_f2.png', 'JTOOLBAR_EDIT', true);
+ }
+ if ($canDo->get('core.delete')) {
+ JToolBarHelper::divider();
+ JToolBarHelper::deleteList('', 'menus.delete','JTOOLBAR_DELETE');
+ }
+
JToolBarHelper::custom('menus.rebuild', 'refresh.png', 'refresh_f2.png', 'JTOOLBAR_REBUILD', false);
+ if ($canDo->get('core.admin')) {
+ JToolBarHelper::divider();
+ JToolBarHelper::preferences('com_menus');
+ }
JToolBarHelper::divider();
- JToolBarHelper::preferences('com_menus');
- JToolBarHelper::divider();
JToolBarHelper::help('JHELP_MENUS_MENU_MANAGER');
}
}
Modified: development/branches/jcamp/administrator/components/com_messages/views/message/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_messages/views/message/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_messages/views/message/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -10,7 +10,7 @@
// No direct access.
defined('_JEXEC') or die;
?>
-<form action="<?php echo JRoute::_('index.php?option=com_messages'); ?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_messages'); ?>" method="post" name="adminForm" id="adminForm">
<div class="width-60 fltlft">
<ul class="adminformlist">
<li><?php echo JText::_('COM_MESSAGES_FIELD_USER_ID_FROM_LABEL'); ?>
Modified: development/branches/jcamp/administrator/components/com_modules/controller.php
===================================================================
--- development/branches/jcamp/administrator/components/com_modules/controller.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_modules/controller.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -32,9 +32,9 @@
{
require_once JPATH_COMPONENT.'/helpers/modules.php';
- parent::display();
-
// Load the submenu.
ModulesHelper::addSubmenu(JRequest::getWord('view', 'modules'));
+
+ parent::display();
}
}
\ No newline at end of file
Modified: development/branches/jcamp/administrator/components/com_modules/helpers/modules.php
===================================================================
--- development/branches/jcamp/administrator/components/com_modules/helpers/modules.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_modules/helpers/modules.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -82,14 +82,20 @@
jimport('joomla.filesystem.folder');
$db = JFactory::getDbo();
- $query = $db->getQuery(true);
- $query->select('DISTINCT(position)');
- $query->from('#__modules');
- $query->where('`client_id` = '.(int) $clientId);
- $query->order('position');
+ if ($clientId == '*') {
+ $where = '';
+ } else {
+ $where = ' WHERE client_id = '.(int) $clientId;
+ }
- $db->setQuery($query);
+ $db->setQuery(
+ 'SELECT DISTINCT(position)' .
+ ' FROM #__modules' .
+ $where .
+ ' ORDER BY position'
+ );
+
$positions = $db->loadResultArray();
$positions = (is_array($positions)) ? $positions : array();
@@ -118,10 +124,16 @@
$db = JFactory::getDbo();
$query = $db->getQuery(true);
+ if ($clientId == '*') {
+ $where = '';
+ } else {
+ $where = 'm.`client_id` = '.(int)$clientId;
+ }
+
$query->select('DISTINCT(m.module) AS value, e.name AS text');
$query->from('#__modules AS m');
$query->join('LEFT', '#__extensions AS e ON e.element=m.module');
- $query->where('m.`client_id` = '.(int)$clientId);
+ $query->where($where);
$db->setQuery($query);
$modules = $db->loadObjectList();
Modified: development/branches/jcamp/administrator/components/com_modules/models/modules.php
===================================================================
--- development/branches/jcamp/administrator/components/com_modules/models/modules.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_modules/models/modules.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -47,7 +47,7 @@
$module = $app->getUserStateFromRequest($this->context.'.filter.module', 'filter_module', '', 'string');
$this->setState('filter.module', $module);
- $clientId = $app->getUserStateFromRequest($this->context.'.filter.client_id', 'filter_client_id', 0, 'int');
+ $clientId = $app->getUserStateFromRequest($this->context.'.filter.client_id', 'filter_client_id', null);
$this->setState('filter.client_id', $clientId);
$language = $app->getUserStateFromRequest($this->context.'.filter.language', 'filter_language', '');
@@ -132,15 +132,15 @@
protected function translate(&$items)
{
$lang = JFactory::getLanguage();
- $client = $this->getState('filter.client_id') ? 'administrator' : 'site';
foreach($items as $item) {
+ $path = $item->client_id ? JPATH_ADMINISTRATOR : JPATH_SITE;
$extension = $item->module;
- $source = constant('JPATH_' . strtoupper($client)) . "/modules/$extension";
- $lang->load("$extension.sys", constant('JPATH_' . strtoupper($client)), null, false, false)
+ $source = $path . '/modules/' . $extension;
+ $lang->load("$extension.sys", $path, null, false, false)
|| $lang->load("$extension.sys", $source, null, false, false)
- || $lang->load("$extension.sys", constant('JPATH_' . strtoupper($client)), $lang->getDefault(), false, false)
+ || $lang->load("$extension.sys", $path, $lang->getDefault(), false, false)
|| $lang->load("$extension.sys", $source, $lang->getDefault(), false, false);
- $item->name = JText::_($item->name);
+ $item->name = JText::_($item->name);
if (is_null($item->pages)) {
$item->pages = JText::_('JNONE');
} else if ($item->pages < 0) {
@@ -168,7 +168,7 @@
$query->select(
$this->getState(
'list.select',
- 'a.id, a.title, a.note, a.position, a.module, a.language,' .
+ 'a.id, a.title, a.note, a.client_id, a.position, a.module, a.language,' .
'a.checked_out, a.checked_out_time, a.published, a.access, a.ordering'
)
);
@@ -227,7 +227,10 @@
if (is_numeric($clientId)) {
$query->where('a.client_id = '.(int) $clientId);
}
-
+ else if ($clientId === '') {
+ $query->where('(a.client_id IN (0, 1))');
+ }
+
// Filter by search in title
$search = $this->getState('filter.search');
if (!empty($search))
Modified: development/branches/jcamp/administrator/components/com_modules/views/module/tmpl/edit.php
===================================================================
--- development/branches/jcamp/administrator/components/com_modules/views/module/tmpl/edit.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_modules/views/module/tmpl/edit.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -34,7 +34,7 @@
}
</script>
-<form action="<?php JRoute::_('index.php?option=com_modules'); ?>" method="post" name="adminForm" id="module-form" class="form-validate">
+<form action="<?php echo JRoute::_('index.php?option=com_modules'); ?>" method="post" name="adminForm" id="module-form" class="form-validate">
<div class="width-60 fltlft">
<fieldset class="adminform">
<legend><?php echo JText::_('JDETAILS'); ?></legend>
Modified: development/branches/jcamp/administrator/components/com_modules/views/module/tmpl/modal.php
===================================================================
--- development/branches/jcamp/administrator/components/com_modules/views/module/tmpl/modal.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_modules/views/module/tmpl/modal.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -35,7 +35,7 @@
}
</script>
-<form action="<?php JRoute::_('index.php?option=com_modules&layout=modal&tmpl=component'); ?>" method="post" name="adminForm" id="module-form" class="form-validate">
+<form action="<?php echo JRoute::_('index.php?option=com_modules&layout=modal&tmpl=component'); ?>" method="post" name="adminForm" id="module-form" class="form-validate">
<div class="fltrt">
<button type="button" onclick="Joomla.submitform('module.save', this.form);window.top.setTimeout('window.parent.SqueezeBox.close()', 1400);">
Modified: development/branches/jcamp/administrator/components/com_modules/views/module/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_modules/views/module/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_modules/views/module/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -64,9 +64,11 @@
JToolBarHelper::title( JText::sprintf('COM_MODULES_MANAGER_MODULE', JText::_($this->item->module)), 'module.png');
// If not checked out, can save the item.
- if (!$checkedOut && $canDo->get('core.edit')) {
+ if (!$checkedOut && ($canDo->get('core.edit') || $canDo->get('core.create') )) {
JToolBarHelper::apply('module.apply', 'JTOOLBAR_APPLY');
JToolBarHelper::save('module.save', 'JTOOLBAR_SAVE');
+ }
+ if (!$checkedOut && $canDo->get('core.create')) {
JToolBarHelper::custom('module.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
}
// If an existing item, can save to a copy.
Modified: development/branches/jcamp/administrator/components/com_modules/views/modules/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_modules/views/modules/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_modules/views/modules/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -31,8 +31,13 @@
</div>
<div class="filter-select fltrt">
<select name="filter_client_id" class="inputbox" onchange="this.form.submit()">
+ <option value=""><?php echo JText::_('JGLOBAL_FILTER_CLIENT');?></option>
<?php echo JHtml::_('select.options', ModulesHelper::getClientOptions(), 'value', 'text', $this->state->get('filter.client_id'));?>
</select>
+ <select name="filter_state" class="inputbox" onchange="this.form.submit()">
+ <option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
+ <?php echo JHtml::_('select.options', ModulesHelper::getStateOptions(), 'value', 'text', $this->state->get('filter.state'));?>
+ </select>
<select name="filter_position" class="inputbox" onchange="this.form.submit()">
<option value=""><?php echo JText::_('COM_MODULES_OPTION_SELECT_POSITION');?></option>
@@ -44,10 +49,7 @@
<?php echo JHtml::_('select.options', ModulesHelper::getModules($this->state->get('filter.client_id')), 'value', 'text', $this->state->get('filter.module'));?>
</select>
- <select name="filter_state" class="inputbox" onchange="this.form.submit()">
- <option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
- <?php echo JHtml::_('select.options', ModulesHelper::getStateOptions(), 'value', 'text', $this->state->get('filter.state'));?>
- </select>
+
<select name="filter_access" class="inputbox" onchange="this.form.submit()">
<option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
@@ -72,25 +74,29 @@
<th class="title">
<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'title', $listDirn, $listOrder); ?>
</th>
- <th width="15%">
- <?php echo JHtml::_('grid.sort', 'COM_MODULES_HEADING_POSITION', 'position', $listDirn, $listOrder); ?>
+ <th width="5%">
+ <?php echo JHtml::_('grid.sort', 'JCLIENT', 'client_id', $listDirn, $listOrder); ?>
</th>
- <th width="10%">
- <?php echo JHtml::_('grid.sort', 'COM_MODULES_HEADING_PAGES', 'pages', $listDirn, $listOrder); ?>
+ <th width="5%">
+ <?php echo JHtml::_('grid.sort', 'JPUBLISHED', 'published', $listDirn, $listOrder); ?>
</th>
- <th width="10%">
- <?php echo JHtml::_('grid.sort', 'COM_MODULES_HEADING_MODULE', 'name', $listDirn, $listOrder); ?>
+ <th width="10%" class="left">
+ <?php echo JHtml::_('grid.sort', 'COM_MODULES_HEADING_POSITION', 'position', $listDirn, $listOrder); ?>
</th>
- <th width="5%">
- <?php echo JHtml::_('grid.sort', 'JPUBLISHED', 'published', $listDirn, $listOrder); ?>
- </th>
- <th width="10%">
+ <th width="10%">
<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'ordering', $listDirn, $listOrder); ?>
<?php if ($canOrder && $saveOrder) :?>
<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'modules.saveorder'); ?>
<?php endif; ?>
</th>
+ <th width="10%" class="left" >
+ <?php echo JHtml::_('grid.sort', 'COM_MODULES_HEADING_MODULE', 'name', $listDirn, $listOrder); ?>
+ </th>
<th width="10%">
+ <?php echo JHtml::_('grid.sort', 'COM_MODULES_HEADING_PAGES', 'pages', $listDirn, $listOrder); ?>
+ </th>
+
+ <th width="10%">
<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'access', $listDirn, $listOrder); ?>
</th>
<th width="5%">
@@ -124,7 +130,7 @@
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'modules.', $canCheckin); ?>
<?php endif; ?>
- <?php if ($canCreate || $canEdit) : ?>
+ <?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_modules&task=module.edit&id='.(int) $item->id); ?>">
<?php echo $this->escape($item->title); ?></a>
<?php else : ?>
@@ -136,19 +142,16 @@
<?php echo JText::sprintf('JGLOBAL_LIST_NOTE', $this->escape($item->note));?></p>
<?php endif; ?>
</td>
- <td class="left">
- <?php echo $item->position; ?>
- </td>
<td class="center">
- <?php echo $item->pages; ?>
+ <?php echo $item->client_id == 0 ? JText::_('JSITE') : JText::_('JADMINISTRATOR'); ?>
</td>
+ <td class="center">
+ <?php echo JHtml::_('jgrid.published', $item->published, $i, 'modules.', $canChange);?>
+ </td>
<td class="left">
- <?php echo $item->name;?>
+ <?php echo $item->position; ?>
</td>
- <td class="center">
- <?php echo JHtml::_('jgrid.published', $item->published, $i, 'modules.', $canChange);?>
- </td>
- <td class="order">
+ <td class="order">
<?php if ($canChange) : ?>
<?php if ($saveOrder) :?>
<?php if ($listDirn == 'asc') : ?>
@@ -165,7 +168,14 @@
<?php echo $item->ordering; ?>
<?php endif; ?>
</td>
+ <td class="left">
+ <?php echo $item->name;?>
+ </td>
<td class="center">
+ <?php echo $item->pages; ?>
+ </td>
+
+ <td class="center">
<?php echo $this->escape($item->access_level); ?>
</td>
<td class="center">
Modified: development/branches/jcamp/administrator/components/com_modules/views/modules/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_modules/views/modules/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_modules/views/modules/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -68,13 +68,10 @@
JToolBarHelper::custom('modules.duplicate', 'copy.png', 'copy_f2.png','JTOOLBAR_DUPLICATE', true);
}
- if ($canDo->get('core.edit')) {
+ if ($canDo->get('core.edit.state')) {
JToolBarHelper::divider();
JToolBarHelper::custom('modules.publish', 'publish.png', 'publish_f2.png', 'JTOOLBAR_PUBLISH', true);
JToolBarHelper::custom('modules.unpublish', 'unpublish.png', 'unpublish_f2.png', 'JTOOLBAR_UNPUBLISH', true);
- }
-
- if (JFactory::getUser()->authorise('core.manage','com_checkin')) {
JToolBarHelper::divider();
JToolBarHelper::custom('modules.checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true);
}
Modified: development/branches/jcamp/administrator/components/com_newsfeeds/controller.php
===================================================================
--- development/branches/jcamp/administrator/components/com_newsfeeds/controller.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_newsfeeds/controller.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -32,9 +32,9 @@
{
require_once JPATH_COMPONENT.'/helpers/newsfeeds.php';
- parent::display();
-
// Load the submenu.
NewsfeedsHelper::addSubmenu(JRequest::getWord('view', 'newsfeeds'));
+
+ parent::display();
}
}
\ No newline at end of file
Modified: development/branches/jcamp/administrator/components/com_newsfeeds/models/forms/newsfeed.xml
===================================================================
--- development/branches/jcamp/administrator/components/com_newsfeeds/models/forms/newsfeed.xml 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_newsfeeds/models/forms/newsfeed.xml 2010-08-31 19:21:09 UTC (rev 18740)
@@ -102,12 +102,12 @@
readonly="true" filter="unset" />
<field name="publish_up" type="calendar"
- label="JGLOBAL_FIELD_Publish_up_Label" description="JGLOBAL_FIELD_Publish_up_Desc"
+ label="JGLOBAL_FIELD_PUBLISH_UP_LABEL" description="JGLOBAL_FIELD_PUBLISH_UP_DESC"
class="inputbox" format="%Y-%m-%d %H:%M:%S" size="20"
filter="user_utc" />
<field name="publish_down" type="calendar"
- label="JGLOBAL_FIELD_Publish_down_Label" description="JGLOBAL_FIELD_Publish_down_Desc"
+ label="JGLOBAL_FIELD_PUBLISH_DOWN_LABEL" description="JGLOBAL_FIELD_PUBLISH_DOWN_DESC"
class="inputbox" format="%Y-%m-%d %H:%M:%S" size="20"
filter="user_utc" />
Modified: development/branches/jcamp/administrator/components/com_newsfeeds/views/newsfeed/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_newsfeeds/views/newsfeed/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_newsfeeds/views/newsfeed/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -59,9 +59,11 @@
JToolBarHelper::title(JText::_('COM_NEWSFEEDS_MANAGER_NEWSFEED'), 'newsfeeds.png');
// If not checked out, can save the item.
- if (!$checkedOut && $canDo->get('core.edit')) {
+ if (!$checkedOut && ($canDo->get('core.edit')||($canDo->get('core.create')))) {
JToolBarHelper::apply('newsfeed.apply', 'JTOOLBAR_APPLY');
JToolBarHelper::save('newsfeed.save', 'JTOOLBAR_SAVE');
+ }
+ if (!$checkedOut && $canDo->get('core.create')){
JToolBarHelper::custom('newsfeed.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
}
// If an existing item, can save to a copy.
Modified: development/branches/jcamp/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -31,11 +31,7 @@
<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
<button type="button" onclick="document.id('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
</div>
- <div class="filter-select fltrt">
- <select name="filter_access" class="inputbox" onchange="this.form.submit()">
- <option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
- <?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
- </select>
+ <div class="filter-select fltrt">
<select name="filter_published" class="inputbox" onchange="this.form.submit()">
<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
@@ -46,6 +42,11 @@
<option value=""><?php echo JText::_('JOPTION_SELECT_CATEGORY');?></option>
<?php echo JHtml::_('select.options', JHtml::_('category.options', 'com_newsfeeds'), 'value', 'text', $this->state->get('filter.category_id'));?>
</select>
+
+ <select name="filter_access" class="inputbox" onchange="this.form.submit()">
+ <option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
+ <?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
+ </select>
<select name="filter_language" class="inputbox" onchange="this.form.submit()">
<option value=""><?php echo JText::_('JOPTION_SELECT_LANGUAGE');?></option>
@@ -116,7 +117,7 @@
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'newsfeeds.', $canCheckin); ?>
<?php endif; ?>
- <?php if ($canCreate || $canEdit) : ?>
+ <?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_newsfeeds&task=newsfeed.edit&id='.(int) $item->id); ?>">
<?php echo $this->escape($item->name); ?></a>
<?php else : ?>
@@ -134,8 +135,13 @@
<td class="order">
<?php if ($canChange) : ?>
<?php if ($saveOrder) :?>
- <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid), 'newsfeeds.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
- <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, ($item->catid == @$this->items[$i+1]->catid), 'newsfeeds.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php if ($listDirn == 'asc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid), 'newsfeeds.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, ($item->catid == @$this->items[$i+1]->catid), 'newsfeeds.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php elseif ($listDirn == 'desc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid), 'newsfeeds.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, ($item->catid == @$this->items[$i+1]->catid), 'newsfeeds.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php endif; ?>
<?php endif; ?>
<?php $disabled = $saveOrder ? '' : 'disabled="disabled"'; ?>
<input type="text" name="order[]" size="5" value="<?php echo $item->ordering;?>" <?php echo $disabled ?> class="text-area-order" />
Modified: development/branches/jcamp/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php
===================================================================
--- development/branches/jcamp/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -17,7 +17,7 @@
$listOrder = $this->state->get('list.ordering');
$listDirn = $this->state->get('list.direction');
?>
-<form action="<?php echo JRoute::_('index.php?option=com_newsfeeds&view=newsfeeds&layout=modal&tmpl=component');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_newsfeeds&view=newsfeeds&layout=modal&tmpl=component');?>" method="post" name="adminForm" id="adminForm">
<fieldset class="filter clearfix">
<div class="left">
<label for="filter_search">
Modified: development/branches/jcamp/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -65,8 +65,6 @@
JToolBarHelper::custom('newsfeeds.unpublish', 'unpublish.png', 'unpublish_f2.png', 'JTOOLBAR_UNPUBLISH', true);
JToolBarHelper::divider();
JToolBarHelper::archiveList('newsfeeds.archive','JTOOLBAR_ARCHIVE');
- }
- if(JFactory::getUser()->authorise('core.manage','com_checkin')) {
JToolBarHelper::custom('newsfeeds.checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true);
}
if ($state->get('filter.state') == -2 && $canDo->get('core.delete')) {
Modified: development/branches/jcamp/administrator/components/com_plugins/controller.php
===================================================================
--- development/branches/jcamp/administrator/components/com_plugins/controller.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_plugins/controller.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -32,9 +32,9 @@
{
require_once JPATH_COMPONENT.'/helpers/plugins.php';
- parent::display();
-
// Load the submenu.
PluginsHelper::addSubmenu(JRequest::getWord('view', 'plugins'));
+
+ parent::display();
}
}
\ No newline at end of file
Modified: development/branches/jcamp/administrator/components/com_plugins/views/plugin/tmpl/edit.php
===================================================================
--- development/branches/jcamp/administrator/components/com_plugins/views/plugin/tmpl/edit.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_plugins/views/plugin/tmpl/edit.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -23,7 +23,7 @@
}
</script>
-<form action="<?php JRoute::_('index.php?option=com_templates'); ?>" method="post" name="adminForm" id="style-form" class="form-validate">
+<form action="<?php echo JRoute::_('index.php?option=com_plugins'); ?>" method="post" name="adminForm" id="style-form" class="form-validate">
<div class="width-60 fltlft">
<fieldset class="adminform">
<legend><?php echo JText::_('JDETAILS') ?></legend>
Modified: development/branches/jcamp/administrator/components/com_plugins/views/plugins/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_plugins/views/plugins/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_plugins/views/plugins/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -34,16 +34,16 @@
<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
<?php echo JHtml::_('select.options', PluginsHelper::stateOptions(), 'value', 'text', $this->state->get('filter.state'), true);?>
</select>
-
+ <select name="filter_folder" class="inputbox" onchange="this.form.submit()">
+ <option value=""><?php echo JText::_('COM_PLUGINS_OPTION_FOLDER');?></option>
+ <?php echo JHtml::_('select.options', PluginsHelper::folderOptions(), 'value', 'text', $this->state->get('filter.folder'));?>
+ </select>
<select name="filter_access" class="inputbox" onchange="this.form.submit()">
<option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
<?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
</select>
- <select name="filter_folder" class="inputbox" onchange="this.form.submit()">
- <option value=""><?php echo JText::_('COM_PLUGINS_OPTION_FOLDER');?></option>
- <?php echo JHtml::_('select.options', PluginsHelper::folderOptions(), 'value', 'text', $this->state->get('filter.folder'));?>
- </select>
+
</div>
</fieldset>
<div class="clr"> </div>
@@ -66,15 +66,16 @@
<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'plugins.saveorder'); ?>
<?php endif; ?>
</th>
- <th width="5%">
- <?php echo JHtml::_('grid.sort', 'JGrid_Heading_Access', 'access', $listDirn, $listOrder); ?>
- </th>
+
<th class="nowrap" width="10%">
<?php echo JHTML::_('grid.sort', 'COM_PLUGINS_FOLDER_HEADING', 'folder', $listDirn, $listOrder); ?>
</th>
<th class="nowrap" width="10%">
<?php echo JHTML::_('grid.sort', 'COM_PLUGINS_ELEMENT_HEADING', 'element', $listDirn, $listOrder); ?>
</th>
+ <th width="5%">
+ <?php echo JHtml::_('grid.sort', 'JGrid_Heading_Access', 'access', $listDirn, $listOrder); ?>
+ </th>
<th class="nowrap" width="1%">
<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'extension_id', $listDirn, $listOrder); ?>
</th>
@@ -115,8 +116,13 @@
<td class="order">
<?php if ($canChange) : ?>
<?php if ($saveOrder) :?>
- <span><?php echo $this->pagination->orderUpIcon($i, (@$this->items[$i-1]->folder == $item->folder), 'plugins.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
- <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, (@$this->items[$i+1]->folder == $item->folder), 'plugins.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php if ($listDirn == 'asc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, (@$this->items[$i-1]->folder == $item->folder), 'plugins.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, (@$this->items[$i+1]->folder == $item->folder), 'plugins.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php elseif ($listDirn == 'desc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, (@$this->items[$i-1]->folder == $item->folder), 'plugins.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, (@$this->items[$i+1]->folder == $item->folder), 'plugins.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php endif; ?>
<?php endif; ?>
<?php $disabled = $saveOrder ? '' : 'disabled="disabled"'; ?>
<input type="text" name="order[]" size="5" value="<?php echo $item->ordering;?>" <?php echo $disabled ?> class="text-area-order" />
@@ -124,15 +130,16 @@
<?php echo $item->ordering; ?>
<?php endif; ?>
</td>
- <td class="center">
- <?php echo $this->escape($item->access_level); ?>
- </td>
+
<td class="nowrap center">
<?php echo $this->escape($item->folder);?>
</td>
<td class="nowrap center">
<?php echo $this->escape($item->element);?>
</td>
+ <td class="center">
+ <?php echo $this->escape($item->access_level); ?>
+ </td>
<td class="center">
<?php echo (int) $item->extension_id;?>
</td>
Modified: development/branches/jcamp/administrator/components/com_plugins/views/plugins/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_plugins/views/plugins/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_plugins/views/plugins/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -62,8 +62,6 @@
JToolBarHelper::divider();
JToolBarHelper::custom('plugins.publish', 'publish.png', 'publish_f2.png', 'JTOOLBAR_ENABLE', true);
JToolBarHelper::custom('plugins.unpublish', 'unpublish.png', 'unpublish_f2.png', 'JTOOLBAR_DISABLE', true);
- }
- if(JFactory::getUser()->authorise('core.manage','com_checkin')) {
JToolBarHelper::divider();
JToolBarHelper::custom('plugins.checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true);
}
Modified: development/branches/jcamp/administrator/components/com_redirect/controller.php
===================================================================
--- development/branches/jcamp/administrator/components/com_redirect/controller.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_redirect/controller.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -37,9 +37,9 @@
{
require_once JPATH_COMPONENT.'/helpers/redirect.php';
- parent::display();
-
// Load the submenu.
RedirectHelper::addSubmenu(JRequest::getWord('view', 'links'));
+
+ parent::display();
}
}
\ No newline at end of file
Modified: development/branches/jcamp/administrator/components/com_redirect/views/links/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_redirect/views/links/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_redirect/views/links/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -87,7 +87,7 @@
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
</td>
<td>
- <?php if ($canCreate || $canEdit) : ?>
+ <?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_redirect&task=link.edit&id='.$item->id);?>" title="<?php echo $this->escape($item->old_url); ?>">
<?php echo $this->escape(str_replace(JURI::root(), '', $item->old_url)); ?></a>
<?php else : ?>
Modified: development/branches/jcamp/administrator/components/com_search/controller.php
===================================================================
--- development/branches/jcamp/administrator/components/com_search/controller.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_search/controller.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -38,9 +38,9 @@
{
require_once JPATH_COMPONENT.'/helpers/search.php';
- parent::display();
-
// Load the submenu.
SearchHelper::addSubmenu(JRequest::getWord('view', 'searches'));
+
+ parent::display();
}
}
\ No newline at end of file
Modified: development/branches/jcamp/administrator/components/com_search/helpers/site.php
===================================================================
--- development/branches/jcamp/administrator/components/com_search/helpers/site.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_search/helpers/site.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -5,6 +5,9 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
+// no direct access
+defined('_JEXEC') or die;
+
/**
* Mock JSite class used to fool the frontend search plugins because they route the results.
*
Modified: development/branches/jcamp/administrator/components/com_templates/config.xml
===================================================================
--- development/branches/jcamp/administrator/components/com_templates/config.xml 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_templates/config.xml 2010-08-31 19:21:09 UTC (rev 18740)
@@ -1,11 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<config>
<fieldset
+ name="templates"
+ label="COM_TEMPLATES_SUBMENU_TEMPLATES"
+ description="COM_TEMPLATES_CONFIG_FIELDSET_DESC">
+
+ <field
+ name="template_positions_display"
+ type="radio"
+ default="0"
+ label="COM_TEMPLATES_CONFIG_POSITIONS_LABEL"
+ description="COM_TEMPLATES_CONFIG_POSITIONS_DESC">
+ <option
+ value="0">JDISABLED</option>
+ <option
+ value="1">JENABLED</option>
+ </field>
+ </fieldset>
+
+ <fieldset
name="permissions"
label="JCONFIG_PERMISSIONS_LABEL"
description="JCONFIG_PERMISSIONS_DESC"
>
-
<field
name="rules"
type="rules"
Modified: development/branches/jcamp/administrator/components/com_templates/controller.php
===================================================================
--- development/branches/jcamp/administrator/components/com_templates/controller.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_templates/controller.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -38,10 +38,10 @@
{
require_once JPATH_COMPONENT.'/helpers/templates.php';
- parent::display();
-
// Load the submenu.
TemplatesHelper::addSubmenu(JRequest::getWord('view', 'styles'));
+
+ parent::display();
}
/**
Modified: development/branches/jcamp/administrator/components/com_templates/models/style.php
===================================================================
--- development/branches/jcamp/administrator/components/com_templates/models/style.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_templates/models/style.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -1,6 +1,8 @@
<?php
/**
* @version $Id$
+ * @package Joomla.Administrator
+ * @subpackage com_templates
* @copyright Copyright (C) 2005 - 2010 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
@@ -61,7 +63,8 @@
$table = $this->getTable();
// Iterate the items to delete each one.
- foreach ($pks as $i => $pk) {
+ foreach ($pks as $i => $pk)
+ {
if ($table->load($pk)) {
// Access checks.
if (!$user->authorise('core.delete', 'com_templates')) {
@@ -72,7 +75,8 @@
$this->setError($table->getError());
return false;
}
- } else {
+ }
+ else {
$this->setError($table->getError());
return false;
}
@@ -102,7 +106,8 @@
$table = $this->getTable();
- foreach ($pks as $pk) {
+ foreach ($pks as $pk)
+ {
if ($table->load($pk, true)) {
// Reset the id to create a new record.
$table->id = 0;
@@ -114,14 +119,16 @@
$m = null;
if (preg_match('#\((\d+)\)$#', $table->title, $m)) {
$table->title = preg_replace('#\(\d+\)$#', '('.($m[1] + 1).')', $table->title);
- } else {
+ }
+ else {
$table->title .= ' (2)';
}
if (!$table->check() || !$table->store()) {
throw new Exception($table->getError());
}
- } else {
+ }
+ else {
throw new Exception($table->getError());
}
}
@@ -148,7 +155,8 @@
$item = $this->getItem();
$clientId = $item->client_id;
$template = $item->template;
- } else {
+ }
+ else {
$clientId = JArrayHelper::getValue($data, 'client_id');
$template = JArrayHelper::getValue($data, 'template');
}
@@ -275,7 +283,9 @@
}
// Disable home field if it is default style
- if(is_array($data) && $data['home'] || is_object($data) && $data->home) {
+
+ if ((is_array($data) && array_key_exists('home',$data))
+ || ((is_object($data) && $data->home))){
$form->setFieldAttribute('home','readonly','true');
}
@@ -336,31 +346,40 @@
$user = JFactory::getUser();
if ($user->authorise('core.edit','com_menus') && $table->client_id==0) {
- $n=0;
+ $n = 0;
+ $db = JFactory::getDbo();
+ $user = JFactory::getUser();
- $db = JFactory::getDbo();
- $user = JFactory::getUser();
- $app = JFactory::getApplication();
- $query=$db->getQuery(true);
- $query->update('#__menu');
- $query->set('template_style_id='.(int)$table->id);
- $query->where('id IN ('.implode(',',$data['assigned']).')');
- $query->where('template_style_id!='.(int)$table->id);
- $query->where('checked_out in (0,'.(int)$user->id.')');
- $db->setQuery($query);
- $db->query();
- $n = $n + $db->getAffectedRows();
+ if (!empty($data['assigned'])) {
+ // Update the mapping for menu items that this style IS assigned to.
+ $query = $db->getQuery(true);
+ $query->update('#__menu');
+ $query->set('template_style_id='.(int)$table->id);
+ $query->where('id IN ('.implode(',', $data['assigned']).')');
+ $query->where('template_style_id!='.(int) $table->id);
+ $query->where('checked_out in (0,'.(int) $user->id.')');
+ $db->setQuery($query);
+ $db->query();
+ $n += $db->getAffectedRows();
+ }
- $query=$db->getQuery(true);
+ // Remove style mappings for menu items this style is NOT assigned to.
+ // If unassigned then all existing maps will be removed.
+ $query = $db->getQuery(true);
$query->update('#__menu');
$query->set('template_style_id=0');
- $query->where('id NOT IN ('.implode(',',$data['assigned']).')');
- $query->where('template_style_id='.(int)$table->id);
- $query->where('checked_out in (0,'.(int)$user->id.')');
+ if (!empty($data['assigned'])) {
+ $query->where('id NOT IN ('.implode(',', $data['assigned']).')');
+ }
+
+ $query->where('template_style_id='.(int) $table->id);
+ $query->where('checked_out in (0,'.(int) $user->id.')');
$db->setQuery($query);
$db->query();
- $n = $n + $db->getAffectedRows();
- if ($n>0) {
+
+ $n += $db->getAffectedRows();
+ if ($n > 0) {
+ $app = JFactory::getApplication();
$app->enQueueMessage(JText::plural('COM_TEMPLATES_MENU_CHANGED',$n));
}
}
@@ -406,7 +425,8 @@
if ($error = $db->getErrorMsg()) {
throw new Exception($error);
- } else if (!is_numeric($clientId)) {
+ }
+ else if (!is_numeric($clientId)) {
throw new Exception(JText::_('COM_TEMPLATES_ERROR_STYLE_NOT_FOUND'));
}
@@ -434,4 +454,4 @@
return true;
}
-}
+}
\ No newline at end of file
Modified: development/branches/jcamp/administrator/components/com_templates/views/prevuuw/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_templates/views/prevuuw/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_templates/views/prevuuw/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -12,7 +12,7 @@
?>
-<form action="<?php echo JRoute::_('index.php'); ?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php'); ?>" method="post" name="adminForm" id="adminForm">
<div class="width-100">
<h3 class="title fltlft">
<?php echo JText::_('COM_TEMPLATES_SITE_PREVIEW'); ?>
Modified: development/branches/jcamp/administrator/components/com_templates/views/source/tmpl/edit.php
===================================================================
--- development/branches/jcamp/administrator/components/com_templates/views/source/tmpl/edit.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_templates/views/source/tmpl/edit.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -28,7 +28,7 @@
}
</script>
-<form action="<?php JRoute::_('index.php?option=com_templates'); ?>" method="post" name="adminForm" id="source-form" class="form-validate">
+<form action="<?php echo JRoute::_('index.php?option=com_templates'); ?>" method="post" name="adminForm" id="source-form" class="form-validate">
<fieldset class="adminform">
<legend><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->source->filename, $this->template->element); ?></legend>
Modified: development/branches/jcamp/administrator/components/com_templates/views/style/tmpl/edit.php
===================================================================
--- development/branches/jcamp/administrator/components/com_templates/views/style/tmpl/edit.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_templates/views/style/tmpl/edit.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -25,7 +25,7 @@
}
</script>
-<form action="<?php JRoute::_('index.php?option=com_templates'); ?>" method="post" name="adminForm" id="style-form" class="form-validate">
+<form action="<?php echo JRoute::_('index.php?option=com_templates'); ?>" method="post" name="adminForm" id="style-form" class="form-validate">
<div class="width-60 fltlft">
<fieldset class="adminform">
<legend><?php echo JText::_('JDETAILS');?></legend>
Modified: development/branches/jcamp/administrator/components/com_templates/views/styles/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_templates/views/styles/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_templates/views/styles/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -27,17 +27,17 @@
<button type="button" onclick="document.id('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
</div>
<div class="filter-select fltrt">
- <select name="filter_client_id" class="inputbox" onchange="this.form.submit()">
- <option value="*"><?php echo JText::_('COM_TEMPLATES_FILTER_TYPE'); ?></option>
- <?php echo JHtml::_('select.options', TemplatesHelper::getClientOptions(), 'value', 'text', $this->state->get('filter.client_id'));?>
- </select>
- </div>
- <div class="filter-select fltrt">
<select name="filter_template" class="inputbox" onchange="this.form.submit()">
<option value="0"><?php echo JText::_('COM_TEMPLATES_FILTER_TEMPLATE'); ?></option>
<?php echo JHtml::_('select.options', TemplatesHelper::getTemplateOptions($this->state->get('filter.client_id')), 'value', 'text', $this->state->get('filter.template'));?>
</select>
</div>
+ <div class="filter-select fltrt">
+ <select name="filter_client_id" class="inputbox" onchange="this.form.submit()">
+ <option value="*"><?php echo JText::_('JGLOBAL_FILTER_CLIENT'); ?></option>
+ <?php echo JHtml::_('select.options', TemplatesHelper::getClientOptions(), 'value', 'text', $this->state->get('filter.client_id'));?>
+ </select>
+ </div>
</fieldset>
<div class="clr"> </div>
@@ -50,12 +50,12 @@
<th>
<?php echo JHtml::_('grid.sort', 'COM_TEMPLATES_HEADING_STYLE', 'a.title', $listDirn, $listOrder); ?>
</th>
+ <th width="10%">
+ <?php echo JHtml::_('grid.sort', 'JCLIENT', 'a.client_id', $listDirn, $listOrder); ?>
+ </th>
<th>
<?php echo JHtml::_('grid.sort', 'COM_TEMPLATES_HEADING_TEMPLATE', 'a.template', $listDirn, $listOrder); ?>
</th>
- <th width="10%">
- <?php echo JHtml::_('grid.sort', 'COM_TEMPLATES_HEADING_TYPE', 'a.client_id', $listDirn, $listOrder); ?>
- </th>
<th width="5%">
<?php echo JHtml::_('grid.sort', 'COM_TEMPLATES_HEADING_DEFAULT', 'a.home', $listDirn, $listOrder); ?>
</th>
@@ -86,22 +86,22 @@
</td>
<td>
- <?php if ($canCreate || $canEdit) : ?>
+ <?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_templates&task=style.edit&id='.(int) $item->id); ?>">
<?php echo $this->escape($item->title);?></a>
<?php else : ?>
<?php echo $this->escape($item->title);?>
<?php endif; ?>
</td>
+ <td class="center">
+ <?php echo $item->client_id == 0 ? JText::_('JSITE') : JText::_('JADMINISTRATOR'); ?>
+ </td>
<td>
<label for="cb<?php echo $i;?>">
<?php echo $this->escape($item->template);?>
</label>
</td>
<td class="center">
- <?php echo $item->client_id == 0 ? JText::_('JSITE') : JText::_('JADMINISTRATOR'); ?>
- </td>
- <td class="center">
<?php echo JHtml::_('jgrid.isdefault', $item->home, $i, 'styles.', $canChange && !$item->home);?>
</td>
<td class="center">
Modified: development/branches/jcamp/administrator/components/com_templates/views/templates/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_templates/views/templates/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_templates/views/templates/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -31,7 +31,7 @@
</div>
<div class="filter-select fltrt">
<select name="filter_client_id" class="inputbox" onchange="this.form.submit()">
- <option value="*"><?php echo JText::_('COM_TEMPLATES_TEMPLATES_FILTER_CLIENT'); ?></option>
+ <option value="*"><?php echo JText::_('JGLOBAL_FILTER_CLIENT'); ?></option>
<?php echo JHtml::_('select.options', TemplatesHelper::getClientOptions(), 'value', 'text', $this->state->get('filter.client_id'));?>
</select>
</div>
@@ -48,7 +48,7 @@
<?php echo JHtml::_('grid.sort', 'COM_TEMPLATES_HEADING_TEMPLATE', 'a.element', $listDirn, $listOrder); ?>
</th>
<th width="10%">
- <?php echo JHtml::_('grid.sort', 'COM_TEMPLATES_HEADING_TYPE', 'a.client_id', $listDirn, $listOrder); ?>
+ <?php echo JHtml::_('grid.sort', 'JCLIENT', 'a.client_id', $listDirn, $listOrder); ?>
</th>
<th width="10%" class="center">
<?php echo JText::_('JVERSION'); ?>
@@ -75,8 +75,8 @@
<?php echo JHtml::_('templates.thumb', $item->element, $item->client_id); ?>
</td>
<td class="template-name">
- <a href="<?php echo JRoute::_('index.php?option=com_templates&view=template&id='.(int) $item->extension_id); ?>">
- <?php echo JText::sprintf( 'COM_TEMPLATES_TEMPLATE_DETAILS', $item->name) ;?></a>
+ <a href="<?php echo JRoute::_('index.php?option=com_templates&view=template&id='.(int) $item->extension_id); ?>">
+ <?php echo JText::sprintf( 'COM_TEMPLATES_TEMPLATE_DETAILS', $item->name) ;?></a>
<p>
<?php if($this->preview && $item->client_id == '0'): ?>
<a href="<?php echo JURI::root(true).'?tp=1&template='.$item->element; ?>" target="_blank">
Modified: development/branches/jcamp/administrator/components/com_templates/views/templates/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_templates/views/templates/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_templates/views/templates/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -50,7 +50,7 @@
$this->items = $this->get('Items');
$this->pagination = $this->get('Pagination');
$this->state = $this->get('State');
- $this->preview = JFactory::getConfig()->get('debug_modules');
+ $this->preview = JComponentHelper::getParams('com_templates')->get('template_positions_display');
// Check for errors.
if (count($errors = $this->get('Errors'))) {
Modified: development/branches/jcamp/administrator/components/com_users/controller.php
===================================================================
--- development/branches/jcamp/administrator/components/com_users/controller.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_users/controller.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -32,9 +32,9 @@
{
require_once JPATH_COMPONENT.'/helpers/users.php';
- parent::display();
-
// Load the submenu.
UsersHelper::addSubmenu(JRequest::getWord('view', 'users'));
+
+ parent::display();
}
}
\ No newline at end of file
Modified: development/branches/jcamp/administrator/components/com_users/models/mail.php
===================================================================
--- development/branches/jcamp/administrator/components/com_users/models/mail.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_users/models/mail.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -124,7 +124,7 @@
$mailer = JFactory::getMailer();
$params = JComponentHelper::getParams('com_users');
- // Build e-mail message format.
+ // Build email message format.
$mailer->setSender(array($app->getCfg('mailfrom'), $app->getCfg('fromname')));
$mailer->setSubject($params->get('mailSubjectPrefix') . stripslashes($subject));
$mailer->setBody($message_body . $params->get('mailBodySuffix'));
Modified: development/branches/jcamp/administrator/components/com_users/models/user.php
===================================================================
--- development/branches/jcamp/administrator/components/com_users/models/user.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_users/models/user.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -248,19 +248,25 @@
if ($value == 1 && $pk == $user->get('id')) {
// Cannot block yourself.
unset($pks[$i]);
- JError::raiseWarning(403, JText::_('COM_USERS_USERS_ERROR_CANNOT_DELETE_SELF'));
+ JError::raiseWarning(403, JText::_('COM_USERS_USERS_ERROR_CANNOT_BLOCK_SELF'));
}
else if ($table->load($pk)) {
$old = $table->getProperties();
$allow = $user->authorise('core.edit.state', 'com_users');
-
+
// Prepare the logout options.
$options = array(
'clientid' => array(0, 1)
);
if ($allow) {
+ // Skip changing of same state
+ if ($table->block == $value) {
+ unset($pks[$i]);
+ continue;
+ }
+
$table->block = (int) $value;
if (!$table->check()) {
Modified: development/branches/jcamp/administrator/components/com_users/views/group/tmpl/edit.php
===================================================================
--- development/branches/jcamp/administrator/components/com_users/views/group/tmpl/edit.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_users/views/group/tmpl/edit.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -27,7 +27,7 @@
}
</script>
-<form action="<?php JRoute::_('index.php?option=com_users'); ?>" method="post" name="adminForm" id="group-form" class="form-validate">
+<form action="<?php echo JRoute::_('index.php?option=com_users'); ?>" method="post" name="adminForm" id="group-form" class="form-validate">
<div class="width-100">
<fieldset class="adminform">
<legend><?php echo JText::_('COM_USERS_USERGROUP_DETAILS');?></legend>
Modified: development/branches/jcamp/administrator/components/com_users/views/group/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_users/views/group/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_users/views/group/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -57,9 +57,11 @@
JToolBarHelper::title(JText::_($isNew ? 'COM_USERS_VIEW_NEW_GROUP_TITLE' : 'COM_USERS_VIEW_EDIT_GROUP_TITLE'), 'groups-add');
- if ($canDo->get('core.edit')) {
+ if ($canDo->get('core.edit')||$canDo->get('core.create')) {
JToolBarHelper::apply('group.apply','JTOOLBAR_APPLY');
JToolBarHelper::save('group.save','JTOOLBAR_SAVE');
+ }
+ if ($canDo->get('core.create')) {
JToolBarHelper::custom('group.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
}
// If an existing item, can save to a copy.
Modified: development/branches/jcamp/administrator/components/com_users/views/groups/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_users/views/groups/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_users/views/groups/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -20,7 +20,7 @@
$listOrder = $this->state->get('list.ordering');
$listDirn = $this->state->get('list.direction');
?>
-<form action="<?php echo JRoute::_('index.php?option=com_users&view=groups');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_users&view=groups');?>" method="post" name="adminForm" id="adminForm">
<fieldset id="filter-bar">
<div class="filter-search fltlft">
<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('COM_USERS_SEARCH_GROUPS_LABEL'); ?></label>
@@ -67,7 +67,7 @@
</td>
<td>
<?php echo str_repeat('<span class="gi">|—</span>', $item->level) ?>
- <?php if ($canCreate || $canEdit) : ?>
+ <?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_users&task=group.edit&id='.$item->id);?>">
<?php echo $this->escape($item->title); ?></a>
<?php else : ?>
Modified: development/branches/jcamp/administrator/components/com_users/views/level/tmpl/edit.php
===================================================================
--- development/branches/jcamp/administrator/components/com_users/views/level/tmpl/edit.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_users/views/level/tmpl/edit.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -87,7 +87,7 @@
</script>
-<form action="<?php JRoute::_('index.php?option=com_users'); ?>" method="post" name="adminForm" id="level-form" class="form-validate">
+<form action="<?php echo JRoute::_('index.php?option=com_users'); ?>" method="post" name="adminForm" id="level-form" class="form-validate">
<div class="width-100">
<fieldset class="adminform">
<legend><?php echo JText::_('COM_USERS_LEVEL_DETAILS');?></legend>
Modified: development/branches/jcamp/administrator/components/com_users/views/level/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_users/views/level/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_users/views/level/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -58,27 +58,24 @@
JToolBarHelper::title(JText::_($isNew ? 'COM_USERS_VIEW_NEW_LEVEL_TITLE' : 'COM_USERS_VIEW_EDIT_LEVEL_TITLE'), 'levels-add');
- if ($canDo->get('core.edit'))
- {
+ if ($canDo->get('core.edit')||$canDo->get('core.create')) {
JToolBarHelper::apply('level.apply','JTOOLBAR_APPLY');
JToolBarHelper::save('level.save','JTOOLBAR_SAVE');
+ }
+ if ($canDo->get('core.create')) {
JToolBarHelper::custom('level.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
-
- // If an existing item, can save to a copy.
- if (!$isNew && $canDo->get('core.create'))
- {
+ }
+ // If an existing item, can save to a copy.
+ if (!$isNew && $canDo->get('core.create')){
JToolBarHelper::custom('level.save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false);
}
-
- if (empty($this->item->id))
- {
+ if (empty($this->item->id)){
JToolBarHelper::cancel('level.cancel','JTOOLBAR_CANCEL');
- } else {
+ } else {
JToolBarHelper::cancel('level.cancel', 'JTOOLBAR_CLOSE');
- }
+ }
JToolBarHelper::divider();
JToolBarHelper::help('JHELP_USERS_ACCESS_LEVELS_EDIT');
- }
}
}
\ No newline at end of file
Modified: development/branches/jcamp/administrator/components/com_users/views/levels/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_users/views/levels/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_users/views/levels/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -22,7 +22,7 @@
$canOrder = $user->authorise('core.edit.state', 'com_users');
$saveOrder = $listOrder == 'a.ordering';
?>
-<form action="<?php echo JRoute::_('index.php?option=com_users&view=levels');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_users&view=levels');?>" method="post" id="adminForm" name="adminForm">
<fieldset id="filter-bar">
<div class="filter-search fltlft">
<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('COM_USERS_SEARCH_ACCESS_LEVELS'); ?></label>
@@ -75,7 +75,7 @@
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
</td>
<td>
- <?php if ($canCreate || $canEdit) : ?>
+ <?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_users&task=level.edit&id='.$item->id);?>">
<?php echo $this->escape($item->title); ?></a>
<?php else : ?>
@@ -85,8 +85,13 @@
<td class="order">
<?php if ($canChange) : ?>
<?php if ($saveOrder) :?>
- <span><?php echo $this->pagination->orderUpIcon($i, true, 'levels.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
- <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'levels.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php if ($listDirn == 'asc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, true, 'levels.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'levels.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php elseif ($listDirn == 'desc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, true, 'levels.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'levels.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php endif; ?>
<?php endif; ?>
<?php $disabled = $saveOrder ? '' : 'disabled="disabled"'; ?>
<input type="text" name="order[]" size="5" value="<?php echo $item->ordering;?>" <?php echo $disabled ?> class="text-area-order" />
Modified: development/branches/jcamp/administrator/components/com_users/views/mail/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_users/views/mail/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_users/views/mail/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -31,7 +31,7 @@
JFactory::getDocument()->addScriptDeclaration($script);
?>
-<form action="<?php echo(JRoute::_('index.php?option=com_users&view=mail')); ?>" name="adminForm" method="post">
+<form action="<?php echo JRoute::_('index.php?option=com_users&view=mail'); ?>" name="adminForm" method="post" id="adminForm">
<div class="width-30 fltlft">
<fieldset class="adminform">
Modified: development/branches/jcamp/administrator/components/com_users/views/user/tmpl/edit.php
===================================================================
--- development/branches/jcamp/administrator/components/com_users/views/user/tmpl/edit.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_users/views/user/tmpl/edit.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -29,7 +29,7 @@
}
</script>
-<form action="<?php JRoute::_('index.php?option=com_users'); ?>" method="post" name="adminForm" id="user-form" class="form-validate">
+<form action="<?php echo JRoute::_('index.php?option=com_users'); ?>" method="post" name="adminForm" id="user-form" class="form-validate">
<div class="width-60 fltlft">
<fieldset class="adminform">
<legend><?php echo JText::_('COM_USERS_USER_ACCOUNT_DETAILS'); ?></legend>
Modified: development/branches/jcamp/administrator/components/com_users/views/user/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_users/views/user/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_users/views/user/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -54,11 +54,20 @@
{
JRequest::setVar('hidemainmenu', 1);
+ $user = JFactory::getUser();
+ $isNew = ($this->item->id == 0);
+ $canDo = UsersHelper::getActions();
+
+
$isNew = ($this->item->id == 0);
JToolBarHelper::title(JText::_($isNew ? 'COM_USERS_VIEW_NEW_USER_TITLE' : 'COM_USERS_VIEW_EDIT_USER_TITLE'), 'user-add');
- JToolBarHelper::apply('user.apply','JTOOLBAR_APPLY');
- JToolBarHelper::save('user.save','JTOOLBAR_SAVE');
- JToolBarHelper::custom('user.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+ if ($canDo->get('core.edit')||$canDo->get('core.create')) {
+ JToolBarHelper::apply('user.apply','JTOOLBAR_APPLY');
+ JToolBarHelper::save('user.save','JTOOLBAR_SAVE');
+ }
+ if ($canDo->get('core.create')) {
+ JToolBarHelper::custom('user.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+ }
if (empty($this->item->id)) {
JToolBarHelper::cancel('user.cancel','JTOOLBAR_CANCEL');
} else {
Modified: development/branches/jcamp/administrator/components/com_users/views/users/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_users/views/users/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_users/views/users/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -21,7 +21,7 @@
$listDirn = $this->state->get('list.direction');
?>
-<form action="<?php echo JRoute::_('index.php?option=com_users&view=users');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_users&view=users');?>" method="post" name="adminForm" id="adminForm">
<fieldset id="filter-bar">
<div class="filter-search fltlft">
<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('COM_USERS_SEARCH_USERS'); ?></label>
Modified: development/branches/jcamp/administrator/components/com_users/views/users/tmpl/modal.php
===================================================================
--- development/branches/jcamp/administrator/components/com_users/views/users/tmpl/modal.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_users/views/users/tmpl/modal.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -16,7 +16,7 @@
$listOrder = $this->state->get('list.ordering');
$listDirn = $this->state->get('list.direction');
?>
-<form action="<?php echo JRoute::_('index.php?option=com_users&view=users&layout=modal&tmpl=component');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_users&view=users&layout=modal&tmpl=component');?>" method="post" name="adminForm" id="adminForm">
<fieldset class="filter">
<div class="left">
<label for="filter_search"><?php echo JText::_('JSEARCH_FILTER'); ?></label>
Modified: development/branches/jcamp/administrator/components/com_users/views/users/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_users/views/users/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_users/views/users/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -64,6 +64,7 @@
JToolBarHelper::divider();
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);
}
if ($canDo->get('core.delete')) {
Modified: development/branches/jcamp/administrator/components/com_weblinks/controller.php
===================================================================
--- development/branches/jcamp/administrator/components/com_weblinks/controller.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_weblinks/controller.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -32,10 +32,10 @@
{
require_once JPATH_COMPONENT.'/helpers/weblinks.php';
- parent::display();
-
// Load the submenu.
WeblinksHelper::addSubmenu(JRequest::getWord('view', 'weblinks'));
+
+ parent::display();
return $this;
}
Modified: development/branches/jcamp/administrator/components/com_weblinks/views/weblink/tmpl/edit.php
===================================================================
--- development/branches/jcamp/administrator/components/com_weblinks/views/weblink/tmpl/edit.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_weblinks/views/weblink/tmpl/edit.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -27,7 +27,7 @@
}
</script>
-<form action="<?php JRoute::_('index.php?option=com_weblinks'); ?>" method="post" name="adminForm" id="weblink-form" class="form-validate">
+<form action="<?php echo JRoute::_('index.php?option=com_weblinks'); ?>" method="post" name="adminForm" id="weblink-form" class="form-validate">
<div class="width-60 fltlft">
<fieldset class="adminform">
<legend><?php echo empty($this->item->id) ? JText::_('COM_WEBLINKS_NEW_WEBLINK') : JText::sprintf('COM_WEBLINKS_EDIT_WEBLINK', $this->item->id); ?></legend>
Modified: development/branches/jcamp/administrator/components/com_weblinks/views/weblink/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_weblinks/views/weblink/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_weblinks/views/weblink/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -59,14 +59,16 @@
JToolBarHelper::title(JText::_('COM_WEBLINKS_MANAGER_WEBLINK'), 'weblinks.png');
// If not checked out, can save the item.
- if (!$checkedOut && $canDo->get('core.edit'))
+ if (!$checkedOut && ($canDo->get('core.edit')||($canDo->get('core.create'))))
{
JToolBarHelper::apply('weblink.apply', 'JTOOLBAR_APPLY');
JToolBarHelper::save('weblink.save', 'JTOOLBAR_SAVE');
+ }
+ if (!$checkedOut && ($canDo->get('core.create'))){
JToolBarHelper::custom('weblink.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
}
- // If an existing item, can save to a copy.
+ // If an existing item, can save to a copy.
if (!$isNew && $canDo->get('core.create')) {
JToolBarHelper::custom('weblink.save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false);
}
Modified: development/branches/jcamp/administrator/components/com_weblinks/views/weblinks/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/components/com_weblinks/views/weblinks/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_weblinks/views/weblinks/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -30,10 +30,7 @@
<button type="button" onclick="document.id('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
</div>
<div class="filter-select fltrt">
- <select name="filter_access" class="inputbox" onchange="this.form.submit()">
- <option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
- <?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
- </select>
+
<select name="filter_published" class="inputbox" onchange="this.form.submit()">
<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
@@ -44,6 +41,11 @@
<option value=""><?php echo JText::_('JOPTION_SELECT_CATEGORY');?></option>
<?php echo JHtml::_('select.options', JHtml::_('category.options', 'com_weblinks'), 'value', 'text', $this->state->get('filter.category_id'));?>
</select>
+
+ <select name="filter_access" class="inputbox" onchange="this.form.submit()">
+ <option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
+ <?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
+ </select>
<select name="filter_language" class="inputbox" onchange="this.form.submit()">
<option value=""><?php echo JText::_('JOPTION_SELECT_LANGUAGE');?></option>
@@ -112,7 +114,7 @@
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'weblinks.', $canCheckin); ?>
<?php endif; ?>
- <?php if ($canCreate || $canEdit) : ?>
+ <?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_weblinks&task=weblink.edit&id='.(int) $item->id); ?>">
<?php echo $this->escape($item->title); ?></a>
<?php else : ?>
@@ -130,8 +132,13 @@
<td class="order">
<?php if ($canChange) : ?>
<?php if ($saveOrder) :?>
- <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid), 'weblinks.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
- <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, ($item->catid == @$this->items[$i+1]->catid), 'weblinks.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php if ($listDirn == 'asc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid), 'weblinks.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, ($item->catid == @$this->items[$i+1]->catid), 'weblinks.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php elseif ($listDirn == 'desc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid), 'weblinks.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, ($item->catid == @$this->items[$i+1]->catid), 'weblinks.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php endif; ?>
<?php endif; ?>
<?php $disabled = $saveOrder ? '' : 'disabled="disabled"'; ?>
<input type="text" name="order[]" size="5" value="<?php echo $item->ordering;?>" <?php echo $disabled ?> class="text-area-order" />
Modified: development/branches/jcamp/administrator/components/com_weblinks/views/weblinks/view.html.php
===================================================================
--- development/branches/jcamp/administrator/components/com_weblinks/views/weblinks/view.html.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/components/com_weblinks/views/weblinks/view.html.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -67,17 +67,9 @@
JToolBarHelper::custom('weblinks.publish', 'publish.png', 'publish_f2.png','JTOOLBAR_PUBLISH', true);
JToolBarHelper::custom('weblinks.unpublish', 'unpublish.png', 'unpublish_f2.png', 'JTOOLBAR_UNPUBLISH', true);
- if ($state->get('filter.state') != -1 ) {
- JToolBarHelper::divider();
- if ($state->get('filter.state') != 2) {
- JToolBarHelper::archiveList('weblinks.archive','JTOOLBAR_ARCHIVE');
- }
- else if ($state->get('filter.state') == 2) {
- JToolBarHelper::unarchiveList('weblinks.publish', 'JTOOLBAR_UNARCHIVE');
- }
- }
- }
- if(JFactory::getUser()->authorise('core.manage','com_checkin')) {
+
+ JToolBarHelper::divider();
+ JToolBarHelper::archiveList('weblinks.archive','JTOOLBAR_ARCHIVE');
JToolBarHelper::custom('weblinks.checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true);
}
if ($state->get('filter.state') == -2 && $canDo->get('core.delete')) {
Modified: development/branches/jcamp/administrator/language/en-GB/en-GB.com_banners.ini
===================================================================
--- development/branches/jcamp/administrator/language/en-GB/en-GB.com_banners.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/en-GB/en-GB.com_banners.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -43,7 +43,6 @@
COM_BANNERS_DEFAULT="Default (%s)"
COM_BANNERS_DELETE_MSG="Are you sure you want to delete all these tracks?"
COM_BANNERS_EDIT_BANNER="Edit Banner"
-COM_BANNERS_EDIT_BANNER="Edit banner"
COM_BANNERS_EDIT_CLIENT="Details"
COM_BANNERS_END_LABEL="End date:"
COM_BANNERS_ERR_ZIP_ADAPTER_FAILURE="Zip adapter failure"
@@ -82,8 +81,8 @@
COM_BANNERS_FIELD_CUSTOMCODE_DESC="Enter your custom code for the banner"
COM_BANNERS_FIELD_CUSTOMCODE_LABEL="Custom Code"
COM_BANNERS_FIELD_DESCRIPTION_DESC="Enter a description for the banner"
-COM_BANNERS_FIELD_EMAIL_DESC="Enter a valid Contact E-mail"
-COM_BANNERS_FIELD_EMAIL_LABEL="Contact E-mail"
+COM_BANNERS_FIELD_EMAIL_DESC="Enter a valid Contact email"
+COM_BANNERS_FIELD_EMAIL_LABEL="Contact email"
COM_BANNERS_FIELD_EXTRAINFO_DESC="Enter extra information for this client."
COM_BANNERS_FIELD_EXTRAINFO_LABEL="Additional Information"
COM_BANNERS_FIELD_HEIGHT_DESC="The height of the banner"
@@ -100,10 +99,10 @@
COM_BANNERS_FIELD_METAKEYWORDS_DESC="Enter here the meta keywords for the banner"
COM_BANNERS_FIELD_NAME_DESC="Enter a name for the banner"
COM_BANNERS_FIELD_NAME_LABEL="Name"
-COM_BANNERS_FIELD_PUBLISH_DOWN_DESC="An optional date to finish publishing the banner."
-COM_BANNERS_FIELD_PUBLISH_DOWN_LABEL="Publish Finish"
-COM_BANNERS_FIELD_PUBLISH_UP_DESC="An optional date to start publishing the banner."
-COM_BANNERS_FIELD_PUBLISH_UP_LABEL="Publish Start"
+COM_BANNERS_FIELD_PUBLISH_DOWN_DESC="An optional date to Finish Publishing the banner."
+COM_BANNERS_FIELD_PUBLISH_DOWN_LABEL="Finish Publishing"
+COM_BANNERS_FIELD_PUBLISH_UP_DESC="An optional date to Start Publishing the banner."
+COM_BANNERS_FIELD_PUBLISH_UP_LABEL="Start Publishing"
COM_BANNERS_FIELD_PURCHASETYPE_DESC="Select the type of purchase in the list."
COM_BANNERS_FIELD_PURCHASETYPE_LABEL="Purchase Type"
COM_BANNERS_FIELD_STATE_DESC="Defines the state of the banner"
@@ -126,6 +125,8 @@
COM_BANNERS_FIELD_VALUE_USECOMPONENTDEFAULT="-- Use Component Default --"
COM_BANNERS_FIELD_WIDTH_LABEL="Width"
COM_BANNERS_FIELD_WIDTH_DESC="The width of the banner"
+COM_BANNERS_FIELDSET_CONFIG_CLIENT_OPTIONS_LABEL="Client Options"
+COM_BANNERS_FIELDSET_CONFIG_CLIENT_OPTIONS_DESC="These settings apply for clients unless they are changed for a specific client."
COM_BANNERS_FILENAME="%1$s-banners-tracks-%2$s"
COM_BANNERS_GROUP_LABEL_PUBLISHING_DETAILS="Publishing Options"
COM_BANNERS_HEADING_ACTIVE="Active"
Modified: development/branches/jcamp/administrator/language/en-GB/en-GB.com_categories.ini
===================================================================
--- development/branches/jcamp/administrator/language/en-GB/en-GB.com_categories.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/en-GB/en-GB.com_categories.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -23,7 +23,7 @@
COM_CATEGORIES_FIELD_PARENT_DESC="Select a Parent Category"
COM_CATEGORIES_FIELD_PARENT_LABEL="Parent"
COM_CATEGORIES_FIELDSET_DETAILS="Details"
-COM_CATEGORIES_FIELDSET_RULES="Category Access Rules"
+COM_CATEGORIES_FIELDSET_RULES="Category Permissions"
COM_CATEGORIES_ITEMS_SEARCH_FILTER="Search"
COM_CATEGORIES_N_ITEMS_ARCHIVED="%d categories successfully archived"
COM_CATEGORIES_N_ITEMS_ARCHIVED_1="%d category successfully archived"
@@ -53,4 +53,4 @@
COM_CATEGORY_ACCESS_EDITSTATE_DESC="Shown below is the inherited state for <strong>edit state actions</strong> on this category and the calculated state based on the menu selection."
JFIELD_RULES_DESC="Rules description"
JFIELD_RULES_LABEL="Rules label"
-JLIB_HTML_ACCESS_SUMMARY_DESC="Shown below is an overview of the access setting for this category. Click the tabs above to customize these settings by action."
+JLIB_HTML_ACCESS_SUMMARY_DESC="Shown below is an overview of the permission settings for this category. Click the tabs above to customize these settings by action."
Modified: development/branches/jcamp/administrator/language/en-GB/en-GB.com_config.ini
===================================================================
--- development/branches/jcamp/administrator/language/en-GB/en-GB.com_config.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/en-GB/en-GB.com_config.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -29,7 +29,7 @@
COM_CONFIG_FIELD_CACHE_HANDLER_DESC="Choose cache handler to enable caching. Native caching mechanism is file-based. Please make sure the cache folders are writable."
COM_CONFIG_FIELD_CACHE_HANDLER_LABEL="Cache Handler"
COM_CONFIG_FIELD_CACHE_LABEL="Cache"
-COM_CONFIG_FIELD_CACHE_DESC="Enable or disable caching and set caching level. Conservative level: smaller system cache, Progressive level (default): faster, bigger system cache, includes module renderers cache. Not apropriate for extremly large sites."
+COM_CONFIG_FIELD_CACHE_DESC="Enable or disable caching and set caching level. Conservative level: smaller system cache, Progressive level (default): faster, bigger system cache, includes module renderers cache. Not appropriate for extremely large sites."
COM_CONFIG_FIELD_CACHE_TIME_DESC="The maximum length of time in minutes for a cache file to be stored before it is refreshed."
COM_CONFIG_FIELD_CACHE_TIME_LABEL="Cache Time"
COM_CONFIG_FIELD_COOKIE_DOMAIN_DESC="Domain to use when setting session cookies. Preceed domain with '.' if cookie should be valid for all subdomains."
@@ -48,8 +48,6 @@
COM_CONFIG_FIELD_DATABASE_USERNAME_LABEL="Database Username"
COM_CONFIG_FIELD_DEBUG_LANG_DESC="Select whether the debugging indicators (<bold>**...**</bold>) or (<bold>??...??</bold>) for the Joomla! Language files will be displayed. Debug Language will work without Debug System being activated, but you will not get the aditional detailed references that will help you correct any errors."
COM_CONFIG_FIELD_DEBUG_LANG_LABEL="Debug Language"
-COM_CONFIG_FIELD_DEBUG_MODULES_DESC="If enabled, this setting allows the module positions to be displayed when tp="_QQ_"1"_QQ_" is added to the URL."
-COM_CONFIG_FIELD_DEBUG_MODULES_LABEL="Debug Modules"
COM_CONFIG_FIELD_DEBUG_SYSTEM_DESC="If enabled, diagnostic information, language translation, and SQL errors (if present) will be displayed. The information will be displayed at the foot of every page you view within the Joomla backend and frontend. It is not advisable to leave the debug mode activated when running a live Web site."
COM_CONFIG_FIELD_DEBUG_SYSTEM_LABEL="Debug System"
COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_DESC="Choose the default minimum access level to the site"
@@ -62,8 +60,8 @@
COM_CONFIG_FIELD_DEFAULT_LIST_LIMIT_LABEL="Default List Limit"
COM_CONFIG_FIELD_ERROR_REPORTING_DESC="Select the appropriate level of reporting from the drop down list. See the Help Screen for full details."
COM_CONFIG_FIELD_ERROR_REPORTING_LABEL="Error Reporting"
-COM_CONFIG_FIELD_FEED_EMAIL_DESC="The RSS and Atom newsfeeds include the author's e-mail address. Select Author Email to use each author's e-mail (from the User Manager) in the news feed. Select Site Email to include the site 'Mail from' email address for each article."
-COM_CONFIG_FIELD_FEED_EMAIL_LABEL="Feed E-mail"
+COM_CONFIG_FIELD_FEED_EMAIL_DESC="The RSS and Atom newsfeeds include the author's email address. Select Author Email to use each author's email (from the User Manager) in the news feed. Select Site Email to include the site 'Mail from' email address for each article."
+COM_CONFIG_FIELD_FEED_EMAIL_LABEL="Feed email"
COM_CONFIG_FIELD_FORCE_SSL_DESC="Force site access to always occur under SSL (https) for selected areas. You will not be able to access selected areas under non-ssl. Note, you must have SSL enabled on your server to utilize this option."
COM_CONFIG_FIELD_FORCE_SSL_LABEL="Force SSL"
COM_CONFIG_FIELD_FTP_ENABLE_DESC="Enable the built in FTP (File Transfer Protocol) functionality which is needed in some server environments to be used instead of the normal upload functionality of Joomla!"
@@ -84,11 +82,11 @@
COM_CONFIG_FIELD_HELP_SERVER_LABEL="Help Server"
COM_CONFIG_FIELD_LOG_PATH_DESC="For logging of Joomla. Please specify a folder."
COM_CONFIG_FIELD_LOG_PATH_LABEL="Path to Log Folder"
-COM_CONFIG_FIELD_MAIL_FROM_EMAIL_DESC="The e-mail address that will be used to send site e-mail."
-COM_CONFIG_FIELD_MAIL_FROM_EMAIL_LABEL="From E-mail"
-COM_CONFIG_FIELD_MAIL_FROM_NAME_DESC="The e-mail address that will be used to send site e-mail."
+COM_CONFIG_FIELD_MAIL_FROM_EMAIL_DESC="The email address that will be used to send site email."
+COM_CONFIG_FIELD_MAIL_FROM_EMAIL_LABEL="From email"
+COM_CONFIG_FIELD_MAIL_FROM_NAME_DESC="The email address that will be used to send site email."
COM_CONFIG_FIELD_MAIL_FROM_NAME_LABEL="From Name"
-COM_CONFIG_FIELD_MAIL_MAILER_DESC="Select which mailer for the delivery of site e-mail."
+COM_CONFIG_FIELD_MAIL_MAILER_DESC="Select which mailer for the delivery of site email."
COM_CONFIG_FIELD_MAIL_MAILER_LABEL="Mailer"
COM_CONFIG_FIELD_MAIL_SENDMAIL_PATH_DESC="Enter the path to the sendmail program directory on the host server."
COM_CONFIG_FIELD_MAIL_SENDMAIL_PATH_LABEL="Sendmail Path"
Modified: development/branches/jcamp/administrator/language/en-GB/en-GB.com_contact.ini
===================================================================
--- development/branches/jcamp/administrator/language/en-GB/en-GB.com_contact.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/en-GB/en-GB.com_contact.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -19,7 +19,6 @@
COM_CONTACT_DETAILS="Contact Information"
COM_CONTACT_EDIT_CONTACT="Edit Contact"
COM_CONTACT_EDIT_DETAILS="Edit contact information displayed on an individual page."
-COM_CONTACT_EMAIL_FORM_DETAILS="Form Details"
COM_CONTACT_ERROR_UNIQUE_ALIAS="Another Contact from this category has the same alias"
COM_CONTACT_FIELD_ARTICLES_COMMENTS_DESC="Allow comments for the articles written by the contact"
COM_CONTACT_FIELD_ARTICLES_COMMENTS_LABEL="Comments"
@@ -48,7 +47,7 @@
COM_CONTACT_FIELD_CONFIG_CATEGORIES_LABEL="Categories Options"
COM_CONTACT_FIELD_CONFIG_COUNTRY_DESC="Show/Hide a Country column in the list of Contacts."
COM_CONTACT_FIELD_CONFIG_COUNTRY_LABEL="Country"
-COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_DESC="Custom Reply Desc"
+COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_DESC="Turns off the automated reply, allowing for Plugins to handle integration with other systems."
COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL="Custom Reply"
COM_CONTACT_FIELD_CONFIG_EMAIL_DESC="Show/Hide an Email column in the list of Contacts."
COM_CONTACT_FIELD_CONFIG_EMAIL_LABEL="Email"
@@ -62,9 +61,9 @@
COM_CONTACT_FIELD_CONFIG_PHONE_LABEL="Phone"
COM_CONTACT_FIELD_CONFIG_POSITION_DESC="Show/Hide a Position column in the list of Contacts."
COM_CONTACT_FIELD_CONFIG_POSITION_LABEL="Position"
-COM_CONTACT_FIELD_CONFIG_REDIRECT_DESC="Contact Redirect desc"
+COM_CONTACT_FIELD_CONFIG_REDIRECT_DESC="Enter an alternative email address, where information will be sent to."
COM_CONTACT_FIELD_CONFIG_REDIRECT_LABEL="Contact Redirect"
-COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_DESC="Session Check DESC"
+COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_DESC="Check for the existence of session cookie.This means that users without cookies enabled will not be able to send emails."
COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_LABEL="Session Check"
COM_CONTACT_FIELD_CONFIG_STATE_DESC="Show/Hide a State column in the list of Contacts."
COM_CONTACT_FIELD_CONFIG_SUBURB_DESC="Show/Hide a City or Suburb column in the list of Contacts."
@@ -85,8 +84,6 @@
COM_CONTACT_FIELD_EMAIL_BANNED_TEXT_LABEL="Banned Text"
COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_DESC="Hide or Show checkbox to allow copy of email to be sent to submitter."
COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL="Send Copy to Submitter"
-COM_CONTACT_FIELD_EMAIL_REDIRECT_DESC="Contact Redirect description"
-COM_CONTACT_FIELD_EMAIL_REDIRECT_LABEL="Contact Redirect"
COM_CONTACT_FIELD_EMAIL_SHOW_FORM_DESC="Show or Hide contact form."
COM_CONTACT_FIELD_EMAIL_SHOW_FORM_LABEL="Show Contact Form"
COM_CONTACT_FIELD_FEATURED_DESC="If marked yes, will be displayed in featured view."
Modified: development/branches/jcamp/administrator/language/en-GB/en-GB.com_content.ini
===================================================================
--- development/branches/jcamp/administrator/language/en-GB/en-GB.com_content.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/en-GB/en-GB.com_content.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -19,16 +19,22 @@
COM_CONTENT_CHANGE_ARTICLE_BUTTON="Select / Change"
COM_CONTENT_CHOOSE_CATEGORY_DESC="Select a parent category"
COM_CONTENT_CONFIGURATION="Article Manager Options"
-COM_CONTENT_CONFIG_BLOG_SETTINGS_DESC="These setting apply for blog layouts unless they are changed for a specific menu item or category."
-COM_CONTENT_CONFIG_BLOG_SETTINGS_LABEL="Blog Layouts"
-COM_CONTENT_CONFIG_CATEGORY_SETTINGS_DESC="These settings apply for category and featured pages when they are displayed on the web site,<br /> unless they are changed by the individual category or menu settings."
-COM_CONTENT_CONFIG_CATEGORY_SETTINGS_LABEL="Categories & Featured"
+COM_CONTENT_CONFIG_ARTICLE_SETTINGS_DESC="These settings apply for article layouts unless they are changed for a specific menu item."
+COM_CONTENT_CONFIG_BLOG_SETTINGS_DESC="These setting apply for blog or featured layouts unless they are changed for a specific menu item."
+COM_CONTENT_CONFIG_BLOG_SETTINGS_LABEL="Blog / Featured Layouts"
+COM_CONTENT_CONFIG_CATEGORY_SETTINGS_DESC="These settings apply for category options unless they are changed by the individual category or menu settings."
+COM_CONTENT_CONFIG_CATEGORY_SETTINGS_LABEL="Category Options"
+COM_CONTENT_CONFIG_CATEGORIES_SETTINGS_DESC="These settings apply for categories options, unless they are changed by the individual category or menu settings."
+COM_CONTENT_CONFIG_CATEGORIES_SETTINGS_LABEL="Categories Options"
COM_CONTENT_CONFIG_INTEGRATION_SETTINGS_DESC="These settings determine how the Article Component will integrate with other extensions."
COM_CONTENT_CONFIG_INTEGRATION_SETTINGS_LABEL="Integration"
COM_CONTENT_CONFIG_LIST_SETTINGS_DESC="These settings apply for list layouts unless they are changed for a specific menu item or category."
COM_CONTENT_CONFIG_LIST_SETTINGS_LABEL="List Layouts"
COM_CONTENT_CONFIG_TEXT_FILTERS_DESC="These are the text filters that will be applied to articles submitted by users in the selected groups."
COM_CONTENT_CONFIG_TEXT_FILTERS_LABEL="Text Filters"
+COM_CONTENT_DRILL_CATEGORIES_LABEL="List or Blog: after choosing the display,<br />make sure you define the Options in the desired layout."
+COM_CONTENT_DRILL_DOWN_LAYOUT_DESC="When drilling down to a category, whether to show articles in a list or blog layout."
+COM_CONTENT_DRILL_DOWN_LAYOUT_LABEL="List or Blog Layout"
COM_CONTENT_EDIT_ARTICLE="Edit Article"
COM_CONTENT_FEATURED="Featured article"
COM_CONTENT_FEATURED_CATEGORIES_DESC="Optional list of categories. If selected, only featured articles from the selected categories will show. Use Ctrl+Click to select or unselect."
@@ -39,7 +45,7 @@
COM_CONTENT_FIELDSET_RULES="Article Permissions"
COM_CONTENT_FIELD_ARTICLETEXT_DESC="Enter the article content in the text-area"
COM_CONTENT_FIELD_ARTICLETEXT_LABEL="Article Text"
-COM_CONTENT_FIELD_CREATED_BY_ALIAS_DESC="You can enter here an alias to be displayed instead of the name of the user who has created the article."
+COM_CONTENT_FIELD_CREATED_BY_ALIAS_DESC="You can enter here an alias to be displayed instead of the name of the user who created the article."
COM_CONTENT_FIELD_CREATED_BY_ALIAS_LABEL="Created by alias"
COM_CONTENT_FIELD_CREATED_BY_DESC="You can change here the name of the user who created the article."
COM_CONTENT_FIELD_CREATED_BY_LABEL="Created by"
@@ -50,12 +56,12 @@
COM_CONTENT_FIELD_LANGUAGE_DESC="The language that the article is assigned to."
COM_CONTENT_FIELD_MODIFIED_DESC="The date and time that the article was last modified."
COM_CONTENT_FIELD_MODIFIED_LABEL="Modified"
-COM_CONTENT_FIELD_PUBLISH_DOWN_DESC="An optional date to finish publishing the article."
-COM_CONTENT_FIELD_PUBLISH_DOWN_LABEL="Publish Finish"
-COM_CONTENT_FIELD_PUBLISH_UP_DESC="An optional date to start publishing the article."
-COM_CONTENT_FIELD_PUBLISH_UP_LABEL="Publish Start"
-COM_CONTENT_FIELD_RULES_DESC="Below are the access rules for this article where you can manage group access and actions they can perform. The default state is <strong>Inherit</strong>."
-COM_CONTENT_FIELD_RULES_LABEL="Access Rules"
+COM_CONTENT_FIELD_PUBLISH_DOWN_DESC="An optional date to Finish Publishing the article."
+COM_CONTENT_FIELD_PUBLISH_DOWN_LABEL="Finish Publishing"
+COM_CONTENT_FIELD_PUBLISH_UP_DESC="An optional date to Start Publishing the article."
+COM_CONTENT_FIELD_PUBLISH_UP_LABEL="Start Publishing"
+COM_CONTENT_FIELD_RULES_DESC="Below are the permissions for this article where you can manage group access and actions they can perform. The default state is <strong>Inherit</strong>."
+COM_CONTENT_FIELD_RULES_LABEL="Permissions"
COM_CONTENT_FIELD_SELECT_ARTICLE_DESC="Select the desired article from the list."
COM_CONTENT_FIELD_SELECT_ARTICLE_LABEL="Select Article"
COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS="Use Article Settings"
@@ -81,6 +87,8 @@
COM_CONTENT_N_ITEMS_UNPUBLISHED="%s articles unpublished."
COM_CONTENT_N_ITEMS_UNPUBLISHED_1="%s article unpublished."
COM_CONTENT_NEW_ARTICLE="New Article"
+COM_CONTENT_NUMBER_CATEGORY_ITEMS_DESC="If Show, the number of articles in the category will show."
+COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL="# Articles in Category"
COM_CONTENT_OPTION_BLACK_LIST="Black List (Default)"
COM_CONTENT_OPTION_NO_HTML="No HTML"
COM_CONTENT_OPTION_WHITE_LIST="White List"
@@ -93,6 +101,7 @@
COM_CONTENT_PAGE_VIEW_ARTICLE="Article Manager: View Article"
COM_CONTENT_SAVE_SUCCESS="Article successfully saved"
COM_CONTENT_SELECT_AN_ARTICLE="Select an Article"
+COM_CONTENT_SHOW_EMPTY_CATEGORIES_DESC="If Show, empty categories will display. A category is only empty - if it has no articles or subcategories."
COM_CONTENT_SUBMENU_CATEGORIES="Categories"
COM_CONTENT_SUBMENU_FEATURED="Featured Articles"
COM_CONTENT_TOGGLE_TO_FEATURE="Toggle to change article state to 'Featured'"
@@ -100,3 +109,4 @@
COM_CONTENT_UNFEATURED="Unfeatured article"
COM_CONTENT_WARNING_PROVIDE_VALID_NAME="Please provide a valid, non-blank title."
COM_CONTENT_XML_DESCRIPTION="Article management component"
+
Modified: development/branches/jcamp/administrator/language/en-GB/en-GB.com_installer.ini
===================================================================
--- development/branches/jcamp/administrator/language/en-GB/en-GB.com_installer.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/en-GB/en-GB.com_installer.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -24,7 +24,7 @@
COM_INSTALLER_HEADING_ID="ID"
COM_INSTALLER_HEADING_INSTALLTYPE="Install Type"
COM_INSTALLER_HEADING_NAME="Name"
-COM_INSTALLER_HEADING_TYPE="Extension Type"
+COM_INSTALLER_HEADING_TYPE="Type"
COM_INSTALLER_INSTALL_BUTTON="Install"
COM_INSTALLER_INSTALL_DIRECTORY="Install Directory"
COM_INSTALLER_INSTALL_ERROR="Error installing %s"
Modified: development/branches/jcamp/administrator/language/en-GB/en-GB.com_menus.ini
===================================================================
--- development/branches/jcamp/administrator/language/en-GB/en-GB.com_menus.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/en-GB/en-GB.com_menus.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -122,7 +122,7 @@
COM_MENUS_N_MENUS_DELETED_1="Menu type successfully deleted"
COM_MENUS_NO_ITEM_SELECTED="No menu items selected"
COM_MENUS_NO_MENUS_SELECTED="No menu selected"
-COM_MENUS_OPTION_SELECT_LEVEL="- Select Menu Level -"
+COM_MENUS_OPTION_SELECT_LEVEL="- Select Max Levels -"
COM_MENUS_REQUEST_FIELDSET_LABEL="Required Settings"
COM_MENUS_SAVE_SUCCESS="Menu item successfully saved"
COM_MENUS_SUBMENU_ITEMS="Menu Items"
Modified: development/branches/jcamp/administrator/language/en-GB/en-GB.com_modules.ini
===================================================================
--- development/branches/jcamp/administrator/language/en-GB/en-GB.com_modules.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/en-GB/en-GB.com_modules.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -33,16 +33,16 @@
COM_MODULES_FIELD_NOTE_LABEL="Note"
COM_MODULES_FIELD_POSITION_DESC="You may select a module position from the dropdown box of pre-defined positions or enter your own module position by clicking on the 'Select position', typing in the name and Save."
COM_MODULES_FIELD_POSITION_LABEL="Position"
-COM_MODULES_FIELD_PUBLISH_DOWN_DESC="An optional date to finish publishing the module."
-COM_MODULES_FIELD_PUBLISH_DOWN_LABEL="Publish Finish"
-COM_MODULES_FIELD_PUBLISH_UP_DESC="An optional date to start publishing the module."
-COM_MODULES_FIELD_PUBLISH_UP_LABEL="Publish Start"
+COM_MODULES_FIELD_PUBLISH_DOWN_DESC="An optional date to Finish Publishing the module."
+COM_MODULES_FIELD_PUBLISH_DOWN_LABEL="Finish Publishing"
+COM_MODULES_FIELD_PUBLISH_UP_DESC="An optional date to Start Publishing the module."
+COM_MODULES_FIELD_PUBLISH_UP_LABEL="Start Publishing"
COM_MODULES_FIELD_PUBLISHED_DESC="If published, this module will display on your site frontend or backend depending on the module."
COM_MODULES_FIELD_SHOWTITLE_DESC="Show/Hide module title on display. Effect will depend on the chrome style in the template."
COM_MODULES_FIELD_SHOWTITLE_LABEL="Show Title"
COM_MODULES_FIELD_TITLE_DESC="Module must have a title"
COM_MODULES_FIELD_VALUE_NOCACHING="No caching"
-COM_MODULES_HEADING_MODULE="Module Type"
+COM_MODULES_HEADING_MODULE="Type"
COM_MODULES_HEADING_PAGES="Pages"
COM_MODULES_HEADING_POSITION="Position"
COM_MODULES_MANAGER_MODULE="Module Manager: Module %s"
@@ -74,7 +74,7 @@
COM_MODULES_OPTION_MENU_NONE="No pages"
COM_MODULES_OPTION_ORDER_POSITION="%d. %s"
COM_MODULES_OPTION_SELECT_CLIENT="- Select Type -"
-COM_MODULES_OPTION_SELECT_MODULE="- Select Module -"
+COM_MODULES_OPTION_SELECT_MODULE="- Select Type -"
COM_MODULES_OPTION_SELECT_POSITION="- Select Position -"
COM_MODULES_SAVE_SUCCESS="Module successfully saved"
COM_MODULES_XML_DESCRIPTION="Component for module management in backend"
Modified: development/branches/jcamp/administrator/language/en-GB/en-GB.com_templates.ini
===================================================================
--- development/branches/jcamp/administrator/language/en-GB/en-GB.com_templates.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/en-GB/en-GB.com_templates.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -10,6 +10,9 @@
COM_TEMPLATES_ASSIGNED_MORE="Assigned to %d menu items"
COM_TEMPLATES_BASIC_FIELDSET_LABEL="Basic Options"
COM_TEMPLATES_CLICK_TO_ENLARGE="Click to enlarge."
+COM_TEMPLATES_CONFIG_FIELDSET_DESC="Global Configuration for Templates"
+COM_TEMPLATES_CONFIG_POSITIONS_DESC="Enable the preview of the module positions in the template by appending tp=1 to the web address. Also enables the Preview button in the list of templates. Please refresh the page after changing this setting."
+COM_TEMPLATES_CONFIG_POSITIONS_LABEL="Preview Module Positions"
COM_TEMPLATES_CONFIGURATION="Template Manager Options"
COM_TEMPLATES_ERROR_CANNOT_DELETE_LAST_STYLE="Cannot delete last style of a template"
COM_TEMPLATES_ERROR_CANNOT_UNSET_DEFAULT_STYLE="Cannot unset default style"
@@ -33,15 +36,13 @@
COM_TEMPLATES_FIELD_TITLE_DESC="Style Name"
COM_TEMPLATES_FIELD_TITLE_LABEL="Style Name"
COM_TEMPLATES_FILE_SAVE_SUCCESS="File successfully saved"
-COM_TEMPLATES_FILTER_TEMPLATE="- Template -"
-COM_TEMPLATES_FILTER_TYPE="- Location -"
+COM_TEMPLATES_FILTER_TEMPLATE="- Select Template -"
COM_TEMPLATES_FTP_DESC="???"
COM_TEMPLATES_FTP_TITLE="???"
COM_TEMPLATES_HEADING_ASSIGNED="Assigned"
COM_TEMPLATES_HEADING_DEFAULT="Default"
COM_TEMPLATES_HEADING_STYLE="Style"
COM_TEMPLATES_HEADING_TEMPLATE="Template"
-COM_TEMPLATES_HEADING_TYPE="Location"
COM_TEMPLATES_MANAGER="Template Manager"
COM_TEMPLATES_MANAGER_ADD_STYLE="Templates Manager: Add Style"
COM_TEMPLATES_MANAGER_EDIT_FILE="Templates Manager: Edit File"
@@ -73,12 +74,11 @@
COM_TEMPLATES_TEMPLATE_EDIT_PRINTVIEW="Edit print view template"
COM_TEMPLATES_TEMPLATE_FILENAME="Editing file "_QQ_"%s"_QQ_" in template "_QQ_"%s"_QQ_"."
COM_TEMPLATES_TEMPLATE_MASTER_FILES="Template Master Files"
+COM_TEMPLATES_TEMPLATE_NO_PREVIEW="No preview available"
+COM_TEMPLATES_TEMPLATE_NO_PREVIEW_ADMIN="No preview available for Administrator templates"
+COM_TEMPLATES_TEMPLATE_NO_PREVIEW_DESC="To enable template previews, enable the Preview Module Positions option in Template Options"
COM_TEMPLATES_TEMPLATE_NOT_SPECIFIED="Template not specified."
COM_TEMPLATES_TEMPLATE_PREVIEW="Preview"
-COM_TEMPLATES_TEMPLATE_NO_PREVIEW="No preview available"
-COM_TEMPLATES_TEMPLATE_NO_PREVIEW_DESC="To enable template previews, enable the 'Debug Modules' option in Global Configuration"
-COM_TEMPLATES_TEMPLATE_NO_PREVIEW_ADMIN="No preview available for Administrator templates"
-COM_TEMPLATES_TEMPLATES_FILTER_CLIENT="Client"
COM_TEMPLATES_TEMPLATES_FILTER_SEARCH_DESC="Search in template name or folder name."
COM_TEMPLATES_TOOLBAR_SET_HOME="Make Default"
COM_TEMPLATES_XML_DESCRIPTION="This component lets manage templates"
Modified: development/branches/jcamp/administrator/language/en-GB/en-GB.com_users.ini
===================================================================
--- development/branches/jcamp/administrator/language/en-GB/en-GB.com_users.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/en-GB/en-GB.com_users.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -18,7 +18,7 @@
COM_USERS_CONFIG_FIELD_NEW_USER_TYPE_DESC="The default access level that will be applied to new Users registering via the frontend."
COM_USERS_CONFIG_FIELD_NEW_USER_TYPE_LABEL="New User Registration Type"
COM_USERS_CONFIG_FIELD_SUBJECT_PREFIX_LABEL="Subject Prefix"
-COM_USERS_CONFIG_FIELD_USERACTIVATION_DESC="If set to None, the user will be registered right away. If set to Self, the User will be e-mailed a link to activate their account before they can log in. If set to Admin, the user will be e-mailed a link to verify their e-mail address, then an administrator will be notified to activate the user's account."
+COM_USERS_CONFIG_FIELD_USERACTIVATION_DESC="If set to None, the user will be registered right away. If set to Self, the User will be emailed a link to activate their account before they can log in. If set to Admin, the user will be emailed a link to verify their email address, then an administrator will be notified to activate the user's account."
COM_USERS_CONFIG_FIELD_USERACTIVATION_LABEL="New User Account Activation"
COM_USERS_CONFIG_FIELD_USERACTIVATION_OPTION_ADMINACTIVATION="Admin"
COM_USERS_CONFIG_FIELD_USERACTIVATION_OPTION_SELFACTIVATION="Self"
@@ -43,7 +43,7 @@
COM_USERS_GROUPS_N_ITEMS_DELETED_1="One Group successfully deleted"
COM_USERS_GROUPS_NO_ITEM_SELECTED="No Groups selected"
COM_USERS_HEADING_ACTIVATED="Activated"
-COM_USERS_HEADING_EMAIL="E-mail"
+COM_USERS_HEADING_EMAIL="email"
COM_USERS_HEADING_GROUP_TITLE="Group Title"
COM_USERS_HEADING_GROUPS="Groups"
COM_USERS_HEADING_LAST_VISIT_DATE="Last Visit Date"
@@ -59,14 +59,14 @@
COM_USERS_LEVELS_N_ITEMS_DELETED="%d Access Levels successfully deleted"
COM_USERS_LEVELS_N_ITEMS_DELETED_1="One Acces Level successfully deleted"
COM_USERS_MAIL_DETAILS="Details"
-COM_USERS_MAIL_EMAIL_SENT_TO="E-mail sent to %s Users"
+COM_USERS_MAIL_EMAIL_SENT_TO="email sent to %s Users"
COM_USERS_MAIL_FIELD_GROUP_DESC="Choose a group to send the mail to."
COM_USERS_MAIL_FIELD_GROUP_LABEL="Group:"
COM_USERS_MAIL_FIELD_MESSAGE_DESC="Enter here a default message"
COM_USERS_MAIL_FIELD_MESSAGE_LABEL="Message"
COM_USERS_MAIL_FIELD_RECURSE_DESC="Mail to Child Groups Description"
COM_USERS_MAIL_FIELD_RECURSE_LABEL="Mail to Child Groups:"
-COM_USERS_MAIL_FIELD_SEND_AS_BLIND_CARBON_COPY_DESC="Hides recipient list and adds copy to site e-mail."
+COM_USERS_MAIL_FIELD_SEND_AS_BLIND_CARBON_COPY_DESC="Hides recipient list and adds copy to site email."
COM_USERS_MAIL_FIELD_SEND_AS_BLIND_CARBON_COPY_LABEL="Recipients as BCC:"
COM_USERS_MAIL_FIELD_SEND_IN_HTML_MODE_DESC="Send in HTML mode"
COM_USERS_MAIL_FIELD_SEND_IN_HTML_MODE_LABEL="Send in HTML mode:"
@@ -86,10 +86,13 @@
COM_USERS_N_LEVELS_DELETED_1="Access Level successfully removed."
COM_USERS_N_USERS_ACTIVATED="%s Users successfully activated"
COM_USERS_N_USERS_ACTIVATED_1="User successfully activated"
+COM_USERS_N_USERS_ACTIVATED_0="No user activated"
COM_USERS_N_USERS_BLOCKED="%s Users blocked"
COM_USERS_N_USERS_BLOCKED_1="User blocked"
+COM_USERS_N_USERS_BLOCKED_0="No User blocked"
COM_USERS_N_USERS_UNBLOCKED="%s Users enabled"
COM_USERS_N_USERS_UNBLOCKED_1="User enabled"
+COM_USERS_N_USERS_UNBLOCKED_0="No User enabled"
COM_USERS_NO_LEVELS_SELECTED="No Access Levels selected"
COM_USERS_SEARCH_ACCESS_LEVELS="Search Access Levels"
COM_USERS_SEARCH_GROUPS_LABEL="Search Groups"
@@ -103,7 +106,8 @@
COM_USERS_SUBMENU_USERS="Users"
COM_USERS_TOOLBAR_ACTIVATE="Activate"
COM_USERS_TOOLBAR_BLOCK="Block"
-COM_USERS_TOOLBAR_MAIL_SEND_MAIL="Send e-mail"
+COM_USERS_TOOLBAR_UNBLOCK="Unblock"
+COM_USERS_TOOLBAR_MAIL_SEND_MAIL="Send email"
COM_USERS_UNACTIVATED="Unactivated"
COM_USERS_USER_ACCOUNT_DETAILS="Account Details"
COM_USERS_USER_BATCH_FAILED="An error was encountered while performing the batch operation: %s."
@@ -114,8 +118,8 @@
COM_USERS_USER_FIELD_BLOCK_LABEL="Block this User"
COM_USERS_USER_FIELD_EDITOR_DESC="User Editor"
COM_USERS_USER_FIELD_EDITOR_LABEL="Editor"
-COM_USERS_USER_FIELD_EMAIL_DESC="Enter an e-mail for the user"
-COM_USERS_USER_FIELD_EMAIL_LABEL="E-mail"
+COM_USERS_USER_FIELD_EMAIL_DESC="Enter an email for the user"
+COM_USERS_USER_FIELD_EMAIL_LABEL="email"
COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_DESC="Select the Language for the frontend interface. This will only affect this User."
COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_LABEL="Frontend Language"
COM_USERS_USER_FIELD_HELPSITE_DESC="Help site for this user"
@@ -128,8 +132,8 @@
COM_USERS_USER_FIELD_PASSWORD_DESC="Enter the password for the user"
COM_USERS_USER_FIELD_REGISTERDATE_DESC="Registration Date"
COM_USERS_USER_FIELD_REGISTERDATE_LABEL="Registration Date"
-COM_USERS_USER_FIELD_SENDEMAIL_DESC="If set to yes, the user will receive system e-mails."
-COM_USERS_USER_FIELD_SENDEMAIL_LABEL="Send E-mail to this User"
+COM_USERS_USER_FIELD_SENDEMAIL_DESC="If set to yes, the user will receive system emails."
+COM_USERS_USER_FIELD_SENDEMAIL_LABEL="Send email to this User"
COM_USERS_USER_FIELD_TIMEZONE_DESC="Time zone for this user"
COM_USERS_USER_FIELD_TIMEZONE_LABEL="Time Zone"
COM_USERS_USER_FIELD_USERNAME_DESC="Enter the login name (User name) for the user."
@@ -138,6 +142,7 @@
COM_USERS_USER_SAVE_FAILED="An error was encountered while saving the member: %s."
COM_USERS_USER_SAVE_SUCCESS="User successfully saved."
COM_USERS_USERGROUP_DETAILS="User Group Details"
+COM_USERS_USERS_ERROR_CANNOT_BLOCK_SELF="You cannot block yourself."
COM_USERS_USERS_ERROR_CANNOT_DELETE_SELF="You cannot delete yourself."
COM_USERS_USERS_N_ITEMS_DELETED="%d users successfully deleted"
COM_USERS_USERS_N_ITEMS_DELETED_1="One user successfully deleted"
Modified: development/branches/jcamp/administrator/language/en-GB/en-GB.com_weblinks.ini
===================================================================
--- development/branches/jcamp/administrator/language/en-GB/en-GB.com_weblinks.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/en-GB/en-GB.com_weblinks.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -46,7 +46,7 @@
COM_WEBLINKS_FIELD_DISPLAY_NUM_DESC="Default number of Web links to list on a page."
COM_WEBLINKS_FIELD_DISPLAY_NUM_LABEL="# of Web links to List"
COM_WEBLINKS_FIELD_LANGUAGE_DESC="Assign a language to this weblink"
-COM_WEBLINKS_FIELD_ORDERING_DESC="COM_WEBLINKS_FIELD_ORDERING_DESC ??"
+COM_WEBLINKS_FIELD_ORDERING_DESC="Select the Ordering"
COM_WEBLINKS_FIELD_ORDERING_LABEL="Ordering"
COM_WEBLINKS_FIELD_SELECT_CATEGORY_LABEL="Select a category"
COM_WEBLINKS_FIELD_SELECT_CATEGORY_DESC="Select a weblinks category to display"
Modified: development/branches/jcamp/administrator/language/en-GB/en-GB.ini
===================================================================
--- development/branches/jcamp/administrator/language/en-GB/en-GB.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/en-GB/en-GB.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -42,7 +42,7 @@
JCANCEL="Cancel"
JCATEGORY="Category"
JCLEAR="Clear"
-JCLIENT="Client"
+JCLIENT="Location"
JCONFIG_PERMISSIONS_DESC="Default permissions used for all content in this component."
JCONFIG_PERMISSIONS_LABEL="Permissions"
JCURRENT="Current"
@@ -190,8 +190,6 @@
JFIELD_XREFERENCE_DESC="An optional field to allow this record to be cross-referenced to an external data system if required."
JFIELD_XREFERENCE_LABEL="External Reference"
-JGLOBAL_GT=">"
-JGLOBAL_LT="<"
JGLOBAL_ACROSS="Across"
JGLOBAL_ALL_ARTICLE="Max Levels Articles"
JGLOBAL_ALL_LIST="Max Levels as List"
@@ -199,6 +197,9 @@
JGLOBAL_ALLOW_COMMENTS_LABEL="Allow Comments"
JGLOBAL_ALLOW_RATINGS_DESC="If Yes, viewers will be able to add and view ratings for the article."
JGLOBAL_ALLOW_RATINGS_LABEL="Allow Ratings"
+JGLOBAL_ARCHIVE_ARTICLES_FIELD_INTROTEXTLIMIT_DESC="Please enter in a numeric character limit value. The introtext will be trimmed to the number of characters you enter."
+JGLOBAL_ARCHIVE_ARTICLES_FIELD_INTROTEXTLIMIT_LABEL=" Intro text Limit"
+JGLOBAL_ARCHIVE_OPTIONS="Archive Options"
JGLOBAL_ARTICLE_COUNT_DESC="Whether to show or hide a count of articles in each category."
JGLOBAL_ARTICLE_COUNT_LABEL="Article Count"
JGLOBAL_ARTICLE_MANAGER_ORDER="Ordering"
@@ -214,14 +215,14 @@
JGLOBAL_AUTH_ERROR="Authentication error : could not connect to the openid server"
JGLOBAL_AUTH_FAIL="Authentication failed"
JGLOBAL_AUTH_FAILED="Failed to authenticate: %s"
+JGLOBAL_AUTH_INCORRECT="Incorrect username/password"
JGLOBAL_AUTH_INVALID_PASS="Invalid password"
JGLOBAL_AUTH_NO_BIND="Unable to bind to LDAP"
JGLOBAL_AUTH_NO_CONNECT="Unable to connect to LDAP server"
JGLOBAL_AUTH_NO_REDIRECT="Could not redirect to server: %s"
JGLOBAL_AUTH_NO_USER="User does not exist"
JGLOBAL_AUTH_NOT_CREATE_DIR="Could not create the FileStore directory %s. Please check the effective permissions."
-JGLOBAL_AUTH_PASS_BLANK="LADP can not have blank password"
-JGLOBAL_AUTH_INCORRECT="Incorrect username/password"
+JGLOBAL_AUTH_PASS_BLANK="LDAP can not have blank password"
JGLOBAL_AUTH_UNKNOWN_ACCESS_DENIED="Result Unknown. Access Denied"
JGLOBAL_AUTH_USER_BLACKLISTED="User is blacklisted"
JGLOBAL_AUTH_USER_NOT_FOUND="Unable to find user"
@@ -230,35 +231,37 @@
JGLOBAL_AUTO="Auto"
JGLOBAL_BLOG="Blog"
JGLOBAL_BLOG_LAYOUT_OPTIONS="Blog Layout Options"
+JGLOBAL_CATEGORIES_OPTIONS="Categories Options"
JGLOBAL_CATEGORY_LAYOUT_DESC="Layout"
JGLOBAL_CATEGORY_LAYOUT_LABEL="Choose a layout"
+JGLOBAL_CATEGORY_MANAGER_ORDER="Category Manager Order"
JGLOBAL_CATEGORY_NOT_FOUND="Category not found"
-JGLOBAL_CATEGORY_MANAGER_ORDER="Category Manager Order"
JGLOBAL_CATEGORY_OPTIONS="Category Options"
-JGLOBAL_CATEGORIES_OPTIONS="Categories Options"
JGLOBAL_CATEGORY_ORDER_DESC="The order that categories will show in."
JGLOBAL_CATEGORY_ORDER_LABEL="Category Order"
+JGLOBAL_CENTER="Center"
+JGLOBAL_CHOOSE_CATEGORY_DESC="Choose a category from the list"
JGLOBAL_CHOOSE_CATEGORY_LABEL="Choose a category"
-JGLOBAL_CHOOSE_CATEGORY_DESC="Choose a category from the list"
-JGLOBAL_CENTER="Center"
+JGLOBAL_CLICK_TO_SORT_THIS_COLUMN="Click to sort by this column"
JGLOBAL_CLICK_TO_TOGGLE_STATE="Click on icon to toggle state."
-JGLOBAL_CLICK_TO_SORT_THIS_COLUMN="Click to sort by this column"
JGLOBAL_CREATED="Created"
JGLOBAL_DATE_FORMAT_DESC="Optional format string for showing the date. If left blank, it uses DATE_FORMAT_LC1 from your language file (for example, "%A, %d %B %Y" for "Monday, 23 November 2009")."
JGLOBAL_DATE_FORMAT_LABEL="Date Format"
JGLOBAL_DESCRIPTION="Description"
+JGLOBAL_DISPLAY_NUM="Display #"
JGLOBAL_DISPLAY_SELECT_DESC="Whether to show or hide the Display Select dropdown listbox."
JGLOBAL_DISPLAY_SELECT_LABEL="Display Select"
-JGLOBAL_DISPLAY_NUM="Display #"
JGLOBAL_DOWN="Down"
-JGLOBAL_DRILL_DOWN_LAYOUT_DESC="When drilling down to a category, whether to show articles in a list or blog layout."
-JGLOBAL_DRILL_DOWN_LAYOUT_LABEL="List or Blog"
JGLOBAL_EDIT_ITEM="Edit item"
JGLOBAL_EDIT_PREFERENCES="Edit Preferences"
JGLOBAL_EMPTY_CATEGORIES_DESC="Whether to show or hide categories that contain no articles and no subcategories."
JGLOBAL_EMPTY_CATEGORIES_LABEL="Empty Categories"
JGLOBAL_FEED_SUMMARY_DESC="If set to Intro Text, only the Intro Text of each article will show in the newsfeed. If set to Full Text, the whole article will show in the newsfeed."
JGLOBAL_FEED_SUMMARY_LABEL="For each feed item show"
+JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_DESC="Categories that are within this category will be displayed"
+JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_LABEL="Select a Top Level Category"
+JGLOBAL_FIELD_CATEGORIES_DESC_DESC="If you enter some text in this field, it will override the Top Level Category Description, if it has one."
+JGLOBAL_FIELD_CATEGORIES_DESC_LABEL="Top Level Category Description"
JGLOBAL_FIELD_CREATED_BY_ALIAS_DESC="Uses another name than the author's for display"
JGLOBAL_FIELD_CREATED_BY_ALIAS_LABEL="Author's Alias"
JGLOBAL_FIELD_CREATED_BY_DESC="The user who created this"
@@ -267,28 +270,25 @@
JGLOBAL_FIELD_CREATED_LABEL="Created"
JGLOBAL_FIELD_FIELD_CACHETIME_DESC="The number of minutes before the cache is refreshed."
JGLOBAL_FIELD_FIELD_ORDERING_LABEL="Order"
+JGLOBAL_FIELD_ID_DESC="Record number in the database"
+JGLOBAL_FIELD_ID_LABEL="ID"
JGLOBAL_FIELD_MODIFIED_DESC="The date and time the article was last modified"
JGLOBAL_FIELD_MODIFIED_LABEL="Modified"
+JGLOBAL_FIELD_NUM_CATEGORY_ITEMS_DESC="Number of categories to display for each level"
JGLOBAL_FIELD_NUM_CATEGORY_ITEMS_LABEL="Number of categories"
-JGLOBAL_FIELD_NUM_CATEGORY_ITEMS_DESC="Number of categories to display for each level"
-JGLOBAL_FIELD_PUBLISH_DOWN_DESC="An optional date to stop publishing"
-JGLOBAL_FIELD_PUBLISH_DOWN_LABEL="Publish Finish"
-JGLOBAL_FIELD_PUBLISH_UP_DESC="An optional date to start publishing"
-JGLOBAL_FIELD_PUBLISH_UP_LABEL="Publish Start"
+JGLOBAL_FIELD_PUBLISH_DOWN_DESC="An optional date to Stop Publishing"
+JGLOBAL_FIELD_PUBLISH_DOWN_LABEL="Finish Publishing"
+JGLOBAL_FIELD_PUBLISH_UP_DESC="An optional date to Start Publishing"
+JGLOBAL_FIELD_PUBLISH_UP_LABEL="Start Publishing"
+JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC="Show description of the top level category or optionally override with the text from the description field found in menu item. If using Root as top level category, the description field has to be filled."
JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL="Top Level Category Description"
-JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC="Show description of the top level category or optionally override with the text from the description field found in menu item. If using Root as top level category, the description field has to be filled."
-JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_LABEL="Select a Top Level Category"
-JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_DESC="Categories that are within this category will be displayed"
-JGLOBAL_FIELD_CATEGORIES_DESC_DESC="If you enter some text in this field, it will override the Top Level Category Description, if it has one."
-JGLOBAL_FIELD_CATEGORIES_DESC_LABEL="Top Level Category Description"
+JGLOBAL_FIELDSET_DISPLAY_OPTIONS="Display Options"
JGLOBAL_FIELDSET_METADATA_OPTIONS="Metadata Options"
+JGLOBAL_FIELDSET_OPTIONS="Options"
JGLOBAL_FIELDSET_PUBLISHING="Publishing Options"
-JGLOBAL_FIELDSET_OPTIONS="Options"
-JGLOBAL_FIELDSET_DISPLAY_OPTIONS="Display Options"
-JGLOBAL_FIELD_ID_LABEL="ID"
-JGLOBAL_FIELD_ID_DESC="Record number in the database"
JGLOBAL_FILTER_ATTRIBUTES_DESC="List additional attributes, separating each attribute name with a space or comma."
JGLOBAL_FILTER_ATTRIBUTES_LABEL="Filter Attributes"
+JGLOBAL_FILTER_CLIENT="- Select Location -"
JGLOBAL_FILTER_FIELD_DESC="Whether to show a Filter field for the list of articles. Select Hide to hide the filter field, or select which field you wish to filter on."
JGLOBAL_FILTER_FIELD_LABEL="Filter Field"
JGLOBAL_FILTER_GROUPS_DESC="This sets the user groups that you want filters applied to. Other groups will have no filtering performed."
@@ -300,6 +300,7 @@
JGLOBAL_FILTERING_OPTIONS_DESC="Filtering options to give more control over the HTML your content providers submit. You can be as strict or as liberal as you require to suit your site needs. The filtering is opt-in and the default settings provide good protection against markup commonly associated with Web site attacks."
JGLOBAL_FILTERING_OPTIONS_LABEL="Filtering Options"
JGLOBAL_FULL_TEXT="Full Text"
+JGLOBAL_GT=">"
JGLOBAL_HITS="Hits"
JGLOBAL_INDEX_FOLLOW="Index, Follow"
JGLOBAL_INDEX_NOFOLLOW="Index, No follow"
@@ -325,18 +326,23 @@
JGLOBAL_LIST_HITS_LABEL="Show Hits in List"
JGLOBAL_LIST_LAYOUT_OPTIONS="List Layout Options"
JGLOBAL_LIST_NOTE="(<span>Note</span>: %s)"
+JGLOBAL_LIST_TITLE_DESC="If Show, Category Title will show in the list of categories."
+JGLOBAL_LIST_TITLE_LABEL="Category Title"
+JGLOBAL_LT="<"
JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC="The number of subcategory levels to display."
JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL="Subcategory Levels"
+JGLOBAL_MAXLEVEL_DESC="Maximum number of levels of subcategories to show."
+JGLOBAL_MAXLEVEL_LABEL="Subcategory Levels"
+JGLOBAL_MENU_SELECTION="Menu Selection:"
JGLOBAL_MENUS_LAYOUT_INTEGRATION_OPTIONS_LABEL="Integration Options"
-JGLOBAL_MENU_SELECTION="Menu Selection:"
JGLOBAL_MODIFIED="Modified"
JGLOBAL_MOST_HITS="Most Hits"
JGLOBAL_MOST_RECENT_FIRST="Most recent first"
JGLOBAL_MULTI_COLUMN_ORDER_DESC="Order articles down or across columns"
JGLOBAL_MULTI_COLUMN_ORDER_LABEL="Multi Column Order"
JGLOBAL_MULTI_LEVEL="Multi Level"
+JGLOBAL_NEWITEMSFIRST_DESC="New items default to the first position. The ordering can be changed after this item is saved."
JGLOBAL_NEWITEMSLAST_DESC="New items default to the last position. The ordering can be changed after this item is saved."
-JGLOBAL_NEWITEMSFIRST_DESC="New items default to the first position. The ordering can be changed after this item is saved."
JGLOBAL_NO_ORDER="No Order"
JGLOBAL_NOINDEX_FOLLOW="No index, follow"
JGLOBAL_NOINDEX_NOFOLLOW="No index, no follow"
@@ -348,12 +354,14 @@
JGLOBAL_NUM_LEADING_ARTICLES_LABEL="# Leading Articles"
JGLOBAL_NUM_LINKS_DESC="Number of ariticles to display as links, normally below the Intro Articles."
JGLOBAL_NUM_LINKS_LABEL="# Links"
+JGLOBAL_NUMBER_CATEGORY_ITEMS_DESC="If Show, the number of articles in the category will show."
+JGLOBAL_NUMBER_CATEGORY_ITEMS_LABEL="Show Article Count"
JGLOBAL_NUMBER_ITEMS_LIST_DESC="Default number of articles to list on a page."
JGLOBAL_NUMBER_ITEMS_LIST_LABEL="# Articles to List"
JGLOBAL_OLDEST_FIRST="Oldest first"
+JGLOBAL_ORDERING="Article Manager Order"
JGLOBAL_ORDERING_DATE_DESC="If articles are ordered by date, which date to use."
JGLOBAL_ORDERING_DATE_LABEL="Date for Ordering"
-JGLOBAL_ORDERING="Article Manager Order"
JGLOBAL_PAGINATION_DESC="Show or hide Pagination support. Pagination provides page links at the bottom of the page that allow the User to navigate to additional pages. These are needed if the Information will not fit on one page."
JGLOBAL_PAGINATION_LABEL="Pagination"
JGLOBAL_PAGINATION_RESULTS_DESC="Show or hide pagination results information, for example, "Page 1 of 4"."
@@ -362,9 +370,9 @@
JGLOBAL_PREVIEW="Preview"
JGLOBAL_RECORD_NUMBER="Record ID: %d"
JGLOBAL_REMEMBER_ME="Remember Me"
+JGLOBAL_RIGHT="Right"
JGLOBAL_ROOT="Root"
JGLOBAL_ROOT_PARENT="- No parent -"
-JGLOBAL_RIGHT="Right"
JGLOBAL_SELECT_ALLOW_DENY_GROUP="Change %s permission for %s group."
JGLOBAL_SELECTION_INVERT="Toggle Selection"
JGLOBAL_SHOW_AUTHOR_DESC="If set to Show, the Name of the article's Author will be displayed. This is a global setting but can be changed at the Category, Menu and Article levels."
@@ -375,19 +383,23 @@
JGLOBAL_SHOW_CATEGORY_IMAGE_DESC="Show or hide the image of the selected Category."
JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL="Category Image"
JGLOBAL_SHOW_CATEGORY_LABEL="Show Category"
+JGLOBAL_SHOW_CATEGORY_TITLE="Category Title"
+JGLOBAL_SHOW_CATEGORY_TITLE_DESC="If Show, the Category Title will show as a subheading on the page. The subheading is usually displayed inside the "H2" tag."
JGLOBAL_SHOW_CREATE_DATE_DESC="If set to Show, the date and time an Article was created will be displayed. This a global setting but can be changed at Menu and Article levels."
JGLOBAL_SHOW_CREATE_DATE_LABEL="Show Create Date"
JGLOBAL_SHOW_DATE_DESC="Whether to show a date column in the list of articles. Select Hide to hide the date, or select which date you wish to show."
JGLOBAL_SHOW_DATE_LABEL="Show Date"
-JGLOBAL_SHOW_EMAIL_ICON_DESC="Show/Hide the e-mail icon. This allows you to email an article."
+JGLOBAL_SHOW_EMAIL_ICON_DESC="Show/Hide the email icon. This allows you to email an article."
JGLOBAL_SHOW_EMAIL_ICON_LABEL="Show Email Icon"
+JGLOBAL_SHOW_EMPTY_CATEGORIES_DESC="If Show, empty categories will display. A category is only empty - if it has no items or subcategories."
+JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL="Empty Categories"
JGLOBAL_SHOW_FEED_LINK_DESC="Show or hide an RSS Feed Link. (A Feed Link will show up as a feed icon in the address bar of most modern browsers)."
JGLOBAL_SHOW_FEED_LINK_LABEL="Show Feed Link"
JGLOBAL_SHOW_HEADINGS_DESC="Show or Hide the headings in list layouts."
JGLOBAL_SHOW_HEADINGS_LABEL="Table Headings"
JGLOBAL_SHOW_HITS_DESC="If set to Show, the number of Hits on a particular Article will be displayed. This is a global setting but can be changed at the Category, Menu and Article levels."
JGLOBAL_SHOW_HITS_LABEL="Show Hits"
-JGLOBAL_SHOW_ICONS_DESC="Print and E-mail will utilise Icons or Text"
+JGLOBAL_SHOW_ICONS_DESC="Print and email will utilise Icons or Text"
JGLOBAL_SHOW_ICONS_LABEL="Show Icons"
JGLOBAL_SHOW_INTRO_DESC="If set to Show, the Intro Text of the article will show when you drill down to the article. If set to Hide, only the part of the article after the "Read More" break will show."
JGLOBAL_SHOW_INTRO_LABEL="Show Intro Text"
@@ -403,6 +415,8 @@
JGLOBAL_SHOW_PUBLISH_DATE_LABEL="Show Publish Date"
JGLOBAL_SHOW_READMORE_DESC="If set to Show, the Read more... Link will show if Main text has been provided for the Article."
JGLOBAL_SHOW_READMORE_LABEL="Show "Read More""
+JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC="Show/Hide the subcategories descriptions."
+JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL="Subcategories Descriptions"
JGLOBAL_SHOW_SUBCATEGORY_CONTENT_DESC="If No, only articles from this category will show. If Max Levels as List, subcategories will show as a list. If Max Levels Articles, all articles from subcategories will show in the list or blog. The number of levels is determined by the Maximum Subcategory Levels parameter."
JGLOBAL_SHOW_SUBCATEGORY_CONTENT_LABEL="Include Subcategories"
JGLOBAL_SHOW_TITLE_DESC="If set to Show, the article title is shown."
@@ -410,8 +424,10 @@
JGLOBAL_SHOW_UNAUTH_LINKS_DESC="If set to Yes, links to registered content will be shown even if you are not logged in. You will need to log in to access the full item."
JGLOBAL_SHOW_UNAUTH_LINKS_LABEL="Show Unauthorised Links"
JGLOBAL_SINGLE_LEVEL="Single Level"
-JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL="These options are also used when you click <br />on one of the category links -on the first page and/or thereafter,<br /> unless they are changed for a specific menu item."
JGLOBAL_STATE="State"
+JGLOBAL_SUBHEADING_DESC="Optional text to show as a subheading."
+JGLOBAL_SUBHEADING_LABEL="Page Subheading"
+JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL="These options are also used when you click <br />on one of the category links, on the first page and/or thereafter,<br /> unless they are changed for a specific menu item."
JGLOBAL_TITLE="Title"
JGLOBAL_TITLE_ALPHABETICAL="Title Alphabetical"
JGLOBAL_TITLE_REVERSE_ALPHABETICAL="Title Reverse Alphabetical"
@@ -421,20 +437,6 @@
JGLOBAL_USERNAME="User Name"
JGLOBAL_VALIDATION_FORM_FAILED="Invalid form"
JGLOBAL_WARNJAVASCRIPT="Warning! JavaScript must be enabled for proper operation of the Administrator backend."
-JGLOBAL_LIST_TITLE_DESC="If Show, Category Title will show in the list of categories."
-JGLOBAL_LIST_TITLE_LABEL="Category Title"
-JGLOBAL_NUMBER_CATEGORY_ITEMS_DESC="If Show, the number of articles in the category will show."
-JGLOBAL_NUMBER_CATEGORY_ITEMS_LABEL="Show Article Count"
-JGLOBAL_SHOW_CATEGORY_TITLE="Category Title"
-JGLOBAL_SHOW_CATEGORY_TITLE_DESC="If Show, the Category Title will show as a subheading on the page. The subheading is usually displayed inside the "H2" tag."
-JGLOBAL_SHOW_EMPTY_CATEGORIES_DESC="If Show, empty categories will display. A category is only empty - if it has no items or subcategories."
-JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL="Empty Categories"
-JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC="Show/Hide the subcategories descriptions."
-JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL="Subcategories Descriptions"
-JGLOBAL_SUBHEADING_DESC="Optional text to show as a subheading."
-JGLOBAL_SUBHEADING_LABEL="Page Subheading"
-JGLOBAL_MAXLEVEL_DESC="Maximum number of levels of subcategories to show."
-JGLOBAL_MAXLEVEL_LABEL="Subcategory Levels"
JGLOBAL_WIDTH="Width"
JGRID_HEADING_ACCESS="Access"
JGRID_HEADING_CATEGORY="Category"
@@ -707,7 +709,7 @@
JLIB_DATABASE_ERROR_DELETE_CATEGORY="Left-Right data inconsistency. Cannot delete category."
JLIB_DATABASE_ERROR_DELETE_FAILED="%s: :delete failed - %s"
JLIB_DATABASE_ERROR_DELETE_ROOT_CATEGORIES="Root categories cannot be deleted."
-JLIB_DATABASE_ERROR_EMAIL_INUSE="This e-mail is already registered."
+JLIB_DATABASE_ERROR_EMAIL_INUSE="This email is already registered."
JLIB_DATABASE_ERROR_EMPTY_ROW_RETURNED="The database row is empty."
JLIB_DATABASE_ERROR_FUNCTION_FAILED="DB function failed with error number %s <br /><font color="_QQ_"red"_QQ_">%s</font>"
JLIB_DATABASE_ERROR_GET_NEXT_ORDER_FAILED="%s: :getNextOrder failed - %s"
@@ -746,10 +748,11 @@
JLIB_DATABASE_ERROR_STORE_FAILED_UPDATE_ASSET_ID="The asset_id field could not be updated"
JLIB_DATABASE_ERROR_STORE_FAILED="%1$s: :store failed<br />%2$s"
JLIB_DATABASE_ERROR_USERGROUP_TITLE="Usergroup must have a title"
+JLIB_DATABASE_ERROR_USERGROUP_TITLE_EXISTS="Usergroup title already exists. Title must be unique."
JLIB_DATABASE_ERROR_USERNAME_CANNOT_CHANGE="Cannot use this user name"
JLIB_DATABASE_ERROR_USERNAME_INUSE="User name in use"
JLIB_DATABASE_ERROR_VALID_AZ09="Please enter a valid username. No spaces, at least %d characters and must <strong>not</strong> contain the following characters: < > \ "_QQ_" ' % ; ( ) &"
-JLIB_DATABASE_ERROR_VALID_MAIL="Please enter a valid e-mail address."
+JLIB_DATABASE_ERROR_VALID_MAIL="Please enter a valid email address."
JLIB_DATABASE_ERROR_VIEWLEVEL="Viewlevel must have a title"
JLIB_DATABASE_FUNCTION_NOERROR="DB function reports no errors"
@@ -845,12 +848,10 @@
JLIB_FORM_VALIDATE_FIELD_INVALID="Invalid field: %s"
-JLIB_HTML_ACCESS_EDIT_GROUPS="Edit Groups"
JLIB_HTML_ACCESS_MODIFY_DESC_CAPTION_ACL="ACL"
JLIB_HTML_ACCESS_MODIFY_DESC_CAPTION_TABLE="Table"
-JLIB_HTML_ACCESS_RESET_TO_INHERIT="Reset to Inherit"
JLIB_HTML_ACCESS_SUMMARY_DESC_CAPTION="ACL Summary Table"
-JLIB_HTML_ACCESS_SUMMARY_DESC="Shown below is an overview of the access setting for this article. Click the tabs above to customize these settings by action."
+JLIB_HTML_ACCESS_SUMMARY_DESC="Shown below is an overview of the permission settings for this article. Click the tabs above to customize these settings by action."
JLIB_HTML_ACCESS_SUMMARY="Summary"
JLIB_HTML_ADD_TO_THIS_MENU="Add to this menu"
JLIB_HTML_BEHAVIOR_ABOUT_THE_CALENDAR="About the Calendar"
@@ -1068,7 +1069,7 @@
JLIB_INSTALLER_ERROR_PACK_UNINSTALL_UNKNOWN_EXTENSION="Attempting to uninstall unknown extension from package. This extension may have already been removed earlier."
JLIB_MAIL_FUNCTION_DISABLED="The mail() function has been disabled and the mail cannot be sent."
-JLIB_MAIL_INVALID_EMAIL_SENDER="JMail: : Invalid E-Mail Sender: %s, JMail: :setSender(%s)"
+JLIB_MAIL_INVALID_EMAIL_SENDER="JMail: : Invalid email Sender: %s, JMail: :setSender(%s)"
JLIB_PLUGIN_ERROR_LOADING_PLUGINS="Error loading Plugins: %s"
JLIB_REGISTRY_EXCEPTION_LOAD_FORMAT_CLASS="Unable to load format class"
JLIB_UNKNOWN="Unknown"
@@ -1272,7 +1273,7 @@
UTC__14_00__KIRIBATI="(UTC +14:00) Kiribati"
; Mailer Codes
-PHPMAILER_PROVIDE_ADDRESS="You must provide at least one recipient e-mail address."
+PHPMAILER_PROVIDE_ADDRESS="You must provide at least one recipient email address."
PHPMAILER_MAILER_IS_NOT_SUPPORTED=" Mailer is not supported."
PHPMAILER_EXECUTE="Could not execute:"
PHPMAILER_INSTANTIATE="Could not instantiate mail function."
@@ -1284,4 +1285,3 @@
PHPMAILER_FILE_ACCESS="Could not access file:"
PHPMAILER_FILE_OPEN="File Error. Could not open file:"
PHPMAILER_ENCODING="Unknown encoding:"
-
Modified: development/branches/jcamp/administrator/language/en-GB/en-GB.mod_menu.ini
===================================================================
--- development/branches/jcamp/administrator/language/en-GB/en-GB.mod_menu.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/en-GB/en-GB.mod_menu.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -32,6 +32,10 @@
MOD_MENU_EXTENSIONS_MODULE_MANAGER="Module Manager"
MOD_MENU_EXTENSIONS_PLUGIN_MANAGER="Plug-in Manager"
MOD_MENU_EXTENSIONS_TEMPLATE_MANAGER="Template Manager"
+MOD_MENU_FIELD_SHOWNEW="Add New Shortcuts"
+MOD_MENU_FIELD_SHOWNEW_DESC="Show or hide various 'Add New...' shortcuts against users, groups, access levels, articles and categories."
+MOD_MENU_FIELD_SHOWHELP="Help Menu"
+MOD_MENU_FIELD_SHOWHELP_DESC="Show or hide the Help menu menu which includes links to various joomla.org sites useful to users."
MOD_MENU_GLOBAL_CHECKIN="Global Check-in"
MOD_MENU_HELP="Help"
MOD_MENU_HELP_COMMUNITY="Community Portal"
@@ -40,6 +44,7 @@
MOD_MENU_HELP_DOCUMENTATION="Documentation Wiki"
MOD_MENU_HELP_EXTENSIONS="Joomla Extensions"
MOD_MENU_HELP_JOOMLA="Joomla Help"
+MOD_MENU_HELP_LINKS="Useful Joomla links"
MOD_MENU_HELP_RESOURCES="Joomla Resources"
MOD_MENU_HELP_SECURITY="Security Center"
MOD_MENU_HELP_SHOP="Joomla Shop"
@@ -50,6 +55,8 @@
MOD_MENU_MEDIA_MANAGER="Media Manager"
MOD_MENU_MENU_MANAGER="Menu Manager"
MOD_MENU_MENUS="Menus"
+MOD_MENU_MENU_MANAGER_NEW_MENU="Add New Menu"
+MOD_MENU_MENU_MANAGER_NEW_MENU_ITEM="Add New Menu Item"
MOD_MENU_NEW_PRIVATE_MESSAGE="New Private Message"
MOD_MENU_NEW_PRIVATE_MESSAGE="New Private Message"
MOD_MENU_PURGE_EXPIRED_CACHE="Purge Expired Cache"
Modified: development/branches/jcamp/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini
===================================================================
--- development/branches/jcamp/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -9,8 +9,8 @@
PLG_LDAP_FIELD_AUTHMETHOD_LABEL="Authorisation Method"
PLG_LDAP_FIELD_BASEDN_DESC="The base DN of your LDAP server, e.g o=mydomain.com"
PLG_LDAP_FIELD_BASEDN_LABEL="Base DN"
-PLG_LDAP_FIELD_EMAIL_DESC="LDAP Attribute which contains the User's e-mail address"
-PLG_LDAP_FIELD_EMAIL_LABEL="Map: E-mail"
+PLG_LDAP_FIELD_EMAIL_DESC="LDAP Attribute which contains the User's email address"
+PLG_LDAP_FIELD_EMAIL_LABEL="Map: email"
PLG_LDAP_FIELD_FULLNAME_DESC="LDAP Attribute which contains the User's full name"
PLG_LDAP_FIELD_FULLNAME_LABEL="Map: Full Name"
PLG_LDAP_FIELD_HOST_DESC="For example: openldap.mycompany.org"
Modified: development/branches/jcamp/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini
===================================================================
--- development/branches/jcamp/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -9,4 +9,4 @@
PLG_CONTENT_EMAILCLOAK_MODE_DESC="Select how emails will be displayed"
PLG_CONTENT_EMAILCLOAK_MODE_LABEL="Mode"
PLG_CONTENT_EMAILCLOAK_NONLINKABLE="Non-linkable Text"
-PLG_CONTENT_EMAILCLOAK_XML_DESCRIPTION="Cloaks all e-mails in content from spambots using JavaScript"
\ No newline at end of file
+PLG_CONTENT_EMAILCLOAK_XML_DESCRIPTION="Cloaks all emails in content from spambots using JavaScript"
\ No newline at end of file
Modified: development/branches/jcamp/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini
===================================================================
--- development/branches/jcamp/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -5,4 +5,4 @@
; Note : All ini files need to be saved as UTF-8
PLG_CONTENT_EMAILCLOAK="Content - Email Cloaking"
-PLG_CONTENT_EMAILCLOAK_XML_DESCRIPTION="Cloaks all e-mails in content from spambots using JavaScript"
\ No newline at end of file
+PLG_CONTENT_EMAILCLOAK_XML_DESCRIPTION="Cloaks all emails in content from spambots using JavaScript"
\ No newline at end of file
Modified: development/branches/jcamp/administrator/language/en-GB/en-GB.plg_user_joomla.ini
===================================================================
--- development/branches/jcamp/administrator/language/en-GB/en-GB.plg_user_joomla.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/en-GB/en-GB.plg_user_joomla.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -10,4 +10,4 @@
PLG_USER_JOOMLA_XML_DESCRIPTION="Handles Joomla!'s default User synchronisation"
PLG_USER_JOOMLA_NEW_USER_EMAIL_SUBJECT="New User Details"
-PLG_USER_JOOMLA_NEW_USER_EMAIL_BODY="Hello %s,\n\n\nYou have been added as a User to %s by an Administrator.\n\nThis e-mail contains your username and password to log in to %s\n\nUsername: %s\nPassword: %s\n\n\nPlease do not respond to this message as it is automatically generated and is for information purposes only."
+PLG_USER_JOOMLA_NEW_USER_EMAIL_BODY="Hello %s,\n\n\nYou have been added as a User to %s by an Administrator.\n\nThis email contains your username and password to log in to %s\n\nUsername: %s\nPassword: %s\n\n\nPlease do not respond to this message as it is automatically generated and is for information purposes only."
Modified: development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_banners.ini
===================================================================
--- development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_banners.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_banners.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -43,7 +43,6 @@
COM_BANNERS_DEFAULT="Default (%s)"
COM_BANNERS_DELETE_MSG="Are you sure you want to delete all these tracks?"
COM_BANNERS_EDIT_BANNER="Edit Banner"
-COM_BANNERS_EDIT_BANNER="Edit banner"
COM_BANNERS_EDIT_CLIENT="Details"
COM_BANNERS_END_LABEL="End date:"
COM_BANNERS_ERR_ZIP_ADAPTER_FAILURE="Zip adapter failure"
@@ -82,8 +81,8 @@
COM_BANNERS_FIELD_CUSTOMCODE_DESC="???"
COM_BANNERS_FIELD_CUSTOMCODE_LABEL="Custom Code"
COM_BANNERS_FIELD_DESCRIPTION_DESC="Enter a description for the banner"
-COM_BANNERS_FIELD_EMAIL_DESC="Enter a valid Contact E-mail"
-COM_BANNERS_FIELD_EMAIL_LABEL="Contact E-mail"
+COM_BANNERS_FIELD_EMAIL_DESC="Enter a valid Contact email"
+COM_BANNERS_FIELD_EMAIL_LABEL="Contact email"
COM_BANNERS_FIELD_EXTRAINFO_DESC="Enter extra information for this client."
COM_BANNERS_FIELD_EXTRAINFO_LABEL="Additional Information"
COM_BANNERS_FIELD_HEIGHT_DESC="The height of the banner"
@@ -100,10 +99,10 @@
COM_BANNERS_FIELD_METAKEYWORDS_DESC="Enter here the meta keywords for the banner"
COM_BANNERS_FIELD_NAME_DESC="Enter a name for the banner"
COM_BANNERS_FIELD_NAME_LABEL="Name"
-COM_BANNERS_FIELD_PUBLISH_DOWN_DESC="An optional date to finish publishing the banner."
-COM_BANNERS_FIELD_PUBLISH_DOWN_LABEL="Publish Finish"
-COM_BANNERS_FIELD_PUBLISH_UP_DESC="An optional date to start publishing the banner."
-COM_BANNERS_FIELD_PUBLISH_UP_LABEL="Publish Start"
+COM_BANNERS_FIELD_PUBLISH_DOWN_DESC="An optional date to Finish Publishing the banner."
+COM_BANNERS_FIELD_PUBLISH_DOWN_LABEL="Finish Publishing"
+COM_BANNERS_FIELD_PUBLISH_UP_DESC="An optional date to Start Publishing the banner."
+COM_BANNERS_FIELD_PUBLISH_UP_LABEL="Start Publishing"
COM_BANNERS_FIELD_PURCHASETYPE_DESC="Select the type of purchase in the list."
COM_BANNERS_FIELD_PURCHASETYPE_LABEL="Purchase Type"
COM_BANNERS_FIELD_STATE_DESC="Defines the state of the banner"
@@ -124,6 +123,8 @@
COM_BANNERS_FIELD_VALUE_USECOMPONENTDEFAULT="-- Use Component Default --"
COM_BANNERS_FIELD_WIDTH_LABEL="Width"
COM_BANNERS_FIELD_WIDTH_DESC="The width of the banner"
+COM_BANNERS_FIELDSET_CONFIG_CLIENT_OPTIONS_LABEL="Client Options"
+COM_BANNERS_FIELDSET_CONFIG_CLIENT_OPTIONS_DESC="These settings apply for clients unless they are changed for a specific client."
COM_BANNERS_FILENAME="%1$s-banners-tracks-%2$s"
COM_BANNERS_GROUP_LABEL_PUBLISHING_DETAILS="Publishing Options"
COM_BANNERS_HEADING_ACTIVE="Active"
Modified: development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_categories.ini
===================================================================
--- development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_categories.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_categories.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -22,7 +22,7 @@
COM_CATEGORIES_FIELD_PARENT_DESC="Parent Desc"
COM_CATEGORIES_FIELD_PARENT_LABEL="Parent"
COM_CATEGORIES_FIELDSET_DETAILS="Details"
-COM_CATEGORIES_FIELDSET_RULES="Category Access Rules"
+COM_CATEGORIES_FIELDSET_RULES="Category Permissions"
COM_CATEGORIES_ITEMS_SEARCH_FILTER="Search"
COM_CATEGORIES_N_ITEMS_ARCHIVED="%d categories successfully archived"
COM_CATEGORIES_N_ITEMS_ARCHIVED_1="%d category successfully archived"
@@ -52,4 +52,4 @@
COM_CATEGORY_ACCESS_EDITSTATE_DESC="Shown below is the inherited state for <strong>edit state actions</strong> on this category and the calculated state based on the menu selection."
JFIELD_RULES_DESC="Rules description"
JFIELD_RULES_LABEL="Rules label"
-JLIB_HTML_ACCESS_SUMMARY_DESC="Shown below is an overview of the access setting for this category. Click the tabs above to customize these settings by action."
+JLIB_HTML_ACCESS_SUMMARY_DESC="Shown below is an overview of the permission settings for this category. Click the tabs above to customize these settings by action."
Modified: development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_config.ini
===================================================================
--- development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_config.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_config.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -26,9 +26,10 @@
COM_CONFIG_ERROR_ROOT_ASSET_NOT_FOUND="The asset for global configuration could not be found. Permissions have not been saved."
COM_CONFIG_ERROR_WRITE_FAILED="Could not write to the configuration file"
COM_CONFIG_FIELD_CACHE_DESC="Select whether the cache should be enabled or not."
-COM_CONFIG_FIELD_CACHE_HANDLER_DESC="The default caching mechanism is file-based. Please make sure the cache folders are writable."
+COM_CONFIG_FIELD_CACHE_HANDLER_DESC="Choose cache handler to enable caching. Native caching mechanism is file-based. Please make sure the cache folders are writable."
COM_CONFIG_FIELD_CACHE_HANDLER_LABEL="Cache Handler"
COM_CONFIG_FIELD_CACHE_LABEL="Cache"
+COM_CONFIG_FIELD_CACHE_DESC="Enable or disable caching and set caching level. Conservative level: smaller system cache, Progressive level (default): faster, bigger system cache, includes module renderers cache. Not appropriate for extremely large sites."
COM_CONFIG_FIELD_CACHE_TIME_DESC="The maximum length of time in minutes for a cache file to be stored before it is refreshed."
COM_CONFIG_FIELD_CACHE_TIME_LABEL="Cache Time"
COM_CONFIG_FIELD_COOKIE_DOMAIN_DESC="Domain to use when setting session cookies. Preceed domain with '.' if cookie should be valid for all subdomains."
@@ -47,8 +48,6 @@
COM_CONFIG_FIELD_DATABASE_USERNAME_LABEL="Database Username"
COM_CONFIG_FIELD_DEBUG_LANG_DESC="Select whether the debugging indicators (<bold>**...**</bold>) or (<bold>??...??</bold>) for the Joomla! Language files will be displayed. Debug Language will work without Debug System being activated, but you will not get the aditional detailed references that will help you correct any errors."
COM_CONFIG_FIELD_DEBUG_LANG_LABEL="Debug Language"
-COM_CONFIG_FIELD_DEBUG_MODULES_DESC="If enabled, this setting allows the module positions to be displayed when tp="_QQ_"1"_QQ_" is added to the URL."
-COM_CONFIG_FIELD_DEBUG_MODULES_LABEL="Debug Modules"
COM_CONFIG_FIELD_DEBUG_SYSTEM_DESC="If enabled, diagnostic information, language translation, and SQL errors (if present) will be displayed. The information will be displayed at the foot of every page you view within the Joomla backend and frontend. It is not advisable to leave the debug mode activated when running a live Web site."
COM_CONFIG_FIELD_DEBUG_SYSTEM_LABEL="Debug System"
COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_DESC="Choose the default minimum access level to the site"
@@ -61,8 +60,8 @@
COM_CONFIG_FIELD_DEFAULT_LIST_LIMIT_LABEL="Default List Limit"
COM_CONFIG_FIELD_ERROR_REPORTING_DESC="Select the appropriate level of reporting from the drop down list. See the Help Screen for full details."
COM_CONFIG_FIELD_ERROR_REPORTING_LABEL="Error Reporting"
-COM_CONFIG_FIELD_FEED_EMAIL_DESC="The RSS and Atom newsfeeds include the author's e-mail address. Select Author Email to use each author's e-mail (from the User Manager) in the news feed. Select Site Email to include the site 'Mail from' email address for each article."
-COM_CONFIG_FIELD_FEED_EMAIL_LABEL="Feed E-mail"
+COM_CONFIG_FIELD_FEED_EMAIL_DESC="The RSS and Atom newsfeeds include the author's email address. Select Author Email to use each author's email (from the User Manager) in the news feed. Select Site Email to include the site 'Mail from' email address for each article."
+COM_CONFIG_FIELD_FEED_EMAIL_LABEL="Feed email"
COM_CONFIG_FIELD_FORCE_SSL_DESC="Force site access to always occur under SSL (https) for selected areas. You will not be able to access selected areas under non-ssl. Note, you must have SSL enabled on your server to utilize this option."
COM_CONFIG_FIELD_FORCE_SSL_LABEL="Force SSL"
COM_CONFIG_FIELD_FTP_ENABLE_DESC="Enable the built in FTP (File Transfer Protocol) functionality which is needed in some server environments to be used instead of the normal upload functionality of Joomla!"
@@ -83,11 +82,11 @@
COM_CONFIG_FIELD_HELP_SERVER_LABEL="Help Server"
COM_CONFIG_FIELD_LOG_PATH_DESC="For logging of Joomla. Please specify a folder."
COM_CONFIG_FIELD_LOG_PATH_LABEL="Path to Log Folder"
-COM_CONFIG_FIELD_MAIL_FROM_EMAIL_DESC="The e-mail address that will be used to send site e-mail."
-COM_CONFIG_FIELD_MAIL_FROM_EMAIL_LABEL="From E-mail"
-COM_CONFIG_FIELD_MAIL_FROM_NAME_DESC="The e-mail address that will be used to send site e-mail."
+COM_CONFIG_FIELD_MAIL_FROM_EMAIL_DESC="The email address that will be used to send site email."
+COM_CONFIG_FIELD_MAIL_FROM_EMAIL_LABEL="From email"
+COM_CONFIG_FIELD_MAIL_FROM_NAME_DESC="The email address that will be used to send site email."
COM_CONFIG_FIELD_MAIL_FROM_NAME_LABEL="From Name"
-COM_CONFIG_FIELD_MAIL_MAILER_DESC="Select which mailer for the delivery of site e-mail."
+COM_CONFIG_FIELD_MAIL_MAILER_DESC="Select which mailer for the delivery of site email."
COM_CONFIG_FIELD_MAIL_MAILER_LABEL="Mailer"
COM_CONFIG_FIELD_MAIL_SENDMAIL_PATH_DESC="Enter the path to the sendmail program directory on the host server."
COM_CONFIG_FIELD_MAIL_SENDMAIL_PATH_LABEL="Sendmail Path"
@@ -138,8 +137,6 @@
COM_CONFIG_FIELD_SESSION_HANDLER_LABEL="Session Handler"
COM_CONFIG_FIELD_SESSION_TIME_DESC="Auto log out a User after they have been inactive for the entered number of minutes. Do not set too high."
COM_CONFIG_FIELD_SESSION_TIME_LABEL="Session Lifetime"
-COM_CONFIG_FIELD_SHOW_UNTAGGED_CONTENT_DESC="Show untagged content desc"
-COM_CONFIG_FIELD_SHOW_UNTAGGED_CONTENT_LABEL="Show untagged content"
COM_CONFIG_FIELD_SITE_NAME_DESC="Enter the name of your Web site. This will be used in various locations (e.g. the backend browser title bar and <em>Site Offline</em> pages)."
COM_CONFIG_FIELD_SITE_NAME_LABEL="Site Name"
COM_CONFIG_FIELD_SITE_OFFLINE_DESC="Select whether access to the Site frontend is available. If Yes, the frontend will display the message below."
@@ -152,7 +149,9 @@
COM_CONFIG_FIELD_UNICODESLUGS_LABEL="Unicode Aliases"
COM_CONFIG_FIELD_VALUE_ADMINISTRATOR_ONLY="Administrator Only"
COM_CONFIG_FIELD_VALUE_AUTHOR_EMAIL="Author Email"
-COM_CONFIG_FIELD_VALUE_CACHE_OFF="Caching disabled"
+COM_CONFIG_FIELD_VALUE_CACHE_OFF="OFF - Caching disabled"
+COM_CONFIG_FIELD_VALUE_CACHE_CONSERVATIVE="ON - Conservative caching"
+COM_CONFIG_FIELD_VALUE_CACHE_PROGRESSIVE="ON - Progressive caching"
COM_CONFIG_FIELD_VALUE_ENTIRE_SITE="Entire Site"
COM_CONFIG_FIELD_VALUE_MAXIMUM="Maximum"
COM_CONFIG_FIELD_VALUE_MYSQL="MySQL"
Modified: development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_contact.ini
===================================================================
--- development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_contact.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_contact.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -19,7 +19,6 @@
COM_CONTACT_DETAILS="Contact Information"
COM_CONTACT_EDIT_CONTACT="Edit Contact"
COM_CONTACT_EDIT_DETAILS="Edit contact information displayed on an individual page."
-COM_CONTACT_EMAIL_FORM_DETAILS="Form Details"
COM_CONTACT_ERROR_UNIQUE_ALIAS="Another Contact from this category has the same alias"
COM_CONTACT_FIELD_ARTICLES_COMMENTS_DESC="Allow comments for the articles written by the contact"
COM_CONTACT_FIELD_ARTICLES_COMMENTS_LABEL="Comments"
@@ -48,7 +47,7 @@
COM_CONTACT_FIELD_CONFIG_CATEGORIES_LABEL="Categories Options"
COM_CONTACT_FIELD_CONFIG_COUNTRY_DESC="Show/Hide a Country column in the list of Contacts."
COM_CONTACT_FIELD_CONFIG_COUNTRY_LABEL="Country"
-COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_DESC="Custom Reply Desc"
+COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_DESC="Turns off the automated reply, allowing for Plugins to handle integration with other systems."
COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL="Custom Reply"
COM_CONTACT_FIELD_CONFIG_EMAIL_DESC="Show/Hide an Email column in the list of Contacts."
COM_CONTACT_FIELD_CONFIG_EMAIL_LABEL="Email"
@@ -61,9 +60,9 @@
COM_CONTACT_FIELD_CONFIG_PHONE_LABEL="Phone"
COM_CONTACT_FIELD_CONFIG_POSITION_DESC="Show/Hide a Position column in the list of Contacts."
COM_CONTACT_FIELD_CONFIG_POSITION_LABEL="Position"
-COM_CONTACT_FIELD_CONFIG_REDIRECT_DESC="Contact Redirect desc"
+COM_CONTACT_FIELD_CONFIG_REDIRECT_DESC="Enter an alternative email address, where information will be sent to."
COM_CONTACT_FIELD_CONFIG_REDIRECT_LABEL="Contact Redirect"
-COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_DESC="Session Check DESC"
+COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_DESC="Check for the existence of session cookie.This means that users without cookies enabled will not be able to send emails."
COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_LABEL="Session Check"
COM_CONTACT_FIELD_CONFIG_STATE_DESC="Show/Hide a State column in the list of Contacts."
COM_CONTACT_FIELD_CONFIG_SUBURB_DESC="Show/Hide a City or Suburb column in the list of Contacts."
@@ -86,8 +85,6 @@
COM_CONTACT_FIELD_EMAIL_BANNED_TEXT_LABEL="Banned Text"
COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_DESC="Hide or Show checkbox to allow copy of email to be sent to submitter."
COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL="Send Copy to Submitter"
-COM_CONTACT_FIELD_EMAIL_REDIRECT_DESC="Contact Redirect description"
-COM_CONTACT_FIELD_EMAIL_REDIRECT_LABEL="Contact Redirect"
COM_CONTACT_FIELD_EMAIL_SHOW_FORM_DESC="Show or Hide contact form."
COM_CONTACT_FIELD_EMAIL_SHOW_FORM_LABEL="Show Contact Form"
COM_CONTACT_FIELD_FEATURED_DESC="If marked yes, will be displayed in featured view."
Modified: development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_content.ini
===================================================================
--- development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_content.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_content.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -19,16 +19,20 @@
COM_CONTENT_CHANGE_ARTICLE_BUTTON="Select / Change"
COM_CONTENT_CHOOSE_CATEGORY_DESC="Select a parent category"
COM_CONTENT_CONFIGURATION="Article Manager Options"
-COM_CONTENT_CONFIG_BLOG_SETTINGS_DESC="These setting apply for blog layouts unless they are changed for a specific menu item or category."
-COM_CONTENT_CONFIG_BLOG_SETTINGS_LABEL="Blog Layouts"
-COM_CONTENT_CONFIG_CATEGORY_SETTINGS_DESC="These settings apply for category and featured pages when they are displayed on the web site<br /> unless they are changed by the individual category or menu settings."
-COM_CONTENT_CONFIG_CATEGORY_SETTINGS_LABEL="Categories & Featured"
+COM_CONTENT_CONFIG_ARTICLE_SETTINGS_DESC="These settings apply for article layouts unless they are changed for a specific menu item."
+COM_CONTENT_CONFIG_BLOG_SETTINGS_DESC="These setting apply for blog or featured layouts unless they are changed for a specific menu item."
+COM_CONTENT_CONFIG_BLOG_SETTINGS_LABEL="Blog / Featured Layouts"
+COM_CONTENT_CONFIG_CATEGORY_SETTINGS_DESC="These settings apply for category options unless they are changed by the individual category or menu settings."
+COM_CONTENT_CONFIG_CATEGORY_SETTINGS_LABEL="Category Options"
+COM_CONTENT_CONFIG_CATEGORIES_SETTINGS_DESC="These settings apply for categories options ,unless they are changed by the individual category or menu settings."
+COM_CONTENT_CONFIG_CATEGORIES_SETTINGS_LABEL="Categories Options"
COM_CONTENT_CONFIG_INTEGRATION_SETTINGS_DESC="These settings determine how the Article Component will integrate with other extensions."
COM_CONTENT_CONFIG_INTEGRATION_SETTINGS_LABEL="Integration"
COM_CONTENT_CONFIG_LIST_SETTINGS_DESC="These settings apply for list layouts unless they are changed for a specific menu item or category."
COM_CONTENT_CONFIG_LIST_SETTINGS_LABEL="List Layouts"
COM_CONTENT_CONFIG_TEXT_FILTERS_DESC="These are the text filters that will be applied to articles submitted by users in the selected groups."
COM_CONTENT_CONFIG_TEXT_FILTERS_LABEL="Text Filters"
+COM_CONTENT_DRILL_CATEGORIES_LABEL="List or Blog: after choosing the display, make sure you define the Options in the desired layout."
COM_CONTENT_EDIT_ARTICLE="Edit Article"
COM_CONTENT_FEATURED="Featured article"
COM_CONTENT_FEATURED_CATEGORIES_DESC="Optional list of categories. If selected, only featured articles from the selected categories will show. Use Ctrl+Click to select or unselect."
@@ -39,7 +43,7 @@
COM_CONTENT_FIELDSET_RULES="Article Permissions"
COM_CONTENT_FIELD_ARTICLETEXT_DESC="Enter the article content in the text-area"
COM_CONTENT_FIELD_ARTICLETEXT_LABEL="Article Text"
-COM_CONTENT_FIELD_CREATED_BY_ALIAS_DESC="You can enter here an alias to be displayed instead of the name of the user who has created the article."
+COM_CONTENT_FIELD_CREATED_BY_ALIAS_DESC="You can enter here an alias to be displayed instead of the name of the user who created the article."
COM_CONTENT_FIELD_CREATED_BY_ALIAS_LABEL="Created by alias"
COM_CONTENT_FIELD_CREATED_BY_DESC="You can change here the name of the user who created the article."
COM_CONTENT_FIELD_CREATED_BY_LABEL="Created by"
@@ -51,12 +55,12 @@
COM_CONTENT_FIELD_LANGUAGE_DESC="The language that the article is assigned to."
COM_CONTENT_FIELD_MODIFIED_DESC="The date and time that the article was last modified."
COM_CONTENT_FIELD_MODIFIED_LABEL="Modified"
-COM_CONTENT_FIELD_PUBLISH_DOWN_DESC="An optional date to finish publishing the article."
-COM_CONTENT_FIELD_PUBLISH_DOWN_LABEL="Publish Finish"
-COM_CONTENT_FIELD_PUBLISH_UP_DESC="An optional date to start publishing the article."
-COM_CONTENT_FIELD_PUBLISH_UP_LABEL="Publish Start"
-COM_CONTENT_FIELD_RULES_DESC="Below are the access rules for this article where you can manage group access and actions they can perform. The default state is <strong>Inherit</strong>."
-COM_CONTENT_FIELD_RULES_LABEL="Access Rules"
+COM_CONTENT_FIELD_PUBLISH_DOWN_DESC="An optional date to Finish Publishing the article."
+COM_CONTENT_FIELD_PUBLISH_DOWN_LABEL="Finish Publishing"
+COM_CONTENT_FIELD_PUBLISH_UP_DESC="An optional date to Start Publishing the article."
+COM_CONTENT_FIELD_PUBLISH_UP_LABEL="Start Publishing"
+COM_CONTENT_FIELD_RULES_DESC="Below are the permissions for this article where you can manage group access and actions they can perform. The default state is <strong>Inherit</strong>."
+COM_CONTENT_FIELD_RULES_LABEL="Permissions"
COM_CONTENT_FIELD_SELECT_ARTICLE_DESC="Select the desired article from the list."
COM_CONTENT_FIELD_SELECT_ARTICLE_LABEL="Select Article"
COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS="Use Article Settings"
@@ -83,6 +87,8 @@
COM_CONTENT_N_ITEMS_UNPUBLISHED="%s articles unpublished."
COM_CONTENT_N_ITEMS_UNPUBLISHED_1="%s article unpublished."
COM_CONTENT_NEW_ARTICLE="New Article"
+COM_CONTENT_NUMBER_CATEGORY_ITEMS_DESC="If Show, the number of articles in the category will show."
+COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL="# Articles in Category"
COM_CONTENT_OPTION_BLACK_LIST="Black List (Default)"
COM_CONTENT_OPTION_NO_HTML="No HTML"
COM_CONTENT_OPTION_WHITE_LIST="White List"
@@ -95,6 +101,7 @@
COM_CONTENT_PAGE_VIEW_ARTICLE="Article Manager: View Article"
COM_CONTENT_SAVE_SUCCESS="Article successfully saved"
COM_CONTENT_SELECT_AN_ARTICLE="Select an Article"
+COM_CONTENT_SHOW_EMPTY_CATEGORIES_DESC="If Show, empty categories will display. A category is only empty - if it has no articles or subcategories."
COM_CONTENT_SUBMENU_CATEGORIES="Categories"
COM_CONTENT_SUBMENU_FEATURED="Featured Articles"
COM_CONTENT_TOGGLE_TO_FEATURE="Toggle to change article state to 'Featured'"
@@ -102,3 +109,5 @@
COM_CONTENT_UNFEATURED="Unfeatured article"
COM_CONTENT_WARNING_PROVIDE_VALID_NAME="Please provide a valid, non-blank title."
COM_CONTENT_XML_DESCRIPTION="Article management component"
+
+
Modified: development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_installer.ini
===================================================================
--- development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_installer.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_installer.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -24,7 +24,7 @@
COM_INSTALLER_HEADING_ID="ID"
COM_INSTALLER_HEADING_INSTALLTYPE="Install Type"
COM_INSTALLER_HEADING_NAME="Name"
-COM_INSTALLER_HEADING_TYPE="Extension Type"
+COM_INSTALLER_HEADING_TYPE="Type"
COM_INSTALLER_INSTALL_BUTTON="Install"
COM_INSTALLER_INSTALL_DIRECTORY="Install Directory"
COM_INSTALLER_INSTALL_ERROR="Error installing %s"
Modified: development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_menus.ini
===================================================================
--- development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_menus.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_menus.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -122,7 +122,7 @@
COM_MENUS_N_MENUS_DELETED_1="Menu type successfully deleted"
COM_MENUS_NO_ITEM_SELECTED="No menu items selected"
COM_MENUS_NO_MENUS_SELECTED="No menu selected"
-COM_MENUS_OPTION_SELECT_LEVEL="- Select Menu Level -"
+COM_MENUS_OPTION_SELECT_LEVEL="- Select Max Levels -"
COM_MENUS_REQUEST_FIELDSET_LABEL="Required Settings"
COM_MENUS_SAVE_SUCCESS="Menu item successfully saved"
COM_MENUS_SUBMENU_ITEMS="Menu Items"
Modified: development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_modules.ini
===================================================================
--- development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_modules.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_modules.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -33,16 +33,16 @@
COM_MODULES_FIELD_NOTE_LABEL="Note"
COM_MODULES_FIELD_POSITION_DESC="You may select a module position from the dropdown box of pre-defined positions or enter your own module position by clicking on the 'Select position', typing in the name and Save."
COM_MODULES_FIELD_POSITION_LABEL="Position"
-COM_MODULES_FIELD_PUBLISH_DOWN_DESC="An optional date to finish publishing the module."
-COM_MODULES_FIELD_PUBLISH_DOWN_LABEL="Publish Finish"
-COM_MODULES_FIELD_PUBLISH_UP_DESC="An optional date to start publishing the module."
-COM_MODULES_FIELD_PUBLISH_UP_LABEL="Publish Start"
+COM_MODULES_FIELD_PUBLISH_DOWN_DESC="An optional date to Finish Publishing the module."
+COM_MODULES_FIELD_PUBLISH_DOWN_LABEL="Finish Publishing"
+COM_MODULES_FIELD_PUBLISH_UP_DESC="An optional date to Start Publishing the module."
+COM_MODULES_FIELD_PUBLISH_UP_LABEL="Start Publishing"
COM_MODULES_FIELD_PUBLISHED_DESC="If published, this module will display on your site frontend or backend depending on the module."
COM_MODULES_FIELD_SHOWTITLE_DESC="Show/Hide module title on display. Effect will depend on the chrome style in the template."
COM_MODULES_FIELD_SHOWTITLE_LABEL="Show Title"
COM_MODULES_FIELD_TITLE_DESC="Module must have a title"
COM_MODULES_FIELD_VALUE_NOCACHING="No caching"
-COM_MODULES_HEADING_MODULE="Module Type"
+COM_MODULES_HEADING_MODULE="Type"
COM_MODULES_HEADING_PAGES="Pages"
COM_MODULES_HEADING_POSITION="Position"
COM_MODULES_MANAGER_MODULE="Module Manager: Module %s"
@@ -74,7 +74,7 @@
COM_MODULES_OPTION_MENU_NONE="No pages"
COM_MODULES_OPTION_ORDER_POSITION="%d. %s"
COM_MODULES_OPTION_SELECT_CLIENT="- Select Type -"
-COM_MODULES_OPTION_SELECT_MODULE="- Select Module -"
+COM_MODULES_OPTION_SELECT_MODULE="- Select Type -"
COM_MODULES_OPTION_SELECT_POSITION="- Select Position -"
COM_MODULES_SAVE_SUCCESS="Module successfully saved"
COM_MODULES_XML_DESCRIPTION="Component for module management in backend"
Modified: development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_templates.ini
===================================================================
--- development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_templates.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_templates.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -10,6 +10,9 @@
COM_TEMPLATES_ASSIGNED_MORE="Assigned to %d menu items"
COM_TEMPLATES_BASIC_FIELDSET_LABEL="Basic Options"
COM_TEMPLATES_CLICK_TO_ENLARGE="Click to enlarge."
+COM_TEMPLATES_CONFIG_FIELDSET_DESC="Global Configuration for Templates"
+COM_TEMPLATES_CONFIG_POSITIONS_DESC="Enable the preview of the module positions in the template by appending tp=1 to the web address. Also enables the Preview button in the list of templates. Please refresh the page after changing this setting."
+COM_TEMPLATES_CONFIG_POSITIONS_LABEL="Preview Module Positions"
COM_TEMPLATES_CONFIGURATION="Template Manager Options"
COM_TEMPLATES_ERROR_CANNOT_DELETE_LAST_STYLE="Cannot delete last style of a template"
COM_TEMPLATES_ERROR_CANNOT_UNSET_DEFAULT_STYLE="Cannot unset default style"
@@ -33,15 +36,13 @@
COM_TEMPLATES_FIELD_TITLE_DESC="Style Name"
COM_TEMPLATES_FIELD_TITLE_LABEL="Style Name"
COM_TEMPLATES_FILE_SAVE_SUCCESS="File successfully saved"
-COM_TEMPLATES_FILTER_TEMPLATE="- Template -"
-COM_TEMPLATES_FILTER_TYPE="- Location -"
+COM_TEMPLATES_FILTER_TEMPLATE="- Select Template -"
COM_TEMPLATES_FTP_DESC="???"
COM_TEMPLATES_FTP_TITLE="???"
COM_TEMPLATES_HEADING_ASSIGNED="Assigned"
COM_TEMPLATES_HEADING_DEFAULT="Default"
COM_TEMPLATES_HEADING_STYLE="Style"
COM_TEMPLATES_HEADING_TEMPLATE="Template"
-COM_TEMPLATES_HEADING_TYPE="Location"
COM_TEMPLATES_MANAGER="Template Manager"
COM_TEMPLATES_MANAGER_ADD_STYLE="Templates Manager: Add Style"
COM_TEMPLATES_MANAGER_EDIT_FILE="Templates Manager: Edit File"
@@ -73,12 +74,11 @@
COM_TEMPLATES_TEMPLATE_EDIT_PRINTVIEW="Edit print view template"
COM_TEMPLATES_TEMPLATE_FILENAME="Editing file "_QQ_"%s"_QQ_" in template "_QQ_"%s"_QQ_"."
COM_TEMPLATES_TEMPLATE_MASTER_FILES="Template Master Files"
+COM_TEMPLATES_TEMPLATE_NO_PREVIEW="No preview available"
+COM_TEMPLATES_TEMPLATE_NO_PREVIEW_ADMIN="No preview available for Administrator templates"
+COM_TEMPLATES_TEMPLATE_NO_PREVIEW_DESC="To enable template previews, enable the Preview Module Positions option in Template Options"
COM_TEMPLATES_TEMPLATE_NOT_SPECIFIED="Template not specified."
COM_TEMPLATES_TEMPLATE_PREVIEW="Preview"
-COM_TEMPLATES_TEMPLATE_NO_PREVIEW="No preview available"
-COM_TEMPLATES_TEMPLATE_NO_PREVIEW_DESC="To enable template previews, enable the 'Debug Modules' option in Global Configuration"
-COM_TEMPLATES_TEMPLATE_NO_PREVIEW_ADMIN="No preview available for Administrator templates"
-COM_TEMPLATES_TEMPLATES_FILTER_CLIENT="Client"
COM_TEMPLATES_TEMPLATES_FILTER_SEARCH_DESC="Search in template name or folder name."
COM_TEMPLATES_TOOLBAR_SET_HOME="Make Default"
COM_TEMPLATES_XML_DESCRIPTION="This component lets manage templates"
Modified: development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_users.ini
===================================================================
--- development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_users.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_users.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -18,7 +18,7 @@
COM_USERS_CONFIG_FIELD_NEW_USER_TYPE_DESC="The default access level that will be applied to new Users registering via the frontend."
COM_USERS_CONFIG_FIELD_NEW_USER_TYPE_LABEL="New User Registration Type"
COM_USERS_CONFIG_FIELD_SUBJECT_PREFIX_LABEL="Subject Prefix"
-COM_USERS_CONFIG_FIELD_USERACTIVATION_DESC="If set to None, the user will be registered right away. If set to Self, the User will be e-mailed a link to activate their account before they can log in. If set to Admin, the user will be e-mailed a link to verify their e-mail address, then an administrator will be notified to activate the user's account."
+COM_USERS_CONFIG_FIELD_USERACTIVATION_DESC="If set to None, the user will be registered right away. If set to Self, the User will be emailed a link to activate their account before they can log in. If set to Admin, the user will be emailed a link to verify their email address, then an administrator will be notified to activate the user's account."
COM_USERS_CONFIG_FIELD_USERACTIVATION_LABEL="New User Account Activation"
COM_USERS_CONFIG_FIELD_USERACTIVATION_OPTION_ADMINACTIVATION="Admin"
COM_USERS_CONFIG_FIELD_USERACTIVATION_OPTION_SELFACTIVATION="Self"
@@ -43,7 +43,7 @@
COM_USERS_GROUPS_N_ITEMS_DELETED_1="One Group successfully deleted"
COM_USERS_GROUPS_NO_ITEM_SELECTED="No Groups selected"
COM_USERS_HEADING_ACTIVATED="Activated"
-COM_USERS_HEADING_EMAIL="E-mail"
+COM_USERS_HEADING_EMAIL="email"
COM_USERS_HEADING_GROUP_TITLE="Group Title"
COM_USERS_HEADING_GROUPS="Groups"
COM_USERS_HEADING_LAST_VISIT_DATE="Last Visit Date"
@@ -59,14 +59,14 @@
COM_USERS_LEVELS_N_ITEMS_DELETED="%d Access Levels successfully deleted"
COM_USERS_LEVELS_N_ITEMS_DELETED_1="One Acces Level successfully deleted"
COM_USERS_MAIL_DETAILS="Details"
-COM_USERS_MAIL_EMAIL_SENT_TO="E-mail sent to %s Users"
+COM_USERS_MAIL_EMAIL_SENT_TO="email sent to %s Users"
COM_USERS_MAIL_FIELD_GROUP_DESC="Choose a group to send the mail to."
COM_USERS_MAIL_FIELD_GROUP_LABEL="Group:"
COM_USERS_MAIL_FIELD_MESSAGE_DESC="Enter here a default message"
COM_USERS_MAIL_FIELD_MESSAGE_LABEL="Message"
COM_USERS_MAIL_FIELD_RECURSE_DESC="Mail to Child Groups Description"
COM_USERS_MAIL_FIELD_RECURSE_LABEL="Mail to Child Groups:"
-COM_USERS_MAIL_FIELD_SEND_AS_BLIND_CARBON_COPY_DESC="Hides recipient list and adds copy to site e-mail."
+COM_USERS_MAIL_FIELD_SEND_AS_BLIND_CARBON_COPY_DESC="Hides recipient list and adds copy to site email."
COM_USERS_MAIL_FIELD_SEND_AS_BLIND_CARBON_COPY_LABEL="Recipients as BCC:"
COM_USERS_MAIL_FIELD_SEND_IN_HTML_MODE_DESC="Send in HTML mode"
COM_USERS_MAIL_FIELD_SEND_IN_HTML_MODE_LABEL="Send in HTML mode:"
@@ -86,10 +86,13 @@
COM_USERS_N_LEVELS_DELETED_1="Access Level successfully removed."
COM_USERS_N_USERS_ACTIVATED="%s Users successfully activated"
COM_USERS_N_USERS_ACTIVATED_1="User successfully activated"
+COM_USERS_N_USERS_ACTIVATED_0="No user activated"
COM_USERS_N_USERS_BLOCKED="%s Users blocked"
COM_USERS_N_USERS_BLOCKED_1="User blocked"
+COM_USERS_N_USERS_BLOCKED_0="No User blocked"
COM_USERS_N_USERS_UNBLOCKED="%s Users enabled"
COM_USERS_N_USERS_UNBLOCKED_1="User enabled"
+COM_USERS_N_USERS_UNBLOCKED_0="No User enabled"
COM_USERS_NO_LEVELS_SELECTED="No Access Levels selected"
COM_USERS_SEARCH_ACCESS_LEVELS="Search Access Levels"
COM_USERS_SEARCH_GROUPS_LABEL="Search Groups"
@@ -103,7 +106,8 @@
COM_USERS_SUBMENU_USERS="Users"
COM_USERS_TOOLBAR_ACTIVATE="Activate"
COM_USERS_TOOLBAR_BLOCK="Block"
-COM_USERS_TOOLBAR_MAIL_SEND_MAIL="Send e-mail"
+COM_USERS_TOOLBAR_UNBLOCK="Unblock"
+COM_USERS_TOOLBAR_MAIL_SEND_MAIL="Send email"
COM_USERS_UNACTIVATED="Unactivated"
COM_USERS_USER_ACCOUNT_DETAILS="Account Details"
COM_USERS_USER_BATCH_FAILED="An error was encountered while performing the batch operation: %s."
@@ -114,8 +118,8 @@
COM_USERS_USER_FIELD_BLOCK_LABEL="Block this User"
COM_USERS_USER_FIELD_EDITOR_DESC="User Editor"
COM_USERS_USER_FIELD_EDITOR_LABEL="Editor"
-COM_USERS_USER_FIELD_EMAIL_DESC="Enter an e-mail for the user"
-COM_USERS_USER_FIELD_EMAIL_LABEL="E-mail"
+COM_USERS_USER_FIELD_EMAIL_DESC="Enter an email for the user"
+COM_USERS_USER_FIELD_EMAIL_LABEL="email"
COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_DESC="Select the Language for the frontend interface. This will only affect this User."
COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_LABEL="Frontend Language"
COM_USERS_USER_FIELD_HELPSITE_DESC="Help site for this user"
@@ -128,8 +132,8 @@
COM_USERS_USER_FIELD_PASSWORD_DESC="Enter the password for the user"
COM_USERS_USER_FIELD_REGISTERDATE_DESC="Registration Date"
COM_USERS_USER_FIELD_REGISTERDATE_LABEL="Registration Date"
-COM_USERS_USER_FIELD_SENDEMAIL_DESC="If set to yes, the user will receive system e-mails."
-COM_USERS_USER_FIELD_SENDEMAIL_LABEL="Send E-mail to this User"
+COM_USERS_USER_FIELD_SENDEMAIL_DESC="If set to yes, the user will receive system emails."
+COM_USERS_USER_FIELD_SENDEMAIL_LABEL="Send email to this User"
COM_USERS_USER_FIELD_TIMEZONE_DESC="Time zone for this user"
COM_USERS_USER_FIELD_TIMEZONE_LABEL="Time Zone"
COM_USERS_USER_FIELD_USERNAME_DESC="Enter the login name (User name) for the user."
@@ -138,6 +142,7 @@
COM_USERS_USER_SAVE_FAILED="An error was encountered while saving the member: %s."
COM_USERS_USER_SAVE_SUCCESS="User successfully saved."
COM_USERS_USERGROUP_DETAILS="User Group Details"
+COM_USERS_USERS_ERROR_CANNOT_BLOCK_SELF="You cannot block yourself."
COM_USERS_USERS_ERROR_CANNOT_DELETE_SELF="You cannot delete yourself."
COM_USERS_USERS_N_ITEMS_DELETED="%d users successfully deleted"
COM_USERS_USERS_N_ITEMS_DELETED_1="One user successfully deleted"
@@ -151,4 +156,4 @@
COM_USERS_VIEW_NEW_LEVEL_TITLE="User Manager: Add New Access Level"
COM_USERS_VIEW_NEW_USER_TITLE="User Manager: Add New User"
COM_USERS_VIEW_USERS_TITLE="User Manager: Users"
-COM_USERS_XML_DESCRIPTION="Component for managing users"
+COM_USERS_XML_DESCRIPTION="Component for managing users"
\ No newline at end of file
Modified: development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_weblinks.ini
===================================================================
--- development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_weblinks.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/xx-XX/xx-XX.com_weblinks.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -56,7 +56,7 @@
COM_WEBLINKS_FIELD_DISPLAY_NUM_DESC="Default number of Web links to list on a page."
COM_WEBLINKS_FIELD_DISPLAY_NUM_LABEL="# of Web links to List"
COM_WEBLINKS_FIELD_LANGUAGE_DESC="Assign a language to this weblink"
-COM_WEBLINKS_FIELD_ORDERING_DESC="COM_WEBLINKS_FIELD_ORDERING_DESC ??"
+COM_WEBLINKS_FIELD_ORDERING_DESC="Select the Ordering"
COM_WEBLINKS_FIELD_ORDERING_LABEL="Ordering"
COM_WEBLINKS_FIELD_SELECT_CATEGORY_LABEL="Select a category"
COM_WEBLINKS_FIELD_SELECT_CATEGORY_DESC="Select a weblinks category to display"
Modified: development/branches/jcamp/administrator/language/xx-XX/xx-XX.ini
===================================================================
--- development/branches/jcamp/administrator/language/xx-XX/xx-XX.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/xx-XX/xx-XX.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -42,7 +42,7 @@
JCANCEL="Cancel"
JCATEGORY="Category"
JCLEAR="Clear"
-JCLIENT="Client"
+JCLIENT="Location"
JCONFIG_PERMISSIONS_DESC="Default permissions used for all content in this component."
JCONFIG_PERMISSIONS_LABEL="Permissions"
JCURRENT="Current"
@@ -55,6 +55,7 @@
JDISABLED="Disabled"
JENABLED="Enabled"
JERROR_ALERTNOAUTHOR="You are not authorised to view this resource."
+JFEATURED="Featured"
JFALSE="False"
JGROUPS="Groups"
JHIDE="Hide"
@@ -189,8 +190,6 @@
JFIELD_XREFERENCE_DESC="An optional field to allow this record to be cross-referenced to an external data system if required."
JFIELD_XREFERENCE_LABEL="External Reference"
-JGLOBAL_GT=">"
-JGLOBAL_LT="<"
JGLOBAL_ACROSS="Across"
JGLOBAL_ALL_ARTICLE="Max Levels Articles"
JGLOBAL_ALL_LIST="Max Levels as List"
@@ -213,14 +212,14 @@
JGLOBAL_AUTH_ERROR="Authentication error : could not connect to the openid server"
JGLOBAL_AUTH_FAIL="Authentication failed"
JGLOBAL_AUTH_FAILED="Failed to authenticate: %s"
+JGLOBAL_AUTH_INCORRECT="Incorrect username/password"
JGLOBAL_AUTH_INVALID_PASS="Invalid password"
JGLOBAL_AUTH_NO_BIND="Unable to bind to LDAP"
JGLOBAL_AUTH_NO_CONNECT="Unable to connect to LDAP server"
JGLOBAL_AUTH_NO_REDIRECT="Could not redirect to server: %s"
JGLOBAL_AUTH_NO_USER="User does not exist"
JGLOBAL_AUTH_NOT_CREATE_DIR="Could not create the FileStore directory %s. Please check the effective permissions."
-JGLOBAL_AUTH_PASS_BLANK="LADP can not have blank password"
-JGLOBAL_AUTH_INCORRECT="Incorrect username/password"
+JGLOBAL_AUTH_PASS_BLANK="LDAP can not have blank password"
JGLOBAL_AUTH_UNKNOWN_ACCESS_DENIED="Result Unknown. Access Denied"
JGLOBAL_AUTH_USER_BLACKLISTED="User is blacklisted"
JGLOBAL_AUTH_USER_NOT_FOUND="Unable to find user"
@@ -229,35 +228,37 @@
JGLOBAL_AUTO="Auto"
JGLOBAL_BLOG="Blog"
JGLOBAL_BLOG_LAYOUT_OPTIONS="Blog Layout Options"
+JGLOBAL_CATEGORIES_OPTIONS="Categories Options"
JGLOBAL_CATEGORY_LAYOUT_DESC="Layout"
JGLOBAL_CATEGORY_LAYOUT_LABEL="Choose a layout"
-JGLOBAL_CATEGORY_NOT_FOUND="Category not found"
JGLOBAL_CATEGORY_MANAGER_ORDER="Category Manager Order"
+JGLOBAL_CATEGORY_NOT_FOUND="Category not found"
JGLOBAL_CATEGORY_OPTIONS="Category Options"
-JGLOBAL_CATEGORIES_OPTIONS="Categories Options"
JGLOBAL_CATEGORY_ORDER_DESC="The order that categories will show in."
JGLOBAL_CATEGORY_ORDER_LABEL="Category Order"
-JGLOBAL_CHOOSE_CATEGORY_LABEL="Choose a category"
-JGLOBAL_CHOOSE_CATEGORY_DESC="Choose a category from the list"
JGLOBAL_CENTER="Center"
-JGLOBAL_CLICK_TO_TOGGLE_STATE="Click on icon to toggle state."
+JGLOBAL_CHOOSE_CATEGORY_DESC="Choose a category from the list"
+JGLOBAL_CHOOSE_CATEGORY_LABEL="Choose a category"
JGLOBAL_CLICK_TO_SORT_THIS_COLUMN="Click to sort by this column"
+JGLOBAL_CLICK_TO_TOGGLE_STATE="Click on icon to toggle state."
JGLOBAL_CREATED="Created"
JGLOBAL_DATE_FORMAT_DESC="Optional format string for showing the date. If left blank, it uses DATE_FORMAT_LC1 from your language file (for example, "%A, %d %B %Y" for "Monday, 23 November 2009")."
JGLOBAL_DATE_FORMAT_LABEL="Date Format"
JGLOBAL_DESCRIPTION="Description"
+JGLOBAL_DISPLAY_NUM="Display #"
JGLOBAL_DISPLAY_SELECT_DESC="Whether to show or hide the Display Select dropdown listbox."
JGLOBAL_DISPLAY_SELECT_LABEL="Display Select"
-JGLOBAL_DISPLAY_NUM="Display #"
JGLOBAL_DOWN="Down"
-JGLOBAL_DRILL_DOWN_LAYOUT_DESC="When drilling down to a category, whether to show articles in a list or blog layout."
-JGLOBAL_DRILL_DOWN_LAYOUT_LABEL="List or Blog"
JGLOBAL_EDIT_ITEM="Edit item"
JGLOBAL_EDIT_PREFERENCES="Edit Preferences"
JGLOBAL_EMPTY_CATEGORIES_DESC="Whether to show or hide categories that contain no articles and no subcategories."
JGLOBAL_EMPTY_CATEGORIES_LABEL="Empty Categories"
JGLOBAL_FEED_SUMMARY_DESC="If set to Intro Text, only the Intro Text of each article will show in the newsfeed. If set to Full Text, the whole article will show in the newsfeed."
JGLOBAL_FEED_SUMMARY_LABEL="For each feed item show"
+JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_DESC="Categories that are within this category will be displayed"
+JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_LABEL="Select a Top Level Category"
+JGLOBAL_FIELD_CATEGORIES_DESC_DESC="If you enter some text in this field, it will override the Top Level Category Description, if it has one."
+JGLOBAL_FIELD_CATEGORIES_DESC_LABEL="Top Level Category Description"
JGLOBAL_FIELD_CREATED_BY_ALIAS_DESC="Uses another name than the author's for display"
JGLOBAL_FIELD_CREATED_BY_ALIAS_LABEL="Author's Alias"
JGLOBAL_FIELD_CREATED_BY_DESC="The user who created this"
@@ -266,28 +267,25 @@
JGLOBAL_FIELD_CREATED_LABEL="Created"
JGLOBAL_FIELD_FIELD_CACHETIME_DESC="The number of minutes before the cache is refreshed."
JGLOBAL_FIELD_FIELD_ORDERING_LABEL="Order"
+JGLOBAL_FIELD_ID_DESC="Record number in the database"
+JGLOBAL_FIELD_ID_LABEL="ID"
JGLOBAL_FIELD_MODIFIED_DESC="The date and time the article was last modified"
JGLOBAL_FIELD_MODIFIED_LABEL="Modified"
-JGLOBAL_FIELD_NUM_CATEGORY_ITEMS_LABEL="Number of categories"
JGLOBAL_FIELD_NUM_CATEGORY_ITEMS_DESC="Number of categories to display for each level"
-JGLOBAL_FIELD_PUBLISH_DOWN_DESC="An optional date to stop publishing"
-JGLOBAL_FIELD_PUBLISH_DOWN_LABEL="Publish Finish"
-JGLOBAL_FIELD_PUBLISH_UP_DESC="An optional date to start publishing"
-JGLOBAL_FIELD_PUBLISH_UP_LABEL="Publish Start"
-JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL="Base Category Description"
-JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC="Show description of the base category or optionally override with the text from the description field found in menu item."
-JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_LABEL="Select a base category"
-JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_DESC="Categories that are within this category will be displayed"
-JGLOBAL_FIELD_CATEGORIES_DESC_DESC="If you enter some text in this field, it will override the Base Category Description."
-JGLOBAL_FIELD_CATEGORIES_DESC_LABEL="Base Category Description"
+JGLOBAL_FIELD_NUM_CATEGORY_ITEMS_LABEL="Number of categories"
+JGLOBAL_FIELD_PUBLISH_DOWN_DESC="An optional date to Stop Publishing"
+JGLOBAL_FIELD_PUBLISH_DOWN_LABEL="Finish Publishing"
+JGLOBAL_FIELD_PUBLISH_UP_DESC="An optional date to Start Publishing"
+JGLOBAL_FIELD_PUBLISH_UP_LABEL="Start Publishing"
+JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC="Show description of the top level category or optionally override with the text from the description field found in menu item. If using Root as top level category, the description field has to be filled."
+JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL="Top Level Category Description"
+JGLOBAL_FIELDSET_DISPLAY_OPTIONS="Display Options"
JGLOBAL_FIELDSET_METADATA_OPTIONS="Metadata Options"
-JGLOBAL_FIELDSET_PUBLISHING="Publishing Options"
JGLOBAL_FIELDSET_OPTIONS="Options"
-JGLOBAL_FIELDSET_DISPLAY_OPTIONS="Display Options"
-JGLOBAL_FIELD_ID_LABEL="ID"
-JGLOBAL_FIELD_ID_DESC="Record number in the database"
+JGLOBAL_FIELDSET_PUBLISHING="Publishing Options"
JGLOBAL_FILTER_ATTRIBUTES_DESC="List additional attributes, separating each attribute name with a space or comma."
JGLOBAL_FILTER_ATTRIBUTES_LABEL="Filter Attributes"
+JGLOBAL_FILTER_CLIENT="- Select Location -"
JGLOBAL_FILTER_FIELD_DESC="Whether to show a Filter field for the list of articles. Select Hide to hide the filter field, or select which field you wish to filter on."
JGLOBAL_FILTER_FIELD_LABEL="Filter Field"
JGLOBAL_FILTER_GROUPS_DESC="This sets the user groups that you want filters applied to. Other groups will have no filtering performed."
@@ -299,6 +297,7 @@
JGLOBAL_FILTERING_OPTIONS_DESC="Filtering options to give more control over the HTML your content providers submit. You can be as strict or as liberal as you require to suit your site needs. The filtering is opt-in and the default settings provide good protection against markup commonly associated with Web site attacks."
JGLOBAL_FILTERING_OPTIONS_LABEL="Filtering Options"
JGLOBAL_FULL_TEXT="Full Text"
+JGLOBAL_GT=">"
JGLOBAL_HITS="Hits"
JGLOBAL_INDEX_FOLLOW="Index, Follow"
JGLOBAL_INDEX_NOFOLLOW="Index, No follow"
@@ -324,20 +323,23 @@
JGLOBAL_LIST_HITS_LABEL="Show Hits in List"
JGLOBAL_LIST_LAYOUT_OPTIONS="List Layout Options"
JGLOBAL_LIST_NOTE="(<span>Note</span>: %s)"
-JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC="The number of Category subcategory levels to display."
-JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL="Category Subcategory Levels"
-JGLOBAL_MAXIMUM_CATEGORIES_LEVELS_DESC="The number of Categories subcategory levels to display."
-JGLOBAL_MAXIMUM_CATEGORIES_LEVELS_LABEL="Categories Subcategory Levels"
-JGLOBAL_MENUS_LAYOUT_INTEGRATION_OPTIONS_LABEL="Integration Options"
+JGLOBAL_LIST_TITLE_DESC="If Show, Category Title will show in the list of categories."
+JGLOBAL_LIST_TITLE_LABEL="Category Title"
+JGLOBAL_LT="<"
+JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC="The number of subcategory levels to display."
+JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL="Subcategory Levels"
+JGLOBAL_MAXLEVEL_DESC="Maximum number of levels of subcategories to show."
+JGLOBAL_MAXLEVEL_LABEL="Subcategory Levels"
JGLOBAL_MENU_SELECTION="Menu Selection:"
+JGLOBAL_MENUS_LAYOUT_INTEGRATION_OPTIONS_LABEL="Integration Options"
JGLOBAL_MODIFIED="Modified"
JGLOBAL_MOST_HITS="Most Hits"
JGLOBAL_MOST_RECENT_FIRST="Most recent first"
JGLOBAL_MULTI_COLUMN_ORDER_DESC="Order articles down or across columns"
JGLOBAL_MULTI_COLUMN_ORDER_LABEL="Multi Column Order"
JGLOBAL_MULTI_LEVEL="Multi Level"
-JGLOBAL_NEWITEMSLAST_DESC="New items default to the last position. The ordering can be changed after this item is saved."
JGLOBAL_NEWITEMSFIRST_DESC="New items default to the first position. The ordering can be changed after this item is saved."
+JGLOBAL_NEWITEMSLAST_DESC="New items default to the last position. The ordering can be changed after this item is saved."
JGLOBAL_NO_ORDER="No Order"
JGLOBAL_NOINDEX_FOLLOW="No index, follow"
JGLOBAL_NOINDEX_NOFOLLOW="No index, no follow"
@@ -349,12 +351,14 @@
JGLOBAL_NUM_LEADING_ARTICLES_LABEL="# Leading Articles"
JGLOBAL_NUM_LINKS_DESC="Number of ariticles to display as links, normally below the Intro Articles."
JGLOBAL_NUM_LINKS_LABEL="# Links"
+JGLOBAL_NUMBER_CATEGORY_ITEMS_DESC="If Show, the number of articles in the category will show."
+JGLOBAL_NUMBER_CATEGORY_ITEMS_LABEL="Show Article Count"
JGLOBAL_NUMBER_ITEMS_LIST_DESC="Default number of articles to list on a page."
JGLOBAL_NUMBER_ITEMS_LIST_LABEL="# Articles to List"
JGLOBAL_OLDEST_FIRST="Oldest first"
+JGLOBAL_ORDERING="Article Manager Order"
JGLOBAL_ORDERING_DATE_DESC="If articles are ordered by date, which date to use."
JGLOBAL_ORDERING_DATE_LABEL="Date for Ordering"
-JGLOBAL_ORDERING="Article Manager Order"
JGLOBAL_PAGINATION_DESC="Show or hide Pagination support. Pagination provides page links at the bottom of the page that allow the User to navigate to additional pages. These are needed if the Information will not fit on one page."
JGLOBAL_PAGINATION_LABEL="Pagination"
JGLOBAL_PAGINATION_RESULTS_DESC="Show or hide pagination results information, for example, "Page 1 of 4"."
@@ -363,9 +367,9 @@
JGLOBAL_PREVIEW="Preview"
JGLOBAL_RECORD_NUMBER="Record ID: %d"
JGLOBAL_REMEMBER_ME="Remember Me"
+JGLOBAL_RIGHT="Right"
JGLOBAL_ROOT="Root"
JGLOBAL_ROOT_PARENT="- No parent -"
-JGLOBAL_RIGHT="Right"
JGLOBAL_SELECT_ALLOW_DENY_GROUP="Change %s permission for %s group."
JGLOBAL_SELECTION_INVERT="Toggle Selection"
JGLOBAL_SHOW_AUTHOR_DESC="If set to Show, the Name of the article's Author will be displayed. This is a global setting but can be changed at the Category, Menu and Article levels."
@@ -376,19 +380,23 @@
JGLOBAL_SHOW_CATEGORY_IMAGE_DESC="Show or hide the image of the selected Category."
JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL="Category Image"
JGLOBAL_SHOW_CATEGORY_LABEL="Show Category"
+JGLOBAL_SHOW_CATEGORY_TITLE="Category Title"
+JGLOBAL_SHOW_CATEGORY_TITLE_DESC="If Show, the Category Title will show as a subheading on the page. The subheading is usually displayed inside the "H2" tag."
JGLOBAL_SHOW_CREATE_DATE_DESC="If set to Show, the date and time an Article was created will be displayed. This a global setting but can be changed at Menu and Article levels."
JGLOBAL_SHOW_CREATE_DATE_LABEL="Show Create Date"
JGLOBAL_SHOW_DATE_DESC="Whether to show a date column in the list of articles. Select Hide to hide the date, or select which date you wish to show."
JGLOBAL_SHOW_DATE_LABEL="Show Date"
-JGLOBAL_SHOW_EMAIL_ICON_DESC="Show/Hide the e-mail icon. This allows you to email an article."
+JGLOBAL_SHOW_EMAIL_ICON_DESC="Show/Hide the email icon. This allows you to email an article."
JGLOBAL_SHOW_EMAIL_ICON_LABEL="Show Email Icon"
+JGLOBAL_SHOW_EMPTY_CATEGORIES_DESC="If Show, empty categories will display. A category is only empty - if it has no items or subcategories."
+JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL="Empty Categories"
JGLOBAL_SHOW_FEED_LINK_DESC="Show or hide an RSS Feed Link. (A Feed Link will show up as a feed icon in the address bar of most modern browsers)."
JGLOBAL_SHOW_FEED_LINK_LABEL="Show Feed Link"
JGLOBAL_SHOW_HEADINGS_DESC="Show or Hide the headings in list layouts."
JGLOBAL_SHOW_HEADINGS_LABEL="Table Headings"
JGLOBAL_SHOW_HITS_DESC="If set to Show, the number of Hits on a particular Article will be displayed. This is a global setting but can be changed at the Category, Menu and Article levels."
JGLOBAL_SHOW_HITS_LABEL="Show Hits"
-JGLOBAL_SHOW_ICONS_DESC="Print and E-mail will utilise Icons or Text"
+JGLOBAL_SHOW_ICONS_DESC="Print and email will utilise Icons or Text"
JGLOBAL_SHOW_ICONS_LABEL="Show Icons"
JGLOBAL_SHOW_INTRO_DESC="If set to Show, the Intro Text of the article will show when you drill down to the article. If set to Hide, only the part of the article after the "Read More" break will show."
JGLOBAL_SHOW_INTRO_LABEL="Show Intro Text"
@@ -404,6 +412,8 @@
JGLOBAL_SHOW_PUBLISH_DATE_LABEL="Show Publish Date"
JGLOBAL_SHOW_READMORE_DESC="If set to Show, the Read more... Link will show if Main text has been provided for the Article."
JGLOBAL_SHOW_READMORE_LABEL="Show "Read More""
+JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC="Show/Hide the subcategories descriptions."
+JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL="Subcategories Descriptions"
JGLOBAL_SHOW_SUBCATEGORY_CONTENT_DESC="If No, only articles from this category will show. If Max Levels as List, subcategories will show as a list. If Max Levels Articles, all articles from subcategories will show in the list or blog. The number of levels is determined by the Maximum Subcategory Levels parameter."
JGLOBAL_SHOW_SUBCATEGORY_CONTENT_LABEL="Include Subcategories"
JGLOBAL_SHOW_TITLE_DESC="If set to Show, the article title is shown."
@@ -411,8 +421,10 @@
JGLOBAL_SHOW_UNAUTH_LINKS_DESC="If set to Yes, links to registered content will be shown even if you are not logged in. You will need to log in to access the full item."
JGLOBAL_SHOW_UNAUTH_LINKS_LABEL="Show Unauthorised Links"
JGLOBAL_SINGLE_LEVEL="Single Level"
-JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL="These options are used for drill-down categories"
JGLOBAL_STATE="State"
+JGLOBAL_SUBHEADING_DESC="Optional text to show as a subheading."
+JGLOBAL_SUBHEADING_LABEL="Page Subheading"
+JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL="These options are also used when you click <br />on one of the category links, on the first page and/or thereafter,<br /> unless they are changed for a specific menu item."
JGLOBAL_TITLE="Title"
JGLOBAL_TITLE_ALPHABETICAL="Title Alphabetical"
JGLOBAL_TITLE_REVERSE_ALPHABETICAL="Title Reverse Alphabetical"
@@ -422,18 +434,6 @@
JGLOBAL_USERNAME="User Name"
JGLOBAL_VALIDATION_FORM_FAILED="Invalid form"
JGLOBAL_WARNJAVASCRIPT="Warning! JavaScript must be enabled for proper operation of the Administrator backend."
-JGLOBAL_LIST_TITLE_DESC="If Show, Category Title will show in the list of categories."
-JGLOBAL_LIST_TITLE_LABEL="Category Title"
-JGLOBAL_NUMBER_CATEGORY_ITEMS_DESC="If Show, the number of articles in the category will show."
-JGLOBAL_NUMBER_CATEGORY_ITEMS_LABEL="Show Article Count"
-JGLOBAL_SHOW_CATEGORY_TITLE="Category Title"
-JGLOBAL_SHOW_CATEGORY_TITLE_DESC="If Show, the Category Title will show as a subheading on the page. The subheading is usually displayed inside the "H2" tag."
-JGLOBAL_SHOW_EMPTY_CATEGORIES_DESC="If Show, empty categories will display. A category is only empty - if it has no items or subcategories."
-JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL="Empty Categories"
-JGLOBAL_SUBHEADING_DESC="Optional text to show as a subheading."
-JGLOBAL_SUBHEADING_LABEL="Page Subheading"
-JGLOBAL_MAXLEVEL_DESC="Maximum number of levels of subcategories to show."
-JGLOBAL_MAXLEVEL_LABEL="Subcategory Levels"
JGLOBAL_WIDTH="Width"
JGRID_HEADING_ACCESS="Access"
JGRID_HEADING_CATEGORY="Category"
@@ -706,7 +706,7 @@
JLIB_DATABASE_ERROR_DELETE_CATEGORY="Left-Right data inconsistency. Cannot delete category."
JLIB_DATABASE_ERROR_DELETE_FAILED="%s: :delete failed - %s"
JLIB_DATABASE_ERROR_DELETE_ROOT_CATEGORIES="Root categories cannot be deleted."
-JLIB_DATABASE_ERROR_EMAIL_INUSE="This e-mail is already registered."
+JLIB_DATABASE_ERROR_EMAIL_INUSE="This email is already registered."
JLIB_DATABASE_ERROR_EMPTY_ROW_RETURNED="The database row is empty."
JLIB_DATABASE_ERROR_FUNCTION_FAILED="DB function failed with error number %s <br /><font color="_QQ_"red"_QQ_">%s</font>"
JLIB_DATABASE_ERROR_GET_NEXT_ORDER_FAILED="%s: :getNextOrder failed - %s"
@@ -745,10 +745,11 @@
JLIB_DATABASE_ERROR_STORE_FAILED_UPDATE_ASSET_ID="The asset_id field could not be updated"
JLIB_DATABASE_ERROR_STORE_FAILED="%1$s: :store failed<br />%2$s"
JLIB_DATABASE_ERROR_USERGROUP_TITLE="Usergroup must have a title"
+JLIB_DATABASE_ERROR_USERGROUP_TITLE_EXISTS="Usergroup title already exists. Title must be unique."
JLIB_DATABASE_ERROR_USERNAME_CANNOT_CHANGE="Cannot use this user name"
JLIB_DATABASE_ERROR_USERNAME_INUSE="User name in use"
JLIB_DATABASE_ERROR_VALID_AZ09="Please enter a valid username. No spaces, at least %d characters and must <strong>not</strong> contain the following characters: < > \ "_QQ_" ' % ; ( ) &"
-JLIB_DATABASE_ERROR_VALID_MAIL="Please enter a valid e-mail address."
+JLIB_DATABASE_ERROR_VALID_MAIL="Please enter a valid email address."
JLIB_DATABASE_ERROR_VIEWLEVEL="Viewlevel must have a title"
JLIB_DATABASE_FUNCTION_NOERROR="DB function reports no errors"
@@ -844,12 +845,10 @@
JLIB_FORM_VALIDATE_FIELD_INVALID="Invalid field: %s"
-JLIB_HTML_ACCESS_EDIT_GROUPS="Edit Groups"
JLIB_HTML_ACCESS_MODIFY_DESC_CAPTION_ACL="ACL"
JLIB_HTML_ACCESS_MODIFY_DESC_CAPTION_TABLE="Table"
-JLIB_HTML_ACCESS_RESET_TO_INHERIT="Reset to Inherit"
JLIB_HTML_ACCESS_SUMMARY_DESC_CAPTION="ACL Summary Table"
-JLIB_HTML_ACCESS_SUMMARY_DESC="Shown below is an overview of the access setting for this article. Click the tabs above to customize these settings by action."
+JLIB_HTML_ACCESS_SUMMARY_DESC="Shown below is an overview of the permission settings for this article. Click the tabs above to customize these settings by action."
JLIB_HTML_ACCESS_SUMMARY="Summary"
JLIB_HTML_ADD_TO_THIS_MENU="Add to this menu"
JLIB_HTML_BEHAVIOR_ABOUT_THE_CALENDAR="About the Calendar"
@@ -1067,7 +1066,7 @@
JLIB_INSTALLER_ERROR_PACK_UNINSTALL_UNKNOWN_EXTENSION="Attempting to uninstall unknown extension from package. This extension may have already been removed earlier."
JLIB_MAIL_FUNCTION_DISABLED="The mail() function has been disabled and the mail cannot be sent."
-JLIB_MAIL_INVALID_EMAIL_SENDER="JMail: : Invalid E-Mail Sender: %s, JMail: :setSender(%s)"
+JLIB_MAIL_INVALID_EMAIL_SENDER="JMail: : Invalid email Sender: %s, JMail: :setSender(%s)"
JLIB_PLUGIN_ERROR_LOADING_PLUGINS="Error loading Plugins: %s"
JLIB_REGISTRY_EXCEPTION_LOAD_FORMAT_CLASS="Unable to load format class"
JLIB_UNKNOWN="Unknown"
@@ -1271,7 +1270,7 @@
UTC__14_00__KIRIBATI="(UTC +14:00) Kiribati"
; Mailer Codes
-PHPMAILER_PROVIDE_ADDRESS="You must provide at least one recipient e-mail address."
+PHPMAILER_PROVIDE_ADDRESS="You must provide at least one recipient email address."
PHPMAILER_MAILER_IS_NOT_SUPPORTED=" Mailer is not supported."
PHPMAILER_EXECUTE="Could not execute:"
PHPMAILER_INSTANTIATE="Could not instantiate mail function."
Modified: development/branches/jcamp/administrator/language/xx-XX/xx-XX.plg_authentication_ldap.ini
===================================================================
--- development/branches/jcamp/administrator/language/xx-XX/xx-XX.plg_authentication_ldap.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/xx-XX/xx-XX.plg_authentication_ldap.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -9,8 +9,8 @@
PLG_LDAP_FIELD_AUTHMETHOD_LABEL="Authorisation Method"
PLG_LDAP_FIELD_BASEDN_DESC="The base DN of your LDAP server, e.g o=mydomain.com"
PLG_LDAP_FIELD_BASEDN_LABEL="Base DN"
-PLG_LDAP_FIELD_EMAIL_DESC="LDAP Attribute which contains the User's e-mail address"
-PLG_LDAP_FIELD_EMAIL_LABEL="Map: E-mail"
+PLG_LDAP_FIELD_EMAIL_DESC="LDAP Attribute which contains the User's email address"
+PLG_LDAP_FIELD_EMAIL_LABEL="Map: email"
PLG_LDAP_FIELD_FULLNAME_DESC="LDAP Attribute which contains the User's full name"
PLG_LDAP_FIELD_FULLNAME_LABEL="Map: Full Name"
PLG_LDAP_FIELD_HOST_DESC="For example: openldap.mycompany.org"
Modified: development/branches/jcamp/administrator/language/xx-XX/xx-XX.plg_content_emailcloak.ini
===================================================================
--- development/branches/jcamp/administrator/language/xx-XX/xx-XX.plg_content_emailcloak.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/xx-XX/xx-XX.plg_content_emailcloak.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -9,4 +9,4 @@
PLG_CONTENT_EMAILCLOAK_MODE_DESC="Select how emails will be displayed"
PLG_CONTENT_EMAILCLOAK_MODE_LABEL="Mode"
PLG_CONTENT_EMAILCLOAK_NONLINKABLE="Non-linkable Text"
-PLG_CONTENT_EMAILCLOAK_XML_DESCRIPTION="Cloaks all e-mails in content from spambots using JavaScript"
\ No newline at end of file
+PLG_CONTENT_EMAILCLOAK_XML_DESCRIPTION="Cloaks all emails in content from spambots using JavaScript"
\ No newline at end of file
Modified: development/branches/jcamp/administrator/language/xx-XX/xx-XX.plg_content_emailcloak.sys.ini
===================================================================
--- development/branches/jcamp/administrator/language/xx-XX/xx-XX.plg_content_emailcloak.sys.ini 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/language/xx-XX/xx-XX.plg_content_emailcloak.sys.ini 2010-08-31 19:21:09 UTC (rev 18740)
@@ -5,4 +5,4 @@
; Note : All ini files need to be saved as UTF-8
PLG_CONTENT_EMAILCLOAK="Content - Email Cloaking"
-PLG_CONTENT_EMAILCLOAK_XML_DESCRIPTION="Cloaks all e-mails in content from spambots using JavaScript"
\ No newline at end of file
+PLG_CONTENT_EMAILCLOAK_XML_DESCRIPTION="Cloaks all emails in content from spambots using JavaScript"
\ No newline at end of file
Modified: development/branches/jcamp/administrator/modules/mod_login/tmpl/default.php
===================================================================
--- development/branches/jcamp/administrator/modules/mod_login/tmpl/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/modules/mod_login/tmpl/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -11,7 +11,7 @@
defined('_JEXEC') or die;
JHtml::_('behavior.keepalive');
?>
-<form action="<?php echo JRoute::_('index.php', true, $params->get('usesecure')); ?>" method="post" name="login" id="form-login">
+<form action="<?php echo JRoute::_('index.php', true, $params->get('usesecure')); ?>" method="post" id="form-login">
<fieldset class="loginform">
<label id="mod-login-username-lbl" for="mod-login-username"><?php echo JText::_('JGLOBAL_USERNAME'); ?></label>
@@ -26,7 +26,7 @@
<div class="button-holder">
<div class="button1">
<div class="next">
- <a href="#" onclick="login.submit();">
+ <a href="#" onclick="document.getElementById('form-login').submit();">
<?php echo JText::_('MOD_LOGIN_LOGIN'); ?></a>
</div>
</div>
Modified: development/branches/jcamp/administrator/modules/mod_menu/menu.php
===================================================================
--- development/branches/jcamp/administrator/modules/mod_menu/menu.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/modules/mod_menu/menu.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -205,9 +205,9 @@
*/
public $active = false;
- public function __construct($title, $link = null, $class = null, $active = false, $target = null)
+ public function __construct($title, $link = null, $class = null, $active = false, $target = null, $titleicon = null)
{
- $this->title = $title;
+ $this->title = $titleicon ? $title.$titleicon : $title;
$this->link = JFilterOutput::ampReplace($link);
$this->class = $class;
$this->active = $active;
Modified: development/branches/jcamp/administrator/modules/mod_menu/mod_menu.xml
===================================================================
--- development/branches/jcamp/administrator/modules/mod_menu/mod_menu.xml 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/modules/mod_menu/mod_menu.xml 2010-08-31 19:21:09 UTC (rev 18740)
@@ -33,8 +33,28 @@
type="text"
label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
-
+
<field
+ name="shownew"
+ type="list"
+ default="1"
+ label="MOD_MENU_FIELD_SHOWNEW"
+ description="MOD_MENU_FIELD_SHOWNEW_DESC">
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field
+ name="showhelp"
+ type="list"
+ default="1"
+ label="MOD_MENU_FIELD_SHOWHELP"
+ description="MOD_MENU_FIELD_SHOWHELP_DESC">
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field
name="cache"
type="list"
default="0"
Modified: development/branches/jcamp/administrator/modules/mod_menu/tmpl/default_disabled.php
===================================================================
--- development/branches/jcamp/administrator/modules/mod_menu/tmpl/default_disabled.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/modules/mod_menu/tmpl/default_disabled.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -10,6 +10,7 @@
// No direct access.
defined('_JEXEC') or die;
+$showhelp = $params->get('showhelp', 1);
//
// Site SubMenu
//
@@ -61,4 +62,7 @@
//
// Help Submenu
//
-$menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP'), null, 'disabled'));
+if ($showhelp == 1) {
+$menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP'), null,'disabled'));
+}
+
Modified: development/branches/jcamp/administrator/modules/mod_menu/tmpl/default_enabled.php
===================================================================
--- development/branches/jcamp/administrator/modules/mod_menu/tmpl/default_enabled.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/modules/mod_menu/tmpl/default_enabled.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -10,14 +10,17 @@
// No direct access.
defined('_JEXEC') or die;
+$shownew = (boolean)$params->get('shownew', 1);
+$showhelp = $params->get('showhelp', 1);
+
//
// Site SubMenu
//
$menu->addChild(
- new JMenuNode(JText::_('JSITE'), '#'), true
+new JMenuNode(JText::_('JSITE'), '#'), true
);
$menu->addChild(
- new JMenuNode(JText::_('MOD_MENU_CONTROL_PANEL'), 'index.php', 'class:cpanel')
+new JMenuNode(JText::_('MOD_MENU_CONTROL_PANEL'), 'index.php', 'class:cpanel')
);
$menu->addSeparator();
@@ -33,7 +36,7 @@
if ($chm || $cam )
{
$menu->addChild(
- new JMenuNode(JText::_('MOD_MENU_SITE_MAINTENANCE'), '#', 'class:maintenance'), true
+ new JMenuNode(JText::_('MOD_MENU_SITE_MAINTENANCE'), '#', 'class:maintenance'), true
);
if ($chm)
@@ -51,8 +54,8 @@
}
$menu->addSeparator();
- $menu->addChild(
- new JMenuNode(JText::_('MOD_MENU_SYSTEM_INFORMATION'), 'index.php?option=com_admin&view=sysinfo', 'class:info')
+$menu->addChild(
+new JMenuNode(JText::_('MOD_MENU_SYSTEM_INFORMATION'), 'index.php?option=com_admin&view=sysinfo', 'class:info')
);
$menu->addSeparator();
@@ -67,35 +70,41 @@
if ($user->authorise('core.manage', 'com_users'))
{
$menu->addChild(
- new JMenuNode(JText::_('MOD_MENU_COM_USERS_USERS'), '#'), true
+ new JMenuNode(JText::_('MOD_MENU_COM_USERS_USERS'), '#'), true
);
$menu->addChild(
- new JMenuNode(JText::_('MOD_MENU_COM_USERS_USER_MANAGER'), 'index.php?option=com_users&view=users', 'class:user')
+ new JMenuNode(JText::_('MOD_MENU_COM_USERS_USER_MANAGER'), 'index.php?option=com_users&view=users', 'class:user'), $shownew
);
+ if ($shownew == true) {
+ $menu->addChild(
+ new JMenuNode(JText::_('MOD_MENU_COM_USERS_ADD_USER'), 'index.php?option=com_users&task=user.add', 'class:newarticle')
+ );
+ $menu->getParent();
+ }
$menu->addChild(
- new JMenuNode(JText::_('MOD_MENU_COM_USERS_GROUPS'), 'index.php?option=com_users&view=groups', 'class:groups')
+ new JMenuNode(JText::_('MOD_MENU_COM_USERS_GROUPS'), 'index.php?option=com_users&view=groups', 'class:groups'), $shownew
);
+ if ($shownew == true) {
+ $menu->addChild(
+ new JMenuNode(JText::_('MOD_MENU_COM_USERS_ADD_GROUP'), 'index.php?option=com_users&task=group.add', 'class:newarticle')
+ );
+ $menu->getParent();
+ }
$menu->addChild(
- new JMenuNode(JText::_('MOD_MENU_COM_USERS_LEVELS'), 'index.php?option=com_users&view=levels', 'class:levels')
+ new JMenuNode(JText::_('MOD_MENU_COM_USERS_LEVELS'), 'index.php?option=com_users&view=levels', 'class:levels'), $shownew
);
+ if ($shownew == true) {
+ $menu->addChild(
+ new JMenuNode(JText::_('MOD_MENU_COM_USERS_ADD_LEVEL'), 'index.php?option=com_users&task=level.add', 'class:newarticle')
+ );
+ $menu->getParent();
+ }
$menu->addSeparator();
$menu->addChild(
- new JMenuNode(JText::_('MOD_MENU_COM_USERS_ADD_USER'), 'index.php?option=com_users&task=user.add', 'class:newuser')
+ new JMenuNode(JText::_('MOD_MENU_MASS_MAIL_USERS'), 'index.php?option=com_users&view=mail', 'class:massmail')
);
- $menu->addChild(
- new JMenuNode(JText::_('MOD_MENU_COM_USERS_ADD_GROUP'), 'index.php?option=com_users&task=group.add', 'class:newgroup')
- );
- $menu->addChild(
- new JMenuNode(JText::_('MOD_MENU_COM_USERS_ADD_LEVEL'), 'index.php?option=com_users&task=level.add', 'class:newlevel')
- );
- $menu->addSeparator();
-
- $menu->addChild(
- new JMenuNode(JText::_('MOD_MENU_MASS_MAIL_USERS'), 'index.php?option=com_users&view=mail', 'class:massmail')
- );
-
$menu->getParent();
}
@@ -105,22 +114,33 @@
if ($user->authorise('core.manage', 'com_menus'))
{
$menu->addChild(
- new JMenuNode(JText::_('MOD_MENU_MENUS'), '#'), true
+ new JMenuNode(JText::_('MOD_MENU_MENUS'), '#'), true
);
$menu->addChild(
- new JMenuNode(JText::_('MOD_MENU_MENU_MANAGER'), 'index.php?option=com_menus&view=menus', 'class:menumgr')
+ new JMenuNode(JText::_('MOD_MENU_MENU_MANAGER'), 'index.php?option=com_menus&view=menus', 'class:menumgr'), $shownew
);
+ if ($shownew == true) {
+ $menu->addChild(
+ new JMenuNode(JText::_('MOD_MENU_MENU_MANAGER_NEW_MENU'), 'index.php?option=com_menus&view=menu&layout=edit', 'class:newarticle')
+ );
+ $menu->getParent();
+ }
$menu->addSeparator();
// Menu Types
foreach (ModMenuHelper::getMenus() as $menuType)
- {
+ {
+ $titleicon = $menuType->home ? ' <span>'.JHTML::_('image','menu/icon-16-default.png', NULL, NULL, true).'</span>' : '';
$menu->addChild(
- new JMenuNode(
- $menuType->title.($menuType->home ? ' <span>'.JHTML::_('image','menu/icon-16-default.png', NULL, NULL, true).'</span>' : ''),
- 'index.php?option=com_menus&view=items&menutype='.$menuType->menutype, 'class:menu'
- )
- );
+ new JMenuNode($menuType->title, 'index.php?option=com_menus&view=items&menutype='.$menuType->menutype, 'class:menu', null, null, $titleicon), $shownew
+ );
+
+ if ($shownew == true) {
+ $menu->addChild(
+ new JMenuNode(JText::_('MOD_MENU_MENU_MANAGER_NEW_MENU_ITEM'), 'index.php?option=com_menus&view=item&layout=edit&menutype='.$menuType->menutype, 'class:newarticle')
+ );
+ $menu->getParent();
+ }
}
$menu->getParent();
}
@@ -131,27 +151,31 @@
if ($user->authorise('core.manage', 'com_content'))
{
$menu->addChild(
- new JMenuNode(JText::_('MOD_MENU_COM_CONTENT'), '#'), true
+ new JMenuNode(JText::_('MOD_MENU_COM_CONTENT'), '#'), true
);
$menu->addChild(
- new JMenuNode(JText::_('MOD_MENU_COM_CONTENT_ARTICLE_MANAGER'), 'index.php?option=com_content', 'class:article')
+ new JMenuNode(JText::_('MOD_MENU_COM_CONTENT_ARTICLE_MANAGER'), 'index.php?option=com_content', 'class:article'), $shownew
);
+ if ($shownew == true) {
+ $menu->addChild(
+ new JMenuNode(JText::_('MOD_MENU_COM_CONTENT_NEW_ARTICLE'), 'index.php?option=com_content&task=article.add', 'class:newarticle')
+ );
+ $menu->getParent();
+ }
$menu->addChild(
- new JMenuNode(JText::_('MOD_MENU_COM_CONTENT_CATEGORY_MANAGER'), 'index.php?option=com_categories&extension=com_content', 'class:category')
+ new JMenuNode(JText::_('MOD_MENU_COM_CONTENT_CATEGORY_MANAGER'), 'index.php?option=com_categories&extension=com_content', 'class:category'), $shownew
);
+ if ($shownew == true) {
+ $menu->addChild(
+ new JMenuNode(JText::_('MOD_MENU_COM_CONTENT_NEW_CATEGORY'), 'index.php?option=com_categories&task=category.add&extension=com_content', 'class:newarticle')
+ );
+ $menu->getParent();
+ }
$menu->addChild(
- new JMenuNode(JText::_('MOD_MENU_COM_CONTENT_FEATURED'), 'index.php?option=com_content&view=featured', 'class:featured')
+ new JMenuNode(JText::_('MOD_MENU_COM_CONTENT_FEATURED'), 'index.php?option=com_content&view=featured', 'class:featured')
);
$menu->addSeparator();
- $menu->addChild(
- new JMenuNode(JText::_('MOD_MENU_COM_CONTENT_NEW_ARTICLE'), 'index.php?option=com_content&task=article.add', 'class:newarticle')
- );
- $menu->addChild(
- new JMenuNode(JText::_('MOD_MENU_COM_CONTENT_NEW_CATEGORY'), 'index.php?option=com_categories&task=category.add&extension=com_content', 'class:newcategory')
- );
-
- $menu->addSeparator();
if ($user->authorise('core.manage', 'com_media')) {
$menu->addChild(new JMenuNode(JText::_('MOD_MENU_MEDIA_MANAGER'), 'index.php?option=com_media', 'class:media'));
}
@@ -224,40 +248,46 @@
//
// Help Submenu
//
-$menu->addChild(
+if ($showhelp == 1) {
+ $menu->addChild(
new JMenuNode(JText::_('MOD_MENU_HELP'), '#'), true
-);
-$menu->addChild(
+ );
+ $menu->addChild(
new JMenuNode(JText::_('MOD_MENU_HELP_JOOMLA'), 'index.php?option=com_admin&view=help', 'class:help')
-);
-$menu->addSeparator();
+ );
+ $menu->addSeparator();
-$menu->addChild(
+ $menu->addChild(
new JMenuNode(JText::_('MOD_MENU_HELP_SUPPORT_FORUM'), 'http://forum.joomla.org', 'class:help-forum', false, '_blank')
-);
-$menu->addChild(
+ );
+ $menu->addChild(
new JMenuNode(JText::_('MOD_MENU_HELP_DOCUMENTATION'), 'http://docs.joomla.org', 'class:help-docs', false, '_blank')
-);
-$menu->addSeparator();
-$menu->addChild(
+ );
+ $menu->addSeparator();
+ $menu->addChild(
+ new JMenuNode(JText::_('MOD_MENU_HELP_LINKS'), '#', 'class:weblinks'), true
+ );
+ $menu->addChild(
new JMenuNode(JText::_('MOD_MENU_HELP_EXTENSIONS'), 'http://extensions.joomla.org', 'class:help-jed', false, '_blank')
-);
-$menu->addChild(
+ );
+ $menu->addChild(
new JMenuNode(JText::_('MOD_MENU_HELP_TRANSLATIONS'), 'http://community.joomla.org/translations.html', 'class:help-trans', false, '_blank')
-);
-$menu->addChild(
+ );
+ $menu->addChild(
new JMenuNode(JText::_('MOD_MENU_HELP_RESOURCES'), 'http://resources.joomla.org', 'class:help-jrd', false, '_blank')
-);
-$menu->addChild(
+ );
+ $menu->addChild(
new JMenuNode(JText::_('MOD_MENU_HELP_COMMUNITY'), 'http://community.joomla.org', 'class:help-community', false, '_blank')
-);
-$menu->addChild(
+ );
+ $menu->addChild(
new JMenuNode(JText::_('MOD_MENU_HELP_SECURITY'), 'http://developer.joomla.org/security.html', 'class:help-security', false, '_blank')
-);
-$menu->addChild(
+ );
+ $menu->addChild(
new JMenuNode(JText::_('MOD_MENU_HELP_DEVELOPER'), 'http://developer.joomla.org', 'class:help-dev', false, '_blank')
-);
-$menu->addChild(
+ );
+ $menu->addChild(
new JMenuNode(JText::_('MOD_MENU_HELP_SHOP'), 'http://shop.joomla.org', 'class:help-shop', false, '_blank')
-);
-$menu->getParent();
+ );
+ $menu->getParent();
+ $menu->getParent();
+}
\ No newline at end of file
Modified: development/branches/jcamp/administrator/templates/bluestork/css/template.css
===================================================================
--- development/branches/jcamp/administrator/templates/bluestork/css/template.css 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/bluestork/css/template.css 2010-08-31 19:21:09 UTC (rev 18740)
@@ -1322,6 +1322,11 @@
margin-right: 5px;
}
+span.gtr {
+ visibility:hidden;
+ margin-right: 5px;
+}
+
ul#legend li {
float: left;
margin: 20px;
@@ -2015,6 +2020,7 @@
.icon-32-css { background-image: url(../images/toolbar/icon-32-css.png); }
.icon-32-menus { background-image: url(../images/toolbar/icon-32-menu.png); }
.icon-32-publish { background-image: url(../images/toolbar/icon-32-publish.png); }
+.icon-32-unblock { background-image: url(../images/toolbar/icon-32-unblock.png); }
.icon-32-unpublish { background-image: url(../images/toolbar/icon-32-unpublish.png); }
.icon-32-restore { background-image: url(../images/toolbar/icon-32-revert.png); }
.icon-32-trash { background-image: url(../images/toolbar/icon-32-trash.png); }
Modified: development/branches/jcamp/administrator/templates/bluestork/login.php
===================================================================
--- development/branches/jcamp/administrator/templates/bluestork/login.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/bluestork/login.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -40,8 +40,8 @@
<script type="text/javascript">
function setFocus() {
- document.login.username.select();
- document.login.username.focus();
+ document.getElementById('form-login').username.select();
+ document.getElementById('form-login').username.focus();
}
</script>
</head>
Modified: development/branches/jcamp/administrator/templates/hathor/css/template.css
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/css/template.css 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/css/template.css 2010-08-31 19:21:09 UTC (rev 18740)
@@ -1122,6 +1122,11 @@
margin-right: 5px;
}
+span.gtr {
+ visibility:hidden;
+ margin-right: 5px;
+}
+
/**
* Admintable Styles
*/
@@ -2418,6 +2423,10 @@
background-image: url(../images/toolbar/icon-32-publish.png);
}
+.icon-32-unblock {
+ background-image: url(../images/toolbar/icon-32-unblock.png);
+}
+
.icon-32-unpublish {
background-image: url(../images/toolbar/icon-32-unpublish.png);
}
Modified: development/branches/jcamp/administrator/templates/hathor/css/template_rtl.css
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/css/template_rtl.css 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/css/template_rtl.css 2010-08-31 19:21:09 UTC (rev 18740)
@@ -8,277 +8,535 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @since 1.6
*
- * Main CSS file for the template for RTL changes
+ * RTL CSS file for the template
*/
-/**
- * General styles
- */
body {
direction: rtl;
}
/**
- * Button styling
+ * CSS Reset
*/
-.button1 {
- background: url(../images/j_button1_right.png) 100% 0 no-repeat;
- margin-left: 5px;
- padding-right: 10px;
- white-space: nowrap;
- padding-left: 0px;
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+ background-position: transparent none repeat scroll top right;
}
-.button1 .next {
- background: url(../images/j_button1_prev.png) no-repeat;
+/* new styles */
+
+
+
+/* end new styles */
+
+/**
+ * Overall Styles
+ */
+#header {
+ background: #ffffff url(../images/j_logo.png) no-repeat top right;
}
-.button1 a {
- padding: 0 6px 0 30px;
+#header h1.title {
+ padding: 0 120px 0 0;
}
-.button1,.button1 div {
+#footer {
+ padding: 10px 20px;
+}
+
+#content {
+ margin: 5px 20px 20px 20px;
+}
+
+#element-box {
+ border-left: 1px solid #c7c8b2;
+ border-right: 1px solid #c7c8b2;
+}
+
+#element-box.cpanel {
+ padding: 15px;
+}
+
+/**
+ * Status layout
+ */
+#module-status {
+ left: 0;
+ right: none;
+}
+
+#module-status span {
float: left;
+ padding: 4px 22px 0 20px;
}
-.button2-left a,.button2-left span {
- padding: 0pt 6px 0pt 24px;
+#module-status { /* @TODO check the x position */
+ background: url(../images/mini_icon.png) 3px 5px no-repeat;
}
-.button2-left {
- background: transparent url(../images/j_button2_right.png) no-repeat
- scroll 100%;
- float: right;
+#module-status .preview {
+ background: url(../images/menu/icon-16-media.png) 3px 3px no-repeat;
}
-.button2-left .end {
- background: transparent url(../images/j_button2_first.png) no-repeat
- scroll 0% 0;
+#module-status .viewsite {
+ background: url(../images/menu/icon-16-viewsite.png) 3px 3px no-repeat;
}
-.button2-left.off .end {
- background: transparent url(../images/j_button2_first_off.png) no-repeat
- scroll 0% 0;
+#module-status .unread-messages,#module-status .no-unread-messages {
+ background: url(../images/menu/icon-16-messages.png) 3px 3px no-repeat;
}
-.button2-left .next {
- background: transparent url(../images/j_button2_prev.png) no-repeat
- scroll 0% 0;
+#module-status .loggedin-users {
+ background: url(../images/menu/icon-16-user.png) 3px 3px no-repeat;
}
-.button2-left.off .next {
- background: transparent url(../images/j_button2_prev_off.png) no-repeat
- scroll 0% 0;
+#module-status .logout {
+ background: url(../images/menu/icon-16-logout.png) 3px 3px no-repeat;
}
-.button2-left .page,.button2-left .blank {
- background: url(../images/j_button2_left_cap.png) 0 no-repeat;
+/**
+ * Various Styles
+ */
+
+div.checkin-tick { /* @TODO check the x position */
+ background: url(../images/admin/tick.png) 20px 50% no-repeat;
+ text-indent: -9999px;
}
-.button2-right a,.button2-right span {
- padding: 0pt 24px 0pt 6px;
+/**
+ * Overlib
+ */
+
+
+
+/**
+ * Subheader, toolbar, page title
+ */
+
+div.pagetitle {
+ padding: 0 0 5px 0px;
+ background-position: right 50%;
+ line-height: 54px;
}
-.button2-left .image {
- background: transparent url(../images/j_button2_image_rtl.png) no-repeat
- scroll 0% 0pt;
+.pagetitle h2 {
+ padding: 0 50px 0 0;
}
-.button2-left .pagebreak {
- background: transparent url(../images/j_button2_pagebreak_rtl.png)
- no-repeat scroll 0% 0pt;
+div.configuration {
+ padding-right: 30px;
+ margin-right: 10px;
}
-.button2-left .readmore {
- background: transparent url(../images/j_button2_readmore_rtl.png)
- no-repeat scroll 0% 0pt;
+div.toolbar-box {
+ border-left: 1px solid #c7c8b2;
+ border-right: 1px solid #c7c8b2;
}
-.button2-right {
- background: transparent url(../images/j_button2_left.png) no-repeat
- scroll 0% 0pt;
+div.toolbar-list {
float: right;
+ text-align: left;
}
-.button2-right .prev {
- background: transparent url(../images/j_button2_next.png) no-repeat
- scroll 100%;
+div.toolbar-list li {
+ padding: 5px 4px 5px 1px;
+ float: right;
}
-.button2-right.off .prev {
- background: transparent url(../images/j_button2_next_off.png) no-repeat
- scroll 100%;
+div.toolbar-list li.divider {
+ border-left:1px dotted #e3e4ca;
+ border-right:none;
+ margin-left: 10px;
+ margin-right: 0;
}
-.button2-right .start {
- background: transparent url(../images/j_button2_last.png) no-repeat
- scroll 100%;
+div.toolbar-list span {
+ margin: 0 auto;
}
-.button2-right.off .start {
- background: transparent url(../images/j_button2_last_off.png) no-repeat
- scroll 100%;
+div.toolbar-list a {
+ float: right;
+ padding: 1px 5px;
}
-.button2-left .page a,.button2-right .page a,
-.button2-left .page span,.button2-right .page span,
-.button2-left .blank a,.button2-right .blank a,
-.button2-left .blank span,.button2-right .blank span
- {
- float: right;
+div.toolbar-list a:hover {
+ border-right: 1px solid #e3e4ca;
+ border-left: 1px solid #c7c8b2;
}
+/**
+ * Massmail component
+ */
+
/**
- * Overall Styles
+ * Pane Slider Jpane Toggler styles
*/
-#header .version {
- float: left;
- padding: 25px 0 0 5px;
+div.pane-sliders {
+ margin-left: 10px;
}
-#header .title {
- padding-right: 180px;
- padding-left: 0px;
- float: right;
+.jpane-toggler span { /* @TODO check the x position */
+ background: transparent url(../images/j_arrow_left.png) 5px 50% no-repeat;
+ padding-right: 20px;
}
+.jpane-toggler-down span { /* @TODO check the x position */
+ background: transparent url(../images/j_arrow_down.png) 5px 50%
+ no-repeat;
+ padding-right: 20px;
+}
+
/**
- * Status layout
+ * Tabs
*/
-#module-status {
- float: left;
- background-position: right 5px;
+dl.tabs {
+ float: right;
+ margin: 10px 0 -1px 0;
}
-#module-status span {
- padding: 4px 22px 0pt 10px;
+dl.tabs dt {
+ float: right;
+ padding: 4px 10px;
+ margin-right: 3px;
}
-#module-status .legacy-mode {
- background-position: right 5px;
+div.current {
+ padding: 10px 10px;
}
-#module-status .preview {
- background-position: right 3px;
+/* New parameter styles (check rtl) */
+
+dl#content-pane.tabs {
+ margin: 1px 0 0 0;
}
-#module-status .unread-messages,#module-status .no-unread-messages {
- background-position: right 3px;
+div.current label, div.current span.faux-label {
+ float:right;
+ clear:right;
}
-#module-status .loggedin-users {
- background-position: right 3px;
+div.current fieldset.radio {
+ float:right;
}
-#module-status .logout {
- background-position: right 3px;
+div.current fieldset.radio input {
+ float:right;
+ margin: 3px 2px 0 0;
}
-/**
- * Form Styles
- */
-fieldset#filter-bar {
- border: 0;
- padding: 0;
- margin: 0 0 10px;
+div.current fieldset.radio label {
+ float:right;
+ margin: 3px 2px 0 0;
}
-fieldset {
+div.current input,
+div.current span.faux-input,
+div.current textarea,
+div.current select {
+ float:right;
+ margin: 3px 2px 0 0;
+}
+
+div.current table#acl-config th.acl-groups {
text-align: right;
}
-fieldset#filter-bar .filter-search {
- float: left;
+div#menu-assignment {
+ clear:right;
}
-fieldset#filter-bar .filter-select {
+div#menu-assignment h3 {
+ clear:right;
+}
+
+div#menu-assignment ul.menu-links li.menu-link label {
float: right;
+ margin: 3px 2px 0 0;
}
+div#menu-assignment ul.menu-links li.menu-link input {
+ clear: right;
+ float: right;
+}
+p.tab-description {
+ margin-right: 0;
+}
+/* end new parameter styles */
+
/**
- * Standard Layout Styles
+ * Login Settings
*/
-div.left {
+#login-page form .inputbox {
+ margin-right: 5px;
+}
+#login-page input, #login-page select {
+ float: left;
+}
+
+#login-page .login {
+ margin: 0 auto;
+}
+
+#login-page .pagetitle h2 {
+ margin: -70px 0 30px 0;
+}
+
+#login-page .login-inst {
float: right;
}
-div.right {
+#login-page .login-box {
float: left;
}
-div.col {
+#login-page .button {
+ text-align: left;
+}
+
+#login-page .login-text {
+ text-align: right;
float: right;
}
-/**
- * Login Page styles
- */
+#form-login {
+ float: left;
+}
+
#form-login label {
float: right;
+ clear: right;
text-align: left;
}
-#form-login div.button_holder {
- padding-left: 0px;
+#form-login div.button1 div.next {
+ float: right;
}
-#login-page form {
- margin-left: 0px;
- margin-right: 10px;
+#form-login div.button1 a {
+ padding: 0 15px 0 15px;
+ /* padding: 0 6px 0 30px; use this if you use images */
}
/**
- * Cpanel styles
+ * Cpanel Settings
*/
#cpanel div.icon {
- margin-right: 0px;
margin-left: 5px;
+ float: right;
}
+#cpanel div.icon a {
+ float: right;
+}
+
+#cpanel div.icon a:hover,
+#cpanel div.icon a:focus {
+ border-right: 1px solid #e3e4ca;
+ border-left: 1px solid #c7c8b2;
+}
+
+#cpanel img {
+ padding: 10px 0;
+ margin: 0 auto;
+}
+
+div.cpanel-icons {
+ float: right;
+}
+
+div.cpanel-component {
+ float: left;
+}
+
/**
- * Pane Slider Jpane Toggler styles
+ * Standard Layout Styles
*/
-.jpane-toggler span,.jpane-toggler-down span {
- background-position: right;
- padding-right: 20px;
- padding-left: 0px;
+
+
+div.col {
+ float: right;
}
-.jpane-toggler span {
- background-image: url(../images/j_arrow_left.png);
+div.col1 {
+ float: right;
}
+div.col2 {
+ float: left;
+}
+
+ /* Avoid using the width divs. They are here for 3PD Extensions if needed
+ * Use the specific layout divs listed after. See also the th.width entries */
+
+
+.clrlft { clear: right; }
+.clrrt { clear: left; }
+.fltlft { float: right; }
+.fltrt { float: left; }
+.fltnone { float: none; }
+
+
+ /* Layout Divs */
+div.main-section {
+ width: 60%;
+}
+
+div.options-section {
+ width: 40%;
+}
+
/**
- * Subheader, toolbar, page title
+ * Form Styles
*/
-div.toolbar-list {
+
+fieldset {
+ margin: 2px 10px 2px 10px;
+ text-align: right;
+}
+
+fieldset p {
+ margin: 10px 0px;
+}
+
+/* new form fields (check rtl) */
+
+fieldset.adminform fieldset.radio,
+fieldset.panelform fieldset.radio,
+fieldset.adminform-legacy fieldset.radio {
+ float:right;
+ margin: 0 0 5px 0;
+ clear:left;
+}
+fieldset.adminform fieldset.radio label,
+fieldset.panelform fieldset.radio label,
+fieldset.adminform fieldset.radio span.faux-label,
+fieldset.panelform fieldset.radio span.faux-label {
+ float:right;
+}
+
+fieldset.panelform-legacy label,
+fieldset.adminform-legacy label,
+fieldset.panelform-legacy span.faux-label,
+fieldset.adminform-legacy span.faux-label {
+ float:right;
+
+}
+/* JParameter classes on radio button labels */
+
+p.jform_desc {
+ clear:right;
+}
+
+fieldset ul.checklist {
+ margin-right: 27px;
+ margin-left: 0px;
+}
+
+/* end new form fields */
+
+fieldset#filter-bar {
+ border-left: none;
+ border-right: none;
+ margin: 0;
+ padding: 5px 10px 5px 10px;
+}
+
+fieldset#filter-bar ol, fieldset#filter-bar ul {
+ padding: 5px 0 0;
+}
+
+fieldset#filter-bar ol li, fieldset#filter-bar ul li {
+ float: right;
+ padding: 0 0 0 5px;
+}
+
+fieldset#filter-bar .filter-search {
+ float: right;
+}
+
+fieldset#filter-bar .filter-select {
float: left;
- padding: 0pt;
- text-align: left;
}
-div.pagetitle {
+
+ /* Note: these visual cues should be augmented by aria */
+
+ /* must be augmented by aria at the same time if changed dynamically by js
+ aria-invalid=true or aria-invalid=false */
+
+
+ /* augmented by aria in template javascript */
+
+span.readonly {
+ float: right;
+}
+
+div.extdescript {
margin-right: 10px;
- margin-left: 0px;
- padding-right: 55px;
- padding-left: 0px;
}
-.pagetitle {
- background-position: right;
+input[type="button"] {
+ padding: 1px 6px;
}
+label.selectlabel {
+/* position: absolute;
+ left: 0;
+ right: -1000em;*/
+}
+
/**
- * Adminform Styles
+ * Option or Parameter styles
*/
-table.adminlist tbody tr {
+
+
+/* end from alpha2 */
+
+span.gi {
+ margin-left: 5px;
+}
+
+/**
+ * Admintable Styles
+ */
+
+table.admintable td.key,table.admintable td.paramlist_key {
+ text-align: left;
+ border-left: 1px solid #e9e9e9;
+ border-right: none;
+}
+
+table.paramlist td.paramlist_description {
text-align: right;
+ border-left: 1px solid #e9e9e9;
+ border-right: none;
}
+/**
+ * Admin Form Styles
+ */
+fieldset.adminform {
+ margin: 0 10px 10px 10px;
+}
+
+ /* Table styles are for use with tabular data */
+table.adminform {
+ margin: 8px 0 10px 0;
+}
+
+
table.adminform th {
+ padding: 6px 4px 4px 2px;
text-align: right;
- padding: 6px 4px 4px 2px;
}
table.adminform td {
@@ -293,42 +551,593 @@
text-align: left;
}
+table.adminform tr {
+ padding-right: 10px;
+ padding-left: 10px;
+ border-left: 1px solid #c7c8b2;
+ border-right: none;
+}
+
/**
- * Adminlist Table Styles
+ * Table formating styles
*/
+
+ /* Avoid using the width classes. They are here for 3PD Extensions if needed
+ * Use the specific layout table headers listed after. See also the div.width entries */
+
+ /* Table header layout classes */
+
+th.ordering-col a {
+ float:right;
+ margin-right: 3px;
+}
+
+th.ordering-col a img {
+ margin-right: 4px;
+ margin-left: 4px;
+}
+
+/**
+ * Adminlist Table layout
+ */
+
+table.adminlist.modal {
+ border-right: 1px solid #c7c8b2;
+ border-left: 1px solid #c7c8b2;
+}
+
+
+ /* Table row styles */
+table.adminlist tr {
+ padding-left: 30px;
+ padding-right: 30px;
+}
+
+table.adminlist tbody tr {
+ text-align: right;
+}
+
+table.adminlist tbody tr td,
+table.adminlist tbody tr th {
+ border-left: 1px solid #c7c8b2;
+ border-right: none;
+}
+
+table.adminlist tbody tr td:last-child {
+ border-left: none;
+}
+
+ /* Table td/th styles */
+table.adminlist td.order span {
+ float: right;
+}
+
+/**
+ * Tree indentation & nesting - Up to 10 levels deep so don't go crazy :
+ */
+table.adminlist td.indent-4 { padding-right:4px; }
+table.adminlist td.indent-19 { padding-right:19px; }
+table.adminlist td.indent-34 { padding-right:34px; }
+table.adminlist td.indent-49 { padding-right:49px; }
+table.adminlist td.indent-64 { padding-right:64px; }
+table.adminlist td.indent-79 { padding-right:79px; }
+table.adminlist td.indent-94 { padding-right:94px; }
+table.adminlist td.indent-109 { padding-right:109px; }
+table.adminlist td.indent-124 { padding-right:124px; }
+table.adminlist td.indent-139 { padding-right:139px; }
+
+/**
+ * Adminlist buttons
+ */
+table.adminlist tr td.btns a {
+ padding: 3px 20px;
+}
+
+/**
+ * Modal Modules styles
+ */
+ul#new-modules-list {
+ margin-right: 50px;
+ margin-left: 0;
+}
+
+/**
+ * Utility styles
+ */
+ /* General Clearing Class */
+.menu-module-list {
+ padding-right: 10px;
+ margin-right: 5px;
+}
+
+ /* stu nicholls solution for centering divs */
+
+ /* table solution for global config */
+
+table.noshow fieldset {
+ margin: 15px 7px 7px 7px;
+}
+
+/**
+ * Saving order icon styling in admin tables
+ */
+a.saveorder {
+ background: url(../images/admin/filesave.png) no-repeat;
+ float:left;
+ margin-left: 8px;
+}
+
+a.saveorder.inactive { /* @TODO check the x position */
+ background-position: 0px -16px;
+}
+
+/**
+ * Button styling
+ */
+#editor-xtd-buttons {
+ padding: 5px;
+}
+
+/* Button 1 Type */
+.button1,.button1 div {
+ float: left;
+}
+
+ /* Use this if you add images to the buttons such as directional arrows */
+
+.button1 a {
+ float: right;
+ padding: 0 6px 0 6px;
+ /* add padding if you are using the directional images */
+ /* padding: 0 6px 0 30px; */
+}
+
+ /* Button 2 Type */
+.button2-left,.button2-right {
+ float: right;
+}
+
+.button2-left a,.button2-right a,.button2-left span,.button2-right span
+ {
+ float: right;
+}
+
+ /* these are inactive buttons */
+
+.button2-left .page a,.button2-right .page a,
+.button2-left .page span,.button2-right .page span,
+.button2-left .blank a,.button2-right .blank a,
+.button2-left .blank span,.button2-right .blank span
+ {
+ padding: 0 6px;
+}
+
+.button2-left a,.button2-left span {
+ padding: 0 6px 0 24px;
+}
+
+.button2-right a,.button2-right span {
+ padding: 0 24px 0 6px;
+}
+
+.button2-left {
+ float: right;
+ margin-right: 5px;
+}
+
+.button2-right {
+ float: right;
+ margin-right: 5px;
+}
+
+.button2-right .prev {
+ background-image: url(../images/j_button2_prev.png);
+ background-position: right center;
+}
+
+.button2-right.off .prev {
+ background: url(../images/j_button2_prev_off.png) no-repeat;
+}
+
+.button2-right .start {
+ background-image: url(../images/j_button2_first.png);
+ background-position: right center;
+}
+
+.button2-left .next {
+ background-image: url(../images/j_button2_next.png);
+ background-position: left center;
+}
+
+.button2-left.off .next { /* @TODO check the x position */
+ background: url(../images/j_button2_next_off.png) 100% 0 no-repeat;
+}
+
+.button2-left .end {
+ background-image: url(../images/j_arrow_left.png);
+ background-position: left center;
+}
+
+.button2-left.off .end { /* @TODO check the x position */
+ background: url(../images/j_button2_last_off.png) 100% 0 no-repeat;
+}
+
+.button2-left .image {
+ background: url(../images/j_button2_image.png) 100% 0 no-repeat;
+}
+
+.button2-left .readmore {
+ background: url(../images/j_button2_readmore.png) 100% 0 no-repeat;
+}
+
+.button2-left .pagebreak {
+ background: url(../images/j_button2_pagebreak.png) 100% 0 no-repeat;
+}
+
+
+/**
+ * Pagination styles
+ */
+
+ /* Normal pagination styles */
+div.containerpg {
+ position: relative;
+ right: 50%;
+ float: right;
+ clear: right;
+}
+
+div.pagination {
+ right: -50%;
+ margin: 0 auto;
+}
+
+.pagination div.limit {
+ float: right;
+ margin: 0 10px;
+}
+
+ /* The Go submittal button */
+.pagination button {
+ margin-left: 20px;
+}
+
+ /* Style if pagination is part of the table (old style) */
table.adminlist .pagination {
- display: -moz-box;
+ margin: 0 auto;
}
+table.adminlist .pagination button {
+ margin-left: 20px;
+}
+
/**
- * Pagination
+ * Pagination styles
*/
+
+ /* Normal pagination styles */
+div.containerpg {
+ right: 50%;
+ float: right;
+ clear: right;
+}
+
+div.pagination {
+ right: -50%;
+ margin: 0 auto;
+}
+
.pagination div.limit {
float: right;
- margin: 0 0 0 10px;
+ margin: 0 10px;
}
+ /* The Go submittal button */
+.pagination button {
+ margin-left: 20px;
+}
+
+
+ /* Grey out the current page number */
+
+
+ /* Style if pagination is part of the table (old style) */
+
+table.adminlist .pagination button {
+ margin-left: 20px;
+}
+
/**
- * System Messages
+ * MCE Editor
*/
-#system-message dd.message ul {
- background-position: 99% center;
+div.toggle-editor {
+ margin-top: -15px;
}
-#system-message dd {
- text-indent: 35px;
+/**
+ * Tooltips
+ */
+.tip {
+ float: right;
}
+.tip-title { /* @TODO is there a different image */
+ background: url(../images/selector-arrow-rtl.png) no-repeat right top;
+}
+
+
/**
- * Debug
+ * Calendar
*/
-#system-debug ol,#system-debug ul {
- direction: ltr;
+a img.calendar {
+ margin-right: 3px;
}
/**
+ * System Standard Messages
+ */
+#system-message dd.message ul { /* @TODO check the x position */
+ background: #C3D2E5 url(../images/notice-info.png) 99.5% center no-repeat;
+}
+
+/**
+ * System Error Messages
+ */
+#system-message dd.error ul {
+ background: #E6C0C0 url(../images/notice-alert.png) 99.5% top no-repeat;
+}
+
+/**
+ * System Notice Messages
+ */
+#system-message dd.notice ul {
+ background: #EFE7B8 url(../images/notice-note.png) 99%.5 top no-repeat;
+}
+
+/**
+ * JGrid styles
+ */
+
+/**
+ * Menu Icons
+ * These icons are used on the Administrator menu
+ * The classes are constructed dynamically when the menu is generated
+ */
+
+
+/**
+ * Toolbar icons
+ * These icons are used for the toolbar buttons
+ * The classes are constructed dynamically when the toolbar is created
+ */
+
+/**
+ * Quick Icons
+ * Also knows as Header Icons
+ * These are used for the Quick Icons on the Control Panel
+ * The same classes are also assigned the Component Title
+ */
+
+/**
+ * General styles
+ */
+
+.helpFrame {
+ border-right: 0px solid #222;
+ border-left: none;
+ border-top: none;
+ padding: 0px 10px 0px 5px;
+}
+
+#treecellhelp {
+ float: right;
+}
+
+#datacellhelp {
+ float: right;
+ padding: 2px 0px 0px 0px;
+}
+
+/* -- MODAL STYLES ----------- */
+
+h2.modal-title {
+ margin-right: 15px;
+}
+
+ul.menu_types {
+ padding: 0 15px 0 0;
+}
+ul.menu_types li,
+dl.menu_type dd ul li {
+ float:right;
+ margin-left: 10px;
+}
+
+dl.menu_type dt {
+ float:right;
+ margin: 13px 0 5px 0;
+}
+dl.menu_type dd {
+ clear:right;
+}
+
+/**
+ * User Accessibility
+ */
+
+ /* Skip to Content Structural Styling */
+#skiplinkholder a,#skiplinkholder a:link,#skiplinkholder a:visited {
+ right: -200%;
+}
+
+#skiplinkholder a:focus, #skiplinkholder a:active {
+ right: 0;
+ top: 0;
+}
+
+#skiplinkholder p {
+ margin: 0px;
+}
+
+#skiptargetholder {
+ right: -200%;
+}
+
+ /* Skip to Content Visual Styling */
+#skiplinkholder a, #skiplinkholder a:link, #skiplinkholder a:visited {
+ padding-left: 20px;
+ padding-right: 20px;
+}
+
+ /* For elements that aren't to be seen by users unless the user does something
+ * like clicking on a header to see the collapsed section. */
+
+ /* For elements that aren't to be seen by visual users but do need to be read by screenreaders.
+ * Cannot be used for elements that can get focus such as links and form elements */
+
+ /* Firefox has issues styling legend so this is a universal fix
+ for making the legend invisible (i.e. visually it's not there, but screen readers see it */
+
+legend.element-invisible {
+ /*margin: 0;
+ margin-right: -10000px; */
+}
+
+fieldset.adminform label,
+fieldset.panelform label,
+fieldset.adminform span.faux-label,
+fieldset.panelform span.faux-label {
+ clear:right;
+ float:right;
+ margin-right: 10px;
+}
+
+fieldset.adminform fieldset.radio label,
+fieldset.panelform fieldset.radio label,
+fieldset.adminform fieldset.radio span.faux-label,
+fieldset.panelform fieldset.radio span.faux-label {
+ margin-right: 0;
+}
+
+
+fieldset.adminform input, fieldset.adminform span.faux-input, fieldset.adminform textarea, fieldset.adminform select, fieldset.adminform img,
+fieldset.panelform input, fieldset.panelform span.faux-input, fieldset.panelform textarea, fieldset.panelform select, fieldset.panelform img {
+ float:right;
+ margin:5px 0 5px 5px;
+}
+
+fieldset.batch label {
+ float:right;
+ margin-left: 10px;
+ margin-right: 0;
+}
+
+fieldset.batch input, fieldset.batch textarea, fieldset.batch select, fieldset.batch img {
+ float:right;
+ margin:5px 0 5px 25px;
+}
+
+fieldset.batch input[type="radio"] {
+ margin-left: 5px;
+}
+
+/* Banner edit */
+
+
+/* -- ACL STYLES relocated from com_users/media/grid.css ----------- */
+
+/* -- ACL PANEL STYLES ----------- */
+
+
+/* All Tabs */
+
+td.col1 {
+ text-align:right;
+}
+
+
+table.aclsummary-table td.col2,
+table.aclsummary-table th.col2,
+table.aclsummary-table td.col3,
+table.aclsummary-table th.col3,
+table.aclsummary-table td.col4,
+table.aclsummary-table th.col4,
+table.aclsummary-table td.col5,
+table.aclsummary-table th.col5,
+table.aclmodify-table td.col2,
+table.aclmodify-table th.col2 {
+ border-right: 1px solid #cbcbcb;
+ border-left: none;
+}
+
+/* Icons */
+label.icon-16-allow,
+label.icon-16-deny,
+a.icon-16-allow,
+a.icon-16-deny,
+a.icon-16-allowinactive,
+a.icon-16-denyinactive {
+ margin: 0 auto;
+}
+label.icon-16-allow {
+ right: 40%;
+}
+label.icon-16-deny {
+ right: 40%;
+}
+
+ul.acllegend li {
+ float: right;
+ padding-left: 20px;
+ margin: 15px 10px 15px 0;
+}
+ul.acllegend li.acl-allowed {
+ padding-right: 20px;
+ padding-left: 10px;
+ background:url(../images/admin/icon-16-allow.png) no-repeat right;
+}
+ul.acllegend li.acl-denied {
+ padding-right: 20px;
+ padding-left: 20px;
+ background:url(../images/admin/icon-16-deny.png) no-repeat right;
+}
+ul.acllegend li.acl-editgroups {
+ padding-left: 10px;
+}
+ul.acllegend li.acl-resetbtn {
+ padding-left: 0px;
+}
+
+li.acl-editgroups,
+li.acl-resetbtn {
+ float:right;
+}
+
+table#acl-config th.acl-groups {
+ padding-right: 8px;
+ border-left: 1px solid #c7c8b2;
+}
+
+table#acl-config th.acl-groups {
+ text-align: right;
+}
+
+.acl-action {
+ margin: auto 0;
+}
+
+/**
* Mod_rewrite Warning
*/
#jform_sef_rewrite-lbl {
background: url(../images/admin/icon-16-notice-note.png) left top no-repeat;
-}
\ No newline at end of file
+}
+
+/**
+* Modal S-Box overrides
+*/
+
+#sbox-window {
+ text-align:right;
+}
+
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_banners/banners/default.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_banners/banners/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_banners/banners/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -32,7 +32,15 @@
</div>
<div class="filter-select">
- <label class="selectlabel" for="filter_state">
+ <label class="selectlabel" for="filter_client_id">
+ <?php echo JText::_('COM_BANNERS_SELECT_CLIENT'); ?>
+ </label>
+ <select name="filter_client_id" id="filter_client_id" class="inputbox">
+ <option value=""><?php echo JText::_('COM_BANNERS_SELECT_CLIENT');?></option>
+ <?php echo JHtml::_('select.options', JFormFieldBannerClient::getOptions(), 'value', 'text', $this->state->get('filter.client_id'));?>
+ </select>
+
+ <label class="selectlabel" for="filter_state">
<?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?>
</label>
<select name="filter_state" id="filter_state" class="inputbox">
@@ -48,13 +56,7 @@
<?php echo JHtml::_('select.options', JHtml::_('category.options', 'com_banners'), 'value', 'text', $this->state->get('filter.category_id'));?>
</select>
- <label class="selectlabel" for="filter_client_id">
- <?php echo JText::_('COM_BANNERS_SELECT_CLIENT'); ?>
- </label>
- <select name="filter_client_id" id="filter_client_id" class="inputbox">
- <option value=""><?php echo JText::_('COM_BANNERS_SELECT_CLIENT');?></option>
- <?php echo JHtml::_('select.options', JFormFieldBannerClient::getOptions(), 'value', 'text', $this->state->get('filter.client_id'));?>
- </select>
+
<label class="selectlabel" for="filter_language">
<?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?>
@@ -136,7 +138,7 @@
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'banners.', $canCheckin); ?>
<?php endif; ?>
- <?php if ($canCreate || $canEdit) : ?>
+ <?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_banners&task=banner.edit&id='.(int) $item->id); ?>">
<?php echo $this->escape($item->name); ?></a>
<?php else : ?>
@@ -157,8 +159,13 @@
<td class="order">
<?php if ($canChange) : ?>
<?php if ($saveOrder) :?>
- <span><?php echo $this->pagination->orderUpIcon($i, (@$this->items[$i-1]->catid == $item->catid), 'banners.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
- <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, (@$this->items[$i+1]->catid == $item->catid), 'banners.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php if ($listDirn == 'asc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, (@$this->items[$i-1]->catid == $item->catid), 'banners.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, (@$this->items[$i+1]->catid == $item->catid), 'banners.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php elseif ($listDirn == 'desc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, (@$this->items[$i-1]->catid == $item->catid), 'banners.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, (@$this->items[$i+1]->catid == $item->catid), 'banners.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php endif; ?>
<?php endif; ?>
<?php $disabled = $saveOrder ? '' : 'disabled="disabled"'; ?>
<input type="text" name="order[]" value="<?php echo $item->ordering;?>" <?php echo $disabled ?> class="text-area-order" title="<?php echo $item->name; ?> order" />
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_banners/clients/default.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_banners/clients/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_banners/clients/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -93,7 +93,7 @@
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'clients.', $canCheckin); ?>
<?php endif; ?>
- <?php if ($canCreate || $canEdit) : ?>
+ <?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_banners&task=client.edit&id='.(int) $item->id); ?>">
<?php echo $this->escape($item->name); ?></a>
<?php else : ?>
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_banners/tracks/default.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_banners/tracks/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_banners/tracks/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -32,13 +32,15 @@
</div>
<div class="filter-select">
- <label class="selectlabel" for="filter_type">
- <?php echo JText::_('BANNERS_SELECT_TYPE'); ?>
+
+ <label class="selectlabel" for="filter_client_id">
+ <?php echo JText::_('COM_BANNERS_SELECT_CLIENT'); ?>
</label>
- <select name="filter_type" id="filter_type" class="inputbox">
- <?php echo JHtml::_('select.options', array(JHtml::_('select.option', '0', JText::_('COM_BANNERS_SELECT_TYPE')), JHtml::_('select.option', 1, JText::_('COM_BANNERS_IMPRESSION')), JHtml::_('select.option', 2, JText::_('COM_BANNERS_CLICK'))), 'value', 'text', $this->state->get('filter.type'));?>
- </select>
-
+ <select name="filter_client_id" id="filter_client_id" class="inputbox">
+ <option value=""><?php echo JText::_('COM_BANNERS_SELECT_CLIENT');?></option>
+ <?php echo JHtml::_('select.options', JFormFieldBannerClient::getOptions(), 'value', 'text', $this->state->get('filter.client_id'));?>
+ </select>
+
<label class="selectlabel" for="filter_category_id">
<?php echo JText::_('JOPTION_SELECT_CATEGORY'); ?>
</label>
@@ -47,14 +49,14 @@
<option value=""><?php echo JText::_('JOPTION_SELECT_CATEGORY');?></option>
<?php echo JHtml::_('select.options', JHtml::_('category.options', 'com_banners'), 'value', 'text', $category);?>
</select>
-
- <label class="selectlabel" for="filter_client_id">
- <?php echo JText::_('COM_BANNERS_SELECT_CLIENT'); ?>
+
+ <label class="selectlabel" for="filter_type">
+ <?php echo JText::_('BANNERS_SELECT_TYPE'); ?>
</label>
- <select name="filter_client_id" id="filter_client_id" class="inputbox">
- <option value=""><?php echo JText::_('COM_BANNERS_SELECT_CLIENT');?></option>
- <?php echo JHtml::_('select.options', JFormFieldBannerClient::getOptions(), 'value', 'text', $this->state->get('filter.client_id'));?>
+ <select name="filter_type" id="filter_type" class="inputbox">
+ <?php echo JHtml::_('select.options', array(JHtml::_('select.option', '0', JText::_('COM_BANNERS_SELECT_TYPE')), JHtml::_('select.option', 1, JText::_( 'COM_BANNERS_IMPRESSION')), JHtml::_('select.option', 2, JText::_('COM_BANNERS_CLICK'))), 'value', 'text', $this->state->get('filter.type'));?>
</select>
+
<button type="button" id="filter-go" onclick="this.form.submit();">
<?php echo JText::_('JSUBMIT'); ?></button>
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_categories/categories/default.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_categories/categories/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_categories/categories/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -21,12 +21,13 @@
$listOrder = $this->state->get('list.ordering');
$listDirn = $this->state->get('list.direction');
$ordering = ($listOrder == 'a.lft');
-$canOrder = $user->authorise('core.edit.state', 'com_categories');
+$canOrder = $user->authorise('core.edit.state');
+$canEdit = $user->authorise('core.edit');
$saveOrder = ($listOrder == 'a.lft' && $listDirn == 'asc');
$n = count($this->items);
?>
<div class="categories">
-<form action="<?php echo JRoute::_('index.php?option=com_categories&view=categories');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_categories&view=categories');?>" method="post" name="adminForm" id="adminForm">
<fieldset id="filter-bar">
<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
@@ -100,20 +101,26 @@
$originalOrders = array();
foreach ($this->items as $i => $item) :
$orderkey = array_search($item->id, $this->ordering[$item->parent_id]);
- $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out==$user->get('id') || $item->checked_out==0;
+ $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out==$user->get('id');
$canChange = $canCheckin;
- ?>
+ ?>
<tr class="row<?php echo $i % 2; ?>">
<th class="center">
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
</th>
- <td class="indent-<?php echo intval(($item->level-1)*15)+4; ?>">
+ <td>
+ <?php echo str_repeat('<span class="gi">|—</span>', $item->level-1) ?>
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'categories.', $canCheckin); ?>
<?php endif; ?>
- <a href="<?php echo JRoute::_('index.php?option=com_categories&task=category.edit&cid[]='.$item->id.'&extension='.$extension);?>">
- <?php echo $this->escape($item->title); ?></a>
+ <?php if ($canEdit) : ?>
+ <a href="<?php echo JRoute::_('index.php?option=com_categories&task=category.edit&cid[]='.$item->id.'&extension='.$extension);?>">
+ <?php echo $this->escape($item->title); ?></a>
+ <?php else : ?>
+ <?php echo $this->escape($item->title); ?>
+ <?php endif; ?>
<p class="smallsub" title="<?php echo $this->escape($item->path);?>">
+ <?php echo str_repeat('<span class="gtr">|—</span>', $item->level-1) ?>
<?php if (empty($item->note)) : ?>
<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias));?>
<?php else : ?>
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_contact/contacts/default.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_contact/contacts/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_contact/contacts/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -32,13 +32,7 @@
<button type="button" onclick="document.id('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
</div>
<div class="filter-select">
- <label class="selectlabel" for="filter_access">
- <?php echo JText::_('JOPTION_SELECT_ACCESS'); ?>
- </label>
- <select name="filter_access" id="filter_access" class="inputbox">
- <option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
- <?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
- </select>
+
<label class="selectlabel" for="filter_published">
<?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?>
</label>
@@ -53,9 +47,16 @@
<option value=""><?php echo JText::_('JOPTION_SELECT_CATEGORY');?></option>
<?php echo JHtml::_('select.options', JHtml::_('category.options', 'com_contact'), 'value', 'text', $this->state->get('filter.category_id'));?>
</select>
+ <label class="selectlabel" for="filter_access">
+ <?php echo JText::_('JOPTION_SELECT_ACCESS'); ?>
+ </label>
+ <select name="filter_access" id="filter_access" class="inputbox">
+ <option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
+ <?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
+ </select>
<label class="selectlabel" for="filter_language">
<?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?>
- </label>
+ </label>
<select name="filter_language" id="filter_language" class="inputbox">
<option value=""><?php echo JText::_('JOPTION_SELECT_LANGUAGE');?></option>
<?php echo JHtml::_('select.options', JHtml::_('contentlanguage.existing', true, true), 'value', 'text', $this->state->get('filter.language'));?>
@@ -72,7 +73,7 @@
<thead>
<tr>
<th class="checkmark-col">
- <input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('TPL_HATHOR_CHECKMARK_ALL'); ?>" onclick="checkAll(<?php echo count($this->items); ?>);" />
+ <input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('TPL_HATHOR_CHECKMARK_ALL'); ?>" onclick="checkAll(this)" />
</th>
<th class="title">
<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.name', $listDirn, $listOrder); ?>
@@ -121,7 +122,7 @@
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'contacts.', $canCheckin); ?>
<?php endif; ?>
- <?php if ($canCreate || $canEdit) : ?>
+ <?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_contact&task=contact.edit&id='.(int) $item->id); ?>">
<?php echo $this->escape($item->name); ?></a>
<?php else : ?>
@@ -136,8 +137,13 @@
<td class="order">
<?php if ($canChange) : ?>
<?php if ($saveOrder) :?>
- <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid),'contacts.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
- <span><?php echo $this->pagination->orderDownIcon($i, $n, ($item->catid == @$this->items[$i+1]->catid), 'contacts.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php if ($listDirn == 'asc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid),'contacts.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $n, ($item->catid == @$this->items[$i+1]->catid), 'contacts.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php elseif ($listDirn == 'desc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid),'contacts.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $n, ($item->catid == @$this->items[$i+1]->catid), 'contacts.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php endif; ?>
<?php endif; ?>
<?php $disabled = $saveOrder ? '' : 'disabled="disabled"'; ?>
<input type="text" name="order[]" value="<?php echo $item->ordering;?>" <?php echo $disabled ?> class="text-area-order" title="<?php echo $item->name; ?> order" />
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_contact/contacts/modal.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_contact/contacts/modal.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_contact/contacts/modal.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -20,7 +20,7 @@
?>
-<form action="<?php echo JRoute::_('index.php?option=com_contact&view=contacts&layout=modal&tmpl=component');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_contact&view=contacts&layout=modal&tmpl=component');?>" method="post" name="adminForm" id="adminForm">
<fieldset id="filter-bar">
<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
<div class="filter-search">
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_content/article/edit.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_content/article/edit.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_content/article/edit.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -145,6 +145,7 @@
<?php echo JHtml::_('sliders.end'); ?>
<input type="hidden" name="task" value="" />
+ <input type="hidden" name="return" value="<?php echo JRequest::getCmd('return');?>" />
<?php echo JHtml::_('form.token'); ?>
</div>
</form>
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_content/articles/default.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_content/articles/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_content/articles/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -21,7 +21,7 @@
$saveOrder = $listOrder == 'a.ordering';
$n = count($this->items);
?>
-<form action="<?php echo JRoute::_('index.php?option=com_content&view=articles');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_content&view=articles');?>" method="post" name="adminForm" id="adminForm">
<fieldset id="filter-bar">
<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
<div class="filter-search">
@@ -76,7 +76,7 @@
<?php echo JHtml::_('grid.sort', 'JPUBLISHED', 'a.state', $listDirn, $listOrder); ?>
</th>
<th class="nowrap featured-col">
- <?php echo JHtml::_('grid.sort', 'COM_CONTENT_HEADING_FEATURED', 'a.featured', $listDirn, $listOrder); ?>
+ <?php echo JHtml::_('grid.sort', 'JFEATURED', 'a.featured', $listDirn, $listOrder); ?>
</th>
<th class="title category-col">
<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_CATEGORY', 'category_title', $listDirn, $listOrder); ?>
@@ -125,7 +125,7 @@
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'articles.', $canCheckin); ?>
<?php endif; ?>
- <?php if ($canCreate || $canEdit) : ?>
+ <?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_content&task=article.edit&id='.$item->id);?>">
<?php echo $this->escape($item->title); ?></a>
<?php else : ?>
@@ -146,8 +146,13 @@
<td class="order">
<?php if ($canChange) : ?>
<?php if ($saveOrder) :?>
- <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid), 'articles.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
- <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, ($item->catid == @$this->items[$i+1]->catid), 'articles.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php if ($listDirn == 'asc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid), 'articles.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, ($item->catid == @$this->items[$i+1]->catid), 'articles.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php elseif ($listDirn == 'desc') :?>
+ <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid), 'articles.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, ($item->catid == @$this->items[$i+1]->catid), 'articles.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php endif; ?>
<?php endif; ?>
<?php $disabled = $saveOrder ? '' : 'disabled="disabled"'; ?>
<input type="text" name="order[]" value="<?php echo $item->ordering;?>" <?php echo $disabled ?> class="text-area-order" title="<?php echo $item->title; ?> order" />
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_content/articles/modal.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_content/articles/modal.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_content/articles/modal.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -20,7 +20,7 @@
?>
-<form action="<?php echo JRoute::_('index.php?option=com_content&view=articles&layout=modal&tmpl=component');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_content&view=articles&layout=modal&tmpl=component');?>" method="post" name="adminForm" id="adminForm">
<fieldset id="filter-bar">
<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
<div class="filter-search">
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_content/featured/default.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_content/featured/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_content/featured/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -22,7 +22,7 @@
$saveOrder = $listOrder == 'fp.ordering';
$n = count($this->items);
?>
-<form action="<?php echo JRoute::_('index.php?option=com_content&view=featured');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_content&view=featured');?>" method="post" name="adminForm" id="adminForm">
<fieldset id="filter-bar">
<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
<div class="filter-search">
@@ -33,11 +33,6 @@
</div>
<div class="filter-select">
- <label class="selectlabel" for="filter_access"><?php echo JText::_('JOPTION_SELECT_ACCESS'); ?></label>
- <select name="filter_access" class="inputbox" id="filter_access">
- <option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
- <?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
- </select>
<label class="selectlabel" for="filter_published"><?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?></label>
<select name="filter_published" class="inputbox" id="filter_published">
@@ -45,6 +40,12 @@
<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true);?>
</select>
+ <label class="selectlabel" for="filter_access"><?php echo JText::_('JOPTION_SELECT_ACCESS'); ?></label>
+ <select name="filter_access" class="inputbox" id="filter_access">
+ <option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
+ <?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
+ </select>
+
<label class="selectlabel" for="filter_language"><?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?></label>
<select name="filter_language" id="filter_language" class="inputbox">
<option value=""><?php echo JText::_('JOPTION_SELECT_LANGUAGE');?></option>
@@ -117,8 +118,8 @@
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'featured.', $canCheckin); ?>
<?php endif; ?>
- <?php if ($canCreate || $canEdit) : ?>
- <a href="<?php echo JRoute::_('index.php?option=com_content&task=article.edit&id='.$item->id);?>">
+ <?php if ($canEdit) : ?>
+ <a href="<?php echo JRoute::_('index.php?option=com_content&task=article.edit&return=featured&id='.$item->id);?>">
<?php echo $this->escape($item->title); ?></a>
<?php else : ?>
<?php echo $this->escape($item->title); ?>
@@ -135,8 +136,13 @@
<td class="order">
<?php if ($canChange) : ?>
<?php if ($saveOrder) :?>
- <span><?php echo $this->pagination->orderUpIcon($i, true, 'featured.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
- <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'featured.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php if ($listDirn == 'asc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, true, 'featured.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'featured.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php elseif ($listDirn == 'desc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, true, 'featured.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'featured.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php endif; ?>
<?php endif; ?>
<?php $disabled = $saveOrder ? '' : 'disabled="disabled"'; ?>
<input type="text" name="order[]" value="<?php echo $item->ordering;?>" <?php echo $disabled ?> class="text-area-order" title="<?php echo $item->title; ?> order" />
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_installer/discover/default.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_installer/discover/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_installer/discover/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -15,7 +15,7 @@
$listDirn = $this->state->get('list.direction');
?>
-<form action="<?php echo JRoute::_('index.php?option=com_installer&view=discover');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_installer&view=discover');?>" method="post" name="adminForm" id="adminForm">
<?php if ($this->showMessage) : ?>
<?php echo $this->loadTemplate('message'); ?>
<?php endif; ?>
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_installer/manage/default.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_installer/manage/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_installer/manage/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -15,7 +15,7 @@
$listDirn = $this->state->get('list.direction');
?>
-<form action="<?php echo JRoute::_('index.php?option=com_installer&view=manage');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_installer&view=manage');?>" method="post" name="adminForm" id="adminForm">
<?php if ($this->showMessage) : ?>
<?php echo $this->loadTemplate('message'); ?>
<?php endif; ?>
@@ -31,14 +31,14 @@
<thead>
<tr>
<th class="checkmark-col""><input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('TPL_HATHOR_CHECKMARK_ALL'); ?>" onclick="checkAll(this)" /></th>
- <th class="title nowrap"><?php echo JHTML::_('grid.sort', 'COM_INSTALLER_HEADING_NAME', 'name', $listDirn, $listOrder); ?></th>
- <th class="center"><?php echo JHTML::_('grid.sort', 'COM_INSTALLER_HEADING_TYPE', 'type', $listDirn, $listOrder); ?></th>
+ <th class="title nowrap"><?php echo JHTML::_('grid.sort', 'COM_INSTALLER_HEADING_NAME', 'name', $listDirn, $listOrder); ?></th>
+ <th><?php echo JHTML::_('grid.sort', 'COM_INSTALLER_HEADING_LOCATION', 'client_id', $listDirn, $listOrder); ?></th>
<th class="width-10 center"><?php echo JHTML::_('grid.sort', 'JENABLED', 'enabled', $listDirn, $listOrder); ?></th>
+ <th class="center"><?php echo JHTML::_('grid.sort', 'COM_INSTALLER_HEADING_TYPE', 'type', $listDirn, $listOrder); ?></th>
<th class="width-10 center"><?php echo JText::_('JVERSION'); ?></th>
<th class="width-10"><?php echo JText::_('JDATE'); ?></th>
- <th><?php echo JHTML::_('grid.sort', 'COM_INSTALLER_HEADING_FOLDER', 'folder', $listDirn, $listOrder); ?></th>
- <th><?php echo JHTML::_('grid.sort', 'COM_INSTALLER_HEADING_LOCATION', 'client_id', $listDirn, $listOrder); ?></th>
- <th class="width-15 center"><?php echo JText::_('JAUTHOR'); ?></th>
+ <th class="width-15 center"><?php echo JText::_('JAUTHOR'); ?></th>
+ <th><?php echo JHTML::_('grid.sort', 'COM_INSTALLER_HEADING_FOLDER', 'folder', $listDirn, $listOrder); ?></th>
<th class="nowrap id-col"><?php echo JHTML::_('grid.sort', 'COM_INSTALLER_HEADING_ID', 'extension_id', $listDirn, $listOrder); ?></th>
</tr>
</thead>
@@ -48,7 +48,7 @@
<tr class="row<?php echo $i%2;?>" style="<?php if ($item->protected) echo 'color:#999999;';?>">
<td><?php echo JHtml::_('grid.id', $i, $item->extension_id); ?></td>
<td><span class="bold hasTip" title="<?php echo htmlspecialchars($item->name.'::'.$item->description); ?>"><?php echo $item->name; ?></span></td>
- <td class="center"><?php echo JText::_('COM_INSTALLER_TYPE_' . $item->type); ?></td>
+ <td class="center"><?php echo $item->client; ?></td>
<td class="center">
<?php if (!$item->element) : ?>
<strong>X</strong>
@@ -56,15 +56,17 @@
<?php echo JHtml::_('jgrid.published', $item->enabled, $i, 'manage.', !$item->protected);?>
<?php endif; ?>
</td>
+ <td class="center"><?php echo JText::_('COM_INSTALLER_TYPE_' . $item->type); ?></td>
<td class="center"><?php echo @$item->version != '' ? $item->version : ' '; ?></td>
<td class="center"><?php echo @$item->creationDate != '' ? $item->creationDate : ' '; ?></td>
- <td class="center"><?php echo @$item->folder != '' ? $item->folder : JText::_('COM_INSTALLER_TYPE_NONAPPLICABLE'); ?></td>
- <td class="center"><?php echo $item->client; ?></td>
- <td class="center">
+ <td class="center">
<span class="editlinktip hasTip" title="<?php echo JText::_('COM_INSTALLER_AUTHOR_INFORMATION');?>::<?php echo $item->author_info; ?>">
<?php echo @$item->author != '' ? $item->author : ' '; ?>
</span>
</td>
+ <td class="center"><?php echo @$item->folder != '' ? $item->folder : JText::_('COM_INSTALLER_TYPE_NONAPPLICABLE'); ?></td>
+
+
<td><?php echo $item->extension_id ?></td>
</tr>
<?php endforeach; ?>
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_installer/update/default.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_installer/update/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_installer/update/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -14,7 +14,7 @@
$listOrder = $this->state->get('list.ordering');
$listDirn = $this->state->get('list.direction');
?>
-<form action="<?php echo JRoute::_('index.php?option=com_installer&view=update');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_installer&view=update');?>" method="post" name="adminForm" id="adminForm">
<?php if ($this->showMessage) : ?>
<?php echo $this->loadTemplate('message'); ?>
<?php endif; ?>
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_languages/installed/default.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_languages/installed/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_languages/installed/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -11,7 +11,9 @@
defined('_JEXEC') or die;
// Add specific helper files for html generation
-JHtml::addIncludePath(JPATH_COMPONENT.DS.'helpers'.DS.'html');
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+$user = JFactory::getUser();
+$userId = $user->get('id');
?>
<form action="<?php echo JRoute::_('index.php?option=com_languages&view=installed'); ?>" method="post" name="adminForm" id="adminForm">
@@ -66,7 +68,11 @@
</thead>
<tbody>
- <?php foreach ($this->rows as $i => $row):?>
+ <?php foreach ($this->rows as $i => $row) :
+ $canCreate = $user->authorise('core.create', 'com_languages');
+ $canEdit = $user->authorise('core.edit', 'com_languages');
+ $canChange = $user->authorise('core.edit.state', 'com_languages');
+ ?>
<tr class="row<?php echo $i % 2; ?>">
<th>
<?php echo $this->pagination->getRowOffset($i); ?>
@@ -78,7 +84,7 @@
<?php echo $row->name;?>
</td>
<td class="center">
- <?php echo JHtml::_('jgrid.isdefault', $row->published, $i, 'installed.', !$row->published);?>
+ <?php echo JHtml::_('jgrid.isdefault', $row->published, $i, 'installed.', !$row->published && $canChange);?>
</td>
<td class="center">
<?php echo $row->version; ?>
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_languages/language/edit.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_languages/language/edit.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_languages/language/edit.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -1,6 +1,6 @@
<?php
/**
- * @version $Id: edit.php 18290 2010-07-29 02:27:05Z ian $
+ * @version $Id: edit.php 18650 2010-08-26 13:28:49Z ian $
* @package Joomla.Administrator
* @subpackage com_languages
* @copyright Copyright (C) 2005 - 2010 Open Source Matters, Inc. All rights reserved.
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_languages/languages/default.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_languages/languages/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_languages/languages/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -13,8 +13,9 @@
JHtml::addIncludePath(JPATH_COMPONENT.DS.'helpers'.DS.'html');
JHtml::_('behavior.tooltip');
+$user = JFactory::getUser();
+$userId = $user->get('id');
$n = count($this->items);
-
$listOrder = $this->state->get('list.ordering');
$listDirn = $this->state->get('list.direction');
@@ -53,7 +54,7 @@
<?php echo JText::_('JGRID_HEADING_ROW_NUMBER'); ?>
</th>
<th class="checkmark-col">
- <input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('TPL_HATHOR_CHECKMARK_ALL'); ?>" onclick="checkAll(<?php echo count($this->items); ?>);" />
+ <input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('TPL_HATHOR_CHECKMARK_ALL'); ?>" onclick="checkAll(this)" />
</th>
<th class="title">
<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
@@ -82,7 +83,10 @@
<tbody>
<?php
foreach ($this->items as $i => $item) :
- ?>
+ $canCreate = $user->authorise('core.create', 'com_languages');
+ $canEdit = $user->authorise('core.edit', 'com_languages');
+ $canChange = $user->authorise('core.edit.state', 'com_languages');
+ ?>
<tr class="row<?php echo $i % 2; ?>">
<td>
<?php echo $this->pagination->getRowOffset($i); ?>
@@ -92,8 +96,13 @@
</td>
<td>
<span class="editlinktip hasTip" title="<?php echo JText::_('JGLOBAL_EDIT_ITEM');?>::<?php echo $item->title; ?>">
+ <?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_languages&task=language.edit&id='.(int) $item->lang_id); ?>">
- <?php echo $item->title; ?></a></span>
+ <?php echo $item->title; ?></a>
+ <?php else : ?>
+ <?php echo $item->title; ?>
+ <?php endif; ?>
+ </span>
</td>
<td class="center">
<?php echo $item->title_native; ?>
@@ -108,7 +117,7 @@
<?php echo $item->image; ?>
</td>
<td class="center">
- <?php echo JHtml::_('jgrid.published', $item->published, $i, 'languages.');?>
+ <?php echo JHtml::_('jgrid.published', $item->published, $i, 'languages.', $canChange);?>
</td>
<td class="center">
<?php echo $item->lang_id; ?>
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_menus/item/edit.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_menus/item/edit.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_menus/item/edit.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -20,10 +20,13 @@
?>
<script type="text/javascript">
- function submitbutton(task)
+ function submitbutton(task, type)
{
- if (task == 'item.cancel' || document.formvalidator.isValid(document.id('item-form'))) {
+ if (task == 'item.setType') {
+ document.id('item-form').elements['jform[type]'].value = type;
submitform(task);
+ } else if (task == 'item.cancel' || document.formvalidator.isValid(document.id('item-form'))) {
+ submitform(task);
} else {
// special case for modal popups validation response
$$('#item-form .modal-value.invalid').each(function(field){
@@ -43,12 +46,12 @@
<div class="col main-section">
<fieldset class="adminform">
<legend><?php echo JText::_('COM_MENUS_ITEM_DETAILS');?></legend>
- <ul class="adminformlist">
- <li><?php echo $this->form->getLabel('title'); ?>
- <?php echo $this->form->getInput('title'); ?></li>
+ <ul class="adminformlist">
<li><?php echo $this->form->getLabel('type'); ?>
<?php echo $this->form->getInput('type'); ?></li>
+ <li><?php echo $this->form->getLabel('title'); ?>
+ <?php echo $this->form->getInput('title'); ?></li>
<?php if ($this->item->type =='url'): ?>
<?php $this->form->setFieldAttribute('link','readonly','false');?>
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_menus/items/default.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_menus/items/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_menus/items/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -23,7 +23,7 @@
$canOrder = $user->authorise('core.edit.state', 'com_menus');
$saveOrder = ($listOrder == 'a.lft' && $listDirn == 'asc');
?>
-<form action="<?php echo JRoute::_('index.php?option=com_menus&view=items');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_menus&view=items');?>" method="post" name="adminForm" id="adminForm">
<fieldset id="filter-bar">
<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
<div class="filter-search">
@@ -123,22 +123,28 @@
// $lang = JFactory::getLanguage();
// $lang->load($item->componentname, JPATH_ADMINISTRATOR);
$orderkey = array_search($item->id, $this->ordering[$item->parent_id]);
- $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out==$user->get('id') || $item->checked_out==0;
+ $canCreate = $user->authorise('core.create', 'com_menus');
+ $canEdit = $user->authorise('core.edit', 'com_menus');
+ $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out==$user->get('id')|| $item->checked_out==0;
$canChange = $user->authorise('core.edit.state', 'com_menus') && $canCheckin;
- ?>
+ ?>
<tr class="row<?php echo $i % 2; ?>">
<td class="center">
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
</td>
- <td class="indent-<?php echo intval(($item->level-1)*15)+4; ?>">
-
+ <td>
+ <?php echo str_repeat('<span class="gi">|—</span>', $item->level-1) ?>
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'items.', $canCheckin); ?>
<?php endif; ?>
- <a href="<?php echo JRoute::_('index.php?option=com_menus&task=item.edit&cid[]='.$item->id);?>">
- <?php echo $this->escape($item->title); ?></a>
-
+ <?php if ($canEdit) : ?>
+ <a href="<?php echo JRoute::_('index.php?option=com_menus&task=item.edit&cid[]='.$item->id);?>">
+ <?php echo $this->escape($item->title); ?></a>
+ <?php else : ?>
+ <?php echo $this->escape($item->title); ?>
+ <?php endif; ?>
<p class="smallsub" title="<?php echo $this->escape($item->path);?>">
+ <?php echo str_repeat('<span class="gtr">|—</span>', $item->level-1) ?>
<?php if (empty($item->note)) : ?>
<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias));?>
<?php else : ?>
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_menus/menus/default.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_menus/menus/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_menus/menus/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -18,6 +18,8 @@
$uri = JFactory::getUri();
$return = base64_encode($uri);
+$user = JFactory::getUser();
+$userId = $user->get('id');
$listOrder = $this->state->get('list.ordering');
$listDirn = $this->state->get('list.direction');
?>
@@ -62,7 +64,11 @@
</thead>
<tbody>
- <?php foreach ($this->items as $i => $item) : ?>
+ <?php foreach ($this->items as $i => $item) :
+ $canCreate = $user->authorise('core.create', 'com_menus');
+ $canEdit = $user->authorise('core.edit', 'com_menus');
+ $canChange = $user->authorise('core.edit.state', 'com_menus');
+ ?>
<tr class="row<?php echo $i % 2; ?>">
<td class="center">
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
@@ -71,8 +77,13 @@
<a href="<?php echo JRoute::_('index.php?option=com_menus&view=items&menutype='.$item->menutype) ?> ">
<?php echo $this->escape($item->title); ?></a>
<p class="smallsub">(<span><?php echo JText::_('COM_MENUS_MENU_MENUTYPE_LABEL') ?></span>
- <?php echo '<a href="'. JRoute::_('index.php?option=com_menus&task=menu.edit&cid[]='.$item->id).' title='.$this->escape($item->description).'">'.
- $this->escape($item->menutype).'</a>'; ?>)</p>
+ <?php if ($canEdit) : ?>
+ <?php echo '<a href="'. JRoute::_('index.php?option=com_menus&task=menu.edit&cid[]='.$item->id).' title='.$this->escape($item->description).'">'.
+ $this->escape($item->menutype).'</a>'; ?>)
+ <?php else : ?>
+ <?php echo $this->escape($item->menutype)?>)
+ <?php endif; ?>
+ </p>
</td>
<td class="center btns">
<a href="<?php echo JRoute::_('index.php?option=com_menus&view=items&menutype='.$item->menutype.'&filter_published=1');?>">
@@ -92,8 +103,14 @@
if (isset($this->modules[$item->menutype])) :
foreach ($this->modules[$item->menutype] as &$module) :
?>
- <li><a class="modal" href="<?php echo JRoute::_('index.php?option=com_modules&task=module.edit&id='.$module->id.'&return='.$return.'&tmpl=component&layout=modal');?>" rel="{handler: 'iframe', size: {x: 1024, y: 450}}" title="<?php echo JText::_('COM_MENUS_EDIT_MODULE_SETTINGS');?>">
- <?php echo JText::sprintf('COM_MENUS_MODULE_ACCESS_POSITION', $this->escape($module->title), $this->escape($module->access_title), $this->escape($module->position)); ?></a></li>
+ <li>
+ <?php if ($canEdit) : ?>
+ <a class="modal" href="<?php echo JRoute::_('index.php?option=com_modules&task=module.edit&id='.$module->id.'&return='.$return.'&tmpl=component&layout=modal');?>" rel="{handler: 'iframe', size: {x: 1024, y: 450}}" title="<?php echo JText::_('COM_MENUS_EDIT_MODULE_SETTINGS');?>">
+ <?php echo JText::sprintf('COM_MENUS_MODULE_ACCESS_POSITION', $this->escape($module->title), $this->escape($module->access_title), $this->escape($module->position)); ?></a>
+ <?php else :?>
+ <?php echo JText::sprintf('COM_MENUS_MODULE_ACCESS_POSITION', $this->escape($module->title), $this->escape($module->access_title), $this->escape($module->position)); ?>
+ <?php endif; ?>
+ </li>
<?php
endforeach;
endif;
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_messages/messages/default.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_messages/messages/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_messages/messages/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -49,7 +49,7 @@
<thead>
<tr>
<th class="checkmark-col">
- <input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('TPL_HATHOR_CHECKMARK_ALL'); ?>" onclick="checkAll(<?php echo count($this->items); ?>);" />
+ <input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('TPL_HATHOR_CHECKMARK_ALL'); ?>" onclick="checkAll(this)" />
</th>
<th class="title">
<?php echo JHtml::_('grid.sort', 'COM_MESSAGES_HEADING_SUBJECT', 'a.subject', $listDirn, $listOrder); ?>
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_modules/modules/default.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_modules/modules/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_modules/modules/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -33,12 +33,19 @@
</div>
<div class="filter-select">
<label class="selectlabel" for="filter_client_id">
- <?php echo JText::_('COM_MODULES_OPTION_SELECT_CLIENT'); ?>
+ <?php echo JText::_('JGLOBAL_FILTER_CLIENT'); ?>
</label>
<select name="filter_client_id" id="filter_client_id" class="inputbox">
+ <option value=""><?php echo JText::_('JGLOBAL_FILTER_CLIENT');?></option>
<?php echo JHtml::_('select.options', ModulesHelper::getClientOptions(), 'value', 'text', $this->state->get('filter.client_id'));?>
</select>
-
+ <label class="selectlabel" for="filter_state">
+ <?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?>
+ </label>
+ <select name="filter_state" id="filter_state" class="inputbox">
+ <option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
+ <?php echo JHtml::_('select.options', ModulesHelper::getStateOptions(), 'value', 'text', $this->state->get('filter.state'));?>
+ </select>
<label class="selectlabel" for="filter_position">
<?php echo JText::_('COM_MODULES_OPTION_SELECT_POSITION'); ?>
</label>
@@ -54,13 +61,7 @@
<option value=""><?php echo JText::_('COM_MODULES_OPTION_SELECT_MODULE');?></option>
<?php echo JHtml::_('select.options', ModulesHelper::getModules($this->state->get('filter.client_id')), 'value', 'text', $this->state->get('filter.module'));?>
</select>
- <label class="selectlabel" for="filter_state">
- <?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?>
- </label>
- <select name="filter_state" id="filter_state" class="inputbox">
- <option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
- <?php echo JHtml::_('select.options', ModulesHelper::getStateOptions(), 'value', 'text', $this->state->get('filter.state'));?>
- </select>
+
<label class="selectlabel" for="filter_access">
<?php echo JText::_('JOPTION_SELECT_ACCESS'); ?>
@@ -93,25 +94,28 @@
</th>
<th class="title">
<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'title', $listDirn, $listOrder); ?>
+ </th>
+ <th class="width-5">
+ <?php echo JHtml::_('grid.sort', 'JCLIENT', 'client_id', $listDirn, $listOrder); ?>
</th>
- <th class="width-20">
+ <th class="width-5">
+ <?php echo JHtml::_('grid.sort', 'JPUBLISHED', 'published', $listDirn, $listOrder); ?>
+ </th>
+ <th class="width-15">
<?php echo JHtml::_('grid.sort', 'COM_MODULES_HEADING_POSITION', 'position', $listDirn, $listOrder); ?>
</th>
- <th class="width-10">
- <?php echo JHtml::_('grid.sort', 'COM_MODULES_HEADING_PAGES', 'pages', $listDirn, $listOrder); ?>
- </th>
- <th class="width-10">
- <?php echo JHtml::_('grid.sort', 'COM_MODULES_HEADING_MODULE', 'name', $listDirn, $listOrder); ?>
- </th>
- <th class="width-5">
- <?php echo JHtml::_('grid.sort', 'JPUBLISHED', 'published', $listDirn, $listOrder); ?>
- </th>
- <th class="nowrap ordering-col">
+ <th class="nowrap ordering-col">
<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'ordering', $listDirn, $listOrder); ?>
<?php if ($canOrder && $saveOrder) :?>
<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'modules.saveorder'); ?>
<?php endif; ?>
+ </th>
+ <th class="width-10">
+ <?php echo JHtml::_('grid.sort', 'COM_MODULES_HEADING_MODULE', 'name', $listDirn, $listOrder); ?>
</th>
+ <th class="width-10">
+ <?php echo JHtml::_('grid.sort', 'COM_MODULES_HEADING_PAGES', 'pages', $listDirn, $listOrder); ?>
+ </th>
<th class="title access-col">
<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'access', $listDirn, $listOrder); ?>
</th>
@@ -140,7 +144,7 @@
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'modules.', $canCheckin); ?>
<?php endif; ?>
- <?php if ($canCreate || $canEdit) : ?>
+ <?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_modules&task=module.edit&id='.(int) $item->id); ?>">
<?php echo $this->escape($item->title); ?></a>
<?php else : ?>
@@ -152,18 +156,15 @@
<?php endif; ?>
</td>
<td class="center">
- <?php echo $item->position; ?>
+ <?php echo $item->client_id == 0 ? JText::_('JSITE') : JText::_('JADMINISTRATOR'); ?>
</td>
- <td class="center">
- <?php echo $item->pages; ?>
+ <td class="center">
+ <?php echo JHtml::_('jgrid.published', $item->published, $i, 'modules.', $canChange);?>
</td>
- <td class="left">
- <?php echo $item->name;?>
- </td>
<td class="center">
- <?php echo JHtml::_('jgrid.published', $item->published, $i, 'modules.', $canChange);?>
+ <?php echo $item->position; ?>
</td>
- <td class="order">
+ <td class="order">
<?php if ($canChange) : ?>
<?php if ($saveOrder) :?>
<?php if ($listDirn == 'asc') : ?>
@@ -180,7 +181,14 @@
<?php echo $item->ordering; ?>
<?php endif; ?>
</td>
+ <td class="left">
+ <?php echo $item->name;?>
+ </td>
<td class="center">
+ <?php echo $item->pages; ?>
+ </td>
+
+ <td class="center">
<?php echo $this->escape($item->access_level); ?>
</td>
<td class="center">
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/default.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -34,13 +34,7 @@
<button type="button" onclick="document.id('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
</div>
<div class="filter-select fltrt">
- <label class="selectlabel" for="filter_access">
- <?php echo JText::_('JOPTION_SELECT_ACCESS'); ?>
- </label>
- <select name="filter_access" class="inputbox" id="filter_access">
- <option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
- <?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
- </select>
+
<label class="selectlabel" for="filter_published">
<?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?>
@@ -57,6 +51,14 @@
<option value=""><?php echo JText::_('JOPTION_SELECT_CATEGORY');?></option>
<?php echo JHtml::_('select.options', JHtml::_('category.options', 'com_newsfeeds'), 'value', 'text', $this->state->get('filter.category_id'));?>
</select>
+
+ <label class="selectlabel" for="filter_access">
+ <?php echo JText::_('JOPTION_SELECT_ACCESS'); ?>
+ </label>
+ <select name="filter_access" class="inputbox" id="filter_access">
+ <option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
+ <?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
+ </select>
<label class="selectlabel" for="filter_language">
<?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?>
@@ -128,7 +130,7 @@
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'newsfeeds.', $canCheckin); ?>
<?php endif; ?>
- <?php if ($canCreate || $canEdit) : ?>
+ <?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_newsfeeds&task=newsfeed.edit&id='.(int) $item->id); ?>">
<?php echo $this->escape($item->name); ?></a>
<?php else : ?>
@@ -146,8 +148,13 @@
<td class="order">
<?php if ($canChange) : ?>
<?php if ($saveOrder) :?>
- <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid), 'newsfeeds.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
- <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, ($item->catid == @$this->items[$i+1]->catid), 'newsfeeds.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php if ($listDirn == 'asc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid), 'newsfeeds.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, ($item->catid == @$this->items[$i+1]->catid), 'newsfeeds.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php elseif ($listDirn == 'desc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid), 'newsfeeds.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, ($item->catid == @$this->items[$i+1]->catid), 'newsfeeds.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php endif; ?>
<?php endif; ?>
<?php $disabled = $saveOrder ? '' : 'disabled="disabled"'; ?>
<input type="text" name="order[]" size="5" value="<?php echo $item->ordering;?>" <?php echo $disabled ?> class="text-area-order" title="<?php echo $item->name; ?> order"/>
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/modal.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/modal.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/modal.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -17,7 +17,7 @@
$listOrder = $this->state->get('list.ordering');
$listDirn = $this->state->get('list.direction');
?>
-<form action="<?php echo JRoute::_('index.php?option=com_newsfeeds&view=newsfeeds&layout=modal&tmpl=component');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_newsfeeds&view=newsfeeds&layout=modal&tmpl=component');?>" method="post" name="adminForm" id="adminForm">
<fieldset id="filter-bar">
<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
<div class="filter-search fltlft">
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_plugins/plugins/default.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_plugins/plugins/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_plugins/plugins/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -38,8 +38,15 @@
<select name="filter_state" id="filter_state" class="inputbox">
<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
<?php echo JHtml::_('select.options', PluginsHelper::stateOptions(), 'value', 'text', $this->state->get('filter.state'), true);?>
+ </select>
+
+ <label class="selectlabel" for="filter_folder">
+ <?php echo JText::_('COM_PLUGINS_OPTION_FOLDER'); ?>
+ </label>
+ <select name="filter_folder" id="filter_folder" class="inputbox">
+ <option value=""><?php echo JText::_('COM_PLUGINS_OPTION_FOLDER');?></option>
+ <?php echo JHtml::_('select.options', PluginsHelper::folderOptions(), 'value', 'text', $this->state->get('filter.folder'));?>
</select>
-
<label class="selectlabel" for="filter_access">
<?php echo JText::_('JOPTION_SELECT_ACCESS'); ?>
</label>
@@ -48,14 +55,6 @@
<?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
</select>
- <label class="selectlabel" for="filter_folder">
- <?php echo JText::_('COM_PLUGINS_OPTION_FOLDER'); ?>
- </label>
- <select name="filter_folder" id="filter_folder" class="inputbox">
- <option value=""><?php echo JText::_('COM_PLUGINS_OPTION_FOLDER');?></option>
- <?php echo JHtml::_('select.options', PluginsHelper::folderOptions(), 'value', 'text', $this->state->get('filter.folder'));?>
- </select>
-
<button type="button" id="filter-go" onclick="this.form.submit();">
<?php echo JText::_('JSUBMIT'); ?></button>
@@ -81,15 +80,16 @@
<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'plugins.saveorder'); ?>
<?php endif; ?>
</th>
- <th class="title access-col">
- <?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'access', $listDirn, $listOrder); ?>
- </th>
+
<th class="nowrap width-10">
<?php echo JHTML::_('grid.sort', 'COM_PLUGINS_FOLDER_HEADING', 'folder', $listDirn, $listOrder); ?>
</th>
<th class="nowrap width-10">
<?php echo JHTML::_('grid.sort', 'COM_PLUGINS_ELEMENT_HEADING', 'element', $listDirn, $listOrder); ?>
</th>
+ <th class="title access-col">
+ <?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'access', $listDirn, $listOrder); ?>
+ </th>
<th class="nowrap id-col">
<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'extension.id', $listDirn, $listOrder); ?>
</th>
@@ -127,8 +127,13 @@
<td class="order">
<?php if ($canChange) : ?>
<?php if ($saveOrder) :?>
- <span><?php echo $this->pagination->orderUpIcon($i, (@$this->items[$i-1]->folder == $item->folder), 'plugins.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
- <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, (@$this->items[$i+1]->folder == $item->folder), 'plugins.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php if ($listDirn == 'asc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, (@$this->items[$i-1]->folder == $item->folder), 'plugins.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, (@$this->items[$i+1]->folder == $item->folder), 'plugins.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php elseif ($listDirn == 'desc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, (@$this->items[$i-1]->folder == $item->folder), 'plugins.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, (@$this->items[$i+1]->folder == $item->folder), 'plugins.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php endif; ?>
<?php endif; ?>
<?php $disabled = $saveOrder ? '' : 'disabled="disabled"'; ?>
<input type="text" name="order[]" value="<?php echo $item->ordering;?>" <?php echo $disabled ?> class="text-area-order" title="<?php echo $item->name; ?> order" />
@@ -136,15 +141,16 @@
<?php echo $item->ordering; ?>
<?php endif; ?>
</td>
- <td class="center">
- <?php echo $this->escape($item->access_level); ?>
- </td>
+
<td class="nowrap center">
<?php echo $this->escape($item->folder);?>
</td>
<td class="nowrap center">
<?php echo $this->escape($item->element);?>
</td>
+ <td class="center">
+ <?php echo $this->escape($item->access_level); ?>
+ </td>
<td class="center">
<?php echo (int) $item->extension_id;?>
</td>
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_redirect/links/default.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_redirect/links/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_redirect/links/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -83,7 +83,7 @@
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
</td>
<td>
- <?php if ($canCreate || $canEdit) : ?>
+ <?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_redirect&task=link.edit&id='.$item->id);?>" title="<?php echo $this->escape($item->old_url); ?>">
<?php echo $this->escape(str_replace(JURI::root(), '', $item->old_url)); ?></a>
<?php else : ?>
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_templates/styles/default.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_templates/styles/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_templates/styles/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -30,10 +30,10 @@
</div>
<div class="filter-select">
<label class="selectlabel" for="filter_client_id">
- <?php echo JText::_('COM_TEMPLATES_FILTER_TYPE'); ?>
+ <?php echo JText::_('JGLOBAL_FILTER_CLIENT'); ?>
</label>
<select name="filter_client_id" id="filter_client_id" class="inputbox">
- <option value="*"><?php echo JText::_('COM_TEMPLATES_FILTER_TYPE'); ?></option>
+ <option value="*"><?php echo JText::_('JGLOBAL_FILTER_CLIENT'); ?></option>
<?php echo JHtml::_('select.options', TemplatesHelper::getClientOptions(), 'value', 'text', $this->state->get('filter.client_id'));?>
</select>
@@ -61,12 +61,12 @@
<th>
<?php echo JHtml::_('grid.sort', 'COM_TEMPLATES_HEADING_STYLE', 'a.title', $listDirn, $listOrder); ?>
</th>
+ <th class="width-10">
+ <?php echo JHtml::_('grid.sort', 'JCLIENT', 'a.client_id', $listDirn, $listOrder); ?>
+ </th>
<th>
<?php echo JHtml::_('grid.sort', 'COM_TEMPLATES_HEADING_TEMPLATE', 'a.template', $listDirn, $listOrder); ?>
</th>
- <th class="width-10">
- <?php echo JHtml::_('grid.sort', 'COM_TEMPLATES_HEADING_TYPE', 'a.client_id', $listDirn, $listOrder); ?>
- </th>
<th class="width-5">
<?php echo JHtml::_('grid.sort', 'COM_TEMPLATES_HEADING_DEFAULT', 'a.home', $listDirn, $listOrder); ?>
</th>
@@ -90,22 +90,22 @@
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
</td>
<td>
- <?php if ($canCreate || $canEdit) : ?>
+ <?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_templates&task=style.edit&id='.(int) $item->id); ?>">
<?php echo $this->escape($item->title);?></a>
<?php else : ?>
<?php echo $this->escape($item->title);?>
<?php endif; ?>
</td>
+ <td class="center">
+ <?php echo $item->client_id == 0 ? JText::_('JSITE') : JText::_('JADMINISTRATOR'); ?>
+ </td>
<td>
<label for="cb<?php echo $i;?>">
<?php echo $this->escape($item->template);?>
</label>
</td>
<td class="center">
- <?php echo $item->client_id == 0 ? JText::_('JSITE') : JText::_('JADMINISTRATOR'); ?>
- </td>
- <td class="center">
<?php echo JHtml::_('jgrid.isdefault', $item->home, $i, 'styles.', $canChange && !$item->home);?>
</td>
<td class="center">
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_templates/templates/default.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_templates/templates/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_templates/templates/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -32,10 +32,10 @@
</div>
<div class="filter-select">
<label class="selectlabel" for="filter_client_id">
- <?php echo JText::_('COM_TEMPLATES_TEMPLATES_FILTER_CLIENT'); ?>
+ <?php echo JText::_('JGLOBAL_FILTER_CLIENT'); ?>
</label>
<select name="filter_client_id" id="filter_client_id" class="inputbox">
- <option value="*"><?php echo JText::_('COM_TEMPLATES_TEMPLATES_FILTER_CLIENT'); ?></option>
+ <option value="*"><?php echo JText::_('JGLOBAL_FILTER_CLIENT'); ?></option>
<?php echo JHtml::_('select.options', TemplatesHelper::getClientOptions(), 'value', 'text', $this->state->get('filter.client_id'));?>
</select>
@@ -56,7 +56,7 @@
<?php echo JHtml::_('grid.sort', 'COM_TEMPLATES_HEADING_TEMPLATE', 'a.element', $listDirn, $listOrder); ?>
</th>
<th class="width-10">
- <?php echo JHtml::_('grid.sort', 'COM_TEMPLATES_HEADING_TYPE', 'a.client_id', $listDirn, $listOrder); ?>
+ <?php echo JHtml::_('grid.sort', 'JCLIENT', 'a.client_id', $listDirn, $listOrder); ?>
</th>
<th class="center width-10">
<?php echo JText::_('JVERSION'); ?>
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_users/groups/default.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_users/groups/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_users/groups/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -21,7 +21,7 @@
$listOrder = $this->state->get('list.ordering');
$listDirn = $this->state->get('list.direction');
?>
-<form action="<?php echo JRoute::_('index.php?option=com_users&view=groups');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_users&view=groups');?>" method="post" name="adminForm" id="adminForm">
<fieldset id="filter-bar">
<legend class="element-invisible"><?php echo JText::_('COM_USERS_SEARCH_GROUPS_LABEL'); ?></legend>
<div class="filter-search">
@@ -63,7 +63,7 @@
</td>
<td>
<?php echo str_repeat('<span class="gi">|—</span>', $item->level) ?>
- <?php if ($canCreate || $canEdit) : ?>
+ <?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_users&task=group.edit&id='.$item->id);?>">
<?php echo $this->escape($item->title); ?></a>
<?php else : ?>
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_users/levels/default.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_users/levels/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_users/levels/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -23,7 +23,7 @@
$canOrder = $user->authorise('core.edit.state', 'com_users');
$saveOrder = $listOrder == 'a.ordering';
?>
-<form action="<?php echo JRoute::_('index.php?option=com_users&view=levels');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_users&view=levels');?>" method="post" name="adminForm" id="adminForm">
<fieldset id="filter-bar">
<legend class="element-invisible"><?php echo JText::_('COM_USERS_SEARCH_ACCESS_LEVELS'); ?></legend>
<div class="filter-search">
@@ -71,7 +71,7 @@
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
</td>
<td>
- <?php if ($canCreate || $canEdit) : ?>
+ <?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_users&task=level.edit&id='.$item->id);?>">
<?php echo $this->escape($item->title); ?></a>
<?php else : ?>
@@ -81,8 +81,13 @@
<td class="order">
<?php if ($canChange) : ?>
<?php if ($saveOrder) :?>
- <span><?php echo $this->pagination->orderUpIcon($i, true, 'levels.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
- <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'levels.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php if ($listDirn == 'asc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, true, 'levels.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'levels.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php elseif ($listDirn == 'desc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, true, 'levels.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'levels.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php endif; ?>
<?php endif; ?>
<?php $disabled = $saveOrder ? '' : 'disabled="disabled"'; ?>
<input type="text" name="order[]" value="<?php echo $item->ordering;?>" <?php echo $disabled ?> class="text-area-order" title="<?php echo $item->title; ?> order" />
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_users/users/default.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_users/users/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_users/users/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -69,7 +69,7 @@
<thead>
<tr>
<th class="checkmark-col">
- <input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('TPL_HATHOR_CHECKMARK_ALL'); ?>" onclick="checkAll(<?php echo count($this->items);?>)" />
+ <input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('TPL_HATHOR_CHECKMARK_ALL'); ?>" onclick="checkAll(this)" />
</th>
<th class="title">
<?php echo JHtml::_('grid.sort', 'COM_USERS_HEADING_NAME', 'a.name', $listDirn, $listOrder); ?>
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_users/users/modal.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_users/users/modal.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_users/users/modal.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -14,7 +14,7 @@
JHtml::_('behavior.tooltip');
$function = 'jSelectUser_'.JRequest::getVar('field');
?>
-<form action="<?php echo JRoute::_('index.php?option=com_users&view=users&layout=modal&tmpl=component');?>" method="post" name="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_users&view=users&layout=modal&tmpl=component');?>" method="post" name="adminForm" id="adminForm">
<fieldset id="filter-bar">
<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER'); ?></legend>
<div class="filter-search">
Modified: development/branches/jcamp/administrator/templates/hathor/html/com_weblinks/weblinks/default.php
===================================================================
--- development/branches/jcamp/administrator/templates/hathor/html/com_weblinks/weblinks/default.php 2010-08-31 19:17:06 UTC (rev 18739)
+++ development/branches/jcamp/administrator/templates/hathor/html/com_weblinks/weblinks/default.php 2010-08-31 19:21:09 UTC (rev 18740)
@@ -32,13 +32,7 @@
<button type="button" onclick="document.id('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
</div>
<div class="filter-select">
- <label class="selectlabel" for="filter_access">
- <?php echo JText::_('JOPTION_SELECT_ACCESS'); ?>
- </label>
- <select name="filter_access" id="filter_access" class="inputbox">
- <option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
- <?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
- </select>
+
<label class="selectlabel" for="filter_published">
<?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?>
@@ -55,12 +49,12 @@
<option value=""><?php echo JText::_('JOPTION_SELECT_CATEGORY');?></option>
<?php echo JHtml::_('select.options', JHtml::_('category.options', 'com_weblinks'), 'value', 'text', $this->state->get('filter.category_id'));?>
</select>
- <label class="selectlabel" for="filter_language">
- <?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?>
+ <label class="selectlabel" for="filter_access">
+ <?php echo JText::_('JOPTION_SELECT_ACCESS'); ?>
</label>
- <select name="filter_language" id="filter_language" class="inputbox">
- <option value=""><?php echo JText::_('JOPTION_SELECT_LANGUAGE');?></option>
- <?php echo JHtml::_('select.options', JHtml::_('contentlanguage.existing', true, true), 'value', 'text', $this->state->get('filter.language'));?>
+ <select name="filter_access" id="filter_access" class="inputbox">
+ <option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
+ <?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
</select>
<label class="selectlabel" for="filter_language">
<?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?>
@@ -69,6 +63,7 @@
<option value=""><?php echo JText::_('JOPTION_SELECT_LANGUAGE');?></option>
<?php echo JHtml::_('select.options', JHtml::_('contentlanguage.existing', true, true), 'value', 'text', $this->state->get('filter.language'));?>
</select>
+
<button type="button" id="filter-go" onclick="this.form.submit();">
<?php echo JText::_('JSUBMIT'); ?></button>
@@ -81,7 +76,7 @@
<thead>
<tr>
<th class="checkmark-col">
- <input type="checkbox" name="checkall-toggle" id="toggle" value="" title="<?php echo JText::_('TPL_HATHOR_CHECKMARK_ALL'); ?>" onclick="checkAll(<?php echo count($this->items); ?>);" />
+ <input type="checkbox" name="checkall-toggle" id="toggle" value="" title="<?php echo JText::_('TPL_HATHOR_CHECKMARK_ALL'); ?>" onclick="checkAll(this)" />
</th>
<th class="title">
<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
@@ -132,7 +127,7 @@
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'weblinks.', $canCheckin); ?>
<?php endif; ?>
- <?php if ($canCreate || $canEdit) : ?>
+ <?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_weblinks&task=weblink.edit&id='.(int) $item->id); ?>">
<?php echo $this->escape($item->title); ?></a>
<?php else : ?>
@@ -150,8 +145,13 @@
<td class="order">
<?php if ($canChange) : ?>
<?php if ($saveOrder) :?>
- <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid), 'weblinks.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
- <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, ($item->catid == @$this->items[$i+1]->catid), 'weblinks.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php if ($listDirn == 'asc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid), 'weblinks.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, ($item->catid == @$this->items[$i+1]->catid), 'weblinks.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php elseif ($listDirn == 'desc') : ?>
+ <span><?php echo $this->pagination->orderUpIcon($i, ($item->catid == @$this->items[$i-1]->catid), 'weblinks.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+ <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, ($item->catid == @$this->items[$i+1]->catid), 'weblinks.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+ <?php endif; ?>
<?php endif; ?>
<?php $disabled = $saveOrder ? '' : 'disabled="disabled"'; ?>
<input type="text" name="order[]" value="<?php echo $item->ordering;?>" <?php echo $disabled ?> class="text-area-order" title="<?php echo $item->title; ?> order" />
_______________________________________________
Joomla-commits mailing list
Joomla-...@joomlacode.org
http://joomlacode.org/mailman/listinfo/joomla-commits