Navigation Menu

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

Jump to bottom

Fix closing tag of opt out iframe #12668

Merged
merged 3 commits into from Mar 28, 2018
Merged

Fix closing tag of opt out iframe #12668

merged 3 commits into from Mar 28, 2018

Conversation

sgiehl
Copy link
Member

@sgiehl sgiehl commented Mar 28, 2018

fixes #12665

@sgiehl sgiehl 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 Mar 28, 2018
@sgiehl sgiehl added this to the 3.4.1 milestone Mar 28, 2018
fdellwing
fdellwing reviewed Mar 28, 2018
View reviewed changes
plugins/PrivacyManager/angularjs/opt-out-customizer/opt-out-customizer.directive.html Outdated
@@ -44,9 +44,9 @@ <h3>HTML code to embed on your website</h3>
<pre piwik-select-on-focus>&lt;iframe
style="border: 0; height: 200px; width: 600px;"
src="{{ optOutCustomizer.iframeUrl }}"
></iframe></pre>
&gt;&lt;/iframe&gt;</pre>
<p ng-bind-html="'CoreAdminHome_OptOutExplanationIntro'|translate:'&lt;a href=\'' + optOutCustomizer.iframeUrl + '\' rel=\'noreferrer\' target=\'_blank\'>':'&lt/a>'">
Copy link
Contributor

Choose a reason for hiding this comment

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

I think there is a ; missing at the end of the entity.

Copy link
Member Author

Choose a reason for hiding this comment

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

right, didn't notice

diosmosis
diosmosis approved these changes Mar 28, 2018
View reviewed changes
Copy link
Member

@diosmosis diosmosis left a comment

Choose a reason for hiding this comment

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

LGTM

@diosmosis
Copy link
Member

One screenshot test failure: https://builds-artifacts.matomo.org/matomo-org/matomo/fixoptoutiframe/26702/UIIntegrationTest_admin_privacy_settings.png

@sgiehl
Copy link
Member Author

sgiehl commented Mar 28, 2018

updated the ui file :)

@sgiehl sgiehl merged commit 119e62c into 3.x-dev Mar 28, 2018
@sgiehl sgiehl deleted the fixoptoutiframe branch March 28, 2018 19:10
@tsteur
Copy link
Member

tsteur commented Apr 5, 2018

It looks like it is still missing the closing iframe in the example markup itself?

@tsteur
Copy link
Member

tsteur commented Apr 5, 2018

all good my fault... it works :)

InfinityVoid pushed a commit to InfinityVoid/matomo that referenced this pull request Oct 11, 2018
@sgiehl @InfinityVoid
Fix closing tag of opt out iframe (matomo-org#12668)
8d3b79d 
* Fix closing tag of opt out iframe

* adds missing semicolon

* update ui files
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fdellwing fdellwing fdellwing left review comments

@diosmosis diosmosis diosmosis approved these changes

Assignees
No one assigned
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
Milestone
3.5.0
Development

Successfully merging this pull request may close these issues.

iframe opt-in/opt-out code is not properly closed
4 participants
@sgiehl @diosmosis @tsteur @fdellwing