Merge branch 'markus101'

Conflicts:
	NzbDrone.Web/Views/Series/Index.cshtml

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;
+}

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<string> {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<QualityTypes>();
 
             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()

NzbDrone.Web/NzbDrone.Web.csproj

@@ -545,6 +545,7 @@
     <Content Include="Content\jquery-ui.custom.css" />
     <Content Include="Content\jquery.jgrowl.css" />
     <Content Include="Content\notibar.css" />
+    <Content Include="Content\Settings.css" />
     <Content Include="Content\Site.css" />
     <Content Include="Content\Images\XbmcNotification.png" />
     <Content Include="favicon.ico" />
@@ -579,7 +580,6 @@
     <Content Include="Scripts\2011.1.414\telerik.window.min.js" />
     <Content Include="Scripts\doTimeout.js" />
     <Content Include="Scripts\episodeSearch.js" />
-    <Content Include="Scripts\gridLoad.js" />
     <Content Include="Scripts\jquery-1.6.1-vsdoc.js" />
     <Content Include="Scripts\jquery-1.6.1.js" />
     <Content Include="Scripts\jquery-1.6.1.min.js" />

NzbDrone.Web/Scripts/gridLoad.js

@@ -1,11 +0,0 @@
-function grid_bind(args) {
-    var id = this.attributes[0].textContent;
-    var parent = $('#' + id).parent();
-    parent.children('.grid-loader').stop().css("top", "0px").fadeIn('slow');
-}
-
-function grid_bound(args) {
-    var id = this.attributes[0].textContent;
-    var parent = $('#' + id).parent();
-    $('.grid-container').children('.grid-loader').stop().fadeOut('slow');
-}

NzbDrone.Web/Views/History/Index.cshtml

@@ -39,12 +39,6 @@ History
                 .Pageable(
                     c =>
                     c.PageSize(20).Position(GridPagerPosition.Bottom).Style(GridPagerStyles.NextPrevious))
-                .ClientEvents(clientEvents =>
-                {
-                    clientEvents.OnDataBinding("grid_bind");
-                    clientEvents.OnDataBound("grid_bound");
-                })
                 .Render();}
-        <span class="grid-loader"><img src="@Url.Content( "~/Content/Images/Loading.gif" )" alt="Loading"/> Loading...</span>
     </div>
 }

NzbDrone.Web/Views/Series/Details.cshtml

@@ -68,11 +68,6 @@
                                                     "<a href='#Rename' onClick=\"renameEpisode('<#= EpisodeFileId #>'); return false;\">Rename</a>");
                          })
             .DetailView(detailView => detailView.ClientTemplate("<div><#= Overview #> </br><#= Path #> </div>"))
-            .ClientEvents(clientEvents =>
-            {
-                clientEvents.OnDataBinding("grid_bind");
-                clientEvents.OnDataBound("grid_bound");
-            })
             .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.EpisodeNumber).Descending()).Enabled(true))
             .Footer(true)
             .DataBinding(
@@ -84,9 +79,6 @@
                 c.Custom().Text("Rename Season").Action("RenameSeason", "Series", new { seasonId = season })
                     .ButtonType(GridButtonType.Text))
             .Render();}
-            <span class="grid-loader">
-                <img src="@Url.Content("~/Content/Images/Loading.gif")" alt="Loading"/>
-                Loading...</span>
         </div>
     }
     @if (Model.Seasons.Any(s => s == 0))
@@ -114,11 +106,6 @@
                                  columns.Bound(c => c.Status).Width(10);
                              })
                     .DetailView(detailView => detailView.ClientTemplate("<div><#= Overview #> </br><#= Path #> </div>"))
-                    .ClientEvents(clientEvents =>
-                    {
-                        clientEvents.OnDataBinding("grid_bind");
-                        clientEvents.OnDataBound("grid_bound");
-                    })
                     .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.EpisodeNumber).Descending()).Enabled(true))
                     .Footer(true)
                     .DataBinding(
@@ -126,9 +113,6 @@
                         d.Ajax().Select("_AjaxSeasonGrid", "Series",
                                         new RouteValueDictionary { { "seriesId", Model.SeriesId }, { "seasonNumber", 0 } }
             )).Render(); }
