More new icons, updated status colors.

This commit is contained in:
kay.one 2012-02-25 11:41:48 -08:00
parent 0bb36eb20c
commit 67298d62a0
12 changed files with 69 additions and 60 deletions

View File

@ -1,4 +1,4 @@
.gridImage .gridImage , .gridAction
{ {
width: 18px; width: 18px;
height: 18px; height: 18px;
@ -7,9 +7,9 @@
vertical-align: middle; vertical-align: middle;
} }
.gridImage:hover .gridAction:hover
{ {
background-color: #065EFE; cursor: pointer;
} }
/* Custom Grid */ /* Custom Grid */
@ -68,12 +68,12 @@
/* Episode Grid Row Colouring */ /* Episode Grid Row Colouring */
.episodeIgnored .episodeIgnored
{ {
background-color: #F2F5A9; background: lightgray;
} }
.episodeMissing .episodeMissing
{ {
background-color: #F5A9A9; background-color: #f5c5c5;
} }
/*Hidden Grid to prevent FOUSC*/ /*Hidden Grid to prevent FOUSC*/

Binary file not shown.

Before

Width:  |  Height:  |  Size: 771 B

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

@ -47,9 +47,13 @@
margin-top: 10px; margin-top: 10px;
} }
.ui-button .ui-state-default{
background: none;
}
/*MiniProfiler*/ /*MiniProfiler*/
.profiler-button .profiler-button
{ {
opacity: 0.4; opacity: 0.6;
} }

View File

