Skip to content

Moving Joomla part on the update notice form com_installer to com_joomlaupdate #3779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
infograf768 merged 6 commits into from
Jul 10, 2014
Merged

Moving Joomla part on the update notice form com_installer to com_joomlaupdate #3779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b17dac5
Update en-GB.com_installer.ini
zero-24 Jun 14, 2014
7124abf
Update en-GB.com_joomlaupdate.ini
zero-24 Jun 14, 2014
33fcef5
Update view.html.php
zero-24 Jun 14, 2014
38cc28b
Update en-GB.com_joomlaupdate.ini
zero-24 Jun 14, 2014
709e143
Update en-GB.com_joomlaupdate.ini
zero-24 Jun 14, 2014
beb3f32
Update view.html.php
zero-24 Jun 28, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion administrator/components/com_joomlaupdate/views/default/view.html.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class JoomlaupdateViewDefault extends JViewLegacy
*
* @since 2.5.4
*/
public function display($tpl=null)
public function display($tpl = null)
{
// Get data from the model
$this->state = $this->get('State');
Expand All @@ -50,6 +50,7 @@ public function display($tpl=null)
{
JToolbarHelper::preferences('com_joomlaupdate');
}

JToolBarHelper::divider();
JToolBarHelper::help('JHELP_COMPONENTS_JOOMLA_UPDATE');

Expand All @@ -64,6 +65,12 @@ public function display($tpl=null)
$document->addScript('../media/com_joomlaupdate/default.js');
JHtml::_('stylesheet', 'media/mediamanager.css', array(), true);

if (!is_null($this->updateInfo['object']))
{
// Show the message if a update is found.
JFactory::getApplication()->enqueueMessage(JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATE_NOTICE'), 'notice');
}

// Render the view
parent::display($tpl);
}
Expand Down
2 changes: 1 addition & 1 deletion administrator/language/en-GB/en-GB.com_installer.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZE="Small PHP maximum POST size"
COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZEDESC="The maximum POST size sets the most amount of data that can be sent via POST to the server. This includes form submissions for articles, media (images, videos) and extensions. This value is less than 2MB which may impact on uploading large extensions. This is set in the php.ini under post_max_size"
COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZE="Small PHP file upload size"
COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZEDESC="The maximum file size for uploads is set to less than 2MB which may impact on uploading large extensions."
COM_INSTALLER_MSG_WARNINGS_UPDATE_NOTICE="Before updating ensure that the update is compatible with your Joomla! installation. If updating Joomla!, ensure installed extensions are available for the new Joomla! version."
COM_INSTALLER_MSG_WARNINGS_UPDATE_NOTICE="Before updating ensure that the update is compatible with your Joomla! installation."
COM_INSTALLER_MSG_WARNINGS_UPLOADBIGGERTHANPOST="PHP Upload Size bigger than POST size"
COM_INSTALLER_MSG_WARNINGS_UPLOADBIGGERTHANPOSTDESC="The value of the upload_max_filesize in the php.ini file is greater than the post_max_size variable. The post_max_size variable will take precedence here and block requests larger than it. This is generally a server misconfiguration when trying to increase upload sizes. Please increase the upload_max_filesize to at least match the post_max_size variable or vice versa"
COM_INSTALLER_N_EXTENSIONS_PUBLISHED="%d extensions successfully enabled."
Expand Down
1 change: 1 addition & 0 deletions administrator/language/en-GB/en-GB.com_joomlaupdate.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_NOUPDATES="No updates available"
COM_JOOMLAUPDATE_VIEW_DEFAULT_NOUPDATESNOTICE="You already have the latest Joomla! version, %s."
COM_JOOMLAUPDATE_VIEW_DEFAULT_PACKAGE="Update package URL"
COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATEFOUND="A Joomla! update was found"
COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATE_NOTICE="Before you update Joomla!, ensure that the installed extensions are available for the new Joomla! version."
COM_JOOMLAUPDATE_VIEW_PROGRESS="Update progress"
COM_JOOMLAUPDATE_VIEW_UPDATE_BYTESEXTRACTED="Bytes extracted"
COM_JOOMLAUPDATE_VIEW_UPDATE_BYTESREAD="Bytes read"
Expand Down