Preparing with new outer/inner container

2sic · Dec 14, 2016 · 3a629ee · 3a629ee
1 parent 96d0501
commit 3a629ee
Show file tree

Hide file tree

Showing 25 changed files with 469 additions and 427 deletions.
diff --git a/_Content - Image full-width text.cshtml b/_Content - Image full-width text.cshtml
@@ -1,15 +1,17 @@
 @* put all necessary link/script tags here *@
 @RenderPage("_Shared - Assets.cshtml", new { parts = "fancybox,styles,scripts"})
 
-<div class="clearfix sc-element co-content co-content-image-left co-text-beside-image ly-margin-bottom row">
-    @Edit.Toolbar(Content)
-	<div class="col-sm-12">
-		@RenderPage("_Shared - header tag.cshtml")
-		@* call sub-template to show the image with all possible options *@
-		@RenderPage("_Shared - image and optional Lightbox.cshtml", new { width = 540 })
-		@* call sub-template to show the title with the correct H1-H6 tag *@
-		<div class="co-text">
-			@Html.Raw(Content.Text)
+<div class="co-container-outer">
+	<div class="co-container-inner clearfix sc-element co-content co-content-image-left co-text-beside-image ly-margin-bottom row">
+		@Edit.Toolbar(Content)
+		<div class="col-sm-12">
+			@RenderPage("_Shared - header tag.cshtml")
+			@* call sub-template to show the image with all possible options *@
+			@RenderPage("_Shared - image and optional Lightbox.cshtml", new { width = 540 })
+			@* call sub-template to show the title with the correct H1-H6 tag *@
+			<div class="co-text">
+				@Html.Raw(Content.Text)
+			</div>
 		</div>
 	</div>
 </div>
diff --git a/_Content - Image text 1-2.cshtml b/_Content - Image text 1-2.cshtml
@@ -1,17 +1,19 @@
 @* put all necessary link/script tags here *@
 @RenderPage("_Shared - Assets.cshtml", new { parts = "fancybox,styles,scripts"})
 
-<div class="clearfix sc-element co-content co-content-image-left co-text-beside-image ly-margin-bottom row">
-	@Edit.Toolbar(Content)
-	<div class="col-sm-8 col-sm-push-4">
-		@* call sub-template to show the title with the correct H1-H6 tag *@
-		@RenderPage("_Shared - header tag.cshtml")
-		<div class="co-text">
-			@Html.Raw(Content.Text)
+<div class="co-container-outer">
+	<div class="co-container-inner clearfix sc-element co-content co-content-image-left co-text-beside-image ly-margin-bottom row">
+		@Edit.Toolbar(Content)
+		<div class="col-sm-8 col-sm-push-4">
+			@* call sub-template to show the title with the correct H1-H6 tag *@
+			@RenderPage("_Shared - header tag.cshtml")
+			<div class="co-text">
+				@Html.Raw(Content.Text)
+			</div>
+		</div>
+		<div class="col-sm-4 col-sm-pull-8">
+			@* call sub-template to show the image with all possible options *@
+			@RenderPage("_Shared - image and optional Lightbox.cshtml", new { width = 540 })
 		</div>
-	</div>
-	<div class="col-sm-4 col-sm-pull-8">
-		@* call sub-template to show the image with all possible options *@
-		@RenderPage("_Shared - image and optional Lightbox.cshtml", new { width = 540 })
 	</div>
 </div>
diff --git a/_Content - Image text.cshtml b/_Content - Image text.cshtml
@@ -1,17 +1,19 @@
 @* put all necessary link/script tags here *@
 @RenderPage("_Shared - Assets.cshtml", new { parts = "fancybox,styles,scripts"})
 
-<div class="clearfix sc-element co-content co-content-image-left co-text-beside-image ly-margin-bottom row">
-    @Edit.Toolbar(Content)
-	<div class="col-sm-6 col-sm-push-6">
-		@* call sub-template to show the title with the correct H1-H6 tag *@
-		@RenderPage("_Shared - header tag.cshtml")
-	<div class="co-text">
-		@Html.Raw(Content.Text)
-	</div>
-	</div>
-	<div class="col-sm-6 col-sm-pull-6">
-		@* call sub-template to show the image with all possible options *@
-		@RenderPage("_Shared - image and optional Lightbox.cshtml", new { width = 540 })
+<div class="co-container-outer">
+	<div class="co-container-inner clearfix sc-element co-content co-content-image-left co-text-beside-image ly-margin-bottom row">
+		@Edit.Toolbar(Content)
+		<div class="col-sm-6 col-sm-push-6">
+			@* call sub-template to show the title with the correct H1-H6 tag *@
+			@RenderPage("_Shared - header tag.cshtml")
+		<div class="co-text">
+			@Html.Raw(Content.Text)
+		</div>
+		</div>
+		<div class="col-sm-6 col-sm-pull-6">
+			@* call sub-template to show the image with all possible options *@
+			@RenderPage("_Shared - image and optional Lightbox.cshtml", new { width = 540 })
+		</div>
 	</div>
 </div>
