diff --git a/project_server.py b/project_server.py
index d5abe52e2e1f0cc754c8d6cd332dd520074e4734..e82e33e8ba2eeff3fabb2b41bcae982fb22101ae 100644
--- a/project_server.py
+++ b/project_server.py
@@ -9,9 +9,13 @@ ALLOWED_EXTENSIONS = set(['txt', 'pdf', 'png', 'jpg', 'jpeg', 'gif'])
@app.route("/", methods=['GET'])
-def returnTemplate():
+def returnIndex():
return render_template("test.html")
+@app.route("/Manage_Coworking_Spaces", methods=['GET'])
+def returnManageCoworkingSpaces():
+ return render_template("Manage_Coworking_Spaces.html")
+
@app.route("/SearchRecord", methods=['POST'])
def searchRecord():
diff --git a/static/Manage_Coworking_Spaces.html b/static/Manage_Coworking_Spaces.html
deleted file mode 100644
index 26908ef8108f7b8ae8876a4f7d7e9018dadee7bc..0000000000000000000000000000000000000000
--- a/static/Manage_Coworking_Spaces.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE html>
-<html lang="EN" dir="ltr">
- <head>
- <meta charSet="UTF-8">
- <title> Manage Coworking Spaces </title>
- <link rel="stylesheet" href="CSS/Manage_Coworking_Spaces.css">
-
- </head>
- <body onLoad="pageLoad()">
-
- <header id="pageHeader" class="pageHeader">
- <div id="headerDiv">
- <a href="Manage_Coworking_Spaces.html">
- <img id="headerImg" class="headerImg"
- src="Media/Tramshed-Logo-Main-Black.png"></img></a>
- <a id="headerText" class="headerText"
- href="Manage_Coworking_Spaces.html">
- Manage Coworking Spaces</a>
- </div>
- <nav id="headerNav" class="navBar">
- <ul class="Left">
- <li><a href="Manage_Coworking_Spaces.html">
- <img id="navImg" class="navImg"
- src="Media/Tramshed-Logo-Main-White.png"></img></a></li>
- <li><a href="Manage_Coworking_Spaces.html">Home</a></li>
- <li><a href="Manage_Coworking_Spaces.html">Locations</a></li>
- </ul>
- <ul class="Right">
- <li><a href="Manage_Coworking_Spaces.html">Manage</a></li>
- <li><a href="Manage_Coworking_Spaces.html">Login</a></li>
- <li><div class="navHamburger">
- <span></span>
- <span></span>
- <span></span>
- </div></li>
- </ul>
- </nav>
- </header>
-
- <main id="pageMain">
- <form id="recordForm" title="Record Form">
- <label>Name: <input id="recordName" class="formTextInput"
- name="record_name" type="text"></label><br>
- <label>Address: <input id="recordAddress" class="formTextInput"
- name="record_address" type="text"></label><br>
- <label>Main Photograph: <input id="recordMainPhotos" class="formTextInput"
- name="record_MP" type="text"></label><br>
- <label>Additional Photographs: <input id="recordAdditionalPhotos" class="formTextInput"
- name="record_AP" type="text"></label><br>
- <label>Description: <input id="recordDescription" class="formTextInput"
- name="record_description" type="text"></label><br>
- <label>Website: <input id="recordWebsite" class="formTextInput"
- name="record_website" type="text"></label><br>
- <label>Email: <input id="recordEmail" class="formTextInput"
- name="record_email" type="text"></label><br>
- <label>Phone Number: <input id="recordPhoneNumber" class="formTextInput"
- name="record_PN" type="text"></label><br>
- <label>Opening Hours: <input id="recordOpeningHours" class="formTextInput"
- name="record_OH" type="text"></label><br>
- <label>Checkin Instructions: <input id="recordCheckinInstructions" class="formTextInput"
- name="record_CI" type="text"></label>
-
- <br><br>
- <button id="searchButton" type="submit">Search</button>
- <button id="addButton" type="submit">Add</button>
- <button id="editButton" type="submit">Edit</button>
- <button id="deleteButton" type="submit">Delete</button>
- </form>
- <br>
- <span id="DEBUGserverMessage"> </span>
-
- <br><br><br><br><br><br><br><br><br><br><br><br>
- <br><br><br><br><br><br><br><br><br><br><br><br>
- <br><br><br><br><br><br><br><br><br><br><br><br>
- <br><br><br><br><br><br><br><br><br><br><br><br>
- </main>
-
- <footer id="pageFooter">
- <nav id="footerNav" class="navBar">
- <ul class="Center">
- <li><a href="Manage_Coworking_Spaces.html">Left</a></li>
- </ul>
- <ul class="Center">
- <li><a href="Manage_Coworking_Spaces.html">Center</a></li>
- </ul>
- <ul class="Center">
- <li><a href="Manage_Coworking_Spaces.html">Right</a></li>
- </ul>
- </nav>
- </footer>
-
- <script src="JS/Manage_Coworking_Spaces.js"></script>
- </body>
-</html>
diff --git a/static/landingpage.html b/static/landingpage.html
index cc325be3feb9eb530c86f7f133f36e970c2ef94c..fca729848a41a620680e438f5ae7728876e074c1 100644
--- a/static/landingpage.html
+++ b/static/landingpage.html
@@ -12,7 +12,7 @@
<a class="nav-link" href="locations.html">Coworking locations</a>
</li>
<li class="nav-item">
- <a class="nav-link" href="Manage_Coworking_Spaces.html">Manage locations</a>
+ <a class="nav-link" href="/Manage_Coworking_Spaces">Manage locations</a>
</li>
</ul>
</div>
diff --git a/templates/Manage_Coworking_Spaces.html b/templates/Manage_Coworking_Spaces.html
new file mode 100644
index 0000000000000000000000000000000000000000..4daddcc1d7cbb43e10a747f90edd331c74e35084
--- /dev/null
+++ b/templates/Manage_Coworking_Spaces.html
@@ -0,0 +1,92 @@
+{%extends "base_template.html"%}
+
+{%block headblock%}
+ <title> Manage Coworking Spaces </title>
+ <link rel="stylesheet" href="/static/CSS/Manage_Coworking_Spaces.css">
+{%endblock%}
+
+{%block onLoadblock%}
+ pageLoad()
+{%endblock%}
+
+{%block headerblock%}
+ <div id="headerDiv">
+ <a href="Manage_Coworking_Spaces.html">
+ <img id="headerImg" class="headerImg"
+ src="/static/Media/Tramshed-Logo-Main-Black.png"></img></a>
+ <a id="headerText" class="headerText"
+ href="Manage_Coworking_Spaces">
+ Manage Coworking Spaces</a>
+ </div>
+ <nav id="headerNav" class="navBar">
+ <ul class="Left">
+ <li><a href="Manage_Coworking_Spaces">Home</a></li>
+ <li><a href="Locations">Locations</a></li>
+ </ul>
+ <ul class="Right">
+ <li><a href="Manage_Coworking_Spaces">Manage</a></li>
+ <li><a href="Manage_Coworking_Spaces">Login</a></li>
+ <li><div class="navHamburger">
+ <span></span>
+ <span></span>
+ <span></span>
+ </div></li>
+ </ul>
+ </nav>
+{%endblock%}
+
+{%block mainblock%}
+ <form id="recordForm" title="Record Form">
+ <label>Name: <input id="recordName" class="formTextInput"
+ name="record_name" type="text"></label><br>
+ <label>Address: <input id="recordAddress" class="formTextInput"
+ name="record_address" type="text"></label><br>
+ <label>Main Photograph: <input id="recordMainPhotos" class="formTextInput"
+ name="record_MP" type="text"></label><br>
+ <label>Additional Photographs: <input id="recordAdditionalPhotos" class="formTextInput"
+ name="record_AP" type="text"></label><br>
+ <label>Description: <input id="recordDescription" class="formTextInput"
+ name="record_description" type="text"></label><br>
+ <label>Website: <input id="recordWebsite" class="formTextInput"
+ name="record_website" type="text"></label><br>
+ <label>Email: <input id="recordEmail" class="formTextInput"
+ name="record_email" type="text"></label><br>
+ <label>Phone Number: <input id="recordPhoneNumber" class="formTextInput"
+ name="record_PN" type="text"></label><br>
+ <label>Opening Hours: <input id="recordOpeningHours" class="formTextInput"
+ name="record_OH" type="text"></label><br>
+ <label>Checkin Instructions: <input id="recordCheckinInstructions" class="formTextInput"
+ name="record_CI" type="text"></label>
+
+ <br><br>
+ <button id="searchButton" type="submit">Search</button>
+ <button id="addButton" type="submit">Add</button>
+ <button id="editButton" type="submit">Edit</button>
+ <button id="deleteButton" type="submit">Delete</button>
+ </form>
+ <br>
+ <span id="DEBUGserverMessage"> </span>
+
+ <br><br><br><br><br><br><br><br><br><br><br><br>
+ <br><br><br><br><br><br><br><br><br><br><br><br>
+ <br><br><br><br><br><br><br><br><br><br><br><br>
+ <br><br><br><br><br><br><br><br><br><br><br><br>
+{%endblock%}
+
+{%block footerblock%}
+ <nav id="footerNav" class="navBar">
+ <ul class="Center">
+ <li><a href="Manage_Coworking_Spaces.html">Left</a></li>
+ </ul>
+ <ul class="Center">
+ <li><a href="Manage_Coworking_Spaces.html">Center</a></li>
+ </ul>
+ <ul class="Center">
+ <li><a href="Manage_Coworking_Spaces.html">Right</a></li>
+ </ul>
+ </nav>
+{%endblock%}
+
+{%block jsblock%}
+ /static/JS/Manage_Coworking_Spaces.js
+{%endblock%}
diff --git a/templates/base_template.html b/templates/base_template.html
index 0b285b1ecc1f90b004c53bc499cf740df1758916..6460c1ffceb45aa080041be4dc7c93f60104bbce 100644
--- a/templates/base_template.html
+++ b/templates/base_template.html
@@ -2,61 +2,26 @@
<html lang="EN" dir="ltr">
<head>
<meta charSet="UTF-8">
- <title> Manage Coworking Spaces </title>
- <link rel="stylesheet" href="/static/CSS/Manage_Coworking_Spaces.css">
-
+ {%block headblock%}
+ {%endblock%}
</head>
- <body onLoad="pageLoad()">
+ <body onLoad="{%block onLoadblock%}{%endblock%}">
<header id="pageHeader" class="pageHeader">
- <div id="headerDiv">
- <a href="Manage_Coworking_Spaces.html">
- <img id="headerImg" class="headerImg"
- src="Media/Tramshed-Logo-Main-Black.png"></img></a>
- <a id="headerText" class="headerText"
- href="Manage_Coworking_Spaces.html">
- Manage Coworking Spaces</a>
- </div>
- <nav id="headerNav" class="navBar">
- <ul class="Left">
- <li><a href="Manage_Coworking_Spaces.html">
- <img id="navImg" class="navImg"
- src="Media/Tramshed-Logo-Main-White.png"></img></a></li>
- <li><a href="Manage_Coworking_Spaces.html">Home</a></li>
- <li><a href="Manage_Coworking_Spaces.html">Locations</a></li>
- </ul>
- <ul class="Right">
- <li><a href="Manage_Coworking_Spaces.html">Manage</a></li>
- <li><a href="Manage_Coworking_Spaces.html">Login</a></li>
- <li><div class="navHamburger">
- <span></span>
- <span></span>
- <span></span>
- </div></li>
- </ul>
- </nav>
+ {%block headerblock%}
+ {%endblock%}
</header>
<main id="pageMain">
- <br><br>
{%block mainblock%}
{%endblock%}
</main>
<footer id="pageFooter">
- <nav id="footerNav" class="navBar">
- <ul class="Center">
- <li><a href="Manage_Coworking_Spaces.html">Left</a></li>
- </ul>
- <ul class="Center">
- <li><a href="Manage_Coworking_Spaces.html">Center</a></li>
- </ul>
- <ul class="Center">
- <li><a href="Manage_Coworking_Spaces.html">Right</a></li>
- </ul>
- </nav>
+ {%block footerblock%}
+ {%endblock%}
</footer>
- <script src="/static/JS/Manage_Coworking_Spaces.js"></script>
+ <script src="{%block jsblock%}{%endblock%}"></script>
</body>
</html>