-            <span class="grid-loader">
-                <img src="@Url.Content("~/Content/Images/Loading.gif")" alt="Loading"/>
-                Loading...</span>
         </div>
     }
 }

NzbDrone.Web/Views/Series/Index.cshtml

@@ -1,4 +1,4 @@
-@using NzbDrone.Core.Repository;
+@using NzbDrone.Core.Repository;
 @using NzbDrone.Web.Models;
 @model IEnumerable<NzbDrone.Core.Repository.Series>
 @section TitleContent{
@@ -55,12 +55,6 @@ Series
                     .Delete("_DeleteAjaxSeriesEditing", "Series"))
                 .Columns(columns =>
                              {
-                                 columns.Command(commands =>
-                                 {
-                                     commands.Edit().ButtonType(GridButtonType.Image);
-                                     commands.Delete().ButtonType(GridButtonType.Image);
-                                 }).Title("Actions").Width(80);
-
                                  columns.Bound(o => o.Title)
                                      .ClientTemplate("<a href=" +
                                                      Url.Action("Details", "Series", new { seriesId = "<#= SeriesId #>" }) +
@@ -76,23 +70,23 @@ Series
                                                                 "<span class=\"progressText\" style=\"width: 125px;\"></span>" +
                                                             "</div>" +
                                                      "</div>");
+                                 columns.Command(commands =>
+                                 {
+                                     commands.Edit().ButtonType(GridButtonType.Image);
+                                     commands.Delete().ButtonType(GridButtonType.Image);
+                                 }).Title("Actions").Width(80);
 
                              })
                 .Editable(editor => editor.Mode(GridEditMode.PopUp))
                 .Sortable(sort => sort.OrderBy(order => order.Add(o => o.Title).Ascending()).Enabled(true))
-                .DetailView(detailView => detailView.ClientTemplate("<div style=\"width:95%\"><#= Overview #></div>"))
+                .DetailView(detailView => detailView.ClientTemplate("<#= Overview #>"))
                 .ClientEvents(clientEvents =>
                 {
                     clientEvents.OnEdit("grid_edit");
                     clientEvents.OnSave("grid_save");
-                    clientEvents.OnDataBinding("grid_bind");
-                    clientEvents.OnDataBound("grid_bound");
                     clientEvents.OnRowDataBound("grid_rowBound");
                 })
                 .Render();}
-        <span class="grid-loader">
-            <img src="@Url.Content("~/Content/Images/Loading.gif")" alt="Loading"/>
-            Loading...</span>
     </div>
 }
 
@@ -100,22 +94,6 @@ Series
     <script type="text/javascript">
         var windowElement;
 
-        (function ($) {
-            $.fn.episodeProgress = function (episodes, totalEpisodes) {
-                return this.each(
-                function () {
-                    var div = $(this);
-                    var progressBar = div.find(".progress");
-
-                    var width = Math.round(episodes / totalEpisodes * 100);
-
-                    progressBar.css("width", width + "%");
-                    div.find(".progressText").html(episodes + " / " + totalEpisodes);
-                });
-            };
-        })(jQuery);
-        
-        
         function grid_edit(args) {
             $(args.form)
             .closest(".t-window")
@@ -162,7 +140,22 @@ Series
 
             $("#progressbar_" + seriesId).episodeProgress(episodeFileCount, episodeCount);
         }
+    </script>
+    <script src="../../Scripts/doTimeout.js" type="text/javascript"></script>
+    <script type="text/javascript">
+        (function ($) {
+            $.fn.episodeProgress = function (episodes, totalEpisodes) {
+                return this.each(
+                function () {
+                    var div = $(this);
+                    var progressBar = div.find(".progress");
 
+                    var width = Math.round(episodes / totalEpisodes * 100);
 
+                    progressBar.css("width", width + "%");
+                    div.find(".progressText").html(episodes + " / " + totalEpisodes);
+                });
+            };
+        })(jQuery);
     </script>
 }

