pages/android.tmpl - Issue 29766571: Fixes #55 - Updated install button on Samsung Browser for Android

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Side by Side Diff: pages/android.tmpl

Issue 29766571: Fixes #55 - Updated install button on Samsung Browser for Android (Closed) Base URL: https://hg.adblockplus.org/web.adblockplus.org

Patch Set: Addressed #3 Created May 1, 2018, 11:10 a.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View unified diff | Download patch

OLD	NEW
	1 <head>

	2 <style>

	3 /* Hide TOS & Install on android page when not using Samsung Browser */

	4 .android:not(.ua-samsung) #terms-message,
	juliandoucette 2018/05/01 11:21:56 Detail: `.android` is applied to the android page Detail: `.android` is applied to the android page by default.tmpl (it flags the page, not the browser).
	5 .android:not(.ua-samsung) #install,

	6 /* Hide other platforms on android page when using Android */

	7 .ua-andriod.android #other-platform,
	juliandoucette 2018/05/01 11:21:56 Detail: ua-* classes are injected by the server (w Detail: ua-* classes are injected by the server (with the one exception of samsung below). Therefore, this applies to the android page when using android only.
	8 /* Hide ABB banner on android page when using Samsung Browser */

	9 #content.ua-android.ua-samsung #abb-banner
	juliandoucette 2018/05/01 11:21:56 Detail: `.ua-android` is injected by the server. ` Detail: `.ua-android` is injected by the server. `.ua-samsung` is added by the script below. I decided to keep and use them both based on your suggestion and the fact that both are true e.g. `bowser.android` and `bowser.samsungBrowser` are both true at once. This is also convenient because it allows me to make a more specific selector than `#content.ua-android #abb-banner` that already exists to display this banner block.
	10 {

	11 display: none;

	12 }

	13 </style>

	14 <script src="/js/vendor/bowser.js"></script>

	15 <script>

	16 document.addEventListener("DOMContentLoaded", function()

	17 {

	18 if (!bowser instanceof Object) return;

	19

	20 var locale = "{{ locale }}";

	21

	22 var content = document.getElementById("content");

	23

	24 // Replicating server behaviour on the frontend for testing

	25 if (bowser.android)

	26 content.classList.add("ua-android");

	27

	28 if (bowser.samsungBrowser)

	29 {

	30 // Assign more specific user agent (ua-android is already present)

	31 document
	juliandoucette 2018/05/01 11:21:56 Oops... I'll use the content variable above in the Oops... I'll use the content variable above in the next PatchSet.
	32 .getElementById("content")

	33 .classList.add("ua-samsung");

	34

	35 // change the Android install link to Samsung Browser

	36 document

	37 .getElementById("install-android")

	38 .href = "https://play.google.com/store/apps/details?id=org.adblockplus .adblockplussbrowser";

	39

	40 // update the install button text in English only

	41 if (locale == "en")

	42 document

	43 .getElementById("install-android")

	44 .textContent = "Agree and Install for Samsung Internet";

	45 }

	46 });

	47 </script>

	48 </head>

	49

1 <? include index ?>	50 <? include index ?>

OLD	NEW

« no previous file with comments | « no previous file | static/js/vendor/bowser.js » ('j') | no next file with comments »