Skip to content

Commit 230b1af

Browse files
garysharpgarysharp
committed
Bug Fix: MVC Layouts to Static
1 parent fe00963 commit 230b1af

14 files changed

Lines changed: 34 additions & 49 deletions

‎Disco.Web/Areas/Config/Views/_ViewStart.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
@{
2-
Layout = "~/Views/Shared/_Layout.cshtml";
2+
Layout = MVC.Shared.Views._Layout;
33
Html.BundleDeferred("~/Style/Config");
44
}

‎Disco.Web/Areas/Config/Views/_ViewStart.generated.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//------------------------------------------------------------------------------
33
// <auto-generated>
44
// This code was generated by a tool.
5-
// Runtime Version:4.0.30319.18051
5+
// Runtime Version:4.0.30319.34003
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if
88
// the code is regenerated.
@@ -45,7 +45,7 @@ public override void Execute()
4545

4646
#line 1 "..\..\Areas\Config\Views\_ViewStart.cshtml"
4747

48-
Layout = "~/Views/Shared/_Layout.cshtml";
48+
Layout = MVC.Shared.Views._Layout;
4949
Html.BundleDeferred("~/Style/Config");
5050

5151

‎Disco.Web/Areas/Public/Views/_ViewStart.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@{
2-
Layout = "~/Views/Shared/_PublicLayout.cshtml";
2+
Layout = MVC.Shared.Views._PublicLayout;
33
}

‎Disco.Web/Areas/Public/Views/_ViewStart.generated.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public override void Execute()
4545

4646
#line 1 "..\..\Areas\Public\Views\_ViewStart.cshtml"
4747

48-
Layout = "~/Views/Shared/_PublicLayout.cshtml";
48+
Layout = MVC.Shared.Views._PublicLayout;
4949

5050

5151
#line default

‎Disco.Web/Disco.Web.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1788,10 +1788,10 @@
17881788
<Generator>RazorGenerator</Generator>
17891789
<LastGenOutput>Licence.generated.cs</LastGenOutput>
17901790
</None>
1791-
<Content Include="Views\Shared\DisplayTemplates\AccessDeniedException.cshtml">
1791+
<None Include="Views\Shared\DisplayTemplates\AccessDeniedException.cshtml">
17921792
<Generator>RazorGenerator</Generator>
17931793
<LastGenOutput>AccessDeniedException.generated.cs</LastGenOutput>
1794-
</Content>
1794+
</None>
17951795
<None Include="Views\Shared\DisplayTemplates\Exception.cshtml">
17961796
<Generator>RazorGenerator</Generator>
17971797
<LastGenOutput>Exception.generated.cs</LastGenOutput>
@@ -1933,7 +1933,6 @@
19331933
</ItemGroup>
19341934
<ItemGroup>
19351935
<Folder Include="Areas\API\Models\WirelessCertificate\" />
1936-
<Folder Include="Areas\Public\Views\Shared\" />
19371936
<Folder Include="Areas\Services\Models\" />
19381937
</ItemGroup>
19391938
<ItemGroup>

‎Disco.Web/T4MVC.cs‎

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ public class PublicClass
9090
public Disco.Web.Areas.Public.Controllers.HeldDevicesController HeldDevices = new Disco.Web.Areas.Public.Controllers.T4MVC_HeldDevicesController();
9191
public Disco.Web.Areas.Public.Controllers.PublicController Public = new Disco.Web.Areas.Public.Controllers.T4MVC_PublicController();
9292
public Disco.Web.Areas.Public.Controllers.UserHeldDevicesController UserHeldDevices = new Disco.Web.Areas.Public.Controllers.T4MVC_UserHeldDevicesController();
93-
public T4MVC.Public.SharedController Shared = new T4MVC.Public.SharedController();
9493
}
9594
[GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
9695
public class ServicesClass
@@ -373,7 +372,7 @@ public static class Timeline {
373372
}
374373

375374
public static readonly string Timeline_js_bundle = Url("Timeline.js.bundle");
376-
public static readonly string timeline_js = T4MVCHelpers.IsProduction() && T4Extensions.FileExists(URLPATH + "/timeline.min.js") ? Url("timeline.min.js") : Url("timeline.js");
375+
public static readonly string Timeline_js = T4MVCHelpers.IsProduction() && T4Extensions.FileExists(URLPATH + "/Timeline.min.js") ? Url("Timeline.min.js") : Url("Timeline.js");
377376
public static readonly string Timeline_min_js = Url("Timeline.min.js");
378377
public static readonly string Timeline_min_js_map = Url("Timeline.min.js.map");
379378
[GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
@@ -2163,6 +2162,7 @@ public class _ViewNamesClass
21632162
public readonly string _JobTable = "_JobTable";
21642163
public readonly string _JobTableRender = "_JobTableRender";
21652164
public readonly string _Layout = "_Layout";
2165+
public readonly string _PublicLayout = "_PublicLayout";
21662166
public readonly string _SearchDialog = "_SearchDialog";
21672167
public readonly string Error = "Error";
21682168
}
@@ -2171,8 +2171,17 @@ public class _ViewNamesClass
21712171
public readonly string _JobTable = "~/Views/Shared/_JobTable.cshtml";
21722172
public readonly string _JobTableRender = "~/Views/Shared/_JobTableRender.cshtml";
21732173
public readonly string _Layout = "~/Views/Shared/_Layout.cshtml";
2174+
public readonly string _PublicLayout = "~/Views/Shared/_PublicLayout.cshtml";
21742175
public readonly string _SearchDialog = "~/Views/Shared/_SearchDialog.cshtml";
21752176
public readonly string Error = "~/Views/Shared/Error.cshtml";
2177+
static readonly _DisplayTemplatesClass s_DisplayTemplates = new _DisplayTemplatesClass();
2178+
public _DisplayTemplatesClass DisplayTemplates { get { return s_DisplayTemplates; } }
2179+
[GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
2180+
public partial class _DisplayTemplatesClass
2181+
{
2182+
public readonly string AccessDeniedException = "AccessDeniedException";
2183+
public readonly string Exception = "Exception";
2184+
}
21762185
}
21772186
}
21782187

