Fix layout html

noelmcloughlin · noelmcloughlin · commit 6bff1798f336 · 2019-03-28T13:11:41.000Z
diff --git a/mvc/views/home.njk b/mvc/views/home.njk
@@ -1,4 +1,4 @@
-{% include "layouts/main.html" %}
+{% include "layouts/layout.html" %}
 
 <div class="ui pusher">
   <div class="ui inverted vertical masthead center aligned segment">
@@ -10,7 +10,7 @@
               <aside class="three wide column">
                   <img class="ui image" src="/images/Beacha_sculpture_by_David_Walsh.jpg">
               </aside>
-              <article class="thirteen wide column">
+              <section class="thirteen wide column">
 
                   {%- if regions %}
                       {%- include "partials/regionlist.njk" %}
@@ -20,7 +20,7 @@
                       <br><br><br>
                   {%- endif %}
 
-              </article>
+              </section>
           </div>
       </section>
       <section class="ui stacked segment">
diff --git a/mvc/views/layouts/layout.html b/mvc/views/layouts/layout.html
@@ -2,10 +2,6 @@
 <html>
 <head>
   <meta charset="utf-8">
-    {%- block title %}
-  <title> {{- '' if not title else title }} </title>
-    {%- endblock %}
-  <meta charset="UTF-8">
 
     <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
     <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.1/semantic.min.js"></script>
diff --git a/mvc/views/layouts/main.html b/mvc/views/layouts/main.html
diff --git a/mvc/views/login.njk b/mvc/views/login.njk
@@ -1,4 +1,4 @@
-{% include "layouts/main.html" %}
+{% include "layouts/layout.html" %}
 
 <div class="pusher">
     <div class="ui inverted vertical masthead center aligned segment">
diff --git a/mvc/views/main.njk b/mvc/views/main.njk
@@ -1,4 +1,4 @@
-{% include "layouts/main.html" %}
+{% include "layouts/layout.html" %}
 
 <div class="pusher">
   <div class="ui inverted vertical masthead center aligned segment">
diff --git a/mvc/views/privacy.njk b/mvc/views/privacy.njk
@@ -1,4 +1,4 @@
-{% include "layouts/main.html" %}
+{% include "layouts/layout.html" %}
 
 <div class="pusher">
     <div class="ui inverted vertical masthead center aligned segment">
diff --git a/mvc/views/report.njk b/mvc/views/report.njk
@@ -1,11 +1,11 @@
-{% include "layouts/main.html" %}
+{% include "layouts/layout.html" %}
 
 <div class="pusher">
     <div class="ui inverted vertical masthead center aligned segment">
 
       {% include "partials/mainmenu.njk" %}
 
-      <section class="ui stacked segment">
+      <section class="ui stacked segment grid">
           <div class="ui grid">
               <aside class="three wide column">
                   <img class="ui image" src="/images/Beacha_sculpture_by_David_Walsh.jpg">
diff --git a/mvc/views/settings.njk b/mvc/views/settings.njk
@@ -1,4 +1,4 @@
-{% include "layouts/main.html" %}
+{% include "layouts/layout.html" %}
 
 <div class="pusher">
     <div class="ui inverted vertical masthead center aligned segment">
diff --git a/mvc/views/signup.njk b/mvc/views/signup.njk
@@ -1,4 +1,4 @@
-{% include "layouts/main.html" %}
+{% include "layouts/layout.html" %}
 
 <div class="pusher">
     <div class="ui inverted vertical masthead center aligned segment">

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% include "layouts/main.html" %}`
	`1`	`+{% include "layouts/layout.html" %}`
`2`	`2`
`3`	`3`	`<div class="pusher">`
`4`	`4`	`<div class="ui inverted vertical masthead center aligned segment">`