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:
authorMatthieu Napoli <matthieu@mnapoli.fr>2015-01-16 03:01:15 +0300
committerMatthieu Napoli <matthieu@mnapoli.fr>2015-01-16 03:03:46 +0300
commit7f3823b44631b95687eb99213415054a08819d52 (patch)
tree099e89d8bb1a25c98d4cd709b05db96b69156964 /plugins/Login/templates/login.twig
parent2ee84591ce91cf064cb082425c9359892f1272e1 (diff)
Refactored Twig templates using a single base layout
Also should affect #7036
Diffstat (limited to 'plugins/Login/templates/login.twig')
-rw-r--r--plugins/Login/templates/login.twig39
1 files changed, 16 insertions, 23 deletions
diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig
index ec8760a991..acf42a3ea7 100644
--- a/plugins/Login/templates/login.twig
+++ b/plugins/Login/templates/login.twig
@@ -1,18 +1,7 @@
-<!DOCTYPE html>
-<html>
-<head>
- <meta charset="utf-8">
- <meta http-equiv="x-ua-compatible" content="IE=EDGE,chrome=1" >
- <title>{% if isCustomLogo == false %}Piwik &rsaquo; {% endif %}{{ 'Login_LogIn'|translate }}</title>
-
- {% include "@CoreHome/_favicon.twig" %}
- {% autoescape false %}
- {{ includeAssets({"type": "css"}) }}
- {% endautoescape %}
- <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" %}
+{% extends 'layout.twig' %}
+
+{% block head %}
+ {{ parent() }}
<script type="text/javascript" src="libs/bower_components/jquery-placeholder/jquery.placeholder.js"></script>
<!--[if lt IE 9]>
<script src="libs/bower_components/html5shiv/dist/html5shiv.min.js"></script>
@@ -26,12 +15,16 @@
$('input').placeholder();
$.smartbanner({title: "Piwik Mobile 2", author: "Piwik team", hideOnInstall: false, layer: true, icon: "plugins/CoreHome/images/googleplay.png"});
});
- </script>
- </head>
- <!--[if lt IE 9 ]>
- <body id="loginPage" class="old-ie"> <![endif]-->
- <!--[if (gte IE 9)|!(IE)]><!-->
- <body id="loginPage"><!--<![endif]-->
+ </script>
+{% endblock %}
+
+{% block pageTitle %}{% if isCustomLogo == false %}Piwik &rsaquo; {% endif %}{{ 'Login_LogIn'|translate }}{% endblock %}
+{% block pageDescription %}{{ 'General_OpenSourceWebAnalytics'|translate }}{% endblock %}
+
+{% set bodyId = 'loginPage' %}
+
+{% block body %}
+
{{ postEvent("Template.beforeTopBar", "login") }}
{{ postEvent("Template.beforeContent", "login") }}
@@ -151,5 +144,5 @@
</div>
{% endif %}
</section>
-</body>
-</html>
+
+{% endblock %}