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

Merge branch 'develop'

pull/5327/head
Ruud 10 years ago
parent
48601a134d 3f866a36f5
commit
c3f88b2c3a
11 changed files with 113 additions and 52 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. 2
      couchpotato/core/media/movie/_base/static/list.js
  2. 15
      couchpotato/core/media/movie/_base/static/movie.js
  3. 23
      couchpotato/core/media/movie/_base/static/movie.scss
  4. 2
      couchpotato/core/media/movie/_base/static/page.js
  5. 48
      couchpotato/core/media/movie/providers/automation/imdb.py
  6. 3
      couchpotato/static/scripts/combined.base.min.js
  7. 17
      couchpotato/static/scripts/combined.plugins.min.js
  8. 5
      couchpotato/static/scripts/page/settings.js
  9. 31
      couchpotato/static/style/combined.min.css
  10. 4
      couchpotato/static/style/main.scss
  11. 15
      couchpotato/static/style/settings.scss

2
couchpotato/core/media/movie/_base/static/list.js
View File

@ -153,7 +153,7 @@ var MovieList = new Class({
if(!self.navigation_counter) return;
self.counter_count = count;
self.navigation_counter.set('text', (count || 0) + ' movies');
self.navigation_counter.set('text', count === 1 ? '1 movie' : (count || 0) + ' movies');
if (self.empty_message) {
self.empty_message.destroy();

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

@ -277,13 +277,14 @@ var Movie = new Class({
onClick: function(e){
var self = this;
if(e.target.getParents('.actions').length == 0 && e.target != self.select_checkbox){
if(e.target.getParents('.actions').length === 0 && e.target != self.select_checkbox){
(e).stopPropagation();
self.addActions();
self.openDetails();
}
},
onMouseenter: function(){
addActions: function(){
var self = this;
if(self.actions.length <= 0){
@ -298,10 +299,20 @@ var Movie = new Class({
self.actions.push(action);
});
}
},
onMouseenter: function(){
var self = this;
if(App.mobile_screen) return;
self.addActions();
if(self.list.current_view == 'thumb'){
self.el.addClass('hover_start');
setTimeout(function(){
self.el.removeClass('hover_start');
}, 300);
dynamics.css(self.el, {
scale: 1,
opacity: 1

23
couchpotato/core/media/movie/_base/static/movie.scss
View File

@ -6,6 +6,11 @@ $mass_edit_height: 44px;
bottom: auto;
z-index: 21;
height: $header_height;
background: $background_color;
.scroll_content {
display: none;
}
@include media-phablet {
height: $header_width_mobile;
@ -137,6 +142,16 @@ $mass_edit_height: 44px;
}
}
&.movies > h2 {
padding: 0 $padding;
line-height: $header_height;
@include media-phablet {
line-height: $header_width_mobile;
padding: 0 $padding/2;
}
}
> .description {
position: absolute;
top: 0;
@ -460,7 +475,8 @@ $mass_edit_height: 44px;
.actions {
background-image: linear-gradient(25deg, rgba($primary_color,0) 0%, rgba($primary_color,1) 80%);
transition: opacity 400ms;
opacity: 0;
opacity: 1;
visibility: hidden;
position: absolute;
top: 0;
right: 0;
@ -496,12 +512,17 @@ $mass_edit_height: 44px;
&:hover .actions {
opacity: 1;
visibility: visible;
@include media-phablet {
display: none;
}
}
&.hover_start .actions {
pointer-events: none;
}
.mask {
bottom: 44px;
border-radius: $border_radius;

2
couchpotato/core/media/movie/_base/static/page.js
View File

@ -13,7 +13,7 @@ Page.Movies = new Class({
self.parent(parent, options);
self.navigation = new BlockNavigation();
$(self.navigation).inject(self.content, 'top');
$(self.navigation).inject(self.el);
},

48
couchpotato/core/media/movie/providers/automation/imdb.py
View File

@ -26,6 +26,30 @@ class IMDBBase(Automation, RSS):
interval = 1800
charts = {
'theater': {
'order': 1,
'name': 'IMDB - Movies in Theaters',
'url': 'http://www.imdb.com/movies-in-theaters/',
},
'boxoffice': {
'order': 2,
'name': 'IMDB - Box Office',
'url': 'http://www.imdb.com/boxoffice/',
},
'rentals': {
'order': 3,
'name': 'IMDB - Top DVD rentals',
'url': 'http://www.imdb.com/boxoffice/rentals',
'type': 'json',
},
'top250': {
'order': 4,
'name': 'IMDB - Top 250 Movies',
'url': 'http://www.imdb.com/chart/top',
},
}
def getInfo(self, imdb_id):
return fireEvent('movie.info', identifier = imdb_id, extended = False, merge = True)
@ -154,30 +178,6 @@ class IMDBAutomation(IMDBBase):
class IMDBCharts(IMDBBase):
charts = {
'theater': {
'order': 1,
'name': 'IMDB - Movies in Theaters',
'url': 'http://www.imdb.com/movies-in-theaters/',
},
'boxoffice': {
'order': 2,
'name': 'IMDB - Box Office',
'url': 'http://www.imdb.com/boxoffice/',
},
'rentals': {
'order': 3,
'name': 'IMDB - Top DVD rentals',
'url': 'http://www.imdb.com/boxoffice/rentals',
'type': 'json',
},
'top250': {
'order': 4,
'name': 'IMDB - Top 250 Movies',
'url': 'http://www.imdb.com/chart/top',
},
}
def getChartList(self):
# Nearly identical to 'getIMDBids', but we don't care about minimalMovie and return all movie data (not just id)
movie_lists = []

3
couchpotato/static/scripts/combined.base.min.js
View File

@ -1247,7 +1247,8 @@ Page.Settings = new Class({
});
});
setTimeout(function() {
self.content.adopt(self.navigation, self.tabs_container, self.containers);
self.el.grab(self.navigation);
self.content.adopt(self.tabs_container, self.containers);
self.fireEvent("create");
self.openTab();
}, 0);

17
couchpotato/static/scripts/combined.plugins.min.js
View File

@ -549,7 +549,7 @@ var MovieList = new Class({
var self = this;
if (!self.navigation_counter) return;
self.counter_count = count;
self.navigation_counter.set("text", (count || 0) + " movies");
self.navigation_counter.set("text", count === 1 ? "1 movie" : (count || 0) + " movies");
if (self.empty_message) {
self.empty_message.destroy();
self.empty_message = null;
@ -1936,12 +1936,13 @@ var Movie = new Class({
},
onClick: function(e) {
var self = this;
if (e.target.getParents(".actions").length == 0 && e.target != self.select_checkbox) {
if (e.target.getParents(".actions").length === 0 && e.target != self.select_checkbox) {
e.stopPropagation();
self.addActions();
self.openDetails();
}
},
onMouseenter: function() {
addActions: function() {
var self = this;
if (self.actions.length <= 0) {
self.options.actions.each(function(a) {
@ -1953,8 +1954,16 @@ var Movie = new Class({
self.actions.push(action);
});
}
},
onMouseenter: function() {
var self = this;
if (App.mobile_screen) return;
self.addActions();
if (self.list.current_view == "thumb") {
self.el.addClass("hover_start");
setTimeout(function() {
self.el.removeClass("hover_start");
}, 300);
dynamics.css(self.el, {
scale: 1,
opacity: 1
@ -2072,7 +2081,7 @@ Page.Movies = new Class({
var self = this;
self.parent(parent, options);
self.navigation = new BlockNavigation();
$(self.navigation).inject(self.content, "top");
$(self.navigation).inject(self.el);
},
defaultAction: function(action, params) {
var self = this;

5
couchpotato/static/scripts/page/settings.js
View File

@ -209,8 +209,11 @@ Page.Settings = new Class({
});
setTimeout(function(){
self.el.grab(
self.navigation
);
self.content.adopt(
self.navigation,
self.tabs_container,
self.containers
);

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

@ -1,3 +1,4 @@
.page.movie_details,.thumb_list .movie.hover_start .actions{pointer-events:none}
.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 *{-webkit-transform:translateZ(0);transform:translateZ(0)}
@ -61,12 +62,12 @@
@media (max-width:480px){.page.home .search_form{margin-top:10px;height:64px}
}
.page.home .search_form .icon-search{display:block;color:#000;right:20px;top:20px;width:66px;height:66px;line-height:66px;left:auto;-webkit-transform:none;transform:none;font-size:2em;opacity:.5}
.page.home .search_form .wrapper:before,.page.movies .scroll_content{display:none}
@media (max-width:480px){.page.home .search_form .icon-search{width:44px;height:44px;line-height:44px;right:10px;top:10px;font-size:1.5em}
}
.page.home .search_form .wrapper{border-radius:0;box-shadow:none;bottom:auto;top:20px;left:20px;right:20px;position:absolute;width:auto}
@media (max-width:480px){.page.home .search_form .wrapper{right:10px;top:10px;left:10px}
}
.page.home .search_form .wrapper:before{display:none}
.page.home .search_form .wrapper .input{border-radius:0;left:0;position:absolute;top:0;height:66px}
.page.home .search_form .wrapper .input input{box-shadow:0;font-size:2em;font-weight:400}
.directory_list,.messages .message,.more_menu .wrapper{box-shadow:0 0 15px 2px rgba(0,0,0,.15)}
@ -91,7 +92,7 @@
.page.home .search_form .wrapper .results_container .results .media_result .options .title{width:140px;margin-right:2px}
}
.big_search{background:#eaeaea}
.page.movies{bottom:auto;z-index:21;height:80px}
.page.movies{bottom:auto;z-index:21;height:80px;background:#FFF}
.page.movies_manage,.page.movies_wanted{top:80px;padding:0;transition:top 300ms cubic-bezier(.9,0,.1,1)}
@media (max-width:480px){.page.movies{height:44px}
.page.movies_manage,.page.movies_wanted{top:44px}
@ -121,6 +122,9 @@
@media (max-width:768px){.movies .no_movies{padding:10px}
}
.movies .message{padding:20px 0;text-align:center}
.movies.movies>h2{padding:0 20px;line-height:80px}
@media (max-width:480px){.movies.movies>h2{line-height:44px;padding:0 10px}
}
.movies>.description{position:absolute;top:0;right:20px;width:auto;line-height:80px}
@media (max-width:768px){.movies>.description{display:none}
}
@ -221,14 +225,13 @@
.thumb_list .movie .info .eta{opacity:.5;float:right;margin-left:4px}
.thumb_list .movie .info .quality{white-space:nowrap;overflow:hidden}
.thumb_list .movie .info .quality span{font-size:.8em;margin-right:2px}
.thumb_list .movie .actions{background-image:linear-gradient(25deg,rgba(172,0,0,0) 0,#ac0000 80%);transition:opacity 400ms;opacity:0;position:absolute;top:0;right:0;bottom:0;left:0;text-align:right}
.thumb_list .movie .actions{background-image:linear-gradient(25deg,rgba(172,0,0,0) 0,#ac0000 80%);transition:opacity 400ms;opacity:1;visibility:hidden;position:absolute;top:0;right:0;bottom:0;left:0;text-align:right}
.thumb_list .movie .actions .action{position:relative;margin-right:10px;float:right;clear:both}
.thumb_list .movie .actions .action:first-child{margin-top:10px}
.thumb_list .movie .actions .action a{transition:all 150ms cubic-bezier(.9,0,.1,1);display:block;width:auto;padding:6.67px;color:#FFF;border-radius:2px}
.thumb_list .movie .actions .action a:hover{background:#FFF;color:#ac0000}
.thumb_list .movie:hover .actions{opacity:1}
.thumb_list .movie:hover .actions{opacity:1;visibility:visible}
.thumb_list .movie .mask{bottom:44px;border-radius:3px;transition:opacity 30ms}
.page.movie_details{pointer-events:none}
@media (max-width:480px){.thumb_list .movie:hover .actions{display:none}
.page.movie_details{left:0}
}
@ -695,14 +698,14 @@ input,select,textarea{font-size:1em;font-weight:300;padding:6.67px;background:#F
.page .navigation{z-index:2;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-ms-flex-align:center;align-items:center;position:fixed;top:0;height:80px;left:152px;right:20px;background:#FFF;border-radius:3px 0 0}
.more_menu .button,.more_menu a,.page .navigation ul li{display:inline-block}
.more_menu,.more_menu .button:before{position:relative}
@media (max-width:480px){.page h2{font-size:18px;padding:10px}
@media (max-width:480px){.page h2{font-size:18px}
.page .navigation{height:44px;left:54px;right:10px}
}
.page .navigation ul{-webkit-flex:1 auto;-ms-flex:1 auto;flex:1 auto;list-style:none}
.page .navigation ul li a{display:inline-block;font-size:24px;line-height:80px;padding:0 20px;color:rgba(0,0,0,.5)}
.page .navigation ul li a{display:inline-block;font-size:24px;line-height:80px;padding:0 20px;color:rgba(0,0,0,.5);vertical-align:bottom}
.page .navigation ul .active a{color:#000}
.page .navigation>ul>li:first-child{margin-left:-20px}
@media (max-width:480px){.page .navigation ul li a{font-size:18px;line-height:44px;padding:10px}
@media (max-width:480px){.page .navigation ul li a{font-size:18px;line-height:44px;padding:0 10px}
.page .navigation>ul>li:first-child{margin-left:-10px}
}
.page .navigation h2{padding:20px 20px 20px 0}
@ -760,9 +763,9 @@ input,select,textarea{font-size:1em;font-weight:300;padding:6.67px;background:#F
.table .item span{padding:1px 2px}
.table .item span:first-child{padding-left:0}
.table .item span:last-child{padding-right:0}
.page.settings{top:80px}
.page.settings{padding-top:80px}
.page.settings.active .scroll_content{display:-webkit-flex;display:-ms-flexbox;display:flex}
@media (max-width:480px){.page.settings{top:44px}
@media (max-width:480px){.page.settings{padding-top:44px}
.page.settings.active .scroll_content{display:block}
}
.page.settings .navigation{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}
@ -771,16 +774,20 @@ input,select,textarea{font-size:1em;font-weight:300;padding:6.67px;background:#F
.page.settings .tab_content{display:none}
.page.settings .tab_content.active{display:block}
.page.settings .tabs{margin:0 20px 20px;list-style:none;font-size:24px}
@media (max-width:480px){.page.settings .tabs{margin:0 10px 20px}
}
.page.settings .tabs ul{list-style:none;font-size:14px}
.page.settings .tabs li a{color:rgba(0,0,0,.5)}
.page.settings .tabs li.active a{color:#000}
.page.settings form.containers{margin:0 20px 0 0;-webkit-flex:1 1 auto;-ms-flex:1 1 auto;flex:1 1 auto}
@media (max-width:480px){.page.settings form.containers{margin:0 10px 0 0}
}
.page.settings fieldset h2 .group_label,.page.settings fieldset h2 .icon{margin-right:10px}
.page.settings fieldset{border:0;padding:10px 0;position:relative}
.page.settings fieldset h2{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row wrap;-ms-flex-flow:row wrap;flex-flow:row wrap;-webkit-align-items:baseline;-ms-flex-align:baseline;align-items:baseline;padding:0 0 0 20px}
.page.settings fieldset h2 .icon img{vertical-align:middle;position:relative;top:-1px}
.page.settings fieldset h2 .hint{-webkit-flex:1;-ms-flex:1;flex:1;font-size:1rem}
@media (max-width:480px){.page.settings fieldset h2{display:block}
@media (max-width:480px){.page.settings fieldset h2{display:block;padding:0 0 0 10px}
.page.settings fieldset h2 .hint{margin:0;display:block}
}
.page.settings fieldset h2 .hint a{font-weight:400;color:#ac0000;text-decoration:underline;display:inline}
@ -795,7 +802,7 @@ input,select,textarea{font-size:1em;font-weight:300;padding:6.67px;background:#F
.page.settings fieldset .ctrlHolder label{display:inline-block;min-width:150px}
.page.settings fieldset .ctrlHolder input,.page.settings fieldset .ctrlHolder select,.page.settings fieldset .ctrlHolder textarea{min-width:200px}
.page.settings fieldset .ctrlHolder input[type=checkbox]{width:auto;min-width:0}
@media (max-width:480px){.page.settings fieldset .ctrlHolder{-webkit-flex-flow:row wrap;-ms-flex-flow:row wrap;flex-flow:row wrap;padding-right:0}
@media (max-width:480px){.page.settings fieldset .ctrlHolder{-webkit-flex-flow:row wrap;-ms-flex-flow:row wrap;flex-flow:row wrap;padding:6.67px 0 6.67px 10px}
.page.settings fieldset .ctrlHolder input,.page.settings fieldset .ctrlHolder label,.page.settings fieldset .ctrlHolder select,.page.settings fieldset .ctrlHolder textarea{-webkit-flex:1 1 auto;-ms-flex:1 1 auto;flex:1 1 auto}
.page.settings fieldset .ctrlHolder input[type=checkbox]{margin-right:20px;-webkit-flex:none;-ms-flex:none;flex:none}
}

4
couchpotato/static/style/main.scss
View File

@ -440,7 +440,6 @@ input, textarea, select {
@include media-phablet {
font-size: 18px;
padding: $padding/2;
}
}
@ -475,11 +474,12 @@ input, textarea, select {
line-height: $header_height;
padding: 0 $padding;
color: rgba(0,0,0,.5);
vertical-align: bottom;
@include media-phablet {
font-size: 18px;
line-height: $header_width_mobile;
padding: $padding/2;
padding: 0 $padding/2;
}
}
}

15
couchpotato/static/style/settings.scss
View File

@ -1,10 +1,10 @@
@import "_mixins";
.page.settings {
top: $header_height;
padding-top: $header_height;
@include media-phablet {
top: $header_width_mobile;
padding-top: $header_width_mobile;
}
&.active .scroll_content {
@ -42,6 +42,10 @@
list-style: none;
font-size: 24px;
@include media-phablet {
margin: 0 $padding/2 $padding;
}
ul {
list-style: none;
font-size: $font_size;
@ -64,6 +68,10 @@
form.containers {
margin: 0 $padding 0 0;
flex: 1 1 auto;
@include media-phablet {
margin: 0 $padding/2 0 0;
}
}
fieldset {
@ -79,6 +87,7 @@
@include media-phablet {
display: block;
padding: 0 0 0 $padding/2;
}
.icon {
@ -164,7 +173,7 @@
@include media-phablet {
flex-flow: row wrap;
padding-right: 0;
padding: $padding/3 0 $padding/3 $padding/2;
}
&:last-child {

Write Preview
Loading…
Cancel
Save