added sub menu for add series
This commit is contained in:
parent
c45729a986
commit
82808355c4
|
@ -6,7 +6,7 @@ namespace NzbDrone.Core.Instrumentation
|
||||||
{
|
{
|
||||||
public class NlogWriter : TextWriter
|
public class NlogWriter : TextWriter
|
||||||
{
|
{
|
||||||
private static readonly Logger Logger = LogManager.GetLogger("DB");
|
private static readonly Logger Logger = LogManager.GetLogger("NzbDrone.SubSonic");
|
||||||
|
|
||||||
|
|
||||||
public override void Write(char[] buffer, int index, int count)
|
public override void Write(char[] buffer, int index, int count)
|
||||||
|
|
|
@ -122,6 +122,7 @@ hr
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
background-color: White;
|
background-color: White;
|
||||||
padding: 10px 20px 20px 20px;
|
padding: 10px 20px 20px 20px;
|
||||||
|
min-height: 300px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -60,11 +60,6 @@ namespace NzbDrone.Web.Controllers
|
||||||
return View();
|
return View();
|
||||||
}
|
}
|
||||||
|
|
||||||
public ActionResult Add()
|
|
||||||
{
|
|
||||||
return View(new AddNewSeriesModel());
|
|
||||||
}
|
|
||||||
|
|
||||||
public ActionResult AddExisting()
|
public ActionResult AddExisting()
|
||||||
{
|
{
|
||||||
var defaultQuality = Convert.ToInt32(_configProvider.GetValue("DefaultQualityProfile", "1", true));
|
var defaultQuality = Convert.ToInt32(_configProvider.GetValue("DefaultQualityProfile", "1", true));
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
||||||
<MvcBuildViews>true</MvcBuildViews>
|
<MvcBuildViews>true</MvcBuildViews>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
|
<UseIISExpress>false</UseIISExpress>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
<DebugSymbols>true</DebugSymbols>
|
<DebugSymbols>true</DebugSymbols>
|
||||||
|
@ -293,7 +294,6 @@
|
||||||
<Content Include="Views\Series\SeriesSearchResults.ascx" />
|
<Content Include="Views\Series\SeriesSearchResults.ascx" />
|
||||||
<Content Include="Views\Series\SubMenu.ascx" />
|
<Content Include="Views\Series\SubMenu.ascx" />
|
||||||
<Content Include="Views\Series\Unmapped.aspx" />
|
<Content Include="Views\Series\Unmapped.aspx" />
|
||||||
<Content Include="Views\Series\Add.aspx" />
|
|
||||||
<Content Include="Views\Settings\RootDir.ascx" />
|
<Content Include="Views\Settings\RootDir.ascx" />
|
||||||
<Content Include="Views\Settings\Notifications.ascx" />
|
<Content Include="Views\Settings\Notifications.ascx" />
|
||||||
<Content Include="Views\Settings\Downloads.ascx" />
|
<Content Include="Views\Settings\Downloads.ascx" />
|
||||||
|
|
|
@ -1,17 +0,0 @@
|
||||||
<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<dynamic>" %>
|
|
||||||
|
|
||||||
<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
|
|
||||||
Add Series
|
|
||||||
</asp:Content>
|
|
||||||
<asp:Content ID="Menu" ContentPlaceHolderID="ActionMenu" runat="server">
|
|
||||||
<%
|
|
||||||
Html.RenderPartial("SubMenu");
|
|
||||||
%>
|
|
||||||
</asp:Content>
|
|
||||||
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
|
|
||||||
|
|
||||||
<%: Html.ActionLink("Add New Series", "AddNew", "Series") %>
|
|
||||||
<br />
|
|
||||||
<%: Html.ActionLink("Add Existing Series", "AddExisting", "Series") %>
|
|
||||||
|
|
||||||
</asp:Content>
|
|
|
@ -60,10 +60,12 @@
|
||||||
var seriesSearch = $('#new_series_id');
|
var seriesSearch = $('#new_series_id');
|
||||||
|
|
||||||
$("#result").text("Searching...");
|
$("#result").text("Searching...");
|
||||||
document.getElementById('RootDirectories').style.display = 'inline';
|
|
||||||
$("#result").load('<%=Url.Action("SearchForSeries", "Series") %>', {
|
$("#result").load('<%=Url.Action("SearchForSeries", "Series") %>', {
|
||||||
seriesName: seriesSearch.val()
|
seriesName: seriesSearch.val()
|
||||||
});
|
});
|
||||||
|
|
||||||
|
document.getElementById('RootDirectories').style.display = 'inline';
|
||||||
}
|
}
|
||||||
|
|
||||||
function addSeries() {
|
function addSeries() {
|
||||||
|
|
|
@ -1,10 +1,11 @@
|
||||||
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<dynamic>" %>
|
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<dynamic>" %>
|
||||||
|
|
||||||
<%@ Import Namespace="Telerik.Web.Mvc.UI" %>
|
<%@ Import Namespace="Telerik.Web.Mvc.UI" %>
|
||||||
|
|
||||||
<% Html.Telerik().Menu().Name("telerikGrid").Items(items =>
|
<% Html.Telerik().Menu().Name("telerikGrid").Items(items =>
|
||||||
{
|
{
|
||||||
items.Add().Text("Add Series").Action("Add", "Series");
|
items.Add().Text("Add Series")
|
||||||
|
.Items(subItem => subItem.Add().Text("New Series").Action("AddNew", "Series"))
|
||||||
|
.Items(subItem => subItem.Add().Text("Existing Series").Action("AddExisting", "Series"));
|
||||||
|
|
||||||
items.Add().Text("Start RSS Sync").Action("RssSync", "Series");
|
items.Add().Text("Start RSS Sync").Action("RssSync", "Series");
|
||||||
items.Add().Text("Rename All").Action("RenameAll", "Series");
|
items.Add().Text("Rename All").Action("RenameAll", "Series");
|
||||||
}).Render();
|
}).Render();
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<targets>
|
<targets>
|
||||||
<target name="consoleTarget" xsi:type="ColoredConsole" layout="${logger}: ${message}" />
|
<target name="consoleTarget" xsi:type="ColoredConsole" layout="${logger}: ${message}" />
|
||||||
<target name="debugTarget" xsi:type="Debugger" layout="${logger}: ${message}" />
|
<target name="debugTarget" xsi:type="Debugger" layout="${logger}: ${message}" />
|
||||||
<target name="udpTarget" xsi:type="Chainsaw" address="udp://127.0.0.1:7777"
|
<target name="udpTarget" xsi:type="Chainsaw" address="udp://127.0.0.1:20480"
|
||||||
includeCallSite="true" includeSourceInfo="true" includeNLogData="true" includeNDC="true" includeMDC="true">
|
includeCallSite="true" includeSourceInfo="true" includeNLogData="true" includeNDC="true" includeMDC="true">
|
||||||
<parameter name="exception" layout="${exception:format=ToString}" xsi:type="NLogViewerParameterInfo" />
|
<parameter name="exception" layout="${exception:format=ToString}" xsi:type="NLogViewerParameterInfo" />
|
||||||
<parameter name="processname" layout="${processname}" xsi:type="NLogViewerParameterInfo" />
|
<parameter name="processname" layout="${processname}" xsi:type="NLogViewerParameterInfo" />
|
||||||
|
|
Loading…
Reference in New Issue