diff --git a/NzbDrone.Web/Content/Images/Indexers/Nzbs.org.png b/NzbDrone.Web/Content/Images/Indexers/Nzbsorg.png similarity index 100% rename from NzbDrone.Web/Content/Images/Indexers/Nzbs.org.png rename to NzbDrone.Web/Content/Images/Indexers/Nzbsorg.png diff --git a/NzbDrone.Web/Content/Images/blue.png b/NzbDrone.Web/Content/Images/blue.png new file mode 100644 index 000000000..9a8e03a69 Binary files /dev/null and b/NzbDrone.Web/Content/Images/blue.png differ diff --git a/NzbDrone.Web/Content/Images/green.png b/NzbDrone.Web/Content/Images/green.png new file mode 100644 index 000000000..65f614972 Binary files /dev/null and b/NzbDrone.Web/Content/Images/green.png differ diff --git a/NzbDrone.Web/Content/Images/red.png b/NzbDrone.Web/Content/Images/red.png new file mode 100644 index 000000000..719f81074 Binary files /dev/null and b/NzbDrone.Web/Content/Images/red.png differ diff --git a/NzbDrone.Web/Content/Images/yellow.png b/NzbDrone.Web/Content/Images/yellow.png new file mode 100644 index 000000000..19fea1ac0 Binary files /dev/null and b/NzbDrone.Web/Content/Images/yellow.png differ diff --git a/NzbDrone.Web/Content/Messages.css b/NzbDrone.Web/Content/Messages.css new file mode 100644 index 000000000..223f17d87 --- /dev/null +++ b/NzbDrone.Web/Content/Messages.css @@ -0,0 +1,55 @@ +/*Pinned messages*/ + +.infoBox, .successBox, .warningBox, .errorBox, .validationBox +{ + border: 0px solid; + margin: 10px 0px; + padding: 10px 10px 10px 50px; + background-repeat: no-repeat; + background-position: 10px center; +} +.infoBox +{ + color: #00529B; + background-color: #f4f7f9; + background-image: url(images/blue.png); +} +.successBox +{ + color: #4F8A10; + background-color: #DFF2BF; + background-image: url(images/green.png); +} +.warningBox +{ + color: #9F6000; + background-color: #FEEFB3; + background-image: url(images/yellow.png); +} +.errorBox +{ + color: #D8000C; + background-color: #FFBABA; + background-image: url(images/red.png); +} + +/*Progress Notification*/ +#msgBox +{ + display: none; + height: 30px; + background-color: #272525; + opacity: .9; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=85)"; + filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=85); + padding: 10px; + text-align: left; + position: fixed; + z-index: 99; + bottom: 0; + right: 0; + font-size: 20px; + color: White; + text-align: center; + white-space:nowrap; +} diff --git a/NzbDrone.Web/Content/Settings.css b/NzbDrone.Web/Content/Settings.css index b8c24f9d1..d931b1fa6 100644 --- a/NzbDrone.Web/Content/Settings.css +++ b/NzbDrone.Web/Content/Settings.css @@ -16,8 +16,8 @@ p, h1, form, button{border:0; margin:0; padding:0;} #stylized { - border:solid 2px #b7ddf2; - /*background:#ebf4fb;*/ + /*border:solid 2px #b7ddf2; + background:#ebf4fb;*/ } #stylized h1 diff --git a/NzbDrone.Web/Content/notibar.css b/NzbDrone.Web/Content/notibar.css deleted file mode 100644 index 43e9d26f9..000000000 --- a/NzbDrone.Web/Content/notibar.css +++ /dev/null @@ -1,23 +0,0 @@ -#msgBox -{ - display: none; - height: 30px; - background-color: #272525; - opacity: .9; - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=85)"; - filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=85); - padding: 10px; - text-align: left; - position: fixed; - z-index: 99; - bottom: 0; - right: 0; - font-size: 20px; - color: White; - text-align: center; - white-space:nowrap; -} -#msgCloseButton -{ - float: right; -} diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj index 1df7de569..13bd90bd5 100644 --- a/NzbDrone.Web/NzbDrone.Web.csproj +++ b/NzbDrone.Web/NzbDrone.Web.csproj @@ -140,7 +140,14 @@ + + + + + + + @@ -263,9 +270,6 @@ Always - - Always - Always @@ -293,7 +297,6 @@ - diff --git a/NzbDrone.Web/Views/Log/Index.cshtml b/NzbDrone.Web/Views/Log/Index.cshtml index dcae34133..c39c3bad6 100644 --- a/NzbDrone.Web/Views/Log/Index.cshtml +++ b/NzbDrone.Web/Views/Log/Index.cshtml @@ -31,6 +31,8 @@ Logs } @section MainContent{ +
+ Log entries older than 30 days are automatically deleted.
@{Html.Telerik().Grid().Name("logsGrid") .TableHtmlAttributes(new { @class = "Grid" }) .Columns(columns => diff --git a/NzbDrone.Web/Views/Settings/Indexers.cshtml b/NzbDrone.Web/Views/Settings/Indexers.cshtml index 4e33e4a12..e5f81e03f 100644 --- a/NzbDrone.Web/Views/Settings/Indexers.cshtml +++ b/NzbDrone.Web/Views/Settings/Indexers.cshtml @@ -2,7 +2,7 @@ @model NzbDrone.Web.Models.IndexerSettingsModel @section HeaderContent{ -