Browse Source

Changes the header for shop_log and start_shop.

1)  Pages will go back to shop_welcome (original behavior) but for these two pages.  This prevents transaction pages from going back.
2) Added an About/Help link to the left.
3) Changed the width/margin of the associated tables so that it would line up withe new table presenting the menu links.
devel
Jonathan Rosenbaum 9 years ago
parent
commit
6bbf55a25e
  1. 4
      Connections/volunteer_interest_form_introduction.txt
  2. 50
      include_header_shop.html
  3. 17
      js/shop.js
  4. 6
      shop_log.php
  5. 4
      start_shop.php

4
Connections/volunteer_interest_form_introduction.txt

@ -1,5 +1,5 @@
Positive Spin is a volunteer-run organization. Your volunteered time, and our
ability to benefit the community with our exciting services and programs are
directly related. We do have funding for various committees. Please indicate
directly related. We can provide funding for various committees. Please indicate
if you would be interested in helping us with any of the following management
needs, operations, events and programs:
needs, operations, events and programs:

50
include_header_shop.html

@ -0,0 +1,50 @@
<script type="text/javascript">
var t;
window.onload=resetTimer;
document.onmousedown=resetTimer;
document.onkeypress=resetTimer;
function logout()
{
location.href='shop_welcome.php'
}
function resetTimer()
{
clearTimeout(t);
t=setTimeout(logout,1000*240) //Shop welcome after 240 seconds of inactivity
}
</script>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>YBDB</title>
<link href="css/transactions.css" rel="stylesheet" type="text/css" />
<link href="css/contacts.css" rel="stylesheet" type="text/css" />
<link href="css/css_yb_standard.css" rel="stylesheet" type="text/css" />
<link href="css/jquery.nouislider.css" rel="stylesheet" type="text/css" />
<link href="css/chosen.css" rel="stylesheet" type="text/css" />
<script src="js/jquery-2.1.1.js"></script>
<script src="js/transaction.js"></script>
<script src="js/contact.js"></script>
<script src="js/shop.js"></script>
<script src="js/jquery.mask.js"></script>
<script src="js/jquery.jeditable.js"></script>
<script src="js/jquery.nouislider.js"></script>
<script src="js/chosen.jquery.js"></script>
<script src="js/jquery.liblink.js"></script>
<script src="js/wNumb.js"></script>
</head>
<body class="yb_standard">
<table align="center" width="1000" border="0" cellpadding="1" cellspacing="0">
<tr valign="top">
<td height="40" align="left"><a href="/shop_welcome.php">About/Help</a></td>
<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">Statistics</a> | <a href="/transaction_log.php">Transaction Log</a> | <a href="http://www.positivespin.org/home2/" target="_blank">PS Home</a></td>
</tr>
</table>

17
js/shop.js

@ -1,12 +1,19 @@
$(function(){
"use strict";
"use strict";
// sensible defaults
$("#shop_date").mask("0000-00-00", {placeholder: "yyyy-mm-dd" });
// sensible defaults
$("#shop_date").mask("0000-00-00", {placeholder: "yyyy-mm-dd" });
$("[name='contact_id']").attr("tabindex",1);
$("[name='contact_id']").trigger('chosen:activate');
$("[name='user_role']").attr("tabindex",2);
$("[name='time_in']").attr("tabindex",3);
$("[name='project']").attr("tabindex",4);
$("[name='comment']").attr("tabindex",5);
$("[name='Submit']").attr("tabindex",6);
// error handler for shops with a popup dialog
// error handler for shops with a popup dialog (TODO)
function error_handler(input,error_span,error,error_text,event) {
var trans_error = 0;
if ( input == error ) {

6
shop_log.php

@ -133,9 +133,9 @@ if ((isset($_POST["MM_insert"])) && ($_POST["MM_insert"] == "FormEdit")) {
?>
<?php include("include_header.html"); ?>
<?php include("include_header_shop.html"); ?>
<table>
<table width="2200px">
<tr>
<td align="left" valign="bottom"><?php echo $error_message;?></td>
</tr>
@ -191,7 +191,7 @@ if ((isset($_POST["MM_insert"])) && ($_POST["MM_insert"] == "FormEdit")) {
<br /><br />
<table width="850px" border="1" cellpadding="1" cellspacing="0" bordercolor="#CCCCCC">
<table width="850px" style="margin-left:170px" border="1" cellpadding="1" cellspacing="0" bordercolor="#CCCCCC">
<tbody
<tr valign="bottom" bordercolor="#CCCCCC">
<td height="25" colspan="1" bgcolor="#99CC33">Existing Shop Users</td>

4
start_shop.php

@ -110,9 +110,9 @@ if ((isset($_POST["MM_insert"])) && ($_POST["MM_insert"] == "ChangeDate")) {
header(sprintf("Location: %s",$editFormAction )); //$editFormAction
}
?>
<?php include("include_header.html"); ?>
<?php include("include_header_shop.html"); ?>
<table>
<table style="margin-left:170px">
<tr valign="top">
<td align="left"><span class="yb_heading3red"><?php echo $error_message; ?></span> </td>

Loading…
Cancel
Save