diff --git a/couchpotato/core/plugins/subtitle/__init__.py b/couchpotato/core/plugins/subtitle/__init__.py
index 858ce9d6..686d385e 100644
--- a/couchpotato/core/plugins/subtitle/__init__.py
+++ b/couchpotato/core/plugins/subtitle/__init__.py
@@ -8,9 +8,9 @@ config = [{
'groups': [
{
'tab': 'renamer',
- 'subtab': 'subtitles',
'name': 'subtitle',
- 'label': 'Download subtitles after rename',
+ 'label': 'Download subtitles',
+ 'description': 'after rename',
'options': [
{
'name': 'enabled',
diff --git a/couchpotato/core/plugins/trailer/__init__.py b/couchpotato/core/plugins/trailer/__init__.py
index 033df088..3ae454da 100644
--- a/couchpotato/core/plugins/trailer/__init__.py
+++ b/couchpotato/core/plugins/trailer/__init__.py
@@ -8,9 +8,9 @@ config = [{
'groups': [
{
'tab': 'renamer',
- 'subtab': 'trailer',
'name': 'trailer',
- 'label': 'Download trailer after rename',
+ 'label': 'Download trailer',
+ 'description': 'after rename',
'options': [
{
'name': 'enabled',
diff --git a/couchpotato/core/providers/nzb/mysterbin/__init__.py b/couchpotato/core/providers/nzb/mysterbin/__init__.py
index 3f0d1d33..b34f72fc 100644
--- a/couchpotato/core/providers/nzb/mysterbin/__init__.py
+++ b/couchpotato/core/providers/nzb/mysterbin/__init__.py
@@ -8,7 +8,7 @@ config = [{
'groups': [
{
'tab': 'searcher',
- 'subtab': 'providers',
+ 'subtab': 'nzb_providers',
'name': 'Mysterbin',
'description': 'Free provider, less accurate. See Mysterbin',
'options': [
diff --git a/couchpotato/core/providers/nzb/newzbin/__init__.py b/couchpotato/core/providers/nzb/newzbin/__init__.py
index 06b25486..11292339 100644
--- a/couchpotato/core/providers/nzb/newzbin/__init__.py
+++ b/couchpotato/core/providers/nzb/newzbin/__init__.py
@@ -8,7 +8,7 @@ config = [{
'groups': [
{
'tab': 'searcher',
- 'subtab': 'providers',
+ 'subtab': 'nzb_providers',
'name': 'newzbin',
'description': 'See Newzbin',
'wizard': True,
diff --git a/couchpotato/core/providers/nzb/newznab/__init__.py b/couchpotato/core/providers/nzb/newznab/__init__.py
index e54db343..712f03e5 100644
--- a/couchpotato/core/providers/nzb/newznab/__init__.py
+++ b/couchpotato/core/providers/nzb/newznab/__init__.py
@@ -8,8 +8,9 @@ config = [{
'groups': [
{
'tab': 'searcher',
- 'subtab': 'providers',
+ 'subtab': 'nzb_providers',
'name': 'newznab',
+ 'order': 10,
'description': 'Enable multiple NewzNab providers such as NZB.su and nzbs.org',
'wizard': True,
'options': [
diff --git a/couchpotato/core/providers/nzb/nzbclub/__init__.py b/couchpotato/core/providers/nzb/nzbclub/__init__.py
index e3387a3e..fc7b7ef2 100644
--- a/couchpotato/core/providers/nzb/nzbclub/__init__.py
+++ b/couchpotato/core/providers/nzb/nzbclub/__init__.py
@@ -8,7 +8,7 @@ config = [{
'groups': [
{
'tab': 'searcher',
- 'subtab': 'providers',
+ 'subtab': 'nzb_providers',
'name': 'NZBClub',
'description': 'Free provider, less accurate. See NZBClub',
'options': [
diff --git a/couchpotato/core/providers/nzb/nzbindex/__init__.py b/couchpotato/core/providers/nzb/nzbindex/__init__.py
index 59b2730d..5bf5cd4d 100644
--- a/couchpotato/core/providers/nzb/nzbindex/__init__.py
+++ b/couchpotato/core/providers/nzb/nzbindex/__init__.py
@@ -8,7 +8,7 @@ config = [{
'groups': [
{
'tab': 'searcher',
- 'subtab': 'providers',
+ 'subtab': 'nzb_providers',
'name': 'nzbindex',
'description': 'Free provider, less accurate. See NZBIndex',
'options': [
diff --git a/couchpotato/core/providers/nzb/nzbmatrix/__init__.py b/couchpotato/core/providers/nzb/nzbmatrix/__init__.py
index 8fc6b408..c3a5bfaa 100644
--- a/couchpotato/core/providers/nzb/nzbmatrix/__init__.py
+++ b/couchpotato/core/providers/nzb/nzbmatrix/__init__.py
@@ -8,7 +8,7 @@ config = [{
'groups': [
{
'tab': 'searcher',
- 'subtab': 'providers',
+ 'subtab': 'nzb_providers',
'name': 'nzbmatrix',
'label': 'NZBMatrix',
'description': 'See NZBMatrix',
diff --git a/couchpotato/core/providers/nzb/nzbsrus/__init__.py b/couchpotato/core/providers/nzb/nzbsrus/__init__.py
index 70f3e3f0..cd4d6691 100644
--- a/couchpotato/core/providers/nzb/nzbsrus/__init__.py
+++ b/couchpotato/core/providers/nzb/nzbsrus/__init__.py
@@ -8,7 +8,7 @@ config = [{
'groups': [
{
'tab': 'searcher',
- 'subtab': 'providers',
+ 'subtab': 'nzb_providers',
'name': 'nzbsrus',
'label': 'Nzbsrus',
'description': 'See NZBsRus',
diff --git a/couchpotato/core/providers/torrent/kickasstorrents/__init__.py b/couchpotato/core/providers/torrent/kickasstorrents/__init__.py
index 9f0ab122..ffa3934c 100644
--- a/couchpotato/core/providers/torrent/kickasstorrents/__init__.py
+++ b/couchpotato/core/providers/torrent/kickasstorrents/__init__.py
@@ -8,7 +8,7 @@ config = [{
'groups': [
{
'tab': 'searcher',
- 'subtab': 'providers',
+ 'subtab': 'torrent_providers',
'name': 'KickAssTorrents',
'description': 'See KickAssTorrents',
'wizard': True,
diff --git a/couchpotato/core/providers/torrent/passthepopcorn/__init__.py b/couchpotato/core/providers/torrent/passthepopcorn/__init__.py
index 67bf6665..44d98cb7 100644
--- a/couchpotato/core/providers/torrent/passthepopcorn/__init__.py
+++ b/couchpotato/core/providers/torrent/passthepopcorn/__init__.py
@@ -5,32 +5,34 @@ def start():
config = [{
'name': 'passthepopcorn',
- 'groups': [{
- 'tab': 'searcher',
- 'subtab': 'providers',
- 'name': 'PassThePopcorn',
- 'description': 'See PassThePopcorn.me',
- 'options': [
- {
- 'name': 'enabled',
- 'type': 'enabler',
- 'default': False
- },
- {
- 'name': 'domain',
- 'advanced': True,
- 'label': 'Proxy server',
- 'description': 'Domain for requests (HTTPS only!), keep empty to use default (tls.passthepopcorn.me).',
- },
- {
- 'name': 'username',
- 'default': '',
- },
- {
- 'name': 'password',
- 'default': '',
- 'type': 'password',
- }
- ],
- }]
+ 'groups': [
+ {
+ 'tab': 'searcher',
+ 'subtab': 'torrent_providers',
+ 'name': 'PassThePopcorn',
+ 'description': 'See PassThePopcorn.me',
+ 'options': [
+ {
+ 'name': 'enabled',
+ 'type': 'enabler',
+ 'default': False
+ },
+ {
+ 'name': 'domain',
+ 'advanced': True,
+ 'label': 'Proxy server',
+ 'description': 'Domain for requests (HTTPS only!), keep empty to use default (tls.passthepopcorn.me).',
+ },
+ {
+ 'name': 'username',
+ 'default': '',
+ },
+ {
+ 'name': 'password',
+ 'default': '',
+ 'type': 'password',
+ }
+ ],
+}
+ ]
}]
diff --git a/couchpotato/core/providers/torrent/publichd/__init__.py b/couchpotato/core/providers/torrent/publichd/__init__.py
index 94d0825e..edffeba8 100644
--- a/couchpotato/core/providers/torrent/publichd/__init__.py
+++ b/couchpotato/core/providers/torrent/publichd/__init__.py
@@ -8,7 +8,7 @@ config = [{
'groups': [
{
'tab': 'searcher',
- 'subtab': 'providers',
+ 'subtab': 'torrent_providers',
'name': 'PublicHD',
'description': 'Public Torrent site with only HD content. See PublicHD',
'options': [
diff --git a/couchpotato/core/providers/torrent/sceneaccess/__init__.py b/couchpotato/core/providers/torrent/sceneaccess/__init__.py
index 28b7ca33..e59f89b1 100644
--- a/couchpotato/core/providers/torrent/sceneaccess/__init__.py
+++ b/couchpotato/core/providers/torrent/sceneaccess/__init__.py
@@ -8,7 +8,7 @@ config = [{
'groups': [
{
'tab': 'searcher',
- 'subtab': 'providers',
+ 'subtab': 'torrent_providers',
'name': 'SceneAccess',
'description': 'See SceneAccess',
'options': [
diff --git a/couchpotato/core/providers/torrent/scenehd/__init__.py b/couchpotato/core/providers/torrent/scenehd/__init__.py
index c9f18be8..a3d03130 100644
--- a/couchpotato/core/providers/torrent/scenehd/__init__.py
+++ b/couchpotato/core/providers/torrent/scenehd/__init__.py
@@ -8,7 +8,7 @@ config = [{
'groups': [
{
'tab': 'searcher',
- 'subtab': 'providers',
+ 'subtab': 'torrent_providers',
'name': 'SceneHD',
'description': 'See SceneHD',
'options': [
diff --git a/couchpotato/core/providers/torrent/thepiratebay/__init__.py b/couchpotato/core/providers/torrent/thepiratebay/__init__.py
index 9a7beef5..9c56eb8f 100644
--- a/couchpotato/core/providers/torrent/thepiratebay/__init__.py
+++ b/couchpotato/core/providers/torrent/thepiratebay/__init__.py
@@ -5,24 +5,26 @@ def start():
config = [{
'name': 'thepiratebay',
- 'groups': [{
- 'tab': 'searcher',
- 'subtab': 'providers',
- 'name': 'ThePirateBay',
- 'description': 'The world\'s largest bittorrent tracker. See ThePirateBay',
- 'wizard': True,
- 'options': [
- {
- 'name': 'enabled',
- 'type': 'enabler',
- 'default': False
- },
- {
- 'name': 'domain',
- 'advanced': True,
- 'label': 'Proxy server',
- 'description': 'Domain for requests, keep empty to let CouchPotato pick.',
- }
- ],
- }]
+ 'groups': [
+ {
+ 'tab': 'searcher',
+ 'subtab': 'torrent_providers',
+ 'name': 'ThePirateBay',
+ 'description': 'The world\'s largest bittorrent tracker. See ThePirateBay',
+ 'wizard': True,
+ 'options': [
+ {
+ 'name': 'enabled',
+ 'type': 'enabler',
+ 'default': False
+ },
+ {
+ 'name': 'domain',
+ 'advanced': True,
+ 'label': 'Proxy server',
+ 'description': 'Domain for requests, keep empty to let CouchPotato pick.',
+ }
+ ],
+ }
+ ]
}]
diff --git a/couchpotato/core/providers/torrent/torrentleech/__init__.py b/couchpotato/core/providers/torrent/torrentleech/__init__.py
index 482dfda7..b808a005 100644
--- a/couchpotato/core/providers/torrent/torrentleech/__init__.py
+++ b/couchpotato/core/providers/torrent/torrentleech/__init__.py
@@ -8,7 +8,7 @@ config = [{
'groups': [
{
'tab': 'searcher',
- 'subtab': 'providers',
+ 'subtab': 'torrent_providers',
'name': 'TorrentLeech',
'description': 'See TorrentLeech',
'options': [
diff --git a/couchpotato/static/scripts/page/settings.js b/couchpotato/static/scripts/page/settings.js
index 161da685..f4afc84d 100644
--- a/couchpotato/static/scripts/page/settings.js
+++ b/couchpotato/static/scripts/page/settings.js
@@ -244,7 +244,7 @@ Page.Settings = new Class({
if(!parent_tab.subtabs_el)
parent_tab.subtabs_el = new Element('ul.subtabs').inject(parent_tab.tab);
- var label = tab.label || (tab.name || tab_name).capitalize()
+ var label = tab.label || (tab.name || tab_name.replace('_', ' ')).capitalize()
var tab_el = new Element('li.t_'+tab_name).adopt(
new Element('a', {
'href': App.createUrl(self.name+'/'+parent_tab_name+'/'+tab_name),