From 63e303af3b470ace2f5194d11a9c2b1df26e8af3 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Wed, 29 Jun 2011 22:22:34 -0700 Subject: [PATCH] New layout for Settings/Sabnzbd Fixed scripting for Settings/Quality --- NzbDrone.Web/Content/Settings.css | 100 +++++++++ .../Controllers/SettingsController.cs | 8 +- NzbDrone.Web/NzbDrone.Web.csproj | 1 + NzbDrone.Web/Views/Series/Index.cshtml | 2 +- NzbDrone.Web/Views/Settings/Index.cshtml | 27 +++ NzbDrone.Web/Views/Settings/Indexers.cshtml | 30 +-- NzbDrone.Web/Views/Settings/Quality.cshtml | 67 ++++-- NzbDrone.Web/Views/Settings/Sabnzbd.cshtml | 178 +++++++-------- NzbDrone.Web/Views/Settings/Test.cshtml | 206 +++++++----------- 9 files changed, 335 insertions(+), 284 deletions(-) create mode 100644 NzbDrone.Web/Content/Settings.css diff --git a/NzbDrone.Web/Content/Settings.css b/NzbDrone.Web/Content/Settings.css new file mode 100644 index 000000000..6ba5707bf --- /dev/null +++ b/NzbDrone.Web/Content/Settings.css @@ -0,0 +1,100 @@ +body +{ + /*font-family:"Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, Helvetica, sans-serif; + font-size:12px;*/ +} + +p, h1, form, button{border:0; margin:0; padding:0;} +.spacer{clear:both; height:1px;} + +.settingsForm +{ + /*margin:0 auto;*/ + width: 600px; + padding: 14px; +} + +#stylized +{ + border:solid 2px #b7ddf2; + /*background:#ebf4fb;*/ +} + +#stylized h1 +{ + font-size:20px; + font-weight:bold; + margin-bottom:8px; +} + +#stylized p +{ + font-size:11px; + color:#666666; + margin-bottom:20px; + border-bottom:solid 1px #b7ddf2; + padding-bottom:10px; +} + +#stylized label +{ + display:block; + font-weight:bold; + text-align:right; + width:340px; + float:left; +} + +#stylized .small +{ + color:#666666; + display:block; + font-size:11px; + font-weight:normal; + text-align:right; + width:340px; +} + +#stylized input, select +{ + float:left; + font-size:12px; + padding:4px 2px; + border:solid 1px #aacfe4; + width:200px; + margin:2px 0 20px 10px; +} + +#stylized button +{ + clear:both; + margin-left:220px; + margin-bottom: 10px; + width:125px; + height:31px; + background:#666666 url(img/button.png) no-repeat; + text-align:center; + line-height:31px; + color:#FFFFFF; + font-size:11px; + font-weight:bold; +} + +#save_button:hover +{ + border-bottom-style: solid; + border-bottom-width: 4px; + border-color: #3C3C3C; + /* Set padding to prevent fieldset border from moving when button is highlighted... WINNING! */ + padding-bottom: 0px; + padding-top: 4px; +} + +#saveAjax +{ + padding-left: 6px; + margin-bottom: -7px; + width: 20px; + height: 20px; + display: none; +} \ No newline at end of file diff --git a/NzbDrone.Web/Controllers/SettingsController.cs b/NzbDrone.Web/Controllers/SettingsController.cs index 528a0fd0d..2f4583a80 100644 --- a/NzbDrone.Web/Controllers/SettingsController.cs +++ b/NzbDrone.Web/Controllers/SettingsController.cs @@ -94,8 +94,6 @@ namespace NzbDrone.Web.Controllers public ActionResult Sabnzbd() { - ViewData["viewName"] = "Sabnzbd"; - var sabDropDir = _configProvider.SabDropDirectory; var selectList = new SelectList(new List {sabDropDir}, sabDropDir); @@ -112,13 +110,11 @@ namespace NzbDrone.Web.Controllers SabDropDirectorySelectList = selectList }; - return View("Index", model); + return View(model); } public ActionResult Quality() { - ViewData["viewName"] = "Quality"; - var qualityTypes = new List(); foreach (QualityTypes qual in Enum.GetValues(typeof(QualityTypes))) @@ -139,7 +135,7 @@ namespace NzbDrone.Web.Controllers QualityProfileSelectList = qualityProfileSelectList }; - return View("Index", model); + return View(model); } public ActionResult Notifications() diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj index 1658f4f76..1466a16e2 100644 --- a/NzbDrone.Web/NzbDrone.Web.csproj +++ b/NzbDrone.Web/NzbDrone.Web.csproj @@ -544,6 +544,7 @@ + diff --git a/NzbDrone.Web/Views/Series/Index.cshtml b/NzbDrone.Web/Views/Series/Index.cshtml index 16b9f4ca8..9748c0720 100644 --- a/NzbDrone.Web/Views/Series/Index.cshtml +++ b/NzbDrone.Web/Views/Series/Index.cshtml @@ -79,7 +79,7 @@ Series }) .Editable(editor => editor.Mode(GridEditMode.PopUp)) .Sortable(sort => sort.OrderBy(order => order.Add(o => o.Title).Ascending()).Enabled(true)) - .DetailView(detailView => detailView.ClientTemplate("
<#= Overview #>
")) + .DetailView(detailView => detailView.ClientTemplate("<#= Overview #>")) .ClientEvents(clientEvents => { clientEvents.OnEdit("grid_edit"); diff --git a/NzbDrone.Web/Views/Settings/Index.cshtml b/NzbDrone.Web/Views/Settings/Index.cshtml index 7da7aa1ba..1863d0a29 100644 --- a/NzbDrone.Web/Views/Settings/Index.cshtml +++ b/NzbDrone.Web/Views/Settings/Index.cshtml @@ -11,3 +11,30 @@ @{Html.RenderPartial(ViewData["viewName"].ToString());} } + +@section Scripts{ + +} \ No newline at end of file diff --git a/NzbDrone.Web/Views/Settings/Indexers.cshtml b/NzbDrone.Web/Views/Settings/Indexers.cshtml index 44aca26e2..d1b58a6dd 100644 --- a/NzbDrone.Web/Views/Settings/Indexers.cshtml +++ b/NzbDrone.Web/Views/Settings/Indexers.cshtml @@ -170,32 +170,4 @@ } -
- - -@section Scripts{ - - -} \ No newline at end of file +
\ No newline at end of file diff --git a/NzbDrone.Web/Views/Settings/Quality.cshtml b/NzbDrone.Web/Views/Settings/Quality.cshtml index 96bb92aa6..7b98e773c 100644 --- a/NzbDrone.Web/Views/Settings/Quality.cshtml +++ b/NzbDrone.Web/Views/Settings/Quality.cshtml @@ -1,5 +1,19 @@ @using NzbDrone.Web.Helpers; @model NzbDrone.Web.Models.QualityModel + +@section HeaderContent{ + +} + +@section TitleContent{ + Settings +} + +@section ActionMenu{ + @{Html.RenderPartial("SubMenu");} +} + +@section MainContent{ @using (Html.BeginForm("SaveQuality", "Settings", FormMethod.Post, new { id = "form", name = "form" })) {
@@ -31,36 +45,19 @@ } -
}
+} + @section Scripts{ + + + } diff --git a/NzbDrone.Web/Views/Settings/Sabnzbd.cshtml b/NzbDrone.Web/Views/Settings/Sabnzbd.cshtml index d637b704c..a0e5a0ec5 100644 --- a/NzbDrone.Web/Views/Settings/Sabnzbd.cshtml +++ b/NzbDrone.Web/Views/Settings/Sabnzbd.cshtml @@ -1,105 +1,82 @@ @using NzbDrone.Web.Helpers; @model NzbDrone.Web.Models.SabnzbdSettingsModel -@using (Html.BeginForm("SaveSabnzbd", "Settings", FormMethod.Post, new { id = "form", name = "form" })) -{ -
- SABnzbd - -
-
-
@Html.LabelFor(m => m.SabHost)
-
@Html.TextBoxFor(m => m.SabHost)
-
-
-
@Html.ValidationMessageFor(m => m.SabHost)
-
@Html.DescriptionFor(m => m.SabHost)
-
-
-
-
-
@Html.LabelFor(m => m.SabPort)
-
@Html.TextBoxFor(m => m.SabPort)
-
-
-
@Html.ValidationMessageFor(m => m.SabPort)
-
@Html.DescriptionFor(m => m.SabPort)
-
-
-
-
-
@Html.LabelFor(m => m.SabApiKey)
-
@Html.TextBoxFor(m => m.SabApiKey)
-
-
-
@Html.ValidationMessageFor(m => m.SabApiKey)
-
@Html.DescriptionFor(m => m.SabApiKey)
-
-
-
-
-
@Html.LabelFor(m => m.SabUsername)
-
@Html.TextBoxFor(m => m.SabUsername)
-
-
-
@Html.ValidationMessageFor(m => m.SabUsername)
-
@Html.DescriptionFor(m => m.SabUsername)
-
-
-
-
-
@Html.LabelFor(m => m.SabPassword)
-
@Html.TextBoxFor(m => m.SabPassword)
-
-
-
@Html.ValidationMessageFor(m => m.SabPassword)
-
@Html.DescriptionFor(m => m.SabPassword)
-
-
-
-
-
@Html.LabelFor(m => m.SabTvCategory)
-
@Html.TextBoxFor(m => m.SabTvCategory)
-
-
-
@Html.ValidationMessageFor(m => m.SabTvCategory)
-
@Html.DescriptionFor(m => m.SabTvCategory)
-
-
-
-
-
@Html.LabelFor(m => m.SabTvPriority)
-
@Html.DropDownListFor(m => m.SabTvPriority, Model.PrioritySelectList)
-
-
-
@Html.ValidationMessageFor(m => m.SabTvPriority)
-
@Html.DescriptionFor(m => m.SabTvPriority)
-
-
-
-
-
@Html.LabelFor(m => m.SabDropDirectory)
-
- @{Html.Telerik().ComboBoxFor(m => m.SabDropDirectory) - .BindTo(Model.SabDropDirectorySelectList) - .DataBinding(binding => binding.Ajax().Select("_autoCompletePath", "Directory").Delay(400).Cache(false)) - .Filterable(f => f.FilterMode(AutoCompleteFilterMode.StartsWith)) - .HighlightFirstMatch(true) - .HtmlAttributes(new { style = "margin-left: -2px; width: 220px;" }) - .Render();} -
-
-
-
@Html.ValidationMessageFor(m => m.SabDropDirectory)
-
@Html.DescriptionFor(m => m.SabDropDirectory)
-
-
- -
+ +@section HeaderContent{ + } -
-
+ +@section TitleContent{ + Settings +} + +@section ActionMenu{ + @{Html.RenderPartial("SubMenu");} +} + +@section MainContent{ +
+ + @using (Html.BeginForm("SaveSabnzbd", "Settings", FormMethod.Post, new { id = "form", name = "form", @class = "settingsForm" })) + { +

SABnzbd

+

+ + + + + + @Html.TextBoxFor(m => m.SabHost) + + + @Html.TextBoxFor(m => m.SabPort) + + + @Html.TextBoxFor(m => m.SabApiKey) + + + @Html.TextBoxFor(m => m.SabUsername) + + + @Html.TextBoxFor(m => m.SabPassword) + + + @Html.TextBoxFor(m => m.SabTvCategory) + + + @Html.DropDownListFor(m => m.SabTvPriority, Model.PrioritySelectList) + + + @Html.TextBoxFor(m => m.SabDropDirectory) + + Loader + } +
+ +
+} + @section Scripts{ + + + } diff --git a/NzbDrone.Web/Views/Settings/Test.cshtml b/NzbDrone.Web/Views/Settings/Test.cshtml index 9349f7ef8..27792a291 100644 --- a/NzbDrone.Web/Views/Settings/Test.cshtml +++ b/NzbDrone.Web/Views/Settings/Test.cshtml @@ -1,136 +1,94 @@ - - - - - -
-
-
- -
-
+
+
+
+

Sign-up form

+

This is the basic look of my form without table

-
-
-
- -
-
+ + - \ No newline at end of file + +
+
+
+
\ No newline at end of file