stuff we did :D

This commit is contained in:
Keivan Beigi 2013-04-24 21:27:49 -07:00
commit 4cd75cd8aa
29 changed files with 648 additions and 479 deletions

View file

@ -25,8 +25,8 @@ define(['app'], function () {
name : 'airDate',
label : 'Air Date',
editable : false,
cell : 'datetime',
formatter: new Backgrid.AirDateFormatter()
cell : 'datetime'
//formatter: new Backgrid.AirDateFormatter()
}
],

View file

@ -2,17 +2,12 @@
define([
'app',
'Series/Index/List/CollectionView',
<<<<<<< HEAD
'Config'
'Series/Index/Posters/CollectionView',
'Series/Index/EmptyView',
'Config',
'Series/Index/Table/AirDateCell',
'Series/Index/Table/SeriesStatusCell'
'Series/Index/Table/SeriesStatusCell',
'Shared/Toolbar/ToolbarView',
=======
'Shared/Toolbar/ToolbarLayout',
>>>>>>> added support for multi-button groups to toolbar
'Config'
],
function () {
@ -34,128 +29,74 @@ define([
showTable: function () {
var columns =
[
{
name : 'status',
label : '',
editable: false,
cell : 'seriesStatus'
},
{
name : 'title',
label : 'Title',
editable: false,
cell : 'string'
},
{
name : 'seasonCount',
label : 'Seasons',
editable: false,
cell : 'integer'
},
{
name : 'quality',
label : 'Quality',
editable: false,
cell : 'integer'
},
{
name : 'network',
label : 'Network',
editable: false,
cell : 'string'
},
{
name : 'nextAiring',
label : 'Next Airing',
editable : false,
cell : 'datetime',
formatter: new Backgrid.AirDateFormatter()
},
{
name : 'episodes',
label : 'Episodes',
editable: false,
sortable: false,
cell : 'string'
},
{
name : 'edit',
label : '',
editable: false,
sortable: false,
cell : 'string'
}
];
var grid = new Backgrid.Grid(
var columns = [
{
name: 'status',
label: '',
editable: false,
cell: 'seriesStatus',
name : 'status',
label : '',
editable : false,
cell : 'seriesStatus',
headerCell: 'nzbDrone'
},
{
name: 'title',
label: 'Title',
editable: false,
cell: Backgrid.TemplateBackedCell.extend({ template: 'Series/Index/Table/SeriesTitleTemplate' }),
name : 'title',
label : 'Title',
editable : false,
cell : Backgrid.TemplateBackedCell.extend({ template: 'Series/Index/Table/SeriesTitleTemplate' }),
headerCell: 'nzbDrone'
},
{
name: 'seasonCount',
label: 'Seasons',
editable: false,
cell: 'integer',
name : 'seasonCount',
label : 'Seasons',
editable : false,
cell : 'integer',
headerCell: 'nzbDrone'
},
{
name: 'quality',
label: 'Quality',
editable: false,
cell: 'integer',
name : 'quality',
label : 'Quality',
editable : false,
cell : 'integer',
headerCell: 'nzbDrone'
},
{
name: 'network',
label: 'Network',
editable: false,
cell: 'string',
name : 'network',
label : 'Network',
editable : false,
cell : 'string',
headerCell: 'nzbDrone'
},
{
name: 'nextAiring',
label: 'Next Airing',
editable: false,
cell: 'airDate',
name : 'nextAiring',
label : 'Next Airing',
editable : false,
cell : 'airDate',
headerCell: 'nzbDrone'
},
{
name: 'episodes',
label: 'Episodes',
editable: false,
sortable: false,
cell: Backgrid.TemplateBackedCell.extend({ template: 'Series/EpisodeProgressTemplate' }),
name : 'episodes',
label : 'Episodes',
editable : false,
sortable : false,
cell : Backgrid.TemplateBackedCell.extend({ template: 'Series/EpisodeProgressTemplate' }),
headerCell: 'nzbDrone'
},
{
name: 'edit',
label: '',
editable: false,
sortable: false,
cell: Backgrid.TemplateBackedCell.extend({ template: 'Series/Index/Table/ControlsColumnTemplate' }),
name : 'edit',
label : '',
editable : false,
sortable : false,
cell : Backgrid.TemplateBackedCell.extend({ template: 'Series/Index/Table/ControlsColumnTemplate' }),
headerCell: 'nzbDrone'
}
];
this.series.show(new Backgrid.Grid(
{
row: Backgrid.SeriesIndexTableRow,
columns : columns,
collection : this.seriesCollection,
className: 'table table-hover'
row : Backgrid.SeriesIndexTableRow,
columns : columns,
collection: this.seriesCollection,
className : 'table table-hover'
}));
},
@ -196,7 +137,7 @@ define([
menuRight.add(new NzbDrone.Shared.Toolbar.CommandModel({title: "RSS Sync", icon: "icon-rss"}));
menuRight.add(new NzbDrone.Shared.Toolbar.CommandModel({title: "Sync Database", icon: "icon-refresh"}));
this.toolbar.show(new NzbDrone.Shared.Toolbar.ToolbarLayout({left: [ menuLeft], right: [menuRight]}));
this.toolbar.show(new NzbDrone.Shared.Toolbar.ToolbarLayout({left: [ menuLeft, menuLeft], right: [menuRight]}));
switch (this.viewStyle) {
case 1:

View file

@ -9,7 +9,7 @@
margin-top: 0px;
}
a{
a {
color: #000000;
}
}
@ -21,70 +21,71 @@
display: inline-block;
vertical-align: top;
}
.series-page-header {
padding-bottom: 50px;
}
.series-posters-item {
margin-bottom: 20px;
.center {
display: block;
margin-left:auto;
margin-right:auto;
text-align: center;
.series-page-header {
padding-bottom: 50px;
}
.progress {
left: 22px;
margin-top: 5px;
}
.series-posters-item {
margin-bottom: 20px;
.title {
font-size: 17px;
text-rendering: optimizelegibility;
}
.labels {
display: inline-block;
opacity: 0.75;
width: 138px;
:hover {
cursor: default;
}
.label {
margin-top: 3px;
.center {
display: block;
margin-left: auto;
margin-right: auto;
text-align: center;
}
.tooltip {
opacity: 1;
.progress {
left: 22px;
margin-top: 5px;
}
.title {
font-size: 17px;
text-rendering: optimizelegibility;
}
.labels {
display: inline-block;
opacity: 0.75;
width: 138px;
:hover {
cursor: default;
}
.label {
margin-top: 3px;
display: block;
}
.tooltip {
opacity: 1;
}
}
.series-season {
padding-bottom: 20px;
}
}
.series-season {
padding-bottom: 20px;
}
}
.series-poster-container {
position: relative;
overflow: hidden;
display: inline-block;
.series-poster-container {
position: relative;
overflow: hidden;
display: inline-block;
.ended-banner {
color: #EEEEEE;
background-color: #B94A48;
-moz-box-shadow: 2px 2px 20px #888;
-moz-transform: rotate(45deg);
-moz-transform-origin: 50% 50%;
-webkit-transform: rotate(45deg);
-webkit-transform-origin: 50% 50%;
position: absolute;
width: 300px;
top: 175px;
left: -122px;
text-align: center;
.ended-banner {
color: #eeeeee;
background-color: #b94a48;
-moz-box-shadow: 2px 2px 20px #888888;
-moz-transform: rotate(45deg);
-moz-transform-origin: 50% 50%;
-webkit-transform: rotate(45deg);
-webkit-transform-origin: 50% 50%;
position: absolute;
width: 300px;
top: 175px;
left: -122px;
text-align: center;
}
}
}