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

[TV] Update messages containing "movie", fixed alignment and search box

Browse Source
This commit is contained in:
Dean Gardiner
2014-07-27 00:15:14 +12:00
parent 44063dfcc5
commit c77eaabbff
2 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/media/show/_base/static/list.js
+8 -8
View File
@@ -37,7 +37,7 @@ var ShowList = new Class({
'html': self.options.description, 'html': self.options.description,
'styles': {'display': 'none'} 'styles': {'display': 'none'}
}) : null, }) : null,
self.movie_list = new Element('div'), self.movie_list = new Element('div.list'),
self.load_more = self.options.load_more ? new Element('a.load_more', { self.load_more = self.options.load_more ? new Element('a.load_more', {
'events': { 'events': {
'click': self.loadMore.bind(self) 'click': self.loadMore.bind(self)
@@ -79,7 +79,7 @@ var ShowList = new Class({
self.fireEvent('movieAdded', notification); self.fireEvent('movieAdded', notification);
if(self.options.add_new && !self.movies_added[notification.data._id] && notification.data.status == self.options.status){ if(self.options.add_new && !self.movies_added[notification.data._id] && notification.data.status == self.options.status){
window.scroll(0,0); window.scroll(0,0);
self.createMovie(notification.data, 'top'); self.createShow(notification.data, 'top');
self.setCounter(self.counter_count+1); self.setCounter(self.counter_count+1);
self.checkIfEmpty(); self.checkIfEmpty();
@@ -117,7 +117,7 @@ var ShowList = new Class({
} }
Object.each(movies, function(movie){ Object.each(movies, function(movie){
self.createMovie(movie); self.createShow(movie);
}); });
self.total_movies += total; self.total_movies += total;
@@ -131,7 +131,7 @@ var ShowList = new Class({
if(!self.navigation_counter) return; if(!self.navigation_counter) return;
self.counter_count = count; self.counter_count = count;
self.navigation_counter.set('text', (count || 0) + ' movies'); self.navigation_counter.set('text', (count || 0) + ' shows');
if (self.empty_message) { if (self.empty_message) {
self.empty_message.destroy(); self.empty_message.destroy();
@@ -143,7 +143,7 @@ var ShowList = new Class({
(self.filter.starts_with ? ' in <strong>'+self.filter.starts_with+'</strong>' : ''); (self.filter.starts_with ? ' in <strong>'+self.filter.starts_with+'</strong>' : '');
self.empty_message = new Element('.message', { self.empty_message = new Element('.message', {
'html': 'No movies found ' + message + '.<br/>' 'html': 'No shows found ' + message + '.<br/>'
}).grab( }).grab(
new Element('a', { new Element('a', {
'text': 'Reset filter', 'text': 'Reset filter',
@@ -167,20 +167,20 @@ var ShowList = new Class({
}, },
createMovie: function(movie, inject_at){ createShow: function(show, inject_at){
var self = this; var self = this;
var m = new Show(self, { var m = new Show(self, {
'actions': self.options.actions, 'actions': self.options.actions,
'view': self.current_view, 'view': self.current_view,
'onSelect': self.calculateSelected.bind(self) 'onSelect': self.calculateSelected.bind(self)
}, movie); }, show);
$(m).inject(self.movie_list, inject_at || 'bottom'); $(m).inject(self.movie_list, inject_at || 'bottom');
m.fireEvent('injected'); m.fireEvent('injected');
self.movies.include(m); self.movies.include(m);
self.movies_added[movie._id] = true; self.movies_added[show._id] = true;
}, },
createNavigation: function(){ createNavigation: function(){
couchpotato/core/media/show/_base/static/show.css
+34 -34
View File
@@ -1,4 +1,4 @@
.shows { .shows.details_list {
padding: 10px 0 20px; padding: 10px 0 20px;
position: relative; position: relative;
z-index: 3; z-index: 3;
@@ -88,7 +88,7 @@
padding-top: 6px; padding-top: 6px;
} }
.shows .show { .shows .list .show {
position: relative; position: relative;
margin: 10px 0; margin: 10px 0;
padding-left: 20px; padding-left: 20px;
@@ -100,11 +100,11 @@
background: rgba(0,0,0,.2); background: rgba(0,0,0,.2);
} }
.shows .show.expanded { .shows .list .show.expanded {
height: 360px; height: 360px;
} }
.shows .show .table.expanded { .shows .list .show .table.expanded {
height: 360px; height: 360px;
} }
@@ -113,7 +113,7 @@
background: none; background: none;
} }
.shows.details_list .show { .shows.details_list .list .show {
padding-left: 120px; padding-left: 120px;
} }
@@ -146,7 +146,7 @@
} }
} }
.shows .show .mask { .shows .list .show .mask {
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
@@ -196,7 +196,7 @@
right: -100%; right: -100%;
} }
.shows .show .check { .shows .list .show .check {
display: none; display: none;
} }
@@ -471,8 +471,8 @@
} }
} }
.shows .show:hover .data .actions, .shows .list .show:hover .data .actions,
.touch_enabled .shows .show .data .actions { .touch_enabled .shows .list .show .data .actions {
opacity: 1; opacity: 1;
display: inline-block; display: inline-block;
} }
@@ -482,7 +482,7 @@
bottom: 18px; bottom: 18px;
} }
.shows .show:hover .actions { .shows .list .show:hover .actions {
opacity: 1; opacity: 1;
display: inline-block; display: inline-block;
} }
@@ -492,8 +492,8 @@
top: auto; top: auto;
} }
.shows .show:hover .action { opacity: 0.6; } .shows .list .show:hover .action { opacity: 0.6; }
.shows .show:hover .action:hover { opacity: 1; } .shows .list .show:hover .action:hover { opacity: 1; }
.shows .data .action { .shows .data .action {
display: inline-block; display: inline-block;
@@ -681,11 +681,11 @@
top: -30px; top: -30px;
} }
.shows .show .episodes .item { .shows .list .show .episodes .item {
position: relative; position: relative;
} }
.shows .show .episodes .actions { .shows .list .show .episodes .actions {
position: absolute; position: absolute;
width: auto; width: auto;
right: 0; right: 0;
@@ -693,36 +693,36 @@
border-left: none; border-left: none;
} }
.shows .show .episodes .actions .refresh { .shows .list .show .episodes .actions .refresh {
color: #cbeecc; color: #cbeecc;
} }
.shows .show .try_container { .shows .list .show .try_container {
padding: 5px 10px; padding: 5px 10px;
text-align: center; text-align: center;
} }
.shows .show .try_container a { .shows .list .show .try_container a {
margin: 0 5px; margin: 0 5px;
padding: 2px 5px; padding: 2px 5px;
} }
.shows .show .releases .next_release { .shows .list .show .releases .next_release {
border-left: 6px solid #2aa300; border-left: 6px solid #2aa300;
} }
.shows .show .releases .next_release > :first-child { .shows .list .show .releases .next_release > :first-child {
margin-left: -6px; margin-left: -6px;
} }
.shows .show .releases .last_release { .shows .list .show .releases .last_release {
border-left: 6px solid #ffa200; border-left: 6px solid #ffa200;
} }
.shows .show .releases .last_release > :first-child { .shows .list .show .releases .last_release > :first-child {
margin-left: -6px; margin-left: -6px;
} }
.shows .show .trynext { .shows .list .show .trynext {
display: inline; display: inline;
position: absolute; position: absolute;
right: 180px; right: 180px;
@@ -733,32 +733,32 @@
height: 100%; height: 100%;
top: 0; top: 0;
} }
.touch_enabled .shows .show .trynext { .touch_enabled .shows .list .show .trynext {
display: none; display: none;
} }
@media all and (max-width: 480px) { @media all and (max-width: 480px) {
.shows .show .trynext { .shows .list .show .trynext {
display: none; display: none;
} }
} }
.shows.mass_edit_list .trynext { display: none; } .shows.mass_edit_list .trynext { display: none; }
.wanted .shows .show .trynext { .wanted .shows .list .show .trynext {
padding-right: 30px; padding-right: 30px;
} }
.shows .show:hover .trynext, .shows .list .show:hover .trynext,
.touch_enabled .shows.details_list .show .trynext { .touch_enabled .shows.details_list .list .show .trynext {
opacity: 1; opacity: 1;
} }
.shows.details_list .show .trynext { .shows.details_list .list .show .trynext {
background: #47515f; background: #47515f;
padding: 0; padding: 0;
right: 0; right: 0;
height: 25px; height: 25px;
} }
.shows .show .trynext a { .shows .list .show .trynext a {
background-position: 5px center; background-position: 5px center;
padding: 0 5px 0 25px; padding: 0 5px 0 25px;
margin-right: 10px; margin-right: 10px;
@@ -767,19 +767,19 @@
line-height: 27px; line-height: 27px;
font-family: OpenSans, "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif; font-family: OpenSans, "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
} }
.shows .show .trynext a:before { .shows .list .show .trynext a:before {
margin: 2px 0 0 -20px; margin: 2px 0 0 -20px;
position: absolute; position: absolute;
font-family: 'Elusive-Icons'; font-family: 'Elusive-Icons';
} }
.shows.details_list .show .trynext a { .shows.details_list .list .show .trynext a {
line-height: 23px; line-height: 23px;
} }
.shows .show .trynext a:last-child { .shows .list .show .trynext a:last-child {
margin: 0; margin: 0;
} }
.shows .show .trynext a:hover, .shows .list .show .trynext a:hover,
.touch_enabled .shows .show .trynext a { .touch_enabled .shows .list .show .trynext a {
background-color: #369545; background-color: #369545;
} }