diff --git a/project_server.py b/project_server.py
index 028a5486fadeca78daff16cd010665df3e290021..dc4d679637735ebd12bb91418b8244e531f01210 100644
--- a/project_server.py
+++ b/project_server.py
@@ -31,7 +31,7 @@ def searchRecord():
except:
print(f"Error: {recordData}")
conn.close()
-
+
finally:
conn.close()
print(f"{recordData} Record found.")
diff --git a/static/CSS/Manage_Coworking_Spaces.css b/static/CSS/Manage_Coworking_Spaces.css
index b9b1e4a439d856607d7bba1fe3a0af72c13b3a42..211e5e0879a39af5370cbcfba342844a015bf194 100644
--- a/static/CSS/Manage_Coworking_Spaces.css
+++ b/static/CSS/Manage_Coworking_Spaces.css
@@ -71,11 +71,11 @@ header #pageHeader
#headerText {
width: 100%;
- margin-left: -220px;
+ margin-left: -240px;
}
#headerImg {
- width: 180px;
+ width: 200px;
height: 65px;
margin-top: -10px;
margin-right: 20px;
@@ -93,11 +93,6 @@ header #pageHeader
padding: 7.5px 10px;
}
-#headerNav img {
- width: 55px;
- height: 20px;
-}
-
/* [#2] Page navigation styling. Used in [#1] and [#4]. */
.navBar {
diff --git a/static/JS/Manage_Coworking_Spaces.js b/static/JS/Manage_Coworking_Spaces.js
index 2e11d7923ecc99355d0d82323bb9d212f74a1094..ab9371b3050e68921c68d7142d571daba878dbfb 100644
--- a/static/JS/Manage_Coworking_Spaces.js
+++ b/static/JS/Manage_Coworking_Spaces.js
@@ -72,7 +72,6 @@ function searchRecord(e) {
xhttp.send(params);
}
-
// Adds a record to the database.
function addRecord(e) {
// Removes the standard form processing.
diff --git a/templates/Manage_Coworking_Spaces.html b/templates/Manage_Coworking_Spaces.html
index 4daddcc1d7cbb43e10a747f90edd331c74e35084..7bb67a24d03a6da411090ae1607e4b12745732cb 100644
--- a/templates/Manage_Coworking_Spaces.html
+++ b/templates/Manage_Coworking_Spaces.html
@@ -5,52 +5,29 @@
<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>
+ name="record_name" type="text"></label>
+ <button id="searchButton" type="submit">Search</button><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>
+ name="record_MP" type="url"></label><br>
<label>Additional Photographs: <input id="recordAdditionalPhotos" class="formTextInput"
- name="record_AP" type="text"></label><br>
+ name="record_AP" type="url"></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>
+ name="record_website" type="url"></label><br>
<label>Email: <input id="recordEmail" class="formTextInput"
- name="record_email" type="text"></label><br>
+ name="record_email" type="email"></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"
@@ -59,10 +36,10 @@
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>
+ <button id="clearButton" type="reset">Clear</button>
</form>
<br>
<span id="DEBUGserverMessage"> </span>
@@ -73,20 +50,6 @@
<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 6460c1ffceb45aa080041be4dc7c93f60104bbce..eb7a85ecda52e3fa2e6cbdd7ed7878689e994063 100644
--- a/templates/base_template.html
+++ b/templates/base_template.html
@@ -5,11 +5,31 @@
{%block headblock%}
{%endblock%}
</head>
- <body onLoad="{%block onLoadblock%}{%endblock%}">
+ <body onLoad="pageLoad()">
<header id="pageHeader" class="pageHeader">
- {%block headerblock%}
- {%endblock%}
+ <div id="headerDiv">
+ <a href="Manage_Coworking_Spaces.html">
+ <img id="headerImg" class="headerImg"
+ src="/static/Media/Tramshed-Logo-Main-Black.png"></img></a>
+ {%block headerblock%}
+ {%endblock%}
+ </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>
</header>
<main id="pageMain">
@@ -18,8 +38,17 @@
</main>
<footer id="pageFooter">
- {%block footerblock%}
- {%endblock%}
+ <nav id="footerNav" class="navBar">
+ <ul class="Center">
+ <li><a href="Manage_Coworking_Spaces">Left</a></li>
+ </ul>
+ <ul class="Center">
+ <li><a href="Manage_Coworking_Spaces">Center</a></li>
+ </ul>
+ <ul class="Center">
+ <li><a href="Manage_Coworking_Spaces">Right</a></li>
+ </ul>
+ </nav>
</footer>
<script src="{%block jsblock%}{%endblock%}"></script>