Permalink
Browse files

Merge branch 'master' of https://dextercowley@github.com/joomla/jooml…

…a-cms.git
  • Loading branch information...
2 parents 313924f + a779c6b commit 555b1f84fd213b539438632e2cd0105686b2a9a9 @dextercowley dextercowley committed Nov 20, 2012
Showing with 2,418 additions and 261 deletions.
  1. +1 −1 administrator/components/com_content/models/forms/article.xml
  2. +22 −8 administrator/components/com_installer/views/update/view.html.php
  3. +4 −4 administrator/components/com_menus/views/item/tmpl/edit_options.php
  4. +6 −5 administrator/components/com_messages/models/forms/message.xml
  5. +1 −1 administrator/components/com_messages/views/message/tmpl/default.php
  6. +1 −1 administrator/components/com_messages/views/message/view.html.php
  7. +5 −3 administrator/components/com_modules/helpers/html/modules.php
  8. +11 −0 administrator/components/com_users/models/user.php
  9. +1 −5 administrator/modules/mod_popular/tmpl/default.php
  10. +1 −3 administrator/templates/hathor/css/template.css
  11. +1 −1 administrator/templates/hathor/css/template_rtl.css
  12. +43 −0 administrator/templates/hathor/html/com_messages/message/edit.php
  13. +1 −0 administrator/templates/hathor/html/com_messages/message/index.html
  14. +5 −4 administrator/templates/hathor/html/com_users/user/edit.php
  15. +2 −1 administrator/templates/hathor/less/template.less
  16. +2 −1 build/generatecss.php
  17. +10 −0 build/less/bootstrap-rtl.less
  18. +4 −5 components/com_content/helpers/route.php
  19. +1 −1 components/com_content/views/archive/tmpl/default.xml
  20. +1 −2 components/com_content/views/article/tmpl/default.xml
  21. +1 −1 components/com_content/views/category/tmpl/blog.xml
  22. +1 −1 components/com_content/views/featured/tmpl/default.xml
  23. +33 −0 installation/CHANGELOG
  24. +19 −7 installation/controller.php
  25. +169 −0 installation/controllers/languages.json.php
  26. +17 −2 installation/controllers/setup.json.php
  27. +28 −0 installation/helpers/html/installation.php
  28. +38 −6 installation/language/en-AU/en-AU.ini
  29. +38 −6 installation/language/en-GB/en-GB.ini
  30. +38 −6 installation/language/en-US/en-US.ini
  31. +258 −0 installation/language/eo-XX/eo-XX.ini
  32. +21 −0 installation/language/eo-XX/eo-XX.xml
  33. +1 −0 installation/language/eo-XX/index.html
  34. +259 −0 installation/language/gl-ES/gl-ES.ini
  35. +21 −0 installation/language/gl-ES/gl-ES.xml
  36. +3 −0 installation/language/gl-ES/index.html
  37. +3 −0 installation/language/ug-CN/index.html
  38. +259 −0 installation/language/ug-CN/ug-CN.ini
  39. +19 −0 installation/language/ug-CN/ug-CN.xml
  40. +472 −0 installation/models/languages.php
  41. +16 −12 installation/template/js/installation.js
  42. +7 −6 installation/views/complete/tmpl/default.php
  43. +1 −0 installation/views/defaultlanguage/index.html
  44. +119 −0 installation/views/defaultlanguage/tmpl/default.php
  45. +1 −0 installation/views/defaultlanguage/tmpl/index.html
  46. +49 −0 installation/views/defaultlanguage/view.html.php
  47. +1 −0 installation/views/languages/index.html
  48. +106 −0 installation/views/languages/tmpl/default.php
  49. +1 −0 installation/views/languages/tmpl/index.html
  50. +42 −0 installation/views/languages/view.html.php
  51. +1 −1 libraries/joomla/form/fields/rules.php
  52. +1 −1 libraries/joomla/html/grid.php
  53. +2 −2 libraries/joomla/installer/adapters/component.php
  54. +2 −1 libraries/joomla/installer/helper.php
  55. +11 −3 libraries/joomla/table/nested.php
  56. +15 −1 libraries/joomla/updater/adapters/extension.php
  57. +6 −6 libraries/joomla/updater/update.php
  58. +49 −24 media/jui/css/bootstrap-rtl.css
  59. +104 −97 media/jui/less/bootstrap-rtl.less
  60. +15 −7 modules/mod_breadcrumbs/tmpl/default.php
  61. +39 −18 modules/mod_menu/helper.php
  62. +4 −2 modules/mod_menu/mod_menu.php
  63. +1 −1 modules/mod_menu/mod_menu.xml
  64. +2 −0 plugins/system/languagefilter/languagefilter.php
  65. +1 −2 templates/protostar/error.php
  66. +1 −2 templates/protostar/index.php
