[Joomla-commits] r22970 - in development/trunk: administrator/includes administrator/language/en-GB administrator/templates/bluestork/css administrator/templates/hathor/css installation installation/language/en-GB installation/template installation/template/js installation/views/filesystem installation/views/site/tmpl
githu...@jcode001.directrouter.com
Date: 2012-04-03 17:36:40 -0500 (Tue, 03 Apr 2012)
New Revision: 22970
Modified:
development/trunk/administrator/includes/helper.php
development/trunk/administrator/language/en-GB/en-GB.com_joomlaupdate.ini
development/trunk/administrator/templates/bluestork/css/template.css
development/trunk/administrator/templates/hathor/css/colour_blue.css
development/trunk/administrator/templates/hathor/css/colour_brown.css
development/trunk/administrator/templates/hathor/css/colour_highcontrast.css
development/trunk/administrator/templates/hathor/css/colour_standard.css
development/trunk/installation/CHANGELOG
development/trunk/installation/language/en-GB/en-GB.ini
development/trunk/installation/template/index.php
development/trunk/installation/template/js/installation.js
development/trunk/installation/views/filesystem/view.html.php
development/trunk/installation/views/site/tmpl/default.php
Log:
Merge branch 'master' of github.com:joomla/joomla-cms
Modified: development/trunk/administrator/includes/helper.php
===================================================================
--- development/trunk/administrator/includes/helper.php 2012-04-02 23:16:43 UTC (rev 22969)
+++ development/trunk/administrator/includes/helper.php 2012-04-03 22:36:40 UTC (rev 22970)
@@ -27,7 +27,7 @@
$option = strtolower(JRequest::getCmd('option'));
$user = JFactory::getUser();
- if (!$user->authorise('core.login.admin')) {
+ if (($user->get('guest')) || !$user->authorise('core.login.admin')) {
$option = 'com_login';
}
Modified: development/trunk/administrator/language/en-GB/en-GB.com_joomlaupdate.ini
===================================================================
--- development/trunk/administrator/language/en-GB/en-GB.com_joomlaupdate.ini 2012-04-02 23:16:43 UTC (rev 22969)
+++ development/trunk/administrator/language/en-GB/en-GB.com_joomlaupdate.ini 2012-04-03 22:36:40 UTC (rev 22970)
@@ -14,6 +14,7 @@
COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_NOCHANGE="Currently configured (no change)"
COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_STS="Short Term Support"
COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_TESTING="Testing"
+COM_JOOMLAUPDATE_CONFIGURATION="Joomla Update Configuration"
COM_JOOMLAUPDATE_OVERVIEW="Joomla! Update"
COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_DIRECTORY="FTP directory"
COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_HOSTNAME="FTP host"
Modified: development/trunk/administrator/templates/bluestork/css/template.css
===================================================================
--- development/trunk/administrator/templates/bluestork/css/template.css 2012-04-02 23:16:43 UTC (rev 22969)
+++ development/trunk/administrator/templates/bluestork/css/template.css 2012-04-03 22:36:40 UTC (rev 22970)
@@ -2051,6 +2051,7 @@
.icon-16-help-shop { background-image: url(../images/menu/icon-16-help-shop.png); }
.icon-16-info { background-image: url(../images/menu/icon-16-info.png); }
.icon-16-install { background-image: url(../images/menu/icon-16-install.png); }
+.icon-16-joomlaupdate { background-image: url(../images/menu/icon-16-install.png); }
.icon-16-language { background-image: url(../images/menu/icon-16-language.png); }
.icon-16-levels { background-image: url(../images/menu/icon-16-levels.png); }
.icon-16-logout { background-image: url(../images/menu/icon-16-logout.png); }
Modified: development/trunk/administrator/templates/hathor/css/colour_blue.css
===================================================================
--- development/trunk/administrator/templates/hathor/css/colour_blue.css 2012-04-02 23:16:43 UTC (rev 22969)
+++ development/trunk/administrator/templates/hathor/css/colour_blue.css 2012-04-03 22:36:40 UTC (rev 22970)
@@ -1003,6 +1003,10 @@
background-image: url(../images/menu/icon-16-install.png);
}
+.icon-16-joomlaupdate {
+ background-image: url(../images/menu/icon-16-install.png);
+}
+
.icon-16-language {
background-image: url(../images/menu/icon-16-language.png);
}
Modified: development/trunk/administrator/templates/hathor/css/colour_brown.css
===================================================================
--- development/trunk/administrator/templates/hathor/css/colour_brown.css 2012-04-02 23:16:43 UTC (rev 22969)
+++ development/trunk/administrator/templates/hathor/css/colour_brown.css 2012-04-03 22:36:40 UTC (rev 22970)
@@ -846,6 +846,10 @@
background-image: url(../images/menu/icon-16-install.png);
}
+.icon-16-joomlaupdate {
+ background-image: url(../images/menu/icon-16-install.png);
+}
+
.icon-16-language {
background-image: url(../images/menu/icon-16-language.png);
}
Modified: development/trunk/administrator/templates/hathor/css/colour_highcontrast.css
===================================================================
--- development/trunk/administrator/templates/hathor/css/colour_highcontrast.css 2012-04-02 23:16:43 UTC (rev 22969)
+++ development/trunk/administrator/templates/hathor/css/colour_highcontrast.css 2012-04-03 22:36:40 UTC (rev 22970)
@@ -961,6 +961,10 @@
background-image: url(../images/menu/icon-16-install.png);
}
+.icon-16-joomlaupdate {
+ background-image: url(../images/menu/icon-16-install.png);
+}
+
.icon-16-language {
background-image: url(../images/menu/icon-16-language.png);
}
Modified: development/trunk/administrator/templates/hathor/css/colour_standard.css
===================================================================
--- development/trunk/administrator/templates/hathor/css/colour_standard.css 2012-04-02 23:16:43 UTC (rev 22969)
+++ development/trunk/administrator/templates/hathor/css/colour_standard.css 2012-04-03 22:36:40 UTC (rev 22970)
@@ -901,6 +901,10 @@
background-image: url(../images/menu/icon-16-install.png);
}
+.icon-16-joomlaupdate {
+ background-image: url(../images/menu/icon-16-install.png);
+}
+
.icon-16-language {
background-image: url(../images/menu/icon-16-language.png);
}
Modified: development/trunk/installation/CHANGELOG
===================================================================
--- development/trunk/installation/CHANGELOG 2012-04-02 23:16:43 UTC (rev 22969)
+++ development/trunk/installation/CHANGELOG 2012-04-03 22:36:40 UTC (rev 22970)
@@ -26,6 +26,11 @@
- -> Removed
! -> Note
+02-Apr-2012 Mark Dexter
+ # [#28354] Problem logging out if Public group has admin login permission
+ # [#28342] *New joomlaupdate component has no icon in admin menu + missing lang string
+ # [#27772] Selecting 'Install Sample Data' button causes 'invalid security token' error message if 'Next' button clicked too fast
+
-------------------- 2.5.4 Stable Release [2-April-2012] ------------------
31-Mar-2012 Mark Dexter
Modified: development/trunk/installation/language/en-GB/en-GB.ini
===================================================================
--- development/trunk/installation/language/en-GB/en-GB.ini 2012-04-02 23:16:43 UTC (rev 22969)
+++ development/trunk/installation/language/en-GB/en-GB.ini 2012-04-03 22:36:40 UTC (rev 22970)
@@ -195,6 +195,7 @@
INSTL_XML_SUPPORT="XML Support"
INSTL_ZIP_SUPPORT_AVAILABLE="Native ZIP support"
INSTL_ZLIB_COMPRESSION_SUPPORT="Zlib Compression Support"
+INSTL_PROCESS_BUSY="Process is in progress. Please wait..."
;Global strings
JADMINISTRATOR="Administrator"
Modified: development/trunk/installation/template/index.php
===================================================================
--- development/trunk/installation/template/index.php 2012-04-02 23:16:43 UTC (rev 22969)
+++ development/trunk/installation/template/index.php 2012-04-03 22:36:40 UTC (rev 22970)
@@ -26,6 +26,11 @@
JHtml::_('behavior.tooltip');
JHtml::_('behavior.formvalidation');
JHtml::_('script', 'installation/template/js/installation.js', true, false, false, false);
+
+// Load the JavaScript translated messages
+JText::script('INSTL_PROCESS_BUSY');
+JText::script('INSTL_SITE_SAMPLE_LOADED');
+JText::script('INSTL_FTP_SETTINGS_CORRECT');
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>" >
@@ -38,11 +43,6 @@
<script type="text/javascript">
window.addEvent('domready', function() {
window.Install = new Installation('rightpad', '<?php echo JURI::current(); ?>');
-
- Locale.define('<?php echo JFactory::getLanguage()->getTag(); ?>', 'installation', {
- sampleDataLoaded: '<?php echo JText::_('INSTL_SITE_SAMPLE_LOADED', true); ?>'
- });
- Locale.use('<?php echo JFactory::getLanguage()->getTag(); ?>');
});
</script>
</head>
Modified: development/trunk/installation/template/js/installation.js
===================================================================
--- development/trunk/installation/template/js/installation.js 2012-04-02 23:16:43 UTC (rev 22969)
+++ development/trunk/installation/template/js/installation.js 2012-04-03 22:36:40 UTC (rev 22970)
@@ -27,7 +27,7 @@
var button = document.id('theDefault').children[0];
button.setAttribute('disabled', 'disabled');
select.setAttribute('disabled', 'disabled');
- button.setAttribute('value', Locale.get('installation.sampleDataLoaded'));
+ button.setAttribute('value', Joomla.JText._('INSTL_SITE_SAMPLE_LOADED', 'Sample Data Installed Successfully.'));
}
},
@@ -35,6 +35,7 @@
var form = document.id('adminForm');
if (this.busy) {
+ alert(Joomla.JText._('INSTL_PROCESS_BUSY', 'Process is in progress. Please wait...'));
return false;
}
@@ -109,6 +110,9 @@
* Method to install sample data via AJAX request.
*/
sampleData: function(el, filename) {
+ this.busy = true;
+ sample_data_spinner = new Spinner('sample-data-region');
+ sample_data_spinner.show(true);
el = document.id(el);
filename = document.id(filename);
var req = new Request.JSON({
@@ -125,7 +129,7 @@
Joomla.replaceTokens(r.token);
this.sampleDataLoaded = r.data.sampleDataLoaded;
if (r.error == false) {
- el.set('value', Locale.get('installation.sampleDataLoaded'));
+ el.set('value', Joomla.JText._('INSTL_SITE_SAMPLE_LOADED', 'Sample Data Installed Successfully.'));
el.set('onclick','');
el.set('disabled', 'disabled');
filename.set('disabled', 'disabled');
@@ -142,6 +146,8 @@
el.set('disabled', 'disabled');
filename.set('disabled', 'disabled');
}
+ this.busy = false;
+ sample_data_spinner.hide(true);
}.bind(this),
onFailure: function(xhr) {
var r = JSON.decode(xhr.responseText);
@@ -152,6 +158,8 @@
}
el.set('disabled', '');
filename.set('disabled', '');
+ this.busy = false;
+ sample_data_spinner.hide(true);
}
}).send();
},
@@ -213,7 +221,7 @@
if (r) {
Joomla.replaceTokens(r.token)
if (r.error == false) {
- alert(Joomla.JText._('INSTL_FTP_SETTINGS_CORRECT'));
+ alert(Joomla.JText._('INSTL_FTP_SETTINGS_CORRECT', 'Settings correct'));
} else {
alert(r.message);
}
Modified: development/trunk/installation/views/filesystem/view.html.php
===================================================================
--- development/trunk/installation/views/filesystem/view.html.php 2012-04-02 23:16:43 UTC (rev 22969)
+++ development/trunk/installation/views/filesystem/view.html.php 2012-04-03 22:36:40 UTC (rev 22970)
@@ -35,7 +35,6 @@
$this->assignRef('state', $state);
$this->assignRef('form', $form);
- JText::script('INSTL_FTP_SETTINGS_CORRECT');
parent::display($tpl);
}
}
Modified: development/trunk/installation/views/site/tmpl/default.php
===================================================================
--- development/trunk/installation/views/site/tmpl/default.php 2012-04-02 23:16:43 UTC (rev 22969)
+++ development/trunk/installation/views/site/tmpl/default.php 2012-04-03 22:36:40 UTC (rev 22970)
@@ -141,7 +141,7 @@
<p><?php echo JText::_('INSTL_SITE_LOAD_SAMPLE_DESC4'); ?></p>
<p><?php echo JText::_('INSTL_SITE_LOAD_SAMPLE_DESC8'); ?></p>
</div>
- <div class="install-body">
+ <div id="sample-data-region" class="install-body">
<div class="m">
<fieldset>
<table class="content2 sample-data">
_______________________________________________
Joomla-commits mailing list
Joomla-...@joomlacode.org
http://joomlacode.org/mailman/listinfo/joomla-commits