General updates

dist/.htaccess

@@ -1,22 +1,17 @@
 Options +Indexes
-Options -MultiViews
 
 RewriteEngine On
 RewriteBase /
 
 RewriteCond %{HTTP_HOST} !^www.sanskritischool.edu.in$ [NC]
 RewriteRule ^(.*)$ http://www.sanskritischool.edu.in/$1 [L,R=301]
 
-RewriteEngine on
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteCond %{REQUEST_FILENAME}\.html -f
-RewriteRule ^([^/]+)/$ $1.html 
-
-# Forces a trailing slash to be added
+RewriteEngine On
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteCond %{REQUEST_URI} !(\.[a-zA-Z0-9]{1,5}|/)$
-RewriteRule (.*)$ /$1/ [R=301,L]
+RewriteRule ^([^\.]+)$ $1.html [NC,L]
+
+#RewriteCond %{REQUEST_URI} !(/$|\.) 
+#RewriteRule (.*) %{REQUEST_URI}/ [R=301,L]
 
 ErrorDocument 404 /404.html
 

dist/about/staff/middle-senior.html

@@ -92,7 +92,9 @@ <h2>Department of History-Civics</h2>
               <li>Minakshi Khemka</li>
               <li>Mona Singh</li>
               <li>Swati Shukla</li>
-              <li>Department of Geography</li>
+            </div>
+            <h2>Department of Geography</h2>
+            <div class="ul">
               <li>Kavita Gupta (HOD)</li>
               <li>Nilakshi Chatterjee</li>
               <li>Shilpi Singh</li>

dist/assets/json/navigation.json

@@ -30,7 +30,7 @@
 		},
 		{
 			"name": "Staff",
-			"href": "/about/staff"
+			"href": "/about/staff.html"
 		},
 		{
 			"name": "Counselling",

dist/news/archive.html

@@ -557,7 +557,7 @@ <h2>September 2017</h2>
               <a href="/News/anti_bullying_class_V.pdf" target="_blank">View ..... </a>
             </li>
             <li class="updates-item">24/09/2017: Canteen Menu for 25th to 27th Sept 2017
-              <a href="/Canteen.html" target="_blank">View ..... </a>
+              <a href="./Canteen.html" target="_blank">View ..... </a>
             </li>
             <li class="updates-item">22/09/2017: Student Council Form 2017
               <a href="/News/CouncilForm.pdf" target="_blank">View ..... </a>
@@ -819,7 +819,7 @@ <h2>May 2017</h2>
               <a href="https://goo.gl/forms/1kUrwo7BA6r4tGX62" target="_blank">Maths Club </a>
             </li>
             <li class="updates-item">11/05/2017:
-              <a href="/newsletter.html" target="_blank">Junior school :Suggested Activities for the Summer Vacations 2017-18</a>
+              <a href="./newsletter.html" target="_blank">Junior school :Suggested Activities for the Summer Vacations 2017-18</a>
             </li>
             <li class="updates-item">09/05/2017:
               <a href="/News/HolidayHomework.pdf" target="_blank">Holiday Homework for the Middle and Senior School</a>

src/pug/pages/about/staff/middle-senior.pug

@@ -92,7 +92,11 @@ html(lang='en')
 							li Minakshi Khemka
 							li Mona Singh
 							li Swati Shukla
-							li Department of Geography
+
+						h2 Department of Geography
+
+						.ul
+
 							li Kavita Gupta (HOD)
 							li Nilakshi Chatterjee
 							li Shilpi Singh