[Piwik-svn] r390 - in trunk: lang modules/SmartyPlugins plugins/AdminHome plugins/Home/templates plugins/Installation plugins/Installation/templates plugins/Login plugins/Login/templates plugins/PluginsAdmin
svnmaster at piwik.org
svnmaster at piwik.org
Wed Mar 19 02:31:20 CET 2008
Author: matt
Date: 2008-03-19 02:31:11 +0100 (Wed, 19 Mar 2008)
New Revision: 390
Modified:
trunk/lang/en.php
trunk/lang/fr.php
trunk/modules/SmartyPlugins/modifier.translate.php
trunk/plugins/AdminHome/Controller.php
trunk/plugins/Home/templates/index.tpl
trunk/plugins/Installation/Controller.php
trunk/plugins/Installation/templates/systemCheck.tpl
trunk/plugins/Login/Form.php
trunk/plugins/Login/templates/login.css
trunk/plugins/Login/templates/login.tpl
trunk/plugins/PluginsAdmin/Controller.php
Log:
- fix #143
- refs #62: started work, prepared Piwik_Translate, the smarty modifier, translated the Login plugin in french & english as a use case
- fixed redirection bug in safari
Modified: trunk/lang/en.php
===================================================================
--- trunk/lang/en.php 2008-03-19 00:52:46 UTC (rev 389)
+++ trunk/lang/en.php 2008-03-19 01:31:11 UTC (rev 390)
@@ -3,9 +3,9 @@
'General_Unknown' => 'Unknown',
'General_Required' => '%s required',
- 'Login_LoginPasswordNotCorrect' => 'login & password not correct',
- 'Login_Go' => 'Go!',
- 'Login_login' => 'login:',
- 'Login_password' => 'pass:',
+ 'Login_LoginPasswordNotCorrect' => 'Username & Password not correct',
+ 'Login_Login' => 'Username',
+ 'Login_Password' => 'Password',
+ 'Login_LogIn' => 'Log in',
);
\ No newline at end of file
Modified: trunk/lang/fr.php
===================================================================
--- trunk/lang/fr.php 2008-03-19 00:52:46 UTC (rev 389)
+++ trunk/lang/fr.php 2008-03-19 01:31:11 UTC (rev 390)
@@ -3,9 +3,9 @@
'General_Unknown' => 'Inconnu',
'General_Required' => '%s requis',
- 'Login_LoginPasswordNotCorrect' => 'login & mot de passe non valides',
- 'Login_Go' => 'Go!',
- 'Login_login' => 'login:',
- 'Login_password' => 'pass:',
+ 'Login_LoginPasswordNotCorrect' => 'Utilisateur & Mot de passe not correct',
+ 'Login_Login' => 'Utilisateur',
+ 'Login_Password' => 'Mot de passe',
+ 'Login_LogIn' => 'Log in',
);
Modified: trunk/modules/SmartyPlugins/modifier.translate.php
===================================================================
--- trunk/modules/SmartyPlugins/modifier.translate.php 2008-03-19 00:52:46 UTC (rev 389)
+++ trunk/modules/SmartyPlugins/modifier.translate.php 2008-03-19 01:31:11 UTC (rev 390)
@@ -17,8 +17,6 @@
*
* {'General_Unknown'|translate} will be translated as 'Unknown' (see the entry in /lang/en.php)
*
- *
- *
*/
function smarty_modifier_translate($string, $aValues = null)
{
@@ -30,5 +28,5 @@
{
$aValues = array( $aValues);
}
- return vsprintf($translations[$string], $aValues);
+ return vsprintf(Piwik_Translate($string), $aValues);
}
\ No newline at end of file
Modified: trunk/plugins/AdminHome/Controller.php
===================================================================
--- trunk/plugins/AdminHome/Controller.php 2008-03-19 00:52:46 UTC (rev 389)
+++ trunk/plugins/AdminHome/Controller.php 2008-03-19 01:31:11 UTC (rev 390)
@@ -25,7 +25,7 @@
}
function redirectToIndex()
{
- header("Location:?module=AdminHome&action=showInContext&moduleToLoad=PluginsAdmin");
+ header("Location:index.php?module=AdminHome&action=showInContext&moduleToLoad=PluginsAdmin");
}
public function showInContext()
Modified: trunk/plugins/Home/templates/index.tpl
===================================================================
--- trunk/plugins/Home/templates/index.tpl 2008-03-19 00:52:46 UTC (rev 389)
+++ trunk/plugins/Home/templates/index.tpl 2008-03-19 01:31:11 UTC (rev 390)
@@ -98,14 +98,15 @@
}
#h1, #h1 a {
- color: #006;
+ color: #136F8B;
font-size: 45px;
font-weight: lighter;
text-decoration : none;
+ margin:5px;
}
#subh1 {
- color: #879DBD;
+ color: #879dbd;
font-size: 25px;
font-weight: lighter;
}
Modified: trunk/plugins/Installation/Controller.php
===================================================================
--- trunk/plugins/Installation/Controller.php 2008-03-19 00:52:46 UTC (rev 389)
+++ trunk/plugins/Installation/Controller.php 2008-03-19 01:31:11 UTC (rev 390)
@@ -444,6 +444,21 @@
$infos['pdo_mysql_ok'] = true;
}
+ $infos['gd_ok'] = false;
+ // Gd version
+ if (in_array('gd', $extensions))
+ {
+ $gdInfo = gd_info();
+
+ $infos['gd_version'] = $gdInfo['GD Version'];
+
+ ereg ("([0-9]{1})", $gdInfo['GD Version'], $gdVersion);
+ if($gdVersion[0] >= 2)
+ {
+ $infos['gd_ok'] = true;
+ }
+ }
+
// server version
$infos['serverVersion'] = addslashes($_SERVER['SERVER_SOFTWARE']);
Modified: trunk/plugins/Installation/templates/systemCheck.tpl
===================================================================
--- trunk/plugins/Installation/templates/systemCheck.tpl 2008-03-19 00:52:46 UTC (rev 389)
+++ trunk/plugins/Installation/templates/systemCheck.tpl 2008-03-19 01:31:11 UTC (rev 390)
@@ -80,12 +80,22 @@
<td class="label">Memory limit</td>
<td>
{$infos.memoryCurrent}
- {if $infos.memory_ok}{$ok}{else}{$warning}{/if}
+ {if $infos.memory_ok}{$ok}{else}{$warning}
+ <br><i>On a high traffic website, the archiving process may require more memory than currently allowed.
+ <br>See the directive memory_limit in your php.ini file if necessary.</i>{/if}
</td>
</tr>
<tr>
+ <td class="label">GD > 2.x (graphics)</td>
+ <td>
+ {if $infos.gd_ok}{$ok}{else}{$warning} <br><i>The sparklines (small graphs) will not work.</i>{/if}
+ </td>
+ </tr>
+ <tr>
<td class="label">set_time_limit() allowed</td>
- <td>{if $infos.setTimeLimit_ok}{$ok}{else}{$warning}{/if}</td>
+ <td>{if $infos.setTimeLimit_ok}{$ok}{else}{$warning}
+ <br><i>On a high traffic website, executing the archiving process may require more time than currently allowed.
+ <br>See the directive max_execution_time in your php.ini file if necessary.</i>{/if}</td>
</tr>
<tr>
<td class="label">mail() allowed</td>
Modified: trunk/plugins/Login/Form.php
===================================================================
--- trunk/plugins/Login/Form.php 2008-03-19 00:52:46 UTC (rev 389)
+++ trunk/plugins/Login/Form.php 2008-03-19 01:31:11 UTC (rev 390)
@@ -35,19 +35,19 @@
}
$formElements = array(
- array('text', 'form_login', Piwik_Translate('Login_login')),
- array('password', 'form_password', Piwik_Translate('Login_password')),
+ array('text', 'form_login'),
+ array('password', 'form_password'),
array('hidden', 'form_url', $urlToGoAfter),
);
$this->addElements( $formElements );
$formRules = array(
- array('form_login', sprintf(Piwik_Translate('General_Required'), 'login'), 'required'),
- array('form_password', sprintf(Piwik_Translate('General_Required'), 'password'), 'required'),
+ array('form_login', sprintf(Piwik_Translate('General_Required'), Piwik_Translate('Login_Login')), 'required'),
+ array('form_password', sprintf(Piwik_Translate('General_Required'), Piwik_Translate('Login_Password')), 'required'),
);
$this->addRules( $formRules );
- $this->addElement('submit', 'submit', Piwik_Translate('Login_Go'));
+ $this->addElement('submit', 'submit');
}
Modified: trunk/plugins/Login/templates/login.css
===================================================================
--- trunk/plugins/Login/templates/login.css 2008-03-19 00:52:46 UTC (rev 389)
+++ trunk/plugins/Login/templates/login.css 2008-03-19 01:31:11 UTC (rev 390)
@@ -101,8 +101,10 @@
color: #555;
}
+a{
+ text-decoration:none;
+}
-
#logo {
margin-left: 38%;
margin-top:100px;
Modified: trunk/plugins/Login/templates/login.tpl
===================================================================
--- trunk/plugins/Login/templates/login.tpl 2008-03-19 00:52:46 UTC (rev 389)
+++ trunk/plugins/Login/templates/login.tpl 2008-03-19 01:31:11 UTC (rev 390)
@@ -4,13 +4,14 @@
<title>Piwik › Login</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-{literal}<script type="text/javascript">
+ {literal}
+ <script type="text/javascript">
function focusit() {
document.getElementById('form_login').focus();
}
window.onload = focusit;
</script>
-{/literal}
+ {/literal}
<link rel="stylesheet" href="plugins/Login/templates/login.css">
</head>
@@ -23,7 +24,6 @@
<div id="login">
-
{if $form_data.errors}
<div id="login_error">
{foreach from=$form_data.errors item=data}
@@ -38,12 +38,12 @@
<form {$form_data.attributes}>
<p>
- <label>Username<br />
+ <label>{'Login_Login'|translate}<br />
<input type="text" name="form_login" id="form_login" class="input" value="" size="20" tabindex="10" /></label>
</p>
<p>
- <label>Password<br />
+ <label>{'Login_Password'|translate}<br />
<input type="password" name="form_password" id="form_password" class="input" value="" size="20" tabindex="20" /></label>
</p>
{*
@@ -51,14 +51,13 @@
*}
{$form_data.form_url.html}
<p class="submit">
- <input type="submit" name="wp-submit" id="wp-submit" value="Log In" tabindex="100" />
+ <input type="submit" value="{'Login_LogIn'|translate}" tabindex="100" />
</p>
</form>
{*
<p id="nav">
-<a href="http://wp.chrisjohnston.org/wp-login.php?action=register">Register</a> |
-<a href="http://wp.chrisjohnston.org/wp-login.php?action=lostpassword" title="Password Lost and Found">Lost your password?</a>
+<a href="" title="Password Lost and Found">Lost your password?</a>
</p>
*}
</div>
Modified: trunk/plugins/PluginsAdmin/Controller.php
===================================================================
--- trunk/plugins/PluginsAdmin/Controller.php 2008-03-19 00:52:46 UTC (rev 389)
+++ trunk/plugins/PluginsAdmin/Controller.php 2008-03-19 01:31:11 UTC (rev 390)
@@ -49,7 +49,7 @@
$pluginName = Piwik_Common::getRequestVar('pluginName', null, 'string');
Piwik_PluginsManager::getInstance()->deactivatePlugin($pluginName);
- Piwik_Url::redirectToUrl('?module=AdminHome&action=showInContext&moduleToLoad=PluginsAdmin');
+ Piwik_Url::redirectToUrl('index.php?module=AdminHome&action=showInContext&moduleToLoad=PluginsAdmin');
}
function activate()
@@ -59,7 +59,7 @@
$pluginName = Piwik_Common::getRequestVar('pluginName', null, 'string');
Piwik_PluginsManager::getInstance()->activatePlugin($pluginName);
- Piwik_Url::redirectToUrl('?module=AdminHome&action=showInContext&moduleToLoad=PluginsAdmin');
+ Piwik_Url::redirectToUrl('index.php?module=AdminHome&action=showInContext&moduleToLoad=PluginsAdmin');
}
}
More information about the Piwik-svn
mailing list