NzbDrone.Web/Views/Settings/Index.cshtml

@@ -11,3 +11,30 @@
     <script src="/Scripts/MicrosoftMvcValidation.js" type="text/javascript"></script>
     @{Html.RenderPartial(ViewData["viewName"].ToString());}
 }
+
+@section Scripts{
+    <script type="text/javascript">
+        $(document).ready(function () {
+            var options = {
+                target: '#result',
+                beforeSubmit: showRequest,
+                success: showResponse,
+                type: 'post',
+                resetForm: false
+            };
+            $('#form').ajaxForm(options);
+        });
+
+        function showRequest(formData, jqForm, options) {
+            $("#result").empty().html('Saving...');
+            $("#form :input").attr("disabled", true);
+            $('#saveAjax').show();
+        }
+
+        function showResponse(responseText, statusText, xhr, $form) {
+            $("#result").empty().html(responseText);
+            $("#form :input").attr("disabled", false);
+            $('#saveAjax').hide();
+        }
+    </script>
+}

NzbDrone.Web/Views/Settings/Indexers.cshtml

@@ -171,31 +171,3 @@
     </fieldset>
 }
 <div id="result" class="hiddenResult"></div>
-
-
-@section Scripts{
-<script type="text/javascript">
-    $(document).ready(function () {
-        var options = {
-            target: '#result',
-            beforeSubmit: showRequest,
-            success: showResponse,
-            type: 'post',
-            resetForm: false
-        };
-        $('#form').ajaxForm(options);
-        $('#save_button').attr('disabled', '');
-    });
-
-    function showRequest(formData, jqForm, options) {
-        $("#result").empty().html('Saving...');
-        $("#form :input").attr("disabled", true);
-    }
-
-    function showResponse(responseText, statusText, xhr, $form) {
-        $("#result").empty().html(responseText);
-        $("#form :input").attr("disabled", false);
-    }
-</script>
-
-}

NzbDrone.Web/Views/Settings/Quality.cshtml

@@ -1,5 +1,19 @@
 @using NzbDrone.Web.Helpers;
 @model NzbDrone.Web.Models.QualityModel
+           
+@section HeaderContent{
+    <link rel="stylesheet" type="text/css" href="../../Content/Settings.css" />
+}
+
+@section TitleContent{
+    Settings
+}
+
+@section ActionMenu{
+    @{Html.RenderPartial("SubMenu");}
+}
+
+@section MainContent{
 @using (Html.BeginForm("SaveQuality", "Settings", FormMethod.Post, new { id = "form", name = "form" }))
 {
     <fieldset style="position: relative;">
@@ -31,36 +45,19 @@
                 }
             </div>
         </div>
-        <input type="submit" id="save_button" value="Save" disabled="disabled" style="position: absolute;
+        <input type="submit" id="save_button" value="Save" style="position: absolute;
             bottom: 0px; display: block; padding-left: 5px;" />
     </fieldset>
 }
 <div id="result" class="hiddenResult">
 </div>
