bike/Yellow-Bike-Database-Mirror
1
0
Fork 0
mirror of https://github.com/fspc/Yellow-Bike-Database.git synced 2025-02-21 08:34:27 -05:00
Code Issues Projects Releases Wiki Activity

This fixes #43 and fixes #47.

Browse Source
This commit is contained in:
Jonathan Rosenbaum 2017-12-26 09:42:40 +00:00
parent 588cbe7580
commit 68e835d74b
2 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include_header.html
View File

@ -48,6 +48,15 @@ function resetTimer()
<script>
$(function() {
// prevent a double etherpad if shop_log_iframe is clicked on after a shop closes
$("#shop_log_link").on("click keypress", function(e) {
$.post("json/transaction.php", {shop_exist: 1}, function(data) {
if (data === "no_shop") {
window.top.location.href = "./start_shop.php";
}
});
});
if ( document.location.pathname.match(/shop_welcome\.php$/) ) {
$("#shop_log_link").attr("href","/shop_log_iframe.php");
@ -67,3 +76,18 @@ $(function() {
</tr>
<tr>
<td>
<!--
<div style="float: left; width: 12.5%; height: 40px; display: inline-block;"></div>
<div style="float: left; align-content: center; width: 75%; height: 40px; display: inline-block;">
<div align="right"><a id="shop_log_link" href="/shop_log.php">Current Shop</a> |
<a href="/start_shop.php" target="_parent"> All Shops</a> |
<a href="/contact_add_edit_select.php" target="_parent">Add/Edit Contact</a> |
<a href="/stats.php" target="_parent">Reports</a> |
<a href="/transaction_log.php" target="_parent">Transaction Log</a> |
<a href="http://www.positivespin.org" target="_blank">PS Home</a></div>
</div>
<div style="float: left; width: 12.5%; height: 40px; display: inline-block;"></div>
<div style="float: left; width: 12.5%; height: 100%; display: inline-block;"></div>
<table style="float: left; width: 75%; display: inline-block;" align="center" border="0" cellpadding="1" cellspacing="0"><tr><td>
-->

17
include_header_shop.html
View File

@ -38,10 +38,22 @@ function resetTimer()
<script src="js/jquery.liblink.js"></script>
<script src="js/wNumb.js"></script>
<script>
// scroll back to same location when up or down are selected
$(function() {
// prevent a double etherpad if shop_log_iframe is clicked on after a shop closes
$("#shop_log_link").on("click keypress", function(e) {
if (window.location.pathname === '/shop_log_iframe.php') {
e.preventDefault(); // hack to prevent open shop from reopening in same page
}
$.post("json/transaction.php", {shop_exist: 1}, function(data) {
if (data === "no_shop") {
window.top.location.href = "./start_shop.php";
}
});
});
// scroll back to same location when up, down, or updated are selected
$(".down").on("click keypress", function(e) {
var hash = document.body.scrollTop + 25;
@ -93,6 +105,7 @@ function resetTimer()
$("[name=FormUpdate_" + visit_id).attr("action", action + add_hash);
});
// end scroll back to same location when up, down, updated are selected
});