From dfef0774f3024d188d6e7c33a9d93f72828f669c Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Wed, 2 May 2018 03:38:42 +0200 Subject: [PATCH] Improved the JCB package import area --- README.md | 4 +- admin/README.txt | 4 +- .../en-GB/en-GB.com_componentbuilder.ini | 2 +- admin/models/import_joomla_components.php | 2 +- .../import_joomla_components/tmpl/default.php | 51 ++++++++++++------- componentbuilder.xml | 2 +- 6 files changed, 39 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 76b3e8081..05b08ec07 100644 --- a/README.md +++ b/README.md @@ -126,11 +126,11 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](http://joomlacomponentbuilder.com) + *First Build*: 30th April, 2015 -+ *Last Build*: 1st May, 2018 ++ *Last Build*: 2nd May, 2018 + *Version*: 2.7.6 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **193870** ++ *Line count*: **193883** + *Field count*: **1027** + *File count*: **1201** + *Folder count*: **193** diff --git a/admin/README.txt b/admin/README.txt index 76b3e8081..05b08ec07 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -126,11 +126,11 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](http://joomlacomponentbuilder.com) + *First Build*: 30th April, 2015 -+ *Last Build*: 1st May, 2018 ++ *Last Build*: 2nd May, 2018 + *Version*: 2.7.6 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **193870** ++ *Line count*: **193883** + *Field count*: **1027** + *File count*: **1201** + *Folder count*: **193** diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index 3a0ba728c..f2d4c64ea 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -6508,7 +6508,7 @@ COM_COMPONENTBUILDER_THE_SNIPPET_WAS_SUCCESSFULLY_EXPORTED="The Snippet Was Succ COM_COMPONENTBUILDER_THE_URL_S_SET_TO_RETRIEVE_THE_PACKAGES_DOES_NOT_EXIST="The url (%s) set to retrieve the packages does not exist!" COM_COMPONENTBUILDER_THE_WIKI_IS_LOADING="The wiki is loading" COM_COMPONENTBUILDER_THIS_BSB_IS_NOT_LINKED_TO_ANY_OTHER_AREAS_OF_JCB_AT_THIS_TIME="This %s is not linked to any other areas of JCB at this time!" -COM_COMPONENTBUILDER_THIS_PACKAGE_BPASSEDB_CHECKSUM_VALIDATION_PLEASE_VALIDATE_THIS_CHECKSUM_BSB_TO_BE_THE_SAME_AS_THE_ONE_FOUND_A_S_SA="This package PASSED checksum validation! Please validate this checksum: %s to be the same as the one found @ " +COM_COMPONENTBUILDER_THIS_PACKAGE_BPASSEDB_THE_CHECKSUM_VALIDATIONBR_BR_SMALLMANUALLY_ALSO_VALIDATE_THAT_THE_CORRECT_CHECKSUM_WAS_USEDSMALLBR_THIS_CHECKSUM_BSB_MUST_BE_THE_SAME_AS_THE_ONE_FOUND_A_S_SA="This package PASSED the checksum validation!

Manually also validate that the correct checksum was used.
This checksum: %s must be the same as the one found @ " COM_COMPONENTBUILDER_THIS_PACKAGE_HAS_NO_KEY="This package has no key." COM_COMPONENTBUILDER_TITLE="Title" COM_COMPONENTBUILDER_TOTAL_DOWNLOADS="total downloads" diff --git a/admin/models/import_joomla_components.php b/admin/models/import_joomla_components.php index 67d0ba28a..7ad6e0357 100644 --- a/admin/models/import_joomla_components.php +++ b/admin/models/import_joomla_components.php @@ -304,7 +304,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy if ($checksums[$packageName] === sha1_file($package['dir'])) { $validator = $this->checksumURLs[$this->checksum].str_replace('.zip', '.sha', $packageName); - $checksumMessage = JText::sprintf('COM_COMPONENTBUILDER_THIS_PACKAGE_BPASSEDB_CHECKSUM_VALIDATION_PLEASE_VALIDATE_THIS_CHECKSUM_BSB_TO_BE_THE_SAME_AS_THE_ONE_FOUND_A_S_SA', $checksums[$packageName], 'href="'.$validator.'" target="_blank" title="verify checksum">', $validator); + $checksumMessage = JText::sprintf('COM_COMPONENTBUILDER_THIS_PACKAGE_BPASSEDB_THE_CHECKSUM_VALIDATIONBR_BR_SMALLMANUALLY_ALSO_VALIDATE_THAT_THE_CORRECT_CHECKSUM_WAS_USEDSMALLBR_THIS_CHECKSUM_BSB_MUST_BE_THE_SAME_AS_THE_ONE_FOUND_A_S_SA', $checksums[$packageName], 'href="'.$validator.'" target="_blank" title="verify checksum">', $validator); $checksumStatus = 'Success'; $checksum = true; } diff --git a/admin/views/import_joomla_components/tmpl/default.php b/admin/views/import_joomla_components/tmpl/default.php index c4421d0d3..fb34dae40 100644 --- a/admin/views/import_joomla_components/tmpl/default.php +++ b/admin/views/import_joomla_components/tmpl/default.php @@ -105,6 +105,8 @@ JHtml::_('behavior.keepalive'); // set the url form.import_url.value = form.vdm_package.value; jQuery('#loading').css('display', 'block'); + jQuery('#noticeboard').show(); + jQuery('#installer-import').hide(); form.checksum.value = 'vdm'; form.gettype.value = 'url'; form.submit(); @@ -123,6 +125,8 @@ JHtml::_('behavior.keepalive'); // set the url form.import_url.value = form.jcb_package.value; jQuery('#loading').css('display', 'block'); + jQuery('#noticeboard').show(); + jQuery('#installer-import').hide(); form.checksum.value = 'jcb'; form.gettype.value = 'url'; form.submit(); @@ -152,8 +156,7 @@ jQuery(document).ready(function($) { dataType === 'smart_package') ? '.zip' : 'none'; ?> - -
+
sidebar)) : ?> @@ -164,6 +167,12 @@ jQuery(document).ready(function($) {
+ +
hasPackage && $this->dataType === 'smart_package') : ?> packageInfo['name']) && ComponentbuilderHelper::checkArray($this->packageInfo['name'])) @@ -275,7 +284,7 @@ jQuery(document).ready(function($) { vdmPackages && ComponentbuilderHelper::checkArray($this->vdmPackages)): ?> -
+

@@ -294,13 +303,8 @@ jQuery(document).ready(function($) {
-
+
-
-
-

-
.
-

@@ -310,7 +314,7 @@ jQuery(document).ready(function($) { jcbPackages && ComponentbuilderHelper::checkArray($this->jcbPackages)) : ?> -
+

@@ -329,13 +333,8 @@ jQuery(document).ready(function($) {
-
+
-
-
-

-
.
-

@@ -349,13 +348,15 @@ jQuery(document).ready(function($) { +