Version 3.2.1

luigifab · Feb 24, 2016 · 9fda255 · 9fda255
1 parent ee778c3
commit 9fda255
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 47 deletions.
diff --git 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.2.0 released on 23/02/2016.
+Version 3.2.1 released on 24/02/2016.
diff --git a/app/code/community/Luigifab/Versioning/etc/config.xml b/app/code/community/Luigifab/Versioning/etc/config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
  * Created S/03/12/2011
- * Updated S/20/02/2016
+ * Updated W/24/02/2016
  * Version 28
  *
  * Copyright 2011-2016 | Fabrice Creuzot (luigifab) <code~luigifab~info>
@@ -21,7 +21,7 @@
 <config>
 	<modules>
 		<Luigifab_Versioning>
-			<version>3.2.0</version>
+			<version>3.2.1</version>
 		</Luigifab_Versioning>
 	</modules>
 	<global>

diff --git a/app/design/adminhtml/default/default/layout/luigifab/versioning.xml b/app/design/adminhtml/default/default/layout/luigifab/versioning.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
  * Created S/03/12/2011
- * Updated L/22/02/2016
- * Version 22
+ * Updated W/24/02/2016
+ * Version 23
  *
  * Copyright 2011-2016 | Fabrice Creuzot (luigifab) <code~luigifab~info>
  * https://redmine.luigifab.info/projects/magento/wiki/versioning
@@ -98,17 +98,15 @@
 	</adminhtml_versioning_repository_confirm>
 
 	<adminhtml_index_login>
-		<block type="adminhtml/template" name="root" output="toHtml" template="login.phtml" />
-		<reference name="root">
+		<reference name="content">
 			<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">
+		<reference name="content">
 			<action method="setTemplate" ifconfig="versioning/scm/login">
 				<template>luigifab/versioning/forgotpassword.phtml</template>
 			</action>

diff --git a/app/design/adminhtml/default/default/template/luigifab/versioning/forgotpassword.phtml b/app/design/adminhtml/default/default/template/luigifab/versioning/forgotpassword.phtml
@@ -1,8 +1,8 @@
 <?php
 /**
  * Created S/20/02/2016
- * Updated L/22/02/2016
- * Version 2
+ * Updated W/24/02/2016
+ * Version 3
  *
  * Copyright 2011-2016 | Fabrice Creuzot (luigifab) <code~luigifab~info>
  * https://redmine.luigifab.info/projects/magento/wiki/versioning
@@ -23,7 +23,7 @@ $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>
+	<title><?php echo $this->__('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" />
@@ -38,33 +38,30 @@ $lang = substr(Mage::app()->getLocale()->getLocaleCode(), 0, 2);
 	<script type="text/javascript" src="<?php echo $this->getJsUrl('mage/captcha.js') ?>"></script>
 </head>
 
-<body id="page-login" onload="document.getElementById('email').focus();">
+<body id="page-login">
 	<div class="login-container">
 		<div class="login-box">
-			<form method="post" action="" id="loginForm">
+			<form method="post" action="">
 				<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>
+					<h2><?php echo $this->__('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;" />
+						<label for="email"><?php echo $this->__('Email Address:') ?></label>
+						<br /><input type="text" name="email" class="required-entry input-text validate-email" id="email" required="required" autofocus="autofocus" 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') ?>" />
+						<a href="<?php echo $this->getUrl('adminhtml', array('_nosecret' => true)) ?>" class="left"><?php echo $this->__('Back to Login') ?></a>
+						<input type="submit" class="form-button" value="<?php echo $this->__('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>
+				<p class="legal"><?php echo $this->__('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>
+	<p class="credits"><?php echo $this->helper('versioning')->__('Martian sunset by Spirit.') ?></p>
 </body>
 </html>
diff --git a/app/design/adminhtml/default/default/template/luigifab/versioning/login.phtml b/app/design/adminhtml/default/default/template/luigifab/versioning/login.phtml
@@ -1,8 +1,8 @@
 <?php
 /**
  * Created S/20/02/2016
- * Updated L/22/02/2016
- * Version 2
+ * Updated W/24/02/2016
+ * Version 3
  *
  * Copyright 2011-2016 | Fabrice Creuzot (luigifab) <code~luigifab~info>
  * https://redmine.luigifab.info/projects/magento/wiki/versioning
@@ -23,7 +23,7 @@ $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>
+	<title><?php echo $this->__('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" />
@@ -38,37 +38,34 @@ $lang = substr(Mage::app()->getLocale()->getLocaleCode(), 0, 2);
 	<script type="text/javascript" src="<?php echo $this->getJsUrl('mage/captcha.js') ?>"></script>
 </head>
 
-<body id="page-login" onload="document.getElementById('username').focus();">
+<body id="page-login">
 	<div class="login-container">
 		<div class="login-box">
-			<form method="post" action="" id="loginForm">
+			<form method="post" action="">
 				<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>
+					<h2><?php echo $this->__('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" />
+						<label for="username"><?php echo $this->__('User Name:') ?></label>
+						<br /><input type="text" name="login[username]" class="required-entry input-text" id="username" required="required" autofocus="autofocus" />
 					</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" />
+						<label for="login"><?php echo $this->__('Password:') ?></label>
+						<br /><input type="password" name="login[password]" class="required-entry input-text" id="login" required="required" />
 					</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') ?>" />
+						<a class="left" href="<?php echo $this->helper('adminhtml')->getUrl('adminhtml/index/forgotpassword', array('_nosecret' => true)) ?>"><?php echo $this->__('Forgot your password?') ?></a>
+						<input type="submit" class="form-button" value="<?php echo $this->__('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>
+				<p class="legal"><?php echo $this->__('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>
+	<p class="credits"><?php echo $this->helper('versioning')->__('Martian sunset by Spirit.') ?></p>
 </body>
 </html>
diff --git a/app/locale/fr_CA/Luigifab_Versioning.csv b/app/locale/fr_CA/Luigifab_Versioning.csv
@@ -4,7 +4,7 @@
 "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+."
+"For Magento 1.7+.","À partir de 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>)"

diff --git a/app/locale/fr_FR/Luigifab_Versioning.csv b/app/locale/fr_FR/Luigifab_Versioning.csv
@@ -4,7 +4,7 @@
 "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+."
+"For Magento 1.7+.","À partir de 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>)"
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.2.0 released on 23/02/2016.
		Version 3.2.1 released on 24/02/2016.