Skip to content

Commit

Permalink
Version 3.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
luigifab committed Feb 23, 2016
1 parent a7da074 commit ee778c3
Show file tree
Hide file tree
Showing 17 changed files with 236 additions and 45 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
/**
* Created S/03/12/2011
* Updated S/04/04/2015
* Version 32
* Updated S/20/02/2016
* Version 33
*
* Copyright 2011-2016 | Fabrice Creuzot (luigifab) <code~luigifab~info>
* https://redmine.luigifab.info/projects/magento/wiki/versioning
Expand Down Expand Up @@ -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.'))."');"
));
}

Expand All @@ -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.'))."');"
));
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
/**
* Created S/03/12/2011
* Updated S/11/04/2015
* Version 40
* Updated S/20/02/2016
* Version 41
*
* Copyright 2011-2016 | Fabrice Creuzot (luigifab) <code~luigifab~info>
* https://redmine.luigifab.info/projects/magento/wiki/versioning
Expand Down Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
/**
* Created S/03/12/2011
* Updated S/28/03/2015
* Version 37
* Updated S/20/02/2016
* Version 38
*
* Copyright 2011-2016 | Fabrice Creuzot (luigifab) <code~luigifab~info>
* https://redmine.luigifab.info/projects/magento/wiki/versioning
Expand Down Expand Up @@ -217,7 +217,7 @@ public function upgradeAction() {
echo "\n",'</head>';

echo "\n",'<body>';
echo "\n",'<p class="credits">'.$this->__('Martian sunset. Spirit at Gusev crater.').'</p>';
echo "\n",'<p class="credits">'.$this->__('Martian sunset by Spirit.').'</p>';
echo "\n",'<div class="obj"><object data="',Mage::getDesign()->getSkinUrl('images/luigifab/versioning/info.svg'),'" type="image/svg+xml" width="100" height="70" id="state"></object></div>';
echo "\n",'<div class="ctn" id="scroll">';
echo "\n",'<p class="first"><strong>',$this->__('Starting upgrade (revision %s)', $revision),'</strong>';
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Luigifab/Versioning/etc/config.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
* Created S/03/12/2011
* Updated W/02/12/2015
* Updated S/20/02/2016
* Version 28
*
* Copyright 2011-2016 | Fabrice Creuzot (luigifab) <code~luigifab~info>
Expand All @@ -21,7 +21,7 @@
<config>
<modules>
<Luigifab_Versioning>
<version>3.1.1</version>
<version>3.2.0</version>
</Luigifab_Versioning>
</modules>
<global>
Expand Down
14 changes: 12 additions & 2 deletions app/code/community/Luigifab/Versioning/etc/system.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
* Created S/03/12/2011
* Updated M/01/09/2015
* Version 46
* Updated S/20/02/2016
* Version 47
*
* Copyright 2011-2016 | Fabrice Creuzot (luigifab) <code~luigifab~info>
* https://redmine.luigifab.info/projects/magento/wiki/versioning
Expand Down Expand Up @@ -93,6 +93,16 @@
<show_in_website>0</show_in_website>
<show_in_store>0</show_in_store>
</bugtracker>
<login translate="label comment">
<label>Customize login page</label>
<comment>For Magento 1.7+.</comment>
<frontend_type>select</frontend_type>
<source_model>adminhtml/system_config_source_yesno</source_model>
<sort_order>13</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>0</show_in_website>
<show_in_store>0</show_in_store>
</login>
</fields>
</scm>
<downtime translate="label comment">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
* Created S/03/12/2011
* Updated L/30/03/2015
* Version 20
* Updated L/22/02/2016
* Version 22
*
* Copyright 2011-2016 | Fabrice Creuzot (luigifab) <code~luigifab~info>
* https://redmine.luigifab.info/projects/magento/wiki/versioning
Expand Down Expand Up @@ -94,8 +94,24 @@
</adminhtml_versioning_repository_history>

<adminhtml_versioning_repository_confirm>
<reference name="content">
<block type="core/template" name="root" template="luigifab/versioning/confirm.phtml" />
</reference>
<block type="core/template" name="root" output="toHtml" template="luigifab/versioning/confirm.phtml" />
</adminhtml_versioning_repository_confirm>

<adminhtml_index_login>
<block type="adminhtml/template" name="root" output="toHtml" template="login.phtml" />
<reference name="root">
<action method="setTemplate" ifconfig="versioning/scm/login">
<template>luigifab/versioning/login.phtml</template>
</action>
</reference>
</adminhtml_index_login>

<adminhtml_index_forgotpassword>
<block type="adminhtml/template" name="root" output="toHtml" template="forgotpassword.phtml" />
<reference name="root">
<action method="setTemplate" ifconfig="versioning/scm/login">
<template>luigifab/versioning/forgotpassword.phtml</template>
</action>
</reference>
</adminhtml_index_forgotpassword>
</layout>
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
/**
* Created S/09/02/2013
* Updated L/30/03/2015
* Version 14
* Updated S/20/02/2016
* Version 15
*
* Copyright 2011-2016 | Fabrice Creuzot (luigifab) <code~luigifab~info>
* https://redmine.luigifab.info/projects/magento/wiki/versioning
Expand All @@ -28,20 +28,15 @@ $lang = substr(Mage::app()->getLocale()->getLocaleCode(), 0, 2);
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Language" content="<?php echo $lang ?>" />

<link rel="stylesheet" type="text/css" charset="utf-8" media="screen" href="<?php echo $this->getSkinUrl('reset.css') ?>" />
<link rel="stylesheet" type="text/css" charset="utf-8" media="screen" href="<?php echo $this->getSkinUrl('boxes.css') ?>" />
<link rel="stylesheet" type="text/css" charset="utf-8" media="screen" href="<?php echo $this->getSkinUrl('css/luigifab/versioning/styles.min.css') ?>" />
<link rel="icon" type="image/x-icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" />

<script type="text/javascript" charset="utf-8" src="<?php echo $this->getSkinUrl('js/luigifab/versioning/app.min.js') ?>"></script>
</head>


<body class="adminhtml-versioning-repository-confirm">

<form action="<?php echo $this->helper('adminhtml')->getUrl('*/*/upgrade', array('revision' => $this->getRequest()->getParam('revision'), 'confirm' => '1')) ?>" method="get" onsubmit="versioning.valid('<?php echo $this->__('Operation in progress...') ?>');">

