dockeruser
/
CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Working delete button

pull/5180/head
Ruud 10 years ago
parent
82a1cb5ded
commit
1731789e18
3 changed files with 79 additions and 120 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 77
      couchpotato/core/media/movie/_base/static/movie.actions.js
  2. 9
      couchpotato/core/media/movie/_base/static/movie.js
  3. 55
      couchpotato/static/style/combined.min.css

77
couchpotato/core/media/movie/_base/static/movie.actions.js
View File

@ -59,7 +59,7 @@ var MovieAction = new Class({
var self = this;
try {
return self.movie.getTitle();
return self.movie.getTitle(true);
}
catch(e){
try {
@ -854,81 +854,70 @@ MA.Delete = new Class({
create: function(){
var self = this;
self.el = new Element('a.delete', {
self.button = self.createButton();
self.detail_button = self.createButton();
},
createButton: function(){
var self = this;
return new Element('a.delete', {
'text': 'Delete',
'title': 'Remove the movie from this CP list',
'events': {
'click': self.showConfirm.bind(self)
}
});
},
showConfirm: function(e){
var self = this;
(e).preventDefault();
if(!self.delete_container){
self.delete_container = new Element('div.buttons.delete_container').adopt(
new Element('a.cancel', {
'text': 'Cancel',
self.question = new Question('Are you sure you want to delete <strong>' + self.getTitle() + '</strong>?', '', [{
'text': 'Yes, delete '+self.getTitle(),
'class': 'delete',
'events': {
'click': self.hideConfirm.bind(self)
}
}),
new Element('span.or', {
'text': 'or'
}),
new Element('a.button.delete', {
'text': 'Delete ' + self.movie.title.get('text'),
'events': {
'click': self.del.bind(self)
'click': function(e){
e.target.set('text', 'Deleting...');
self.del();
}
})
).inject(self.movie, 'top');
}
}, {
'text': 'Cancel',
'cancel': true
}]);
self.movie.slide('in', self.delete_container);
},
hideConfirm: function(e){
var self = this;
(e).preventDefault();
self.movie.removeView();
self.movie.slide('out');
},
del: function(e){
(e).preventDefault();
del: function(){
var self = this;
var movie = $(self.movie);
self.chain(
function(){
self.callChain();
},
function(){
Api.request('media.delete', {
'data': {
'id': self.movie.get('_id'),
'delete_from': self.movie.list.options.identifier
},
'onComplete': function(){
movie.set('tween', {
'duration': 300,
'onComplete': function(){
if(self.question)
self.question.close();
dynamics.animate(movie, {
opacity: 0,
scale: 0
}, {
type: dynamics.bezier,
points: [{'x':0,'y':0,'cp':[{'x':0.876,'y':0}]},{'x':1,'y':1,'cp':[{'x':0.145,'y':1}]}],
duration: 400,
complete: function(){
self.movie.destroy();
}
});
movie.tween('height', 0);
}
});
}
);
self.callChain();
}

9
couchpotato/core/media/movie/_base/static/movie.js
View File

@ -184,6 +184,9 @@ var Movie = new Class({
self.list.checkIfEmpty();
if(self.details)
self.details.close();
// Remove events
Object.each(self.global_events, function(handle, listener){
App.off(listener, handle);
@ -367,13 +370,13 @@ var Movie = new Class({
},
getTitle: function(){
getTitle: function(prefixed){
var self = this;
if(self.data.title)
return self.getUnprefixedTitle(self.data.title);
return prefixed ? self.data.title : self.getUnprefixedTitle(self.data.title);
else if(self.data.info && self.data.info.titles && self.data.info.titles.length > 0)
return self.getUnprefixedTitle(self.data.info.titles[0]);
return prefixed ? self.data.info.titles[0] : self.getUnprefixedTitle(self.data.info.titles[0]);
return 'Unknown movie';
},

55
couchpotato/static/style/combined.min.css
View File

@ -1,4 +1,4 @@
.movies>.description a:hover,.page.movie_details .releases .buttons a:hover,.page.settings fieldset h2 .hint a{text-decoration:underline}
.movies>.description a:hover,.page.movie_details .releases .buttons a:hover{text-decoration:underline}
.search_form{display:inline-block;z-index:11;width:44px;position:relative}
.search_form .icon-search{position:absolute;z-index:2;top:50%;left:0;height:100%;text-align:center;color:#FFF;font-size:20px;-webkit-transform:translateY(-50%);transform:translateY(-50%)}
.search_form .wrapper{position:absolute;left:44px;bottom:0;background:#ac0000;border-radius:3px 0 0 3px;display:none;box-shadow:0 0 15px 2px rgba(0,0,0,.15)}
@ -286,17 +286,15 @@
.charts .chart .media_result .chart_number{color:#fff;position:absolute;top:0;padding:10px;font:700 2em/1em Helvetica,Sans-Serif;width:50px;height:100%;text-align:center;border-left:8px solid transparent}
.charts .chart .media_result.chart_in_wanted .chart_number{border-color:rgba(0,255,40,.3)}
.charts .chart .media_result.chart_in_library .chart_number{border-color:rgba(0,202,32,.3)}
.page.wizard .tabs li:hover a,.toggle_menu a:hover{border-color:#047792}
.charts .chart .media_result .actions{position:absolute;top:10px;right:10px;display:none;width:90px}
.charts .chart .media_result:hover .actions{display:block}
.charts .chart .media_result:hover h2 .title{opacity:0}
.charts .chart .media_result .data.open .actions{display:none}
.charts .chart .media_result .actions a{margin-left:10px;vertical-align:middle}
.toggle_menu{height:50px}
.toggle_menu a{display:block;width:50%;float:left;color:rgba(255,255,255,.6);border-bottom:1px solid rgba(255,255,255,.0666667)}
.toggle_menu a:hover{border-width:4px;color:#fff}
.toggle_menu a{display:block;width:50%;float:left;color:rgba(255,255,255,.6);border-bottom:1px solid rgba(255,255,255,.06667)}
.toggle_menu a:hover{border-color:#047792;border-width:4px;color:#fff}
.toggle_menu a.active{border-bottom:4px solid #04bce6;color:#fff}
#category_ordering li,#profile_ordering li,.add_new_profile{border-bottom:1px solid #eaeaea}
.toggle_menu a:last-child{float:right}
.toggle_menu h2{height:40px}
@media all and (max-width:480px){.toggle_menu h2{font-size:16px;text-align:center;height:30px}
@ -309,7 +307,6 @@
@media all and (max-width:600px){.suggestions .media_result{width:100%}
}
.suggestions .media_result .data{left:100px;background:#4e5969;border:none}
#category_ordering li:last-child,#profile_ordering li:last-child,.api_docs .api .params tr:last-child td,.api_docs .api .params tr:last-child th{border:0}
.suggestions .media_result .data .info{top:10px;left:15px;right:15px;bottom:10px;overflow:hidden}
.suggestions .media_result .data .info h2{white-space:normal;max-height:120px;font-size:18px;line-height:18px}
.suggestions .media_result .data .info .genres,.suggestions .media_result .data .info .rating,.suggestions .media_result .data .info .year{position:static;display:block;padding:0;opacity:.6}
@ -339,7 +336,8 @@
.category .formHint{opacity:.1}
.category:hover .formHint{opacity:1}
#category_ordering ul{float:left;margin:0;width:275px;padding:0}
#category_ordering li{cursor:-webkit-grab;cursor:grab;padding:5px;list-style:none}
#category_ordering li{cursor:-webkit-grab;cursor:grab;border-bottom:1px solid #eaeaea;padding:5px;list-style:none}
#category_ordering li:last-child{border:0}
#category_ordering li .check{margin:2px 10px 0 0;vertical-align:top}
#category_ordering li>span{display:inline-block;height:20px;vertical-align:top;line-height:20px}
#category_ordering li .handle{width:20px;float:right}
@ -367,7 +365,7 @@
.report_popup.report_popup .bug{width:80%;height:80%;max-height:800px;max-width:800px;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:column nowrap;-ms-flex-flow:column nowrap;flex-flow:column nowrap}
.report_popup.report_popup .bug textarea{display:block;width:100%;background:#FFF;padding:20px;overflow:auto;color:#666;height:70%;font-size:12px}
.do_report.do_report{z-index:10000;position:absolute;padding:10px;background:#ac0000;color:#FFF}
.add_new_profile{padding:20px;display:block;text-align:center;font-size:20px}
.add_new_profile{padding:20px;display:block;text-align:center;font-size:20px;border-bottom:1px solid #eaeaea}
.profile{margin-bottom:20px}
.profile .quality_label input{font-weight:700}
.profile .ctrlHolder .types{-webkit-flex:1 1 auto;-ms-flex:1 1 auto;flex:1 1 auto;min-width:360px}
@ -384,8 +382,9 @@
.profile .ctrlHolder.wait_for.wait_for .advanced{display:none;color:#ac0000}
.show_advanced .profile .ctrlHolder.wait_for.wait_for .advanced{display:inline}
#profile_ordering ul{list-style:none;margin:0;width:275px;padding:0}
#profile_ordering li{padding:5px;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-ms-flex-align:center;align-items:center}
#profile_ordering li{border-bottom:1px solid #eaeaea;padding:5px;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-ms-flex-align:center;align-items:center}
#profile_ordering li:hover{background:#eaeaea}
#profile_ordering li:last-child{border:0}
#profile_ordering li input[type=checkbox]{margin:2px 10px 0 0;vertical-align:top}
#profile_ordering li>span{display:inline-block;height:20px;vertical-align:top;line-height:20px}
#profile_ordering li>span.profile_label{-webkit-flex:1 1 auto;-ms-flex:1 1 auto;flex:1 1 auto}
@ -409,6 +408,7 @@
.page.wizard .tab_wrapper .tabs{padding:0;margin:0 auto;display:block;height:100%;width:100%;max-width:960px}
.page.wizard .tabs li{display:inline-block;height:100%}
.page.wizard .tabs li a{padding:20px 10px;height:100%;display:block;color:#FFF;font-weight:400;border-bottom:4px solid transparent}
.page.wizard .tabs li:hover a{border-color:#047792}
.page.wizard .tabs li.done a{border-color:#04bce6}
.page.wizard .tab_wrapper .pointer{border-right:10px solid transparent;border-left:10px solid transparent;border-top:10px solid #5c697b;display:block;position:absolute;top:44px}
.page.wizard .tab_content{margin:20px 0 160px}
@ -424,6 +424,7 @@
.api_docs .api .params{background:#fafafa;width:100%}
.api_docs .api .params h3{clear:both;float:left;width:100px}
.api_docs .api .params td,.api_docs .api .params th{padding:3px 5px;border-bottom:1px solid #eee}
.api_docs .api .params tr:last-child td,.api_docs .api .params tr:last-child th{border:0}
.api_docs .api .params .param{vertical-align:top}
.api_docs .api .params .param th{text-align:left;width:100px}
.api_docs .api .params .param .type{font-style:italic;margin-right:10px;width:100px;color:#666}
@ -441,13 +442,6 @@
.api_docs .database table ._rev,.api_docs .database table ._t{width:60px}
.api_docs .database table .form,.api_docs .database table form{width:600px}
.api_docs .database table textarea{font-size:12px;width:100%;height:200px}
@font-face{font-family:icons;src:url(../fonts/icons.eot?74719538);src:url(../fonts/icons.eot?74719538#iefix)format("embedded-opentype"),url(../fonts/icons.woff?74719538)format("woff"),url(../fonts/icons.ttf?74719538)format("truetype"),url(../fonts/icons.svg?74719538#icons)format("svg");font-weight:400;font-style:normal}
@font-face{font-family:OpenSans;src:url(../fonts/OpenSans-Light-webfont.eot);src:url(../fonts/OpenSans-Light-webfont.eot?#iefix)format("embedded-opentype"),url(../fonts/OpenSans-Light-webfont.woff)format("woff"),url(../fonts/OpenSans-Light-webfont.ttf)format("truetype"),url(../fonts/OpenSans-Light-webfont.svg#OpenSansRegular)format("svg");font-weight:200;font-style:normal}
@font-face{font-family:OpenSans;src:url(../fonts/OpenSans-Regular-webfont.eot);src:url(../fonts/OpenSans-Regular-webfont.eot?#iefix)format("embedded-opentype"),url(../fonts/OpenSans-Regular-webfont.woff)format("woff"),url(../fonts/OpenSans-Regular-webfont.ttf)format("truetype"),url(../fonts/OpenSans-Regular-webfont.svg#OpenSansRegular)format("svg");font-weight:400;font-style:normal}
@font-face{font-family:OpenSans;src:url(../fonts/OpenSans-Italic-webfont.eot);src:url(../fonts/OpenSans-Italic-webfont.eot?#iefix)format("embedded-opentype"),url(../fonts/OpenSans-Italic-webfont.woff)format("woff"),url(../fonts/OpenSans-Italic-webfont.ttf)format("truetype"),url(../fonts/OpenSans-Italic-webfont.svg#OpenSansItalic)format("svg");font-weight:400;font-style:italic}
@font-face{font-family:OpenSans;src:url(../fonts/OpenSans-Bold-webfont.eot);src:url(../fonts/OpenSans-Bold-webfont.eot?#iefix)format("embedded-opentype"),url(../fonts/OpenSans-Bold-webfont.woff)format("woff"),url(../fonts/OpenSans-Bold-webfont.ttf)format("truetype"),url(../fonts/OpenSans-Bold-webfont.svg#OpenSansBold)format("svg");font-weight:700;font-style:normal}
@font-face{font-family:OpenSans;src:url(../fonts/OpenSans-BoldItalic-webfont.eot);src:url(../fonts/OpenSans-BoldItalic-webfont.eot?#iefix)format("embedded-opentype"),url(../fonts/OpenSans-BoldItalic-webfont.woff)format("woff"),url(../fonts/OpenSans-BoldItalic-webfont.ttf)format("truetype"),url(../fonts/OpenSans-BoldItalic-webfont.svg#OpenSansBoldItalic)format("svg");font-weight:700;font-style:italic}
@font-face{font-family:Lobster;src:url(../fonts/Lobster-webfont.eot);src:url(../fonts/Lobster-webfont.eot?#iefix)format("embedded-opentype"),url(../fonts/Lobster-webfont.woff2)format("woff2"),url(../fonts/Lobster-webfont.woff)format("woff"),url(../fonts/Lobster-webfont.ttf)format("truetype"),url(../fonts/Lobster-webfont.svg#lobster_14regular)format("svg");font-weight:400;font-style:normal}
.page.login{background:#ac0000}
.page.login h1{padding:0 0 10px;font-size:60px;font-family:Lobster;font-weight:400;color:#FFF;text-align:center}
.page.login form{padding:0;height:300px;width:400px;position:fixed;left:50%;top:50%;margin:-200px 0 0 -200px}
@ -647,7 +641,7 @@ input,select,textarea{font-size:1em;font-weight:300;padding:6.67px;background:#F
@media (max-width:480px){.page.settings fieldset h2{display:block}
.page.settings fieldset h2 .hint{margin:0;display:block}
}
.page.settings fieldset h2 .hint a{font-weight:400;color:#ac0000}
.page.settings fieldset h2 .hint a{font-weight:400;color:#ac0000;text-decoration:underline}
.page.settings fieldset .ctrlHolder{padding:6.67px 20px;border-bottom:1px solid #eaeaea;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row nowrap;-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-align-items:center;-ms-flex-align:center;align-items:center}
.page.settings fieldset .ctrlHolder:last-child{border-bottom:0}
.page.settings fieldset .ctrlHolder label{display:inline-block;min-width:150px}
@ -744,30 +738,3 @@ input,select,textarea{font-size:1em;font-weight:300;padding:6.67px;background:#F
.page.settings .directory_list .actions:last-child>.clear{left:20px;position:absolute;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%);margin:0}
.page.settings .directory_list .actions:last-child>.cancel{color:rgba(0,0,0,.4)}
.page.settings .directory_list .actions:last-child>.save{margin-right:0}
.uniForm legend{font-weight:700;font-size:100%;margin:0;padding:1.5em 0}
.uniForm .ctrlHolder{padding:1em;border-bottom:1px solid #efefef}
.uniForm .ctrlHolder.focused{background:#fffcdf}
.uniForm .buttonHolder{background:#efefef;text-align:right;margin:1.5em 0 0;padding:1.5em;border-radius:4px}
.uniForm .buttonHolder .primaryAction{padding:10px 22px;line-height:1;background:#254a86;border:1px solid #163362;font-size:12px;font-weight:700;color:#fff;border-radius:4px;box-shadow:1px 1px 0 #fff;text-shadow:-1px -1px 0 rgba(0,0,0,.25)}
.uniForm .buttonHolder .primaryAction:active{position:relative;top:1px}
.uniForm .secondaryAction{text-align:left}
.uniForm button.secondaryAction{background:0 0;border:none;color:#777;margin:1.25em 0 0;padding:0}
.uniForm .inlineLabels .label em,.uniForm .inlineLabels label em{font-style:normal;font-weight:700}
.uniForm label small{font-size:.75em;color:#777}
.uniForm .textInput,.uniForm textarea{padding:4px 2px;border:1px solid #aaa;background:#fff}
.uniForm textarea{height:12em}
.uniForm ul li label{font-size:.85em}
.uniForm .ctrlHolder .textInput:focus,.uniForm .ctrlHolder textarea:focus{outline:0}
.uniForm .formHint{font-size:.85em;color:#777}
.uniForm .inlineLabels .formHint{padding-top:.5em}
.uniForm .ctrlHolder.focused .formHint{color:#333}
.uniForm #errorMsg{background:#ffdfdf;border:1px solid #f3afb5;margin:0 0 1.5em;padding:0 1.5em;border-radius:4px;-webkit-border-radius:4px;-moz-border-radius:4px}
.uniForm #errorMsg ol{margin:0 0 1.5em;padding:0}
.uniForm #errorMsg ol li{margin:0 0 3px 1.5em;padding:7px;background:#f6bec1;position:relative;font-size:.85em;border-radius:4px;-webkit-border-radius:4px;-moz-border-radius:4px}
.uniForm .ctrlHolder.error,.uniForm .ctrlHolder.focused.error{background:#ffdfdf;border:1px solid #f3afb5;border-radius:4px;-webkit-border-radius:4px;-moz-border-radius:4px}
.uniForm .ctrlHolder.error input.error,.uniForm .ctrlHolder.error select.error,.uniForm .ctrlHolder.error textarea.error{color:#af4c4c;margin:0 0 6px;padding:4px}
.uniForm #okMsg{background:#c8ffbf;border:1px solid #a2ef95;margin:0 0 1.5em;padding:0 1.5em;text-align:center;border-radius:4px;-webkit-border-radius:4px;-moz-border-radius:4px}
.uniForm #OKMsg p{margin:0}
.uniForm .col{margin-bottom:1.5em}
.uniForm .col.first{width:49%;float:left;clear:none}
.uniForm .col.last{width:49%;float:right;clear:none;margin-right:0}
Write Preview
Loading…
Cancel
Save