From 0645a9e5521d1a0bcbf6dbc7fcc94f0dc6ce2ce9 Mon Sep 17 00:00:00 2001
From: Mark McDowall <markus.mcd5@gmail.com>
Date: Wed, 18 May 2011 16:10:25 -0700
Subject: [PATCH 1/2] EpisodeSorting UI has descriptions, removed extra
 options.

Config for EpisodeSorting variables added.
---
 .../Providers/Core/ConfigProvider.cs          | 48 ++++++++++++++
 .../Controllers/SettingsController.cs         | 36 +++++-----
 NzbDrone.Web/Models/EpisodeSortingModel.cs    | 17 +++--
 .../Views/Settings/EpisodeSorting.cshtml      | 66 +++++++++++--------
 4 files changed, 116 insertions(+), 51 deletions(-)

diff --git a/NzbDrone.Core/Providers/Core/ConfigProvider.cs b/NzbDrone.Core/Providers/Core/ConfigProvider.cs
index 46811aa5c..8cb41e6ac 100644
--- a/NzbDrone.Core/Providers/Core/ConfigProvider.cs
+++ b/NzbDrone.Core/Providers/Core/ConfigProvider.cs
@@ -188,6 +188,30 @@ namespace NzbDrone.Core.Providers.Core
             set { SetValue("BlackholeDirectory", value); }
         }
 
+        public virtual bool SeriesName
+        {
+            get { return GetValueBoolean("Sorting_SeriesName", true); }
+            set { SetValue("Sorting_SeriesName", value); }
+        }
+
+        public virtual bool EpisodeName
+        {
+            get { return GetValueBoolean("Sorting_EpisodeName", true); }
+            set { SetValue("Sorting_EpisodeName", value); }
+        }
+
+        public virtual bool ReplaceSpaces
+        {
+            get { return GetValueBoolean("Sorting_ReplaceSpaces", true); }
+            set { SetValue("Sorting_ReplaceSpaces", value); }
+        }
+
+        public virtual bool AppendQuality
+        {
+            get { return GetValueBoolean("Sorting_AppendQaulity", true); }
+            set { SetValue("Sorting_AppendQaulity", value); }
+        }
+
         public virtual bool UseSeasonFolder
         {
             get { return GetValueBoolean("Sorting_SeasonFolder", true); }
@@ -195,6 +219,30 @@ namespace NzbDrone.Core.Providers.Core
             set { SetValue("Sorting_SeasonFolder", value); }
         }
 