diff --git a/_Content - Text Only.cshtml b/_Content - Text Only.cshtml
@@ -1,11 +1,13 @@
 @* put all necessary link/script tags here *@
 @RenderPage("_Shared - Assets.cshtml", new { parts = "styles,scripts"})
 
-<div class="clearfix sc-element co-content co-content-text-only ly-margin-bottom">
-    @Edit.Toolbar(Content)
-    @* call sub-template to show the title with the correct H1-H6 tag *@
-    @RenderPage("_Shared - header tag.cshtml")
-	<div class="co-text">
-		@Html.Raw(Content.Text)
-	</div>
+<div class="co-container-outer">
+	<div class="co-container-inner clearfix sc-element co-content co-content-text-only ly-margin-bottom">
+        @Edit.Toolbar(Content)
+        @* call sub-template to show the title with the correct H1-H6 tag *@
+        @RenderPage("_Shared - header tag.cshtml")
+        <div class="co-text">
+            @Html.Raw(Content.Text)
+        </div>
+    </div>
 </div>
diff --git a/_Content - Text image 2-1.cshtml b/_Content - Text image 2-1.cshtml
@@ -1,19 +1,21 @@
 @* put all necessary link/script tags here *@
 @RenderPage("_Shared - Assets.cshtml", new { parts = "fancybox,styles,scripts"})
 
-<div class="clearfix sc-element co-content co-content-image-right co-text-beside-image ly-margin-bottom row">
-	@Edit.Toolbar(Content)
-	<div class="col-sm-8">
-	<div class="co-content-heading">
-		@* call sub-template to show the title with the correct H1-H6 tag *@
-		@RenderPage("_Shared - header tag.cshtml")
-	</div>
-	<div class="co-text">
-		@Html.Raw(Content.Text)
-	</div>
-	</div>
-	<div class="col-sm-4">
-		@* call sub-template to show the image with all possible options *@
-		@RenderPage("_Shared - image and optional Lightbox.cshtml", new { width = 540 })
+<div class="co-container-outer">
+	<div class="co-container-inner clearfix sc-element co-content co-content-image-right co-text-beside-image ly-margin-bottom row">
+		@Edit.Toolbar(Content)
+		<div class="col-sm-8">
+		<div class="co-content-heading">
+			@* call sub-template to show the title with the correct H1-H6 tag *@
+			@RenderPage("_Shared - header tag.cshtml")
+		</div>
+		<div class="co-text">
+			@Html.Raw(Content.Text)
+		</div>
+		</div>
+		<div class="col-sm-4">
+			@* call sub-template to show the image with all possible options *@
+			@RenderPage("_Shared - image and optional Lightbox.cshtml", new { width = 540 })
+		</div>
 	</div>
 </div>
diff --git a/_Content - Text image.cshtml b/_Content - Text image.cshtml
@@ -1,17 +1,19 @@
 @* put all necessary link/script tags here *@
 @RenderPage("_Shared - Assets.cshtml", new { parts = "fancybox,styles,scripts"})
 
-<div class="clearfix sc-element co-content co-content-image-right co-text-beside-image ly-margin-bottom row">
-    @Edit.Toolbar(Content)
-	<div class="col-sm-6">
-		@* call sub-template to show the title with the correct H1-H6 tag *@
-		@RenderPage("_Shared - header tag.cshtml")
-	<div class="co-text">
-		@Html.Raw(Content.Text)
-	</div>
-	</div>
-	<div class="col-sm-6">
-		@* call sub-template to show the image with all possible options *@
-		@RenderPage("_Shared - image and optional Lightbox.cshtml", new { width = 540 })
+<div class="co-container-outer">
+	<div class="co-container-inner clearfix sc-element co-content co-content-image-right co-text-beside-image ly-margin-bottom row">
+		@Edit.Toolbar(Content)
+		<div class="col-sm-6">
+			@* call sub-template to show the title with the correct H1-H6 tag *@
+			@RenderPage("_Shared - header tag.cshtml")
+		<div class="co-text">
+			@Html.Raw(Content.Text)
+		</div>
+		</div>
+		<div class="col-sm-6">
+			@* call sub-template to show the image with all possible options *@
+			@RenderPage("_Shared - image and optional Lightbox.cshtml", new { width = 540 })
+		</div>
 	</div>
 </div>
diff --git a/_Content - Text only emphasized.cshtml b/_Content - Text only emphasized.cshtml
@@ -1,15 +1,17 @@
 @* put all necessary link/script tags here *@
 @RenderPage("_Shared - Assets.cshtml", new { parts = "styles,scripts"})
 
-<div class="row">
-    <div class="clearfix sc-element co-content co-content-text-only ly-margin-bottom col-md-8 col-md-push-2">
-        @Edit.Toolbar(Content)
-        <div class="co-title">
-            @* call sub-template to show the title with the correct H1-H6 tag *@
-            @RenderPage("_Shared - header tag.cshtml")
-        </div>
-        <div class="co-text">
-            @Html.Raw(Content.Text)
+<div class="co-container-outer">
+	<div class="co-container-inner row">
+        <div class="clearfix sc-element co-content co-content-text-only ly-margin-bottom col-md-8 col-md-push-2">
+            @Edit.Toolbar(Content)
+            <div class="co-title">
+                @* call sub-template to show the title with the correct H1-H6 tag *@
+                @RenderPage("_Shared - header tag.cshtml")
+            </div>
+            <div class="co-text">
+                @Html.Raw(Content.Text)
+            </div>
         </div>
     </div>
 </div>
diff --git a/_Content - Title only.cshtml b/_Content - Title only.cshtml
@@ -1,8 +1,10 @@
 @* put all necessary link/script tags here *@
 @RenderPage("_Shared - Assets.cshtml", new { parts = "styles,scripts"})
 
-<div class="clearfix sc-element co-content co-content-text-only ly-margin-bottom">
-    @Edit.Toolbar(Content)
-    @* call sub-template to show the title with the correct H1-H6 tag *@
-    @RenderPage("_Shared - header tag.cshtml")
+<div class="co-container-outer">
+	<div class="co-container-inner clearfix sc-element co-content co-content-text-only ly-margin-bottom">
+        @Edit.Toolbar(Content)
+        @* call sub-template to show the title with the correct H1-H6 tag *@
+        @RenderPage("_Shared - header tag.cshtml")
+    </div>
 </div>
diff --git a/_Image - Wide Banner.cshtml b/_Image - Wide Banner.cshtml
@@ -1,2 +1,6 @@
 @* call shared template which does everything *@
-@RenderPage("_Image - Shared Wide Banner.cshtml", new { width = 1600, height = 240})
+<div class="co-container-outer">
+	<div class="co-container-inner">
+		@RenderPage("_Image - Shared Wide Banner.cshtml", new { width = 1600, height = 240})
+	</div>
+</div>
diff --git a/_Image - Wide banner tall.cshtml b/_Image - Wide banner tall.cshtml
@@ -1,2 +1,6 @@
 @* call shared template which does everything *@
-@RenderPage("_Image - Shared Wide Banner.cshtml", new { width = 1600, height = 600})
+<div class="co-container-outer">
+    <div class="co-container-inner">
+        @RenderPage("_Image - Shared Wide Banner.cshtml", new { width = 1600, height = 600})
+    </div>
+</div>
diff --git a/_Image - max 1.cshtml b/_Image - max 1.cshtml
@@ -5,21 +5,9 @@
 @* put all necessary link/script tags here *@
 @RenderPage("_Shared - Assets.cshtml", new { parts = "fancybox,styles,scripts"})
 
-@foreach (var Content in AsDynamic(Data["Default"]))
-    {
-	<div class="co-img-wrapper sc-element">
-		@Edit.Toolbar(Content)
-		@if (Presentation.ImageLightbox != null && Presentation.ImageLightbox) {		
-			@:<a title="@(Presentation.TitleLightbox ? Content.Title : "")" class="fancybox" rel="group-@Dnn.Module.ModuleID" href="@Content.Image?maxwidth=1400&amp;maxheight=990">
-		}
-		<img class="img-responsive" src="@Content.Image?w=1200" alt="@Content.Title" />
-		@if (Presentation.ImageLightbox != null && Presentation.ImageLightbox) {
-			@:</a>
-		}
-		@if(Presentation.TitleLegend is bool && Presentation.TitleLegend ){
-			<div class="co-imgcaption">
-				@Content.Title
-			</div>
-		}
+<div class="co-container-outer">
+	<div class="co-container-inner co-img-wrapper co-img-wrapper-@(Dnn.Module.ModuleID) co-2colimg row">
+		@* call sub-template to show all images in the right size *@
+		@RenderPage("_Image - Shared - loop images.cshtml", new { width = 1200, gridColumns = 12 })
 	</div>
-	}
+</div>
diff --git a/_Image - max 2.cshtml b/_Image - max 2.cshtml
@@ -4,9 +4,11 @@
 @* put all necessary link/script tags here *@
 @RenderPage("_Shared - Assets.cshtml", new { parts = "fancybox,styles,scripts,height"})
 
-<div class="co-img-wrapper co-img-wrapper-@(Dnn.Module.ModuleID) co-2colimg row">
-	@* call sub-template to show all images in the right size *@
-	@RenderPage("_Image - Shared - loop images.cshtml", new { width = 540, gridColumns = 6 })
+<div class="co-container-outer">
+	<div class="co-container-inner co-img-wrapper co-img-wrapper-@(Dnn.Module.ModuleID) co-2colimg row">
+		@* call sub-template to show all images in the right size *@
+		@RenderPage("_Image - Shared - loop images.cshtml", new { width = 540, gridColumns = 6 })
+	</div>
 </div>
 
 <script>

diff --git a/_Image - max 3.cshtml b/_Image - max 3.cshtml
@@ -1,12 +1,14 @@
-@*
+vz@*
 	todo: can we extract code, or even the entire file? 
 *@
 @* put all necessary link/script tags here *@
 @RenderPage("_Shared - Assets.cshtml", new { parts = "fancybox,styles,scripts,height"})
 
-<div class="co-img-wrapper co-img-wrapper-@(Dnn.Module.ModuleID) co-2colimg row">
-	@* call sub-template to show all images in the right size *@
-	@RenderPage("_Image - Shared - loop images.cshtml", new { width = 350, gridColumns = 4 })
+<div class="co-container-outer">
+	<div class="co-container-inner co-img-wrapper co-img-wrapper-@(Dnn.Module.ModuleID) co-2colimg row">
+		@* call sub-template to show all images in the right size *@
+		@RenderPage("_Image - Shared - loop images.cshtml", new { width = 350, gridColumns = 4 })
+	</div>
 </div>
 
 <script>

diff --git a/_Image - max 4.cshtml b/_Image - max 4.cshtml
@@ -4,9 +4,11 @@
 @* put all necessary link/script tags here *@
 @RenderPage("_Shared - Assets.cshtml", new { parts = "fancybox,styles,scripts,height"})
 
-<div class="co-img-wrapper co-img-wrapper-@(Dnn.Module.ModuleID) co-2colimg row">
-	@* call sub-template to show all images in the right size *@
-	@RenderPage("_Image - Shared - loop images.cshtml", new { width = 350, gridColumns = 3 })
+<div class="co-container-outer">
+	<div class="co-container-inner co-img-wrapper co-img-wrapper-@(Dnn.Module.ModuleID) co-2colimg row">
+		@* call sub-template to show all images in the right size *@
+		@RenderPage("_Image - Shared - loop images.cshtml", new { width = 350, gridColumns = 3 })
+	</div>
 </div>
 
 <script>

diff --git a/_Link - Document and Link List.cshtml b/_Link - Document and Link List.cshtml
@@ -9,24 +9,28 @@
     var Helpers = CreateInstance("_Helpers.cshtml");
 }
 
-<ul class="co-documents row">
-    @foreach (var Content in AsDynamic(Data["Default"]))
-    {
-        var linkInfo = Helpers.LinkInfos(Content.Link, Content.Window, Content.Icon);
+<div class="co-container-outer">
+	<div class="co-container-inner">
+        <ul class="co-documents row">
+            @foreach (var Content in AsDynamic(Data["Default"]))
+            {
+                var linkInfo = Helpers.LinkInfos(Content.Link, Content.Window, Content.Icon);
 
-        <li class="sc-element co-document col-md-12">
-            @Edit.Toolbar(Content)
-            @if(linkInfo.Found){
-                @:<a target="@linkInfo.Window" href="@Content.Link" title="@Content.Title">
+                <li class="sc-element co-document col-md-12">
+                    @Edit.Toolbar(Content)
+                    @if(linkInfo.Found){
+                        @:<a target="@linkInfo.Window" href="@Content.Link" title="@Content.Title">
+                    }
+                        <span class="text-primary pull-left glyphicon @linkInfo.Icon"></span>
+                        <div class="co-document-text">
+                            <span class="@(linkInfo.Found ? "co-link" : "")">@Content.Title</span>
+                            <p>@Helpers.ConvertLineBreaks(Content.Description)</p>
+                        </div>
+                    @if(linkInfo.Found){
+                        @:</a>
+                    }
+                </li>
             }
-                <span class="text-primary pull-left glyphicon @linkInfo.Icon"></span>
-                <div class="co-document-text">
-                    <span class="@(linkInfo.Found ? "co-link" : "")">@Content.Title</span>
-                    <p>@Helpers.ConvertLineBreaks(Content.Description)</p>
-                </div>
-            @if(linkInfo.Found){
-                @:</a>
-            }
-        </li>
-    }
-</ul>
+        </ul>
+	</div>
+</div>