Move views back into /Areas

This effectively reverts a portion of #f618fc8, which removed the interstitial `/Areas/Editor` folders in order to flatten the folder structure. It turns out that views in a **Razor Class Library** are not namespaced, unlike `/wwwroot`, and are thus subject to being subsequently overwritten by host sites embedding the library. This is especially concerning for `/Views/Shared` where common file names, such as `_Layout.cshtml`, could easily take priority. This is actually a useful behavior in some contexts, as it allows more flexibility on overriding elements. But it's peculiar that Microsoft applied this to `/wwwroot` but not `/Views` (e.g., by creating some type of assembly based namespacing convention). Having the files buried a couple additional levels is less than ideal organizationally, but at least we can keep the `.cs` files in (children of) the root directory.
OnTopicCMS · Dec 31, 2019 · 03c2c8c · 03c2c8c
1 parent b9d3ba6
commit 03c2c8c
Show file tree

Hide file tree

Showing 27 changed files with 18 additions and 19 deletions.
diff --git a/.../Editor/Components/Boolean/Default.cshtml → .../Editor/Components/Boolean/Default.cshtml b/.../Editor/Components/Boolean/Default.cshtml → .../Editor/Components/Boolean/Default.cshtml
@@ -1,7 +1,7 @@
 @model BooleanAttributeViewModel
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
 }
 
 <div class="@Model.AttributeDescriptor.CssClass form-check form-check-inline">

diff --git a/...Components/ContentTypeList/Default.cshtml → ...Components/ContentTypeList/Default.cshtml b/...Components/ContentTypeList/Default.cshtml → ...Components/ContentTypeList/Default.cshtml
diff --git a/...Editor/Components/DateTime/Default.cshtml → ...Editor/Components/DateTime/Default.cshtml b/...Editor/Components/DateTime/Default.cshtml → ...Editor/Components/DateTime/Default.cshtml
@@ -1,7 +1,7 @@
 @model DateTimeAttributeViewModel
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
   var includeDatePicker = Model.AttributeDescriptor.IncludeDatePicker?? true;
   var includeTimePicker = Model.AttributeDescriptor.IncludeTimePicker?? true;
 }

diff --git a/.../Components/DisplayOptions/Default.cshtml → .../Components/DisplayOptions/Default.cshtml b/.../Components/DisplayOptions/Default.cshtml → .../Components/DisplayOptions/Default.cshtml
@@ -1,7 +1,7 @@
 @model AttributeViewModel<AttributeDescriptorTopicViewModel>
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
 }
 
 <div class="@Model.AttributeDescriptor.CssClass form-check form-check-inline">

diff --git a/...Editor/Components/FileList/Default.cshtml → ...Editor/Components/FileList/Default.cshtml b/...Editor/Components/FileList/Default.cshtml → ...Editor/Components/FileList/Default.cshtml
@@ -1,7 +1,7 @@
 @model FileListAttributeViewModel
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
 }
 
 @if (Model.Files.Count > 0) {

diff --git a/...Editor/Components/FilePath/Default.cshtml → ...Editor/Components/FilePath/Default.cshtml b/...Editor/Components/FilePath/Default.cshtml → ...Editor/Components/FilePath/Default.cshtml
@@ -1,7 +1,7 @@
 @model FilePathAttributeViewModel
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
 }
 
 <input

diff --git a/...ews/Editor/Components/HTML/Default.cshtml → ...ews/Editor/Components/HTML/Default.cshtml b/...ews/Editor/Components/HTML/Default.cshtml → ...ews/Editor/Components/HTML/Default.cshtml
@@ -1,7 +1,7 @@
 @model AttributeViewModel<HtmlAttributeTopicViewModel>
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
 }
 
 <style type="text/css">

diff --git a/...or/Components/LastModified/Default.cshtml → ...or/Components/LastModified/Default.cshtml b/...or/Components/LastModified/Default.cshtml → ...or/Components/LastModified/Default.cshtml
@@ -1,7 +1,7 @@
 @model LastModifiedAttributeViewModel
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
 }
 
 <div class="label">

diff --git a/.../Components/LastModifiedBy/Default.cshtml → .../Components/LastModifiedBy/Default.cshtml b/.../Components/LastModifiedBy/Default.cshtml → .../Components/LastModifiedBy/Default.cshtml
@@ -1,7 +1,7 @@
 @model LastModifiedByAttributeViewModel
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
 }
 
 <div class="label">

diff --git a/...Components/NestedTopicList/Default.cshtml → ...Components/NestedTopicList/Default.cshtml b/...Components/NestedTopicList/Default.cshtml → ...Components/NestedTopicList/Default.cshtml
@@ -1,7 +1,7 @@
 @model NestedTopicListAttributeViewModel
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
 }
 
 <script type="text/javascript">

diff --git a/...s/Editor/Components/Number/Default.cshtml → ...s/Editor/Components/Number/Default.cshtml b/...s/Editor/Components/Number/Default.cshtml → ...s/Editor/Components/Number/Default.cshtml
@@ -1,7 +1,7 @@
 @model AttributeViewModel<NumberAttributeTopicViewModel>
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
 }
 
 <input

diff --git a/...or/Components/Relationship/Default.cshtml → ...or/Components/Relationship/Default.cshtml b/...or/Components/Relationship/Default.cshtml → ...or/Components/Relationship/Default.cshtml
@@ -1,7 +1,7 @@
 @model AttributeViewModel<RelationshipAttributeTopicViewModel>
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
   var rootTopicKey = Model.AttributeDescriptor.RootTopic?.UniqueKey.Replace(":", "/") ?? Model.AttributeDescriptor.RootTopicKey?.Replace(":", "/") ?? "Root";
 }
 

diff --git a/...ews/Editor/Components/Text/Default.cshtml → ...ews/Editor/Components/Text/Default.cshtml b/...ews/Editor/Components/Text/Default.cshtml → ...ews/Editor/Components/Text/Default.cshtml
@@ -1,7 +1,7 @@
 @model AttributeViewModel<TextAttributeTopicViewModel>
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
 }
 
 <input

diff --git a/...Editor/Components/TextArea/Default.cshtml → ...Editor/Components/TextArea/Default.cshtml b/...Editor/Components/TextArea/Default.cshtml → ...Editor/Components/TextArea/Default.cshtml
@@ -1,7 +1,7 @@
 @model AttributeViewModel<TextAreaAttributeTopicViewModel>
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
 }
 
 <textarea

diff --git a/...ponents/TokenizedTopicList/Default.cshtml → ...ponents/TokenizedTopicList/Default.cshtml b/...ponents/TokenizedTopicList/Default.cshtml → ...ponents/TokenizedTopicList/Default.cshtml
@@ -1,7 +1,7 @@
 @model TokenizedTopicListAttributeViewModel
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
   var rootTopicKey = Model.AttributeDescriptor.RootTopic?.UniqueKey.Replace(":", "/") ?? Model.AttributeDescriptor.RootTopicKey?.Replace(":", "/") ?? "Root";
 }
 

diff --git a/...ditor/Components/TopicList/Default.cshtml → ...ditor/Components/TopicList/Default.cshtml b/...ditor/Components/TopicList/Default.cshtml → ...ditor/Components/TopicList/Default.cshtml
@@ -1,7 +1,7 @@
 @model TopicListAttributeViewModel
 
 @{
-    Layout = "~/Views/Editor/Components/_Layout.cshtml";
+    Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
 }
 
 <select

diff --git a/.../Components/TopicReference/Default.cshtml → .../Components/TopicReference/Default.cshtml b/.../Components/TopicReference/Default.cshtml → .../Components/TopicReference/Default.cshtml
diff --git a/...re/Views/Editor/Components/_Layout.cshtml → ...or/Views/Editor/Components/_Layout.cshtml b/...re/Views/Editor/Components/_Layout.cshtml → ...or/Views/Editor/Components/_Layout.cshtml
diff --git a/...ditor.AspNetCore/Views/Editor/Edit.cshtml → ...ore/Areas/Editor/Views/Editor/Edit.cshtml b/...ditor.AspNetCore/Views/Editor/Edit.cshtml → ...ore/Areas/Editor/Views/Editor/Edit.cshtml
@@ -1,7 +1,6 @@
 @model OnTopic.Editor.Models.EditorViewModel
 
 @{
-  Layout = "~/Views/Shared/_Layout.cshtml";
   ViewBag.Title = "Home Page";
   var bindingModel = new EditorBindingModel();
 }

diff --git a/...AspNetCore/Views/Shared/CloseModal.cshtml → ...eas/Editor/Views/Shared/CloseModal.cshtml b/...AspNetCore/Views/Shared/CloseModal.cshtml → ...eas/Editor/Views/Shared/CloseModal.cshtml
diff --git a/...itor.AspNetCore/Views/Shared/Error.cshtml → ...re/Areas/Editor/Views/Shared/Error.cshtml b/...itor.AspNetCore/Views/Shared/Error.cshtml → ...re/Areas/Editor/Views/Shared/Error.cshtml
diff --git a/...or.AspNetCore/Views/Shared/_Layout.cshtml → .../Areas/Editor/Views/Shared/_Layout.cshtml b/...or.AspNetCore/Views/Shared/_Layout.cshtml → .../Areas/Editor/Views/Shared/_Layout.cshtml
diff --git a/...r.AspNetCore/Views/Shared/_Toolbar.cshtml → ...Areas/Editor/Views/Shared/_Toolbar.cshtml b/...r.AspNetCore/Views/Shared/_Toolbar.cshtml → ...Areas/Editor/Views/Shared/_Toolbar.cshtml
diff --git a/...tCore/Views/Shared/_TreeViewScript.cshtml → ...ditor/Views/Shared/_TreeViewScript.cshtml b/...tCore/Views/Shared/_TreeViewScript.cshtml → ...ditor/Views/Shared/_TreeViewScript.cshtml
diff --git a/...itor.AspNetCore/Views/_ViewImports.cshtml → ...re/Areas/Editor/Views/_ViewImports.cshtml b/...itor.AspNetCore/Views/_ViewImports.cshtml → ...re/Areas/Editor/Views/_ViewImports.cshtml
diff --git a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/_ViewStart.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "~/Areas/Editor/Views/Shared/_Layout.cshtml";
+}
diff --git a/OnTopic.Editor.AspNetCore/Views/_ViewStart.cshtml b/OnTopic.Editor.AspNetCore/Views/_ViewStart.cshtml