+}
+
 @section Scripts{
+    <script src="/Scripts/MicrosoftAjax.js" type="text/javascript"></script>
+    <script src="/Scripts/MicrosoftMvcValidation.js" type="text/javascript"></script>
+
     <script type="text/javascript">
-        $(document).ready(function () {
-            var options = {
-                target: '#result',
-                beforeSubmit: showRequest,
-                success: showResponse,
-                type: 'post',
-                resetForm: false
-            };
-            $('#form').ajaxForm(options);
-            $('#save_button').attr('disabled', '');
-        });
-
-        function showRequest(formData, jqForm, options) {
-            $("#result").empty().html('Saving...');
-            $("#form :input").attr("disabled", true);
-        }
-
-        function showResponse(responseText, statusText, xhr, $form) {
-            $("#result").empty().html(responseText);
-            $("#form :input").attr("disabled", false);
-        }
-
         function addOption(text, value) {
             var myCombo = $('#DefaultQualityProfileId');
 
@@ -78,7 +75,6 @@
             $("#DefaultQualityProfileId option[value='" + value + "']").html(text);
         }
 
-
         $("#addItem").click(function () {
             $.ajax({
                 url: this.href,
@@ -117,5 +113,28 @@
                 }
             });
         }
+
+        $(document).ready(function () {
+            var options = {
+                target: '#result',
+                beforeSubmit: showRequest,
+                success: showResponse,
+                type: 'post',
+                resetForm: false
+            };
+            $('#form').ajaxForm(options);
+        });
+
+        function showRequest(formData, jqForm, options) {
+            $("#result").empty().html('Saving...');
+            $("#form :input").attr("disabled", true);
+            $('#saveAjax').show();
+        }
+
+        function showResponse(responseText, statusText, xhr, $form) {
+            $("#result").empty().html(responseText);
+            $("#form :input").attr("disabled", false);
+            $('#saveAjax').hide();
+        }
     </script>
 }

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" }))
+
-{
+@section HeaderContent{
-    <fieldset>
+    <link rel="stylesheet" type="text/css" href="../../Content/Settings.css" />
-        <legend>SABnzbd</legend>
-        <button type="button" onclick="autoConfigureSab()">
-            Auto-Configure</button>
-        <div class="config-section">
-            <div class="config-group">
-                <div class="config-title">@Html.LabelFor(m => m.SabHost)</div>
-                <div class="config-value">@Html.TextBoxFor(m => m.SabHost)</div>
-            </div>
-            <div class="config-group2">
-                <div class="config-validation">@Html.ValidationMessageFor(m => m.SabHost)</div>
-                <div class="config-description">@Html.DescriptionFor(m => m.SabHost)</div>
-            </div>
-        </div>
-        <div class="config-section">
-            <div class="config-group">
-                <div class="config-title">@Html.LabelFor(m => m.SabPort)</div>
-                <div class="config-value">@Html.TextBoxFor(m => m.SabPort)</div>
-            </div>
-            <div class="config-group2">
-                <div class="config-validation">@Html.ValidationMessageFor(m => m.SabPort)</div>
-                <div class="config-description">@Html.DescriptionFor(m => m.SabPort)</div>
-            </div>
-        </div>
-        <div class="config-section">
-            <div class="config-group">
-                <div class="config-title">@Html.LabelFor(m => m.SabApiKey)</div>
-                <div class="config-value">@Html.TextBoxFor(m => m.SabApiKey)</div>
-            </div>
-            <div class="config-group2">
-                <div class="config-validation">@Html.ValidationMessageFor(m => m.SabApiKey)</div>
-                <div class="config-description">@Html.DescriptionFor(m => m.SabApiKey)</div>
-            </div>
-        </div>
-        <div class="config-section">
-            <div class="config-group">
-                <div class="config-title">@Html.LabelFor(m => m.SabUsername)</div>
-                <div class="config-value">@Html.TextBoxFor(m => m.SabUsername)</div>
-            </div>
-            <div class="config-group2">
-                <div class="config-validation">@Html.ValidationMessageFor(m => m.SabUsername)</div>
-                <div class="config-description">@Html.DescriptionFor(m => m.SabUsername)</div>
-            </div>
-        </div>
-        <div class="config-section">
-            <div class="config-group">
-                <div class="config-title">@Html.LabelFor(m => m.SabPassword)</div>
-                <div class="config-value">@Html.TextBoxFor(m => m.SabPassword)</div>
-            </div>
-            <div class="config-group2">
-                <div class="config-validation">@Html.ValidationMessageFor(m => m.SabPassword)</div>
-                <div class="config-description">@Html.DescriptionFor(m => m.SabPassword)</div>
-            </div>
-        </div>
-        <div class="config-section">
-            <div class="config-group">
-                <div class="config-title">@Html.LabelFor(m => m.SabTvCategory)</div>
-                <div class="config-value">@Html.TextBoxFor(m => m.SabTvCategory)</div>
-            </div>
-            <div class="config-group2">
-                <div class="config-validation">@Html.ValidationMessageFor(m => m.SabTvCategory)</div>
-                <div class="config-description">@Html.DescriptionFor(m => m.SabTvCategory)</div>
-            </div>
-        </div>
-        <div class="config-section">
-            <div class="config-group">
-                <div class="config-title">@Html.LabelFor(m => m.SabTvPriority)</div>
-                <div class="config-value">@Html.DropDownListFor(m => m.SabTvPriority, Model.PrioritySelectList)</div>
-            </div>
-            <div class="config-group2">
-                <div class="config-validation">@Html.ValidationMessageFor(m => m.SabTvPriority)</div>
-                <div class="config-description">@Html.DescriptionFor(m => m.SabTvPriority)</div>
-            </div>
-        </div>
-        <div class="config-section">
-            <div class="config-group">
-                <div class="config-title">@Html.LabelFor(m => m.SabDropDirectory)</div>
-                <div class="config-value">
-                    @{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();}
-                </div>
-            </div>
-            <div class="config-group2">
-                <div class="config-validation">@Html.ValidationMessageFor(m => m.SabDropDirectory)</div>
-                <div class="config-description">@Html.DescriptionFor(m => m.SabDropDirectory)</div>
-            </div>
-        </div>
-        <input type="submit" id="save_button" value="Save" disabled="disabled" />
-    </fieldset>
 }
-<div id="result" class="hiddenResult">
+
-</div>
+@section TitleContent{
+    Settings
+}
+
+@section ActionMenu{
+    @{Html.RenderPartial("SubMenu");}
+}
+
+@section MainContent{
+    <div id="stylized">
+    
+    @using (Html.BeginForm("SaveSabnzbd", "Settings", FormMethod.Post, new { id = "form", name = "form", @class = "settingsForm" }))
+    {
+        <h1>SABnzbd</h1>
+        <p></p>
+    
+        <label>Auto-Configure
+        <span class="small">If no Username and Password is set and SABnzbd is on the same system as NzbDrone, you cna auto-configure it</span>
+        </label>
+        <input type="button" onclick="autoConfigureSab(); return false;" value="Auto-Configure" />
+
+        <label>@Html.LabelFor(m => m.SabHost)
+        <span class="small">@Html.DescriptionFor(m => m.SabHost)</span>
+        </label>
+        @Html.TextBoxFor(m => m.SabHost)
+
+        <label>@Html.LabelFor(m => m.SabPort)
+        <span class="small">@Html.DescriptionFor(m => m.SabPort)</span>
+        </label>
+        @Html.TextBoxFor(m => m.SabPort)
+
+        <label>@Html.LabelFor(m => m.SabApiKey)
+        <span class="small">@Html.DescriptionFor(m => m.SabApiKey)</span>
+        </label>
+        @Html.TextBoxFor(m => m.SabApiKey)
+
+        <label>@Html.LabelFor(m => m.SabUsername)
+        <span class="small">@Html.DescriptionFor(m => m.SabUsername)</span>
+        </label>
+        @Html.TextBoxFor(m => m.SabUsername)
+
+        <label>@Html.LabelFor(m => m.SabPassword)
+        <span class="small">@Html.DescriptionFor(m => m.SabPassword)</span>
+        </label>
+        @Html.TextBoxFor(m => m.SabPassword)
+
+        <label>@Html.LabelFor(m => m.SabTvCategory)
+        <span class="small">@Html.DescriptionFor(m => m.SabTvCategory)</span>
+        </label>
+        @Html.TextBoxFor(m => m.SabTvCategory)
+
+        <label>@Html.LabelFor(m => m.SabTvPriority)
+        <span class="small">@Html.DescriptionFor(m => m.SabTvPriority)</span>
+        </label>
+        @Html.DropDownListFor(m => m.SabTvPriority, Model.PrioritySelectList)
+
+        <label>@Html.LabelFor(m => m.SabDropDirectory)
+        <span class="small">@Html.DescriptionFor(m => m.SabDropDirectory)</span>
+        </label>
+        @Html.TextBoxFor(m => m.SabDropDirectory)
+
+        <button type="submit" id="save_button" >Save</button><img src="../../Content/Images/ajax-loader.gif" alt="Loader" id="saveAjax"/>
+    }
+    </div>
+
+    <div id="result" class="hiddenResult"></div>
+}
+
 @section Scripts{
+    <script src="/Scripts/MicrosoftAjax.js" type="text/javascript"></script>
+    <script src="/Scripts/MicrosoftMvcValidation.js" type="text/javascript"></script>
+
     <script type="text/javascript">
         var autoConfigureSabUrl = '@Url.Action("AutoConfigureSab", "Settings")';
 
@@ -130,17 +107,18 @@
                 resetForm: false
             };
             $('#form').ajaxForm(options);
-            $('#save_button').attr('disabled', '');
         });
 
         function showRequest(formData, jqForm, options) {
             $("#result").empty().html('Saving...');
             $("#form :input").attr("disabled", true);
+            $('#saveAjax').show();
         }
 
         function showResponse(responseText, statusText, xhr, $form) {
             $("#result").empty().html(responseText);
             $("#form :input").attr("disabled", false);
+            $('#saveAjax').hide();
         }
     </script>
 }