@@ -164,7 +164,7 @@
<field
name="info_block_position"
type="list"
- default="0"
+ default=""
label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL"
description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
@@ -88,16 +88,30 @@ protected function addToolbar()
JToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_UPDATE');
JHtmlSidebar::setAction('index.php?option=com_installer&view=manage');
- JHtmlSidebar::addFilter(JText::_('COM_INSTALLER_VALUE_CLIENT_SELECT'), 'filter_client_id',
- JHtml::_('select.options', array('0' => 'JSITE', '1' => 'JADMINISTRATOR'), 'value', 'text', $this->state->get('filter.client_id'), true));
+ JHtmlSidebar::addFilter(
+ JText::_('COM_INSTALLER_VALUE_CLIENT_SELECT'),
+ 'filter_client_id',
+ JHtml::_('select.options', array('0' => 'JSITE', '1' => 'JADMINISTRATOR'), 'value', 'text', $this->state->get('filter.client_id'), true)
+ );
- JHtmlSidebar::addFilter(JText::_('COM_INSTALLER_VALUE_TYPE_SELECT'), 'filter_type',
- JHtml::_('select.options', InstallerHelper::getExtensionTypes(), 'value', 'text', $this->state->get('filter.type'), true));
+ JHtmlSidebar::addFilter(
+ JText::_('COM_INSTALLER_VALUE_TYPE_SELECT'),
+ 'filter_type',
+ JHtml::_('select.options', InstallerHelper::getExtensionTypes(), 'value', 'text', $this->state->get('filter.type'), true)
+ );
- JHtmlSidebar::addFilter(JText::_('COM_INSTALLER_VALUE_FOLDER_SELECT'), 'filter_group',
- JHtml::_('select.options',
- array_merge(InstallerHelper::getExtensionGroupes(), array('*' => JText::_('COM_INSTALLER_VALUE_FOLDER_NONAPPLICABLE'))), 'value',
- 'text', $this->state->get('filter.group'), true));
+ JHtmlSidebar::addFilter(
+ JText::_('COM_INSTALLER_VALUE_FOLDER_SELECT'),
+ 'filter_group',
+ JHtml::_(
+ 'select.options',
+ array_merge(InstallerHelper::getExtensionGroupes(), array('*' => JText::_('COM_INSTALLER_VALUE_FOLDER_NONAPPLICABLE'))),
+ 'value',
+ 'text',
+ $this->state->get('filter.group'),
+ true
+ )
+ );
parent::addToolbar();
}
}
@@ -15,24 +15,24 @@
$i = 0;
foreach ($fieldSets as $name => $fieldSet):
- if (!($this->item->link == 'index.php?option=com_wrapper&view=wrapper' && $fieldSet->name == 'request')):
+ if (!($this->item->link == 'index.php?option=com_wrapper&view=wrapper' && $fieldSet->name == 'request')):
$label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_MENUS_'.$name.'_FIELDSET_LABEL';
echo JHtml::_('bootstrap.addSlide', 'menuOptions', JText::_($label), 'collapse' . $i++);
if (isset($fieldSet->description) && trim($fieldSet->description)) :
echo '<p class="tip">'.$this->escape(JText::_($fieldSet->description)).'</p>';
endif;
?>
<?php foreach ($this->form->getFieldset($name) as $field) : ?>
-
+
<div class="control-group">
-
+
<div class="control-label">
<?php echo $field->label; ?>
</div>
<div class="controls">
<?php echo $field->input; ?>
</div>
-
+
</div>
<?php endforeach;
echo JHtml::_('bootstrap.endSlide');
@@ -18,12 +18,13 @@
<field
name="message"
- type="textarea"
- rows="10"
- cols="80"
+ type="editor"
+ class="inputbox"
label="COM_MESSAGES_FIELD_MESSAGE_LABEL"
description="COM_MESSAGES_FIELD_MESSAGE_DESC"
- required="true">
- </field>
+ required="true"
+ filter="JComponentHelper::filterText"
+ buttons="true"
+ hide="readmore,pagebreak,image,article" />
</fieldset>
</form>
@@ -42,7 +42,7 @@
<?php echo JText::_('COM_MESSAGES_FIELD_MESSAGE_LABEL'); ?>
</div>
<div class="controls">
- <?php echo $this->escape($this->item->message);?>
+ <?php echo $this->item->message; ?>
</div>
</div>
<input type="hidden" name="task" value="" />
@@ -56,7 +56,7 @@ protected function addToolbar()
JToolbarHelper::title(JText::_('COM_MESSAGES_VIEW_PRIVATE_MESSAGE'), 'inbox.png');
$sender = JUser::getInstance($this->item->user_id_from);
if ($sender->authorise('core.admin') || $sender->authorise('core.manage', 'com_messages') && $sender->authorise('core.login.admin')) {
- JToolbarHelper::custom('message.reply', 'restore.png', 'restore_f2.png', 'COM_MESSAGES_TOOLBAR_REPLY', false);
+ JToolbarHelper::custom('message.reply', 'redo', null, 'COM_MESSAGES_TOOLBAR_REPLY', false);
}
JToolbarHelper::cancel('message.cancel');
JToolbarHelper::help('JHELP_COMPONENTS_MESSAGING_READ');
@@ -176,9 +176,11 @@ public static function positionList($clientId = 0)
}
// Pop the first item off the array if it's blank
- if (strlen($options[0]->text) < 1)
- {
- array_shift($options);
+ if(count($options)) {
+ if (strlen($options[0]->text) < 1)
+ {
+ array_shift($options);
+ }
}
return $options;
@@ -72,14 +72,25 @@ public function getItem($pk = null)
public function getForm($data = array(), $loadData = true)
{
$app = JFactory::getApplication();
+ $plugin = JPluginHelper::getPlugin('user', 'joomla');
+ $pluginParams = new JRegistry($plugin->params);
// Get the form.
$form = $this->loadForm('com_users.user', 'user', array('control' => 'jform', 'load_data' => $loadData));
+
if (empty($form))
{
return false;
}
+ // Passwords fields are required when mail to user is set to No in joomla user plugin
+ $userId = $form->getValue('id');
+ if ($userId === 0 && $pluginParams->get('mail_to_user') === "0")
+ {
+ $form->setFieldAttribute('password', 'required', 'true');
+ $form->setFieldAttribute('password2', 'required', 'true');
+ }
+
return $form;
}
@@ -16,11 +16,7 @@
<?php foreach ($list as $i => $item) :
// Calculate popular items
$hits = (int) $item->hits;
-
- if($hits >= 25) $hits_class = 'warning';
- if($hits > 100) $hits_class = 'important';
- if($hits < 24) $hits_class = 'info';
- if($hits < 10) $hits_class = '';
+ $hits_class = $hits >= 100 ? 'important' : $hits >= 25 ? 'warning' : $hits >= 10 ? 'info' : '';
?>
<div class="row-fluid">
<div class="span9">
@@ -1935,9 +1935,6 @@ table.adminlist .pagination button {
line-height: 1.5em;
margin-right: 20px;
}
-div.toggle-editor {
- margin: -15px;
-}
.tip {
float: left;
padding: 5px;
@@ -2872,6 +2869,7 @@ fieldset.uploadform {
-moz-border-radius: 4px;
border-radius: 4px;
color: #c09853;
+ font-size: 120%;
}
.alert-heading {
color: inherit;
@@ -760,7 +760,7 @@ table.adminlist .pagination button {
* MCE Editor
*/
div.toggle-editor {
- margin-top: -15px;
+
}
/**
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @package Joomla.Administrator
+ * @subpackage com_messages
+ *
+ * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+JHtml::_('behavior.tooltip');
+JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.keepalive');
+?>
+<script type="text/javascript">
+ Joomla.submitbutton = function(task) {
+ if (task == 'message.cancel' || document.formvalidator.isValid(document.id('message-form'))) {
+ Joomla.submitform(task, document.getElementById('message-form'));
+ }
+ }
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_messages'); ?>" method="post" name="adminForm" id="message-form" class="form-validate form-horizontal">
+ <fieldset class="adminform">
+ <ul class="adminformlist">
+ <li><?php echo $this->form->getLabel('user_id_to'); ?>
+ <?php echo $this->form->getInput('user_id_to'); ?></li>
+
+ <li><?php echo $this->form->getLabel('subject'); ?>
+ <?php echo $this->form->getInput('subject'); ?></li>
+ </ul>
+ </fieldset>
+ <fieldset class="adminform">
+ <legend><?php echo $this->form->getLabel('message'); ?></legend>
+ <ul class="adminformlist">
+ <li><?php echo $this->form->getInput('message'); ?> </li>
+ </ul>
+ </fieldset>
+ <input type="hidden" name="task" value="" />
+ <?php echo JHtml::_('form.token'); ?>
+</form>
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
@@ -1,9 +1,10 @@
<?php
/**
- * @package Joomla.Administrator
- * @subpackage com_users
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE.txt
+ * @package Joomla.Administrator
+ * @subpackage Template.hathor
+ *
+ * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
*/
defined('_JEXEC') or die;
@@ -1799,7 +1799,7 @@ table.adminlist .pagination button {
* MCE Editor
*/
div.toggle-editor {
- margin: -15px;
+
}
/**
@@ -2989,6 +2989,7 @@ fieldset.uploadform {
-moz-border-radius: 4px;
border-radius: 4px;
color: #c09853;
+ font-size: 120%;
}
.alert-heading {
View
@@ -52,7 +52,8 @@ public function doExecute()
JPATH_ADMINISTRATOR . '/templates/hathor/less/colour_standard.less' => JPATH_ADMINISTRATOR . '/templates/hathor/css/colour_standard.css',
JPATH_SITE . '/templates/protostar/less/template.less' => JPATH_SITE . '/templates/protostar/css/template.css',
// Below files are to recompile the default Bootstrap CSS files
- __DIR__ . '/less/bootstrap-extended.less' => JPATH_SITE . '/media/jui/css/bootstrap-extended.css'
+ __DIR__ . '/less/bootstrap-extended.less' => JPATH_SITE . '/media/jui/css/bootstrap-extended.css',
+ __DIR__ . '/less/bootstrap-rtl.less' => JPATH_SITE . '/media/jui/css/bootstrap-rtl.css'
);
$less = new JLess;
@@ -0,0 +1,10 @@
+// bootstrap-rtl.less
+//
+// Less to compile JUI CSS to extend Bootstrap using default values
+// Need to use this file to compile bootstrap-rtl.css due to the actual
+// file not importing the variables or mixins
+// -----------------------------------------------------
+
+@import "../../media/jui/less/variables.less";
+@import "../../media/jui/less/mixins.less";
+@import "../../media/jui/less/bootstrap-rtl.less";
@@ -209,12 +209,11 @@ protected static function _findItem($needles = null)
}
}
}
- else
+
+ $active = $menus->getActive();
+ if ($active && $active->component == 'com_content' && ($active->language == '*' || !JLanguageMultilang::isEnabled()))
{
- $active = $menus->getActive();
- if ($active && $active->component == 'com_content' && ($active->language == '*' || !JLanguageMultilang::isEnabled())) {
- return $active->id;
- }
+ return $active->id;
}
// if not found, return language specific home link
@@ -92,7 +92,7 @@
<field
name="info_block_position"
type="list"
- default="0"
+ default=""
label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL"
description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
@@ -61,11 +61,10 @@
<field
name="info_block_position"
type="list"
- default="0"
+ default=""
label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL"
description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
- <option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
<option value="2">COM_CONTENT_FIELD_OPTION_SPLIT</option>
@@ -274,7 +274,7 @@
<field
name="info_block_position"
type="list"
- default="0"
+ default=""
label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL"
description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
@@ -159,7 +159,7 @@
<field
name="info_block_position"
type="list"
- default="0"
+ default=""
label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL"
description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC">
<option value="">JGLOBAL_USE_GLOBAL</option>
View
@@ -26,6 +26,39 @@ $ -> Language fix or change
- -> Removed
! -> Note
+19-Nov-2012 Jean-Marie Simonet
+ # [#29714] Code style fixes based on Jenkins, replace uses of JRequest. Thanks Michael.
+ # [#28087] PHP errors when all modules are removed. Thanks David
+ # [#29694] Fix broken extension update. Thanks Viet Vu
+ # [#29439] Bootstrap clearfix improperly used. Thanks Elijah.
+ # [#29700] Component installer and menus may return invisible bug. Thanks Mario.
+
+18-Nov-2012 Jean-Marie Simonet
+ # [#29684] Wrong HTML markup on category edit. Thanks Ofer
+ # [#29528] Incorrect arrows in table heading. Thanks Dennis
+ # [#29687] *Adapting hathor to new message using editor
+ # [#29679] *Passwords fields not required when creating a new user in back-end
+ # [#29698] *Adding bootsrtap-rtl to compiler, correcting some rtl classes
+ # [#29693] *Position of Article Info. Setting Use Global not saved. Menu Manager: Edit Menu Item and Article Manager: Edit Article. Thanks Volkmar
+ # [#29710] mod_breadcrumbs: Custom separator is not applied. Thanks Constantin
+ # [#29682] Adding an icon to the "reply" button in com_messages. Thanks Constantin.
+ # [#29712] Alternate fix for 29646 update changes. Thanks Michael
+ + [#29496] Language Installation tool for the Joomla Installer. Thanks Javier.
+
+16-Nov-2012 Jean-Marie Simonet
+ $+ Adding Uyghur ug-CN installation files
+
+15-Nov-2012 Jean-Marie Simonet
+ $+ Adding Galician gl-ES installation files
+ # [#29660] Error 500 due to "missing alias column in assets table" Thanks Elin.
+ $+ Adding Esperanto eo-XX installation files
+
+14-Nov-2012 Jean-Marie Simonet
+ # [#29558] Incorrect current menu item highlighting in mod_menu if 'Base Item' is not current. Thanks Dennis
+ # [#29619] In the current version 3.0.2 (master branch, 03. Nov. 2012) some settings aren't working. Thanks Benjamin.
+ # [#29473] Fixed issue with hits_class not being defined when hits is 24. Thanks Peter.
+ # [#29676] *formatting at the PM System are lost
+
13-Nov-2012 Jean-Marie Simonet
#$ [#29669] Consistent form validation notifications. Thanks Roland
# [#29675] *Protostar error page tries to load search module even when module is not published
Oops, something went wrong.

0 comments on commit 555b1f8

Please sign in to comment.