@@ -10567,29 +10576,6 @@ public override System.Web.Mvc.ActionResult UserHeldDevices()
1056710576
}
1056810577
}
1056910578

10570-
namespace T4MVC.Public
10571-
{
10572-
public class SharedController
10573-
{
10574-
10575-
static readonly ViewsClass s_views = new ViewsClass();
10576-
[GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
10577-
public ViewsClass Views { get { return s_views; } }
10578-
[GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
10579-
public class ViewsClass
10580-
{
10581-
static readonly _ViewNamesClass s_ViewNames = new _ViewNamesClass();
10582-
public _ViewNamesClass ViewNames { get { return s_ViewNames; } }
10583-
public class _ViewNamesClass
10584-
{
10585-
public readonly string _Layout = "_Layout";
10586-
}
10587-
public readonly string _Layout = "~/Areas/Public/Views/Shared/_Layout.cshtml";
10588-
}
10589-
}
10590-
10591-
}
10592-
1059310579
namespace Disco.Web.Areas.Services.Controllers
1059410580
{
1059510581
public partial class ClientController

‎Disco.Web/Views/InitialConfig/_ViewStart.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
@{
2-
Layout = "~/Views/InitialConfig/_Layout.cshtml";
2+
Layout = MVC.InitialConfig.Views._Layout;
33
Html.BundleDeferred("~/Style/InitialConfig");
44
}

‎Disco.Web/Views/InitialConfig/_ViewStart.generated.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//------------------------------------------------------------------------------
33
// <auto-generated>
44
// This code was generated by a tool.
5-
// Runtime Version:4.0.30319.18051
5+
// Runtime Version:4.0.30319.34003
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if
88
// the code is regenerated.
@@ -45,7 +45,7 @@ public override void Execute()
4545

4646
#line 1 "..\..\Views\InitialConfig\_ViewStart.cshtml"
4747

48-
Layout = "~/Views/InitialConfig/_Layout.cshtml";
48+
Layout = MVC.InitialConfig.Views._Layout;
4949
Html.BundleDeferred("~/Style/InitialConfig");
5050

5151

‎Disco.Web/Views/Job/Create.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@{
33
Authorization.Require(Claims.Job.Actions.Create);
44

5-
Layout = "~/Views/Shared/_DialogLayout.cshtml";
5+
Layout = MVC.Shared.Views._DialogLayout;
66
ViewBag.Title = Html.ToBreadcrumb("Jobs", MVC.Job.Index(), "Create");
77
}
88
<div id="createJob_Container">

‎Disco.Web/Views/Job/Create.generated.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//------------------------------------------------------------------------------
33
// <auto-generated>
44
// This code was generated by a tool.
5-
// Runtime Version:4.0.30319.18051
5+
// Runtime Version:4.0.30319.34003
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if
88
// the code is regenerated.
@@ -47,7 +47,7 @@ public override void Execute()
4747

4848
Authorization.Require(Claims.Job.Actions.Create);
4949

50-
Layout = "~/Views/Shared/_DialogLayout.cshtml";
50+
Layout = MVC.Shared.Views._DialogLayout;
5151
ViewBag.Title = Html.ToBreadcrumb("Jobs", MVC.Job.Index(), "Create");
5252

5353

@@ -208,15 +208,15 @@ public override void Execute()
208208
#line hidden
209209
WriteLiteral(" <div");
210210

211-
WriteAttribute("id", Tuple.Create(" id=\"", 1098), Tuple.Create("\"", 1129)
212-
, Tuple.Create(Tuple.Create("", 1103), Tuple.Create("createJob_SubType_", 1103), true)
211+
WriteAttribute("id", Tuple.Create(" id=\"", 1091), Tuple.Create("\"", 1122)
212+
, Tuple.Create(Tuple.Create("", 1096), Tuple.Create("createJob_SubType_", 1096), true)
213213

214214
#line 28 "..\..\Views\Job\Create.cshtml"
215-
, Tuple.Create(Tuple.Create("", 1121), Tuple.Create<System.Object, System.Int32>(jt.Id
215+
, Tuple.Create(Tuple.Create("", 1114), Tuple.Create<System.Object, System.Int32>(jt.Id
216216

217217
#line default
218218
#line hidden
219-
, 1121), false)
219+
, 1114), false)
220220
);
221221

222222
WriteLiteral(" class=\"createJob_SubType\"");

0 commit comments

Comments
 (0)