<h1 class="<?php echo Mage::getStoreConfig('versioning/scm/type') ?>"><?php echo $this->__('Upgrade to revision %s', $this->getRequest()->getParam('revision')) ?></h1>
<div class="bbcode">
<?php echo $this->helper('versioning')->getFields() ?>
Expand All @@ -51,8 +46,6 @@ $lang = substr(Mage::app()->getLocale()->getLocaleCode(), 0, 2);
<button type="button" class="back" onclick="versioning.valid('<?php echo $this->helper('adminhtml')->getUrl('*/versioning_repository/index') ?>');"><?php echo $this->helper('adminhtml')->__('Cancel') ?></button>
</div>
</form>

<p class="credits"><?php echo $this->__('Martian sunset. Spirit at Gusev crater.') ?></p>

<p class="credits"><?php echo $this->__('Martian sunset by Spirit.') ?></p>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<?php
/**
* Created S/20/02/2016
* Updated L/22/02/2016
* Version 2
*
* Copyright 2011-2016 | Fabrice Creuzot (luigifab) <code~luigifab~info>
* https://redmine.luigifab.info/projects/magento/wiki/versioning
*
* This program is free software, you can redistribute it or modify
* it under the terms of the GNU General Public License (GPL) as published
* by the free software foundation, either version 2 of the license, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but without any warranty, without even the implied warranty of
* merchantability or fitness for a particular purpose. See the
* GNU General Public License (GPL) for more details.
*/

$lang = substr(Mage::app()->getLocale()->getLocaleCode(), 0, 2);

?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $lang ?>" lang="<?php echo $lang ?>" style="height:100%;">
<head>
<title><?php echo $this->helper('adminhtml')->__('Log into Magento Admin Page'),' - ',Mage::getStoreConfig('design/head/default_title') ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Language" content="<?php echo $lang ?>" />
<link rel="stylesheet" type="text/css" charset="utf-8" media="screen" href="<?php echo $this->getSkinUrl('reset.css') ?>" />
<link rel="stylesheet" type="text/css" charset="utf-8" media="screen" href="<?php echo $this->getSkinUrl('boxes.css') ?>" />
<link rel="stylesheet" type="text/css" charset="utf-8" media="screen" href="<?php echo $this->getSkinUrl('css/luigifab/versioning/styles.min.css') ?>" />
<link rel="icon" type="image/x-icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" />
<script type="text/javascript" src="<?php echo $this->getJsUrl('prototype/prototype.js') ?>"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('prototype/validation.js') ?>"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('mage/adminhtml/form.js') ?>"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('mage/captcha.js') ?>"></script>
</head>

