diff options
Diffstat (limited to 'plugins/CoreHome')
31 files changed, 209 insertions, 73 deletions
diff --git a/plugins/CoreHome/DataTableRowAction/RowEvolution.php b/plugins/CoreHome/DataTableRowAction/RowEvolution.php index 2e3632d69e..e7e46820f5 100644 --- a/plugins/CoreHome/DataTableRowAction/RowEvolution.php +++ b/plugins/CoreHome/DataTableRowAction/RowEvolution.php @@ -130,7 +130,7 @@ class RowEvolution $metricsText = Piwik::translate('RowEvolution_AvailableMetrics'); $popoverTitle = ''; if ($this->rowLabel) { - $icon = $this->rowIcon ? '<img src="' . $this->rowIcon . '" alt="">' : ''; + $icon = $this->rowIcon ? '<img width="16px" height="16px" src="' . $this->rowIcon . '" alt="">' : ''; $metricsText = sprintf(Piwik::translate('RowEvolution_MetricsFor'), $this->dimension . ': ' . $icon . ' ' . $this->rowLabel); $popoverTitle = $icon . ' ' . $this->rowLabel; } diff --git a/plugins/CoreHome/Visitor.php b/plugins/CoreHome/Visitor.php index efc818a2f1..962eabce31 100644 --- a/plugins/CoreHome/Visitor.php +++ b/plugins/CoreHome/Visitor.php @@ -32,9 +32,9 @@ class Visitor $status = $this->getVisitEcommerceStatus(); if (in_array($status, array('ordered', 'orderedThenAbandonedCart'))) { - return "plugins/Morpheus/images/ecommerceOrder.gif"; + return "plugins/Morpheus/images/ecommerceOrder.png"; } elseif ($status == 'abandonedCart') { - return "plugins/Morpheus/images/ecommerceAbandonedCart.gif"; + return "plugins/Morpheus/images/ecommerceAbandonedCart.png"; } // Note: it is important that there is no icon when there was no ecommerce conversion return null; @@ -83,7 +83,7 @@ class Visitor if ($type == 'returning' || $type == 'returningCustomer' ) { - return "plugins/Live/images/returningVisitor.gif"; + return "plugins/Live/images/returningVisitor.png"; } return null; } diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector.controller.js b/plugins/CoreHome/angularjs/siteselector/siteselector.controller.js index d539bb3328..f872818897 100644 --- a/plugins/CoreHome/angularjs/siteselector/siteselector.controller.js +++ b/plugins/CoreHome/angularjs/siteselector/siteselector.controller.js @@ -37,5 +37,15 @@ return piwik.helper.getCurrentQueryStringWithParametersModified(newParameters) + '#' + piwik.helper.getQueryStringWithParametersModified(hash.substring(1), newParameters); }; + + Mousetrap.bind('w', function(event) { + if (event.preventDefault) { + event.preventDefault(); + } else { + event.returnValue = false; // IE + } + $('.siteSelector .title').trigger('click').focus(); + }); } + })(); diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.html b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.html index eabca54afd..463a723720 100644 --- a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.html +++ b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.html @@ -34,6 +34,7 @@ ng-model="view.searchTerm" ng-change="model.searchSite(view.searchTerm)" placeholder="{{ 'General_Search' | translate }}" + tabindex="4" class="websiteSearch inp browser-default"/> <img title="Clear" ng-show="view.searchTerm" diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less index 5cb46eea9d..96336373f8 100644 --- a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less +++ b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less @@ -25,7 +25,7 @@ > .siteSelector { position: absolute; - z-index: 999; + z-index: 998; } a.title { diff --git a/plugins/CoreHome/images/bg_header.jpg b/plugins/CoreHome/images/bg_header.jpg Binary files differdeleted file mode 100644 index 1733b0e355..0000000000 --- a/plugins/CoreHome/images/bg_header.jpg +++ /dev/null diff --git a/plugins/CoreHome/images/bg_header.png b/plugins/CoreHome/images/bg_header.png Binary files differnew file mode 100644 index 0000000000..f0fc545f9f --- /dev/null +++ b/plugins/CoreHome/images/bg_header.png diff --git a/plugins/CoreHome/images/bullet1.gif b/plugins/CoreHome/images/bullet1.gif Binary files differdeleted file mode 100644 index f2707da68c..0000000000 --- a/plugins/CoreHome/images/bullet1.gif +++ /dev/null diff --git a/plugins/CoreHome/images/bullet1.png b/plugins/CoreHome/images/bullet1.png Binary files differnew file mode 100644 index 0000000000..6a4bc2a467 --- /dev/null +++ b/plugins/CoreHome/images/bullet1.png diff --git a/plugins/CoreHome/images/bullet2.gif b/plugins/CoreHome/images/bullet2.gif Binary files differdeleted file mode 100644 index 26e1b6af33..0000000000 --- a/plugins/CoreHome/images/bullet2.gif +++ /dev/null diff --git a/plugins/CoreHome/images/bullet2.png b/plugins/CoreHome/images/bullet2.png Binary files differnew file mode 100644 index 0000000000..2e00eda5ec --- /dev/null +++ b/plugins/CoreHome/images/bullet2.png diff --git a/plugins/CoreHome/images/favicon.ico b/plugins/CoreHome/images/favicon.ico Binary files differindex e29ea5b420..616228c5bc 100644 --- a/plugins/CoreHome/images/favicon.ico +++ b/plugins/CoreHome/images/favicon.ico diff --git a/plugins/CoreHome/images/more_date.gif b/plugins/CoreHome/images/more_date.gif Binary files differdeleted file mode 100644 index 87da6b4963..0000000000 --- a/plugins/CoreHome/images/more_date.gif +++ /dev/null diff --git a/plugins/CoreHome/images/more_date.png b/plugins/CoreHome/images/more_date.png Binary files differnew file mode 100644 index 0000000000..17983a7e4a --- /dev/null +++ b/plugins/CoreHome/images/more_date.png diff --git a/plugins/CoreHome/images/more_period.gif b/plugins/CoreHome/images/more_period.gif Binary files differdeleted file mode 100644 index b0c9787851..0000000000 --- a/plugins/CoreHome/images/more_period.gif +++ /dev/null diff --git a/plugins/CoreHome/images/more_period.png b/plugins/CoreHome/images/more_period.png Binary files differnew file mode 100644 index 0000000000..92b10dd782 --- /dev/null +++ b/plugins/CoreHome/images/more_period.png diff --git a/plugins/CoreHome/javascripts/calendar.js b/plugins/CoreHome/javascripts/calendar.js index a413c9ad5a..fdf58f2cf0 100644 --- a/plugins/CoreHome/javascripts/calendar.js +++ b/plugins/CoreHome/javascripts/calendar.js @@ -100,7 +100,7 @@ var parts = dateStr.split(','); dateStr = parts[0]; } - + var splitDate = dateStr.split('-'); currentYear = splitDate[0]; currentMonth = splitDate[1] - 1; @@ -215,6 +215,7 @@ } }); + } else { // Let broadcast do its job: // It will replace date value to both search query and hash and load the new page. @@ -514,7 +515,7 @@ // Apply date range button will reload the page with the selected range $('#calendarApply') - .on('click', function () { + .on("click", function() { var $selectedPeriod = $('#periodMore [name=period]:checked'); if (!$selectedPeriod.is('#period_id_range')) { @@ -697,4 +698,13 @@ initTopControls(); }); + Mousetrap.bind('d', function(event) { + if (event.preventDefault) { + event.preventDefault(); + } else { + event.returnValue = false; // IE + } + $('#periodString .title').trigger('click').focus(); + }); + }(jQuery)); diff --git a/plugins/CoreHome/lang/en.json b/plugins/CoreHome/lang/en.json index c92048e90a..170755885c 100644 --- a/plugins/CoreHome/lang/en.json +++ b/plugins/CoreHome/lang/en.json @@ -67,6 +67,7 @@ "Segments": "Segments", "OneClickUpdateNotPossibleAsMultiServerEnvironment": "The one-click update is not available as you are using Piwik with multiple servers. Please download the latest version from %1$s to proceed.", "AdblockIsMaybeUsed": "In case you are using an ad blocker, please disable it for this site to make sure Piwik works without any issues.", - "ChangeCurrentWebsite": "Choose a website, currently selected website: %s" + "ChangeCurrentWebsite": "Choose a website, currently selected website: %s", + "LeadingAnalyticsPlatformRespectsYourPrivacy": "The leading open analytics platform that respects your privacy." } } diff --git a/plugins/CoreHome/lang/et.json b/plugins/CoreHome/lang/et.json index 009ee32f7b..48dadf7d03 100644 --- a/plugins/CoreHome/lang/et.json +++ b/plugins/CoreHome/lang/et.json @@ -1,8 +1,10 @@ { "CoreHome": { "CategoryNoData": "Informatsioon puudub selles kategoorias. Proovi \"Include all population\".", + "ChangeVisualization": "Muuda visualiseerimist", "CheckForUpdates": "Kontrolli uuendusi", "CheckPiwikOut": "Proovi Piwikut!", + "CloseSearch": "Sulge otsing", "CloseWidgetDirections": "Sa saad antud vidina sulgeda, valides 'X' vidina ülaservas.", "Default": "vaikimisi", "ExcludeRowsWithLowPopulation": "Kuvatakse kõiki ridu %s Eemalda ebapopulaarsemad", @@ -24,6 +26,8 @@ "UnFlattenDataTable": "Antud raport on lame %s Tee see hierarhiliseks", "ViewAllPiwikVideoTutorials": "Vaata kõiki Piwiku video õpetusi", "WebAnalyticsReports": "Veebi analüüsi raportid", - "YouAreUsingTheLatestVersion": "Kasutad uusimat Piwiku versiooni!" + "YouAreUsingTheLatestVersion": "Kasutad uusimat Piwiku versiooni!", + "SystemSummaryWidget": "Süsteemi kokkuvõte", + "SystemSummaryNWebsites": "%d veebilehte" } }
\ No newline at end of file diff --git a/plugins/CoreHome/lang/it.json b/plugins/CoreHome/lang/it.json index 22ea450526..e20dfcc1c2 100644 --- a/plugins/CoreHome/lang/it.json +++ b/plugins/CoreHome/lang/it.json @@ -5,6 +5,7 @@ "CheckForUpdates": "Cerca aggiornamenti", "CheckPiwikOut": "Controlla Piwik!", "ClickToEditX": "Clicca per modificare %s", + "ClickToSeeFullInformation": "Clicca per vedere le informazioni complete", "CloseSearch": "Chiudi la ricerca", "CloseWidgetDirections": "Potete chiudere questo widget cliccando sull'icona 'X' nella parte alta del widget stesso.", "ChooseX": "Scegli %1$s", diff --git a/plugins/CoreHome/lang/sk.json b/plugins/CoreHome/lang/sk.json index 4d5dc4001f..da17249fc1 100644 --- a/plugins/CoreHome/lang/sk.json +++ b/plugins/CoreHome/lang/sk.json @@ -1,20 +1,25 @@ { "CoreHome": { "CategoryNoData": "Pre túto kategóriu nie sú dáta. Skúste použiť „Vrátane celej populácie“.", + "ChangeVisualization": "Zmeniť zobrazenie", "CheckForUpdates": "Skontrolovať aktualizácie", "CheckPiwikOut": "Vyskúšajte Piwik!", "ClickToEditX": "Kliknite pre editovanie %s", + "ClickToSeeFullInformation": "Klinite pre viac informácií.", + "CloseSearch": "Zavrieť vyhľadávanie", "CloseWidgetDirections": "Túto miniaplikáciu môžete zavrieť kliknutím na ikonu 'X' navrchu.", + "ChooseX": "Vyberte %1$s", "DataForThisReportHasBeenPurged": "Dáta pre tento report sú viac ako %s mesiacov staré a boli zmazané.", "DataTableExcludeAggregateRows": "Súhrnné riadky sú zobrazené %s Schovať ich", "DataTableIncludeAggregateRows": "Súhrnné riadky sú schované %s Zobraziť ich", + "DataTableHowToSearch": "Stlačte enter alebo kliknite na ikonu hľadania pre vyhľadávanie", "Default": "Prednastavené", "DonateCall1": "Používanie projektu Piwik Vás nebude nikdy nič stáť, ale to neznamená, že jeho vývoj nič nestojí.", "DonateCall2": "Piwik potrebuje Vašu neustálu podporu aby rástol a prospieval.", "DonateFormInstructions": "Kliknite na bežec a vyberte hodnotu, potom kliknite na subscribe -prispieť- pre finančnú podporu.", "ExcludeRowsWithLowPopulation": "Všetky riadky sú zobrazené %s Vylúčiť nízku populáciu", "ExternalHelp": "Nápoveda (otvorí sa nová tabuľka)", - "FlattenDataTable": "Report je hierarchický %s Urobiť ho jednotný", + "FlattenDataTable": "Report je hierarchický %s Urobiť ho plochý", "HowMuchIsPiwikWorth": "Ako veľmi je Piwik pre Vás cenný?", "IncludeRowsWithLowPopulation": "Riadky s nízkou populáciou sú skryté %s Zobraziť všetky riadky", "InjectedHostEmailBody": "Hello, dnes som sa pokúšal vstúpiť do Piwiku ale objavilo sa neznáme hostname varovanie.", @@ -23,6 +28,7 @@ "InjectedHostSuperUserWarning": "Piwik môže byť zle nakonfigurovaný (napr., ak bol práve Piwik presunutý na nový server alebo URL). Môžete buďto %1$s kliknúť sem a pridať %2$s ako platné Piwik hostname (ak tomu dôverujete)%3$s, alebo %4$s kliknúť sem a vsúpiť %5$s do Piwiku bezpečne%6$s.", "InjectedHostWarningIntro": "Práve vstupujete do Piwiku z %1$s, ale Piwik bol nakonfigurovaný aby bežal na tejto adrese: %2$s.", "JavascriptDisabled": "JavaScript musí byť povolený za účelom používania Piwiku v štandardnom prezeraní.<br \/> Ale vyzerá to tak, že JavaScript je buďto vypnutý alebo nie je podporovaný Vašim perhliadačom.<br \/> Pre štandardné prezeranie zmente nastavenia Vášho prehliadača a povoľte JavaScript , potom %1$s skúste znova%2$s.<br \/>", + "MainNavigation": "Hlavná navigácia", "MakeOneTimeDonation": "Jednorázovo finančne podporiť.", "Menu": "Menu", "NoPrivilegesAskPiwikAdmin": "Ste prihlásený ako '%1$s' ale vyzerá to tak , že nemáte žiadne povolenie do Piwiku. %2$s Spýtajte sa Vášho Piwik administrátora (Kliknite pre email)%3$s aby Vám dal 'prezerací' prístup na webstránku.", @@ -45,6 +51,7 @@ "YouAreUsingTheLatestVersion": "Používate najnovšiu verziu Piwiku!", "ClickRowToExpandOrContract": "Kliknite na tento riadok pre rozvinutie alebo zbalenie podtabuľky.", "UndoPivotBySubtable": "Tento report bol pivotovaný %s Naspäť pivot", + "NoSuchPage": "Táto stránka neexistuje", "PivotBySubtable": "Tento report nebol pivotovaný %1$s Pivotovať podľa %2$s" } }
\ No newline at end of file diff --git a/plugins/CoreHome/lang/uk.json b/plugins/CoreHome/lang/uk.json index 062015e246..9da96fb0c8 100644 --- a/plugins/CoreHome/lang/uk.json +++ b/plugins/CoreHome/lang/uk.json @@ -5,6 +5,7 @@ "CheckForUpdates": "Перевірити на оновлення", "CheckPiwikOut": "Перевірити Piwik на оновлення!", "ClickToEditX": "Редагувати %s", + "ClickToSeeFullInformation": "Натисніть, щоб побачити повну інформацію", "CloseSearch": "Закрити пошук", "CloseWidgetDirections": "Ви можете закрити цей віджет, натиснувши на значок 'X' у верхній частині віджета.", "ChooseX": "Вибирати %1$s", diff --git a/plugins/CoreHome/stylesheets/cloud.less b/plugins/CoreHome/stylesheets/cloud.less index 75969a7f2d..b0853a2a68 100644 --- a/plugins/CoreHome/stylesheets/cloud.less +++ b/plugins/CoreHome/stylesheets/cloud.less @@ -10,6 +10,7 @@ } } + .tagCloud { img { @@ -18,11 +19,13 @@ .word a { text-decoration: none; + } .word { - padding: 4px 8px 4px 0; - white-space: nowrap; + padding: 5px 15px 10px 8px; + white-space: nowrap; + display: inline-block; } .valueIsZero { @@ -30,37 +33,37 @@ } span.size0, span.size0 a { - color: #255792; - font-size: 28px; + color: #1f497a !important; + font-size: 46px; } span.size1, span.size1 a { - color: #255792; - font-size: 24px; + color: #24568f !important; + font-size: 40px; } span.size2, span.size2 a { - color: #255792; - font-size: 20px; + color: #2962a3 !important; + font-size: 32px; } span.size3, span.size3 a { - color: #255792; - font-size: 16px; + color: #255792 !important; + font-size: 28px; } span.size4, span.size4 a { - color: #255792; - font-size: 15px; + color: #337acc !important; + font-size: 19px; } span.size5, span.size5 a { - color: #255792; + color: #5c95d6 !important; font-size: 14px; } span.size6, span.size6 a { - color: #255792; - font-size: 11px; + color: #5c95d6 !important; + font-size: 16px; } -}
\ No newline at end of file +} diff --git a/plugins/CoreHome/stylesheets/layout.less b/plugins/CoreHome/stylesheets/layout.less index 815eb1e20e..4d03fdbc3a 100644 --- a/plugins/CoreHome/stylesheets/layout.less +++ b/plugins/CoreHome/stylesheets/layout.less @@ -366,3 +366,54 @@ nav { .widgetize { width: auto; } + +@media print { + + #secondNavBar{ + display: none; + } + + nav .icon-menu-hamburger, nav .icon-more-verti{ + display: none; + } + + nav ul a{ + display: none; + } + + #root, #standalone { + .dashboard-manager{ + display: none !important; + visibility: hidden !important; + } + } + + #root{ + #secondNavBar + .pageWrap { + margin-left: 0px; + } + + .top_controls{ + .quick-access { + display: none !important; + } + } + } + + .dataTableAction{ + display: none !important; + } + + .select-dropdown, .caret{ + display: none !important; + } + + .dataTable td .ratio{ + margin-right: 4px; + visibility: visible; + } + .dataTableFooterNavigation > .row{ + margin-bottom: -20px !important; + } +} + diff --git a/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig index 2e3a4d1124..f901ddd6be 100644 --- a/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig +++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig @@ -1,4 +1,8 @@ -<h2 id="{{ reportId }}" style="color: rgb({{ reportTitleTextColor }}); font-size: {{ reportTitleTextSize }}pt; font-weight:normal;"> +{% set fontStyle = "color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"%} +{% set styleTableHeader = "border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;" ~ fontStyle %} +{% set styleTableCell = "border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;" ~ fontStyle %} + +<h2 id="{{ reportId }}" style=" {{fontStyle}} font-size: {{ reportTitleTextSize }}pt; font-weight:normal; margin:45px 0 30px 0;"> {{ reportName }} </h2> @@ -13,7 +17,8 @@ src="cid:{{ reportId }}" {% endif %} height="{{ graphHeight }}" - width="{{ graphWidth }}"/> + width="{{ graphWidth }}" + margin="0 auto"/> {% endif %} {% if displayGraph and displayTable %} @@ -22,16 +27,16 @@ {% endif %} {% if displayTable %} - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb({{ tableHeaderBgColor }}); color: rgb({{ tableHeaderTextColor }}); font-size: {{ reportTableHeaderTextSize }}pt; text-transform: {{ reportTableHeaderTextTransform }}; line-height:2.5em;"> - {% for columnName in reportColumns %} - <th style="font-weight: {{ reportTableHeaderTextWeight }}; font-size:10px; text-align:left; padding: 6px 0;"> + <table style="border-collapse:collapse; border:1px solid rgb(231,231,231); padding:5px;"> + <thead style="background-color: rgb({{tableBgColor}});"> + {% for columnId, columnName in reportColumns %} + <th style="{{ styleTableHeader }}{% if columnId == 'label' %}{% else %} text-align:right;{% endif %}"> {{ columnName }} </th> {% endfor %} </thead> <tbody> - {% set cycleValues=['','background-color: rgb('~tableBgColor~')'] %} + {% set cycleValues=['background-color: rgb('~tableBgColor~')',''] %} {% set cycleIndex=1 %} {% for rowId,row in reportRows %} {% set rowMetrics=row.columns %} @@ -41,10 +46,10 @@ {% else %} {% set rowMetadata=null %} {% endif %} - <tr style="{{ cycle(cycleValues, cycleIndex) }};line-height: 22px;"> + <tr style="{{ cycle(cycleValues, cycleIndex) }};{{styleTableCell}}"> {% set cycleIndex=cycleIndex+1 %} {% for columnId, columnName in reportColumns %} - <td style="font-size: {{ reportTableRowTextSize }}; {% if columnId == 'label' %}border-right: 1px solid rgb({{ tableCellBorderColor }}); {% else %}border-left: 1px solid rgb({{ tableCellBorderColor }}); {% endif %} padding: 5px 0 5px 5px;"> + <td style="padding:17px 15px;{% if columnId == 'label' %}{% else %} text-align:right;{% endif %}"> {% if columnId == 'label' %} {% if rowMetrics[columnId] is defined %} {% if rowMetadata.logo is defined %} @@ -73,8 +78,8 @@ </tbody> </table> {% endif %} - <br/> - <a style="text-decoration:none; color: rgb({{ reportTitleTextColor }}); font-size: {{ reportBackToTopTextSize }}pt;" href="#reportTop"> - {{ 'ScheduledReports_TopOfReport'|translate }} - </a> + <p style="width: 100%; text-align:center;"> + <a style="text-decoration:none; font-size: 9pt;" href="#reportTop"> + {{ 'ScheduledReports_TopOfReport'|translate }} ↑ + </a></p> {% endif %} diff --git a/plugins/CoreHome/templates/ReportRenderer/_htmlReportFooter.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportFooter.twig index 691287b6e3..825f2753ac 100644 --- a/plugins/CoreHome/templates/ReportRenderer/_htmlReportFooter.twig +++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportFooter.twig @@ -1,2 +1,15 @@ +{% set fontStyle = 'color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif; '%} +{% set styleParagraph = 'font-size:15px;line-height:24px;margin:0 0 16px;' %} + +<hr style=" border: 0; margin-top: 50px; height: 1px; background-image: linear-gradient(to right, rgba(231, 231, 231, 0), rgba(231, 231, 231, 1), rgba(2311, 2311, 231, 0));"> + +<p style='{{styleParagraph}}{{fontStyle}}text-align:center;font-size:13px; color:#666; padding:30px'> + {{'General_PoweredBy'|translate}} + <a style="color:#439fe0; " href="https://piwik.org/" title="Piwik Analytics">Piwik Analytics</a> + <br /> + {{ 'CoreHome_LeadingAnalyticsPlatformRespectsYourPrivacy'|translate }} +</p> + +</div> </body> -</html>
\ No newline at end of file +</html> diff --git a/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig index 7b8ce0a5d5..01e21348ff 100644 --- a/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig +++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig @@ -1,37 +1,62 @@ -<html> +{% set fontStyle = "color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; "%} +{% set styleParagraph = 'font-size:15px;line-height:24px;margin:0 0 16px;' %} + +<html style="background-color:#edecec"> + <head> <meta charset="utf-8"> <meta name="robots" content="noindex,nofollow"> + <meta name="generator" content="Piwik Analytics"> </head> -<body style="font-family: {{ reportFontFamily }}; color: rgb({{ reportTextColor }});line-height: 1.33;"> - -<a id="reportTop" rel="noreferrer" target="_blank" href="{{ currentPath }}"><img title="{{ 'General_GoTo'|translate("Piwik") }}" border="0" alt="Piwik" src='{{ logoHeader }}'/></a> -<h1 style="font-weight:normal; color: rgb({{ reportTitleTextColor }}); font-size: {{ reportTitleTextSize }}pt;"> - {{ reportTitle }} -</h1> +<body style="{{fontStyle}} line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> -<p> - {{ description }} - {{ 'General_DateRange'|translate }} {{ prettyDate }} -</p> + <a name="reportTop"></a> -{% if displaySegment %} -<p style="color: rgb({{ reportTitleTextColor }});"> - {{ 'ScheduledReports_CustomVisitorSegment'|translate("Piwik") }} {{ segmentName }} -</p> -{% endif %} + <table style="width:100%; background-color:#37474f; padding:10px 0; margin: 0 0 25px 0; height:64px;"> + <tr> + <td> + <a style="font-size:16px;padding:0 15px;color:#ffffff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer" target="_blank" href="{{ piwikUrl }}" style="lineheight:17px"> + <img src="{{ piwikUrl }}/plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Piwik, {{ 'General_OpenSourceWebAnalytics'|translate }}" /> + </a> + </td> + <td align="right"> + <a style="font-size:16px; padding:0 15px; color:#ffffff" title="{{'Dashboard_TopLinkTooltip'|translate(websiteName)}}" target="_blank" href="{{ piwikUrl }}{{ linkTo({'module': 'CoreHome', 'action': 'index', 'idSite': idSite, 'period': period, 'date': date, 'token_auth': null, 'method': null, 'idReport': null, 'outputType': null, 'format': null})|raw }}"> + {{ 'Dashboard_Dashboard'|translate }} + </a> + </td> + </tr> + </table> -{% if reportMetadata|length > 1 %} - <h2 style="font-weight:normal; color: rgb({{ reportTitleTextColor }}); font-size: {{ reportTitleTextSize }}pt;"> - {{ 'ScheduledReports_TableOfContent'|translate }} + <div style="margin:0 20px;"> + <h2 style='{{fontStyle}} color:#37474f; line-height:30px; margin:25px 0 15px 0;'> + {{'ScheduledReports_EmailHello'|translate}} </h2> - <ul> - {% for metadata in reportMetadata %} - <li> - <a href="#{{ metadata.uniqueId }}" style="text-decoration:none; color: rgb({{ reportTextColor }});"> - {{ metadata.name }} - </a> - </li> - {% endfor %} - </ul> -{% endif %} + + <p style='{{styleParagraph}}{{fontStyle}}'> + {{'ScheduledReports_PleaseFindBelow'|translate(period,reportTitle)}} + <br />{{ description }} + <br />{{ 'General_DateRange'|translate }} {{ prettyDate }} + <br />{{ 'ScheduledReports_SentFromX'|translate(piwikUrl) }} + </p> + + {% if displaySegment %} + <p style="{{styleParagraph}}{{fontStyle}}"> + {{ 'ScheduledReports_CustomVisitorSegment'|translate("Piwik") }} {{ segmentName }} + </p> + {% endif %} + + {% if reportMetadata|length > 1 %} + <h2 style="{{fontStyle}}font-weight:normal; font-size: {{ reportTitleTextSize }}pt;"> + {{ 'ScheduledReports_TableOfContent'|translate }} + </h2> + <ul> + {% for metadata in reportMetadata %} + <li> + <a href="#{{ metadata.uniqueId }}" style="text-decoration:none; color: rgb({{ reportTextColor }});"> + {{ metadata.name }} + </a> + </li> + {% endfor %} + </ul> + {% endif %} diff --git a/plugins/CoreHome/templates/_dataTableCell.twig b/plugins/CoreHome/templates/_dataTableCell.twig index 3a54c3fac0..cd49028b33 100644 --- a/plugins/CoreHome/templates/_dataTableCell.twig +++ b/plugins/CoreHome/templates/_dataTableCell.twig @@ -7,7 +7,7 @@ href='{% if row.getMetadata('url')|slice(0,4) not in ['http','ftp:'] %}http://{% endif %}{{ row.getMetadata('url')|rawSafeDecoded }}'> {% if not row.getMetadata('logo') %} <img class="link" width="10" height="9" - src="plugins/Morpheus/images/link.gif"/> + src="plugins/Morpheus/images/link.png"/> {% endif %} {% endif %} diff --git a/plugins/CoreHome/templates/_donate.twig b/plugins/CoreHome/templates/_donate.twig index 10263d0c87..c4de056774 100755 --- a/plugins/CoreHome/templates/_donate.twig +++ b/plugins/CoreHome/templates/_donate.twig @@ -33,7 +33,7 @@ </div> <div class="donate-submit"> - <input type="image" src="plugins/Morpheus/images/paypal_subscribe.gif" border="0" name="submit" + <input type="image" src="plugins/Morpheus/images/paypal_subscribe.png" border="0" name="submit" title="{{ 'CoreHome_SubscribeAndBecomePiwikSupporter'|translate }}"/> <a class="donate-spacer">{{ 'CoreHome_MakeOneTimeDonation'|translate }}</a> <a href="index.php?module=CoreHome&action=redirectToPaypal&idSite=1&cmd=_s-xclick&hosted_button_id=RPL23NJURMTFA&bb2_screener_=1357583494+83.233.186.82" diff --git a/plugins/CoreHome/templates/_headerMessage.twig b/plugins/CoreHome/templates/_headerMessage.twig index 97ed8271a7..ee3b5af8f8 100644 --- a/plugins/CoreHome/templates/_headerMessage.twig +++ b/plugins/CoreHome/templates/_headerMessage.twig @@ -16,16 +16,20 @@ class="piwikSelector borderedControl {% if isPiwikDemo or not latest_version_available %}header_info{% else %}{% endif %} {% if isPiwikDemo %}isPiwikDemo{% else %}piwikTopControl{% endif %} {% if latest_version_available %}update_available{% endif %}" > - <a class="title" href="#"> {% if isPiwikDemo %} + <a class="title" style="cursor:default;"> {{ 'General_YouAreViewingDemoShortMessage'|translate }} + </a> {% elseif latest_version_available %} + <a class="title" href="?module=CoreUpdater&action=newVersionAvailable" style="cursor:pointer;"> {{ 'General_NewUpdatePiwikX'|translate(latest_version_available) }} <span class="icon-warning"></span> + </a> {% elseif isSuperUser and isAdminArea is defined and isAdminArea %} + <a class="title"> {{ updateCheck|raw }} + </a> {% endif %} - </a> <div class="dropdown positionInViewport"> {% if isPiwikDemo %} diff --git a/plugins/CoreHome/templates/_periodSelect.twig b/plugins/CoreHome/templates/_periodSelect.twig index c02f14d1a6..8740cf616d 100644 --- a/plugins/CoreHome/templates/_periodSelect.twig +++ b/plugins/CoreHome/templates/_periodSelect.twig @@ -29,7 +29,7 @@ <span id="otherPeriods"> {% for label,thisPeriod in periodsNames %} <p> - <input type="radio" name="period" id="period_id_{{ label }}" value="{{ linkTo( { 'period': label} ) }}"{% if label==period %} checked="checked"{% endif %} /> + <input type="radio" name="period" tabindex="4" id="period_id_{{ label }}" value="{{ linkTo( { 'period': label} ) }}"{% if label==period %} checked="checked"{% endif %} /> <label for="period_id_{{ label }}">{{ thisPeriod.singular }}</label> </p> {% endfor %} |
