leon 01/11/02 14:16:15
Modified: freetrade2/modules/navigation page_top side
freetrade2/modules/screen department
freetrade2/modules/utility standard_library
Log:
added checkout progress indicator and list of top-level departments to the side nav
Revision Changes Path
1.4 +22 -22 freetrade/freetrade2/modules/navigation/page_top
Index: page_top
===================================================================
RCS file: /home/cvs/freetrade/freetrade2/modules/navigation/page_top,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- page_top 2001/08/23 21:58:56 1.3
+++ page_top 2001/11/02 22:16:15 1.4
@@ -2,36 +2,13 @@
/*
** File: page_top
** Description: navigation module to be display at top of page
- ** Version: $Revision: 1.3 $
+ ** Version: $Revision: 1.4 $
** Created: 05/18/1999
** Author: Leon Atkinson
** Email: [EMAIL PROTECTED]
** CVS Author: $Author: leon $
- ** Last Revised: $Date: 2001/08/23 21:58:56 $
+ ** Last Revised: $Date: 2001/11/02 22:16:15 $
**
- ** Log : $Log: page_top,v $
- ** Log : Revision 1.3 2001/08/23 21:58:56 leon
- ** Log : bug fixes
- ** Log :
- ** Log : Revision 1.2 2000/05/10 22:28:10 leon
- ** Log : More changes to admin functionality
- ** Log :
- ** Log : Revision 1.1.1.1 2000/02/05 00:44:43 leon
- ** Log : Importing initial work on FreeTrade 2.0. This code is not really
working
- ** Log : yet, but I want everyone to be able to see what's going on and
possibly
- ** Log : contribute.
- ** Log :
- ** Log : Revision 1.5 2000/01/10 23:20:22 leon
- ** Log : Changed version info.
- ** Log :
- ** Log : Revision 1.4 1999/12/06 21:36:08 leon
- ** Log : Added little disclaimer to page top.
- ** Log :
- ** Log : Revision 1.3 1999/07/28 19:27:27 leon
- ** Log : Mass update based on code donation from a live project
- ** Log :
- **
- ** Copyright (c) 1999 Working Dogs. All rights reserved.
*/
printLine(getImage("FreeTradeMedium.gif", 254, 45), 1, FALSE);
@@ -39,5 +16,25 @@
print("Please visit ");
printLinkOutside("share.whichever.com/freetrade",
"http://share.whichever.com/freetrade/";, 0);
printLine(" for the latest version.", 1);
+
+ //if we're checking out, show progress indicator
+ switch($SCREEN)
+ {
+ case "order_info":
+ case "order_address":
+ case "order_express":
+ showProgressBar(FALSE, FALSE, FALSE);
+ break;
+ case "order_billing":
+ showProgressBar(TRUE, FALSE, FALSE);
+ break;
+ case "order_confirm":
+ case "order_view_ibid":
+ showProgressBar(TRUE, TRUE, FALSE);
+ break;
+ case "order_thankyou":
+ showProgressBar(TRUE, TRUE, TRUE);
+ break;
+ }
?>
1.10 +33 -4 freetrade/freetrade2/modules/navigation/side
Index: side
===================================================================
RCS file: /home/cvs/freetrade/freetrade2/modules/navigation/side,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- side 2001/10/30 21:14:51 1.9
+++ side 2001/11/02 22:16:15 1.10
@@ -2,23 +2,52 @@
/*
** File: side
** Description: side navigation
- ** Version: $Revision: 1.9 $
+ ** Version: $Revision: 1.10 $
** Created: 04/22/1999
** Author: Leon Atkinson
** Email: [EMAIL PROTECTED]
** CVS Author: $Author: leon $
- ** Last Revised: $Date: 2001/10/30 21:14:51 $
+ ** Last Revised: $Date: 2001/11/02 22:16:15 $
**
*/
include_once(DATABASE_MODULE . "item");
include_once(DATABASE_MODULE . "attribute");
+ include_once(DATABASE_MODULE . "department");
- printLink(L_NAV_SIDE_HOME, "welcome", 1);
+ //link to home page
+ printLink(L_NAV_SIDE_HOME, "welcome", 2);
+
+ //link to root of department
printLink(L_NAV_SIDE_DEPT, "department", 1);
+
+ //list of first-level departments
+ $d = getDepartmentChildren(0);
+ for($i = 0; $i < $d["NumRows"]; $i++)
+ {
+ //If using named departments, your URLs will look like
+ //department=Kitchenware instead of department=14
+ if(USE_NAMED_DEPARTMENTS)
+ {
+ $id = $d["Name"][$i];
+ }
+ else
+ {
+ $id = $d["ID"][$i];
+ }
+
+ printLink(' · ' . getTinyText($d["Name"][$i]),
+ "department", 1, array("department"=>$id));
+ }
+ printLine("");
+
+
+ //list of all items for sale, not good for
+ //stores with lots of items
printLink(L_NAV_SIDE_QUICK, "quick_order", 1);
- printLink(L_NAV_SIDE_STORE, "store", 1);
+ //link to list of real-world store locations
+ printLink(L_NAV_SIDE_STORE, "store", 1);
//help link
if(file_exists(MODULE . "help/$SCREEN"))
1.9 +3 -9 freetrade/freetrade2/modules/screen/department
Index: department
===================================================================
RCS file: /home/cvs/freetrade/freetrade2/modules/screen/department,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- department 2001/10/27 00:07:19 1.8
+++ department 2001/11/02 22:16:15 1.9
@@ -2,12 +2,12 @@
/*
** File: department
** Description: show departments and items contained in them
- ** Version: $Revision: 1.8 $
+ ** Version: $Revision: 1.9 $
** Created: 04/22/1999
** Author: Leon Atkinson
** Email: [EMAIL PROTECTED]
** CVS Author: $Author: leon $
- ** Last Revised: $Date: 2001/10/27 00:07:19 $
+ ** Last Revised: $Date: 2001/11/02 22:16:15 $
*/
//get item functions, getDepartmentItemList()
@@ -27,13 +27,7 @@
}
//show sub-departments
- if (! ($Departments = getDepartmentChildren($department)) )
- {
- addToLog("Couldn't get department list!",
- LOG_EMERGENCY, __FILE__, __LINE__);
- return(FALSE);
- }
-
+ $Departments = getDepartmentChildren($department);
for ($i = 0; $i < $Departments["NumRows"]; $i++)
{
//If using named departments, your URLs will look like
1.26 +43 -2 freetrade/freetrade2/modules/utility/standard_library
Index: standard_library
===================================================================
RCS file: /home/cvs/freetrade/freetrade2/modules/utility/standard_library,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- standard_library 2001/11/01 20:45:01 1.25
+++ standard_library 2001/11/02 22:16:15 1.26
@@ -6,12 +6,12 @@
** 75% of all page views. Most of these functions were in global_settings
** at one time.
**
- ** Version: $Revision: 1.25 $
+ ** Version: $Revision: 1.26 $
** Created: 10/4/99
** Author: Leon Atkinson
** Email: [EMAIL PROTECTED]
** CVS Author: $Author: leon $
- ** Last Revised: $Date: 2001/11/01 20:45:01 $
+ ** Last Revised: $Date: 2001/11/02 22:16:15 $
*/
@@ -933,6 +933,47 @@
$data .= selectField($name . 'Year', $years, FALSE);
return($data);
+ }
+
+
+ function showProgressBar($shipping, $billing, $confirmation)
+ {
+ startTable();
+
+ print("<td class=\"fttablelabel\">Items Selected</td>\n");
+
+ if($shipping)
+ {
+ $style = 'fttablelabel';
+ }
+ else
+ {
+ $style = 'fttabledata';
+ }
+ print("<td class=\"$style\">Shipping Address Set</td>\n");
+
+ if($billing)
+ {
+ $style = 'fttablelabel';
+ }
+ else
+ {
+ $style = 'fttabledata';
+ }
+ print("<td class=\"$style\">Billing Information Set</td>\n");
+
+ if($confirmation)
+ {
+ $style = 'fttablelabel';
+ }
+ else
+ {
+ $style = 'fttabledata';
+ }
+ print("<td class=\"$style\">Order Confirmed</td>\n");
+
+
+ endTable();
}
?>
_______________________________________________
FreeTrade-dev mailing list
[EMAIL PROTECTED]
http://share.whichever.com/mailman/listinfo/freetrade-dev
