Skip to content

A Few Changes #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Deastrom wants to merge 4 commits into
base: master
Choose a base branch
from
Open

A Few Changes #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42deb3b
created docker-compose file for deploying server
benjamincedar-stack Nov 29, 2020
26297f2
Updated to change navbar to include venue name and add openkj link to…
benjamincedar-stack Nov 29, 2020
da27b83
fixed css file issues
benjamincedar-stack Nov 29, 2020
c910bf4
change cursor on result
benjamincedar-stack Nov 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
version: '3'
services:
songbook:
image: php:7.4-apache
container_name: songbook
volumes:
- .:/var/www/html/okjweb
ports:
- 8080:80
7 changes: 4 additions & 3 deletions global.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function siteheader($title)
echo "<html><head>
<link href='https://fonts.googleapis.com/css?family=Audiowide' rel='stylesheet'>
<link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet'>
<title>$venueName Karaoke Songbook</title>
<title>$venueName Songbook</title>
<link rel=stylesheet type=\"text/css\" href=venuestyle.css />
<script type=\"text/javascript\">
function submitreq(varid){
Expand All @@ -31,16 +31,17 @@ function siteheader($title)
}

function sitefooter() {
echo "</div></body></html>";
echo "<a href='https://github.com/OpenKJ/StandaloneRequestServer'>Developed by OpenKJ</a></div></body></html>";
}

function navbar($backurl)
{
if ($backurl == "")
$backurl = index.php;
global $screensize;
global $venueName;
echo "<div class=navbar>
<span class=title>OpenKJ Songbook</span>
<span class=title>$venueName Songbook</span>
</div><div class=mainbody><span class=backbtn><a class=button href=\"$backurl\" class=navbar id=backlink>Back</a></span>";
}

Expand Down
23 changes: 12 additions & 11 deletions venuestyle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ body
padding-top: 60px;
}
input[type=text] {
border: 2px solid black;
border: 2px solid black;
padding-top: 5px;
padding-bottom: 5px;
margin-right: 5px;
Expand All @@ -25,19 +25,19 @@ p.info
}
div.navbar
{
# height: 50px;
height: 50px;
width: 100%;
position: fixed;
left: 0;
top: 0;
position: fixed;
left: 0;
top: 0;
padding-left: 5px;
padding-top: 5px;
padding-bottom: 5px;
padding-right: 5px
width: 100%;
background-color: white;
color: black;
text-align: left;
padding-right: 5px;
width: 100%;
background-color: white;
color: black;
text-align: left;
border-style: solid;
border-width: 0px 0px 2px 0px;
}
Expand Down Expand Up @@ -68,7 +68,8 @@ td.result
padding: 20px;
border-spacing: 10px;
border-style: solid;
border-size: 2px;
border-width: 2px;
cursor: pointer;
}

input[type=button], input[type=submit], input[type=reset], a.button {
Expand Down