@ -80,8 +80,8 @@
} }
}, //Date }, //Date
{ sWidth: '40px', "mDataProp": "HistoryId", "bSortable": false, "fnRender": function (row) { { sWidth: '40px', "mDataProp": "HistoryId", "bSortable": false, "fnRender": function (row) {
var deleteImage = "<img src=\"../../Content/Images/X.png\" alt=\"Delete\" title=\"Delete from History\" class=\"gridImage\" onclick=\"deleteHistory(this.parentNode.parentNode, " + row.aData["HistoryId"] + ")\">"; var deleteImage = "<img src=\"../../Content/Images/X.png\" alt=\"Delete\" title=\"Delete from History\" class=\"gridAction\" onclick=\"deleteHistory(this.parentNode.parentNode, " + row.aData["HistoryId"] + ")\">";
var redownloadImage = "<img src=\"../../Content/Images/redownload.png\" alt=\"Redownload\" title=\Redownload Episode\" class=\"gridImage\" onclick=\"redownloadHistory(this.parentNode.parentNode, " + row.aData["HistoryId"] + ", " + row.aData["EpisodeId"] + ")\">"; var redownloadImage = "<img src=\"../../Content/Images/redownload.png\" alt=\"Redownload\" title=\Redownload Episode\" class=\"gridAction\" onclick=\"redownloadHistory(this.parentNode.parentNode, " + row.aData["HistoryId"] + ", " + row.aData["EpisodeId"] + ")\">";
return deleteImage + redownloadImage; return deleteImage + redownloadImage;
} }

View File

@ -81,7 +81,7 @@
} }
}, //Grabbed On }, //Grabbed On
{ sWidth: '40px', "mDataProp": "EpisodeId", "bSortable": false, "fnRender": function (row) { { sWidth: '40px', "mDataProp": "EpisodeId", "bSortable": false, "fnRender": function (row) {
return createImageAjaxLink('/Episode/Search?episodeId=' + row.aData["EpisodeId"], '../../Content/Images/Search.png', 'Search', 'Search for Episode', 'gridImage'); return createImageAjaxLink('/Episode/Search?episodeId=' + row.aData["EpisodeId"], '../../Content/Images/Search.png', 'Search', 'Search for Episode', 'gridAction');
} }
}, //Actions }, //Actions
{ sWidth: 'auto', "mDataProp": "Details", "bSortable": false, "bVisible": false, "fnRender": function (row) { { sWidth: 'auto', "mDataProp": "Details", "bSortable": false, "bVisible": false, "fnRender": function (row) {

View File

@ -88,7 +88,7 @@
var ignoreSeason = "ignoreSeason_" + season.SeasonNumber; var ignoreSeason = "ignoreSeason_" + season.SeasonNumber;
<div class="seasonToggleTop"> <div class="seasonToggleTop">
<img src='../../Content/Images/@(season.Ignored ? "ignored" : "notIgnored").png' <img src='../../Content/Images/@(season.Ignored ? "ignored" : "notIgnored").png'
class='ignoredEpisodesMaster ignoreEpisode @ignoreSeason@(season.Ignored ? " ignored" : " ") gridImage' class='ignoredEpisodesMaster ignoreEpisode @ignoreSeason@(season.Ignored ? " ignored" : " ") gridAction'
title='Click to toggle season ignore status' /> title='Click to toggle season ignore status' />
<a href="@string.Format("#SeasonSection_{0}", season.SeasonNumber)" class="seasonToggleLabel">@(season.SeasonNumber == 0 ? "Specials" : "Season " + season.SeasonNumber)</a> <a href="@string.Format("#SeasonSection_{0}", season.SeasonNumber)" class="seasonToggleLabel">@(season.SeasonNumber == 0 ? "Specials" : "Season " + season.SeasonNumber)</a>
</div> </div>

View File

@ -24,8 +24,8 @@
@*Commands Column*@ @*Commands Column*@
<td class="@cellColourClass"> <td class="@cellColourClass">
<img src='../../Content/Images/@(Model.Ignored ? "ignored" : "notIgnored").png' class='ignoreEpisode ignoreEpisode_@(Model.SeasonNumber)@(Model.Ignored ? " ignored" : " ") gridImage' id='@Model.EpisodeId' title='Click to toggle episode ignore status' /> <img src='../../Content/Images/@(Model.Ignored ? "ignored" : "notIgnored").png' class='ignoreEpisode ignoreEpisode_@(Model.SeasonNumber)@(Model.Ignored ? " ignored" : " ") gridAction' id='@Model.EpisodeId' title='Click to toggle episode ignore status' />
@Ajax.ImageActionLink("../../Content/Images/Search.png", new { Alt = "Search", Title = "Search for episode", @class = "gridImage" }, "Search", "Episode", new { episodeId = Model.EpisodeId }, null, null) @Ajax.ImageActionLink("../../Content/Images/Search.png", new { Alt = "Search", Title = "Search for episode", @class = "gridAction" }, "Search", "Episode", new { episodeId = Model.EpisodeId }, null, null)
<img src='../../Content/Images/@(Model.Status).png' alt='@Model.Status' title='@Model.Status' class='gridImage status-@Model.Status statusImage' /> <img src='../../Content/Images/@(Model.Status).png' alt='@Model.Status' title='@Model.Status' class='gridImage status-@Model.Status statusImage' />
</td> </td>
</tr> </tr>

View File

@ -22,9 +22,9 @@
@*Commands Column*@ @*Commands Column*@
<th> <th>
<img src='../../Content/Images/@(Model.Ignored ? "ignored" : "notIgnored").png' class='ignoredEpisodesMaster ignoreEpisode ignoreSeason_@(Model.SeasonNumber)@(Model.Ignored ? " ignored" : " ") gridImage' title='Click to toggle season ignore status' /> <img src='../../Content/Images/@(Model.Ignored ? "ignored" : "notIgnored").png' class='ignoredEpisodesMaster ignoreEpisode ignoreSeason_@(Model.SeasonNumber)@(Model.Ignored ? " ignored" : " ") gridAction' title='Click to toggle season ignore status' />
@Ajax.ImageActionLink("../../Content/Images/Search.png", new { Alt = "Search", Title = "Search for all episodes in this season", @class = "gridImage" }, "SearchSeason", "Episode", new { SeriesId = Model.SeriesId, SeasonNumber = Model.SeasonNumber }, null, null) @Ajax.ImageActionLink("../../Content/Images/Search.png", new { Alt = "Search", Title = "Search for all episodes in this season", @class = "gridAction" }, "SearchSeason", "Episode", new { SeriesId = Model.SeriesId, SeasonNumber = Model.SeasonNumber }, null, null)
@Ajax.ImageActionLink("../../Content/Images/Rename.png", new { Alt = "Rename", Title = "Rename all episodes in this season", @class = "gridImage" }, "RenameSeason", "Episode", new { SeriesId = Model.SeriesId, SeasonNumber = Model.SeasonNumber }, null, null) @Ajax.ImageActionLink("../../Content/Images/Rename.png", new { Alt = "Rename", Title = "Rename all episodes in this season", @class = "gridAction" }, "RenameSeason", "Episode", new { SeriesId = Model.SeriesId, SeasonNumber = Model.SeasonNumber }, null, null)
</th> </th>
</tr> </tr>
</thead> </thead>

View File

@ -73,7 +73,7 @@
if (!row.aData["Enable"]) if (!row.aData["Enable"])
return ""; return "";
return createImageAjaxLink('/System/RunJob?typeName=' + row.aData["TypeName"], '../../Content/Images/Gear.png', 'Run', 'Run Job', 'gridImage'); return createImageAjaxLink('/System/RunJob?typeName=' + row.aData["TypeName"], '../../Content/Images/Gear.png', 'Run', 'Run Job', 'gridAction');
//return createImageAjaxLink('/History/Delete?historyId=' + row.aData["HistoryId"], '../../Content/Images/X.png', 'Delete', 'Delete from History', 'searchImage'); //return createImageAjaxLink('/History/Delete?historyId=' + row.aData["HistoryId"], '../../Content/Images/X.png', 'Delete', 'Delete from History', 'searchImage');
} }
} //Actions } //Actions

View File

@ -1,17 +1,21 @@
@using NzbDrone.Web.Helpers @using NzbDrone.Web.Helpers
@model NzbDrone.Web.Models.UpcomingEpisodesModel @model NzbDrone.Web.Models.UpcomingEpisodesModel
@{ViewBag.Title = "Upcoming";} @{ViewBag.Title = "Upcoming";}
@section HeaderContent @section HeaderContent
{ {
@Html.IncludeCss("Grid.css") @Html.IncludeCss("Grid.css")
<style> <style>
.gridControls { .gridControls
{
float: right; float: right;
padding: 0px 5px 20px 0px; padding-top: 10px;
visibility: hidden; visibility: hidden;
} }
.sub-menu
{
float: left;
}
</style> </style>
} }
@section ActionMenu{ @section ActionMenu{
@ -19,27 +23,33 @@
<li>@Ajax.ActionLink("Start RSS Sync", "RssSync", "Command", null, null)</li> <li>@Ajax.ActionLink("Start RSS Sync", "RssSync", "Command", null, null)</li>
</ul> </ul>
} }
<div class="gridControls"> <div class="gridControls">
@Html.CheckBox("showDownloaded", true) @Html.CheckBox("showDownloaded", true)
<label for="showDownloaded">Show Downloaded</label> <label for="showDownloaded">
Show Downloaded</label>
</div> </div>
<table class="seriesTable"> <table class="seriesTable">
<colgroup> <colgroup>
<col/> <col />
<col style="width:90px" /> <col style="width: 90px" />
<col style="width:300px" /> <col style="width: 300px" />
<col style="width:160px" /> <col style="width: 160px" />
<col style="width:100px" /> <col style="width: 100px" />
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
<th>Series Title</th> <th>
<th>Episode</th> Series Title
<th>Episode Title</th> </th>
<th>Air Time</th> <th>
Episode
</th>
<th>
Episode Title
</th>
<th>
Air Time
</th>
@*Commands/Status Column*@ @*Commands/Status Column*@
<th> <th>
Status Status
@ -52,11 +62,10 @@
Yesterday Yesterday
</td> </td>
</tr> </tr>
@for (int i = 0; i < Model.Yesterday.Count; i++) @for (int i = 0; i < Model.Yesterday.Count; i++)
{ {
var episode = Model.Yesterday[i]; var episode = Model.Yesterday[i];
if (i % 2 == 0) if (i % 2 == 0)
{ {
Html.RenderPartial("UpcomingEpisode", episode); Html.RenderPartial("UpcomingEpisode", episode);
@ -72,11 +81,10 @@
Today Today
</td> </td>
</tr> </tr>
@for (int i = 0; i < Model.Today.Count; i++) @for (int i = 0; i < Model.Today.Count; i++)
{ {
var episode = Model.Today[i]; var episode = Model.Today[i];
if (i % 2 == 0) if (i % 2 == 0)
{ {
Html.RenderPartial("UpcomingEpisode", episode); Html.RenderPartial("UpcomingEpisode", episode);
@ -91,31 +99,29 @@
<td colspan="6"> <td colspan="6">
Tomorrow Tomorrow
</td> </td>
@for (int i = 0; i < Model.Tomorrow.Count; i++)
@for (int i = 0; i < Model.Tomorrow.Count; i++)
{
var episode = Model.Tomorrow[i];
if (i % 2 == 0)
{ {
Html.RenderPartial("UpcomingEpisode", episode); var episode = Model.Tomorrow[i];
}
else if (i % 2 == 0)
{ {
Html.RenderPartial("UpcomingEpisode", episode, new ViewDataDictionary { new KeyValuePair<string, object>("AltRow", true) }); Html.RenderPartial("UpcomingEpisode", episode);
}
else
{
Html.RenderPartial("UpcomingEpisode", episode, new ViewDataDictionary { new KeyValuePair<string, object>("AltRow", true) });
}
} }
} <tr class="title-row">
<tr class="title-row"> <td colspan="6">
<td colspan="6"> Future Forecast
Future Forecast </td>
</td> </tr>
</tr>
@for (int i = 0; i < Model.Week.Count; i++) @for (int i = 0; i < Model.Week.Count; i++)
{ {
var episode = Model.Week[i]; var episode = Model.Week[i];
if (i % 2 == 0) if (i % 2 == 0)
{ {
Html.RenderPartial("UpcomingEpisode", episode); Html.RenderPartial("UpcomingEpisode", episode);
@ -128,7 +134,6 @@
} }
</tbody> </tbody>
</table> </table>
@section Scripts{ @section Scripts{
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function () { $(document).ready(function () {
@ -171,9 +176,9 @@
function toggleHideDownloadedCookie(show) { function toggleHideDownloadedCookie(show) {
if (show) if (show)
$.cookie("showDownloaded", true, { expires: 365 }); $.cookie("showDownloaded", true, { expires: 365 });
else else
$.cookie("showDownloaded", false, { expires: 365 }); $.cookie("showDownloaded", false, { expires: 365 });
} }
</script> </script>
} }

View File

@ -36,7 +36,7 @@
@*Commands Column*@ @*Commands Column*@
<td class="@cellColourClass"> <td class="@cellColourClass">
<img src='../../Content/Images/@(Model.Status).png' alt='@Model.Status' title='@Model.Status' class='gridImage statusImage' /> <img src='../../Content/Images/@(Model.Status).png' alt='@Model.Status' title='@Model.Status' class='gridImage statusImage' />
@Ajax.ImageActionLink("../../Content/Images/Search.png", new { Alt = "Search", Title = "Search for episode", @class = "gridImage" }, "Search", "Episode", new { episodeId = Model.EpisodeId }, null, null) @Ajax.ImageActionLink("../../Content/Images/Search.png", new { Alt = "Search", Title = "Search for episode", @class = "gridAction" }, "Search", "Episode", new { episodeId = Model.EpisodeId }, null, null)
</td> </td>
</tr> </tr>