-
-
diff --git a/src/UI/Movies/Index/MoviesIndexLayout.js b/src/UI/Movies/Index/MoviesIndexLayout.js
index 68fc34bc5..3e16a7eb7 100644
--- a/src/UI/Movies/Index/MoviesIndexLayout.js
+++ b/src/UI/Movies/Index/MoviesIndexLayout.js
@@ -5,13 +5,13 @@ var PosterCollectionView = require('./Posters/SeriesPostersCollectionView');
var ListCollectionView = require('./Overview/SeriesOverviewCollectionView');
var EmptyView = require('./EmptyView');
var MoviesCollection = require('../MoviesCollection');
-var RelativeDateCell = require('../../Cells/RelativeDateCell');
-var SeriesTitleCell = require('../../Cells/SeriesTitleCell');
+var InCinemasCell = require('../../Cells/InCinemasCell');
+var MovieTitleCell = require('../../Cells/MovieTitleCell2');
var TemplatedCell = require('../../Cells/TemplatedCell');
var ProfileCell = require('../../Cells/ProfileCell');
-var EpisodeProgressCell = require('../../Cells/EpisodeProgressCell');
-var SeriesActionsCell = require('../../Cells/SeriesActionsCell');
-var SeriesStatusCell = require('../../Cells/SeriesStatusCell');
+var MovieLinksCell = require('../../Cells/MovieLinksCell');
+var MovieActionCell = require('../../Cells/MovieActionCell');
+var MovieStatusCell = require('../../Cells/MovieStatusCell');
var FooterView = require('./FooterView');
var FooterModel = require('./FooterModel');
var ToolbarLayout = require('../../Shared/Toolbar/ToolbarLayout');
@@ -31,46 +31,36 @@ module.exports = Marionette.Layout.extend({
{
name : 'statusWeight',
label : '',
- cell : SeriesStatusCell
+ cell : MovieStatusCell
},
{
name : 'title',
label : 'Title',
- cell : SeriesTitleCell,
+ cell : MovieTitleCell,
cellValue : 'this',
sortValue : 'sortTitle'
},
- {
- name : 'seasonCount',
- label : 'Seasons',
- cell : 'integer'
- },
{
name : 'profileId',
label : 'Profile',
cell : ProfileCell
},
{
- name : 'network',
- label : 'Network',
- cell : 'string'
- },
- {
- name : 'nextAiring',
- label : 'Next Airing',
- cell : RelativeDateCell
+ name : 'inCinemas',
+ label : 'In Cinemas',
+ cell : InCinemasCell
},
{
- name : 'percentOfEpisodes',
- label : 'Episodes',
- cell : EpisodeProgressCell,
- className : 'episode-progress-cell'
+ name : 'this',
+ label : 'Links',
+ cell : MovieLinksCell,
+ className : "movie-links-cell"
},
{
name : 'this',
label : '',
sortable : false,
- cell : SeriesActionsCell
+ cell : MovieActionCell
}
],
diff --git a/src/UI/Movies/Index/Overview/SeriesOverviewItemViewTemplate.hbs b/src/UI/Movies/Index/Overview/SeriesOverviewItemViewTemplate.hbs
index ee6ddddee..e16191edb 100644
--- a/src/UI/Movies/Index/Overview/SeriesOverviewItemViewTemplate.hbs
+++ b/src/UI/Movies/Index/Overview/SeriesOverviewItemViewTemplate.hbs
@@ -1,4 +1,4 @@
-
+
diff --git a/src/UI/Movies/Search/ManualLayout.js b/src/UI/Movies/Search/ManualLayout.js
index daae5d781..af5413779 100644
--- a/src/UI/Movies/Search/ManualLayout.js
+++ b/src/UI/Movies/Search/ManualLayout.js
@@ -8,6 +8,7 @@ var DownloadReportCell = require('../../Release/DownloadReportCell');
var AgeCell = require('../../Release/AgeCell');
var ProtocolCell = require('../../Release/ProtocolCell');
var PeersCell = require('../../Release/PeersCell');
+var EditionCell = require('../../Cells/EditionCell');
module.exports = Marionette.Layout.extend({
template : 'Movies/Search/ManualLayoutTemplate',
@@ -32,6 +33,12 @@ module.exports = Marionette.Layout.extend({
label : 'Title',
cell : ReleaseTitleCell
},
+ {
+ name : 'edition',
+ label : 'Edition',
+ cell : EditionCell,
+ title : "Edition"
+ },
{
name : 'indexer',
label : 'Indexer',
diff --git a/src/UI/Movies/movies.less b/src/UI/Movies/movies.less
index 57ff91ed4..6c19733dc 100644
--- a/src/UI/Movies/movies.less
+++ b/src/UI/Movies/movies.less
@@ -8,6 +8,22 @@
max-width: 100%;
}
+.movie-tabs-card {
+ .card;
+ .opacity(0.9);
+ margin : 30px 10px;
+ padding : 10px 25px;
+
+ .show-hide-episodes {
+ .clickable();
+ text-align : center;
+
+ i {
+ .clickable();
+ }
+ }
+}
+
.edit-movie-modal, .delete-movie-modal {
overflow : visible;
@@ -52,6 +68,12 @@
a {
color : #000000;
}
+
+ .movie-info-links {
+ a {
+ color: white;
+ }
+ }
}
.movie-page-header {
@@ -104,7 +126,7 @@
.card;
.clickable;
margin-bottom : 20px;
- height : 315px;
+ height : 324px;
.center {
display : block;
@@ -184,7 +206,39 @@
font-weight: 100;
}
- .ended-banner {
+ .announced-banner {
+ color : #eeeeee;
+ background-color : #777;
+ .box-shadow(2px 2px 20px #888888);
+ -moz-transform-origin : 50% 50%;
+ -webkit-transform-origin : 50% 50%;
+ position : absolute;
+ width : 320px;
+ top : 200px;
+ left : -122px;
+ text-align : center;
+ .opacity(0.9);
+
+ .transform(rotate(45deg));
+ }
+
+ .released-banner {
+ color : #eeeeee;
+ background-color : #5cb85c;
+ .box-shadow(2px 2px 20px #888888);
+ -moz-transform-origin : 50% 50%;
+ -webkit-transform-origin : 50% 50%;
+ position : absolute;
+ width : 320px;
+ top : 200px;
+ left : -122px;
+ text-align : center;
+ .opacity(0.9);
+
+ .transform(rotate(45deg));
+ }
+
+ .cinemas-banner {
color : #eeeeee;
background-color : #b94a48;
.box-shadow(2px 2px 20px #888888);
@@ -249,10 +303,17 @@
}
}
+
.movie-detail-overview {
margin-bottom : 50px;
}
+.alternative-titles {
+ font-size: 12px;
+ color: rgba(255, 255, 255, 180);
+ opacity: .75;
+}
+
.movie-season {
.episode-number-cell {
diff --git a/src/UI/Release/ReleaseLayout.js b/src/UI/Release/ReleaseLayout.js
index 07f4a1af6..9b1791ff6 100644
--- a/src/UI/Release/ReleaseLayout.js
+++ b/src/UI/Release/ReleaseLayout.js
@@ -7,6 +7,7 @@ var FileSizeCell = require('../Cells/FileSizeCell');
var QualityCell = require('../Cells/QualityCell');
var ApprovalStatusCell = require('../Cells/ApprovalStatusCell');
var LoadingView = require('../Shared/LoadingView');
+var EditionCell = require('../Cells/EditionCell');
module.exports = Marionette.Layout.extend({
template : 'Release/ReleaseLayoutTemplate',
@@ -17,6 +18,12 @@ module.exports = Marionette.Layout.extend({
},
columns : [
+ {
+ name : 'edition',
+ label : 'Edition',
+ sortable : false,
+ cell : EditionCell
+ },
{
name : 'indexer',
label : 'Indexer',
@@ -29,12 +36,12 @@ module.exports = Marionette.Layout.extend({
sortable : true,
cell : Backgrid.StringCell
},
- {
+ /*{
name : 'episodeNumbers',
episodes : 'episodeNumbers',
label : 'season',
cell : EpisodeNumberCell
- },
+ },*/
{
name : 'size',
label : 'Size',
@@ -75,4 +82,4 @@ module.exports = Marionette.Layout.extend({
}));
}
}
-});
\ No newline at end of file
+});