From 647159e54943d13816e611c9e974af6bce4579c6 Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Wed, 23 Jan 2013 22:16:04 +0100
Subject: [PATCH] Fix and cleanup wizard. fix #1324

---
 couchpotato/core/plugins/wizard/static/wizard.css             | 7 ++++++-
 couchpotato/core/plugins/wizard/static/wizard.js              | 5 +----
 couchpotato/core/providers/nzb/__init__.py                    | 1 +
 couchpotato/core/providers/nzb/binsearch/__init__.py          | 1 +
 couchpotato/core/providers/nzb/ftdworld/__init__.py           | 1 +
 couchpotato/core/providers/nzb/nzbclub/__init__.py            | 1 +
 couchpotato/core/providers/nzb/nzbindex/__init__.py           | 1 +
 couchpotato/core/providers/nzb/nzbx/__init__.py               | 1 +
 couchpotato/core/providers/nzb/omgwtfnzbs/__init__.py         | 1 +
 couchpotato/core/providers/torrent/__init__.py                | 1 +
 couchpotato/core/providers/torrent/passthepopcorn/__init__.py | 1 +
 couchpotato/core/providers/torrent/publichd/__init__.py       | 1 +
 couchpotato/core/providers/torrent/sceneaccess/__init__.py    | 1 +
 couchpotato/core/providers/torrent/scenehd/__init__.py        | 1 +
 couchpotato/core/providers/torrent/torrentday/__init__.py     | 1 +
 couchpotato/core/providers/torrent/torrentleech/__init__.py   | 1 +
 couchpotato/static/scripts/page/settings.js                   | 2 +-
 couchpotato/static/style/page/settings.css                    | 1 +
 18 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/couchpotato/core/plugins/wizard/static/wizard.css b/couchpotato/core/plugins/wizard/static/wizard.css
index a24f2b9..8d50d9d 100644
--- a/couchpotato/core/plugins/wizard/static/wizard.css
+++ b/couchpotato/core/plugins/wizard/static/wizard.css
@@ -1,8 +1,13 @@
+.page.wizard .uniForm {
+	width: 80%;
+	margin: 0 auto 30px;
+}
+
 .page.wizard h1 {
 	padding: 10px 30px;
 	margin: 0;
 	display: block;
-	font-size: 40px;
+	font-size: 30px;
 	margin-top: 80px;
 }
 
