diff --git a/UI/Calendar/CalendarLayoutTemplate.html b/UI/Calendar/CalendarLayoutTemplate.html
index b788ab3b1..436a68b58 100644
--- a/UI/Calendar/CalendarLayoutTemplate.html
+++ b/UI/Calendar/CalendarLayoutTemplate.html
@@ -5,13 +5,13 @@
-
+
- Unaired
- On Air
- - Missing
+ - Missing
- Downloaded
-
+
diff --git a/UI/Calendar/calendar.less b/UI/Calendar/calendar.less
index 692c43a55..70c87108d 100644
--- a/UI/Calendar/calendar.less
+++ b/UI/Calendar/calendar.less
@@ -111,37 +111,7 @@
}
}
-.legend {
- margin: 5px;
-
- ul {
- margin: 0;
- margin-bottom: 5px;
- padding: 0;
- float: left;
- list-style: none;
-
- li {
- font-size: 80%;
- list-style: none;
- margin-left: 0;
- line-height: 18px;
- margin-bottom: 2px;
-
- span {
- display: block;
- float: left;
- height: 16px;
- width: 30px;
- margin-right: 5px;
- margin-left: 0;
- border: none;
- }
- }
- }
-}
-
-.calendar, .legend {
+.calendar, {
.primary {
border-color : @btnPrimaryBackground;
background-color : @btnPrimaryBackground;
diff --git a/UI/Content/base.less b/UI/Content/base.less
index 33bb18d93..cbf257618 100644
--- a/UI/Content/base.less
+++ b/UI/Content/base.less
@@ -10,6 +10,7 @@
@import "prefixer";
@import "icons";
@import "spinner";
+@import "legend";
.progress {
width : 125px;
diff --git a/UI/Content/legend.less b/UI/Content/legend.less
new file mode 100644
index 000000000..a31a0928b
--- /dev/null
+++ b/UI/Content/legend.less
@@ -0,0 +1,45 @@
+@import "./Bootstrap/mixins";
+
+.legend {
+ margin: 5px;
+
+ ul {
+ margin: 0;
+ margin-bottom: 5px;
+ padding: 0;
+ float: left;
+ list-style: none;
+
+ li {
+ font-size: 80%;
+ list-style: none;
+ margin-left: 0;
+ line-height: 18px;
+ margin-bottom: 2px;
+
+ span {
+ display: block;
+ float: left;
+ height: 16px;
+ width: 30px;
+ margin-right: 5px;
+ margin-left: 0;
+ border: none;
+ border-radius: 3px;
+ }
+ }
+ }
+
+ .progress-primary {
+ #gradient > .vertical(#149bdf, #0480be);
+ .transition(width .6s ease);
+ }
+
+ .progress-success {
+ #gradient > .vertical(#62c462, #57a957);
+ }
+
+ .progress-danger {
+ #gradient > .vertical(#ee5f5b, #c43c35);
+ }
+}
\ No newline at end of file
diff --git a/UI/Series/Index/LegendView.js b/UI/Series/Index/LegendView.js
new file mode 100644
index 000000000..c5fac4c4d
--- /dev/null
+++ b/UI/Series/Index/LegendView.js
@@ -0,0 +1,9 @@
+'use strict';
+define(
+ [
+ 'marionette'
+ ], function (Marionette) {
+ return Marionette.CompositeView.extend({
+ template: 'Series/Index/LegendViewTemplate'
+ });
+ });
diff --git a/UI/Series/Index/LegendViewTemplate.html b/UI/Series/Index/LegendViewTemplate.html
new file mode 100644
index 000000000..11a7486a4
--- /dev/null
+++ b/UI/Series/Index/LegendViewTemplate.html
@@ -0,0 +1,7 @@
+
+
+ - Continuing (All Episodes downloaded)
+ - Ended (All Episodes downloaded)
+ - Missing Episodes
+
+
\ No newline at end of file
diff --git a/UI/Series/Index/SeriesIndexLayout.js b/UI/Series/Index/SeriesIndexLayout.js
index 2dcb7afc0..916613b3e 100644
--- a/UI/Series/Index/SeriesIndexLayout.js
+++ b/UI/Series/Index/SeriesIndexLayout.js
@@ -12,6 +12,7 @@ define(
'Cells/QualityProfileCell',
'Series/Index/Table/SeriesStatusCell',
'Series/Index/Table/Row',
+ 'Series/Index/LegendView',
'Shared/Toolbar/ToolbarLayout',
'Shared/LoadingView'
], function (Marionette,
@@ -25,6 +26,7 @@ define(
QualityProfileCell,
SeriesStatusCell,
SeriesIndexRow,
+ LegendView,
ToolbarLayout,
LoadingView) {
return Marionette.Layout.extend({
@@ -32,7 +34,8 @@ define(
regions: {
seriesRegion: '#x-series',
- toolbar : '#x-toolbar'
+ toolbar : '#x-toolbar',
+ legend : '#x-legend'
},
columns:
@@ -152,6 +155,7 @@ define(
else {
this.currentView.collection = SeriesCollection;
this.seriesRegion.show(this.currentView);
+ this.legend.show(new LegendView());
this._showToolbar();
}
diff --git a/UI/Series/Index/SeriesIndexLayoutTemplate.html b/UI/Series/Index/SeriesIndexLayoutTemplate.html
index 14a498c46..a140e82cc 100644
--- a/UI/Series/Index/SeriesIndexLayoutTemplate.html
+++ b/UI/Series/Index/SeriesIndexLayoutTemplate.html
@@ -4,3 +4,8 @@
+
\ No newline at end of file