General HTML fixes

Incorporated pull requests #1305 and #1306.

Restored declaration of 'hidden' class to index file.

Restored h2 in sections for navigation purposes.

Cleaned up index.html.
This commit is contained in:
Matthew Hana 2023-08-31 23:34:10 +10:00 committed by MatthewHana
parent d387491fb6
commit 6474f8f31c
2 changed files with 152 additions and 124 deletions

View file

@ -13,6 +13,10 @@ body{
justify-content: space-around; justify-content: space-around;
} }
main{
width: 100%;
}
.container{ .container{
height: auto; height: auto;
min-height: 450px; min-height: 450px;
@ -74,7 +78,7 @@ body{
z-index: 999; z-index: 999;
} }
#loadingscene span{ #loadingscene h2{
font-size: 2em; font-size: 2em;
font-weight: bold; font-weight: bold;
} }
@ -142,6 +146,7 @@ body{
font-size: 1.5em; font-size: 1.5em;
display: block; display: block;
padding: 10px 0; padding: 10px 0;
margin: 0;
} }
#collectionsscene article small{ #collectionsscene article small{
@ -250,10 +255,6 @@ body{
box-shadow: 2px 2px 7px #000000d6; box-shadow: 2px 2px 7px #000000d6;
} }
.hidden{
display: none !important;
}
.title{ .title{
word-wrap: break-word; word-wrap: break-word;
font-weight: bold; font-weight: bold;

View file

@ -1,50 +1,57 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<script src="fn.js"></script> <title>Radicale Web Interface</title>
<title>Radicale Web Interface</title> <link href="css/main.css" type="text/css" media="screen" rel="stylesheet">
<link href="css/main.css" media="screen" rel="stylesheet"> <link href="css/icon.png" type="image/png" rel="icon">
<link href="css/icon.png" type="image/png" rel="shortcut icon"> <style>.hidden {display: none !important;}</style>
<script src="fn.js"></script>
<nav id="logoutview" class="hidden"> </head>
<span data-name="user" style="word-wrap:break-word;"></span>
<a href="" class="red" data-name="link" title="Logout">Logout</a> <body>
</nav> <nav id="logoutview" class="hidden">
<span data-name="user" style="word-wrap:break-word;"></span>
<section id="loadingscene"> <a href="" class="red" data-name="link" title="Logout">Logout</a>
<img src="css/loading.svg" /> </nav>
<span>Loading</span>
<p>Please wait...</p> <main>
<noscript>JavaScript is required</noscript> <section id="loadingscene">
</section> <img src="css/loading.svg" alt="Loading">
<h2>Loading</h2>
<section id="loginscene" class="container hidden"> <p>Please wait...</p>
<div class="logocontainer"> <noscript>JavaScript is required</noscript>
<img src="css/logo.svg" /> </section>
</div>
<h1>Sign in</h1><br /> <section id="loginscene" class="container hidden">
<form data-name="form"> <div class="logocontainer">
<input data-name="user" type="text" placeholder="Username"> <img src="css/logo.svg" alt="Radicale">
<input data-name="password" type="password" placeholder="Password"> </div>
<button class="green" type="submit">Next</button> <h1>Sign in</h1>
<span class="error" data-name="error"></span> <br>
</form> <form data-name="form">
</section> <input data-name="user" type="text" placeholder="Username">
<input data-name="password" type="password" placeholder="Password">
<section id="collectionsscene" class="hidden"> <button class="green" type="submit">Next</button>
<div class="fabcontainer"> <span class="error" data-name="error"></span>
<a href="" class="green" data-name="new" title="Create a new addressbook or calendar"><img src="css/icons/new.svg" class="icon" alt="➕"></a></a> </form>
<a href="" class="blue" data-name="upload" title="Upload an addressbook or calendar"><img src="css/icons/upload.svg" class="icon" alt="⬆️"></a></a> </section>
</div>
<section id="collectionsscene" class="hidden">
<article data-name="collectiontemplate" class="hidden"> <div class="fabcontainer">
<div class="colorbar" data-name="color"></div> <a href="" class="green" data-name="new" title="Create a new addressbook or calendar">
<span class="title" data-name="title">Title</span> <img src="css/icons/new.svg" class="icon" alt="➕">
</h2> </a>
<small> <a href="" class="blue" data-name="upload" title="Upload an addressbook or calendar">
<img src="css/icons/upload.svg" class="icon" alt="⬆️">
</a>
</div>
<article data-name="collectiontemplate" class="hidden">
<div class="colorbar" data-name="color"></div>
<h3 class="title" data-name="title">Title</h3>
<small>
<span data-name="ADDRESSBOOK">Address book</span> <span data-name="ADDRESSBOOK">Address book</span>
<span data-name="CALENDAR_JOURNAL_TASKS">Calendar, journal and tasks</span> <span data-name="CALENDAR_JOURNAL_TASKS">Calendar, journal and tasks</span>
<span data-name="CALENDAR_JOURNAL">Calendar and journal</span> <span data-name="CALENDAR_JOURNAL">Calendar and journal</span>
@ -53,23 +60,35 @@
<span data-name="CALENDAR">Calendar</span> <span data-name="CALENDAR">Calendar</span>
<span data-name="JOURNAL">Journal</span> <span data-name="JOURNAL">Journal</span>
<span data-name="TASKS">Tasks</span> <span data-name="TASKS">Tasks</span>
</small> </small>
<input type="text" data-name="url" value="" readonly="" onfocus="this.setSelectionRange(0, 99999);"> <input type="text" data-name="url" value="" readonly="" onfocus="this.setSelectionRange(0, 99999);">
<p data-name="description" style="word-wrap:break-word;">Description</p> <p data-name="description" style="word-wrap:break-word;">Description</p>
<ul> <ul>
<li><a href="" title="Download" class="green" data-name="download"><img src="css/icons/download.svg" class="icon" alt="🔗"></a></li> <li>
<li><a href="" title="Edit" class="blue" data-name="edit"><img src="css/icons/edit.svg" class="icon" alt="✏️"></a></li> <a href="" title="Download" class="green" data-name="download">
<li><a href="" title="Delete" class="red" data-name="delete"><img src="css/icons/delete.svg" class="icon" alt="❌"></a></li> <img src="css/icons/download.svg" class="icon" alt="🔗">
</ul> </a>
</article> </li>
</section> <li>
<a href="" title="Edit" class="blue" data-name="edit">
<section id="editcollectionscene" class="container hidden"> <img src="css/icons/edit.svg" class="icon" alt="✏️">
<h1>Edit Collection</h1> </a>
<p>Editing collection <span class="title" data-name="title">title</span></p> </li>
<form> <li>
Type:<br> <a href="" title="Delete" class="red" data-name="delete">
<select data-name="type"> <img src="css/icons/delete.svg" class="icon" alt="❌">
</a>
</li>
</ul>
</article>
</section>
<section id="editcollectionscene" class="container hidden">
<h1>Edit Collection</h1>
<p>Editing collection <span class="title" data-name="title">title</span>
</p>
<form> Type: <br>
<select data-name="type">
<option value="ADDRESSBOOK">addressbook</option> <option value="ADDRESSBOOK">addressbook</option>
<option value="CALENDAR_JOURNAL_TASKS">calendar, journal and tasks</option> <option value="CALENDAR_JOURNAL_TASKS">calendar, journal and tasks</option>
<option value="CALENDAR_JOURNAL">calendar and journal</option> <option value="CALENDAR_JOURNAL">calendar and journal</option>
@ -78,25 +97,26 @@
<option value="CALENDAR">calendar</option> <option value="CALENDAR">calendar</option>
<option value="JOURNAL">journal</option> <option value="JOURNAL">journal</option>
<option value="TASKS">tasks</option> <option value="TASKS">tasks</option>
</select><br> </select>
Title:<br> <br> Title: <br>
<input data-name="displayname" type="text"><br> <input data-name="displayname" type="text">
Description:<br> <br> Description: <br>
<input data-name="description" type="text"><br> <input data-name="description" type="text">
Color:<br> <br> Color: <br>
<input data-name="color" type="color"><br> <input data-name="color" type="color">
<span class="error hidden" data-name="error"></span><br> <br>
<button type="submit" class="green" data-name="submit">Save</button> <span class="error hidden" data-name="error"></span>
<button type="button" class="red" data-name="cancel">Cancel</button> <br>
</form> <button type="submit" class="green" data-name="submit">Save</button>
</section> <button type="button" class="red" data-name="cancel">Cancel</button>
</form>
<section id="createcollectionscene" class="container hidden"> </section>
<h1>Create a new Collection</h1>
<p>Enter the details of your new collection.</p> <section id="createcollectionscene" class="container hidden">
<form> <h1>Create a new Collection</h1>
Type:<br> <p>Enter the details of your new collection.</p>
<select data-name="type"> <form> Type: <br>
<select data-name="type">
<option value="ADDRESSBOOK">Address book</option> <option value="ADDRESSBOOK">Address book</option>
<option value="CALENDAR_JOURNAL_TASKS">Calendar, journal and tasks</option> <option value="CALENDAR_JOURNAL_TASKS">Calendar, journal and tasks</option>
<option value="CALENDAR_JOURNAL">Calendar and journal</option> <option value="CALENDAR_JOURNAL">Calendar and journal</option>
@ -105,41 +125,48 @@
<option value="CALENDAR">Calendar</option> <option value="CALENDAR">Calendar</option>
<option value="JOURNAL">Journal</option> <option value="JOURNAL">Journal</option>
<option value="TASKS">Tasks</option> <option value="TASKS">Tasks</option>
</select><br> </select>
Title:<br> <br> Title: <br>
<input data-name="displayname" type="text"><br> <input data-name="displayname" type="text">
Description:<br> <br> Description: <br>
<input data-name="description" type="text"><br> <input data-name="description" type="text">
Color:<br> <br> Color: <br>
<input data-name="color" type="color"><br> <input data-name="color" type="color">
<span class="error" data-name="error"></span><br> <br>
<button type="submit" class="green" data-name="submit">Create</button> <span class="error" data-name="error"></span>
<button type="button" class="red" data-name="cancel">Cancel</button> <br>
</form> <button type="submit" class="green" data-name="submit">Create</button>
</section> <button type="button" class="red" data-name="cancel">Cancel</button>
</form>
<section id="uploadcollectionscene" class="container hidden"> </section>
<h1>Upload Collection</h1>
<ul> <section id="uploadcollectionscene" class="container hidden">
<li data-name="filetemplate" class="hidden"> <h1>Upload Collection</h1>
Uploading <span data-name="name">name</span><br> <ul>
<img data-name="pending" src="css/loading.svg" alt="Please wait..."/> <li data-name="filetemplate" class="hidden"> Uploading <span data-name="name">name</span>
<span clas="successmessage";" data-name="success">Uploaded Successfully!</span> <br>
<span class="error" data-name="error"></span> <img data-name="pending" src="css/loading.svg" alt="Please wait...">
</li> <span class="successmessage" data-name="success">Uploaded Successfully!</span>
</ul> <span class="error" data-name="error"></span>
<form> </li>
<button type="button" class="red" data-name="close">Close</button> </ul>
</form> <form>
</section> <button type="button" class="red" data-name="close">Close</button>
</form>
<section id="deletecollectionscene" class="container hidden"> </section>
<h1>Delete Collection</h1>
<p>Do you want to delete the collection <span class="title" data-name="title">title</span>?</p> <section id="deletecollectionscene" class="container hidden">
<p class="red">Warning: This action cannot be reversed.</p> <h1>Delete Collection</h1>
<form> <p>Do you want to delete the collection <span class="title" data-name="title">title</span>? </p>
<button type="button" class="red" data-name="delete">Delete</button> <p class="red">WARNING: This action cannot be reversed.</p>
<button type="button" class="blue" data-name="cancel">Cancel</button> <form>
</form> <button type="button" class="red" data-name="delete">Delete</button>
<span class="error hidden" data-name="error"></span><br> <button type="button" class="blue" data-name="cancel">Cancel</button>
</section> </form>
<span class="error hidden" data-name="error"></span>
<br>
</section>
</main>
</body>
</html>