issue-fix (#32)

Closes issues #22 & #26.

Improves #23 but does not close it yet.

Co-authored-by: fred.boniface <fred@fjla.uk>
Reviewed-on: #32
This commit is contained in:
Fred Boniface 2022-09-23 10:03:54 +00:00
parent e05ba27ac8
commit 6fd580e3f9
7 changed files with 83 additions and 58 deletions

View File

@ -14,6 +14,12 @@
<h1>Oh no! That page can't be found</h1> <h1>Oh no! That page can't be found</h1>
<p>
If you got here from a homescreen icon on your device, you will
need to remove and re-add the button due to major upgrades to
the Athena application
</p>
<p><a class="actionbutton" href="/">Go back to the homepage</a></p> <p><a class="actionbutton" href="/">Go back to the homepage</a></p>
<h3>404 - Not Found</h3> <h3>404 - Not Found</h3>

View File

@ -1,23 +1,19 @@
function openMenu() { /* When the user clicks on the button,
document.getElementById("menu").style.display = "block"; toggle between hiding and showing the dropdown content */
function myFunction() {
document.getElementById("myDropdown").classList.toggle("show");
} }
function closeMenu() { // Close the dropdown menu if the user clicks outside of it
document.getElementById("menu").style.display = "none"; window.onclick = function(event) {
} if (!event.target.matches('.dropbtn')) {
var dropdowns = document.getElementsByClassName("dropdown-content");
function closeAboutPopup() { var i;
document.getElementById("popup-about").style.display = "none"; for (i = 0; i < dropdowns.length; i++) {
} var openDropdown = dropdowns[i];
if (openDropdown.classList.contains('show')) {
function openAboutPopup() { openDropdown.classList.remove('show');
document.getElementById("popup-about").style.display = "block"; }
} }
}
function closeTiplocPopup() {
document.getElementById("popup-tiploc").style.display = "none";
}
function openTiplocPopup() {
document.getElementById("popup-tiploc").style.display = "block";
} }

View File

@ -1,7 +1,7 @@
{ {
"name": "Athena", "name": "Athena",
"short_name": "Athena", "short_name": "Athena",
"start_url": "/index.html", "start_url": "/",
"scope": "/", "scope": "/",
"display": "standalone", "display": "standalone",
"background_color": "#7fa7e6", "background_color": "#7fa7e6",

View File

@ -8,3 +8,5 @@ echo '<meta name="author" content="Frederick Boniface">';
echo '<link rel="stylesheet" type="text/css" href="/styles/style.css"/>'; echo '<link rel="stylesheet" type="text/css" href="/styles/style.css"/>';
echo '<link rel="icon" type="image/png" href="/assets/icons/favicon.ico"/>'; echo '<link rel="icon" type="image/png" href="/assets/icons/favicon.ico"/>';
echo '<link rel="manifest" type="application/json" href="/manifest.json"/>'; echo '<link rel="manifest" type="application/json" href="/manifest.json"/>';
echo '<script src="/js/nav.js"></script>';

View File

@ -1,12 +1,10 @@
<?php <?php
echo '<script src="/js/nav.js" async></script>';
echo '<div id="menu-button" class="menu-button">'; echo '<div class="dropdown">';
echo '<img onclick="openMenu()" src="/assets/icons/menu.png"></img>'; echo ' <button onclick="myFunction()" class="dropbtn">Menu</button>';
echo '</div>'; echo ' <div id="myDropdown" class="dropdown-content">';
echo '<div id="menu" class="menu">'; echo ' <a href="/">Home</a>';
echo '<a href="/" class="menuitem" onclick="closeMenu()"">Home</a>'; echo ' <a href="/issue.php">Report Issue</a>';
echo '<a href="/issue.php" class="menuitem" onclick="closeMenu()"">Report Issue</a>"'; echo ' <a class="dropdown-last" href="/help.php">Help</a>';
echo '<a href="/help.php" class="menuitem" onclick="closeMenu()"">Help</a>'; echo ' </div>';
echo '<img class="menu-button" onclick="closeMenu()" class="popup-close" src="/assets/icons/close-circle.png"></img>';
echo '</div>'; echo '</div>';

View File

@ -1,2 +1,2 @@
<?php <?php
$athenaVersion = '0.4.0-alpha'; $athenaVersion = '0.4.1-alpha';

View File

@ -92,6 +92,7 @@ body {
padding: 5px; padding: 5px;
padding-left: 15px; padding-left: 15px;
padding-right: 15px; padding-right: 15px;
margin-bottom: 10px;
cursor: pointer; cursor: pointer;
} }
@ -114,45 +115,67 @@ body {
cursor: pointer; cursor: pointer;
} }
.menu { /* START MENU STYLE */
display: none;
background-color: #3c78d8; /* Dropdown Button */
width: 100%; .dropbtn {
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; right: 0;
padding-top: 10px; background-color: #7fa7e6;
padding-bottom: 10px; color: white;
padding: 12px;
font-size: 12px;
border: none;
border-bottom-left-radius: 10px;
cursor: pointer;
} }
.menu-button { /* Dropdown button on hover & focus */
.dropbtn:hover, .dropbtn:focus {
background-color: #0280e5;
}
/* The container <div> - needed to position the dropdown content */
.dropdown {
position: relative;
display: inline-block;
}
/* Dropdown Content (Hidden by Default) */
.dropdown-content {
display: none;
position: absolute; position: absolute;
background-color: #aac4ee; background-color: #7fa7e6;
border: none; min-width: 160px;
right: 30px; box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
cursor: pointer; z-index: 1;
} }
.menuitem { /* Links inside the dropdown */
background-color: #2256aa; .dropdown-content a {
color: white;
padding: 12px 16px;
text-decoration: none; text-decoration: none;
color: #f6f5f4; display: block;
border: none; border-top: 1px solid black;
border-radius: 18px;
font-size: 16px;
font-weight: bold;
padding: 3px;
padding-left: 8px;
padding-right: 8px;
margin-left: 10px;
margin-right: 10px;
cursor: pointer;
} }
.menuitem:hover { /*Final item of the dropdown has bottom border*/
background-color: #112b55; .dropdown-last {
border-bottom: 1px solid black;
} }
/* Change color of dropdown links on hover */
.dropdown-content a:hover {background-color: #ddd;}
/* Show the dropdown menu (use JS to add this class to the .dropdown-content container when the user clicks on the dropdown button) */
.show {display:block;}
/* END MENU STYLE */
/* Footer Styles */
footer { footer {
background-color: #7fa7e6; background-color: #7fa7e6;
color: white; color: white;