NzbDrone.Web/Views/Settings/Test.cshtml

@@ -1,136 +1,94 @@
-<script>
+<style>
-    /*
+/*body{
-    * jQuery doTimeout: Like setTimeout, but better! - v1.0 - 3/3/2010
+font-family:"Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, Helvetica, sans-serif;
-    * http://benalman.com/projects/jquery-dotimeout-plugin/
+font-size:12px;
-    * 
+}
-    * Copyright (c) 2010 "Cowboy" Ben Alman
+p, h1, form, button{border:0; margin:0; padding:0;}*/
-    * Dual licensed under the MIT and GPL licenses.
+.spacer{clear:both; height:1px;}
-    * http://benalman.com/about/license/
+/* ----------- My Form ----------- */
-    */
+.myform{
-    (function ($) { var a = {}, c = "doTimeout", d = Array.prototype.slice; $[c] = function () { return b.apply(window, [0].concat(d.call(arguments))) }; $.fn[c] = function () { var f = d.call(arguments), e = b.apply(this, [c + f[0]].concat(f)); return typeof f[0] === "number" || typeof f[1] === "number" ? this : e }; function b(l) { var m = this, h, k = {}, g = l ? $.fn : $, n = arguments, i = 4, f = n[1], j = n[2], p = n[3]; if (typeof f !== "string") { i--; f = l = 0; j = n[1]; p = n[2] } if (l) { h = m.eq(0); h.data(l, k = h.data(l) || {}) } else { if (f) { k = a[f] || (a[f] = {}) } } k.id && clearTimeout(k.id); delete k.id; function e() { if (l) { h.removeData(l) } else { if (f) { delete a[f] } } } function o() { k.id = setTimeout(function () { k.fn() }, j) } if (p) { k.fn = function (q) { if (typeof p === "string") { p = g[p] } p.apply(m, d.call(n, i)) === true && !q ? o() : e() }; o() } else { if (k.fn) { j === undefined ? e() : k.fn(j === false); return true } else { e() } } } })(jQuery);
+margin:0 auto;
-</script>
+width:400px;
-
+padding:14px;
-<script>
-    (function ($) {
-        $.fn.episodeProgress = function (episodes, totalEpisodes) {
-            return this.each(
-			    function () {
-			        var div = $(this);
-			        var progressBar = div.find(".progress");
-
-			        var width = Math.round(episodes / totalEpisodes * 100);
-
-			        progressBar.css("width", width + "%");
-
-			        if (width > 97) {
-			            progressBar.css("-khtml-border-top-right-radius", "7px");
-			            progressBar.css("border-top-right-radius", "7px");
-			            progressBar.css("-moz-border-top-right-radius", "7px");
-			            progressBar.css("-webkit-border-top-right-radius", "7px");
-
-			            progressBar.css("-khtml-border-bottom-right-radius", "7px");
-			            progressBar.css("border-bottom-right-radius", "7px");
-			            progressBar.css("-moz-border-bottom-right-radius", "7px");
-			            progressBar.css("-webkit-border-bottom-right-radius", "7px");
-			        }
-
-			        div.find(".progressText").html(episodes + " / " + totalEpisodes);
-			    }
-		    );
-        };
-    })(jQuery);
-</script>
-
-<style>
-/* progress bar container */
-.progressbar
-{
-    border:1px solid grey;
-    -khtml-border-radius:8px;
-    border-radius:8px;
-    -moz-border-radius:8px;
-    -webkit-border-radius:8px;
-    width:125px;
-    height:20px;
-    position:relative;
-    color:black;
 }
 
-/* apply curves to the progress bar */
+/* ----------- stylized ----------- */
-.progress
+#stylized{
-{
+border:solid 2px #b7ddf2;
-    -khtml-border-top-left-radius:7px;
+background:#ebf4fb;
-    border-top-left-radius:7px;
-    -moz-border-top-left-radius:7px;
-    -webkit-border-top-left-radius:7px;
-    
-    -khtml-border-bottom-left-radius:7px;
-    border-bottom-left-radius:7px;
-    -moz-border-bottom-left-radius:7px;
-    -webkit-border-bottom-left-radius:7px;
 }
-
+#stylized h1 {
-/* color bar */
+font-size:14px;
-.progressbar div.progress
+font-weight:bold;
-{
+margin-bottom:8px;
-    position:absolute;
-    width:0;
-    height:100%;
-    overflow:hidden;
-    background-color:#065EFE;
 }
-/* text on bar */
+#stylized p{
-.progressbar div.progress .progressText{
+font-size:11px;
-    position:absolute;
+color:#666666;
-    text-align:center;
+margin-bottom:20px;
-    color:white;
+border-bottom:solid 1px #b7ddf2;
+padding-bottom:10px;
 }
-
+#stylized label{
-/* text off bar */
+display:block;
-.progressbar div.progressText{
+font-weight:bold;
-    position:absolute;
+text-align:right;
-    width:100%;
+width:140px;
-    height:100%;
+float:left;
-    text-align:center;
+}
+#stylized .small{
+color:#666666;
+display:block;
+font-size:11px;
+font-weight:normal;
+text-align:right;
+width:140px;
+}
+#stylized input{
+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:150px;
+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;
 }
 </style>
 
