diff options
author | Kate Butler <kate@innocraft.com> | 2019-05-28 04:28:04 +0300 |
---|---|---|
committer | Matthieu Aubry <mattab@users.noreply.github.com> | 2019-05-28 04:28:04 +0300 |
commit | d100ab0bde28b8ec4cd28203b892df7a23113c43 (patch) | |
tree | 5f82daf7389513a6db8dab81b5da99de2419f409 /plugins | |
parent | e35fcd8ce317a83d85543259cfd61f7e5f756931 (diff) |
Update video content on Welcome widget (#14454)
* Remove Piwik promo video on Welcome widget and replace with link to Matomo videos
* Fix image overlapping text on smaller screen widths
* Updated screenshots for dashboard welcome widget
* Update test screenshots
* Revert file permissions
Diffstat (limited to 'plugins')
10 files changed, 21 insertions, 59 deletions
diff --git a/plugins/CoreHome/images/promo_splash.png b/plugins/CoreHome/images/promo_splash.png Binary files differdeleted file mode 100644 index 9a78f8e283..0000000000 --- a/plugins/CoreHome/images/promo_splash.png +++ /dev/null diff --git a/plugins/CoreHome/images/promo_video_splash.jpg b/plugins/CoreHome/images/promo_video_splash.jpg Binary files differnew file mode 100644 index 0000000000..a2bf76a0c0 --- /dev/null +++ b/plugins/CoreHome/images/promo_video_splash.jpg diff --git a/plugins/CoreHome/stylesheets/promo.less b/plugins/CoreHome/stylesheets/promo.less index ab0ed8f124..bf4992d603 100644 --- a/plugins/CoreHome/stylesheets/promo.less +++ b/plugins/CoreHome/stylesheets/promo.less @@ -1,37 +1,16 @@ #piwik-promo-thumbnail { - background: @theme-color-background-base url(plugins/CoreHome/images/promo_splash.png) no-repeat 0 0; - background-position: center; width: 100%; - max-width: 321px; + min-height: 178px; 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; + width: 100%; } #piwik-widget-footer { @@ -66,6 +45,7 @@ margin: 1em 0 0 1.25em; color: @theme-color-text-lighter; display: inline-block; + width: 90%; } #piwik-promo-videos-link:hover { diff --git a/plugins/CoreHome/templates/getPromoVideo.twig b/plugins/CoreHome/templates/getPromoVideo.twig index e068bb25e1..56e46d75ef 100644 --- a/plugins/CoreHome/templates/getPromoVideo.twig +++ b/plugins/CoreHome/templates/getPromoVideo.twig @@ -1,15 +1,12 @@ <div id="piwik-promo"> - <div id="piwik-promo-video"> - <div id="piwik-promo-thumbnail"> - <img src="plugins/Morpheus/images/video_play.png"/> + <a id="piwik-promo-videos-link" href="https://matomo.org/docs/videos/" rel="noreferrer noopener" target="_blank"> + <div id="piwik-promo-video"> + <div id="piwik-promo-thumbnail"> + <img src="plugins/CoreHome/images/promo_video_splash.jpg"/> + </div> </div> - <div id="piwik-promo-embed" style="display:none;"> - </div> - </div> - - <a id="piwik-promo-videos-link" href="https://matomo.org/blog/2012/12/piwik-how-to-videos/" rel="noreferrer noopener" target="_blank"> - {{ 'CoreHome_ViewAllPiwikVideoTutorials'|translate }} + <span>{{ 'CoreHome_ViewAllPiwikVideoTutorials'|translate }}</span> </a> <div id="piwik-promo-share"> @@ -35,18 +32,3 @@ <div id="piwik-widget-footer" style="color:#666;">{{ 'CoreHome_CloseWidgetDirections'|translate }}</div> </div> - -<script type="application/javascript"> - $(function () { - $('#piwik-promo-thumbnail').click(function () { - var promoEmbed = $('#piwik-promo-embed'), - widgetWidth = $(this).closest('.widgetContent').width(), - height = (266 * widgetWidth) / 421, - embedHtml = '<iframe width="100%" height="' + height + '" src="https://www.youtube-nocookie.com/embed/OslfF_EH81g?autoplay=1&vq=hd720&wmode=transparent" frameborder="0" wmode="Opaque"></iframe>'; - - $(this).hide(); - promoEmbed.height(height).html(embedHtml); - promoEmbed.show(); - }); - }); -</script> diff --git a/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png b/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png index e331f87184..d8fc9cbf8d 100644 --- a/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png +++ b/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:874f9bb14bdb6e4a3eae691415b65db04a7dbd3ec95ac6f229a07e6f9a946eea -size 137758 +oid sha256:c296d4f92e71b4b80cc2b782a3368cf1157bcb66be0d33f6b6bf0c9acf7f3037 +size 183822 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png index 1c32cad889..b9d559ce90 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0a996d908b67936455feec069e5f97c6e0a0923c8a80765c1256550d78813a8 -size 422721 +oid sha256:97fde3b9d0070a072d93f78459bfada29302c01ab35d98e9f4693428383f5f9a +size 469153 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png index 8029f27ee4..15926547b7 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2702dca9f3584c5bb3a6fc3642ec381d183a0d56a5787c5b3e09adcb5dab6802 -size 626549 +oid sha256:9486c79eed6489a34342211671250c58a7237b70d157f7c433c5efa484386bdc +size 690933 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png index 8029f27ee4..15926547b7 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2702dca9f3584c5bb3a6fc3642ec381d183a0d56a5787c5b3e09adcb5dab6802 -size 626549 +oid sha256:9486c79eed6489a34342211671250c58a7237b70d157f7c433c5efa484386bdc +size 690933 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png index 26f8a16927..5df30d6338 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:276d31c54153cd889f9ff5a7095c0ba0311a75f4d15a3579653e3379e4730943 -size 137776 +oid sha256:00d05436c7b85a772cd9cd1592faa3242f9a4cf2c87fdec8590d1a69b5244bea +size 183833 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step4.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step4.png index b7b036caf4..ab8820d907 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step4.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:406db65e1a97717babe5b8d5a8a9cae79318ef27b70677f635f7b6b84bd87b24 -size 136725 +oid sha256:30750c43eac06e7e31aac2f74cbe613b60d7c90587246749bfa4fd16bb9aa311 +size 182961 |