Issue 6321 - Move the popup under UI

Already landed.

[a.giammarchi, 2018-06-07 13:24:07]

I have already tested this locally, after moving all files inside the
adblockplusui folder (and subfolders) but I wonderif there's anything else I am
missing in here.

Thanks for double checking.

[Sebastian Noack, 2018-06-07 15:21:27]

We probably should also move the translations used by the popup, as well as
icons/detailed/abp-64.png, to adblockplusui.

[a.giammarchi, 2018-06-07 15:33:27]

On 2018/06/07 15:21:27, Sebastian Noack wrote:
> We probably should also move the translations used by the popup

Done. The cancel is used also in the composer so I haven't removed it.

> as well as icons/detailed/abp-64.png, to adblockplusui.

You mean to re-map all icons to adblockplusui/icons?
Or there's some specific reason to mention abp-64.png only?

Thanks.

[Sebastian Noack, 2018-06-07 16:17:58]

On 2018/06/07 15:33:27, a.giammarchi wrote:
> You mean to re-map all icons to adblockplusui/icons?
> Or there's some specific reason to mention abp-64.png only?

The popup is usin abp-64.png and abp-128.png. But the latter is already imported
from adblockplusui.

[a.giammarchi, 2018-06-08 13:14:28]

I have done all popup related updates and I don't think we need to dig further
for the new Bubble UI.

Please have a look and let me know if there's anything else I've missed.

Also please note this need the Bubble UI to be finished on ABPUI side, which is
not yet the case, but I want to be sure I am including in the new UI everything
I need from Chrome repo.

Thanks.

[Thomas Greiner, 2018-06-08 13:33:23]

https://codereview.adblockplus.org/29801613/diff/29802559/metadata.chrome
File metadata.chrome (right):

https://codereview.adblockplus.org/29801613/diff/29802559/metadata.chrome#new...
metadata.chrome:65: icons/detailed/abp-64.png = adblockplusui/skin/abp-64.png
Detail: I don't see this file being removed from the repo as part of this
review.

https://codereview.adblockplus.org/29801613/diff/29802559/metadata.gecko
File metadata.gecko (right):

https://codereview.adblockplus.org/29801613/diff/29802559/metadata.gecko#newc...
metadata.gecko:20: skin/popup.png = adblockplusui/skin/popup.png
Detail: These mappings are already defined in metadata.chrome which this file
inherits from.

[a.giammarchi, 2018-06-08 13:44:23]

dropped file and useless overrides in the geko meta file.

https://codereview.adblockplus.org/29801613/diff/29802559/metadata.chrome
File metadata.chrome (right):

https://codereview.adblockplus.org/29801613/diff/29802559/metadata.chrome#new...
metadata.chrome:65: icons/detailed/abp-64.png = adblockplusui/skin/abp-64.png
On 2018/06/08 13:33:22, Thomas Greiner wrote:
> Detail: I don't see this file being removed from the repo as part of this
> review.

Done.

https://codereview.adblockplus.org/29801613/diff/29802559/metadata.gecko
File metadata.gecko (right):

https://codereview.adblockplus.org/29801613/diff/29802559/metadata.gecko#newc...
metadata.gecko:20: skin/popup.png = adblockplusui/skin/popup.png
On 2018/06/08 13:33:22, Thomas Greiner wrote:
> Detail: These mappings are already defined in metadata.chrome which this file
> inherits from.

Done.

[Thomas Greiner, 2018-06-11 11:34:41]

LGTM
Note that it's up to Sebastian to decide when and where this change should land.
In any case, we now know what we can/need to change in adblockplusui.

[a.giammarchi, 2018-06-11 11:39:57]

On 2018/06/11 11:34:41, Thomas Greiner wrote:
> LGTM
> Note that it's up to Sebastian to decide when and where this change should
land.

Absolutely, and no rush at all


> In any case, we now know what we can/need to change in adblockplusui.

That was my intention: have a base to start developing as UI pull request.

Thanks

[a.giammarchi, 2018-06-19 15:00:00]

FYI it looks like these strings are all duplicated in the popup.json within the
adbplusui repo.

Are there reason to keep these still in extension? Thanks.

overlay_notification_closing_button_optout
disabled_for_site
easy_create_filter
clickhide_instructions
block_element
stats_title
sendReport defined
overlay_notification_closing_button_hide
stats_show_iconnumber
stats_label_page
cancel
stats_label_total
enabled_for_site
 options_short

[a.giammarchi, 2018-06-19 15:50:21]

actually, never mind. I think Thomas spotted the issue, and it was me
duplicating the file in here.

Yet I think I need to add to the meta the following:

adblockplusui/locale/*/popup.json = *

if that's the case, please let me know.

THanks.

[Thomas Greiner, 2018-06-19 16:20:20]

On 2018/06/19 15:50:21, a.giammarchi wrote:
> Yet I think I need to add to the meta the following:
> 
> adblockplusui/locale/*/popup.json = *

Correct, this needs to be added to import all the strings from adblockplusui. I
just didn't notice that it wasn't in there already.

[a.giammarchi, 2018-06-19 17:03:03]

On 2018/06/19 16:20:20, Thomas Greiner wrote:
> On 2018/06/19 15:50:21, a.giammarchi wrote:
> > Yet I think I need to add to the meta the following:
> > 
> > adblockplusui/locale/*/popup.json = *
> 
> Correct, this needs to be added to import all the strings from adblockplusui.
I
> just didn't notice that it wasn't in there already.

Done

[Thomas Greiner, 2018-07-13 10:22:17]

https://codereview.adblockplus.org/29801613/diff/29817555/metadata.chrome
File metadata.chrome (right):

https://codereview.adblockplus.org/29801613/diff/29817555/metadata.chrome#new...
metadata.chrome:144: skin/popup.png = adblockplusui/skin/popup.png
We don't seem to be using this sprite image anymore in the new design so there's
nothing to import here.

[a.giammarchi, 2018-07-17 16:22:56]

On 2018/07/13 10:22:17, Thomas Greiner wrote:
> https://codereview.adblockplus.org/29801613/diff/29817555/metadata.chrome
> File metadata.chrome (right):
> 
>
https://codereview.adblockplus.org/29801613/diff/29817555/metadata.chrome#new...
> metadata.chrome:144: skin/popup.png = adblockplusui/skin/popup.png
> We don't seem to be using this sprite image anymore in the new design so
there's
> nothing to import here.

Done.