From ee778c3b8b5b28acdcfdbe442082315c9522b4b9 Mon Sep 17 00:00:00 2001 From: Fabrice Creuzot Date: Tue, 23 Feb 2016 20:00:00 +0200 Subject: [PATCH] Version 3.2.0 --- README.md | 2 +- .../Versioning/Block/Adminhtml/Repository.php | 8 +- .../Block/Adminhtml/Repository/Grid.php | 6 +- .../Versioning/RepositoryController.php | 6 +- .../Luigifab/Versioning/etc/config.xml | 4 +- .../Luigifab/Versioning/etc/system.xml | 14 +++- .../default/layout/luigifab/versioning.xml | 26 +++++-- .../luigifab/versioning/confirm.phtml | 13 +--- .../luigifab/versioning/forgotpassword.phtml | 70 ++++++++++++++++++ .../template/luigifab/versioning/login.phtml | 74 +++++++++++++++++++ app/locale/fr_CA/Luigifab_Versioning.csv | 4 +- app/locale/fr_FR/Luigifab_Versioning.csv | 4 +- package.xml | 10 +-- .../css/luigifab/versioning/styles.css | 20 ++++- .../css/luigifab/versioning/styles.min.css | 13 +++- .../js/luigifab/versioning/innersvg.min.js | 2 +- .../js/luigifab/versioning/raphael.min.js | 5 +- 17 files changed, 236 insertions(+), 45 deletions(-) create mode 100644 app/design/adminhtml/default/default/template/luigifab/versioning/forgotpassword.phtml create mode 100644 app/design/adminhtml/default/default/template/luigifab/versioning/login.phtml diff --git a/README.md b/README.md index 537e3ed..483611a 100644 --- a/README.md +++ b/README.md @@ -4,4 +4,4 @@ For more information, go to https://www.luigifab.fr/magento/versioning (IPv6 is This repository is a mirror. To install the module, please use the extension key available in the documentation. If you like, take some of your time to improve the translations, go to https://bit.ly/2HyCCEc. -Version 3.1.1 released on 03/01/2016. +Version 3.2.0 released on 23/02/2016. diff --git a/app/code/community/Luigifab/Versioning/Block/Adminhtml/Repository.php b/app/code/community/Luigifab/Versioning/Block/Adminhtml/Repository.php index 85fea36..0c9ec1d 100644 --- a/app/code/community/Luigifab/Versioning/Block/Adminhtml/Repository.php +++ b/app/code/community/Luigifab/Versioning/Block/Adminhtml/Repository.php @@ -1,8 +1,8 @@ * https://redmine.luigifab.info/projects/magento/wiki/versioning @@ -42,7 +42,7 @@ public function __construct() { else { $this->_addButton('maintenance_flag', array( 'label' => $this->__('Enable maintenace page'), - 'onclick' => "versioning.confirmFlag(this, '".$this->getUrl('*/*/addMaintenanceFlag')."', this.textContent, '".addslashes($this->helper('versioning')->getMaintenanceInfo(true))."', '".addslashes($this->__('Martian sunset. Spirit at Gusev crater.'))."');" + 'onclick' => "versioning.confirmFlag(this, '".$this->getUrl('*/*/addMaintenanceFlag')."', this.textContent, '".addslashes($this->helper('versioning')->getMaintenanceInfo(true))."', '".addslashes($this->__('Martian sunset by Spirit.'))."');" )); } @@ -56,7 +56,7 @@ public function __construct() { else { $this->_addButton('upgrade_flag', array( 'label' => $this->__('Enable upgrade page'), - 'onclick' => "versioning.confirmFlag(this, '".$this->getUrl('*/*/addUpgradeFlag')."', this.textContent, '".addslashes($this->helper('versioning')->getUpgradeInfo(true))."', '".addslashes($this->__('Martian sunset. Spirit at Gusev crater.'))."');" + 'onclick' => "versioning.confirmFlag(this, '".$this->getUrl('*/*/addUpgradeFlag')."', this.textContent, '".addslashes($this->helper('versioning')->getUpgradeInfo(true))."', '".addslashes($this->__('Martian sunset by Spirit.'))."');" )); } diff --git a/app/code/community/Luigifab/Versioning/Block/Adminhtml/Repository/Grid.php b/app/code/community/Luigifab/Versioning/Block/Adminhtml/Repository/Grid.php index cac5eee..00052fc 100644 --- a/app/code/community/Luigifab/Versioning/Block/Adminhtml/Repository/Grid.php +++ b/app/code/community/Luigifab/Versioning/Block/Adminhtml/Repository/Grid.php @@ -1,8 +1,8 @@ * https://redmine.luigifab.info/projects/magento/wiki/versioning @@ -96,7 +96,7 @@ protected function _prepareColumns() { 'caption' => $this->__('Deliver'), 'url' => array('base' => '*/*/upgrade'), 'field' => 'revision', - 'onclick' => 'return versioning.confirmUpgrade(this.href, "'.addslashes($this->__('Upgrade to revision %s', '§')).'", "'.addslashes($this->helper('versioning')->getFields(true)).'", "'.addslashes($this->__('Martian sunset. Spirit at Gusev crater.')).'");' + 'onclick' => 'return versioning.confirmUpgrade(this.href, "'.addslashes($this->__('Upgrade to revision %s', '§')).'", "'.addslashes($this->helper('versioning')->getFields(true)).'", "'.addslashes($this->__('Martian sunset by Spirit.')).'");' ) ), 'align' => 'center', diff --git a/app/code/community/Luigifab/Versioning/controllers/Versioning/RepositoryController.php b/app/code/community/Luigifab/Versioning/controllers/Versioning/RepositoryController.php index 69ef31e..696a887 100644 --- a/app/code/community/Luigifab/Versioning/controllers/Versioning/RepositoryController.php +++ b/app/code/community/Luigifab/Versioning/controllers/Versioning/RepositoryController.php @@ -1,8 +1,8 @@ * https://redmine.luigifab.info/projects/magento/wiki/versioning @@ -217,7 +217,7 @@ public function upgradeAction() { echo "\n",''; echo "\n",''; - echo "\n",'

'.$this->__('Martian sunset. Spirit at Gusev crater.').'

'; + echo "\n",'

'.$this->__('Martian sunset by Spirit.').'

'; echo "\n",'
'; echo "\n",'
'; echo "\n",'

',$this->__('Starting upgrade (revision %s)', $revision),''; diff --git a/app/code/community/Luigifab/Versioning/etc/config.xml b/app/code/community/Luigifab/Versioning/etc/config.xml index 322be3f..897643d 100644 --- a/app/code/community/Luigifab/Versioning/etc/config.xml +++ b/app/code/community/Luigifab/Versioning/etc/config.xml @@ -1,7 +1,7 @@