esoko/mapguesser
esoko/mapguesser
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 18 Wiki Activity

Merged in feature/MAPG-87-create-footer-with-author-copyright (pull request #130)

Browse Source 
Feature/MAPG-87 create footer with author copyright
This commit is contained in:
Bence Pőcze 2020-06-21 20:27:40 +00:00
commit 05934d6245
15 changed files with 57 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
public/static/css/mapguesser.css
View File

@ -42,7 +42,7 @@ h1>a:hover, h1>a:focus {
text-decoration: none;
}
h2, div.header.small h1 {
h2, header.small h1 {
font-size: 24px;
}
@ -83,7 +83,7 @@ hr {
font-weight: 500;
}
.small {
p.small, span.small {
font-size: 12px;
}
@ -281,7 +281,7 @@ p.formError {
display: none;
}
div.header {
header {
display: grid;
grid-template-columns: auto auto;
background-color: #333333;
@ -291,33 +291,44 @@ div.header {
color: white;
}
div.header.small {
header.small {
height: 40px;
line-height: 40px;
}
div.header>p.header {
header>p {
line-height: inherit;
text-align: right;
}
div.header>p.header>span {
header>p>span {
padding-left: 6px;
}
div.header>p.header>span>a:link, div.header>p.header>span>a:visited {
header>p>span>a:link, header>p>span>a:visited {
color: inherit;
}
div.header>p.header>span:not(:last-child) {
header>p>span:not(:last-child) {
border-right: solid white 1px;
padding-right: 6px;
}
div.main {
main {
padding: 6px 12px;
}
footer {
background-color: #444444;
padding: 6px 12px;
color: white;
text-align: center;
}
footer>p {
font-size: 13px;
}
div.buttonContainer {
height: 35px;
}
@ -348,9 +359,12 @@ div.box {
}
@media screen and (max-width: 599px) {
div.header h1 span {
header h1 span {
display: none;
}
footer>p:not(:first-child) {
margin-top: 4px;
}
button, a.button {
padding: 0;
width: 100%;
@ -371,6 +385,16 @@ div.box {
}
@media screen and (min-width: 600px) {
footer>p {
display: inline;
}
footer>p:not(:first-child) {
padding-left: 6px;
}
footer>p:not(:last-child) {
border-right: solid white 1px;
padding-right: 6px;
}
div.modal {
width: 540px;
left: 50%;

4
views/admin/map_editor.php
View File

@ -13,7 +13,7 @@ $jsFiles = [
];
?>
<?php require ROOT . '/views/templates/main_header.php'; ?>
<div class="header small">
<header class="small">
<h1>
<a href="/maps" title="Back to playable maps">
<img class="inline" width="1em" height="1em" src="<?= $_ENV['STATIC_ROOT'] ?>/img/icon.svg?rev=<?= REVISION ?>"><!--
@ -47,7 +47,7 @@ $jsFiles = [
--><span id="deleted" class="bold">0</span><!--
--></span>
</p>
</div>
</header>
<div id="metadata" class="modal">
<h2>Edit map data</h2>
<form id="metadataForm" class="marginTop">

3
views/error/404.php
View File

@ -1,7 +1,6 @@
<?php require ROOT . '/views/templates/main_header.php'; ?>
<?php require ROOT . '/views/templates/header.php'; ?>
<div class="main">
<h2>404 | Page not found</h2>
<p>The requested URL was not found on this server. <a href="/" title="MapGuesser">Back to start.</a></p>
</div>
<?php require ROOT . '/views/templates/footer.php'; ?>
<?php require ROOT . '/views/templates/main_footer.php'; ?>

4
views/game.php
View File

@ -8,7 +8,7 @@ $jsFiles = [
];
?>
<?php require ROOT . '/views/templates/main_header.php'; ?>
<div class="header small">
<header class="small">
<h1>
<a href="/maps" title="Back to playable maps">
<img class="inline" width="1em" height="1em" src="<?= $_ENV['STATIC_ROOT'] ?>/img/icon.svg?rev=<?= REVISION ?>"><!--
@ -20,7 +20,7 @@ $jsFiles = [
--><span>Round <span id="currentRound" class="bold"></span></span><!--
--><span>Score <span id="currentScoreSum" class="bold"></span></span>
</p>
</div>
</header>
<div id="guessCover"></div>
<div id="panorama"></div>
<div id="showGuessButtonContainer">

3
views/login/activate.php
View File

@ -1,9 +1,8 @@
<?php require ROOT . '/views/templates/main_header.php'; ?>
<?php require ROOT . '/views/templates/header.php'; ?>
<div class="main">
<h2>Account activation</h2>
<div class="box">
<p class="error justify">Activation failed. Please check the link you entered or retry <a href="/signup" title="Sign up">sign up</a>!</p>
</div>
</div>
<?php require ROOT . '/views/templates/footer.php'; ?>
<?php require ROOT . '/views/templates/main_footer.php'; ?>

3
views/login/cancel.php
View File

@ -1,6 +1,5 @@
<?php require ROOT . '/views/templates/main_header.php'; ?>
<?php require ROOT . '/views/templates/header.php'; ?>
<div class="main">
<h2>Account cancellation</h2>
<div class="box">
<?php if ($success) : ?>
@ -9,5 +8,5 @@
<p class="error justify">Cancellation failed. Please check the link you entered! Maybe the account was already deleted, in this case no further action is required.</p>
<?php endif; ?>
</div>
</div>
<?php require ROOT . '/views/templates/footer.php'; ?>
<?php require ROOT . '/views/templates/main_footer.php'; ?>

3
views/login/google_login.php
View File

@ -1,9 +1,8 @@
<?php require ROOT . '/views/templates/main_header.php'; ?>
<?php require ROOT . '/views/templates/header.php'; ?>
<div class="main">
<h2>Login up with Google</h2>
<div class="box">
<p class="error justify">Authenticating with Google failed. Please <a href="/login/google" title="Login with Google">retry</a>!</p>
</div>
</div>
<?php require ROOT . '/views/templates/footer.php'; ?>
<?php require ROOT . '/views/templates/main_footer.php'; ?>

3
views/login/google_signup.php
View File

@ -1,6 +1,5 @@
<?php require ROOT . '/views/templates/main_header.php'; ?>
<?php require ROOT . '/views/templates/header.php'; ?>
<div class="main">
<h2>Sign up</h2>
<div class="box">
<form id="googleSignupForm" action="/signup/google" method="post">
@ -22,7 +21,7 @@
</div>
</form>
</div>
</div>
<?php require ROOT . '/views/templates/footer.php'; ?>
<script>
(function () {
var form = document.getElementById('googleSignupForm');

3
views/login/login.php
View File

@ -5,7 +5,6 @@ $jsFiles = [
?>
<?php require ROOT . '/views/templates/main_header.php'; ?>
<?php require ROOT . '/views/templates/header.php'; ?>
<div class="main">
<h2>Login</h2>
<div class="box">
<form id="loginForm" action="/login" method="post">
@ -21,5 +20,5 @@ $jsFiles = [
</div>
</form>
</div>
</div>
<?php require ROOT . '/views/templates/footer.php'; ?>
<?php require ROOT . '/views/templates/main_footer.php'; ?>

3
views/login/signup.php
View File

@ -5,7 +5,6 @@ $jsFiles = [
?>
<?php require ROOT . '/views/templates/main_header.php'; ?>
<?php require ROOT . '/views/templates/header.php'; ?>
<div class="main">
<h2>Sign up</h2>
<div class="box">
<form id="signupForm" action="/signup" method="post">
@ -31,5 +30,5 @@ $jsFiles = [
</div>
</form>
</div>
</div>
<?php require ROOT . '/views/templates/footer.php'; ?>
<?php require ROOT . '/views/templates/main_footer.php'; ?>

3
views/login/signup_success.php
View File

@ -1,9 +1,8 @@
<?php require ROOT . '/views/templates/main_header.php'; ?>
<?php require ROOT . '/views/templates/header.php'; ?>
<div class="main">
<h2>Sign up</h2>
<div class="box">
<p class="justify">Sign up was successful. Please check your email and click on the activation link to activate your account!</p>
</div>
</div>
<?php require ROOT . '/views/templates/footer.php'; ?>
<?php require ROOT . '/views/templates/main_footer.php'; ?>

3
views/maps.php
View File

@ -5,7 +5,6 @@ $cssFiles = [
?>
<?php require ROOT . '/views/templates/main_header.php'; ?>
<?php require ROOT . '/views/templates/header.php'; ?>
<div class="main">
<h2>Playable maps</h2>
<div id="mapContainer">
<?php foreach ($maps as $map): ?>
@ -60,7 +59,7 @@ $cssFiles = [
<?php endfor; ?>
<?php endif; ?>
</div>
</div>
<?php require ROOT . '/views/templates/footer.php'; ?>
<script>
(function () {
const GOOGLE_MAPS_JS_API_KEY = '<?= $_ENV['GOOGLE_MAPS_JS_API_KEY'] ?>';

3
views/profile.php
View File

@ -5,7 +5,6 @@ $jsFiles = [
?>
<?php require ROOT . '/views/templates/main_header.php'; ?>
<?php require ROOT . '/views/templates/header.php'; ?>
<div class="main">
<h2>Profile</h2>
<div class="box">
<form id="profileForm" action="/profile" method="post">
@ -21,5 +20,5 @@ $jsFiles = [
</div>
</form>
</div>
</div>
<?php require ROOT . '/views/templates/footer.php'; ?>
<?php require ROOT . '/views/templates/main_footer.php'; ?>

5
views/templates/footer.php Normal file
View File

@ -0,0 +1,5 @@
</main>
<footer>
<p><span class="bold">MapGuesser</span> <?= VERSION ?></p><!--
--><p>&copy; Pőcze Bence <?= (new DateTime(REVISION_DATE))->format('Y') ?></p>
</footer>

7
views/templates/header.php
View File

@ -1,11 +1,11 @@
<div class="header">
<header>
<h1>
<a href="/" title="MapGuesser">
<img class="inline" width="1em" height="1em" src="<?= $_ENV['STATIC_ROOT'] ?>/img/icon.svg?rev=<?= REVISION ?>"><!--
--><span>MapGuesser</span>
</a>
</h1>
<p class="header">
<p>
<?php if (Container::$request->user()) : ?>
<span><a href="/profile" title="Profile">
<?php /* Copyright (c) 2019 The Bootstrap Authors. License can be found in 'USED_SOFTWARE' in section 'Bootstrap Icons'. */ ?>
@ -20,4 +20,5 @@
--><span><a href="/login" title="Login">Login</a></span>
<?php endif; ?>
</p>
</div>
</header>
<main>