#184 assistant layout

Extension/_locales/en/messages.json

@@ -93,13 +93,13 @@
         "message": "Advanced settings..."
     },
     "assistant_apply_rule_to_all_sites": {
-        "message": "Apply this rule to&nbsp;every web site<input id='oneDomainRadio' type='checkbox' class='checkbox'>"
+        "message": "Apply this rule to&nbsp;every web site"
     },
     "assistant_block_by_reference": {
-        "message": "Block element by&nbsp;url<input id='blockByUrl' type='checkbox' class='checkbox'>"
+        "message": "Block element by&nbsp;url"
     },
     "assistant_block_similar": {
-        "message": "Block similar elements<input id='blockSimilar' type='checkbox' class='checkbox'>"
+        "message": "Block similar elements"
     },
     "assistant_block": {
         "message": "Block"

Extension/browser/chrome/manifest.json

@@ -65,7 +65,6 @@
 				"lib/content-script/i18n-helper.js",
 				"lib/content-script/assistant/js/adguard-selector.js",
 				"lib/content-script/assistant/js/adguard-rules-constructor.js",
-				"lib/content-script/assistant/js/tools.js",
 				"lib/content-script/assistant/js/assistant.js",
 				"lib/content-script/assistant/js/start-assistant.js"
 			],

Extension/browser/firefox/lib/contentScripts.js

@@ -108,7 +108,6 @@ ContentScripts.prototype = {
             'content-script/i18n-helper.js',    // Localization placeholders
             'content-script/content-script.js', // Message passing
             'content-script/assistant/js/start-assistant.js',
-            'content-script/assistant/js/tools.js',
             'content-script/assistant/js/adguard-selector.js',
             'content-script/assistant/js/adguard-rules-constructor.js',
             'content-script/assistant/js/assistant.js'

Extension/browser/safari/Info.plist

@@ -65,7 +65,6 @@
                     <string>lib/content-script/assistant/js/adguard-selector.js</string>
                     <string>lib/content-script/assistant/js/adguard-rules-constructor.js</string>
                     <string>lib/content-script/assistant/js/assistant.js</string>
-                    <string>lib/content-script/assistant/js/tools.js</string>
                     <string>lib/content-script/assistant/js/start-assistant.js</string>
                     <string>lib/content-script/subscribe.js</string>
                 </array>

Extension/lib/content-script/assistant/js/assistant.js

@@ -360,11 +360,6 @@ var Adguard = function () {
 		});
 	};
 
-	var makeRadioButtonsAndCheckBoxes = function () {
-		findInIframe('.radiobox').radioButton();
-		findInIframe('.checkbox').checkbox();
-	};
-
 	var onCancelSelectModeClicked = function (e) {
 		e.preventDefault();
 
@@ -446,18 +441,18 @@ var Adguard = function () {
 					).append($('<div>', {id: 'adv-settings', "class": 'element-rule_form'})
 						.append($('<div>', {"class": 'element-rule_form-cont'})
 							.append($('<div>', {id: 'one-domain-p', "class": 'element-rule_fieldset'})
-								.append($('<input>', {type:'checkbox', "class": 'form-ui-control'}))
-								.append($('<label>', {"class": 'form-ui'})
+								.append($('<input>', {id:'oneDomainRadio', type:'checkbox', "class": 'form-ui-control checkbox'}))
+								.append($('<label>', {"class": 'form-ui', "for":'oneDomainRadio'})
 									.append($('<span>', {"class": 'form-ui-txt', i18n: 'assistant_apply_rule_to_all_sites'}))
 								)
 							).append($('<div>', {id: 'block-by-url-p', "class": 'element-rule_fieldset', style: 'display: none;'})
-								.append($('<input>', {type:'checkbox', "class": 'form-ui-control'}))
-								.append($('<label>', {"class": 'form-ui'})
+								.append($('<input>', {id:'blockByUrl', type:'checkbox', "class": 'form-ui-control checkbox'}))
+								.append($('<label>', {"class": 'form-ui', "for":'blockByUrl'})
 									.append($('<span>', {"class": 'form-ui-txt', i18n: 'assistant_block_by_reference'}))
 								)
 							).append($('<div>', {id: 'block-similar-p',"class": 'element-rule_fieldset', style: 'display: none;'})
-								.append($('<input>', {type:'checkbox', "class": 'form-ui-control'}))
-								.append($('<label>', {"class": 'form-ui'})
+								.append($('<input>', {id:'blockSimilar', type:'checkbox', "class": 'form-ui-control checkbox'}))
+								.append($('<label>', {"class": 'form-ui', "for":'blockSimilar'})
 									.append($('<span>', {"class": 'form-ui-txt', i18n: 'assistant_block_similar'}))
 								)
 							).append($('<div>', {"class": 'element-rule_fieldset'})
@@ -533,7 +528,6 @@ var Adguard = function () {
 			d.resolve('');
 		}, function () {
 			localizeMenu();
-			makeRadioButtonsAndCheckBoxes();
 		});
 		return d;
 	};
@@ -765,7 +759,6 @@ var Adguard = function () {
 
 		makeDefaultCheckboxesForDetailedMenu();
 		onScopeChange();
-		makeRadioButtonsAndCheckBoxes();
 		handleShowBlockSettings(haveUrlBlockParameter(element), haveClassAttribute(element));
 	};
 
@@ -774,9 +767,6 @@ var Adguard = function () {
 		findInIframe('#blockByUrl').attr('checked', false);
 		findInIframe('#blockSimilar').attr('checked', false);
 		findInIframe('#oneDomainRadio').attr('checked', false);
-		findInIframe('#block-by-url-p >div >span').removeClass('active');
-		findInIframe('#block-similar-p >div >span').removeClass('active');
-		findInIframe('#one-domain-p >div >span').removeClass('active');
 	};
 
 	var getUrlBlockAttribute = function (element) {