diff --git a/couchpotato/core/plugins/wizard/static/wizard.js b/couchpotato/core/plugins/wizard/static/wizard.js
index fd6eb14..eb41cb5 100644
--- a/couchpotato/core/plugins/wizard/static/wizard.js
+++ b/couchpotato/core/plugins/wizard/static/wizard.js
@@ -41,8 +41,7 @@ Page.Wizard = new Class({
 		},
 		'providers': {
 			'title': 'Are you registered at any of these sites?',
-			'description': 'CP uses these sites to search for movies. A few free are enabled by default, but it\'s always better to have a few more. Check settings for the full list of available providers.',
-			'include': ['nzb_providers', 'torrent_providers']
+			'description': 'CP uses these sites to search for movies. A few free are enabled by default, but it\'s always better to have a few more. Check settings for the full list of available providers.'
 		},
 		'renamer': {
 			'title': 'Move & rename the movies after downloading?',
@@ -213,8 +212,6 @@ Page.Wizard = new Class({
 		// Hide retention
 		self.el.getElement('.tab_searcher').hide();
 		self.el.getElement('.t_searcher').hide();
-		self.el.getElement('.t_nzb_providers').hide();
-		self.el.getElement('.t_torrent_providers').hide();
 
 		// Add pointer
 		new Element('.tab_wrapper').wraps(tabs).adopt(
diff --git a/couchpotato/core/providers/nzb/__init__.py b/couchpotato/core/providers/nzb/__init__.py
index a704a94..651ae8b 100644
--- a/couchpotato/core/providers/nzb/__init__.py
+++ b/couchpotato/core/providers/nzb/__init__.py
@@ -4,6 +4,7 @@ config = {
         {
             'label': 'Usenet',
             'description': 'Providers searching usenet for new releases',
+            'wizard': True,
             'type': 'list',
             'name': 'nzb_providers',
             'tab': 'searcher',
diff --git a/couchpotato/core/providers/nzb/binsearch/__init__.py b/couchpotato/core/providers/nzb/binsearch/__init__.py
index bf45f66..f4288b1 100644
--- a/couchpotato/core/providers/nzb/binsearch/__init__.py
+++ b/couchpotato/core/providers/nzb/binsearch/__init__.py
@@ -12,6 +12,7 @@ config = [{
             'list': 'nzb_providers',
             'name': 'binsearch',
             'description': 'Free provider, less accurate. See <a href="https://www.binsearch.info/">BinSearch</a>',
+            'wizard': True,
             'options': [
                 {
                     'name': 'enabled',
diff --git a/couchpotato/core/providers/nzb/ftdworld/__init__.py b/couchpotato/core/providers/nzb/ftdworld/__init__.py
index 7698564..ca60ac4 100644
--- a/couchpotato/core/providers/nzb/ftdworld/__init__.py
+++ b/couchpotato/core/providers/nzb/ftdworld/__init__.py
@@ -12,6 +12,7 @@ config = [{
             'list': 'nzb_providers',
             'name': 'FTDWorld',
             'description': 'Free provider, less accurate. See <a href="http://ftdworld.net">FTDWorld</a>',
+            'wizard': True,
             'options': [
                 {
                     'name': 'enabled',
diff --git a/couchpotato/core/providers/nzb/nzbclub/__init__.py b/couchpotato/core/providers/nzb/nzbclub/__init__.py
index 310f4b0..7859fe9 100644
--- a/couchpotato/core/providers/nzb/nzbclub/__init__.py
+++ b/couchpotato/core/providers/nzb/nzbclub/__init__.py
@@ -12,6 +12,7 @@ config = [{
             'list': 'nzb_providers',
             'name': 'NZBClub',
             'description': 'Free provider, less accurate. See <a href="https://www.nzbclub.com/">NZBClub</a>',
+            'wizard': True,
             'options': [
                 {
                     'name': 'enabled',
diff --git a/couchpotato/core/providers/nzb/nzbindex/__init__.py b/couchpotato/core/providers/nzb/nzbindex/__init__.py
index bad0557..29eb0d3 100644
--- a/couchpotato/core/providers/nzb/nzbindex/__init__.py
+++ b/couchpotato/core/providers/nzb/nzbindex/__init__.py
@@ -12,6 +12,7 @@ config = [{
             'list': 'nzb_providers',
             'name': 'nzbindex',
             'description': 'Free provider, less accurate. See <a href="https://www.nzbindex.com/">NZBIndex</a>',
+            'wizard': True,
             'options': [
                 {
                     'name': 'enabled',
diff --git a/couchpotato/core/providers/nzb/nzbx/__init__.py b/couchpotato/core/providers/nzb/nzbx/__init__.py
index 2063a5e..9ce9226 100644
--- a/couchpotato/core/providers/nzb/nzbx/__init__.py
+++ b/couchpotato/core/providers/nzb/nzbx/__init__.py
@@ -12,6 +12,7 @@ config = [{
             'list': 'nzb_providers',
             'name': 'nzbX',
             'description': 'Free provider. See <a href="https://www.nzbx.co/">nzbX</a>',
+            'wizard': True,
             'options': [
                 {
                     'name': 'enabled',
diff --git a/couchpotato/core/providers/nzb/omgwtfnzbs/__init__.py b/couchpotato/core/providers/nzb/omgwtfnzbs/__init__.py
index 74fee0a..287ced4 100644
--- a/couchpotato/core/providers/nzb/omgwtfnzbs/__init__.py
+++ b/couchpotato/core/providers/nzb/omgwtfnzbs/__init__.py
@@ -12,6 +12,7 @@ config = [{
             'list': 'nzb_providers',
             'name': 'OMGWTFNZBs',
             'description': 'See <a href="http://omgwtfnzbs.org/">OMGWTFNZBs</a>',
+            'wizard': True,
             'options': [
                 {
                     'name': 'enabled',
diff --git a/couchpotato/core/providers/torrent/__init__.py b/couchpotato/core/providers/torrent/__init__.py
index df6cd9a..191e132 100644
--- a/couchpotato/core/providers/torrent/__init__.py
+++ b/couchpotato/core/providers/torrent/__init__.py
@@ -4,6 +4,7 @@ config = {
         {
             'label': 'Torrent',
             'description': 'Providers searching torrent sites for new releases',
+            'wizard': True,
             'type': 'list',
             'name': 'torrent_providers',
             'tab': 'searcher',
diff --git a/couchpotato/core/providers/torrent/passthepopcorn/__init__.py b/couchpotato/core/providers/torrent/passthepopcorn/__init__.py
index ce9d382..06be7a8 100644
--- a/couchpotato/core/providers/torrent/passthepopcorn/__init__.py
+++ b/couchpotato/core/providers/torrent/passthepopcorn/__init__.py
@@ -12,6 +12,7 @@ config = [{
             'list': 'torrent_providers',
             'name': 'PassThePopcorn',
             'description': 'See <a href="https://passthepopcorn.me">PassThePopcorn.me</a>',
+            'wizard': True,
             'options': [
                 {
                     'name': 'enabled',
diff --git a/couchpotato/core/providers/torrent/publichd/__init__.py b/couchpotato/core/providers/torrent/publichd/__init__.py
index 06be335..2c356e2 100644
--- a/couchpotato/core/providers/torrent/publichd/__init__.py
+++ b/couchpotato/core/providers/torrent/publichd/__init__.py
@@ -12,6 +12,7 @@ config = [{
             'list': 'torrent_providers',
             'name': 'PublicHD',
             'description': 'Public Torrent site with only HD content. See <a href="https://publichd.se/">PublicHD</a>',
+            'wizard': True,
             'options': [
                 {
                     'name': 'enabled',
diff --git a/couchpotato/core/providers/torrent/sceneaccess/__init__.py b/couchpotato/core/providers/torrent/sceneaccess/__init__.py
index 1361482..e12bf8b 100644
--- a/couchpotato/core/providers/torrent/sceneaccess/__init__.py
+++ b/couchpotato/core/providers/torrent/sceneaccess/__init__.py
@@ -12,6 +12,7 @@ config = [{
             'list': 'torrent_providers',
             'name': 'SceneAccess',
             'description': 'See <a href="https://sceneaccess.eu/">SceneAccess</a>',
+            'wizard': True,
             'options': [
                 {
                     'name': 'enabled',
diff --git a/couchpotato/core/providers/torrent/scenehd/__init__.py b/couchpotato/core/providers/torrent/scenehd/__init__.py
index 032e705..10c5e38 100644
--- a/couchpotato/core/providers/torrent/scenehd/__init__.py
+++ b/couchpotato/core/providers/torrent/scenehd/__init__.py
@@ -12,6 +12,7 @@ config = [{
             'list': 'torrent_providers',
             'name': 'SceneHD',
             'description': 'See <a href="https://scenehd.org">SceneHD</a>',
+            'wizard': True,
             'options': [
                 {
                     'name': 'enabled',
diff --git a/couchpotato/core/providers/torrent/torrentday/__init__.py b/couchpotato/core/providers/torrent/torrentday/__init__.py
index 2ebf0d9..1a4d3c7 100644
--- a/couchpotato/core/providers/torrent/torrentday/__init__.py
+++ b/couchpotato/core/providers/torrent/torrentday/__init__.py
@@ -12,6 +12,7 @@ config = [{
             'list': 'torrent_providers',
             'name': 'TorrentDay',
             'description': 'See <a href="http://www.td.af/">TorrentDay</a>',
+            'wizard': True,
             'options': [
                 {
                     'name': 'enabled',
diff --git a/couchpotato/core/providers/torrent/torrentleech/__init__.py b/couchpotato/core/providers/torrent/torrentleech/__init__.py
index 5d1de87..d96ac06 100644
--- a/couchpotato/core/providers/torrent/torrentleech/__init__.py
+++ b/couchpotato/core/providers/torrent/torrentleech/__init__.py
@@ -12,6 +12,7 @@ config = [{
             'list': 'torrent_providers',
             'name': 'TorrentLeech',
             'description': 'See <a href="http://torrentleech.org">TorrentLeech</a>',
+            'wizard': True,
             'options': [
                 {
                     'name': 'enabled',
diff --git a/couchpotato/static/scripts/page/settings.js b/couchpotato/static/scripts/page/settings.js
index a050b3f..ddb2abf 100644
--- a/couchpotato/static/scripts/page/settings.js
+++ b/couchpotato/static/scripts/page/settings.js
@@ -301,7 +301,7 @@ Page.Settings = new Class({
 	createList: function(content_container){
 		return new Element('div.option_list').grab(
 			new Element('h3', {
-				'text': 'Enable more providers'
+				'text': 'Enable another'
 			})
 		).inject(content_container)
 	}
diff --git a/couchpotato/static/style/page/settings.css b/couchpotato/static/style/page/settings.css
index b9c9ea4..8d0b0f2 100644
--- a/couchpotato/static/style/page/settings.css
+++ b/couchpotato/static/style/page/settings.css
@@ -163,6 +163,7 @@
 	
 		.page .option_list .enabler {
 			padding: 0;
+			margin-left: 5px !important;
 		}
 		
 			.page .option_list .enabler:not(.disabled) {