<body id="page-login" onload="document.getElementById('email').focus();">
<div class="login-container">
<div class="login-box">
<form method="post" action="" id="loginForm">
<div class="login-form">
<input name="form_key" type="hidden" value="<?php echo Mage::getSingleton('core/session')->getFormKey() ?>" />
<h2><?php echo $this->helper('adminhtml')->__('Forgot your user name or password?') ?></h2>
<div id="messages"><?php echo $this->getMessagesBlock()->getGroupedHtml() ?></div>
<div class="input-box forgot-password">
<label for="email"><?php echo $this->helper('adminhtml')->__('Email Address:') ?></label>
<br /><input type="text" name="email" class="required-entry input-text validate-email" id="email" style="width:461px;" />
</div>
<?php echo $this->getChildHtml('form.additional.info') ?>
<div class="clear"></div>
<div class="form-buttons">
<a href="<?php echo $this->getUrl('adminhtml', array('_nosecret' => true)) ?>" class="left"><?php echo $this->helper('adminhtml')->__('Back to Login') ?></a>
<input type="submit" class="form-button" value="<?php echo $this->helper('adminhtml')->__('Retrieve Password') ?>" />
</div>
</div>
<p class="legal"><?php echo $this->helper('adminhtml')->__('Magento is a trademark of Magento Inc. Copyright &copy; %s Magento Inc.', date('Y')) ?></p>
</form>
<div class="bottom"></div>
<script type="text/javascript">
var loginForm = new varienForm('loginForm');
</script>
</div>
</div>
<p class="credits"><?php echo $this->__('Martian sunset by Spirit.') ?></p>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
<?php
/**
* Created S/20/02/2016
* Updated L/22/02/2016
* Version 2
*
* Copyright 2011-2016 | Fabrice Creuzot (luigifab) <code~luigifab~info>
* https://redmine.luigifab.info/projects/magento/wiki/versioning
*
* This program is free software, you can redistribute it or modify
* it under the terms of the GNU General Public License (GPL) as published
* by the free software foundation, either version 2 of the license, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but without any warranty, without even the implied warranty of
* merchantability or fitness for a particular purpose. See the
* GNU General Public License (GPL) for more details.
*/

$lang = substr(Mage::app()->getLocale()->getLocaleCode(), 0, 2);

?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $lang ?>" lang="<?php echo $lang ?>" style="height:100%;">
<head>
<title><?php echo $this->helper('adminhtml')->__('Log into Magento Admin Page'),' - ',Mage::getStoreConfig('design/head/default_title') ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Language" content="<?php echo $lang ?>" />
<link rel="stylesheet" type="text/css" charset="utf-8" media="screen" href="<?php echo $this->getSkinUrl('reset.css') ?>" />
<link rel="stylesheet" type="text/css" charset="utf-8" media="screen" href="<?php echo $this->getSkinUrl('boxes.css') ?>" />
<link rel="stylesheet" type="text/css" charset="utf-8" media="screen" href="<?php echo $this->getSkinUrl('css/luigifab/versioning/styles.min.css') ?>" />
<link rel="icon" type="image/x-icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" />
<script type="text/javascript" src="<?php echo $this->getJsUrl('prototype/prototype.js') ?>"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('prototype/validation.js') ?>"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('mage/adminhtml/form.js') ?>"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('mage/captcha.js') ?>"></script>
</head>