-<div id="progressbar" class="progressbar">
+<div id="stylized" class="myform">
-    <div class="progressText"></div>
+    <form id="form" name="form" method="post">
-    <div class="progress">
+    <fieldset>
-        <span class="progressText" style="width: 125px;"></span>
+        <h1>Sign-up form</h1>
-    </div>
+        <p>This is the basic look of my form without table</p>
+
+        <label>Name
+        <span class="small">Add your name</span>
+        </label>
+        <input type="text" name="name" id="name" />
+
+        <label>Email
+        <span class="small">Add a valid address</span>
+        </label>
+        <input type="text" name="email" id="email" />
+
+        <label>Password
+        <span class="small">Min. size 6 chars</span>
+        </label>
+        <input type="text" name="password" id="password" />
+
+        <button type="submit">Sign-up</button>
+        <div class="spacer"></div>
+        </fieldset>
+    </form>
 </div>
-
-<div id="progressbar2" class="progressbar">
-    <div class="progressText"></div>
-    <div class="progress">
-        <span class="progressText" style="width: 125px;"></span>
-    </div>
-</div>
-
-<script>
-    $(document).ready(function() {
-
-        progress(65, 100, 'progressbar');
-        progress(22, 25, 'progressbar2');
-
-    });
-    
-    function progress(episodes, episodeTotal, elementName) {
-        var counter = 0;
-        var max = episodes + 1;
-
-        $.doTimeout(20, function () {
-            if (counter == max) {
-                return false;
-            }
-
-            $("#" + elementName).episodeProgress(counter, episodeTotal);
-            counter++;
-
-            return true;
-        });
-    };
-    
-</script>

