lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Some cleanup on Theme Machine layout file.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Jonathan Wall
2010-10-14 10:01:41 -07:00
parent 8f8d3ba9e6
commit 09a82b8791
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
View File

@@ -112,7 +112,9 @@
<None Include="Views\Admin\AddLayer.cshtml" /> <None Include="Views\Admin\AddLayer.cshtml" />
<None Include="Views\Admin\AddWidget.cshtml" /> <None Include="Views\Admin\AddWidget.cshtml" />
<None Include="Views\Admin\EditWidget.cshtml" /> <None Include="Views\Admin\EditWidget.cshtml" />
<None Include="Views\Admin\EditLayer.cshtml" /> <None Include="Views\Admin\EditLayer.cshtml">
<SubType>Designer</SubType>
</None>
<None Include="Views\Admin\Index.cshtml" /> <None Include="Views\Admin\Index.cshtml" />
<Content Include="Views\Items_Widget.Editor.cshtml" /> <Content Include="Views\Items_Widget.Editor.cshtml" />
<None Include="Views\Widget.Manage.cshtml" /> <None Include="Views\Widget.Manage.cshtml" />

16
src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
View File

@@ -8,10 +8,6 @@
// Zone is an alias for Display // Zone is an alias for Display
Func<dynamic, dynamic> Zone = x => Display(x); Func<dynamic, dynamic> Zone = x => Display(x);
//Use the two lines below to test the sidebar zones.
//WorkContext.Layout.AsideFirst.Add("This test text will render in Sidebar1.");
//WorkContext.Layout.AsideSecond.Add("This test text will render in Sidebar2.");
//Add classes to the wrapper div to toggle zones on and off //Add classes to the wrapper div to toggle zones on and off
if (Model.AsideFirst != null && Model.AsideSecond == null) { if (Model.AsideFirst != null && Model.AsideSecond == null) {
Model.Classes.Add("has-sidebar"); Model.Classes.Add("has-sidebar");
@@ -26,15 +22,9 @@
} }
//Model.Attributes.Add("onclick", "javscript:alert('woot')");
Model.Id = "layout-wrapper";
var tag = Tag (Model, "div");
} }
@* Add a wrapping div around everything *@ <div id="layout-wrapper">
@tag.StartElement
@* needs to be the page title, not page (head) title... *@ @* needs to be the page title, not page (head) title... *@
@* Adds text and html to the header zone *@ @* Adds text and html to the header zone *@
@@ -88,11 +78,11 @@
<span class="poweredby">Powered by Orchard</span> <span class="copyright">&#169; The Theme Machine 2010.</span> <span class="poweredby">Powered by Orchard</span> <span class="copyright">&#169; The Theme Machine 2010.</span>
} }
@if(Model.Footer != null) { @if(Model.Footer != null) {
<footer id="layout-footer" class="group"> <footer id="layout-footer" class="group">
@Zone(Model.Footer) @Zone(Model.Footer)
@Display.User() @Display.User()
</footer> </footer>
} }
@tag.EndElement </div>