Skip to content
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.

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

[4.x]Upload and Update #177

Closed
joomlapl-bot opened this issue May 2, 2022 · 0 comments
Closed

[4.x]Upload and Update #177

joomlapl-bot opened this issue May 2, 2022 · 0 comments

Comments

@joomlapl-bot
Copy link
Collaborator

PR w związku ze zmianą oryginału joomla/joomla-cms#37519 Poniżej zmiany w oryginale:

Click to expand the diff!
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/noupdate.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/noupdate.php
index 2e3d94274602..ec72b53384e7 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/noupdate.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/noupdate.php
@@ -28,7 +28,7 @@
 
 if (Factory::getApplication()->getIdentity()->authorise('core.admin', 'com_joomlaupdate'))
 {
-	$displayData['formAppend'] = '<div class="text-center text-decoration-underline">' . HTMLHelper::_('link', $uploadLink, Text::_($displayData['textPrefix'] . '_EMPTYSTATE_APPEND')) . '</div>';
+	$displayData['formAppend'] = '<div class="text-center"><a href="' . $uploadLink . '" class="btn btn-sm btn-outline-secondary">' . Text::_($displayData['textPrefix'] . '_EMPTYSTATE_APPEND') . '</a></div>';
 }
 
 if (isset($this->updateInfo['object']) && isset($this->updateInfo['object']->get('infourl')->_data)) :
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php
index 68c459985f8c..cab317c77638 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php
@@ -353,7 +353,9 @@ class="extension-check upcomp hidden"
 
 	<?php if (Factory::getUser()->authorise('core.admin')) : ?>
 		<div class="text-center">
-		<?php echo HTMLHelper::_('link', Route::_('index.php?option=com_joomlaupdate&view=upload'), Text::_('COM_JOOMLAUPDATE_EMPTYSTATE_APPEND')); ?>
+			<a href="<?php echo Route::_('index.php?option=com_joomlaupdate&view=upload'); ?>" class="btn btn-sm btn-outline-secondary">
+				<?php echo Text::_('COM_JOOMLAUPDATE_EMPTYSTATE_APPEND'); ?>
+			</a>
 		</div>
 	<?php endif; ?>
 </div>
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/reinstall.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/reinstall.php
index 6103c338efc2..e6e93402d4ec 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/reinstall.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/reinstall.php
@@ -46,7 +46,7 @@
 endif;
 
 if (Factory::getApplication()->getIdentity()->authorise('core.admin', 'com_joomlaupdate')) :
-	$displayData['formAppend'] = '<div class="text-center">' . HTMLHelper::_('link', $uploadLink, Text::_('COM_JOOMLAUPDATE_EMPTYSTATE_APPEND')) . '</div>';
+	$displayData['formAppend'] = '<div class="text-center"><a href="' . $uploadLink . '" class="btn btn-sm btn-outline-secondary">' . Text::_('COM_JOOMLAUPDATE_EMPTYSTATE_APPEND') . '</a></div>';
 endif;
 
 echo '<div id="joomlaupdate-wrapper">';
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/update.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/update.php
index c5233d77e5da..4daba3221259 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/update.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/update.php
@@ -55,7 +55,7 @@
 	</div>';
 
 if (Factory::getApplication()->getIdentity()->authorise('core.admin', 'com_joomlaupdate')) :
-	$displayData['formAppend'] = '<div class="text-center">' . HTMLHelper::_('link', $uploadLink, Text::_('COM_JOOMLAUPDATE_EMPTYSTATE_APPEND')) . '</div>';
+	$displayData['formAppend'] = '<div class="text-center"><a href="' . $uploadLink . '" class="btn btn-sm btn-outline-secondary">' . Text::_('COM_JOOMLAUPDATE_EMPTYSTATE_APPEND') . '</a></div>';
 endif;
 
 echo '<div id="joomlaupdate-wrapper">';
diff --git a/administrator/language/en-GB/com_joomlaupdate.ini b/administrator/language/en-GB/com_joomlaupdate.ini
index b4502450d0ce..25685034d05d 100644
--- a/administrator/language/en-GB/com_joomlaupdate.ini
+++ b/administrator/language/en-GB/com_joomlaupdate.ini
@@ -16,7 +16,7 @@ COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_NEXT="Joomla Next"
 COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_TESTING="Testing"
 COM_JOOMLAUPDATE_CONFIGURATION="Joomla Update: Options"
 COM_JOOMLAUPDATE_CONFIRM="Confirm"
-COM_JOOMLAUPDATE_EMPTYSTATE_APPEND="Update your site by manually uploading the update package."
+COM_JOOMLAUPDATE_EMPTYSTATE_APPEND="Upload and Update"
 COM_JOOMLAUPDATE_EMPTYSTATE_BUTTON_ADD="Check for Updates"
 COM_JOOMLAUPDATE_EMPTYSTATE_CONTENT="Select the button below to check for updates."
 COM_JOOMLAUPDATE_EMPTYSTATE_TITLE="Check if an update is available."
@@ -35,7 +35,7 @@ COM_JOOMLAUPDATE_MINIMUM_STABILITY_DEV="Development"
 COM_JOOMLAUPDATE_MINIMUM_STABILITY_LABEL="Minimum Stability"
 COM_JOOMLAUPDATE_MINIMUM_STABILITY_RC="Release Candidate"
 COM_JOOMLAUPDATE_MINIMUM_STABILITY_STABLE="Stable"
-COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_APPEND="Update your site by manually uploading the update package."
+COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_APPEND="Upload and Update"
 COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_BUTTON_ADD="Retry check for update"
 COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_CONTENT="An update to Joomla %1$s was found, but it wasn't possible to fetch the download URL for that update. Either the update to Joomla %1$s is not available for your stability level or there is a problem with the Joomla Update Server.<br>Please try to download the update package from <a href=\"https://downloads.joomla.org/latest\">the official Joomla download page</a> and use the Upload and Update function."
 COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_TITLE="We can't find a download URL"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

3 participants