updates.html - Issue 29592569: Issue 5943 - Implement Updates Page for Adblock Plus extension

Delta Between Two Patch Sets: updates.html

Issue 29592569: Issue 5943 - Implement Updates Page for Adblock Plus extension (Closed) Base URL: https://hg.adblockplus.org/adblockplusui/

Left Patch Set: Addressed second round of feedback Created Nov. 13, 2017, 8:47 a.m.

Right Patch Set: Addressed seventh round of feedback Created Jan. 12, 2018, 11:35 a.m.

Left:
Right:

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

Jump to:

Left: Side by side diff | Download
Right: Side by side diff | Download

LEFT	RIGHT
	1 <!DOCTYPE html>

1 <!--	2 <!--

2 - This file is part of Adblock Plus <https://adblockplus.org/>,	3 - This file is part of Adblock Plus <https://adblockplus.org/>,

3 - Copyright (C) 2006-present eyeo GmbH	4 - Copyright (C) 2006-present eyeo GmbH

4 -	5 -

5 - Adblock Plus is free software: you can redistribute it and/or modify	6 - Adblock Plus is free software: you can redistribute it and/or modify

6 - it under the terms of the GNU General Public License version 3 as	7 - it under the terms of the GNU General Public License version 3 as

7 - published by the Free Software Foundation.	8 - published by the Free Software Foundation.

8 -	9 -

9 - Adblock Plus is distributed in the hope that it will be useful,	10 - Adblock Plus is distributed in the hope that it will be useful,

10 - but WITHOUT ANY WARRANTY; without even the implied warranty of	11 - but WITHOUT ANY WARRANTY; without even the implied warranty of

11 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	12 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

12 - GNU General Public License for more details.	13 - GNU General Public License for more details.

13 -	14 -

14 - You should have received a copy of the GNU General Public License	15 - You should have received a copy of the GNU General Public License

15 - along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.	16 - along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.

16 -->	17 -->
Thomas Greiner 2017/11/14 12:25:43 Please leave the license header unchanged. Otherwi Please leave the license header unchanged. Otherwise it could turn out to be more difficult to update it across all files in the future. martin 2017/11/20 11:47:34 Done. Show quoted text On 2017/11/14 12:25:43, Thomas Greiner wrote: > Please leave the license header unchanged. Otherwise it could turn out to be > more difficult to update it across all files in the future. Done.
17 <!DOCTYPE html>	18

18 <html>	19 <html>

19 <head>	20 <head>

20 <title class="i18n_updates_title"></title>	21 <title class="i18n_updates_status"></title>

21 <meta charset="utf-8" />	22 <meta charset="utf-8" />

22 <meta name="viewport" content="width=device-width, initial-scale=1" />	23 <meta name="viewport" content="width=device-width, initial-scale=1" />

23 <link href="skin/updates.css" rel="stylesheet"/>	24 <link href="skin/updates.css" rel="stylesheet"/>

24 <script src="polyfill.js"></script>	25 <script src="polyfill.js"></script>

25 <script src="ext/common.js"></script>	26 <script src="ext/common.js"></script>

26 <script src="ext/content.js"></script>	27 <script src="ext/content.js"></script>

27 <script src="common.js"></script>	28 <script src="common.js"></script>

28 <script src="i18n.js"></script>	29 <script src="i18n.js"></script>

29 </head>	30 <script src="updates.js"></script>

	31 </head>

30	32

31 <body>	33 <body>

32	34

33 <main>	35 <main>

34 <div id="container">	36 <div id="container">

35	37

36 <header class="column graphic-column">	38 <header class="column graphic-column">

37 <div class="update-graphic-container">	39 <div class="update-graphic-container">

38 <div class="update-graphic-content">	40 <div class="update-graphic-content">

39 <img src="/skin/updates/abp-logo.svg"/>	41 <img src="/skin/abp-logo.svg"/>

40 <div class="version-details">	42 <div class="version-details">

41 <h2 class="i18n_updates_status"></h2>	43 <h2 class="i18n_updates_status"></h2>

	44 </div>

	45

42 </div>	46 </div>

43	47 </header>

44 </div>	48

45 </header>	49 <section class="column content-column">

46	50

47 <section class="column content-column">	51 <div id="content">

48	52

49 <div id="content">	53 <header>

50	54 <h1 class="i18n_updates_heading"></h1>

51 <header>	55 <p class="i18n_updates_subheading"></p>

52 <h1 class="i18n_updates_heading"></h1>	56 </header>

53 <p class="i18n_updates_subheading"></p>	57

54 </header>	58 <article class="feature-entry">

55	59 <img class="feature-icon" src="/skin/updates/icon-rocket.svg"/>

56 <article class="feature-entry">	60 <p id="options-page-news" class="i18n_updates_optionsPageNews">< /p>

57 <img class="feature-icon" src="/skin/updates/icon-rocket.svg" alt= "rocket-icon"/>	61 </article>

