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
diff options
context:
space:
mode:
authormattab <matthieu.aubry@gmail.com>2014-04-14 05:45:55 +0400
committermattab <matthieu.aubry@gmail.com>2014-04-14 05:45:55 +0400
commit93783310870df12f029dd5aeaee5a7d6f586784e (patch)
tree5bfa7726d092232872bed00fad7001a516024bc1 /plugins/Login/templates
parent002129493ac9c0dfcb42204f9fd17c32b0f6933b (diff)
Login screen is now using common JS + CSS includes
Diffstat (limited to 'plugins/Login/templates')
-rw-r--r--plugins/Login/templates/login.twig16
1 files changed, 5 insertions, 11 deletions
diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig
index 1ad093e0e4..1612993552 100644
--- a/plugins/Login/templates/login.twig
+++ b/plugins/Login/templates/login.twig
@@ -3,7 +3,7 @@
<html class="old-ie"> <![endif]-->
<!--[if (gte IE 9)|!(IE)]><!-->
<html><!--<![endif]-->
-<head>
+<head>
<meta charset="utf-8">
<title>{% if isCustomLogo == false %}Piwik &rsaquo; {% endif %}{{ 'Login_LogIn'|translate }}</title>
@@ -15,29 +15,23 @@
<meta name="description" content="{{ 'General_OpenSourceWebAnalytics'|translate }}"/>
<meta name="apple-itunes-app" content="app-id=737216887" />
<meta name="google-play-app" content="app-id=org.piwik.mobile2">
+ {% include "_jsCssIncludes.twig" %}
+ <script type="text/javascript" src="libs/jquery/jquery.placeholder.js"></script>
<!--[if lt IE 9]>
<script src="libs/html5shiv/html5shiv.js"></script>
<![endif]-->
- <script type="text/javascript" src="libs/jquery/jquery.js"></script>
- <script type="text/javascript" src="libs/jquery/jquery.placeholder.js"></script>
<script type="text/javascript" src="libs/jquery/jquery.smartbanner.js"></script>
<link rel="stylesheet" type="text/css" href="libs/jquery/stylesheets/jquery.smartbanner.css" />
- <script type="text/javascript" src="plugins/CoreHome/javascripts/require.js"></script>
- <script type="text/javascript" src="plugins/CoreHome/javascripts/notification.js"></script>
- <script type="text/javascript" src="plugins/CoreHome/javascripts/notification_parser.js"></script>
+
<script type="text/javascript">
$(function () {
$('#form_login').focus();
$('input').placeholder();
$.smartbanner({
title: "Piwik Mobile 2", author: "Piwik team", icon: "plugins/CoreHome/images/googleplay.png"
- });
+ });
});
</script>
- <script type="text/javascript" src="plugins/Login/javascripts/login.js"></script>
- {% if 'General_LayoutDirection'|translate =='rtl' %}
- <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/rtl.css"/>
- {% endif %}
</head>
<body id="loginPage">