NzbDrone.Web/Views/Shared/_Layout.cshtml

@@ -65,7 +65,6 @@
 
                     .AddGroup("NzbDrone", group => group
                                         .Add("Notification.js")
-                                        .Add("gridLoad.js")
                                         .Add("episodeSearch.js"))
 
                                         ))

NzbDrone.Web/Views/System/PendingProcessing.cshtml

@@ -29,13 +29,7 @@ Pending Processing
                 .Pageable(
                     c =>
                     c.PageSize(20).Position(GridPagerPosition.Bottom).Style(GridPagerStyles.NextPrevious))
-                .ClientEvents(clientEvents =>
-                {
-                    clientEvents.OnDataBinding("grid_bind");
-                    clientEvents.OnDataBound("grid_bound");
-                })
                 .Render();}
-        <span class="grid-loader"><img src="@Url.Content( "~/Content/Images/Loading.gif" )" alt="Loading"/> Loading...</span>
     </div>
 }
 <script type="text/javascript">

NzbDrone.Web/Views/Upcoming/Index.cshtml

@@ -31,18 +31,12 @@ Upcoming
                         "<div><b>Overview: </b><#= Overview #></div>" +
                         "</fieldset>"
                                                     ))
-                    .ClientEvents(clientEvents =>
-                    {
-                        clientEvents.OnDataBinding("grid_bind");
-                        clientEvents.OnDataBound("grid_bound");
-                    })
                     .DataBinding(data => data.Ajax().Select("_AjaxBindingYesterday", "Upcoming"))
                     .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.AirDate).Ascending()).Enabled(true))
                     //.Pageable(c => c.PageSize(20).Position(GridPagerPosition.Both).Style(GridPagerStyles.PageInput | GridPagerStyles.NextPreviousAndNumeric))
                     //.Filterable()
                     //.ClientEvents(c => c.OnRowDataBound("onRowDataBound"))
                     .Render();}
