From 75a35a0bd4401d7a3b978c01f9d50df048aa958a Mon Sep 17 00:00:00 2001
From: Lahmizzar Muinela <lahmizzar@devxive.com>
Date: Wed, 24 Apr 2013 16:02:31 -0400
Subject: [PATCH] minify installer
---
installer/language/de-DE/de-DE.pkg_projectfork_languages.ini | 9 ++-------
install.script.php | 40 ++++++----------------------------------
installer/language/en-GB/en-GB.pkg_projectfork_languages.ini | 7 +------
pkg_projectfork_languages.xml | 4 ++--
4 files changed, 11 insertions(+), 49 deletions(-)
diff --git a/install.script.php b/install.script.php
index dff2045..695ef3d 100644
--- a/install.script.php
+++ b/install.script.php
@@ -33,31 +33,8 @@
// Do not install if Projectfork 4 doesn't exist.
$table = JTable::getInstance('extension');
$id = $table->find(array('type'=>'component', 'element'=>'com_projectfork'));
- if($id) {
+ if(!$id) {
$app->enqueueMessage(sprintf(JText::_('PKG_PROJECTFORK_LANGUAGES_PFNOTINSTALLED'), '4.x'), 'error');
-
- $nopf_installed = '
- <div style="display: inline-block;">
- <div style="background: url(https://projectfork.net/templates/hydra/img/logo.png) no-repeat 50% 50% #698C00; height: 63px; width: 205px; border: 6px solid #567300; padding: 10px; border-top-left-radius: 5px; border-bottom-left-radius: 5px; float: left;"></div>
- <div onclick="PFInstaller()" style="background-color: #698C00; cursor: pointer; height: 63px; border-width: 6px; border-style: solid; border-color: #567300; border-left: 0px; padding: 10px; color: white; font-size: 25px; line-height: 60px; float: left; text-indent: 0; text-align: center;">' . JText::_('PKG_PROJECTFORK_LANGUAGES_INSTALLNOW') . '</div>
- <div onclick="PFDownload()" style="background-color: #42A9CA; cursor: pointer; height: 63px; border: 6px solid #2E88A5; padding: 10px; color: white; font-size: 25px; line-height: 60px; float: left; text-indent: 0; text-align: center;">' . JText::_('PKG_PROJECTFORK_LANGUAGES_DOWNLOAD_COMMUNITY') . '</div>
- <div onclick="PFOrderPro()" style="background-color: #F7A700; cursor: pointer; height: 63px; border: 6px solid #BE8100; padding: 10px; color: white; font-size: 25px; line-height: 60px; float: left; text-indent: 0; text-align: center; border-top-right-radius: 5px; border-bottom-right-radius: 5px;">' . JText::_('PKG_PROJECTFORK_LANGUAGES_ORDER_PRO') . '</div>
- </div>
- <script type="text/javascript">
- PFInstaller = function(pressbutton) {
- var form = document.getElementById("adminForm");
- form.install_url.value = "https://projectfork.net/downloads/projectfork-4/projectfork-4-4-0-0/pkgprojectfork4-0-0-zip?format=raw";
- Joomla.submitbutton4();
- }
- PFDownload = function(pressbutton) {
- window.open("https://projectfork.net","_blank");
- }
- PFOrderPro = function(pressbutton) {
- window.open("https://projectfork.net/pro","_blank");
- }
- </script>
- ';
- $app->enqueueMessage($nopf_installed, 'notice');
return false;
}
@@ -66,7 +43,7 @@
$languages = JFactory::getLanguage()->getKnownLanguages();
$files = $parent->manifest->files;
- $installed_langs_html = '<div style="inline-block;"><ul>';
+ $installed_langs_html = '<ul>';
foreach ($languages as $language) {
$search = JFolder::folders($source, $language['tag']); // no .zip files use "folders" instead
@@ -82,20 +59,15 @@
}
$installed_langs_html .= '</li>';
}
- $installed_langs_html .= '</ul></div>';
+ $installed_langs_html .= '</ul>';
if (empty($files)) {
- // No packages to install: replace failure message with something that's more descriptive.
+ // No packages to install
$app->enqueueMessage(sprintf(JText::_('PKG_PROJECTFORK_LANGUAGES_ENGLISH_ONLY')), 'notice');
return false;
} else {
- // Override XML-DIV-NOPF-Installer-Placeholder if PF is installed
- $success_html_output = '<div style="display: inline-block; margin-bottom: 25px;">';
- $success_html_output .= '<div style="background: url(https://projectfork.net/templates/hydra/img/logo.png) no-repeat 50% 50% #698C00; height: 63px; width: 205px; border: 6px solid #567300; padding: 10px; border-top-left-radius: 5px; border-bottom-left-radius: 5px; float: left;"></div>';
- $success_html_output .= '<div style="background-color: #698C00; height: 63px; border-width: 6px; border-style: solid; border-color: #567300; border-left: 0px; padding: 10px; color: white; font-size: 25px; line-height: 60px; float: left; text-indent: 0; text-align: center; border-top-right-radius: 5px; border-bottom-right-radius: 5px;">' . JText::_('PKG_PROJECTFORK_LANGUAGES_INSTALLED_DETECTED') . '</div>';
- $success_html_output .= '</div>';
- echo $success_html_output;
- echo $installed_langs_html;
+ // Package was installation successfull with detected languages
+ echo JText::_('PKG_PROJECTFORK_LANGUAGES_INSTALLED_DETECTED_SUCCESS') . $installed_langs_html;
}
return true;
diff --git a/installer/language/de-DE/de-DE.pkg_projectfork_languages.ini b/installer/language/de-DE/de-DE.pkg_projectfork_languages.ini
index 1767bc1..fabd815 100644
--- a/installer/language/de-DE/de-DE.pkg_projectfork_languages.ini
+++ b/installer/language/de-DE/de-DE.pkg_projectfork_languages.ini
@@ -3,13 +3,8 @@
; @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
; @note All ini files need to be saved as UTF-8 - No BOM
-PKG_PROJECTFORK_LANGUAGES_XML_DESC = "Sprachpaket für Projectfork 4, eine Project Management Erweiterung für Joomla!"
PKG_PROJECTFORK_LANGUAGES_PFNOTINSTALLED = "Projectfork %s wurde nicht gefunden!"
-PKG_PROJECTFORK_LANGUAGES_PFLASTINSTALLCHECK = "Bitte die folgenden Installationsschritte prüfen um sicher zu stellen, dass die Installation fehlerfrei durchgeführt wurde."
JLIB_INSTALLER_ABORT_PACKAGE_INSTALL_CUSTOM_INSTALL_FAILURE = "Die Installation der Projectfork Sprachpakete wurde abgebrochen. Um fortzufahren, muss Projectfork installiert sein!"
-PKG_PROJECTFORK_LANGUAGES_INSTALLNOW = "Jetzt installieren!"
-PKG_PROJECTFORK_LANGUAGES_DOWNLOAD_COMMUNITY = "Community-Version herunterladen!"
-PKG_PROJECTFORK_LANGUAGES_ORDER_PRO = "Pro-Version bestellen!"
-PKG_PROJECTFORK_LANGUAGES_NOTFULL_TRANSLATED = "Dieses Sprachpaket ist derzeit nicht vollstündig �bersetzt. Bitte besuchen sie unser %s für weitere Informationen und wie Sie sich daran beteiligen künnen!"
+PKG_PROJECTFORK_LANGUAGES_NOTFULL_TRANSLATED = "Dieses Sprachpaket ist derzeit nicht vollstündig übersetzt. Bitte besuchen sie unser %s für weitere Informationen und wie Sie sich daran beteiligen künnen!"
PKG_PROJECTFORK_LANGUAGES_ENGLISH_ONLY = "Your site is English only. There is no need to install an other Projectfork Language! If you want to install a different language, you have to install a different core language first!"
-PKG_PROJECTFORK_LANGUAGES_INSTALLED_DETECTED = "Installiere erkannte Sprachen:"
\ No newline at end of file
+PKG_PROJECTFORK_LANGUAGES_INSTALLED_DETECTED_SUCCESS = "Folgende Sprachen wurden erkannt und für Projectfork installiert:"
\ No newline at end of file
diff --git a/installer/language/en-GB/en-GB.pkg_projectfork_languages.ini b/installer/language/en-GB/en-GB.pkg_projectfork_languages.ini
index 47a1287..04be7ba 100644
--- a/installer/language/en-GB/en-GB.pkg_projectfork_languages.ini
+++ b/installer/language/en-GB/en-GB.pkg_projectfork_languages.ini
@@ -3,13 +3,8 @@
; @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
; @note All ini files need to be saved as UTF-8 - No BOM
-PKG_PROJECTFORK_LANGUAGES_XML_DESC = "Language Pack for Projectfork 4, a Project Management extension for Joomla!"
PKG_PROJECTFORK_LANGUAGES_PFNOTINSTALLED = "Projectfork %s not found!"
-PKG_PROJECTFORK_LANGUAGES_PFLASTINSTALLCHECK = "To ensure that the installation was performed correctly, please check the following installation steps."
JLIB_INSTALLER_ABORT_PACKAGE_INSTALL_CUSTOM_INSTALL_FAILURE = "The installation of the Projectfork Language-Package has been aborted. Please install Projectfork first!"
-PKG_PROJECTFORK_LANGUAGES_INSTALLNOW = "Install Now!"
-PKG_PROJECTFORK_LANGUAGES_DOWNLOAD_COMMUNITY = "Download Community!"
-PKG_PROJECTFORK_LANGUAGES_ORDER_PRO = "Order Pro!"
PKG_PROJECTFORK_LANGUAGES_NOTFULL_TRANSLATED = "This language is not full translated at this moment. Please visit our %s for more Informations and how to contribute to your language!"
PKG_PROJECTFORK_LANGUAGES_ENGLISH_ONLY = "Your site is English only. There\'s no need to install an other Projectfork Language! If you want to install a different language, you have to install a different core language first!"
-PKG_PROJECTFORK_LANGUAGES_INSTALLED_DETECTED = "Installed detected languages:"
\ No newline at end of file
+PKG_PROJECTFORK_LANGUAGES_INSTALLED_DETECTED_SUCCESS = "Successfully installed detected language for Projectfork:"
\ No newline at end of file
diff --git a/pkg_projectfork_languages.xml b/pkg_projectfork_languages.xml
index f6845e9..6502104 100644
--- a/pkg_projectfork_languages.xml
+++ b/pkg_projectfork_languages.xml
@@ -6,8 +6,8 @@
<author>Projectfork Translation Team</author>
<authorEmail>support@projectfork.net</authorEmail>
<authorUrl>http://www.projectfork.net</authorUrl>
- <copyright>(C) 2006 - 2013 Tobias Kuhn. All rights reserved.</copyright>
- <version>4.0.0</version>
+ <copyright>(C) 2012 - 2013 by the Projectfork Translation Team. All rights reserved.</copyright>
+ <version>4.0.0.0</version>
<updateable>fullupdate</updateable>
<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<description></description>
--
Gitblit v1.9.1