bike/Yellow-Bike-Database-Mirror
1
0
Fork 0
mirror of https://github.com/fspc/Yellow-Bike-Database.git synced 2025-10-31 00:45:35 -04:00
Code Issues Projects Releases Wiki Activity

One of the steps for #39 - include header behavior

Browse Source 
* getting 2 iframes to behave properly so that etherpad isn't constantly reloading at the front sign-in was a little tricky and required slight alteration of some of the include headers.
This commit is contained in:
Jonathan Rosenbaum 2017-12-11 02:05:39 +00:00
parent 77be1aa86e
commit 5d6a1ab384
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include_header.html
View File

@ -45,13 +45,25 @@ function resetTimer()
<script src="js/moment/moment.js"></script> <script src="js/moment/moment.js"></script>
<script src="js/tabulator/dist/js/tabulator.min.js"></script> <script src="js/tabulator/dist/js/tabulator.min.js"></script>
<script src="js/etherpad.js"></script> <script src="js/etherpad.js"></script>
<script>
$(function() {
if ( document.location.pathname.match(/shop_welcome\.php$/) ) {
$("#shop_log_link").attr("href","/shop_log_iframe.php");
} else {
$("#shop_log_link").attr("href","/shop_log.php");
}
});
</script>
</head> </head>
<body class="yb_standard"> <body class="yb_standard">
<table align="center" width="1000" border="0" cellpadding="1" cellspacing="0"> <table align="center" width="1000" border="0" cellpadding="1" cellspacing="0">
<tr valign="top"> <tr valign="top">
<td height="40" align="right"><a href="/shop_log.php">Current Shop</a> | <a href="/start_shop.php"> All Shops</a> | <a href="/contact_add_edit_select.php">Add/Edit Contact</a> | <a href="/stats.php">Reports</a> | <a href="/transaction_log.php">Transaction Log</a> | <a href="http://www.positivespin.org" target="_blank">PS Home</a></td> <td height="40" 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></td>
</tr> </tr>
<tr> <tr>
<td> <td>

6
include_header_shop.html
View File

@ -41,10 +41,10 @@ function resetTimer()
</head> </head>
<body class="yb_standard"> <body class="yb_standard">
<table align="center" width="1000" border="0" cellpadding="1" cellspacing="0"> <table id="header_height" align="center" width="1000" border="0" cellpadding="1" cellspacing="0">
<tr valign="top"> <tr valign="top">
<td height="40" align="left"><a href="/shop_welcome.php">About/Help</a></td> <td height="40" align="left"><a href="/shop_welcome.php">About/Help</a></td>
<td height="40" align="right"><a href="/shop_log.php">Sign In/Sign Out</a> | <a href="/start_shop.php"> All Shops</a> | <a href="/contact_add_edit_select.php">Add/Edit Contact</a> | <a href="/stats.php">Reports</a> | <a href="/transaction_log.php">Transaction Log</a> | <a href="http://www.positivespin.org" target="_blank">PS Home</a></td> <td height="40" align="right"><a id="shop_log_link" href="/shop_log.php">Sign In/Sign Out</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></td>
</tr> </tr>
</table> </table>

2
include_header_stats.html
View File

@ -29,7 +29,7 @@ function resetTimer()
<link href="../css/tabulator/tabulator_site.min.css" rel="stylesheet" type="text/css" /> <link href="../css/tabulator/tabulator_site.min.css" rel="stylesheet" type="text/css" />
<script src="../js/jquery-2.1.1.js"></script> <script src="../js/jquery-2.1.1.js"></script>
<script src="../js/jquery-2.1.1.js"></script> <script src="../js/reports.js"></script>
<script src="../js/jquery.pickmeup.js"></script> <script src="../js/jquery.pickmeup.js"></script>
<script src="../js/stats.js"></script> <script src="../js/stats.js"></script>
<script src="../js/ui/jquery-ui.js"></script> <script src="../js/ui/jquery-ui.js"></script>