-            <span class="grid-loader"><img src="@Url.Content( "~/Content/Images/Loading.gif" )" alt="Loading"/> Loading...</span>
         </div>
     </div>
     <br />
@@ -68,15 +62,9 @@ Upcoming
                         "<div><b>Overview: </b><#= Overview #></div>" +
                         "</fieldset>"
                                                     ))
-                    .ClientEvents(clientEvents =>
-                    {
-                        clientEvents.OnDataBinding("grid_bind");
-                        clientEvents.OnDataBound("grid_bound");
-                    })
                     .DataBinding(data => data.Ajax().Select("_AjaxBindingToday", "Upcoming"))
                     .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.AirDate).Ascending()).Enabled(true))
                     .Render();}
-            <span class="grid-loader"><img src="@Url.Content( "~/Content/Images/Loading.gif" )" alt="Loading"/> Loading...</span>
         </div>
     </div>
     <br />
@@ -103,15 +91,10 @@ Upcoming
                         "<div><b>Overview: </b><#= Overview #></div>" +
                         "</fieldset>"
                                                   ))
-                    .ClientEvents(clientEvents =>
+
-                    {
-                        clientEvents.OnDataBinding("grid_bind");
-                        clientEvents.OnDataBound("grid_bound");
-                    })
                     .DataBinding(data => data.Ajax().Select("_AjaxBindingTomorrow", "Upcoming"))
                     .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.AirDate).Ascending()).Enabled(true))
                     .Render();}
-            <span class="grid-loader"><img src="@Url.Content( "~/Content/Images/Loading.gif" )" alt="Loading"/> Loading...</span>
         </div>
     </div>
     <br />
@@ -138,15 +121,9 @@ Upcoming
                         "<div><b>Overview: </b><#= Overview #></div>" +
                         "</fieldset>"
                                                   ))
-                    .ClientEvents(clientEvents =>
-                    {
-                        clientEvents.OnDataBinding("grid_bind");
-                        clientEvents.OnDataBound("grid_bound");
-                    })
                     .DataBinding(data => data.Ajax().Select("_AjaxBindingWeek", "Upcoming"))
                     .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.AirDate).Ascending()).Enabled(true))
                     .Render();}
-            <span class="grid-loader"><img src="@Url.Content( "~/Content/Images/Loading.gif" )" alt="Loading"/> Loading...</span>
         </div>
     </div>
 }