Merge branch 'markus101'

This commit is contained in:
kay.one 2011-06-24 18:21:15 -07:00
commit d61f683be7
3 changed files with 11 additions and 13 deletions

View File

@ -1,5 +1,4 @@
@using NzbDrone.Web.Models @using NzbDrone.Web.Models
@model NzbDrone.Web.Models.AddNewSeriesModel
@{ @{
Layout = null; Layout = null;

View File

@ -2,12 +2,12 @@
@using NzbDrone.Core.Repository @using NzbDrone.Core.Repository
@{ Html.Telerik().ScriptRegistrar().DefaultGroup(group => group @{ Html.Telerik().ScriptRegistrar().DefaultGroup(group => group
.Add("telerik.common.min.js") .Add("telerik.common.js")
.Add("telerik.draganddrop.min.js") .Add("telerik.draganddrop.js")
.Add("telerik.window.min.js") .Add("telerik.window.js")
.Add("telerik.panelbar.min.js") .Add("telerik.panelbar.js")
.Add("telerik.list.min.js") .Add("telerik.list.js")
.Add("telerik.combobox.min.js")); } .Add("telerik.combobox.js")); }
<style> <style>
.root_dir_text .root_dir_text
@ -25,7 +25,7 @@
@section MainContent{ @section MainContent{
@{ Html.Telerik().Window() @{ Html.Telerik().Window()
.Name("Window") .Name("Window")
.Title("Add New Series") .Title("Add New Series")
.Modal(true) .Modal(true)
@ -86,9 +86,10 @@
<script type="text/javascript"> <script type="text/javascript">
function openAddNewSeries() { function openAddNewSeries() {
var windowElement = $('#Window'); var window = $('#Window').data('tWindow');
window.center().open();
window.refresh();
windowElement.data('tWindow').center().open();
} }
function closeAddNewSeries() { function closeAddNewSeries() {

View File

@ -31,7 +31,7 @@
<div class="display-label"> <div class="display-label">
AirTimes</div> AirTimes</div>
<div class="display-field"> <div class="display-field">
@Model.AirsDayOfWeek.ToString()</div> @Model.AirsDayOfWeek</div>
<div class="display-label"> <div class="display-label">
Language</div> Language</div>
<div class="display-label"> <div class="display-label">
@ -39,10 +39,8 @@
<div class="display-field"> <div class="display-field">
@Model.Path</div> @Model.Path</div>
</fieldset> </fieldset>
@*Todo: This breaks when using SQLServer... thoughts?*@ @*Easy, don't use SQL Server!!!*@
@foreach (var season in Model.Seasons.Where(s => s > 0).Reverse()) @foreach (var season in Model.Seasons.Where(s => s > 0).Reverse())
{ {
<br /> <br />
<h3> <h3>
Season @season</h3> Season @season</h3>