Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authormatt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2008-03-19 03:30:40 +0300
committermatt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2008-03-19 03:30:40 +0300
commit83ffd7749e726b91f38abc31fb81c20f61054ab2 (patch)
treed6c74c5aa39651845907c98f8bf9d4f9912f1c55 /plugins
parent55d8a3ad0bcb68a5c0da0c0b81c873d3d317b41e (diff)
- new login screen design (thanks wordpress 2.5!!)
- misc changes - plugins can now be loaded by default all the time (ex. Home, AdminHome, PluginsAdmin) - improved admin design
Diffstat (limited to 'plugins')
-rw-r--r--plugins/AdminHome/templates/index.tpl10
-rw-r--r--plugins/ExamplePlugin/ExamplePlugin.php20
-rw-r--r--plugins/Login/Controller.php5
-rw-r--r--plugins/Login/Form.php13
-rw-r--r--plugins/Login/templates/login.css124
-rw-r--r--plugins/Login/templates/login.tpl70
-rw-r--r--plugins/PluginsAdmin/Controller.php5
-rw-r--r--plugins/PluginsAdmin/templates/manage.tpl8
-rw-r--r--plugins/SitesManager/templates/DisplayJavascriptCode.tpl2
-rw-r--r--plugins/SitesManager/templates/SitesManager.tpl14
-rw-r--r--plugins/UsersManager/templates/UsersManager.js11
-rw-r--r--plugins/UsersManager/templates/UsersManager.tpl4
12 files changed, 238 insertions, 48 deletions
diff --git a/plugins/AdminHome/templates/index.tpl b/plugins/AdminHome/templates/index.tpl
index e65e6dd5d1..4fbdeafb73 100644
--- a/plugins/AdminHome/templates/index.tpl
+++ b/plugins/AdminHome/templates/index.tpl
@@ -3,8 +3,12 @@
<head>
</head>
<body>
-<link rel="stylesheet" type="text/css" href="plugins/AdminHome/templates/menu.css">
+<script type="text/javascript" src="libs/jquery/jquery.js"></script>
+<script type="text/javascript" src="themes/default/common.js"></script>
+
+<link rel="stylesheet" type="text/css" href="plugins/AdminHome/templates/menu.css">
+<link rel="stylesheet" href="themes/default/common-admin.css">
<div id="menu">
{include file="AdminHome/templates/menu.tpl"}
</div>
@@ -16,3 +20,7 @@
{if $content}{$content}{/if}
</div>
+<div id="footer" style="border-top:1px solid gray; margin-top:20px;padding-top:10px;">
+<a href='?module=Home'>Back to Piwik homepage</a>
+
+</div>
diff --git a/plugins/ExamplePlugin/ExamplePlugin.php b/plugins/ExamplePlugin/ExamplePlugin.php
index 938900a534..368271874a 100644
--- a/plugins/ExamplePlugin/ExamplePlugin.php
+++ b/plugins/ExamplePlugin/ExamplePlugin.php
@@ -1,13 +1,13 @@
-<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- *
- * @package Piwik_ExamplePlugin
- */
+<?php
+/**
+ * Piwik - Open source web analytics
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
+ * @version $Id$
+ *
+ * @package Piwik_ExamplePlugin
+ */
class Piwik_ExamplePlugin extends Piwik_Plugin
{
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php
index 3c21a421c1..10c2291434 100644
--- a/plugins/Login/Controller.php
+++ b/plugins/Login/Controller.php
@@ -63,11 +63,10 @@ class Piwik_Login_Controller extends Piwik_Controller
}
else
{
- $messageNoAccess = 'login & password not correct';
+ $messageNoAccess = _('Login_LoginPasswordNotCorrect');
}
}
-
- $view = new Piwik_View('login.tpl');
+ $view = new Piwik_View('Login/templates/login.tpl');
$view->AccessErrorString = $messageNoAccess;
$view->addForm( $form );
$view->subTemplate = 'genericForm.tpl';
diff --git a/plugins/Login/Form.php b/plugins/Login/Form.php
index 3449a95ba5..44276f356e 100644
--- a/plugins/Login/Form.php
+++ b/plugins/Login/Form.php
@@ -20,6 +20,8 @@ class Piwik_Login_Form extends Piwik_Form
function __construct()
{
parent::__construct();
+ // reset
+ $this->updateAttributes('id="loginform" name="loginform"');
}
function init()
@@ -33,20 +35,19 @@ class Piwik_Login_Form extends Piwik_Form
}
$formElements = array(
- array('text', 'form_login', 'login:'),
- array('password', 'form_password', 'pass:'),
+ array('text', 'form_login', _('Login_login')),
+ array('password', 'form_password', _('Login_password')),
array('hidden', 'form_url', $urlToGoAfter),
);
$this->addElements( $formElements );
$formRules = array(
- array('form_login', sprintf('%s required', 'login'), 'required'),
- array('form_password', sprintf('%s required', 'password'), 'required'),
+ array('form_login', sprintf(_('General_Required'), 'login'), 'required'),
+ array('form_password', sprintf(_('General_Required'), 'password'), 'required'),
);
$this->addRules( $formRules );
- $this->addElement('submit', 'submit', 'Go!');
- $this->addElement('submit', 'back', 'Cancel');
+ $this->addElement('submit', 'submit', _('Login_Go'));
}
diff --git a/plugins/Login/templates/login.css b/plugins/Login/templates/login.css
new file mode 100644
index 0000000000..9eb657af81
--- /dev/null
+++ b/plugins/Login/templates/login.css
@@ -0,0 +1,124 @@
+
+* { margin: 0; padding: 0; }
+
+body {
+ font: 12px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
+}
+
+form {
+ margin-left: 8px;
+ padding: 16px 16px 40px 16px;
+ font-weight: bold;
+ -moz-border-radius: 5px;
+ -khtml-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ border-radius: 5px;
+}
+
+form .forgetmenot { font-weight: normal; float: left; margin-bottom: 0;}
+
+#login form .submit input {
+ font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
+ padding: 3px 5px;
+ border: none;
+ font-size: 13px;
+ border-width: 1px;
+ border-style: solid;
+ -moz-border-radius: 3px;
+ -khtml-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
+ cursor: default;
+ text-decoration: none;
+ margin-top: -6px;
+}
+
+form .submit { float: right; }
+
+form p { margin-bottom: 24px; }
+
+#login { width: 292px; margin: 7em auto; margin-top: 20px; }
+
+#login_error {
+ margin: 0 0 16px 8px;
+ border-width: 1px;
+ border-style: solid;
+ padding: 12px;
+}
+
+#nav { margin: 0 0 0 8px; padding: 16px; }
+
+#form_password, #form_login, #user_email {
+ font-size: 20px;
+ width: 97%;
+ padding: 3px;
+ margin-right: 6px;
+}
+
+#login form input {
+ color: #555;
+}
+
+.login form {
+ background-color: #eaf3fa;
+}
+
+#login form .submit input {
+ background-color: #cee1ef !important;
+}
+
+#login #login_error {
+ background-color: #ffebe8;
+ border-color: #c00;
+}
+
+#login form .submit input {
+ background-color: #e5e5e5;
+ color: #246;
+ border-color: #80b5d0;
+}
+
+#login form .submit input:hover {
+ color: #d54e21;
+}
+
+ #login form .submit input:hover {
+ border-color: #328ab2;
+}
+
+.login #login_error {
+ background-color: #ffffe0;
+ border-color: #e6db55;
+}
+
+.login #nav a {
+ color: #777;
+}
+body.login {
+ border-top-color: #464646;
+}
+#login form input {
+ color: #555;
+}
+
+
+
+#logo {
+ margin-left: 38%;
+ margin-top:100px;
+}
+
+#logo h1 {
+font-family: Georgia, "Times New Roman", Times, serif;
+font-weight: normal;
+color: #136F8B;
+font-size: 48px;
+text-transform: none;
+}
+
+#logo .description {
+font-family: Georgia, "Times New Roman", Times, serif;
+font-weight: normal;
+color: #879dbd;
+font-size: 25px;
+}
diff --git a/plugins/Login/templates/login.tpl b/plugins/Login/templates/login.tpl
new file mode 100644
index 0000000000..a4f7ad05fd
--- /dev/null
+++ b/plugins/Login/templates/login.tpl
@@ -0,0 +1,70 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
+<head>
+ <title>Piwik &rsaquo; Login</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+{literal}<script type="text/javascript">
+ function focusit() {
+ document.getElementById('form_login').focus();
+ }
+ window.onload = focusit;
+ </script>
+{/literal}
+<link rel="stylesheet" href="plugins/Login/templates/login.css">
+</head>
+
+<body class="login">
+
+
+<div id="logo">
+ <a href="http://piwik.org"><h1 title="Web analytics">Piwik <span class="description"># open source web analytics</span></h1></a>
+</div>
+
+<div id="login">
+
+
+{if $form_data.errors}
+<div id="login_error">
+ {foreach from=$form_data.errors item=data}
+ <strong>ERROR</strong>: {$data}<br />
+ {/foreach}
+</div>
+{/if}
+
+{if $AccessErrorString}
+<div id="login_error"><strong>ERROR</strong>: {$AccessErrorString}<br /></div>
+{/if}
+
+<form {$form_data.attributes}>
+ <p>
+ <label>Username<br />
+ <input type="text" name="form_login" id="form_login" class="input" value="" size="20" tabindex="10" /></label>
+ </p>
+
+ <p>
+ <label>Password<br />
+ <input type="password" name="form_password" id="form_password" class="input" value="" size="20" tabindex="20" /></label>
+ </p>
+ {*
+ <p class="forgetmenot"><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="90" /> Remember Me</label></p>
+ *}
+ {$form_data.form_url.html}
+ <p class="submit">
+ <input type="submit" name="wp-submit" id="wp-submit" value="Log In" 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>
+</p>
+*}
+</div>
+
+</body>
+</html>
+
+
+
diff --git a/plugins/PluginsAdmin/Controller.php b/plugins/PluginsAdmin/Controller.php
index 3bc15b6bb3..425e426e10 100644
--- a/plugins/PluginsAdmin/Controller.php
+++ b/plugins/PluginsAdmin/Controller.php
@@ -29,8 +29,9 @@ class Piwik_PluginsAdmin_Controller extends Piwik_Controller
foreach($listPlugins as $pluginName)
{
$oPlugin = Piwik_PluginsManager::getInstance()->loadPlugin($pluginName);
- $plugins[$pluginName]= array( 'activated' => Piwik_PluginsManager::getInstance()->isPluginEnabled($pluginName),
- 'info' => $oPlugin->getInformation()
+ $plugins[$pluginName]= array( 'activated' => Piwik_PluginsManager::getInstance()->isPluginEnabled($pluginName),
+ 'alwaysActivated' => Piwik_PluginsManager::getInstance()->isPluginAlwaysActivated($pluginName),
+ 'info' => $oPlugin->getInformation()
);
}
diff --git a/plugins/PluginsAdmin/templates/manage.tpl b/plugins/PluginsAdmin/templates/manage.tpl
index 033c1793b9..6e2a91fc24 100644
--- a/plugins/PluginsAdmin/templates/manage.tpl
+++ b/plugins/PluginsAdmin/templates/manage.tpl
@@ -5,8 +5,8 @@
<table id="plugins">
<thead>
- <th>Name</th>
- <th>Description</th>
+ <th width="150px">Name</th>
+ <th width="400px">Description</th>
<th>Author</th>
<th>Version</th>
<th>Action</th>
@@ -20,12 +20,10 @@
<td>{$plugin.info.description}&nbsp;</td>
<td class="center"><a href="{$plugin.info.homepage}">{$plugin.info.author}</a></td>
<td>{$plugin.info.version}</td>
- <td class="switch">{if $plugin.activated}<a href=?module=PluginsAdmin&action=deactivate&pluginName={$name}>Deactivate</a>
+ <td class="switch">{if $plugin.alwaysActivated}<span title="This plugin cannot be deactivated">Activated</span>{elseif $plugin.activated}<a href=?module=PluginsAdmin&action=deactivate&pluginName={$name}>Deactivate</a>
{else}<a href=?module=PluginsAdmin&action=activate&pluginName={$name}>Activate</a>{/if}</td>
</tr>
{/foreach}
</tbody>
</table>
-
-<p><a href='?module=Home'>Back to Piwik homepage</a></p>
diff --git a/plugins/SitesManager/templates/DisplayJavascriptCode.tpl b/plugins/SitesManager/templates/DisplayJavascriptCode.tpl
index 593049e546..a02d7a59a0 100644
--- a/plugins/SitesManager/templates/DisplayJavascriptCode.tpl
+++ b/plugins/SitesManager/templates/DisplayJavascriptCode.tpl
@@ -3,5 +3,3 @@
<code>
{$jsTag}
</code>
-
-<p><a href='?module=Home'>Back to Piwik homepage</a></p> \ No newline at end of file
diff --git a/plugins/SitesManager/templates/SitesManager.tpl b/plugins/SitesManager/templates/SitesManager.tpl
index 9ced665119..24e029eb37 100644
--- a/plugins/SitesManager/templates/SitesManager.tpl
+++ b/plugins/SitesManager/templates/SitesManager.tpl
@@ -1,14 +1,5 @@
-
-
-
-<script type="text/javascript" src="libs/jquery/jquery.js"></script>
-<script type="text/javascript" src="themes/default/common.js"></script>
-
-<script type="text/javascript" src="plugins/UsersManager/templates/UsersManager.js"></script>
<script type="text/javascript" src="plugins/SitesManager/templates/SitesManager.js"></script>
-<link rel="stylesheet" href="themes/default/common-admin.css">
-
<h2>Sites</h2>
<div id="ajaxError" style="display:none"></div>
<div id="ajaxLoading" style="display:none">Loading... <img src="themes/default/loading.gif"></div>
@@ -44,8 +35,3 @@
<div id="addRowSite"><img src='plugins/UsersManager/images/add.png'> <a href="#">Add a new Site</a></div>
{/if}
-
-<p><a href='?module=Home'>Back to Piwik homepage</a></p>
-
-
-
diff --git a/plugins/UsersManager/templates/UsersManager.js b/plugins/UsersManager/templates/UsersManager.js
index 37e205ccb5..9f7063336b 100644
--- a/plugins/UsersManager/templates/UsersManager.js
+++ b/plugins/UsersManager/templates/UsersManager.js
@@ -229,7 +229,14 @@ $(document).ready( function() {
}
);
- $('#addrow').click( function() {
+ $('#addrow').hover( function() {
+ $(this).css({ cursor: "pointer"});
+ },
+ function() {
+ $(this).css({ cursor: "auto"});
+ }
+ )
+ .click( function() {
ajaxHideError();
$(this).toggle();
@@ -243,7 +250,7 @@ $(document).ready( function() {
<td><input id="useradd_email" value="email@domain.com" size=15></td>\
<td><input id="useradd_alias" value="alias" size=15></td>\
<td>-</td>\
- <td><img src="plugins/UsersManager/images/ok.png" id="adduser" href="#"></td>\
+ <td><img src="plugins/UsersManager/images/ok.png" id="adduser"></td>\
<td><img src="plugins/UsersManager/images/remove.png" id="cancel"></td>\
</tr>')
.appendTo('#users')
diff --git a/plugins/UsersManager/templates/UsersManager.tpl b/plugins/UsersManager/templates/UsersManager.tpl
index cdb136d523..771b71da17 100644
--- a/plugins/UsersManager/templates/UsersManager.tpl
+++ b/plugins/UsersManager/templates/UsersManager.tpl
@@ -103,7 +103,5 @@
</tbody>
</table>
-<div id="addrow"><img src='plugins/UsersManager/images/add.png'> <a href="#">Add a new user</a></div>
+<div id="addrow"><img src='plugins/UsersManager/images/add.png'> Add a new user</div>
<script type="text/javascript" src="plugins/UsersManager/templates/UsersManager.js"></script>
-
-<p><a href='?module=Home'>Back to Piwik homepage</a></p>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 12:39:26 +0300