Skip to content
Extraits de code Groupes Projets
Valider 7f3823b4 rédigé par Matthieu Napoli's avatar Matthieu Napoli
Parcourir les fichiers

Refactored Twig templates using a single base layout 

Also should affect #7036
parent 2ee84591
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
plugins/Login/templates/login.twig
+ 16
− 23
Voir le fichier @ 7f3823b4
<!DOCTYPE html> {% extends 'layout.twig' %}
<html>
<head> {% block head %}
<meta charset="utf-8"> {{ parent() }}
<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" %}
<script type="text/javascript" src="libs/bower_components/jquery-placeholder/jquery.placeholder.js"></script> <script type="text/javascript" src="libs/bower_components/jquery-placeholder/jquery.placeholder.js"></script>
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="libs/bower_components/html5shiv/dist/html5shiv.min.js"></script> <script src="libs/bower_components/html5shiv/dist/html5shiv.min.js"></script>
...@@ -26,12 +15,16 @@ ...@@ -26,12 +15,16 @@
$('input').placeholder(); $('input').placeholder();
$.smartbanner({title: "Piwik Mobile 2", author: "Piwik team", hideOnInstall: false, layer: true, icon: "plugins/CoreHome/images/googleplay.png"}); $.smartbanner({title: "Piwik Mobile 2", author: "Piwik team", hideOnInstall: false, layer: true, icon: "plugins/CoreHome/images/googleplay.png"});
}); });
</script> </script>
</head> {% endblock %}
<!--[if lt IE 9 ]>
<body id="loginPage" class="old-ie"> <![endif]--> {% block pageTitle %}{% if isCustomLogo == false %}Piwik &rsaquo; {% endif %}{{ 'Login_LogIn'|translate }}{% endblock %}
<!--[if (gte IE 9)|!(IE)]><!--> {% block pageDescription %}{{ 'General_OpenSourceWebAnalytics'|translate }}{% endblock %}
<body id="loginPage"><!--<![endif]-->
{% set bodyId = 'loginPage' %}
{% block body %}
{{ postEvent("Template.beforeTopBar", "login") }} {{ postEvent("Template.beforeTopBar", "login") }}
{{ postEvent("Template.beforeContent", "login") }} {{ postEvent("Template.beforeContent", "login") }}
...@@ -151,5 +144,5 @@ ...@@ -151,5 +144,5 @@
</div> </div>
{% endif %} {% endif %}
</section> </section>
</body>
</html> {% endblock %}
plugins/Morpheus/templates/admin.twig
+ 27
− 49
Voir le fichier @ 7f3823b4
<!DOCTYPE html> {% extends 'layout.twig' %}
<html id="ng-app" ng-app="piwikApp">
<head>
{% block head %}
<meta charset="utf-8">
<meta http-equiv="x-ua-compatible" content="IE=EDGE,chrome=1" >
<title>{% if not isCustomLogo %}Piwik &rsaquo; {% endif %}{{ 'CoreAdminHome_Administration'|translate }}</title>
<meta name="generator" content="Piwik - free/libre analytics platform"/>
<link rel="shortcut icon" href="{{ customFavicon|default('plugins/CoreHome/images/favicon.ico') }}"/>
{% include "@CoreHome/_favicon.twig" %} {% block pageTitle %}{% if not isCustomLogo %}Piwik &rsaquo;{% endif %} {{ 'CoreAdminHome_Administration'|translate }}{% endblock %}
{% include "_jsGlobalVariables.twig" %}
{% include "_piwikTag.twig" %}
{% include "_jsCssIncludes.twig" %}
<!--[if IE]> {% set bodyClass = postEvent('Template.bodyClass', 'admin') %}
<link rel="stylesheet" type="text/css" href="plugins/Morpheus/stylesheets/ieonly.css"/>
<![endif]-->
{% endblock %}
</head>
<!--[if lt IE 9 ]>
<body ng-app="app" class="old-ie {{ postEvent('Template.bodyClass', 'admin') }}">
<![endif]-->
<!--[if (gte IE 9)|!(IE)]><!-->
<body ng-app="app" class="{{ postEvent('Template.bodyClass', 'admin') }}"><!--<![endif]-->
{% block body %}
{% if isSuperUser %} {% if isSuperUser %}
{% set topMenuModule = 'CoreAdminHome' %} {% set topMenuModule = 'CoreAdminHome' %}
{% set topMenuAction = 'generalSettings' %} {% set topMenuAction = 'generalSettings' %}
...@@ -31,40 +12,37 @@ ...@@ -31,40 +12,37 @@
{% set topMenuModule = 'SitesManager' %} {% set topMenuModule = 'SitesManager' %}
{% set topMenuAction = 'index' %} {% set topMenuAction = 'index' %}
{% endif %} {% endif %}
{{ parent() }}
{% endblock %}
{% include "_iframeBuster.twig" %} {% block root %}
{% include "@CoreHome/_javaScriptDisabled.twig" %} {% include "@CoreHome/_topScreen.twig" %}
<div id="root"> {% import 'ajaxMacros.twig' as ajax %}
{% include "@CoreHome/_topScreen.twig" %} {{ ajax.requestErrorDiv(emailSuperUser|default('')) }}
{{ postEvent("Template.beforeContent", "admin", currentModule) }}
{% import 'ajaxMacros.twig' as ajax %} <div id="container">
{{ ajax.requestErrorDiv(emailSuperUser|default('')) }}
{{ postEvent("Template.beforeContent", "admin", currentModule) }}
<div id="container"> {% if showMenu is not defined or showMenu %}
{% include "@CoreAdminHome/_menu.twig" %}
{% endif %}
{% if showMenu is not defined or showMenu %} <div id="content" class="admin">
{% include "@CoreAdminHome/_menu.twig" %}
{% endif %}
<div id="content" class="admin"> {% include "@CoreHome/_headerMessage.twig" %}
{% include "@CoreHome/_notifications.twig" %}
{% include "@CoreHome/_headerMessage.twig" %} <div class="ui-confirm" id="alert">
{% include "@CoreHome/_notifications.twig" %} <h2></h2>
<input role="no" type="button" value="{{ 'General_Ok'|translate }}"/>
<div class="ui-confirm" id="alert"> </div>
<h2></h2>
<input role="no" type="button" value="{{ 'General_Ok'|translate }}"/>
</div>
{% include "@CoreHome/_warningInvalidHost.twig" %} {% include "@CoreHome/_warningInvalidHost.twig" %}
{% block content %} {% block content %}
{% endblock %} {% endblock %}
</div>
</div>
</div> </div>
</body> </div>
</html> {% endblock %}
plugins/Morpheus/templates/dashboard.twig
+ 36
− 48
Voir le fichier @ 7f3823b4
<!DOCTYPE html> {% extends 'layout.twig' %}
<html id="ng-app" lang="{{ language }}" ng-app="piwikApp">
<head>
{% block head %}
<meta charset="utf-8">
<title>{{ siteName|raw }} - {% if isCustomLogo == false %}Piwik &rsaquo; {% endif %} {{ 'CoreHome_WebAnalyticsReports'|translate }}</title>
<meta http-equiv="X-UA-Compatible" content="IE=EDGE,chrome=1"/>
<meta name="viewport" content="initial-scale=1.0" />
<meta name="generator" content="Piwik - free/libre analytics platform"/>
<meta name="description" content="Web Analytics report for '{{ siteName|escape("html_attr") }}' - Piwik"/>
<meta name="apple-itunes-app" content="app-id=737216887" />
{% include "@CoreHome/_favicon.twig" %}
{% include "_jsGlobalVariables.twig" %}
{% include "_piwikTag.twig" %}
<!--[if lt IE 9]>
<script language="javascript" type="text/javascript" src="libs/jqplot/excanvas.min.js"></script>
<![endif]-->
{% include "_jsCssIncludes.twig" %}
<!--[if IE]>
<link rel="stylesheet" type="text/css" href="plugins/Morpheus/stylesheets/ieonly.css"/>
<![endif]-->
{% endblock %}
</head>
<!--[if lt IE 9 ]>
<body ng-app="app" class="old-ie {{ postEvent('Template.bodyClass', 'dashboard') }}"> <![endif]-->
<!--[if (gte IE 9)|!(IE)]><!-->
<body ng-app="app" class="{{ postEvent('Template.bodyClass', 'dashboard') }}"><!--<![endif]-->
{% include "_iframeBuster.twig" %}
{% include "@CoreHome/_javaScriptDisabled.twig" %}
<div id="root">
{% include "@CoreHome/_warningInvalidHost.twig" %}
{% include "@CoreHome/_topScreen.twig" %}
{% block notification %}
{% include "@CoreHome/_notifications.twig" %}
{% endblock %}
<div class="ui-confirm" id="alert">
<h2></h2>
<input role="yes" type="button" value="{{ 'General_Ok'|translate }}"/>
</div>
{{ postEvent("Template.beforeContent", "dashboard", currentModule) }} {% block head %}
{% block content %} {{ parent() }}
{% endblock %}
</div> <!--[if lt IE 9]>
<script language="javascript" type="text/javascript" src="libs/jqplot/excanvas.min.js"></script>
<![endif]-->
{% endblock %}
{% block pageTitle %}{{ siteName|raw }} - {% if not isCustomLogo %}Piwik &rsaquo;{% endif %} {{ 'CoreHome_WebAnalyticsReports'|translate }}{% endblock %}
{% block pageDescription %}Web Analytics report for {{ siteName|escape("html_attr") }} - Piwik{% endblock %}
{% set bodyClass = postEvent('Template.bodyClass', 'dashboard') %}
{% block body %}
{{ parent() }}
{{ postEvent("Template.footer") }} {{ postEvent("Template.footer") }}
</body> {% endblock %}
</html>
{% block root %}
{% include "@CoreHome/_warningInvalidHost.twig" %}
{% include "@CoreHome/_topScreen.twig" %}
{% block notification %}
{% include "@CoreHome/_notifications.twig" %}
{% endblock %}
<div class="ui-confirm" id="alert">
<h2></h2>
<input role="yes" type="button" value="{{ 'General_Ok'|translate }}"/>
</div>
{{ postEvent("Template.beforeContent", "dashboard", currentModule) }}
{% block content %}
{% endblock %}
{% endblock %}
plugins/Morpheus/templates/layout.twig 0 → 100644
+ 45
− 0
Voir le fichier @ 7f3823b4
<!DOCTYPE html>
<html id="ng-app" {% if language is defined %}lang="{{ language }}"{% endif %} ng-app="piwikApp">
<head>
{% block head %}
<meta charset="utf-8">
<title>{% block pageTitle %}Piwik{% endblock %}</title>
<meta http-equiv="X-UA-Compatible" content="IE=EDGE,chrome=1"/>
<meta name="viewport" content="initial-scale=1.0"/>
<meta name="generator" content="Piwik - free/libre analytics platform"/>
<meta name="description" content="{% block pageDescription %}{% endblock %}"/>
<meta name="apple-itunes-app" content="app-id=737216887" />
<meta name="google-play-app" content="app-id=org.piwik.mobile2">
<link rel="shortcut icon" href="{{ customFavicon|default('plugins/CoreHome/images/favicon.ico') }}"/>
{% include "@CoreHome/_favicon.twig" %}
{% include "_jsGlobalVariables.twig" %}
{% include "_piwikTag.twig" %}
{% include "_jsCssIncludes.twig" %}
<!--[if IE]>
<link rel="stylesheet" type="text/css" href="plugins/Morpheus/stylesheets/ieonly.css"/>
<![endif]-->
{% endblock %}
</head>
<!--[if lt IE 9 ]>
<body id="{{ bodyId|default('') }}" ng-app="app" class="old-ie {{ bodyClass|default('') }}">
<![endif]-->
<!--[if (gte IE 9)|!(IE)]><!-->
<body id="{{ bodyId|default('') }}" ng-app="app" class="{{ bodyClass|default('') }}">
<!--<![endif]-->
{% block body %}
{% include "_iframeBuster.twig" %}
{% include "@CoreHome/_javaScriptDisabled.twig" %}
<div id="root">
{% block root %}
{% endblock %}
</div>
{% endblock %}
</body>
</html>
plugins/Morpheus/templates/user.twig
+ 27
− 49
Voir le fichier @ 7f3823b4
<!DOCTYPE html> {% extends 'layout.twig' %}
<html id="ng-app" ng-app="piwikApp">
<head>
{% block head %}
<meta charset="utf-8">
<meta http-equiv="x-ua-compatible" content="IE=EDGE,chrome=1" >
<title>{% if not isCustomLogo %}Piwik &rsaquo; {% endif %}{{ 'CoreAdminHome_Administration'|translate }}</title>
<meta name="generator" content="Piwik - free/libre analytics platform"/>
<link rel="shortcut icon" href="{{ customFavicon|default('plugins/CoreHome/images/favicon.ico') }}"/>
{% include "@CoreHome/_favicon.twig" %}
{% include "_jsGlobalVariables.twig" %}
{% include "_piwikTag.twig" %}
{% include "_jsCssIncludes.twig" %}
<!--[if IE]>
<link rel="stylesheet" type="text/css" href="plugins/Morpheus/stylesheets/ieonly.css"/>
<![endif]-->
{% endblock %}
</head>
<!--[if lt IE 9 ]>
<body ng-app="app" class="old-ie {{ postEvent('Template.bodyClass', 'admin') }}">
<![endif]-->
<!--[if (gte IE 9)|!(IE)]><!-->
<body ng-app="app" class="{{ postEvent('Template.bodyClass', 'admin') }}"><!--<![endif]-->
{% block pageTitle %}{% if not isCustomLogo %}Piwik &rsaquo; {% endif %}{{ 'CoreAdminHome_Administration'|translate }}{% endblock %}
{% set bodyClass = postEvent('Template.bodyClass', 'admin') %}
{% block body %}
{% set topMenuModule = 'UsersManager' %} {% set topMenuModule = 'UsersManager' %}
{% set topMenuAction = 'userSettings' %} {% set topMenuAction = 'userSettings' %}
{{ parent() }}
{% endblock %}
{% include "_iframeBuster.twig" %} {% block root %}
{% include "@CoreHome/_javaScriptDisabled.twig" %} {% include "@CoreHome/_topScreen.twig" %}
<div id="root">
{% include "@CoreHome/_topScreen.twig" %}
{% import 'ajaxMacros.twig' as ajax %} {% import 'ajaxMacros.twig' as ajax %}
{{ ajax.requestErrorDiv(emailSuperUser|default('')) }} {{ ajax.requestErrorDiv(emailSuperUser|default('')) }}
{{ postEvent("Template.beforeContent", "user", currentModule) }} {{ postEvent("Template.beforeContent", "user", currentModule) }}
<div id="container"> <div id="container">
{% if showMenu is not defined or showMenu %} {% if showMenu is not defined or showMenu %}
{% include "@CoreHome/_userMenu.twig" %} {% include "@CoreHome/_userMenu.twig" %}
{% endif %} {% endif %}
<div id="content" class="admin user"> <div id="content" class="admin user">
{% include "@CoreHome/_notifications.twig" %} {% include "@CoreHome/_notifications.twig" %}
<div class="ui-confirm" id="alert"> <div class="ui-confirm" id="alert">
<h2></h2> <h2></h2>
<input role="no" type="button" value="{{ 'General_Ok'|translate }}"/> <input role="no" type="button" value="{{ 'General_Ok'|translate }}"/>
</div> </div>
{% block content %} {% block content %}
{% endblock %} {% endblock %}
</div>
</div>
</div> </div>
</body> </div>
</html> {% endblock %}
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter