lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-23 13:22:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Changing case of template names (in code. filenames to follow)

Browse Source 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4045834
This commit is contained in:
skewed
2010-01-22 07:58:38 +00:00
parent 7f09516e8c
commit 1e7ae582f0
7 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Orchard.Web/Core/Orchard.Core.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.21022</ProductVersion>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</ProjectGuid>
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
@@ -183,14 +183,14 @@
<Content Include="Themes\Theme.txt" />
<Content Include="Themes\Styles\site.css" />
<Content Include="Themes\Views\Admin\Install.aspx" />
<Content Include="Themes\Views\header.ascx" />
<Content Include="Themes\Views\document.aspx" />
<Content Include="Themes\Views\Header.ascx" />
<Content Include="Themes\Views\Document.aspx" />
<Content Include="Themes\Views\EditorTemplates\Parts\Themes.SiteSettings.ascx" />
<Content Include="Themes\Views\HeadPreload.ascx" />
<Content Include="Themes\Views\layout.ascx" />
<Content Include="Themes\Views\messages.ascx" />
<Content Include="Themes\Views\user.ascx" />
<Content Include="Themes\Views\menu.ascx" />
<Content Include="Themes\Views\Layout.ascx" />
<Content Include="Themes\Views\Messages.ascx" />
<Content Include="Themes\Views\User.ascx" />
<Content Include="Themes\Views\Menu.ascx" />
<Content Include="Themes\Views\Web.config" />
</ItemGroup>
<ItemGroup>
@@ -232,6 +232,9 @@
<IISUrl>
</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
</CustomServerUrl>
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties>
</FlavorProperties>

2
src/Orchard.Web/Core/Themes/Views/document.aspx
View File

@@ -9,7 +9,7 @@
//todo: (heskew) this is an interim solution to inlude jQuery in every page and still allow that to be overriden in some theme by it containing a headScripts partial
Model.Zones.AddRenderPartial("head:before", "HeadPreload", Model);
Html.Zone("head", ":metas :styles :scripts"); %>
<script type="text/javascript">window.document.documentElement.className="dyn"</script>
<script type="text/javascript">document.documentElement.className="dyn";</script>
</head>
<body class="<%=Html.ClassForPage() %>"><%
Html.ZoneBody("body"); %>

6
src/Orchard.Web/Core/Themes/Views/layout.ascx
View File

@@ -1,9 +1,9 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BaseViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%><%
Html.RegisterStyle("site.css");
Model.Zones.AddRenderPartial("header", "header", Model);
Model.Zones.AddRenderPartial("header:after", "user", Model);
Model.Zones.AddRenderPartial("menu", "menu", Model);
Model.Zones.AddRenderPartial("header", "Header", Model);
Model.Zones.AddRenderPartial("header:after", "User", Model);
Model.Zones.AddRenderPartial("menu", "Menu", Model);
%>
<div id="page">
<div id="header"><%

15
src/Orchard.Web/Orchard.Web.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.21022</ProductVersion>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{50B779EA-EC00-4699-84C0-03B395C365D2}</ProjectGuid>
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
@@ -149,7 +149,7 @@
<Content Include="Config\Diagnostics.config" />
<Content Include="Themes\Orange\Styles\site.css" />
<Content Include="Themes\Orange\Theme.txt" />
<Content Include="Themes\Orange\Views\layout.ascx" />
<Content Include="Themes\Orange\Views\Layout.ascx" />
<Content Include="Themes\TheAdmin\Styles\images\background_header.jpg" />
<Content Include="Themes\TheAdmin\Styles\images\icons.png" />
<Content Include="Themes\TheAdmin\Styles\images\orchardLogo.jpg" />
@@ -158,7 +158,7 @@
<Content Include="Themes\TheAdmin\Styles\site.css" />
<Content Include="Themes\TheAdmin\Theme.gif" />
<Content Include="Themes\TheAdmin\Theme.txt" />
<Content Include="Themes\TheAdmin\Views\layout.ascx" />
<Content Include="Themes\TheAdmin\Views\Layout.ascx" />
</ItemGroup>
<ItemGroup>
<None Include="Themes\TheAdmin\Styles\images\icons.psd" />
@@ -221,9 +221,9 @@
<Content Include="Themes\Orchard\Views\footer.ascx" />
<Content Include="Themes\Orchard\Views\layout.ascx" />
<Content Include="Themes\Orchard\Views\menu.ascx" />
<Content Include="Themes\TheAdmin\Views\menu.ascx" />
<Content Include="Themes\TheAdmin\Views\user.ascx" />
<Content Include="Themes\TheAdmin\Views\header.ascx" />
<Content Include="Themes\TheAdmin\Views\Menu.ascx" />
<Content Include="Themes\TheAdmin\Views\User.ascx" />
<Content Include="Themes\TheAdmin\Views\Header.ascx" />
<Content Include="Themes\Web.config" />
</ItemGroup>
<ItemGroup>
@@ -265,6 +265,9 @@
<IISUrl>
</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
</CustomServerUrl>
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties>
</FlavorProperties>

6
src/Orchard.Web/Themes/Orange/Views/layout.ascx
View File

@@ -1,9 +1,9 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BaseViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%><%
Html.RegisterStyle("site.css");
Model.Zones.AddRenderPartial("header", "header", Model);
Model.Zones.AddRenderPartial("header:after", "user", Model);
Model.Zones.AddRenderPartial("menu", "menu", Model);
Model.Zones.AddRenderPartial("header", "Header", Model);
Model.Zones.AddRenderPartial("header:after", "User", Model);
Model.Zones.AddRenderPartial("menu", "Menu", Model);
%>
<div class="page">
<div id="header"><%

6
src/Orchard.Web/Themes/TheAdmin/Views/layout.ascx
View File

@@ -2,9 +2,9 @@
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<%@ Import Namespace="Orchard.Mvc.Html"%><%
Html.RegisterStyle("site.css");
Model.Zones.AddRenderPartial("header", "header", Model);
Model.Zones.AddRenderPartial("header:after", "user", Model); // todo: (heskew) should be a user display or widget
Model.Zones.AddRenderPartial("menu", "menu", Model);
Model.Zones.AddRenderPartial("header", "Header", Model);
Model.Zones.AddRenderPartial("header:after", "User", Model); // todo: (heskew) should be a user display or widget
Model.Zones.AddRenderPartial("menu", "Menu", Model);
%>
<div id="header" role="banner"><% Html.Zone("header"); %></div>
<div id="content">

4
src/Orchard/Mvc/ViewEngines/LayoutViewEngine.cs
View File

@@ -34,8 +34,8 @@ namespace Orchard.Mvc.ViewEngines {
var bodyView = _viewEngines.FindPartialView(controllerContext, viewName);
var layoutView = _viewEngines.FindPartialView(controllerContext, "layout");
var documentView = _viewEngines.FindPartialView(controllerContext, "document");
var layoutView = _viewEngines.FindPartialView(controllerContext, "Layout");
var documentView = _viewEngines.FindPartialView(controllerContext, "Document");
if (bodyView.View == null ||
layoutView.View == null ||