58 <p class="i18n_updates_optionsPageNews"><a href="#" class="i18n_up dates_optionsPageLink"></a></p>	62
Thomas Greiner 2017/11/14 12:25:43 There are still a couple of links missing on this There are still a couple of links missing on this page. Note that in this case we shouldn't just link to the options page but we need to call `require("options").showOptions()` so that the extension opens it for us. It focuses our options page if it's already open and it makes sure that the correct options page is opened. martin 2017/11/20 11:47:34 Hmm... I took a look and couldn't figure that one Show quoted text On 2017/11/14 12:25:43, Thomas Greiner wrote: > There are still a couple of links missing on this page. > > Note that in this case we shouldn't just link to the options page but we need to > call `require("options").showOptions()` so that the extension opens it for us. > It focuses our options page if it's already open and it makes sure that the > correct options page is opened. Hmm... I took a look and couldn't figure that one out. Are we even using require.js or ES6 modules? Is there an "options" module? Anyways I'd better leave this to to you guys. Would only slow you down. Thomas Greiner 2017/11/20 17:06:05 It should be fine for you to include it here. We s Show quoted text On 2017/11/20 11:47:34, martin wrote: > On 2017/11/14 12:25:43, Thomas Greiner wrote: > > There are still a couple of links missing on this page. > > > > Note that in this case we shouldn't just link to the options page but we need > to > > call `require("options").showOptions()` so that the extension opens it for us. > > It focuses our options page if it's already open and it makes sure that the > > correct options page is opened. > > Hmm... I took a look and couldn't figure that one out. Are we even using > require.js or ES6 modules? Is there an "options" module? Anyways I'd better > leave this to to you guys. Would only slow you down. It should be fine for you to include it here. We simply need to call `browser.runtime.sendMessage({type: "app.open", what: "options"});` when someone clicks on the link. FYI: `require("options").showOptions()` can't be used by the UI so that was my mistake and you can ignore that. martin 2017/11/26 17:08:37 Done. Show quoted text On 2017/11/20 17:06:05, Thomas Greiner wrote: > On 2017/11/20 11:47:34, martin wrote: > > On 2017/11/14 12:25:43, Thomas Greiner wrote: > > > There are still a couple of links missing on this page. > > > > > > Note that in this case we shouldn't just link to the options page but we > need > > to > > > call `require("options").showOptions()` so that the extension opens it for > us. > > > It focuses our options page if it's already open and it makes sure that the > > > correct options page is opened. > > > > Hmm... I took a look and couldn't figure that one out. Are we even using > > require.js or ES6 modules? Is there an "options" module? Anyways I'd better > > leave this to to you guys. Would only slow you down. > > It should be fine for you to include it here. We simply need to call > `browser.runtime.sendMessage({type: "app.open", what: "options"});` when someone > clicks on the link. > > FYI: `require("options").showOptions()` can't be used by the UI so that was my > mistake and you can ignore that. Done.
59 </article>	63 <article class="feature-entry">

60	64 <img class="feature-icon" src="/skin/updates/icon-thumbs-up.svg" />

61 <article class="feature-entry">	65 <p id="block-ads-text" class="i18n_updates_blockAds"></p>

62 <img class="feature-icon" src="/skin/updates/icon-thumbs-up.svg" a lt="thumbs-up-icon"/>	66 </article>

63 <p id="block-ads-text" class="i18n_updates_blockAds"></p>	67

64 </article>	68 <article class="custom-feature-entry">

65	69 <h2 class="i18n_updates_phone"></h2>

66 <article class="custom-feature-entry">	70

67 <h2 class="i18n_updates_phone"></h2>	71 <div class="feature-entry">

68 <div class="feature-entry">	72 <img class="feature-icon" src="/skin/updates/icon-mobile.svg"/ >

69 <img class="feature-icon" src="/skin/updates/icon-mobile.svg" al t="thumbs-up-icon"/>	73 <p id="adblock-browser-text" class="i18n_updates_adblockBrowse r"></p>

70 <p class="i18n_updates_adblockBrowser"></p>	74 </div>

71 </div>	75

72 <div class="store-buttons">	76 <div class="store-buttons">
Thomas Greiner 2017/11/14 12:25:44 Have we made a decision regarding the store button Have we made a decision regarding the store buttons yet? From what I remember, Jeen and Tamara would be in favor of the WhatsApp approach but I don't think we concluded that IRC discussion yet. martin 2017/11/20 11:47:35 Done. Show quoted text On 2017/11/14 12:25:44, Thomas Greiner wrote: > Have we made a decision regarding the store buttons yet? From what I remember, > Jeen and Tamara would be in favor of the WhatsApp approach but I don't think we > concluded that IRC discussion yet. Done.
73 <a href="" class="store-button applestore-button">	77 <a id="adblock-browser-ios-store" class="store-button applesto re-button" target="_blank">

74 <img src="skin/updates/appstore-bg.svg" alt="apple store butto n">	78 <img src="skin/updates/appstore-bg.svg" alt="apple store but ton">

75 </a>	79 </a>

76 <a href="" class="store-button googleplay-button">	80 <a id="adblock-browser-android-store" class="store-button goog leplay-button" target="_blank">

77 <img src="skin/updates/googleplay-bg.svg" alt="google play sto re button">	81 <img src="skin/updates/googleplay-bg.svg" alt="google play s tore button">

78 </a>	82 </a>

79 </div>	83 </div>

80 </article>	84

81	85 </article>

82 </div>	86

83	87 </div>

84 </section>	88

85	89 </section>

86 </div>	90

87	91 </div>

88 </main>	92

89	93 </main>

90 </body>	94

91	95 </body>

	96

92 </html>	97 </html>

93

LEFT	RIGHT