+        public virtual string SeasonFolderFormat
+        {
+            get { return GetValue("Sorting_SeasonFolderFormat", "Season %s", false); }
+            set { SetValue("Sorting_SeasonFolderFormat", value); }
+        }
+
+        public virtual int SeparatorStyle
+        {
+            get { return GetValueInt("Sorting_SeparatorStyle"); }
+            set { SetValue("Sorting_SeparatorStyle", value); }
+        }
+
+        public virtual int NumberStyle
+        {
+            get { return GetValueInt("Sorting_NumberStyle", 2); }
+            set { SetValue("Sorting_NumberStyle", value); }
+        }
+
+        public virtual int MultiEpisodeStyle
+        {
+            get { return GetValueInt("Sorting_MultiEpisodeStyle"); }
+            set { SetValue("Sorting_MultiEpisodeStyle", value); }
+        }
+
         public virtual int DefaultQualityProfile
         {
             get { return GetValueInt("DefaultQualityProfile", 1); }
diff --git a/NzbDrone.Web/Controllers/SettingsController.cs b/NzbDrone.Web/Controllers/SettingsController.cs
index db8b0c3f6..26a627e89 100644
--- a/NzbDrone.Web/Controllers/SettingsController.cs
+++ b/NzbDrone.Web/Controllers/SettingsController.cs
@@ -182,16 +182,15 @@ namespace NzbDrone.Web.Controllers
 
             var model = new EpisodeSortingModel();
 
-            model.ShowName = Convert.ToBoolean(_configProvider.GetValue("Sorting_ShowName", true, true));
-            model.EpisodeName = Convert.ToBoolean(_configProvider.GetValue("Sorting_EpisodeName", true, true));
-            model.ReplaceSpaces = Convert.ToBoolean(_configProvider.GetValue("Sorting_ReplaceSpaces", false, true));
-            model.AppendQuality = Convert.ToBoolean(_configProvider.GetValue("Sorting_AppendQuality", false, true));
-            model.UseAirByDate = Convert.ToBoolean(_configProvider.GetValue("Sorting_UseAirByDate", true, true));
+            model.SeriesName = _configProvider.SeriesName;
+            model.EpisodeName = _configProvider.EpisodeName;
+            model.ReplaceSpaces = _configProvider.ReplaceSpaces;
+            model.AppendQuality = _configProvider.AppendQuality;
             model.SeasonFolders = _configProvider.UseSeasonFolder;
-            model.SeasonFolderFormat = _configProvider.GetValue("Sorting_SeasonFolderFormat", "Season %s", true);
-            model.SeparatorStyle = Convert.ToInt32(_configProvider.GetValue("Sorting_SeparatorStyle", 0, true));
-            model.NumberStyle = Convert.ToInt32(_configProvider.GetValue("Sorting_NumberStyle", 2, true));
-            model.MultiEpisodeStyle = Convert.ToInt32(_configProvider.GetValue("Sorting_MultiEpisodeStyle", 0, true));
+            model.SeasonFolderFormat = _configProvider.SeasonFolderFormat;
+            model.SeparatorStyle = _configProvider.SeparatorStyle;
+            model.NumberStyle = _configProvider.NumberStyle;
+            model.MultiEpisodeStyle = _configProvider.MultiEpisodeStyle;
 
             model.SeparatorStyles = new SelectList(EpisodeSortingHelper.GetSeparatorStyles(), "Id", "Name");
             model.NumberStyles = new SelectList(EpisodeSortingHelper.GetNumberStyles(), "Id", "Name");
@@ -535,16 +534,15 @@ namespace NzbDrone.Web.Controllers
 
             if (ModelState.IsValid)
             {
-                _configProvider.SetValue("Sorting_ShowName", data.ShowName.ToString());
-                _configProvider.SetValue("Sorting_EpisodeName", data.EpisodeName.ToString());
-                _configProvider.SetValue("Sorting_ReplaceSpaces", data.ReplaceSpaces.ToString());
-                _configProvider.SetValue("Sorting_AppendQuality", data.AppendQuality.ToString());
-                _configProvider.SetValue("Sorting_UseAirByDate", data.UseAirByDate.ToString());
-                _configProvider.SetValue("Sorting_SeasonFolder", data.SeasonFolders.ToString());
-                _configProvider.SetValue("Sorting_SeasonFolderFormat", data.SeasonFolderFormat);
-                _configProvider.SetValue("Sorting_SeparatorStyle", data.SeparatorStyle.ToString());
-                _configProvider.SetValue("Sorting_NumberStyle", data.NumberStyle.ToString());
-                _configProvider.SetValue("Sorting_MultiEpisodeStyle", data.MultiEpisodeStyle.ToString());
+                _configProvider.SeriesName = data.SeriesName;
+                _configProvider.EpisodeName = data.EpisodeName;
+                _configProvider.ReplaceSpaces = data.ReplaceSpaces;
+                _configProvider.AppendQuality = data.AppendQuality;
+                _configProvider.UseSeasonFolder = data.SeasonFolders;
+                _configProvider.SeasonFolderFormat = data.SeasonFolderFormat;
+                _configProvider.SeparatorStyle = data.SeparatorStyle;
+                _configProvider.NumberStyle = data.NumberStyle;
+                _configProvider.MultiEpisodeStyle = data.MultiEpisodeStyle;
 
                 basicNotification.Title = SETTINGS_SAVED;
                 _notificationProvider.Register(basicNotification);
diff --git a/NzbDrone.Web/Models/EpisodeSortingModel.cs b/NzbDrone.Web/Models/EpisodeSortingModel.cs
index beaf0c216..0f21794c2 100644
--- a/NzbDrone.Web/Models/EpisodeSortingModel.cs
+++ b/NzbDrone.Web/Models/EpisodeSortingModel.cs
@@ -6,36 +6,41 @@ namespace NzbDrone.Web.Models
 {
     public class EpisodeSortingModel
     {
-        [DisplayName("Show Name")]
-        public bool ShowName { get; set; }
+        [DisplayName("Series Name")]
+        [Description("Should filenames contain the series name when renamed?")]
+        public bool SeriesName { get; set; }
 
         [DisplayName("Episode Name")]
+        [Description("Should filenames contain the episode name when renamed?")]
         public bool EpisodeName { get; set; }
 
         [DisplayName("Replace Spaces")]
+        [Description("Do you want to replace spaces in the filename with periods?")]
         public bool ReplaceSpaces { get; set; }
 
         [DisplayName("Append Quality")]
+        [Description("Should filenames have the quality appended to the end?")]
         public bool AppendQuality { get; set; }
 
-        [DisplayName("Use Air By Date")]
-        public bool UseAirByDate { get; set; }
-
         [DisplayName("Use Season Folders")]
+        [Description("Should files be stored in season folders?")]
         public bool SeasonFolders { get; set; }
 
         [DisplayName("Season Folder Format")]
         [DisplayFormat(ConvertEmptyStringToNull = false)]
-        [Display(Description = "This is a Description")]
+        [Description("How should season folders be named? (Use %0s to pad to two digits)")]
         public string SeasonFolderFormat { get; set; }
 
         [DisplayName("Separator Style")]
+        [Description("How should NzbDrone separate sections of the filename?")]
         public int SeparatorStyle { get; set; }
 
         [DisplayName("Numbering Style")]
+        [Description("What numbering style do you want?")]
         public int NumberStyle { get; set; }
 
         [DisplayName("Multi-Episode Style")]
+        [Description("How will multi-episode files be named?")]
         public int MultiEpisodeStyle { get; set; }
 
         public SelectList SeparatorStyles { get; set; }
diff --git a/NzbDrone.Web/Views/Settings/EpisodeSorting.cshtml b/NzbDrone.Web/Views/Settings/EpisodeSorting.cshtml
index 2e323027d..7b997f37e 100644
--- a/NzbDrone.Web/Views/Settings/EpisodeSorting.cshtml
+++ b/NzbDrone.Web/Views/Settings/EpisodeSorting.cshtml
@@ -1,4 +1,5 @@
-@model NzbDrone.Web.Models.EpisodeSortingModel
+@using NzbDrone.Web.Helpers
+@model NzbDrone.Web.Models.EpisodeSortingModel
 
 <script type="text/javascript">
     $(document).ready(function () {
@@ -30,59 +31,60 @@
 
     <fieldset>
         <legend>Episode Sorting</legend>
-                    
+            
             <div class="config-section">
                 <div class="config-group">
-                    <div class="config-title">@Html.LabelFor(m => m.ShowName)</div>
-                    <div class="config-value">@Html.CheckBoxFor(m => m.ShowName)</div>
-                    
+                    <div class="config-title">@Html.LabelFor(m => m.SeriesName)</div>
+                    <div class="config-value">@Html.CheckBoxFor(m => m.SeriesName)</div>
+                </div>
+                <div class="config-group2"> 
+                    <div class="config-validation">@Html.ValidationMessageFor(m => m.SeriesName)</div>
+                    <div class="config-description">@Html.DescriptionFor(m => m.SeriesName)</div>
                 </div>
-                <div class="config-validation">@Html.ValidationMessageFor(m => m.ShowName)</div>
             </div>
 
             <div class="config-section">
                 <div class="config-group">
                     <div class="config-title">@Html.LabelFor(m => m.EpisodeName)</div>
                     <div class="config-value">@Html.CheckBoxFor(m => m.EpisodeName)</div>
-                    
                 </div>
-                <div class="config-validation">@Html.ValidationMessageFor(m => m.EpisodeName)</div>
+                <div class="config-group2"> 
+                    <div class="config-validation">@Html.ValidationMessageFor(m => m.EpisodeName)</div>
+                    <div class="config-description">@Html.DescriptionFor(m => m.EpisodeName)</div>
+                </div>
             </div>
 
             <div class="config-section">
                 <div class="config-group">
                     <div class="config-title">@Html.LabelFor(m => m.ReplaceSpaces)</div>
                     <div class="config-value">@Html.CheckBoxFor(m => m.ReplaceSpaces)</div>
-                    
                 </div>
-                <div class="config-validation">@Html.ValidationMessageFor(m => m.ReplaceSpaces)</div>
+                <div class="config-group2"> 
+                    <div class="config-validation">@Html.ValidationMessageFor(m => m.ReplaceSpaces)</div>
+                    <div class="config-description">@Html.DescriptionFor(m => m.ReplaceSpaces)</div>
+                </div>
             </div>
 
             <div class="config-section">
                 <div class="config-group">
                     <div class="config-title">@Html.LabelFor(m => m.AppendQuality)</div>
                     <div class="config-value">@Html.CheckBoxFor(m => m.AppendQuality)</div>
-                    
                 </div>
-                <div class="config-validation">@Html.ValidationMessageFor(m => m.AppendQuality)</div>
-            </div>
-
-            <div class="config-section">
-                <div class="config-group">
-                    <div class="config-title">@Html.LabelFor(m => m.UseAirByDate)</div>
-                    <div class="config-value">@Html.CheckBoxFor(m => m.UseAirByDate)</div>
-                    
+                <div class="config-group2"> 
+                    <div class="config-validation">@Html.ValidationMessageFor(m => m.AppendQuality)</div>
+                    <div class="config-description">@Html.DescriptionFor(m => m.AppendQuality)</div>
                 </div>
-                <div class="config-validation">@Html.ValidationMessageFor(m => m.UseAirByDate)</div>
             </div>
 
             <div class="config-section">
                 <div class="config-group">
                     <div class="config-title">@Html.LabelFor(m => m.SeasonFolders)</div>
                     <div class="config-value">@Html.CheckBoxFor(m => m.SeasonFolders)</div>
-                    
                 </div>
-                <div class="config-validation">@Html.ValidationMessageFor(m => m.SeasonFolders)</div>
+                <div class="config-group2"> 
+                    <div class="config-validation">@Html.ValidationMessageFor(m => m.SeasonFolders)</div>
+                    <div class="config-description">@Html.DescriptionFor(m => m.SeasonFolders)</div>
+                </div>
             </div>
 
             <div class="config-section">
@@ -90,7 +92,10 @@
                     <div class="config-title">@Html.LabelFor(m => m.SeasonFolderFormat)</div>
                     <div class="config-value">@Html.TextBoxFor(m => m.SeasonFolderFormat)</div>
                 </div>
-                <div class="config-validation">@Html.ValidationMessageFor(m => m.SeasonFolderFormat)</div>
+                <div class="config-group2"> 
+                    <div class="config-validation">@Html.ValidationMessageFor(m => m.SeasonFolderFormat)</div>
+                    <div class="config-description">@Html.DescriptionFor(m => m.SeasonFolderFormat)</div>
+                </div>
             </div>
 
             <div class="config-section">
@@ -98,7 +103,10 @@
                     <div class="config-title">@Html.LabelFor(m => m.SeparatorStyle)</div>
                     <div class="config-value">@Html.DropDownListFor(m => m.SeparatorStyle, Model.SeparatorStyles)</div>
                 </div>
-                <div class="config-validation">@Html.ValidationMessageFor(m => m.SeparatorStyle)</div>
+                <div class="config-group2"> 
+                    <div class="config-validation">@Html.ValidationMessageFor(m => m.SeparatorStyle)</div>
+                    <div class="config-description">@Html.DescriptionFor(m => m.SeparatorStyle)</div>
+                </div>
             </div>
 
             <div class="config-section">
@@ -106,7 +114,10 @@
                     <div class="config-title">@Html.LabelFor(m => m.NumberStyle)</div>
                     <div class="config-value">@Html.DropDownListFor(m => m.NumberStyle, Model.NumberStyles)</div>
                 </div>
-                <div class="config-validation">@Html.ValidationMessageFor(m => m.NumberStyle)</div>
+                <div class="config-group2"> 
+                    <div class="config-validation">@Html.ValidationMessageFor(m => m.NumberStyle)</div>
+                    <div class="config-description">@Html.DescriptionFor(m => m.NumberStyle)</div>
+                </div>
             </div>
 
             <div class="config-section">
@@ -114,7 +125,10 @@
                     <div class="config-title">@Html.LabelFor(m => m.MultiEpisodeStyle)</div>
                     <div class="config-value">@Html.DropDownListFor(m => m.MultiEpisodeStyle, Model.MultiEpisodeStyles)</div>
                 </div>
-                <div class="config-validation">@Html.ValidationMessageFor(m => m.MultiEpisodeStyle)</div>
+                <div class="config-group2"> 
+                    <div class="config-validation">@Html.ValidationMessageFor(m => m.MultiEpisodeStyle)</div>
+                    <div class="config-description">@Html.DescriptionFor(m => m.MultiEpisodeStyle)</div>
+                </div>
             </div>
 
             <div id="singleEpisodeExample"></div>

From 1015193ef5e7370c456d7245fdada5d86f1e9341 Mon Sep 17 00:00:00 2001
From: Mark McDowall <markus.mcd5@gmail.com>
Date: Wed, 18 May 2011 20:37:26 -0700
Subject: [PATCH 2/2] Loading overlay added to series grid.

---
 NzbDrone.Web/Content/Images/Loading.gif | Bin 0 -> 7073 bytes
 NzbDrone.Web/Content/style.css          |  28 ++++-
 NzbDrone.Web/Views/Series/Index.cshtml  |  77 +++++++------
 NzbDrone.Web/Views/Settings/Test.cshtml | 146 ++++++++----------------
 4 files changed, 121 insertions(+), 130 deletions(-)
 create mode 100644 NzbDrone.Web/Content/Images/Loading.gif

diff --git a/NzbDrone.Web/Content/Images/Loading.gif b/NzbDrone.Web/Content/Images/Loading.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9e56cb6c198b76138e959c554ddf4c1b9563e854
GIT binary patch
literal 7073
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
PPYl7Z$e%QKw+(*<R<HL_

literal 0
HcmV?d00001

diff --git a/NzbDrone.Web/Content/style.css b/NzbDrone.Web/Content/style.css
index 35eb2eab2..a4aee9077 100644
--- a/NzbDrone.Web/Content/style.css
+++ b/NzbDrone.Web/Content/style.css
@@ -308,4 +308,30 @@ button, input[type="button"], input[type="submit"], input[type="reset"]
     width: 435px;
     display: block;
     height: 25px;
-}
\ No newline at end of file
+}
+
+/* Loading Bar */
+.grid-container  
+    {  
+        position:relative;  
+        margin:auto;  
+        overflow:hidden;  
+    }  
+
+    .grid-loader  
+    {  
+        position: absolute;  
+        width: 100%;
+        height: 100%;
+        top: 400px;  
+        left: 0px;  
+        letter-spacing: -1px;  
+        color: white; font: 48px Berlin Sans FB, Sans-Serif;  
+        background: #4A4D4A;  
+        padding: 20px;  
+        filter:alpha(opacity=80);  
+        -moz-opacity:0.8;  
+        -khtml-opacity: 0.8;  
+        opacity: 0.8;  
+        line-height: 90%  
+    } 
\ No newline at end of file
diff --git a/NzbDrone.Web/Views/Series/Index.cshtml b/NzbDrone.Web/Views/Series/Index.cshtml
index c507d856d..84ed0c13e 100644
--- a/NzbDrone.Web/Views/Series/Index.cshtml
+++ b/NzbDrone.Web/Views/Series/Index.cshtml
@@ -1,7 +1,7 @@
 @using NzbDrone.Core.Repository;
 @using NzbDrone.Web.Models;
 @model IEnumerable<NzbDrone.Core.Repository.Series>
-
+           
 @section TitleContent{
     Series
 }
@@ -11,38 +11,43 @@
 }
 
 @section MainContent{
-    @{Html.Telerik().Grid<SeriesModel>().Name("Grid")
-            .TableHtmlAttributes(new { @class = "Grid" })
-            .DataKeys(keys => keys.Add(p => p.SeriesId))
-            .DataBinding(data => data.Ajax()
-                .Select("_AjaxSeriesGrid", "Series")
-                .Update("_SaveAjaxSeriesEditing", "Series")
-                .Delete("_DeleteAjaxSeriesEditing", "Series"))
-                
-            .Columns(columns =>
-                         {
-                             columns.Bound(o => o.Title)
-                                 .ClientTemplate("<a href=" +
-                                                 Url.Action("Details", "Series", new {seriesId = "<#= SeriesId #>"}) +
-                                                 "><#= Title #></a>");
-                             columns.Bound(o => o.SeasonsCount).Title("Seasons")
-                                 .ClientTemplate("<a href=# onclick=\"openSeasonEditor(<#= SeriesId #>, \'<#= Title #>\'); return false;\"><#= SeasonsCount #></a>");
-                             columns.Bound(o => o.QualityProfileName).Title("Quality");
-                             columns.Bound(o => o.Status);
-                             columns.Bound(o => o.AirsDayOfWeek);
-                             columns.Bound(o => o.Path);
-                             columns.Command(commands =>
-                                                 {
-                                                     commands.Edit().ButtonType(GridButtonType.Image);
-                                                     commands.Delete().ButtonType(GridButtonType.Image);
-                                                 }).Title("Actions").Width(80);
+    <div class="grid-container">
+        @{Html.Telerik().Grid<SeriesModel>().Name("Grid")
+                .TableHtmlAttributes(new { @class = "Grid" })
+                .DataKeys(keys => keys.Add(p => p.SeriesId))
+                .DataBinding(data => data.Ajax()
+                    .Select("_AjaxSeriesGrid", "Series")
+                    .Update("_SaveAjaxSeriesEditing", "Series")
+                    .Delete("_DeleteAjaxSeriesEditing", "Series"))
+                .Columns(columns =>
+                             {
+                                 columns.Bound(o => o.Title)
+                                     .ClientTemplate("<a href=" +
+                                                     Url.Action("Details", "Series", new {seriesId = "<#= SeriesId #>"}) +
+                                                     "><#= Title #></a>");
+                                 columns.Bound(o => o.SeasonsCount).Title("Seasons")
+                                     .ClientTemplate("<a href=# onclick=\"openSeasonEditor(<#= SeriesId #>, \'<#= Title #>\'); return false;\"><#= SeasonsCount #></a>");
+                                 columns.Bound(o => o.QualityProfileName).Title("Quality");
+                                 columns.Bound(o => o.Status);
+                                 columns.Bound(o => o.AirsDayOfWeek);
+                                 columns.Bound(o => o.Path);
+                                 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>"))
-            .ClientEvents(clientEvents => clientEvents.OnEdit("grid_edit"))
-            .Render();}
+                             })
+                .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>"))
+                .ClientEvents(clientEvents => { clientEvents.OnEdit("grid_edit");
+                                                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">
@@ -55,6 +60,14 @@
                 .center();
         }
 
+    function grid_bind(args) {
+        $('.grid-container').children('.grid-loader').stop().css("top", "0px").fadeIn('slow');
+    }
+
+    function grid_bound(args) {
+        $('.grid-container').children('.grid-loader').stop().fadeOut('slow');
+    }
+
     function openSeasonEditor(seriesId, seriesName) {
         windowElement = null;
         windowElement = $.telerik.window.create({
diff --git a/NzbDrone.Web/Views/Settings/Test.cshtml b/NzbDrone.Web/Views/Settings/Test.cshtml
index 03e2618d0..a94ef6113 100644
--- a/NzbDrone.Web/Views/Settings/Test.cshtml
+++ b/NzbDrone.Web/Views/Settings/Test.cshtml
@@ -1,106 +1,58 @@
-    <style type="text/css">
-        
-        #feedback-open-button
-        {
-            height: 32px;
-            margin: 2em 0 4em;
-        }
-        
-        #feedback-form
-        {
-            padding: 0 1em 1em;
-        }
-        
-        #feedback-form label
-        {
-            display: block;
-            line-height: 25px;
-            margin-top: 1em;
-        }
-        
-        #feedback-form input
-        {
-            width: 370px;
-        }
-        
-        .form-actions
-        {
-            padding-top: 1em;
-            overflow: hidden;
-        }
-        
-        .form-actions button
-        {
-            float: right;
-        }
-        
-        .example .t-group
-        {
-            border-width: 1px;
-            border-style: solid;
-            padding: 0 1em 1em;
-        }
-        
-    </style>
-
-@{  Html.Telerik().Window()
-        .Name("Window")
-        .Title("Submit feedback")
-        .LoadContentFrom("TestPartial", "Settings")
-        .Width(400)
-        .Draggable(true)
-        .Modal(true)
-        .Visible(false)
-        .Render();
+<style>
+
+#container {  
+    width: 850px;   
+    margin: auto;  
+}  
+
+.back  
+{  
+    position:absolute;  
+    top:0;left:0;  
+}  
+.wrap  
+{  
+    width:550px;  
+    height:390px;  
+    position:relative;  
+    margin:auto;  
+    overflow:hidden;  
+}  
+
+.comment  
+{  
+    position: absolute;  
+    width: 550px;
+    height: auto;
+    top: 400px;  
+    left: 0px;  
+    letter-spacing: -1px;  
+    color: white; font: 24px/45px Berlin Sans FB, Sans-Serif;  
+    background: #4A4D4A;  
+    padding: 10px;  
+    filter:alpha(opacity=60);  
+    -moz-opacity:0.6;  
+    -khtml-opacity: 0.6;  
+    opacity: 0.6;  
+    line-height: 90%  
 } 
-            
-<button id="feedback-open-button" class="t-button t-state-default">Submit feedback...</button>
-@if (ViewData["name"] != null || ViewData["email"] != null || ViewData["comment"] != null) { 
-    <div class="t-group">
-        <h3>Feedback:</h3>
-    
-        <p>
-            Name: @ViewData["name"] <br />
-            E-mail: @ViewData["email"] <br />
-            Comment: @ViewData["comment"] 
-        </p>
-    </div>
-}
 
-@{ Html.Telerik().ScriptRegistrar()
-        .OnDocumentReady(@<text>
-            // open the initially hidden window when the button is clicked
-            
-        </text>); }
+</style>
 
+<button onclick="overlay()">Click Me!</button>
 
-<script type="text/javascript">
-
-    var windowElement;
-
-    $('#feedback-open-button')
-                .click(function (e) {
-                    e.preventDefault();
+<div class="wrap">
+    <img class="backer" src="../../Content/leopard.jpg" alt="image"/>
+        
+    <span class="comment">
+        Loading...
+    </span>
+</div>
 
-                    windowElement = $.telerik.window.create({
-                        title: "Season Edition: ",
-                        contentUrl: '@Url.Action("SeasonEditor", "Series")' + '/?seriesId=10',
-                        width: 400,
-                        height: 500,
-                        modal: true,
-                        resizable: false,
-                        draggable: true,
-                        scrollable: false
-                    });
 
-                    windowElement.data('tWindow').center();
-                });
-    // add button hovers
-    $('.t-button').live('mouseenter', $.telerik.buttonHover)
-                            .live('mouseleave', $.telerik.buttonLeave);
 
-    function closeWindow() {
-        var window = windowElement.data("tWindow");
-        window.close();
+<script type="text/javascript">
+    function overlay() {
+        $('.wrap').children('.comment').stop().css("top", "0px");
     }
 </script>
\ No newline at end of file