Commit 9a55972d authored by Manvel Saroyan's avatar Manvel Saroyan

issue 2377 - Finish design of Advanced tab of new options page

parent a96817e7
......@@ -163,6 +163,18 @@
"description": "Section title in Advanced tab",
"message": "Filter lists"
},
"options_filterList_title_tooltip": {
"description": "First top part of tooltip description for 'Filter lists' section in Advanced tab",
"message": "You can create or add filter lists here."
},
"options_filterList_title_tooltip_notes_1": {
"description": "First bottom part of tooltip description for 'Filter lists' section in Advanced tab",
"message": "Filter lists are the heart of Adblock Plus, providing its functionality. In order for any feature of Adblock Plus to take effect, at least one filter list needs to be activated. These filter lists are not owned by Adblock Plus, but created by international volunteers, who also create the filter rules. A few of these filter lists are mentioned as examples in Adblock Plus."
},
"options_filterList_title_tooltip_notes_2": {
"description": "Second bottom part of tooltip description for 'Filter lists' section in Advanced tab",
"message": "Adblock Plus provides free hosting for popular filter lists. If you would like to create or maintain a filter list which is not yet provided by Adblock Plus, we would be more than happy to assist you with the hosting. Contact us at <strong>Help > Forum > Filters for Adblock Plus</strong>."
},
"options_tab_overview": {
"description": "Tab name in Advanced tab",
"message": "Overview"
......@@ -239,20 +251,24 @@
"description": "Custom filters option name in Advanced tab",
"message": "Filter rules"
},
"options_customFilters_title_tooltip": {
"description": "Text of tooltip description for 'Filter rules' section in Advanced tab",
"message": "Learn how to write your own filter rules to define elements that should be blocked. See tutorials and the syntax description at <strong>adblockplus.org/filters</strong>"
},
"options_customFilters_textbox_placeholder": {
"description": "Adding custom filter textbox placeholder text in Advanced tab",
"message": "add your filter rule here"
},
"options_customFilter_edit": {
"description": "Label for editing custom filter in Advanced tab",
"message": "edit rules"
"description": "Label below single input view of user's filter list in Advanced tab",
"message": "edit filter rules"
},
"options_customFilter_list": {
"description": "Label for editing custom filter in Advanced tab",
"message": "list view"
"options_customFilter_cancel": {
"description": "Label below raw view of user's filter list in Advanced tab",
"message": "cancel"
},
"options_customFilter_save": {
"description": "Label for editing custom filter in Advanced tab",
"description": "Label below raw view of user's filter list in Advanced tab",
"message": "save"
},
"options_faq_title": {
......
......@@ -213,10 +213,7 @@
<!-- Advanced tab content -->
<div id="content-advanced" class="tab-content">
<div>
<h1>
<span class="i18n_options_tweaks_title"></span>
<a class="i18n_options_readMore tooltip"></a>
</h1>
<h1 class="i18n_options_tweaks_title"></h1>
<ul id="tweaks" class="table">
<li data-pref="shouldShowBlockElementMenu">
<label>
......@@ -249,7 +246,16 @@
<div>
<h1>
<span class="i18n_options_filterList_title"></span>
<a class="i18n_options_readMore tooltip"></a>
<div class="tooltip">
<span class="i18n_options_readMore"></span>
<div role="tooltip">
<p class="i18n_options_filterList_title_tooltip"></p>
<div class="notes">
<p class="i18n_options_filterList_title_tooltip_notes_1"></p>
<p class="i18n_options_filterList_title_tooltip_notes_2"></p>
</div>
</div>
</div>
</h1>
<ul class="tabs horizontal">
<li class="i18n_options_tab_overview active" data-action="switch-tab" data-tab="advanced-allFilterLists"></li>
......@@ -258,8 +264,8 @@
<div id="filter-lists">
<div id="all-filter-lists">
<div class="table-header">
<h3 class="i18n_options_column_name"></h3>
<h3 class="i18n_options_column_date"></h3>
<h2 class="i18n_options_column_name"></h2>
<h2 class="i18n_options_column_date"></h2>
</div>
<ul class="table cols" id="all-filter-lists-table">
<template>
......@@ -282,9 +288,9 @@
<span class="message"></span>
</template>
<li class="static">
<button role="checkbox" class="control" aria-checked="true" disabled="true"></button>
<button id="own-list" role="checkbox" class="control" aria-checked="true" disabled="true"></button>
<div>
<label class="i18n_options_filterList_own_list"></label>
<label for="own-list" class="i18n_options_filterList_own_list"></label>
</div>
<span data-action="switch-tab,edit-custom-filters" data-tab="advanced-customFilters">
<a class="i18n_options_filterList_edit_own_list"></a>
......@@ -303,7 +309,15 @@
</div>
</div>
<div id="custom-filters">
<h3 id="custom-filters-header" class="i18n_options_customFilters_title"></h3>
<h2 id="custom-filters-header">
<span class="i18n_options_customFilters_title"></span>
<div class="tooltip">
<span class="i18n_options_readMore"></span>
<div role="tooltip">
<p class="i18n_options_customFilters_title_tooltip"></p>
</div>
</div>
</h2>
<div id="custom-filters-wrapper">
<div id="custom-filters-list-wrapper">
<ul id="custom-filters-table" class="table list">
......@@ -324,14 +338,14 @@
<span class="i18n_options_customFilter_edit"></span>
</button>
<div id="custom-filters-raw-controls">
<button data-action="cancel-custom-filters">
<span class="icon icon-edit"></span>
<span class="i18n_options_customFilter_list"></span>
</button>
<button id="custom-filters-raw-save" data-action="save-custom-filters">
<span class="icon icon-edit"></span>
<span class="icon icon-save"></span>
<span class="i18n_options_customFilter_save"></span>
</button>
<button data-action="cancel-custom-filters">
<span class="icon icon-cancel"></span>
<span class="i18n_options_customFilter_cancel"></span>
</button>
</div>
</div>
</div>
......
This diff is collapsed.
skin/options-sprite.png

4.87 KB | W: | H:

skin/options-sprite.png

3.61 KB | W: | H:

skin/options-sprite.png
skin/options-sprite.png
skin/options-sprite.png
skin/options-sprite.png
  • 2-up
  • Swipe
  • Onion skin
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment