improvements basic content

2sic · Feb 23, 2022 · 0558f5c · 0558f5c
1 parent 011fdb7
commit 0558f5c
Show file tree

Hide file tree

Showing 12 changed files with 58 additions and 43 deletions.
diff --git a/bs3/Content/_Text and Image.cshtml b/bs3/Content/_Text and Image.cshtml
@@ -18,25 +18,26 @@
 @if (hasMultipleItems && Edit.Enabled) { <div class='pt-4' @Edit.TagToolbar(Header)></div> }
 @for(var iteration = 0; iteration < allContentLength; iteration++)
 {
+  var item = allContent.ElementAt(iteration);
   <div class="co-container-outer">
-    <div class="co-container-inner clearfix co-content" @Edit.TagToolbar(allContent.ElementAt(iteration))>
+    <div class="co-container-inner clearfix co-content" @Edit.TagToolbar(item)>
       <div class="row @(iteration == (allContentLength - 1) ? "" : "mb-4 mb-lg-5")">
         <div class='col-md-@colsText @(isTextFirst ? "" : "col-md-push-" + @colsImg)'>
           @* call sub-template to show the title with the correct H1-H6 tag *@
-          @Html.Partial("../shared/_Header tag.cshtml", new { Title = allContent.ElementAt(iteration).Title })
+          @Html.Partial("../shared/_Header tag.cshtml", new { Title = item.Title })
 
           @* If the image doesn't have it's own column, its between title/text *@
           @if (colsImg == 0) {
-            @Html.Partial("_Part Image.cshtml", new { Item = allContent.ElementAt(iteration) })
+            @Html.Partial("_Part Image.cshtml", new { Item = item })
           }
 
-          @Html.Raw(allContent.ElementAt(iteration).Text)
+          @Html.Raw(item.Text)
         </div>
         @* If the image has it's own column, it's here *@
         @if (colsImg != 0) {
           <div class='col-md-@colsImg @(!isTextFirst ? "col-md-pull-" + @colsText : "")'>
             @* call sub-template to show the image with all possible options *@
-            @Html.Partial("_Part Image.cshtml", new { Item = allContent.ElementAt(iteration), Columns = colsImg, FancyboxAttribute = fancyboxAttribute })
+            @Html.Partial("_Part Image.cshtml", new { Item = item, Columns = colsImg, FancyboxAttribute = fancyboxAttribute })
           </div>
         }
       </div>

diff --git a/bs3/Content/_Text only.cshtml b/bs3/Content/_Text only.cshtml
@@ -14,13 +14,14 @@
 @if (hasMultipleItems && Edit.Enabled) { <div class='pt-4' @Edit.TagToolbar(Header)></div> }
 @for(var iteration = 0; iteration < allContentLength; iteration++)
 {
+  var item = allContent.ElementAt(iteration);
   <div class="co-container-outer">
     <div class="co-container-inner">
       <div class="row @(iteration == (allContentLength - 1) ? "" : "mb-4 mb-lg-5")">
-        <div class="clearfix co-content @styling col-md-@cols col-md-push-@padding" @Edit.TagToolbar(allContent.ElementAt(iteration))>
+        <div class="clearfix co-content @styling col-md-@cols col-md-push-@padding" @Edit.TagToolbar(item)>
           @* call sub-template to show the title with the correct H1-H6 tag *@
-          @Html.Partial("../shared/_Header tag.cshtml", new { Title = allContent.ElementAt(iteration).Title })
-          @Html.Raw(allContent.ElementAt(iteration).Text)
+          @Html.Partial("../shared/_Header tag.cshtml", new { Title = item.Title })
+          @Html.Raw(item.Text)
         </div>
       </div>
     </div>

diff --git a/bs3/Content/_Title only.cshtml b/bs3/Content/_Title only.cshtml
@@ -10,11 +10,12 @@
 
 @if (hasMultipleItems && Edit.Enabled) { <div class='pt-4' @Edit.TagToolbar(Header)></div> }
 @for(var iteration = 0; iteration < allContentLength; iteration++)
-
+{
+  var item = allContent.ElementAt(iteration);
   <div class="co-container-outer">
-    <div class='co-container-inner clearfix co-content @(iteration == (allContentLength - 1) ? "" : "mb-4 mb-lg-5")' @Edit.TagToolbar(allContent.ElementAt(iteration))>
+    <div class='co-container-inner clearfix co-content @(iteration == (allContentLength - 1) ? "" : "mb-4 mb-lg-5")' @Edit.TagToolbar(item)>
       @* call sub-template to show the title with the correct H1-H6 tag *@
-      @Html.Partial("../shared/_Header tag.cshtml", new { Title = allContent.ElementAt(iteration).Title })
+      @Html.Partial("../shared/_Header tag.cshtml", new { Title = item.Title })
     </div>
   </div>
 }
diff --git a/bs3/Video/_Video.cshtml b/bs3/Video/_Video.cshtml
@@ -16,20 +16,22 @@
 }
 
 @if (hasMultipleItems && Edit.Enabled) { <div class='pt-4' @Edit.TagToolbar(Header)></div> }
-@for(var iteration = 0; iteration < allContentLength; iteration++) {
+@for(var iteration = 0; iteration < allContentLength; iteration++) 
+{
+  var item = allContent.ElementAt(iteration);
   <div class="co-container-outer mb-4 mb-md-5">
-    <div class="co-container-inner clearfix co-content" @Edit.TagToolbar(allContent.ElementAt(iteration))>
+    <div class="co-container-inner clearfix co-content" @Edit.TagToolbar(item)>
       <div class='row @(iteration == (allContentLength - 1) ? "" : "mb-4 mb-lg-5")'>
         <div class='col-md-@colsText @(isTextFirst ? "" : "col-md-push-" + @colsImg)'>
           @* call sub-template to show the title with the correct H1-H6 tag *@
-          @Html.Partial("../shared/_Header tag.cshtml", new { Title = allContent.ElementAt(iteration).Title })
+          @Html.Partial("../shared/_Header tag.cshtml", new { Title = item.Title })
 
           @* If the image doesn't have it's own column, its between title/text *@
           @if (colsImg == 0) {
             @Html.Partial("_Part Video.cshtml", new { Columns = 12 })
           }
 
-          @Html.Raw(allContent.ElementAt(iteration).Text)
+          @Html.Raw(item.Text)
         </div>
         @* If the image has it's own column, it's here *@
         @if (colsImg != 0) {

diff --git a/bs4/Content/_Text and Image.cshtml b/bs4/Content/_Text and Image.cshtml
@@ -18,25 +18,26 @@
 @if (hasMultipleItems && Edit.Enabled) { <div class='pt-4' @Edit.TagToolbar(Header)></div> }
 @for(var iteration = 0; iteration < allContentLength; iteration++)
 {
+  var item = allContent.ElementAt(iteration);
   <div class="co-container-outer mb-4 mb-md-5">
-    <div class="co-container-inner" @Edit.TagToolbar(allContent.ElementAt(iteration))>
+    <div class="co-container-inner" @Edit.TagToolbar(item)>
       <div class='row @(iteration == (allContentLength - 1) ? "" : "mb-4 mb-lg-5")'>
         <div class='col-md-@colsText order-md-@(isTextFirst ? "first" : "last")'>
           @* call sub-template to show the title with the correct H1-H6 tag *@
-          @Html.Partial("../shared/_Header tag.cshtml", new { Title = allContent.ElementAt(iteration).Title })
+          @Html.Partial("../shared/_Header tag.cshtml", new { Title = item.Title })
 
           @* If the image doesn't have it's own column, its between title/text *@
           @if (colsImg == 0) {
-            @Html.Partial("_Text and Image.Part-Image.cshtml", new { Item = allContent.ElementAt(iteration) })
+            @Html.Partial("_Text and Image.Part-Image.cshtml", new { Item = item })
           }
 
-          @Html.Raw(allContent.ElementAt(iteration).Text)
+          @Html.Raw(item.Text)
         </div>
         @* If the image has it's own column, it's here *@
         @if (colsImg != 0) {
           <div class='col-md-@colsImg order-md-@(!isTextFirst ? "first" : "last")'>
             @* call sub-template to show the image with all possible options *@
-            @Html.Partial("_Text and Image.Part-Image.cshtml", new { Item = allContent.ElementAt(iteration), Columns = colsImg, FancyboxAttribute = fancyboxAttribute})
+            @Html.Partial("_Text and Image.Part-Image.cshtml", new { Item = item, Columns = colsImg, FancyboxAttribute = fancyboxAttribute})
           </div>
         }
       </div>

diff --git a/bs4/Content/_Text only.cshtml b/bs4/Content/_Text only.cshtml
@@ -13,13 +13,14 @@
 @if (hasMultipleItems && Edit.Enabled) { <div class='pt-4' @Edit.TagToolbar(Header)></div> }
 @for(var iteration = 0; iteration < allContentLength; iteration++)
 {
+  var item = allContent.ElementAt(iteration);
   <div class="co-container-outer mb-4 mb-md-5">
     <div class="co-container-inner">
       <div  class='row @(iteration == (allContentLength - 1) ? "" : "mb-4 mb-lg-5")'>
-        <div class='col-md-@cols offset-md-@padding @styling' @Edit.TagToolbar(allContent.ElementAt(iteration))>
+        <div class='col-md-@cols offset-md-@padding @styling' @Edit.TagToolbar(item)>
           @* call sub-template to show the title with the correct H1-H6 tag *@
-          @Html.Partial("../shared/_Header tag.cshtml", new { Title = allContent.ElementAt(iteration).Title })
-          @Html.Raw(allContent.ElementAt(iteration).Text)
+          @Html.Partial("../shared/_Header tag.cshtml", new { Title = item.Title })
+          @Html.Raw(item.Text)
         </div>
       </div>
     </div>

diff --git a/bs4/Content/_Title only.cshtml b/bs4/Content/_Title only.cshtml
@@ -8,10 +8,11 @@
 @if (hasMultipleItems && Edit.Enabled) { <div class='pt-4' @Edit.TagToolbar(Header)></div> }
 @for(var iteration = 0; iteration < allContentLength; iteration++)
 {
+  var item = allContent.ElementAt(iteration);
   <div class="co-container-outer mb-4 mb-md-5">
-    <div class='co-container-inner @(iteration == (allContentLength - 1) ? "" : "mb-4 mb-lg-5")' @Edit.TagToolbar(allContent.ElementAt(iteration))>
+    <div class='co-container-inner @(iteration == (allContentLength - 1) ? "" : "mb-4 mb-lg-5")' @Edit.TagToolbar(item)>
       @* call sub-template to show the title with the correct H1-H6 tag *@
-      @Html.Partial("../shared/_Header tag.cshtml", new { Title = allContent.ElementAt(iteration).Title })
+      @Html.Partial("../shared/_Header tag.cshtml", new { Title = item.Title })
     </div>
   </div>
 }

diff --git a/bs4/Video/_Video.cshtml b/bs4/Video/_Video.cshtml
@@ -16,20 +16,22 @@
 }
 
 @if (hasMultipleItems && Edit.Enabled) { <div class='pt-4' @Edit.TagToolbar(Header)></div> }
-@for(var iteration = 0; iteration < allContentLength; iteration++) {
+@for(var iteration = 0; iteration < allContentLength; iteration++) 
+{
+  var item = allContent.ElementAt(iteration);
   <div class="co-container-outer mb-4 mb-md-5">
-    <div class="co-container-inner" @Edit.TagToolbar(allContent.ElementAt(iteration))>
+    <div class="co-container-inner" @Edit.TagToolbar(item)>
       <div class='row @(iteration == (allContentLength - 1) ? "" : "mb-4 mb-lg-5")'>
         <div class='col-md-@colsText order-md-@(isTextFirst ? "first" : "last")'>
           @* call sub-template to show the title with the correct H1-H6 tag *@
-          @Html.Partial("../shared/_Header tag.cshtml", new { Title = allContent.ElementAt(iteration).Title })
+          @Html.Partial("../shared/_Header tag.cshtml", new { Title = item.Title })
 
           @* If the image doesn't have it's own column, its between title/text *@
           @if (colsImg == 0) {
             @Html.Partial("_Video.Part-Playback.cshtml", new { Columns = 12 })
           }
 
-          @Html.Raw(allContent.ElementAt(iteration).Text)
+          @Html.Raw(item.Text)
         </div>
         @* If the image has it's own column, it's here *@
         @if (colsImg != 0) {

diff --git a/bs5/Content/_Text and Image.cshtml b/bs5/Content/_Text and Image.cshtml
@@ -18,23 +18,24 @@
 @if (hasMultipleItems && Edit.Enabled) { <div class='pt-4' @Edit.TagToolbar(Header)></div> }
 @for(var iteration = 0; iteration < allContentLength; iteration++)
 {
-  <div class='row @(iteration == (allContentLength - 1) ? "" : "mb-4 mb-lg-5")' @Edit.TagToolbar(allContent.ElementAt(iteration))>
+  var item = allContent.ElementAt(iteration);
+  <div class='row @(iteration == (allContentLength - 1) ? "" : "mb-4 mb-lg-5")' @Edit.TagToolbar(item)>
     <div class='col-md-@colsText order-md-@(isTextFirst ? "first" : "last")'>
       @* call sub-template to show the title with the correct H1-H6 tag *@
-      @Html.Partial("../shared/_Header tag.cshtml", new { Title = allContent.ElementAt(iteration).Title })
+      @Html.Partial("../shared/_Header tag.cshtml", new { Title = item.Title })
 
       @* If the image doesn't have it's own column, its between title/text *@
       @if (colsImg == 0) {
-        @Html.Partial("_Text and Image.Part-Image.cshtml", new { Item = allContent.ElementAt(iteration) })
+        @Html.Partial("_Text and Image.Part-Image.cshtml", new { Item = item })
       }
 
-      @Html.Raw(allContent.ElementAt(iteration).Text)
+      @Html.Raw(item.Text)
     </div>
     @* If the image has it's own column, it's here *@
     @if (colsImg != 0) {
       <div class='col-md-@colsImg order-md-@(!isTextFirst ? "first" : "last")'>
         @* call sub-template to show the image with all possible options *@
-        @Html.Partial("_Text and Image.Part-Image.cshtml", new { Item = allContent.ElementAt(iteration), Columns = colsImg, FancyboxAttribute = fancyboxAttribute})
+        @Html.Partial("_Text and Image.Part-Image.cshtml", new { Item = item, Columns = colsImg, FancyboxAttribute = fancyboxAttribute})
       </div>
     }
   </div>

diff --git a/bs5/Content/_Text only.cshtml b/bs5/Content/_Text only.cshtml
@@ -13,11 +13,12 @@
 @if (hasMultipleItems && Edit.Enabled) { <div class='pt-4' @Edit.TagToolbar(Header)></div> }
 @for(var iteration = 0; iteration < allContentLength; iteration++)
 {
+  var item = allContent.ElementAt(iteration);
   <div class='row @(iteration == (allContentLength - 1) ? "" : "mb-4 mb-lg-5")'>
-    <div class='col-md-@cols offset-md-@padding @styling' @Edit.TagToolbar(allContent.ElementAt(iteration))>
+    <div class='col-md-@cols offset-md-@padding @styling' @Edit.TagToolbar(item)>
       @* call sub-template to show the title with the correct H1-H6 tag *@
-      @Html.Partial("../shared/_Header tag.cshtml", new { Title = allContent.ElementAt(iteration).Title })
-      @Html.Raw(allContent.ElementAt(iteration).Text)
+      @Html.Partial("../shared/_Header tag.cshtml", new { Title = item.Title })
+      @Html.Raw(item.Text)
     </div>
   </div> 
 }

diff --git a/bs5/Content/_Title only.cshtml b/bs5/Content/_Title only.cshtml
@@ -8,9 +8,10 @@
 @if (hasMultipleItems && Edit.Enabled) { <div class='pt-4' @Edit.TagToolbar(Header)></div> }
 @for(var iteration = 0; iteration < allContentLength; iteration++)
 {
-  <div class='@(iteration == (allContentLength - 1) ? "" : "mb-4 mb-lg-5")' @Edit.TagToolbar(allContent.ElementAt(iteration))>
+  var item = allContent.ElementAt(iteration);
+  <div class='@(iteration == (allContentLength - 1) ? "" : "mb-4 mb-lg-5")' @Edit.TagToolbar(item)>
     @* call sub-template to show the title with the correct H1-H6 tag *@
-    @Html.Partial("../shared/_Header tag.cshtml", new { Title = allContent.ElementAt(iteration).Title })
+    @Html.Partial("../shared/_Header tag.cshtml", new { Title = item.Title })
   </div>
 }
 

diff --git a/bs5/Video/_Video.cshtml b/bs5/Video/_Video.cshtml
@@ -16,18 +16,20 @@
 }
 
 @if (hasMultipleItems && Edit.Enabled) { <div class='pt-4' @Edit.TagToolbar(Header)></div> }
-@for(var iteration = 0; iteration < allContentLength; iteration++) {
-  <div class='row @(iteration == (allContentLength - 1) ? "" : "mb-4 mb-lg-5")' @Edit.TagToolbar(allContent.ElementAt(iteration))>
+@for(var iteration = 0; iteration < allContentLength; iteration++) 
+{
+  var item = allContent.ElementAt(iteration);
+  <div class='row @(iteration == (allContentLength - 1) ? "" : "mb-4 mb-lg-5")' @Edit.TagToolbar(item)>
     <div class='col-md-@colsText order-md-@(isTextFirst ? "first" : "last")'>
       @* call sub-template to show the title with the correct H1-H6 tag *@
-      @Html.Partial("../shared/_Header tag.cshtml", new { Title = allContent.ElementAt(iteration).Title })
+      @Html.Partial("../shared/_Header tag.cshtml", new { Title = item.Title })
 
       @* If the image doesn't have it's own column, its between title/text *@
       @if (colsImg == 0) {
         @Html.Partial("_Video.Part-Playback.cshtml", new { Columns = 12 })
       }
 
-      @Html.Raw(allContent.ElementAt(iteration).Text)
+      @Html.Raw(item.Text)
     </div>
     @* If the image has it's own column, it's here *@
     @if (colsImg != 0) {