<body id="page-login" onload="document.getElementById('username').focus();">
<div class="login-container">
<div class="login-box">
<form method="post" action="" id="loginForm">
<div class="login-form">
<input name="form_key" type="hidden" value="<?php echo Mage::getSingleton('core/session')->getFormKey() ?>" />
<h2><?php echo $this->helper('adminhtml')->__('Log in to Admin Panel') ?></h2>
<div id="messages"><?php echo $this->getMessagesBlock()->getGroupedHtml() ?></div>
<div class="input-box input-left">
<label for="username"><?php echo $this->helper('adminhtml')->__('User Name:') ?></label>
<br /><input type="text" name="login[username]" class="required-entry input-text" id="username" />
</div>
<div class="input-box input-right">
<label for="login"><?php echo $this->helper('adminhtml')->__('Password:') ?></label>
<br /><input type="password" name="login[password]" class="required-entry input-text" id="login" />
</div>
<?php echo $this->getChildHtml('form.additional.info') ?>
<div class="clear"></div>
<div class="form-buttons">
<a class="left" href="<?php echo $this->helper('adminhtml')->getUrl('adminhtml/index/forgotpassword', array('_nosecret' => true)) ?>"><?php echo $this->helper('adminhtml')->__('Forgot your password?') ?></a>
<input type="submit" class="form-button" value="<?php echo $this->helper('adminhtml')->__('Login') ?>" />
</div>
</div>
<p class="legal"><?php echo $this->helper('adminhtml')->__('Magento is a trademark of Magento Inc. Copyright &copy; %s Magento Inc.', date('Y')) ?></p>
</form>
<div class="bottom"></div>
<script type="text/javascript">
var loginForm = new varienForm('loginForm');
</script>
</div>
</div>
<p class="credits"><?php echo $this->__('Martian sunset by Spirit.') ?></p>
</body>
</html>
4 changes: 3 additions & 1 deletion app/locale/fr_CA/Luigifab_Versioning.csv
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
"Versioning","Gestionnaire de version"
"Number of commits per page","Nombre de commits par page"
"Bug tracker","Gestionnaire de projet"
"Customize login page","Personnaliser la page de connexion"
"For Magento 1.7+.","Pour Magento 1.7+."
"Downtime pages","Pages de maintenance"
"Warning! Here, [store view] = [lang].<br />The <em>maintenace.flag</em> page takes priority over the <em>upgrade.flag</em> page.","Attention ! Ici, [vue magasin] = [langue].<br />La page <em lang=""en"">maintenace.flag</em> à priorité sur la page <em lang=""en"">upgrade.flag</em>."
"Error 503 (maintenance.flag)","Erreur 503 (<span lang=""en"">maintenance.flag</span>)"
Expand Down Expand Up @@ -33,7 +35,7 @@
"Commit history (<span id=""scmtype"">%s</span>)","Historique des commits (<span id=""scmtype"">%s</span>)"
"Remove maintenace page","Enlever la page de maintenance"
"Enable maintenace page","Activer la page de maintenance"
"Martian sunset. Spirit at Gusev crater.","Coucher de soleil sur Mars. Image prise par Spirit dans le Cratère Gusev."
"Martian sunset by Spirit.","Coucher de soleil sur Mars vu par Spirit."
"Remove upgrade page","Enlever la page de mise à jour"
"Enable upgrade page","Activer la page de mise à jour"
"Upgrades log","Historique des mises à jour"
Expand Down
4 changes: 3 additions & 1 deletion app/locale/fr_FR/Luigifab_Versioning.csv
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
"Versioning","Gestionnaire de version"
"Number of commits per page","Nombre de commits par page"
"Bug tracker","Gestionnaire de projet"
"Customize login page","Personnaliser la page de connexion"
"For Magento 1.7+.","Pour Magento 1.7+."
"Downtime pages","Pages de maintenance"
"Warning! Here, [store view] = [lang].<br />The <em>maintenace.flag</em> page takes priority over the <em>upgrade.flag</em> page.","Attention ! Ici, [vue magasin] = [langue].<br />La page <em lang=""en"">maintenace.flag</em> à priorité sur la page <em lang=""en"">upgrade.flag</em>."
"Error 503 (maintenance.flag)","Erreur 503 (<span lang=""en"">maintenance.flag</span>)"
Expand Down Expand Up @@ -33,7 +35,7 @@
"Commit history (<span id=""scmtype"">%s</span>)","Historique des commits (<span id=""scmtype"">%s</span>)"
"Remove maintenace page","Enlever la page de maintenance"
"Enable maintenace page","Activer la page de maintenance"
"Martian sunset. Spirit at Gusev crater.","Coucher de soleil sur Mars. Image prise par Spirit dans le Cratère Gusev."
"Martian sunset by Spirit.","Coucher de soleil sur Mars vu par Spirit."
"Remove upgrade page","Enlever la page de mise à jour"
"Enable upgrade page","Activer la page de mise à jour"
"Upgrades log","Historique des mises à jour"
Expand Down
Loading

0 comments on commit ee778c3

Please sign in to comment.