diff --git a/core/View/OneClickDone.php b/core/View/OneClickDone.php index bafebb70851..d87be2dfe0d 100644 --- a/core/View/OneClickDone.php +++ b/core/View/OneClickDone.php @@ -66,8 +66,7 @@ public function render() - - + diff --git a/lang/fr.php b/lang/fr.php index fbe3e0d3998..008fbf8c536 100644 --- a/lang/fr.php +++ b/lang/fr.php @@ -2073,7 +2073,7 @@ 'Transitions_NoDataForAction' => 'Il n\'y a aucune données pour %s', 'Transitions_NoDataForActionDetails' => 'L\'action n\'a eu aucune visite de page durant la période %s ou bien elle est invalide.', 'Transitions_ErrorBack' => 'Retour à l\'action précédente', - 'Overlay_Overlay' => 'FOnd de page', + 'Overlay_Overlay' => 'Fond de page', 'Overlay_PluginDescription' => 'Visualisez les données d\'analyse superposées sur votre site web.', 'Overlay_Location' => 'Localisation', 'Overlay_MainMetrics' => 'Métriques principales', diff --git a/plugins/API/templates/listAllAPI.twig b/plugins/API/templates/listAllAPI.twig index 85ad4792cbf..87d9eee1780 100644 --- a/plugins/API/templates/listAllAPI.twig +++ b/plugins/API/templates/listAllAPI.twig @@ -1,5 +1,4 @@ {% extends 'dashboard.twig' %} -{% set showSitesSelection=true %} {% set showPeriodSelection=false %} {% set showMenu=false %} diff --git a/plugins/CoreAdminHome/templates/optOut.twig b/plugins/CoreAdminHome/templates/optOut.twig index c2a41f2fb75..6665172fcb0 100644 --- a/plugins/CoreAdminHome/templates/optOut.twig +++ b/plugins/CoreAdminHome/templates/optOut.twig @@ -1,8 +1,7 @@ - - + + - + {% if not trackVisits %} diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php index e3a1291f07a..a10b7a0968e 100644 --- a/plugins/CoreHome/CoreHome.php +++ b/plugins/CoreHome/CoreHome.php @@ -60,6 +60,7 @@ function getCssFiles($notification) $cssFiles[] = "plugins/CoreHome/stylesheets/jquery.ui.autocomplete.css"; $cssFiles[] = "plugins/CoreHome/stylesheets/jqplot.css"; $cssFiles[] = "plugins/CoreHome/stylesheets/donate.css"; + $cssFiles[] = "plugins/CoreHome/stylesheets/promo.css"; } /** @@ -85,7 +86,6 @@ function getJsFiles($notification) $jsFiles[] = "plugins/CoreHome/javascripts/menu.js"; $jsFiles[] = "plugins/CoreHome/javascripts/menu_init.js"; $jsFiles[] = "plugins/CoreHome/javascripts/calendar.js"; - $jsFiles[] = "plugins/CoreHome/javascripts/date.js"; $jsFiles[] = "plugins/CoreHome/javascripts/autocomplete.js"; $jsFiles[] = "plugins/CoreHome/javascripts/sparkline.js"; $jsFiles[] = "plugins/CoreHome/javascripts/corehome.js"; @@ -93,6 +93,7 @@ function getJsFiles($notification) $jsFiles[] = "plugins/CoreHome/javascripts/donate.js"; $jsFiles[] = "plugins/CoreHome/javascripts/jqplot.js"; $jsFiles[] = "libs/jqplot/jqplot-custom.min.js"; + $jsFiles[] = "plugins/CoreHome/javascripts/promo.js"; } } diff --git a/plugins/CoreHome/javascripts/calendar.js b/plugins/CoreHome/javascripts/calendar.js index 9952ac281b9..4eb1d9d610e 100644 --- a/plugins/CoreHome/javascripts/calendar.js +++ b/plugins/CoreHome/javascripts/calendar.js @@ -442,14 +442,17 @@ }); // reset date/period when opening calendar - var firstClick = true; - $('#periodString').find('#date').click(function () { - if (!firstClick) { - datepickerElem.datepicker('setDate', currentDate); - $('#period_id_' + piwik.period).click(); + $("#periodString").on('click', "#date,.calendar-icon", function () { + var periodMore = $("#periodMore").toggle(); + if (periodMore.is(":visible")) { + periodMore.find(".ui-state-highlight").removeClass('ui-state-highlight'); } + }); - firstClick = false; + $('body').on('click', function(e) { + if (!$(e.target).parents('#periodString').length && !$(e.target).is('#periodString') && !$(e.target).is('option') && $("#periodMore").is(":visible")) { + $("#periodMore").hide(); + } }); function onDateRangeSelect(dateText, inst) { diff --git a/plugins/CoreHome/javascripts/date.js b/plugins/CoreHome/javascripts/date.js deleted file mode 100644 index 776ac417ae7..00000000000 --- a/plugins/CoreHome/javascripts/date.js +++ /dev/null @@ -1,40 +0,0 @@ -/*! - * Piwik - Web Analytics - * - * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ - -$(document).ready(function () { - - //period widget handler - var periodWidget = { - show: function () { - this.isOpen = 1; - $("#periodMore").show(); - }, - hide: function () { - this.isOpen = 0; - $("#periodMore").hide(); - }, - toggle: function (e) { - if (!this.isOpen) this.show(); - else this.hide(); - } - }; - - $("#periodString").on('click', "#date,.calendar-icon", function () { - periodWidget.toggle(); - if ($("#periodMore").is(":visible")) { - $("#periodMore").find(".ui-state-highlight").removeClass('ui-state-highlight'); - } - }); - - //close periodString onClickOutside - $('body').on('mouseup', function (e) { - if (!$(e.target).parents('#periodString').length && !$(e.target).is('#periodString') && !$(e.target).is('option') && periodWidget.isOpen) { - periodWidget.hide(); - } - }); - -}); diff --git a/plugins/CoreHome/javascripts/promo.js b/plugins/CoreHome/javascripts/promo.js new file mode 100644 index 00000000000..06ef4860e96 --- /dev/null +++ b/plugins/CoreHome/javascripts/promo.js @@ -0,0 +1,12 @@ +$(function () { + $('#piwik-promo-thumbnail').click(function () { + var promoEmbed = $('#piwik-promo-embed'), + widgetWidth = $(this).closest('.widgetContent').width(), + height = (266 * widgetWidth) / 421, + embedHtml = ''; + + $(this).hide(); + promoEmbed.height(height).html(embedHtml); + promoEmbed.show(); + }); +}); \ No newline at end of file diff --git a/plugins/CoreHome/javascripts/sparkline.js b/plugins/CoreHome/javascripts/sparkline.js index 04f1e5d4929..712dd0e7a54 100644 --- a/plugins/CoreHome/javascripts/sparkline.js +++ b/plugins/CoreHome/javascripts/sparkline.js @@ -8,7 +8,7 @@ function initializeSparklines() { var sparklineUrlParamsToIgnore = ['module', 'action', 'idSite', 'period', 'date', 'viewDataTable']; - $("a[name='evolutionGraph']").each(function () { + $("[data-graph-id]").each(function () { var graph = $(this); // try to find sparklines and add them clickable behaviour @@ -32,7 +32,7 @@ function initializeSparklines() { // on click, reload the graph with the new url $(this).click(function () { - var idDataTable = graph.attr('graphId'), + var idDataTable = graph.attr('data-graph-id'), dataTable = $('#' + idDataTable); // when the metrics picker is used, the id of the data table might be updated (which is correct behavior). diff --git a/plugins/CoreHome/stylesheets/promo.css b/plugins/CoreHome/stylesheets/promo.css new file mode 100644 index 00000000000..f12c4b2b817 --- /dev/null +++ b/plugins/CoreHome/stylesheets/promo.css @@ -0,0 +1,78 @@ +#piwik-promo-thumbnail { + background: #fff url(plugins/CoreHome/images/promo_splash.png) no-repeat 0 0; + background-position: center; + width: 321px; + margin: 0 auto 0 auto; +} + +#piwik-promo-embed { + margin-left: 1px; +} + +#piwik-promo-embed>iframe { + z-index: 0; +} + +#piwik-promo-thumbnail { + height: 178px; +} + +#piwik-promo-thumbnail:hover { + opacity: .75; + cursor: pointer; +} + +#piwik-promo-thumbnail>img { + display: block; + position: relative; + top: 53px; + left: 125px; +} + +#piwik-promo-video { + margin: 2em 0 2em 0; +} + +#piwik-widget-footer { + margin: 0 1em 1em 1em; +} + +#piwik-promo-share { + margin: 0 2em 1em 0; + background-color: #CCC; + + border: 1px solid #CCC; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + + display: inline-block; + + padding: 0 .5em 0 .5em; + + float: right; +} + +#piwik-promo-share > a { + margin-left: .5em; + margin-top: 4px; + display: inline-block; +} + +#piwik-promo-share>span { + display: inline-block; + vertical-align: top; + margin-top: 4px; +} + +#piwik-promo-videos-link { + font-size: .8em; + font-style: italic; + margin: 1em 0 0 1.25em; + color: #666; + display: inline-block; +} + +#piwik-promo-videos-link:hover { + text-decoration: none; +} \ No newline at end of file diff --git a/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig index b9555dc5ef5..6cec9b77c27 100644 --- a/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig +++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig @@ -1,5 +1,4 @@ - -

+

{{ reportName }}

diff --git a/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig index 0e6879a1c65..21b4bb35f9a 100644 --- a/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig +++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig @@ -1,11 +1,10 @@ - + - -Piwik +Piwik

{{ websiteName }} diff --git a/plugins/CoreHome/templates/_dataTable.twig b/plugins/CoreHome/templates/_dataTable.twig index 8bac0e86495..9548d3d9efb 100644 --- a/plugins/CoreHome/templates/_dataTable.twig +++ b/plugins/CoreHome/templates/_dataTable.twig @@ -17,8 +17,7 @@
{{ 'CoreHome_ThereIsNoDataForThisReport'|translate }}
{% endif %} {% else %} - - +
{% include "@CoreHome/_dataTableHead.twig" %} diff --git a/plugins/CoreHome/templates/_menu.twig b/plugins/CoreHome/templates/_menu.twig index 2d8cefed98b..ba88ca1de27 100644 --- a/plugins/CoreHome/templates/_menu.twig +++ b/plugins/CoreHome/templates/_menu.twig @@ -1,14 +1,16 @@
+
@@ -72,8 +51,7 @@
- - +
@@ -91,8 +69,7 @@
- - +
@@ -110,8 +87,7 @@
- - +
+
diff --git a/plugins/Dashboard/stylesheets/standalone.css b/plugins/Dashboard/stylesheets/standalone.css new file mode 100644 index 00000000000..f63cfc99ab2 --- /dev/null +++ b/plugins/Dashboard/stylesheets/standalone.css @@ -0,0 +1,78 @@ + +body { + padding-left: 7px; +} + +#dashboard { + margin: 30px -6px 0 -12px; + width: 100%; + padding-top: 8px; +} + +#menuHead { + position: absolute; + top: 0; + padding: 7px 0 0 2px; +} + +#Dashboard { + z-index: 5; + font-size: 14px; + cursor: pointer; +} + +#Dashboard > ul { + list-style: square inside none; + background: #f7f7f7; + border: 1px solid #e4e5e4; + padding: 5px 10px 6px 10px; + border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + color: #444; + height: 18px; +} + +#Dashboard:hover ul { + background: #f1f0eb; + border-color: #a9a399; +} + +#Dashboard > ul > li { + float: left; + text-align: center; + margin: 0 15px; +} + +#Dashboard a { + color: #444; + text-decoration: none; + font-weight: normal; + display: inline-block; + margin: 0 -15px; +} + +#Dashboard > ul > li:hover, #Dashboard > ul > li:hover a, +#Dashboard > ul > li.sfHover, #Dashboard > ul > li.sfHover a { + color: #e87500; +} + +#Dashboard > ul > li.sfHover, #Dashboard > ul > li.sfHover a { + font-weight: bold; +} + +#Dashboard, #periodString, #dashboardSettings { + float: left; + clear: none; + position: relative; + margin-left: 0; + margin-right: 10px; +} + +.jqplock-seriespicker-popover { + top: 0; +} + +#ajaxLoading { + margin: 40px 0 -30px 0; +} \ No newline at end of file diff --git a/plugins/Dashboard/templates/_header.twig b/plugins/Dashboard/templates/_header.twig index f9dfba3f4b0..4a9795fc3ae 100644 --- a/plugins/Dashboard/templates/_header.twig +++ b/plugins/Dashboard/templates/_header.twig @@ -1,96 +1,17 @@ {# This header is for loading the dashboard in stand alone mode #} - - + + + {{ 'General_Dashboard'|translate }} - {{ 'CoreHome_WebAnalyticsReports'|translate }} - + {{ loadJavascriptTranslations(['CoreHome',' Dashboard'])|raw }} + + {% include "_jsGlobalVariables.twig" %} {% include "_jsCssIncludes.twig" %} - - diff --git a/plugins/Goals/templates/_titleAndEvolutionGraph.twig b/plugins/Goals/templates/_titleAndEvolutionGraph.twig index 0ed28e42210..a30b33e4245 100644 --- a/plugins/Goals/templates/_titleAndEvolutionGraph.twig +++ b/plugins/Goals/templates/_titleAndEvolutionGraph.twig @@ -1,4 +1,4 @@ - + {% if displayFullReport %}

{% if goalName is defined %}{{ 'Goals_GoalX'|translate(goalName)|raw }}{% else %}{{ 'Goals_GoalsOverview'|translate }}{% endif %}

diff --git a/plugins/ImageGraph/templates/testAllSizes.twig b/plugins/ImageGraph/templates/testAllSizes.twig index 7b07a9c7224..e5a01949a15 100644 --- a/plugins/ImageGraph/templates/testAllSizes.twig +++ b/plugins/ImageGraph/templates/testAllSizes.twig @@ -1,55 +1,55 @@ {% extends 'dashboard.twig' %} {% block content %} -{% set showSitesSelection=true %} + {% set showSitesSelection=true %} -
-

{{ 'ImageGraph_ImageGraph'|translate }} ::: {{ siteName }}

+
+

{{ 'ImageGraph_ImageGraph'|translate }} ::: {{ siteName }}

-
- {% include '@CoreHome/_periodSelect.twig' %} -
+
+ {% include '@CoreHome/_periodSelect.twig' %} +
-
-
- - - - - - - +
+
+
CategoryName
+ + + + + + - {% for type in graphTypes %} - + {% for type in graphTypes %} + + {% endfor %} + + {% for report in availableReports %} + {% if report.imageGraphUrl is defined %} + + + + {% for type in graphTypes %} + + {% endfor %} + + {% endif %} {% endfor %} - - {% for report in availableReports %} - {% if report.imageGraphUrl is defined %} - - - - {% for type in graphTypes %} - - {% endfor %} - - {% endif %} - {% endfor %} - -
CategoryName{{ type }}{{ type }}
{{ report.category }}{{ report.name }} +

Graph {{ type }} for all supported sizes

+ {% for sizes in graphSizes %} +

{{ sizes.0 }} + x {{ sizes.1 }} {% if sizes.2 is defined %} (scaled down to {{ sizes.3 }} x {{ sizes.4 }}){% endif %}

+ + {% endfor %} +
{{ report.category }}{{ report.name }} -

Graph {{ type }} for all supported sizes

- {% for sizes in graphSizes %} -

{{ sizes.0 }} x {{ sizes.1 }} {% if sizes.2 is defined %} (scaled down to {{ sizes.3 }} x {{ sizes.4 }}){% endif - %}

- - {% endfor %} -
+
+ + - - {% endblock %} \ No newline at end of file diff --git a/plugins/Installation/javascripts/installation.js b/plugins/Installation/javascripts/installation.js new file mode 100644 index 00000000000..8bfc92a0b1f --- /dev/null +++ b/plugins/Installation/javascripts/installation.js @@ -0,0 +1,8 @@ +$(function () { + $('#toFade').fadeOut(4000, function () { $(this).show().css({visibility: 'hidden'}); }); + $('input:first').focus(); + $('#progressbar').progressbar({ + value: parseInt($('#progressbar').attr('data-progress')) + }); + $('code').click(function () { $(this).select(); }); +}); \ No newline at end of file diff --git a/plugins/Installation/stylesheets/installation.css b/plugins/Installation/stylesheets/installation.css index 3d75fb66fd9..2cdd581b1a8 100644 --- a/plugins/Installation/stylesheets/installation.css +++ b/plugins/Installation/stylesheets/installation.css @@ -21,7 +21,6 @@ p { } #subtitle { - font-size: 30px; color: #6B320B; font-size: 27px; } @@ -43,6 +42,10 @@ h3 { color: #3F5163; } +code { + font-size: 80%; +} + .topBarElem { font-family: arial, sans-serif !important; font-size: 13px; @@ -113,13 +116,10 @@ h3 { line-height: 1.4em; width: 860px; border: 1px solid #7A5A3F; - text-align: $ rightouleft; margin: auto; background: #FFFFFF; padding: 0.2em 2em 2em 2em; border-radius: 8px; - -moz-border-radius: 8px; - -webkit-border-radius: 8px; } /* form errors */ @@ -174,7 +174,7 @@ td { .submit input { margin-top: 15px; - background: transparent url(./plugins/Zeitgeist/images/background-submit.png) repeat scroll 0; + background: transparent url(../../../plugins/Zeitgeist/images/background-submit.png) repeat scroll 0; font-size: 1.4em; border-color: #CCCCCC rgb(153, 153, 153) rgb(153, 153, 153) rgb(204, 204, 204); border-style: double; diff --git a/plugins/Installation/stylesheets/systemCheckPage.css b/plugins/Installation/stylesheets/systemCheckPage.css index 49444ce2757..579bd888ae9 100755 --- a/plugins/Installation/stylesheets/systemCheckPage.css +++ b/plugins/Installation/stylesheets/systemCheckPage.css @@ -1,4 +1,5 @@ -#systemCheckOptional, #systemCheckRequired { +#systemCheckOptional, +#systemCheckRequired { border: 1px solid #dadada; width: 100%; max-width: 900px; @@ -8,19 +9,21 @@ margin-bottom: 2em; } -#systemCheckOptional td, #systemCheckRequired td { - /*border: 1px solid #222;*/ +#systemCheckOptional td, +#systemCheckRequired td { padding: 1em .5em 1em 2em; vertical-align: middle; font-size: 1.2em; margin: 0; } -#systemCheckOptional tr:nth-child(even), #systemCheckRequired tr:nth-child(even) { +#systemCheckOptional tr:nth-child(even), +#systemCheckRequired tr:nth-child(even) { background-color: #EFEEEC; } -#systemCheckOptional tr:nth-child(odd), #systemCheckRequired tr:nth-child(odd) { +#systemCheckOptional tr:nth-child(odd), +#systemCheckRequired tr:nth-child(odd) { background-color: #F6F5F3; } diff --git a/plugins/Installation/templates/layout.twig b/plugins/Installation/templates/layout.twig index 2a61063f1e4..f3501dad4d6 100644 --- a/plugins/Installation/templates/layout.twig +++ b/plugins/Installation/templates/layout.twig @@ -1,9 +1,8 @@ - - + + + Piwik › {{ 'Installation_Installation'|translate }} - @@ -11,16 +10,7 @@ - - + {% if 'General_LayoutDirection'|translate =='rtl' %} @@ -65,7 +55,7 @@

{{ 'Installation_InstallationStatus'|translate }}

-
+
{{ 'Installation_PercentDone'|translate(percentDone) }} diff --git a/plugins/Installation/templates/trackingCode.twig b/plugins/Installation/templates/trackingCode.twig index 1940641dd32..0a722697532 100644 --- a/plugins/Installation/templates/trackingCode.twig +++ b/plugins/Installation/templates/trackingCode.twig @@ -14,14 +14,4 @@ {{ 'Installation_JsTagArchivingHelp1'|translate('','')|raw }} {{ 'General_ReadThisToLearnMore'|translate('','')|raw }} - - {% endblock %} \ No newline at end of file diff --git a/plugins/LanguagesManager/templates/getLanguagesSelector.twig b/plugins/LanguagesManager/templates/getLanguagesSelector.twig index 96b5b5144cb..3533e96f244 100644 --- a/plugins/LanguagesManager/templates/getLanguagesSelector.twig +++ b/plugins/LanguagesManager/templates/getLanguagesSelector.twig @@ -1,5 +1,5 @@ - - + +
- {% for smsProvider, description in smsProviders %} - - {% endfor %} - - - {{ 'MobileMessaging_Settings_APIKey'|translate }} - + {{ loadJavascriptTranslations(['MobileMessaging'])|raw }} - + {% if accountManagedByCurrentUser %} +

{{ 'MobileMessaging_Settings_SMSAPIAccount'|translate }}

+ {% if credentialSupplied %} + {{ 'MobileMessaging_Settings_CredentialProvided'|translate(provider) }} + {{ creditLeft }} +
+ {{ 'MobileMessaging_Settings_UpdateOrDeleteAccount'|translate("","","","")|raw }} + {% else %} + {{ 'MobileMessaging_Settings_PleaseSignUp'|translate }} + {% endif %} +
+
+ {{ 'MobileMessaging_Settings_SMSProvider'|translate }} + + + {{ 'MobileMessaging_Settings_APIKey'|translate }} + + + - {% for smsProvider, description in smsProviders %} -
- {{ description|raw }} -
- {% endfor %} + {% for smsProvider, description in smsProviders %} +
+ {{ description|raw }} +
+ {% endfor %} -
-{% endif %} + + {% endif %} -{% import 'ajaxMacros.twig' as ajax %} -{{ ajax.errorDiv('ajaxErrorMobileMessagingSettings') }} + {% import 'ajaxMacros.twig' as ajax %} + {{ ajax.errorDiv('ajaxErrorMobileMessagingSettings') }} -

{{ 'MobileMessaging_Settings_PhoneNumbers'|translate }}

-{% if not credentialSupplied %} - {% if accountManagedByCurrentUser %} - {{ 'MobileMessaging_Settings_CredentialNotProvided'|translate }} +

{{ 'MobileMessaging_Settings_PhoneNumbers'|translate }}

+ {% if not credentialSupplied %} + {% if accountManagedByCurrentUser %} + {{ 'MobileMessaging_Settings_CredentialNotProvided'|translate }} + {% else %} + {{ 'MobileMessaging_Settings_CredentialNotProvidedByAdmin'|translate }} + {% endif %} {% else %} - {{ 'MobileMessaging_Settings_CredentialNotProvidedByAdmin'|translate }} - {% endif %} -{% else %} - {{ 'MobileMessaging_Settings_PhoneNumbers_Help'|translate }} -
-
- - - - +
- {{ 'MobileMessaging_Settings_PhoneNumbers_Add'|translate }} -

+ {{ 'MobileMessaging_Settings_PhoneNumbers_Help'|translate }} +
+
+ + + + - - - - + + + + + + +
+ {{ 'MobileMessaging_Settings_PhoneNumbers_Add'|translate }} +

- {% import 'macros.twig' as piwik %} - {{ piwik.inlineHelp(strHelpAddPhone) }} -
- - {% if phoneNumbers|length > 0 %} -
-
- {{ 'MobileMessaging_Settings_ManagePhoneNumbers'|translate }} -
-
- {% endif %} - - {{ ajax.errorDiv('invalidVerificationCodeAjaxError') }} - - - - + {{ 'MobileMessaging_Settings_CountryCode'|translate }} + {{ 'MobileMessaging_Settings_PhoneNumber'|translate }} +

-
    - {% for phoneNumber, validated in phoneNumbers %} -
  • - {{ phoneNumber }} - {% if not validated %} - + {{ 'MobileMessaging_Settings_PhoneNumbers_CountryCode_Help'|translate }} + + + +
+ {% import 'macros.twig' as piwik %} + {{ piwik.inlineHelp(strHelpAddPhone) }} +
+ + {% if phoneNumbers|length > 0 %} +
+
+ {{ 'MobileMessaging_Settings_ManagePhoneNumbers'|translate }} +
+
+ {% endif %} + + {{ ajax.errorDiv('invalidVerificationCodeAjaxError') }} + + + + + +
    + {% for phoneNumber, validated in phoneNumbers %} +
  • + {{ phoneNumber }} + {% if not validated %} + + + {% endif %} - {% endif %} - - {% if not validated %} + {% if not validated %} +
    + {{ 'MobileMessaging_Settings_VerificationCodeJustSent'|translate }} + {% endif %}
    - {{ 'MobileMessaging_Settings_VerificationCodeJustSent'|translate }} - {% endif %} -
    +
    +
    • + {% endfor %} +
+ +
+ {% endif %} + + {% if isSuperUser %} +

{{ 'MobileMessaging_Settings_SuperAdmin'|translate }}

+ + + + - - -
{{ 'MobileMessaging_Settings_LetUsersManageAPICredential'|translate }} +
+
-{% endif %} - -{% if isSuperUser %} -

{{ 'MobileMessaging_Settings_SuperAdmin'|translate }}

- - - - -
{{ 'MobileMessaging_Settings_LetUsersManageAPICredential'|translate }} -
- -
-
- +

- {{ 'MobileMessaging_Settings_LetUsersManageAPICredential_Yes_Help'|translate }} - + -
-
-{% endif %} + +
+ {% endif %} -{{ ajax.loadingDiv('ajaxLoadingMobileMessagingSettings') }} + {{ ajax.loadingDiv('ajaxLoadingMobileMessagingSettings') }} -
-

{{ 'MobileMessaging_Settings_DeleteAccountConfirm'|translate }}

- - -
+
+

{{ 'MobileMessaging_Settings_DeleteAccountConfirm'|translate }}

+ + +
{% endblock %} diff --git a/plugins/MultiSites/templates/getSitesInfo.twig b/plugins/MultiSites/templates/getSitesInfo.twig index 31987ebfe48..e704514a017 100644 --- a/plugins/MultiSites/templates/getSitesInfo.twig +++ b/plugins/MultiSites/templates/getSitesInfo.twig @@ -1,11 +1,11 @@ -{% if isWidgetized %} - {% set showTopMenu = false %} - {% set showSitesSelection = false %} -{% endif %} - {% extends 'dashboard.twig' %} {% block content %} + +
+ {% include "@CoreHome/_periodSelect.twig" %} +
+
+ Piwik_Overlay_Translations = { + domain: "{{ 'Overlay_Domain'|translate }}" + }; + {% endblock %} diff --git a/plugins/Overlay/templates/showErrorWrongDomain.twig b/plugins/Overlay/templates/showErrorWrongDomain.twig index dc9ecb6dc65..0d33e5f81c0 100644 --- a/plugins/Overlay/templates/showErrorWrongDomain.twig +++ b/plugins/Overlay/templates/showErrorWrongDomain.twig @@ -1,31 +1,11 @@ - - + + + - - - - +

{{ message|raw }}

diff --git a/plugins/PDFReports/templates/index.twig b/plugins/PDFReports/templates/index.twig index 19f09ea88ab..f48038613b2 100644 --- a/plugins/PDFReports/templates/index.twig +++ b/plugins/PDFReports/templates/index.twig @@ -1,7 +1,6 @@ {% extends 'dashboard.twig' %} {% block content %} -{% set showSitesSelection=true %}
{% include "@CoreHome/_periodSelect.twig" %} @@ -35,7 +34,7 @@ ReportPlugin.reportList = {{ reportsJSON | raw }}; ReportPlugin.createReportString = "{{ 'PDFReports_CreateReport'|translate }}"; ReportPlugin.updateReportString = "{{ 'PDFReports_UpdateReport'|translate }}"; - $(document).ready(function () { + $(function () { initManagePdf(); }); diff --git a/plugins/PrivacyManager/templates/privacySettings.twig b/plugins/PrivacyManager/templates/privacySettings.twig index 3adab8a3838..7439562717d 100644 --- a/plugins/PrivacyManager/templates/privacySettings.twig +++ b/plugins/PrivacyManager/templates/privacySettings.twig @@ -6,8 +6,7 @@

{{ 'PrivacyManager_TeaserHeadline'|translate }}

{{ 'PrivacyManager_Teaser'|translate('',"",'',"",'',"")|raw }} See also our official guide Web Analytics Privacy

- -

{{ 'PrivacyManager_UseAnonymizeIp'|translate }}

+

{{ 'PrivacyManager_UseAnonymizeIp'|translate }}

@@ -71,8 +70,7 @@ - -

{{ 'PrivacyManager_DeleteDataSettings'|translate }}

+

{{ 'PrivacyManager_DeleteDataSettings'|translate }}

{{ 'PrivacyManager_DeleteDataDescription'|translate }} {{ 'PrivacyManager_DeleteDataDescription2'|translate }}

@@ -229,8 +227,7 @@
- -

{{ 'PrivacyManager_DoNotTrack_SupportDNTPreference'|translate }}

+

{{ 'PrivacyManager_DoNotTrack_SupportDNTPreference'|translate }}

@@ -259,8 +256,7 @@
{% endif %} - -

{{ 'CoreAdminHome_OptOutForYourVisitors'|translate }}

+

{{ 'CoreAdminHome_OptOutForYourVisitors'|translate }}

{{ 'CoreAdminHome_OptOutExplanation'|translate }} {% set optOutUrl %}{{ piwikUrl }}index.php?module=CoreAdminHome&action=optOut&language={{ language }}{% endset %} {% set iframeOptOut %}{% endset %} diff --git a/plugins/Proxy/templates/exportImageWindow.twig b/plugins/Proxy/templates/exportImageWindow.twig index 85bc749a0f7..0145a6589f6 100644 --- a/plugins/Proxy/templates/exportImageWindow.twig +++ b/plugins/Proxy/templates/exportImageWindow.twig @@ -1,8 +1,7 @@ - - + + - + {{ 'General_ExportAsImage_js'|translate }} diff --git a/plugins/Referers/templates/index.twig b/plugins/Referers/templates/index.twig index 6cca9ab49ed..f456ba1e99a 100644 --- a/plugins/Referers/templates/index.twig +++ b/plugins/Referers/templates/index.twig @@ -1,5 +1,4 @@ - -

{{ 'Referers_Evolution'|translate }}

+

{{ 'Referers_Evolution'|translate }}

{{ graphEvolutionReferers|raw }}
diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php index 54b7f9330d6..b2b5821d0ae 100644 --- a/plugins/SitesManager/SitesManager.php +++ b/plugins/SitesManager/SitesManager.php @@ -57,6 +57,7 @@ function getCssFiles($notification) { $cssFiles = & $notification->getNotificationObject(); + $cssFiles[] = "plugins/SitesManager/stylesheets/SitesManager.css"; $cssFiles[] = "plugins/Zeitgeist/stylesheets/styles.css"; } diff --git a/plugins/SitesManager/javascripts/SitesManager.js b/plugins/SitesManager/javascripts/SitesManager.js index 30189068798..73000c39697 100644 --- a/plugins/SitesManager/javascripts/SitesManager.js +++ b/plugins/SitesManager/javascripts/SitesManager.js @@ -438,3 +438,28 @@ function onClickSiteSearchUseDefault() { } } +$(function () { + + // when code element is clicked, select the text + $('.trackingHelp code').click(function() { + // credit where credit is due: + // http://stackoverflow.com/questions/1173194/select-all-div-text-with-single-mouse-click + var range; + if (document.body.createTextRange) // MSIE + { + range = document.body.createTextRange(); + range.moveToElementText(this); + range.select(); + } + else if (window.getSelection) // others + { + range = document.createRange(); + range.selectNodeContents(this); + + var selection = window.getSelection(); + selection.removeAllRanges(); + selection.addRange(range); + } + }) + .click(); +}); diff --git a/plugins/SitesManager/stylesheets/SitesManager.css b/plugins/SitesManager/stylesheets/SitesManager.css new file mode 100644 index 00000000000..4866c98d943 --- /dev/null +++ b/plugins/SitesManager/stylesheets/SitesManager.css @@ -0,0 +1,59 @@ +.trackingHelp ul { + padding-left: 40px; + list-style-type: square; +} + +.trackingHelp ul li { + margin-bottom: 10px; +} + +.trackingHelp h2 { + margin-top: 20px; +} + +.trackingHelp p { + text-align: justify; +} + +#editSites { + vertical-align: top; +} + +#editSites h4 { + font-size: .8em; + margin: 1em 0 1em 0; + font-weight: bold; +} + +#editSites .entityTable tr td { + vertical-align: top; + padding-top: 7px; +} + +#editSites .addRowSite:hover, +#editSites .editableSite:hover, +#editSites .addsite:hover, +#editSites .cancel:hover, +#editSites .deleteSite:hover, +#editSites .editSite:hover, +#editSites .updateSite:hover { + cursor: pointer; +} + +#editSites .addRowSite a { + text-decoration: none; +} + +#editSites .addRowSite { + padding: 1em; + font-weight: bold; +} + +.ecommerceInactive, +.sitesearchInactive { + color: #666666; +} + +#searchSiteParameters { + display: none; +} \ No newline at end of file diff --git a/plugins/SitesManager/templates/_displayJavascriptCode.twig b/plugins/SitesManager/templates/_displayJavascriptCode.twig index 950ce47705f..508f3dd21ba 100644 --- a/plugins/SitesManager/templates/_displayJavascriptCode.twig +++ b/plugins/SitesManager/templates/_displayJavascriptCode.twig @@ -1,22 +1,3 @@ - -

{{ 'SitesManager_TrackingTags'|translate(displaySiteName) }}

@@ -34,31 +15,4 @@ {{ 'CoreAdminHome_JSTrackingIntro5'|translate('','')|raw }}

{{ 'Installation_JSTracking_EndNote'|translate('','')|raw }} -
- \ No newline at end of file +
\ No newline at end of file diff --git a/plugins/SitesManager/templates/index.twig b/plugins/SitesManager/templates/index.twig index 5d619b94b3d..02b9e13432f 100644 --- a/plugins/SitesManager/templates/index.twig +++ b/plugins/SitesManager/templates/index.twig @@ -1,463 +1,426 @@ {% extends 'admin.twig' %} {% block content %} -{% import 'macros.twig' as piwik %} -{% import 'ajaxMacros.twig' as ajax %} -{{ loadJavascriptTranslations(['SitesManager']) }} - -{% set excludedIpHelpPlain %} - {{ 'SitesManager_HelpExcludedIps'|translate("1.2.3.*","1.2.*.*") }} -

- {{ 'SitesManager_YourCurrentIpAddressIs'|translate("" ~ currentIpAddress ~ "")|raw }} -{% endset %} -{% set excludedIpHelp=piwik.inlineHelp(excludedIpHelpPlain) %} - -{% set defaultTimezoneHelpPlain %} - {% if timezoneSupported %} - {{ 'SitesManager_ChooseCityInSameTimezoneAsYou'|translate }} + {% import 'macros.twig' as piwik %} + {% import 'ajaxMacros.twig' as ajax %} + {{ loadJavascriptTranslations(['SitesManager']) }} + + {% set excludedIpHelpPlain %} + {{ 'SitesManager_HelpExcludedIps'|translate("1.2.3.*","1.2.*.*") }} +

+ {{ 'SitesManager_YourCurrentIpAddressIs'|translate("" ~ currentIpAddress ~ "")|raw }} + {% endset %} + + {% set excludedIpHelp=piwik.inlineHelp(excludedIpHelpPlain) %} + + {% set defaultTimezoneHelpPlain %} + {% if timezoneSupported %} + {{ 'SitesManager_ChooseCityInSameTimezoneAsYou'|translate }} + {% else %} + {{ 'SitesManager_AdvancedTimezoneSupportNotFound'|translate }} + {% endif %} +

+ {{ 'SitesManager_UTCTimeIs'|translate(utcTime) }} + {% endset %} + + {% set timezoneHelpPlain %} + {{ defaultTimezoneHelpPlain }} +

+ {{ 'SitesManager_ChangingYourTimezoneWillOnlyAffectDataForward'|translate }} + {% endset %} + + {% set currencyHelpPlain %} + {{ piwik.inlineHelp('SitesManager_CurrencySymbolWillBeUsedForGoals'|translate) }} + {% endset %} + + {% set ecommerceHelpPlain %} + {{ 'SitesManager_EcommerceHelp'|translate }} +
+ {{ 'SitesManager_PiwikOffersEcommerceAnalytics'|translate("","")|raw }} + {% endset %} + + {% set excludedQueryParametersHelp %} + {{ 'SitesManager_ListOfQueryParametersToExclude'|translate }} +

+ {{ 'SitesManager_PiwikWillAutomaticallyExcludeCommonSessionParameters'|translate("phpsessid, sessionid, ...") }} + {% endset %} + + {% set excludedQueryParametersHelp=piwik.inlineHelp(excludedQueryParametersHelp) %} + + {% set excludedUserAgentsHelp %} + {{ 'SitesManager_GlobalExcludedUserAgentHelp1'|translate }} +

+ {{ 'SitesManager_GlobalListExcludedUserAgents_Desc'|translate }} {{ 'SitesManager_GlobalExcludedUserAgentHelp2'|translate }} + {% endset %} + + {% set excludedUserAgentsHelp=piwik.inlineHelp(excludedUserAgentsHelp) %} + + {% set keepURLFragmentSelectHTML %} +

{{ 'SitesManager_KeepURLFragmentsLong'|translate }}

+ + + {% endset %} + + + +

{{ 'SitesManager_WebsitesManagement'|translate }}

+

{{ 'SitesManager_MainDescription'|translate }} + {{ 'SitesManager_YouCurrentlyHaveAccessToNWebsites'|translate("" ~ adminSitesCount ~ "")|raw }} + {% if isSuperUser %} +
+ {{ 'SitesManager_SuperUserCan'|translate("","")|raw }} + {% endif %} +

+ {{ ajax.errorDiv() }} + {{ ajax.loadingDiv() }} + + {% set createNewWebsite %} +
+ Add Website {{ 'SitesManager_AddSite'|translate }} +
+ {% endset %} + + {% if adminSites|length == 0 %} + {{ 'SitesManager_NoWebsites'|translate }} {% else %} - {{ 'SitesManager_AdvancedTimezoneSupportNotFound'|translate }} +
+

+ + +
+
+ {% if isSuperUser %} + {{ createNewWebsite }} + {% endif %} + + + + + + + + + + + + + + + + + + + + {% for i,site in adminSites %} + + + + + + + + + + + + + + + + {% endfor %} + +
{{ 'General_Id'|translate }}{{ 'General_Name'|translate }}{{ 'SitesManager_Urls'|translate }}{{ 'SitesManager_ExcludedIps'|translate }}{{ 'SitesManager_ExcludedParameters'|translate|replace({" ":"
"})|raw }}		{{ 'SitesManager_ExcludedUserAgents'|translate }}{{ 'Actions_SubmenuSitesearch'|translate }}{{ 'SitesManager_Timezone'|translate }}{{ 'SitesManager_Currency'|translate }}{{ 'Goals_Ecommerce'|translate }}{{ 'SitesManager_JsTrackingTag'|translate }}
{{ site.idsite }} + {{- site.name|raw -}} + + {%- for url in site.alias_urls -%} + {{- url|trim|replace({'http://': ''})|raw -}}
+ {%- endfor -%} + 		+ {%- for ip in site.excluded_ips -%} + {{- ip -}}
+ {%- endfor -%} + 		+ {%- for parameter in site.excluded_parameters -%} + {{- parameter|raw -}}
+ {%- endfor -%} + 		+ {%- for ua in site.excluded_user_agents -%} + {{- ua|raw -}}
+ {%- endfor -%} + 		+ {% if site.sitesearch %} + {{ 'General_Yes'|translate }} + {% else %} + - + {% endif %} + + + {{ site.timezone }}{{ site.currency }} + {% if site.ecommerce %} + {{ 'General_Yes'|translate }} + {% else %} + - + {% endif %} + + + + {{ 'General_Edit'|translate }} + + + + + {{ 'General_Delete'|translate }} + + + + {{ 'SitesManager_ShowTrackingTag'|translate }} + +
+ {% if isSuperUser %} + {{ createNewWebsite }} + {% endif %} +
{% endif %} -

- {{ 'SitesManager_UTCTimeIs'|translate(utcTime) }} -{% endset %} - -{% set timezoneHelpPlain %} - {{ defaultTimezoneHelpPlain }} -

- {{ 'SitesManager_ChangingYourTimezoneWillOnlyAffectDataForward'|translate }} -{% endset %} - -{% set currencyHelpPlain %} - {{ piwik.inlineHelp('SitesManager_CurrencySymbolWillBeUsedForGoals'|translate) }} -{% endset %} - -{% set ecommerceHelpPlain %} - {{ 'SitesManager_EcommerceHelp'|translate }} -
- {{ 'SitesManager_PiwikOffersEcommerceAnalytics'|translate("","")|raw }} -{% endset %} - -{% set excludedQueryParametersHelp %} - {{ 'SitesManager_ListOfQueryParametersToExclude'|translate }} -

- {{ 'SitesManager_PiwikWillAutomaticallyExcludeCommonSessionParameters'|translate("phpsessid, sessionid, ...") }} -{% endset %} -{% set excludedQueryParametersHelp=piwik.inlineHelp(excludedQueryParametersHelp) %} - -{% set excludedUserAgentsHelp %} - {{ 'SitesManager_GlobalExcludedUserAgentHelp1'|translate }} -

- {{ 'SitesManager_GlobalListExcludedUserAgents_Desc'|translate}} {{ 'SitesManager_GlobalExcludedUserAgentHelp2'|translate }} -{% endset %} -{% set excludedUserAgentsHelp=piwik.inlineHelp(excludedUserAgentsHelp) %} - -{% set keepURLFragmentSelectHTML %} -

{{ 'SitesManager_KeepURLFragmentsLong'|translate }}

- - -{% endset %} - - - - - -

{{ 'SitesManager_WebsitesManagement'|translate }}

-

{{ 'SitesManager_MainDescription'|translate }} -{{ 'SitesManager_YouCurrentlyHaveAccessToNWebsites'|translate("" ~ adminSitesCount ~ "")|raw }} -{% if isSuperUser %} -
- {{ 'SitesManager_SuperUserCan'|translate("","")|raw }} -{% endif %} -

-{{ ajax.errorDiv() }} -{{ ajax.loadingDiv() }} - -{% set createNewWebsite %} -
- Add Website {{ 'SitesManager_AddSite'|translate }} -
-{% endset %} - -{% if adminSites|length == 0 %} - {{ 'SitesManager_NoWebsites'|translate }} -{% else %} -
-

- - -
-
- {% if isSuperUser %} - {{ createNewWebsite }} + + {# Admin users use these values for Site Search column, when editing websites #} + {% if not isSuperUser %} + + {% endif %} - - - - - - - - - - - - - - - - - - - - {% for i,site in adminSites %} - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{ 'General_Id'|translate }}{{ 'General_Name'|translate }}{{ 'SitesManager_Urls'|translate }}{{ 'SitesManager_ExcludedIps'|translate }}{{ 'SitesManager_ExcludedParameters'|translate|replace({" ":"
"})|raw }}		{{ 'SitesManager_ExcludedUserAgents'|translate }}{{ 'Actions_SubmenuSitesearch'|translate }}{{ 'SitesManager_Timezone'|translate }}{{ 'SitesManager_Currency'|translate }}{{ 'Goals_Ecommerce'|translate }}{{ 'SitesManager_JsTrackingTag'|translate}}
{{ site.idsite }} - {{- site.name|raw -}} - - {%- for url in site.alias_urls -%} - {{- url|trim|replace({'http://': ''})|raw -}}
- {%- endfor -%}		 - {%- for ip in site.excluded_ips -%} - {{- ip -}}
- {%- endfor -%}		 - {%- for parameter in site.excluded_parameters -%} - {{- parameter|raw -}}
- {%- endfor -%} + + {% if isSuperUser %} +
+ +

{{ 'SitesManager_GlobalWebsitesSettings'|translate }}

+
+ + + + - + + - - - - + + + + + + + + + {# global excluded user agents #} + + + + + + - {% endfor %} - -
+ {{ 'SitesManager_GlobalListExcludedIps'|translate }} + +

{{ 'SitesManager_ListOfIpsToBeExcludedOnAllWebsites'|translate }}

- {%- for ua in site.excluded_user_agents -%} - {{- ua|raw -}}
- {%- endfor -%} +
+ - {% if site.sitesearch %} - {{ 'General_Yes'|translate }} - {% else %} - - - {% endif %} - - + + {{ site.timezone }}{{ site.currency }} - {% if site.ecommerce %} - {{ 'General_Yes'|translate }} - {% else %} - - - {% endif %} +
+ {{ 'SitesManager_GlobalListExcludedQueryParameters'|translate }} + +

{{ 'SitesManager_ListOfQueryParametersToBeExcludedOnAllWebsites'|translate }}

- - - {{ 'General_Edit'|translate }} - + - - - {{ 'General_Delete'|translate }} - + +
+ {{ 'SitesManager_GlobalListExcludedUserAgents'|translate }} + +

{{ 'SitesManager_GlobalListExcludedUserAgents_Desc'|translate }}

- - {{ 'SitesManager_ShowTrackingTag'|translate }} - + +
- {% if isSuperUser %} - {{ createNewWebsite }} - {% endif %} - -{% endif %} - - -{# Admin users use these values for Site Search column, when editing websites #} -{% if not isSuperUser %} - - -{% endif %} - -{% if isSuperUser %} -
- -

{{ 'SitesManager_GlobalWebsitesSettings'|translate }}

-
- - - - - - - - - - - - - - - - - - - -{# global excluded user agents #} - - - - - - - - - - - + - - - -{# global keep URL fragments #} - - - - -{# global site search #} - - + + + + {# global keep URL fragments #} + + + + + {# global site search #} + + - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {{ 'SitesManager_GlobalListExcludedIps'|translate }} - -

{{ 'SitesManager_ListOfIpsToBeExcludedOnAllWebsites'|translate }}

-
- - - -
- {{ 'SitesManager_GlobalListExcludedQueryParameters'|translate }} - -

{{ 'SitesManager_ListOfQueryParametersToBeExcludedOnAllWebsites'|translate }}

-
- - - -
- {{ 'SitesManager_GlobalListExcludedUserAgents'|translate }} - -

{{ 'SitesManager_GlobalListExcludedUserAgents_Desc'|translate }}

-
- - -
- - + +
+ + - - {{ piwik.inlineHelp('SitesManager_EnableSiteSpecificUserAgentExclude_Help'|translate('','')|raw) }} -
- {{ 'SitesManager_KeepURLFragments'|translate }} - -

{{ 'SitesManager_KeepURLFragmentsHelp'|translate("#","example.org/index.html#first_section","example.org/index.html")|raw }} -

- - - -

{{ 'SitesManager_KeepURLFragmentsHelp2'|translate }}

-
- {{ 'SitesManager_TrackingSiteSearch'|translate }} - -

{{ sitesearchIntro }}

+ 		+ {{ piwik.inlineHelp('SitesManager_EnableSiteSpecificUserAgentExclude_Help'|translate('',''))|raw }} +
+ {{ 'SitesManager_KeepURLFragments'|translate }} + +

{{ 'SitesManager_KeepURLFragmentsHelp'|translate("#","example.org/index.html#first_section","example.org/index.html")|raw }} +

+ + + +

{{ 'SitesManager_KeepURLFragmentsHelp2'|translate }}

+
+ {{ 'SitesManager_TrackingSiteSearch'|translate }} + +

{{ sitesearchIntro }}

{{ 'SitesManager_SearchParametersNote'|translate }} {{ 'SitesManager_SearchParametersNote2'|translate }} -
- -
- {% if not isSearchCategoryTrackingEnabled %} - - Note: you could also track your Internal Search Engine Categories, but the plugin Custom Variables is required. Please enable the plugin CustomVariables (or ask your Piwik admin). - {% else %} - {{ 'Goals_Optional'|translate }} {{ 'SitesManager_SearchCategoryDesc'|translate }}
-
- - {% endif %} -
- {{ 'SitesManager_DefaultTimezoneForNewWebsites'|translate }} - -

{{ 'SitesManager_SelectDefaultTimezone'|translate }}

-
-
- 		- {{ defaultTimezoneHelp }} -
- {{ 'SitesManager_DefaultCurrencyForNewWebsites'|translate }} - -

{{ 'SitesManager_SelectDefaultCurrency'|translate }}

-
-
- 		- {{ currencyHelpPlain }} -
- +
+ +
+ {% if not isSearchCategoryTrackingEnabled %} + + Note: you could also track your Internal Search Engine Categories, but the plugin Custom Variables is required. Please enable the plugin CustomVariables (or ask your Piwik admin). + {% else %} + {{ 'Goals_Optional'|translate }} {{ 'SitesManager_SearchCategoryDesc'|translate }}
+
+ + {% endif %} +
+ {{ 'SitesManager_DefaultTimezoneForNewWebsites'|translate }} + +

{{ 'SitesManager_SelectDefaultTimezone'|translate }}

+
+
+ 		+ {{ defaultTimezoneHelp }} +
+ {{ 'SitesManager_DefaultCurrencyForNewWebsites'|translate }} + +

{{ 'SitesManager_SelectDefaultCurrency'|translate }}

+
+
+ 		+ {{ currencyHelpPlain }} +
+ - {{ ajax.errorDiv('ajaxErrorGlobalSettings') }} - {{ ajax.loadingDiv('ajaxLoadingGlobalSettings') }} -{% endif %} -{% if showAddSite %} - -{% endif %} - -



+ {{ ajax.errorDiv('ajaxErrorGlobalSettings') }} + {{ ajax.loadingDiv('ajaxLoadingGlobalSettings') }} + {% endif %} + {% if showAddSite %} + + {% endif %} + +



{% endblock %} diff --git a/plugins/UsersManager/UsersManager.php b/plugins/UsersManager/UsersManager.php index 7c518bca668..5046f34caec 100644 --- a/plugins/UsersManager/UsersManager.php +++ b/plugins/UsersManager/UsersManager.php @@ -50,6 +50,7 @@ function getListHooksRegistered() return array( 'AdminMenu.add' => 'addMenu', 'AssetManager.getJsFiles' => 'getJsFiles', + 'AssetManager.getCssFiles' => 'getCssFiles', 'SitesManager.deleteSite' => 'deleteSite', 'Common.fetchWebsiteAttributes' => 'recordAdminUsersInCache', ); @@ -105,6 +106,18 @@ function getJsFiles($notification) $jsFiles[] = "plugins/UsersManager/javascripts/usersSettings.js"; } + /** + * Get CSS files + * + * @param Piwik_Event_Notification $notification notification object + */ + function getCssFiles($notification) + { + $cssFiles = & $notification->getNotificationObject(); + + $cssFiles[] = "plugins/UsersManager/stylesheets/usersManager.css"; + } + /** * Add admin menu items */ diff --git a/plugins/UsersManager/stylesheets/usersManager.css b/plugins/UsersManager/stylesheets/usersManager.css new file mode 100644 index 00000000000..0c3fc1c9f1d --- /dev/null +++ b/plugins/UsersManager/stylesheets/usersManager.css @@ -0,0 +1,10 @@ +#users .editable:hover, +#users .addrow:hover, +#users .updateAccess:hover, +#users .accessGranted:hover, +#users .adduser:hover, .edituser:hover, +#users .deleteuser:hover, +#users .updateuser:hover, +#users .cancel:hover { + cursor: pointer; +} \ No newline at end of file diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig index 01b3eafce00..a90fe124b8a 100644 --- a/plugins/UsersManager/templates/index.twig +++ b/plugins/UsersManager/templates/index.twig @@ -3,35 +3,6 @@ {% block content %} {{ loadJavascriptTranslations(['UsersManager'])|raw }} - -

{{ 'UsersManager_ManageAccess'|translate }}

diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig index 498bb530ca5..4af206e6a76 100644 --- a/plugins/UsersManager/templates/userSettings.twig +++ b/plugins/UsersManager/templates/userSettings.twig @@ -97,7 +97,8 @@

-

{{ 'UsersManager_ExcludeVisitsViaCookie'|translate }}

+ +

{{ 'UsersManager_ExcludeVisitsViaCookie'|translate }}

{% if ignoreCookieSet %} {{ 'UsersManager_YourVisitsAreIgnoredOnDomain'|translate("", piwikHost, "")|raw }} diff --git a/plugins/VisitFrequency/templates/index.twig b/plugins/VisitFrequency/templates/index.twig index 82053d00f61..f3af02c1ad6 100644 --- a/plugins/VisitFrequency/templates/index.twig +++ b/plugins/VisitFrequency/templates/index.twig @@ -1,8 +1,7 @@ {{ postEvent("template_headerVisitsFrequency") }} - -

{{ 'VisitFrequency_ColumnReturningVisits'|translate }}

-{{ graphEvolutionVisitFrequency|raw }} +

{{ 'VisitFrequency_ColumnReturningVisits'|translate }}

+ {{ graphEvolutionVisitFrequency|raw }}
{% include "@VisitFrequency/_sparklines.twig" %} diff --git a/plugins/VisitsSummary/templates/index.twig b/plugins/VisitsSummary/templates/index.twig index c872e5c1a20..fad6c86bffd 100644 --- a/plugins/VisitsSummary/templates/index.twig +++ b/plugins/VisitsSummary/templates/index.twig @@ -1,7 +1,5 @@ {# This graphId must be unique for this report #} - - -

{{ 'Referers_Evolution'|translate }}

+

{{ 'Referers_Evolution'|translate }}

{{ graphEvolutionVisitsSummary|raw }} diff --git a/plugins/Widgetize/Widgetize.php b/plugins/Widgetize/Widgetize.php index 24c50c280fd..31b5a95a5c6 100644 --- a/plugins/Widgetize/Widgetize.php +++ b/plugins/Widgetize/Widgetize.php @@ -66,6 +66,7 @@ function getCssFiles($notification) { $cssFiles = & $notification->getNotificationObject(); + $cssFiles[] = "plugins/Widgetize/stylesheets/widgetize.css"; $cssFiles[] = "plugins/CoreHome/stylesheets/corehome.css"; $cssFiles[] = "plugins/CoreHome/stylesheets/datatable.css"; $cssFiles[] = "plugins/CoreHome/stylesheets/cloud.css"; diff --git a/plugins/Widgetize/stylesheets/widgetize.css b/plugins/Widgetize/stylesheets/widgetize.css new file mode 100644 index 00000000000..bd23615d33a --- /dev/null +++ b/plugins/Widgetize/stylesheets/widgetize.css @@ -0,0 +1,31 @@ +.widgetize { + width: 100%; + padding: 15px 15px 0 15px; + font-size: 13px; +} + +.widgetize p { + padding: 0 0 20px 0; +} + +.widgetize .formEmbedCode { + font-size: 11px; + text-decoration: none; + background-color: #FBFDFF; + border: 1px solid #ECECEC; + width: 220px; +} + +.widgetize label { + color: #666666; + line-height: 18px; + margin-right: 5px; + font-weight: bold; + padding-bottom: 100px; +} + +#embedThisWidgetIframe, +#embedThisWidgetFlash, +#embedThisWidgetEverywhere { + margin-top: 5px; +} \ No newline at end of file diff --git a/plugins/Widgetize/templates/iframe.twig b/plugins/Widgetize/templates/iframe.twig index ea34ef8936e..9edea914d77 100644 --- a/plugins/Widgetize/templates/iframe.twig +++ b/plugins/Widgetize/templates/iframe.twig @@ -1,8 +1,7 @@ - - + + - + {{ loadJavascriptTranslations(['CoreHome']) }} {% include "_jsGlobalVariables.twig" %} - {% block head %} + {% block head %} + {% if not isCustomLogo %}Piwik › {% endif %}{{ 'CoreAdminHome_Administration'|translate }} - @@ -24,20 +24,12 @@ {% include "@CoreHome/_javaScriptDisabled.twig" %}
- {% if showTopMenu is not defined or showTopMenu %} - {% set showSitesSelection = false %} - {% set showPeriodSelection = false %} - {% include "@CoreHome/_topBar.twig" %} - {% endif %} - - + {% include "@CoreHome/_topScreen.twig" %} {% import 'ajaxMacros.twig' as ajax %} {{ ajax.requestErrorDiv }}
+ {% if showMenu is not defined or showMenu %} {% include "@CoreAdminHome/_menu.twig" %} {% endif %} diff --git a/plugins/Zeitgeist/templates/dashboard.twig b/plugins/Zeitgeist/templates/dashboard.twig index 6d20d94027f..a1f7440c13e 100644 --- a/plugins/Zeitgeist/templates/dashboard.twig +++ b/plugins/Zeitgeist/templates/dashboard.twig @@ -5,8 +5,8 @@ {% block head %} - {{ siteName|raw }} - {% if isCustomLogo == false %}Piwik › {% endif %} {{ 'CoreHome_WebAnalyticsReports'|translate}} - + + {{ siteName|raw }} - {% if isCustomLogo == false %}Piwik › {% endif %} {{ 'CoreHome_WebAnalyticsReports'|translate }} @@ -27,7 +27,6 @@
{% include "@CoreHome/_warningInvalidHost.twig" %} - {% include "@CoreHome/_topBar.twig" %} {% include "@CoreHome/_topScreen.twig" %}

diff --git a/plugins/Zeitgeist/templates/simpleLayoutHeader.tpl b/plugins/Zeitgeist/templates/simpleLayoutHeader.tpl index 364ab16fb3b..8e58feb8080 100644 --- a/plugins/Zeitgeist/templates/simpleLayoutHeader.tpl +++ b/plugins/Zeitgeist/templates/simpleLayoutHeader.tpl @@ -1,9 +1,8 @@ - + + {$HTML_TITLE} - diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__PDFReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__PDFReports.generateReport_month.original.html index 1f27b18ef8d..e85cf1d597d 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__PDFReports.generateReport_month.original.html +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__PDFReports.generateReport_month.original.html @@ -1,6 +1,6 @@ - + diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html index 149cf55965f..249673eda49 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html @@ -1,6 +1,6 @@ - + diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html index cb732976b02..17115c18cdd 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html @@ -1,6 +1,6 @@ - + diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__PDFReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__PDFReports.generateReport_week.original.html index e40448a8cd2..2a3f647dda5 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__PDFReports.generateReport_week.original.html +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__PDFReports.generateReport_week.original.html @@ -1,6 +1,6 @@ - + diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html index 211d4af4068..1ca3e2007fe 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html @@ -1,6 +1,6 @@ - + diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html index ad3ff0bb0ef..302cfa778f2 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html @@ -1,6 +1,6 @@ - + diff --git a/tests/javascript/index.php b/tests/javascript/index.php index 0d6fa88b8e6..eae2b8387c3 100644 --- a/tests/javascript/index.php +++ b/tests/javascript/index.php @@ -1,9 +1,8 @@ - + - - piwik.js: Unit Tests + + piwik.js: Unit Tests - + + {! Link.base = ""; /* all generated links will be relative to this */ !} diff --git a/tests/lib/jsdoc-toolkit/templates/jsdoc/class.tmpl b/tests/lib/jsdoc-toolkit/templates/jsdoc/class.tmpl index 1b32e4aa125..4f980d42697 100644 --- a/tests/lib/jsdoc-toolkit/templates/jsdoc/class.tmpl +++ b/tests/lib/jsdoc-toolkit/templates/jsdoc/class.tmpl @@ -1,6 +1,5 @@ - - + + diff --git a/tests/lib/jsdoc-toolkit/templates/jsdoc/index.tmpl b/tests/lib/jsdoc-toolkit/templates/jsdoc/index.tmpl index a5dc1158ec8..06960ec7991 100644 --- a/tests/lib/jsdoc-toolkit/templates/jsdoc/index.tmpl +++ b/tests/lib/jsdoc-toolkit/templates/jsdoc/index.tmpl @@ -1,6 +1,5 @@ - - + + diff --git a/tests/lib/jsdoc-toolkit/templates/jsdoc/static/index.html b/tests/lib/jsdoc-toolkit/templates/jsdoc/static/index.html index 661f6f67d18..7632b1d4e24 100644 --- a/tests/lib/jsdoc-toolkit/templates/jsdoc/static/index.html +++ b/tests/lib/jsdoc-toolkit/templates/jsdoc/static/index.html @@ -1,8 +1,7 @@ - - + + - + Generated Javascript Documentation