Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add privacy policy/terms and conditions settings and display in bottom of certain pages. #13219

Merged
merged 9 commits into from Aug 1, 2018

Conversation

diosmosis
Copy link
Member

Login page:

image

Dashboard (for anonymous user):

image

Another normal page (for anonymous user):

image

Widgetized (when enabled):

image

Fixes #12938

@diosmosis diosmosis added not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. Needs Review PRs that need a code review labels Jul 27, 2018
@diosmosis diosmosis added this to the 3.6.0 milestone Jul 27, 2018
@diosmosis
Copy link
Member Author

If just one link is defined:

image

@tsteur
Copy link
Member

tsteur commented Jul 28, 2018

Looks pretty good. I wonder if at some point we also might want to add "Powered by Matomo" there :) Off topic though :)

$module = Common::getRequestVar('module', false);
if ($module == 'Login') {
return true;
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually that check is redundant, as all users on the login pages are anonymous. But guess we could leave it there for a better understanding

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, will remove this if

* @link https://www.innocraft.com/
* @license For license details see https://www.innocraft.com/license
*/
namespace Piwik\Plugins\PrivacyManager;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't use that license header here. Maybe we should rebase that branch, so it isn't anywhere in the history

@diosmosis
Copy link
Member Author

@sgiehl updated

@mattab mattab self-requested a review July 31, 2018 21:15
@sgiehl sgiehl merged commit 3e6356d into 3.x-dev Aug 1, 2018
@sgiehl sgiehl deleted the 12938-privacy-urls branch August 1, 2018 21:13
InfinityVoid pushed a commit to InfinityVoid/matomo that referenced this pull request Oct 11, 2018
…m of certain pages. (matomo-org#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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Needs Review PRs that need a code review not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants