diff options
| author | mattab <matthieu.aubry@gmail.com> | 2014-02-05 02:56:23 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2014-02-05 02:56:23 +0400 |
| commit | 2fee6fa5e7db6b4015a2ec005fd887713e0d5838 (patch) | |
| tree | 2c56c5cde033c702f165d4011f3ad42d06c25e3a | |
| parent | f46198f4bfb9f187fdd98b392d2b825db4eaad6b (diff) | |
Minor whitespace
| -rw-r--r-- | plugins/CoreAdminHome/stylesheets/generalSettings.less | 1 | ||||
| -rw-r--r-- | plugins/Dashboard/templates/_header.twig | 4 | ||||
| -rw-r--r-- | plugins/Zeitgeist/templates/_jsGlobalVariables.twig | 36 | ||||
| -rw-r--r-- | plugins/Zeitgeist/templates/admin.twig | 7 | ||||
| -rw-r--r-- | plugins/Zeitgeist/templates/dashboard.twig | 4 |
5 files changed, 27 insertions, 25 deletions
diff --git a/plugins/CoreAdminHome/stylesheets/generalSettings.less b/plugins/CoreAdminHome/stylesheets/generalSettings.less index 7166370255..5241f06e26 100644 --- a/plugins/CoreAdminHome/stylesheets/generalSettings.less +++ b/plugins/CoreAdminHome/stylesheets/generalSettings.less @@ -83,6 +83,7 @@ table.admin tbody td:hover, table.admin tbody th:hover { margin: 15px -15px 20px 0; padding: 0 0 5px 0; font-size: 24px; + width:95%; } .admin p, .admin section { diff --git a/plugins/Dashboard/templates/_header.twig b/plugins/Dashboard/templates/_header.twig index c17f947ef0..055129f4cb 100644 --- a/plugins/Dashboard/templates/_header.twig +++ b/plugins/Dashboard/templates/_header.twig @@ -10,7 +10,7 @@ <![endif]--> <link rel="stylesheet" type="text/css" href="plugins/Dashboard/stylesheets/standalone.css" /> - {% include "_jsGlobalVariables.twig" %} - {% include "_jsCssIncludes.twig" %} +{% include "_jsGlobalVariables.twig" %} +{% include "_jsCssIncludes.twig" %} </head> <body id="standalone"> diff --git a/plugins/Zeitgeist/templates/_jsGlobalVariables.twig b/plugins/Zeitgeist/templates/_jsGlobalVariables.twig index fc60d946f2..b89178a4e0 100644 --- a/plugins/Zeitgeist/templates/_jsGlobalVariables.twig +++ b/plugins/Zeitgeist/templates/_jsGlobalVariables.twig @@ -2,22 +2,22 @@ var piwik = {}; piwik.token_auth = "{{ token_auth }}"; piwik.piwik_url = "{{ piwikUrl }}"; - {% if userLogin %}piwik.userLogin = "{{ userLogin|e('js')}}"; - {% endif %} - {% if idSite is defined %}piwik.idSite = "{{ idSite }}"; - {% endif %} - {% if siteName is defined %}piwik.siteName = "{{ siteName|e('js') }}"; - {% endif %} - {% if siteMainUrl is defined %}piwik.siteMainUrl = "{{ siteMainUrl|e('js') }}"; - {% endif %} - {% if period is defined %}piwik.period = "{{ period }}"; - {% endif %} - {# piwik.currentDateString should not be used other than by the calendar Javascript + {% if userLogin %}piwik.userLogin = "{{ userLogin|e('js')}}";{% endif %} + + {% if idSite is defined %}piwik.idSite = "{{ idSite }}";{% endif %} + + {% if siteName is defined %}piwik.siteName = "{{ siteName|e('js') }}";{% endif %} + + {% if siteMainUrl is defined %}piwik.siteMainUrl = "{{ siteMainUrl|e('js') }}";{% endif %} + + {% if period is defined %}piwik.period = "{{ period }}";{% endif %} + +{# piwik.currentDateString should not be used other than by the calendar Javascript (it is not set to the expected value when period=range) Use broadcast.getValueFromUrl('date') instead - #} +#} piwik.currentDateString = "{{ date|default(endDate|default('')) }}"; - {% if startDate is defined %} +{% if startDate is defined %} piwik.startDateString = "{{ startDate }}"; piwik.endDateString = "{{ endDate }}"; piwik.minDateYear = {{ minDateYear }}; @@ -26,11 +26,11 @@ piwik.maxDateYear = {{ maxDateYear }}; piwik.maxDateMonth = parseInt("{{ maxDateMonth }}", 10); piwik.maxDateDay = parseInt("{{ maxDateDay }}", 10); - {% endif %} - {% if language is defined %}piwik.language = "{{ language }}"; - {% endif %} - {% if config_action_url_category_delimiter is defined %} +{% endif %} + {% if language is defined %}piwik.language = "{{ language }}";{% endif %} + +{% if config_action_url_category_delimiter is defined %} piwik.config = {}; piwik.config.action_url_category_delimiter = "{{ config_action_url_category_delimiter }}"; - {% endif %} +{% endif %} </script> diff --git a/plugins/Zeitgeist/templates/admin.twig b/plugins/Zeitgeist/templates/admin.twig index 808d4ddc2d..8fa0fedeff 100644 --- a/plugins/Zeitgeist/templates/admin.twig +++ b/plugins/Zeitgeist/templates/admin.twig @@ -4,14 +4,15 @@ <!--[if (gte IE 9)|!(IE)]><!--> <html><!--<![endif]--> <head> - {% block head %} +{% block head %} <meta charset="utf-8"> <title>{% if not isCustomLogo %}Piwik › {% endif %}{{ 'CoreAdminHome_Administration'|translate }}</title> <meta name="generator" content="Piwik - Open Source Web Analytics"/> <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/> - {% include "_jsGlobalVariables.twig" %} - {% include "_jsCssIncludes.twig" %} +{% include "_jsGlobalVariables.twig" %} +{% include "_jsCssIncludes.twig" %} + <!--[if IE]> <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/ieonly.css"/> <![endif]--> diff --git a/plugins/Zeitgeist/templates/dashboard.twig b/plugins/Zeitgeist/templates/dashboard.twig index d627808ca3..282f51f6c8 100644 --- a/plugins/Zeitgeist/templates/dashboard.twig +++ b/plugins/Zeitgeist/templates/dashboard.twig @@ -13,11 +13,11 @@ <meta name="description" content="Web Analytics report for '{{ siteName|escape("html_attr") }}' - Piwik"/> <meta name="apple-itunes-app" content="app-id=737216887" /> <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/> - {% include "_jsGlobalVariables.twig" %} +{% include "_jsGlobalVariables.twig" %} <!--[if lt IE 9]> <script language="javascript" type="text/javascript" src="libs/jqplot/excanvas.min.js"></script> <![endif]--> - {% include "_jsCssIncludes.twig" %} +{% include "_jsCssIncludes.twig" %} <!--[if IE]> <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/ieonly.css"/> <![endif]--> |