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

Merge branch 'refs/heads/develop'

Browse Source 
Conflicts:
	couchpotato/static/style/main.css
This commit is contained in:
Ruud
2013-09-11 09:11:04 +02:00
parent 55d57bc07b 25693d44eb
commit 4fd1d986dd
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
couchpotato/core/downloaders/nzbget/main.py
View File

@@ -142,7 +142,7 @@ class NZBGet(Downloader):
statuses.append({
'id': nzb_id,
'name': item['NZBFilename'],
'status': 'completed' if item['ParStatus'] == 'SUCCESS' and item['ScriptStatus'] == 'SUCCESS' else 'failed',
'status': 'completed' if item['ParStatus'] in ['SUCCESS','NONE'] and item['ScriptStatus'] in ['SUCCESS','NONE'] else 'failed',
'original_status': item['ParStatus'] + ', ' + item['ScriptStatus'],
'timeleft': str(timedelta(seconds = 0)),
'folder': ss(item['DestDir'])
@@ -178,9 +178,10 @@ class NZBGet(Downloader):
path = None
for hist in history:
if hist['Parameters'] and hist['Parameters']['couchpotato'] and hist['Parameters']['couchpotato'] == item['id']:
nzb_id = hist['ID']
path = hist['DestDir']
for param in hist['Parameters']:
if param['Name'] == 'couchpotato' and param['Value'] == item['id']:
nzb_id = hist['ID']
path = hist['DestDir']
if nzb_id and path and rpc.editqueue('HistoryDelete', 0, "", [tryInt(nzb_id)]):
shutil.rmtree(path, True)

11
couchpotato/static/style/main.css
View File

@@ -128,6 +128,7 @@ body > .spinner, .mask{
border-radius: 2px;
cursor: pointer;
border: none;
-webkit-appearance: none;
}
.button.red { background-color: #ff0000; }
.button.green { background-color: #2aa300; }
@@ -200,14 +201,22 @@ body > .spinner, .mask{
top: -3px;
}
.icon2.menu:before {
content: "\e076 \e076 \e076";
content: "\e076\00a0 \e076\00a0 \e076\00a0";
line-height: 6px;
transform: scaleX(2);
width: 20px;
font-size: 10px;
display: inline-block;
vertical-align: middle;
word-wrap: break-word;
text-align:center;
margin-left: 5px;
}
@media screen and (-webkit-min-device-pixel-ratio:0) {
.icon2.menu:before {
margin-top: -7px;
}
}
/*** Navigation ***/
.header {