Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
uBlock/src/popup-fenix.html

88 lines
6.0 KiB
HTML
Raw Normal View History

First draft of popup panel for Firefox Preview First draft of changes as discussed with Firefox Preview people. In order to allow testing/evaluating these changes, the new advanced setting `uiFlavor` has been added. Default to `unset`; and can currently only be set to `fenix`. The new setting takes effect at launch only. This new setting is not to be mentioned in official documentation for now. This is ongoing work, not open to external feedback.
2020-01-25 07:24:59 -07:00
<!DOCTYPE html>
<html id="uBO-popup-panel">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
Fifth pass to re-design the dashboard Related commits: - https://github.com/gorhill/uBlock/commit/99b2a0a761eec860132bc08680710c3c785f90b6 - https://github.com/gorhill/uBlock/commit/a8e3118feafd5c2d7c3e3d03727beff17f9928b4 - https://github.com/gorhill/uBlock/commit/453f5450b6e6550618bf97b5b0541f5f46c35d8e - https://github.com/gorhill/uBlock/commit/a45a21f337216d7d4aaddb5a454ed4842eca3806 Fine tuned previous work. Started the use of variable-based color values.
2020-04-11 09:32:43 -06:00
<link rel="stylesheet" type="text/css" href="css/themes/default.css">
First draft of popup panel for Firefox Preview First draft of changes as discussed with Firefox Preview people. In order to allow testing/evaluating these changes, the new advanced setting `uiFlavor` has been added. Default to `unset`; and can currently only be set to `fenix`. The new setting takes effect at launch only. This new setting is not to be mentioned in official documentation for now. This is ongoing work, not open to external feedback.
2020-01-25 07:24:59 -07:00
<link rel="stylesheet" href="css/common.css" type="text/css">
<link rel="stylesheet" href="css/fa-icons.css" type="text/css">
<link rel="stylesheet" href="css/popup-fenix.css" type="text/css">
<title data-i18n="extName"></title>
</head>
More work toward redesigning the UI As per email feedback from Mozilla's https://github.com/brampitoyo This is yet another incremental step toward redesigning the UI, much more is left to do. The idea is to align uBO's UI to that of Firefox Preview. Additionally, code has been added to reset the new popup panel to vertical layout should the viewport be not wide enough to accomodate the horizontal layout. Related feedback: - https://www.reddit.com/r/uBlockOrigin/comments/g4ufvi/
2020-04-21 14:33:08 -06:00
<body class="loading">
More fine tuning of various visuals Summarily: - Bring back horizontal layout for fenix popup panel to be used in desktop environment - Address feedback from https://github.com/gorhill/uBlock/commit/54b68ebd9426#commitcomment-38549940 - Allow future dark theme to be enabled programmatically
2020-04-18 07:48:53 -06:00
<div id="panes">
First draft of popup panel for Firefox Preview First draft of changes as discussed with Firefox Preview people. In order to allow testing/evaluating these changes, the new advanced setting `uiFlavor` has been added. Default to `unset`; and can currently only be set to `fenix`. The new setting takes effect at launch only. This new setting is not to be mentioned in official documentation for now. This is ongoing work, not open to external feedback.
2020-01-25 07:24:59 -07:00
<div id="sticky">
Minor code review
2020-04-28 16:39:31 -06:00
<div id="stickyTools">
Fine tune visuals of ruleset tools in popup panel
2020-02-01 09:36:14 -07:00
<div class="rulesetTools">
More work toward re-hauling the user interface This commit specifically address bringing the desktop version of the new popup panel's look and feel more inline with the classic one: - Hide tool captions on desktop - Bring back no-popups switch on desktop - Bring back tooltips on desktop (though they are now rendered natively by the browser) - Use the Photon icons suggested by @brampitoyo for the no-popups and no-remote-fonts switches
2020-04-27 08:33:49 -06:00
<span id="saveRules" class="fa-icon" data-i18n-title="popupTipSaveRules">lock</span>
<span id="revertRules" class="fa-icon" data-i18n-title="popupTipRevertRules">eraser</span>
Fine tune visuals of ruleset tools in popup panel
2020-02-01 09:36:14 -07:00
</div>
More work toward re-hauling the user interface This commit specifically address bringing the desktop version of the new popup panel's look and feel more inline with the classic one: - Hide tool captions on desktop - Bring back no-popups switch on desktop - Bring back tooltips on desktop (though they are now rendered natively by the browser) - Use the Photon icons suggested by @brampitoyo for the no-popups and no-remote-fonts switches
2020-04-27 08:33:49 -06:00
<div id="switch" role="button" aria-label tabindex="0" title>
Fine tune visuals of ruleset tools in popup panel
2020-02-01 09:36:14 -07:00
<span class="fa-icon">power-off</span>
</div>
<div class="rulesetTools">
Move refresh button to the right of the power button
2020-02-27 07:29:14 -07:00
<span id="refresh" class="fa-icon">refresh</span>
Fine tune visuals of ruleset tools in popup panel
2020-02-01 09:36:14 -07:00
</div>
First draft of popup panel for Firefox Preview First draft of changes as discussed with Firefox Preview people. In order to allow testing/evaluating these changes, the new advanced setting `uiFlavor` has been added. Default to `unset`; and can currently only be set to `fenix`. The new setting takes effect at launch only. This new setting is not to be mentioned in official documentation for now. This is ongoing work, not open to external feedback.
2020-01-25 07:24:59 -07:00
</div>
Re-order sections in the new popup panel The blocking-stuff button icons have been brought closer to the power button. The go-somewhere button icons have been moved at the bottom. The hostname of the current site is now shown below the power button. The base domain is bolded. This re-ordering is for a few reasons: - The blocking-stuff button icons are now closer to the revert/persist/reload transient buttons which show up when modifying the blocking behavior of uBO. - The makes it easier to potentially bring in a very basic view where only the power button and the statistics are shown and all the button icons are hidden from view.
2020-04-27 17:01:16 -06:00
<div id="hostname"><span>ephemeralnewyork.</span>&shy;<span>wordpress.com</span></div>
First draft of popup panel for Firefox Preview First draft of changes as discussed with Firefox Preview people. In order to allow testing/evaluating these changes, the new advanced setting `uiFlavor` has been added. Default to `unset`; and can currently only be set to `fenix`. The new setting takes effect at launch only. This new setting is not to be mentioned in official documentation for now. This is ongoing work, not open to external feedback.
2020-01-25 07:24:59 -07:00
<hr>
</div>
More fine tuning of various visuals Summarily: - Bring back horizontal layout for fenix popup panel to be used in desktop environment - Address feedback from https://github.com/gorhill/uBlock/commit/54b68ebd9426#commitcomment-38549940 - Allow future dark theme to be enabled programmatically
2020-04-18 07:48:53 -06:00
<div id="main">
<div id="basicStats" class="itemRibbon">
<span data-i18n="popupBlockedOnThisPage_v2"></span><span></span>
<span data-i18n="popupBlockedSinceInstall_v2"></span><span></span>
<span data-i18n="popupDomainsConnected_v2"></span><span></span>
</div>
<hr>
<div id="extraTools" class="toolRibbon">
More work toward re-hauling the user interface This commit specifically address bringing the desktop version of the new popup panel's look and feel more inline with the classic one: - Hide tool captions on desktop - Bring back no-popups switch on desktop - Bring back tooltips on desktop (though they are now rendered natively by the browser) - Use the Photon icons suggested by @brampitoyo for the no-popups and no-remote-fonts switches
2020-04-27 08:33:49 -06:00
<span id="no-popups" class="hnSwitch tool enabled" role="button" aria-label tabindex="0" title><span class="fa-icon fa-icon-badged">ph-popups<svg class="nope" viewBox="0 0 20 20"><path d="M1,1 19,19M1,19 19,1" /></svg></span><span class="caption" data-i18n="popupNoPopups_v2"></span></span>
<span id="no-large-media" class="hnSwitch tool enabled" role="button" aria-label tabindex="0" title><span class="fa-icon fa-icon-badged">film<svg class="nope" viewBox="0 0 20 20"><path d="M1,1 19,19M1,19 19,1" /></svg></span><span class="caption" data-i18n="popupNoLargeMedia_v2"></span></span>
<span id="no-cosmetic-filtering" class="hnSwitch tool enabled" role="button" aria-label tabindex="0" title><span class="fa-icon fa-icon-badged">eye-slash<svg class="nope" viewBox="0 0 20 20"><path d="M1,1 19,19M1,19 19,1" /></svg></span><span class="caption" data-i18n="popupNoCosmeticFiltering_v2"></span></span>
<span id="no-remote-fonts" class="hnSwitch tool enabled" role="button" aria-label tabindex="0" title><span class="fa-icon fa-icon-badged">ph-readermode-text-size<svg class="nope" viewBox="0 0 20 20"><path d="M1,1 19,19M1,19 19,1" /></svg></span><span class="caption" data-i18n="popupNoRemoteFonts_v2"></span></span>
<span id="no-scripting" class="hnSwitch tool enabled" role="button" aria-label tabindex="0" title><span class="fa-icon fa-icon-badged">code<svg class="nope" viewBox="0 0 20 20"><path d="M1,1 19,19M1,19 19,1" /></svg></span><span class="caption" data-i18n="popupNoScripting_v2"></span></span>
More fine tuning of various visuals Summarily: - Bring back horizontal layout for fenix popup panel to be used in desktop environment - Address feedback from https://github.com/gorhill/uBlock/commit/54b68ebd9426#commitcomment-38549940 - Allow future dark theme to be enabled programmatically
2020-04-18 07:48:53 -06:00
</div>
<hr>
Minor code review
2020-04-28 16:39:31 -06:00
<div id="basicTools" class="toolRibbon">
Re-order sections in the new popup panel The blocking-stuff button icons have been brought closer to the power button. The go-somewhere button icons have been moved at the bottom. The hostname of the current site is now shown below the power button. The base domain is bolded. This re-ordering is for a few reasons: - The blocking-stuff button icons are now closer to the revert/persist/reload transient buttons which show up when modifying the blocking behavior of uBO. - The makes it easier to potentially bring in a very basic view where only the power button and the statistics are shown and all the button icons are hidden from view.
2020-04-27 17:01:16 -06:00
<span id="gotoZap" class="fa-icon tool" data-i18n-title="popupTipZapper">bolt<span class="caption" data-i18n="popupTipZapper"></span></span>
<span id="gotoPick" class="fa-icon tool" data-i18n-title="popupTipPicker">eye-dropper<span class="caption" data-i18n="popupTipPicker"></span></span>
<a href="logger-ui.html#_" class="fa-icon tool enabled" target="uBOLogger" tabindex="0" data-i18n-title="popupTipLog">list-alt<span class="caption" data-i18n="popupTipLog"></span></a>
<a href="dashboard.html" class="fa-icon tool enabled" target="uBODashboard" tabindex="0" data-i18n-title="popupTipDashboard">sliders<span class="caption" data-i18n="popupTipDashboard"></span></a>
</div>
<hr>
More fine tuning of various visuals Summarily: - Bring back horizontal layout for fenix popup panel to be used in desktop environment - Address feedback from https://github.com/gorhill/uBlock/commit/54b68ebd9426#commitcomment-38549940 - Allow future dark theme to be enabled programmatically
2020-04-18 07:48:53 -06:00
<div id="moreButton" class="itemRibbon">
<span data-i18n="popupMoreButton_v2"></span><span class="fa-icon">angle-up</span>
</div>
First draft of popup panel for Firefox Preview First draft of changes as discussed with Firefox Preview people. In order to allow testing/evaluating these changes, the new advanced setting `uiFlavor` has been added. Default to `unset`; and can currently only be set to `fenix`. The new setting takes effect at launch only. This new setting is not to be mentioned in official documentation for now. This is ongoing work, not open to external feedback.
2020-01-25 07:24:59 -07:00
</div>
More fine tuning of various visuals Summarily: - Bring back horizontal layout for fenix popup panel to be used in desktop environment - Address feedback from https://github.com/gorhill/uBlock/commit/54b68ebd9426#commitcomment-38549940 - Allow future dark theme to be enabled programmatically
2020-04-18 07:48:53 -06:00
<div id="firewall">
More work toward re-hauling the user interface This commit specifically address bringing the desktop version of the new popup panel's look and feel more inline with the classic one: - Hide tool captions on desktop - Bring back no-popups switch on desktop - Bring back tooltips on desktop (though they are now rendered natively by the browser) - Use the Photon icons suggested by @brampitoyo for the no-popups and no-remote-fonts switches
2020-04-27 08:33:49 -06:00
<div data-des="*" data-type="*"><span data-i18n="popupAnyRulePrompt"></span><span data-src="/" data-i18n-title="popupTipGlobalRules"> </span><span data-src="." data-i18n-title="popupTipLocalRules"> </span></div>
First draft of popup panel for Firefox Preview First draft of changes as discussed with Firefox Preview people. In order to allow testing/evaluating these changes, the new advanced setting `uiFlavor` has been added. Default to `unset`; and can currently only be set to `fenix`. The new setting takes effect at launch only. This new setting is not to be mentioned in official documentation for now. This is ongoing work, not open to external feedback.
2020-01-25 07:24:59 -07:00
<div data-des="*" data-type="image"><span data-i18n="popupImageRulePrompt"></span><span data-src="/"> </span><span data-src="."> </span></div>
<div data-des="*" data-type="3p"><span data-i18n="popup3pAnyRulePrompt"></span><span data-src="/"> </span><span data-src="."> </span></div>
<div data-des="*" data-type="inline-script"><span data-i18n="popupInlineScriptRulePrompt"></span><span data-src="/"> </span><span data-src="."> </span></div>
<div data-des="*" data-type="1p-script"><span data-i18n="popup1pScriptRulePrompt"></span><span data-src="/"> </span><span data-src="."> </span></div>
<div data-des="*" data-type="3p-script"><span data-i18n="popup3pScriptRulePrompt"></span><span data-src="/"> </span><span data-src="."> </span></div>
<div data-des="*" data-type="3p-frame"><span data-i18n="popup3pFrameRulePrompt"></span><span data-src="/"> </span><span data-src="."> </span></div>
</div>
</div>
<div id="templates" style="display: none">
New way to convey IDN and CNAME info in popup panel Hostnames which have unpunycoded IDN or canonical name information will have this information reported as an extra line under the hostname name in the popup panel, rather than as a tooltip. For the fenix UI flavor, the save/revert tools are now shown regardless of whether the overview area is visible or not.
2020-02-10 06:06:36 -07:00
<div data-des="" data-type="*"><span><span></span><sub></sub></span><span data-src="/"></span><span data-src="."></span><span data-src="."></span></div>
Sixth pass to re-design the dashboard Related commits: - https://github.com/gorhill/uBlock/commit/0662767dd62731320473e9c96a17077145a00610 - https://github.com/gorhill/uBlock/commit/99b2a0a761eec860132bc08680710c3c785f90b6 - https://github.com/gorhill/uBlock/commit/a8e3118feafd5c2d7c3e3d03727beff17f9928b4 - https://github.com/gorhill/uBlock/commit/453f5450b6e6550618bf97b5b0541f5f46c35d8e - https://github.com/gorhill/uBlock/commit/a45a21f337216d7d4aaddb5a454ed4842eca3806 This commit focuses on implementing the use of CSS `var(...)` throughout so as to make it easy to create themes -- a requirement for uBO to support a dark theme. There is still work to do regarding converting uBO's CSS to completely support `var(...)` but being able to start using theming will help complete and fine tune CSS `var(...)` support. Related issue: - https://github.com/uBlockOrigin/uBlock-issues/issues/401
2020-04-13 07:19:58 -06:00
<div id="actionSelector"><span id="dynaAllow"></span><span id="dynaNoop"></span><span id="dynaBlock"></span><span id="dynaCounts"></span></div>
First draft of popup panel for Firefox Preview First draft of changes as discussed with Firefox Preview people. In order to allow testing/evaluating these changes, the new advanced setting `uiFlavor` has been added. Default to `unset`; and can currently only be set to `fenix`. The new setting takes effect at launch only. This new setting is not to be mentioned in official documentation for now. This is ongoing work, not open to external feedback.
2020-01-25 07:24:59 -07:00
<div id="hotspotTip"></div>
<div id="tooltip"></div>
</div>
<script src="js/fa-icons.js"></script>
<script src="lib/punycode.js"></script>
<script src="js/vapi.js"></script>
<script src="js/vapi-common.js"></script>
<script src="js/vapi-client.js"></script>
<script src="js/udom.js"></script>
<script src="js/i18n.js"></script>
<script src="js/popup-fenix.js"></script>
</body>
</html>