dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reordering of settings

Browse Source
This commit is contained in:
Ruud
2012-03-04 23:26:36 +01:00
parent ca67370b44
commit f160bfe779
36 changed files with 370 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/plugins/automation/__init__.py
+1
View File
@@ -5,6 +5,7 @@ def start():
config = [{
'name': 'automation',
'order': 30,
'groups': [
{
'tab': 'automation',
couchpotato/core/plugins/manage/__init__.py
+1 -2
View File
@@ -7,10 +7,9 @@ config = [{
'name': 'manage',
'groups': [
{
'tab': 'renamer',
'tab': 'manage',
'label': 'movie library manager',
'description': 'Add your existing movie folders.',
'wizard': True,
'options': [
{
'name': 'enabled',
couchpotato/core/plugins/movie/static/list.js
+1 -1
View File
@@ -116,7 +116,7 @@ var MovieList = new Class({
'change': self.search.bind(self)
}
}),
self.navigation_menu = new Element('div.menu').adopt(
self.navigation_menu = new Element('div.more_menu').adopt(
self.navigation_menu_ul = new Element('ul'),
self.navigation_menu_toggle = new Element('a.button.onlay', {
'events': {
couchpotato/core/plugins/movie/static/movie.css
+7 -59
View File
@@ -315,7 +315,7 @@
z-index: 2;
top: 0;
padding: 100px 60px 7px;
width: 1082px;
width: 1080px;
margin: 0 -60px;
box-shadow: 0 20px 20px -22px rgba(0,0,0,0.1);
}
@@ -326,7 +326,7 @@
background: #4e5969;
}
.movies .alph_nav ul {
.movies .alph_nav ul.numbers, .movies .alph_nav ul.actions {
list-style: none;
padding: 0 0 1px;
margin: 0;
@@ -334,7 +334,7 @@
user-select: none;
}
.movies .alph_nav li {
.movies .alph_nav .numbers li, .movies .alph_nav .actions li {
display: inline-block;
vertical-align: top;
width: 22px;
@@ -452,63 +452,11 @@
margin: 0 10px 0 0;
}
.movies .alph_nav .menu {
.movies .alph_nav .more_menu {
float: right;
}
.movies .alph_nav .menu > a {
display: block;
background: url('../images/sprite.png') no-repeat center -137px;
height: 25px;
width: 25px;
border: 1px solid rgba(0,0,0,0.3);
.movies .alph_nav .more_menu > a {
background-position: center -157px;
}
.movies .alph_nav .menu ul:before {
content: ' ';
height: 0;
position: absolute;
width: 0;
border: 6px solid transparent;
border-bottom-color: rgba(0,0,0,0.8);
margin: -16px 0 0 147px;
}
.movies .alph_nav .menu ul {
display: none;
border: 1px solid #333;
background: rgba(0,0,0,0.8);
border-radius: 3px;
padding: 4px;
position: absolute;
z-index: 9;
margin: 32px 0 0 -145px;
width: 185px;
box-shadow: 0 10px 20px -10px rgba(0,0,0,0.4);
}
.movies .alph_nav .menu ul.show {
display: block;
}
.movies .alph_nav .menu ul li {
width: 100%;
height: auto;
}
.movies .alph_nav .menu ul li a {
display: block;
border-bottom: 1px solid rgba(255,255,255,0.2);
padding: 0 10px;
box-shadow: none;
font-weight: normal;
font-size: 11px;
text-transform: uppercase;
letter-spacing: 1px;
}
.movies .alph_nav .menu ul li:last-child a {
border: none;
color: #fff;
}
.movies .alph_nav .menu ul li a:hover {
background: rgba(255,255,255,0.1);
}
couchpotato/core/plugins/quality/static/quality.js
+2 -2
View File
@@ -39,10 +39,10 @@ var QualityBase = new Class({
self.settings = App.getPage('Settings')
self.settings.addEvent('create', function(){
var tab = self.settings.createTab('profile', {
var tab = self.settings.createSubTab('profile', {
'label': 'Quality',
'name': 'profile'
});
}, self.settings.tabs.searcher ,'searcher');
self.tab = tab.tab;
self.content = tab.content;
couchpotato/core/plugins/renamer/__init__.py
+1
View File
@@ -24,6 +24,7 @@ rename_options = {
config = [{
'name': 'renamer',
'order': 40,
'description': 'Move and rename your downloaded movies to your movie directory.',
'groups': [
{
couchpotato/core/plugins/searcher/__init__.py
+1
View File
@@ -6,6 +6,7 @@ def start():
config = [{
'name': 'searcher',
'order': 20,
'groups': [
{
'tab': 'searcher',
couchpotato/core/plugins/subtitle/__init__.py
+2
View File
@@ -8,7 +8,9 @@ config = [{
'groups': [
{
'tab': 'renamer',
'subtab': 'subtitles',
'name': 'subtitle',
'label': 'Download subtitles after rename',
'options': [
{
'name': 'enabled',
couchpotato/core/plugins/trailer/__init__.py
+3 -1
View File
@@ -7,8 +7,10 @@ config = [{
'name': 'trailer',
'groups': [
{
'tab': 'metadata',
'tab': 'renamer',
'subtab': 'trailer',
'name': 'trailer',
'label': 'Download trailer after rename',
'options': [
{
'name': 'enabled',
couchpotato/core/plugins/userscript/static/userscript.js
+9 -25
View File
@@ -62,34 +62,18 @@ var UserscriptSettingTab = new Class({
self.settings = App.getPage('Settings')
self.settings.addEvent('create', function(){
var tab = self.settings.createTab('userscript', {
'label': 'Userscript',
'name': 'userscript'
});
self.tab = tab.tab;
self.content = tab.content;
self.createUserscript();
self.settings.createGroup({
'label': 'Install the Userscript'
}).inject(self.settings.tabs.automation.content, 'top').adopt(
new Element('a', {
'text': 'Install userscript',
'href': Api.createUrl('userscript.get')+'couchpotato.user.js',
'target': '_self'
})
);
});
},
createUserscript: function(){
var self = this;
self.settings.createGroup({
'label': 'Install the Userscript'
}).inject(self.content).adopt(
new Element('a', {
'text': 'Install userscript',
'href': Api.createUrl('userscript.get')+'couchpotato.user.js',
'target': '_self'
})
);
}
});
couchpotato/core/plugins/wizard/static/wizard.js
+10 -3
View File
@@ -29,7 +29,7 @@ Page.Wizard = new Class({
},
'finish': {
'title': 'Finish Up',
'description': 'Are you done? Did you fill in everything or as much as possible? Yes, ok gogogo!',
'description': 'Are you done? Did you fill in everything as much as possible? Yes, ok gogogo!',
'content': new Element('div').adopt(
new Element('a.button.green', {
'text': 'I\'m ready to start the awesomeness, wow this button is big and green!',
@@ -115,7 +115,14 @@ Page.Wizard = new Class({
if(tab_navigation && group_container){
tab_navigation.inject(tabs); // Tab navigation
self.el.getElement('.tab_'+group).inject(group_container); // Tab content
if(self.headers[group]) tab_navigation.getElement('a').set('text', (self.headers[group].label || group).capitalize());
if(self.headers[group]){
var a = tab_navigation.getElement('a');
a.set('text', (self.headers[group].label || group).capitalize());
var url_split = a.get('href').split('wizard')[1].split('/');
if(url_split.length > 3)
a.set('href', a.get('href').replace(url_split[url_split.length-3]+'/', ''));
}
}
else {
new Element('li.t_'+group).adopt(
@@ -161,7 +168,7 @@ Page.Wizard = new Class({
if(nr == 0)
func();
var ss = new ScrollSpy( {
min: function(){
var c = g.getCoordinates();