Merge

--HG--
branch : dev

src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Routable.ascx

@@ -1,8 +1,8 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<RoutableEditorViewModel>" %>
+<%@ Import Namespace="Orchard.Utility.Extensions"%>
 <%@ Import Namespace="Orchard.ContentManagement.Extenstions"%>
 <%@ Import Namespace="Orchard.ContentManagement"%>
 <%@ Import Namespace="Orchard.ContentManagement.Aspects"%>
-<%@ Import Namespace="Orchard.Extensions"%>
 <%@ Import Namespace="Orchard.Core.Common.ViewModels"%>
 <% Html.RegisterFootScript("jquery.slugify.js"); %>
 <fieldset>

src/Orchard.Web/Themes/Contoso/Views/Layout.HomePage.ascx

@@ -11,18 +11,18 @@
 %>
 
 <div id="container">
-    <!-- Header -->
+    <%-- Header --%>
     <% Html.Zone("header"); %>
 	
-	<!-- Main Menu -->
+	<%-- Main Menu --%>
 	<div id="nav">
         <% Html.Zone("menu"); %>
     </div>
     
-    <!-- Home Hero -->
+    <%-- Home Hero --%>
 	<div class="home-hero-container">
 	    <div class="home-hero">
-	        <!-- Init jQuery Slider -->
+	        <%-- Init jQuery Slider --%>
 	        <script src="/Themes/Contoso/Scripts/easySlider.js" type="text/javascript"></script>
             <script type="text/javascript">
                 $(document).ready(function() {
@@ -44,7 +44,7 @@
 		</div>
 	</div>
 	
-	<!-- Main Content Area -->
+	<%-- Main Content Area --%>
 	<div class="content-container">
 	    <div class="content">
 	        <div class="content-items group">
@@ -58,9 +58,9 @@
 	    </div>
 	</div>
 	
-	<!-- (Optional) Highlights Area -->
+	<%-- (Optional) Highlights Area --%>
     <% Html.Zone("highlights"); %>    
 	
-	<!-- Footer -->
+	<%-- Footer --%>
 	<% Html.Zone("footer"); %>
 </div>

src/Orchard.Web/Themes/Contoso/Views/Layout.ascx

@@ -11,15 +11,15 @@
 %>
 
 <div id="container">
-    <!-- Header -->
+    <%-- Header --%>
     <% Html.Zone("header"); %>
 	
-	<!-- Main Menu -->
+	<%-- Main Menu --%>
 	<div id="nav">
         <% Html.Zone("menu"); %>
     </div>
 	
-	<!-- Main Content Area -->
+	<%-- Main Content Area --%>
 	
 	<div class="content-container">
 	    <div class="content sub">
@@ -29,9 +29,9 @@
 		        </div>
 		        <div class="sidebar">
                     
-                    <!-- START Blog Sidebars -->
+                    <%-- START Blog Sidebars --%>
 		            <%Html.Zone("sidebar");%>
-		            <!-- END Blog Sidebars -->
+		            <%-- END Blog Sidebars --%>
 
                     <div class="side-block">
                         <% Html.Zone("sidebar-w1"); %>
@@ -47,5 +47,5 @@
 	    </div>
 	</div>
 	
-	<!-- Footer -->
+	<%-- Footer --%>
 	<% Html.Zone("footer"); %>

src/Orchard.Web/Themes/Corporate/Views/Layout.HomePage.ascx

@@ -15,7 +15,7 @@
 </div>
 
 <div class="header group">
-    <!-- Main Menu -->
+    <%-- Main Menu --%>
     <div id="nav">
         <div class="brand group">
             <div class="title">
@@ -29,7 +29,7 @@
     <div id="container">
         <div id="content">
 
-            <!-- Home Hero -->
+            <%-- Home Hero --%>
 	        <div class="main-box">
                 <div class="top">
                      <img src="/Themes/Corporate/Content/Images/content-top.png" /></div>
@@ -44,7 +44,7 @@
                     <img src="/Themes/Corporate/Content/Images/content-bottom.png" /></div>
 	        </div>
 
-	        <!-- Main Content Area -->
+	        <%-- Main Content Area --%>
 	        <div class="content-container">
 	            <div class="content">
 	                <div class="content-items group">
@@ -62,5 +62,5 @@
     </div>
 </div>
 	
-	<!-- Footer -->
+	<%-- Footer --%>
 	<% Html.Zone("footer"); %>

src/Orchard.Web/Themes/Corporate/Views/Layout.ascx

@@ -15,7 +15,7 @@
 </div>
 
 <div class="header group">
-    <!-- Main Menu -->
+    <%-- Main Menu --%>
     <div id="nav">
         <div class="brand group">
             <div class="title">
@@ -29,7 +29,7 @@
     <div id="container">
         <div id="content">
 
-            <!-- Content Hero -->
+            <%-- Content Hero --%>
 	        <div class="main-box">
                 <div class="top">
                      <img src="/Themes/Corporate/Content/Images/content-top.png" /></div>
@@ -39,9 +39,9 @@
                                 <% Html.ZoneBody("content"); %>
                             </div>
                             <div class="sidebar">
-                                <!-- START Blog Sidebars -->
+                                <%-- START Blog Sidebars --%>
 		                        <%Html.Zone("sidebar");%>
-		                        <!-- END Blog Sidebars -->
+		                        <%-- END Blog Sidebars --%>
 
                                 <div class="side-block">
                                     <% Html.Zone("sidebar-w1"); %>
@@ -64,5 +64,5 @@
     </div>
 </div>
 	
-	<!-- Footer -->
+	<%-- Footer --%>
 	<% Html.Zone("footer"); %>