diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2018-08-02 00:13:15 +0300 |
|---|---|---|
| committer | Stefan Giehl <stefan@piwik.org> | 2018-08-02 00:13:15 +0300 |
| commit | 3e6356d717d9dd59a9b73a39db3f08f4c721e255 (patch) | |
| tree | 537dadde8aee0cf3ae16b5bf68deb9034499b00b /plugins/Morpheus | |
| parent | 1aa34c3c73d367b586682d3f778967cd6b21cc70 (diff) | |
Add privacy policy/terms and conditions settings and display in bottom of certain pages. (#13219)
* Add privacy policy/terms and conditions settings and display in bottom of certain pages.
* tweak
* simplify PrivacyManager::shouldRenderFooterLinks().
* Update system test files
* removes typo
* do not render view if no links available
* Remove footer margin in embedded widget.
* ensure footer margin doesn't change (for UI tests)
* update ui files
Diffstat (limited to 'plugins/Morpheus')
| -rw-r--r-- | plugins/Morpheus/stylesheets/main.less | 10 | ||||
| -rw-r--r-- | plugins/Morpheus/templates/layout.twig | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/plugins/Morpheus/stylesheets/main.less b/plugins/Morpheus/stylesheets/main.less index 1127ce4942..5dd36d16f6 100644 --- a/plugins/Morpheus/stylesheets/main.less +++ b/plugins/Morpheus/stylesheets/main.less @@ -84,12 +84,20 @@ p { } #root { - margin: 0 0 100px 0; + margin: 0 0 20px 0; padding: 0; .widgetize { width: auto; } +} + +#pageFooter { + min-height: 20px; + margin-bottom: 60px; + .widgetized & { + min-height: 0; + } } .dashboardSettings { diff --git a/plugins/Morpheus/templates/layout.twig b/plugins/Morpheus/templates/layout.twig index e423daed60..fde91939f5 100644 --- a/plugins/Morpheus/templates/layout.twig +++ b/plugins/Morpheus/templates/layout.twig @@ -47,6 +47,10 @@ {% endblock %} + <div id="pageFooter"> + {{ postEvent('Template.pageFooter') }} + </div> + {% include "@CoreHome/_adblockDetect.twig" %} </body> </html> |