Skip to content
Snippets Groups Projects

Draft: resolving merge conflicts

Closed Draft: resolving merge conflicts
development into 15-as-a-user-i-want-to-find-out-what-tramshed-is-so-that-i-can-access-their-working-spaces
Closed Arianne Bayliss requested to merge development into 15-as-a-user-i-want-to-find-out-what-tramshed-is-so-that-i-can-access-their-working-spaces
Compare
and
14 files
+ 139
− 130
Compare changes
  • Side-by-side
  • Inline
Files
14
static/Manage_Coworking_Spaces.html 0 → 100644
+ 55
− 0
 
<!DOCTYPE html>
 
<html lang="EN" dir="ltr">
 
<head>
 
<meta charSet="UTF-8">
 
<title> Page Template </title>
 
<link rel="stylesheet" href="StylingSheet.css">
 
 
</head>
 
<body onLoad="pageLoad()">
 
 
<header id="header">
 
<a href=""><h1>Page Header</h1></a>
 
</header>
 
 
<hr>
 
 
<main id="recordSection">
 
<form id="recordForm" title="Record Form">
 
<label>Name: <input name="record_name" id="recordName"
 
type="text"></label><br>
 
<label>Address: <input name="record_address" id="recordAddress"
 
type="text"></label><br>
 
<label>Main Photograph: <input name="record_MP" id="recordMainPhotos"
 
type="text"></label><br>
 
<label>Additional Photographs: <input name="record_AP" id="recordAdditionalPhotos"
 
type="text"></label><br>
 
<label>Description: <input name="record_description" id="recordDescription"
 
type="text"></label><br>
 
<label>Website: <input name="record_website" id="recordWebsite"
 
type="text"></label><br>
 
<label>Email: <input name="record_email" id="recordEmail"
 
type="text"></label><br>
 
<label>Phone Number: <input name="record_PN" id="recordPhoneNumber"
 
type="text"></label><br>
 
<label>Opening Hours: <input name="record_OH" id="recordOpeningHours"
 
type="text"></label><br>
 
<label>Checkin Instructions: <input name="record_CI" id="recordCheckinInstructions"
 
type="text"></label>
 
 
<br><br>
 
<button id="addButton" type="submit">Add</button>
 
</form>
 
<br>
 
<span id="DEBUGserverMessage"> </span>
 
</main>
 
 
<hr>
 
 
<footer id="footer">
 
<a href="#header">Top</a>
 
</footer>
 
 
<script src="Manage_Coworking_Spaces.js"></script>
 
</body>
 
</html>