[interchange-cvs] interchange - heins modified 16 files
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Wed Aug 7 04:12:03 2002
User: heins
Date: 2002-08-07 08:11:01 GMT
Modified: . MANIFEST
Modified: dist/lib/UI/pages/admin menu_editor.html
Modified: dist/lib/UI/pages/include/menus Quicklinks.txt
Modified: dist/lib/UI/vars UI_STD_HEAD
Modified: lib/Vend Menu.pm
Added: dist/lib/UI/pages/include/menus Admin.txt Content.txt
Added: Customers.txt Design.txt Items.txt
Added: Merchandising.txt None.txt Orders.txt Reports.txt
Added: Top.txt Wizard.txt
Log:
* Update the Admin menus to be editable via the new menu editor.
TODO: remove _edit_ links when not superuser and/or show_meta
on.
Seems to work pretty transparently.
Revision Changes Path
2.50 +11 -0 interchange/MANIFEST
rev 2.50, prev_rev 2.49
Index: MANIFEST
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/MANIFEST,v
retrieving revision 2.49
retrieving revision 2.50
diff -u -r2.49 -r2.50
--- MANIFEST 5 Aug 2002 04:05:39 -0000 2.49
+++ MANIFEST 7 Aug 2002 08:10:59 -0000 2.50
@@ -827,7 +827,18 @@
dist/lib/UI/pages/include/item_option_modular
dist/lib/UI/pages/include/item_option_simple
dist/lib/UI/pages/include/menus/Accounting.txt
+dist/lib/UI/pages/include/menus/Admin.txt
+dist/lib/UI/pages/include/menus/Content.txt
+dist/lib/UI/pages/include/menus/Customers.txt
+dist/lib/UI/pages/include/menus/Design.txt
+dist/lib/UI/pages/include/menus/Items.txt
+dist/lib/UI/pages/include/menus/Merchandising.txt
+dist/lib/UI/pages/include/menus/None.txt
+dist/lib/UI/pages/include/menus/Orders.txt
dist/lib/UI/pages/include/menus/Quicklinks.txt
+dist/lib/UI/pages/include/menus/Reports.txt
+dist/lib/UI/pages/include/menus/Top.txt
+dist/lib/UI/pages/include/menus/Wizard.txt
dist/lib/UI/pages/include/order_delete_archive
dist/lib/UI/pages/include/page_editor
dist/lib/UI/pages/include/table_populator
2.7 +3 -2 interchange/dist/lib/UI/pages/admin/menu_editor.html
rev 2.7, prev_rev 2.6
Index: menu_editor.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/menu_editor.html,v
retrieving revision 2.6
retrieving revision 2.7
diff -u -r2.6 -r2.7
--- menu_editor.html 6 Aug 2002 22:02:34 -0000 2.6
+++ menu_editor.html 7 Aug 2002 08:11:00 -0000 2.7
@@ -1126,7 +1126,7 @@
=20
if(INACTIVE !=3D undefined) {
form.inactive.disabled =3D 0;
- form.inactive.checked =3D l[INACTIVE] =3D=3D 1 ? 1 : 0;
+ form.inactive.checked =3D l[INACTIVE] ? 1 : 0;
}
else {
form.inactive.disabled =3D 1;
@@ -1171,6 +1171,7 @@
if(EXTENDED !=3D undefined)
form.extended.value =3D '';
=20
+ form.inactive.checked =3D 0;
form.breakline.checked =3D 0;
form.label.checked =3D 0;
form.lineidx.value =3D 0;
@@ -1250,7 +1251,7 @@
}
=20
if(INACTIVE !=3D undefined) {
- l[INACTIVE] =3D form.inactive.checked =3D=3D 1 ? 1 : 0;
+ l[INACTIVE] =3D form.inactive.checked ? 1 : 0;
}
=20
var j;
1.4 +2 -1 interchange/dist/lib/UI/pages/include/menus/Quicklinks=
txt
rev 1.4, prev_rev 1.3
Index: Quicklinks.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/dist/lib/UI/pages/include/menus/Quicklinks.t=
xt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Quicklinks.txt 3 Aug 2002 19:30:43 -0000 1.3
+++ Quicklinks.txt 7 Aug 2002 08:11:00 -0000 1.4
@@ -11,7 +11,7 @@
010 x010 0 <hr noshade size=3D1>=09=09
011 x011 0 Site Design=09=09
012 x012 0 admin/layout Site Layout=09=09
-013 x013 0 admin/page Page Edit=09=09
+013 x013 0 admin/page Page Edit [var COMPANY] [cgi foo] [time]%c[/time]
014 x014 0 admin/regenerate Generate static=09=09
015 x015 0 admin/build_related Build related=09=09
016 x016 0 admin/search_wizard Search Builder=09=09
@@ -41,3 +41,4 @@
040 x040 0 index <b>Go to catalog</b>=09=09
041 x041 0 admin/login <b>Logout</b>=09=09
042 x042 0 admin/reconfig <b>Apply Changes</b>=09=09
+043 x043 0 search fi=3Dproducts&st=3Ddb&co=3D1&sf=3Dtitle&se=3Dbrush&op=
=3Drm&nu=3D0&su=3D1&ml=3D3&tf=3Dtitle&to=3Dx Testing search build=09=09
1.1 interchange/dist/lib/UI/pages/include/menus/Admin.txt
rev 1.1, prev_rev 1.0
Index: Admin.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
code mgroup msort next_line indicator exclude_on depends_on page form name =
super inactive description help_name img_dn img_up img_sel img_icon url deb=
ug
002 Admin x002 admin/tax Tax 0=09=09=09=09=09=09=09=09
011 Admin x011 admin/reconfig Apply Changes 0=09=09=
=09=09=09=09=09=09
016 Admin x016 no_dbmenu mv_data_table admin/search_replace mv_data_table=
=3D[cgi mv_data_table] Search/Replace 0=09=09=09=09=09=09=09=09
004 Admin x004 admin/payment Payment 0=09=09=09=09=09=09=09=09
005 Admin x005 admin/access Access 0=09=09=09=09=09=09=09=09
013 Admin x013 no_dbmenu mv_data_table admin/import_table mv_data_table=
=3D[cgi mv_data_table] Import Data 0=09=09=09=09=09=09=09=09
008 Admin x008 admin/gentable Tables 0=09=09=09=09=09=09=09=09
003 Admin x003 admin/ship Shipping 0=09=09=09=09=09=09=09=09
006 Admin x006 admin/preferences Preferences 0=09=09=09=09=09=09=09=
=09
007 Admin x007 `$CGI->{mv_data_table} eq 'variable' or $CGI->{mv_data_tabl=
e} && return -1` admin/flex_select mv_data_table=3Dvariable&page_title=3D=
Knar%20editor&ui_meta_specific=3D1&doing_knar=3D1&help_name=3Dknar.main&ui_=
description_fields=3Dcode&ui_return_to=3Dadmin/flex_select&ui_return_to=3Dm=
v_data_table=3Dvariable&ui_return_to=3Dpage_title=3DKnar%20Editor Knar 1 0 =
1
019 Admin x019 no_dbmenu mv_data_table admin/gentable =
Re-select Table 0=09=09=09=09=09=09=09=09
018 Admin x018 no_dbmenu mv_data_table admin/flex_editor mv_data_table=3D=
[cgi mv_data_table]&ui_new_item=3D1 New Entry 0=09=09=09=09=09=09=09=09
012 Admin x012 1 no_dbmenu mv_data_table admin/flex_select mv_data_table=
=3D[cgi mv_data_table] Edit 0=09=09=09=09=09=09=09=09
021 Admin x021 access_menu admin/group Groups 0=09=09=09=09=09=09=09=
=09
010 Admin x010 admin/test_code Test code 0=09=09=09=09=09=09=09=09
017 Admin x017 no_dbmenu mv_data_table admin/direct_sql mv_data_table=3D[=
cgi mv_data_table] Direct SQL 0=09=09=09=09=09=09=09=09
009 Admin x009 admin/auto_wizard Wizard 0=09=09=09=09=09=09=09=09
014 Admin x014 no_dbmenu mv_data_table admin/export_table mv_data_table=
=3D[cgi mv_data_table] Export Data 0=09=09=09=09=09=09=09=09
015 Admin x015 no_dbmenu mv_data_table admin/spread mv_data_table=3D[cgi =
mv_data_table] Spreadsheet 0=09=09=09=09=09=09=09=09
001 Admin x001 admin/genconfig YES! Info 0=09=09=09=09=09=09=09=09
020 Admin x020 1 access_menu admin/access Users 0=09=09=09=09=09=09=09=
=09
1.1 interchange/dist/lib/UI/pages/include/menus/Content.txt
rev 1.1, prev_rev 1.0
Index: Content.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
code mgroup msort next_line indicator exclude_on depends_on page form name =
super inactive description help_name img_dn img_up img_sel img_icon url
0027 01 x admin/content Content Edit 0=09=09=09=09=09=09=09
001 admin/genconfig YES!=09=09=09=09=09=09=09=09=09=09=09
0029 03 Content admin/file_transfer File Transfer 0=09=09=09=09=09=09=
=09
1.1 interchange/dist/lib/UI/pages/include/menus/Customers.=
txt
rev 1.1, prev_rev 1.0
Index: Customers.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
code mgroup msort next_line indicator exclude_on depends_on page form name =
super inactive description help_name img_dn img_up img_sel img_icon url deb=
ug
001 Customers x001 showactive! admin/customer showactive=3D1 Active Cust=
omers 0 1
002 Customers x002 showinactive! admin/customer showinactive=3D1 Inactiv=
e Customers 0 1
003 Customers x003 admin/flex_editor page_title=3DCreate new customer&m=
v_data_table=3Duserdb&help_name=3Dcreate.new.customer&ui_new_item=3D1&ui_re=
turn_to=3Dadmin/customer Create new customer 0=09=09=09=09=09=09=09=09
004 Customers x004 1 deletecustomer customer admin/customer_view customer=
=3D[cgi customer] View 0=09=09=09=09=09=09=09=09
005 Customers x005 deletecustomer customer admin/customer_ship customer=
=3D[cgi customer] Shipping 0=09=09=09=09=09=09=09=09
006 Customers x006 deletecustomer customer admin/customer_bill customer=
=3D[cgi customer] Billing 0=09=09=09=09=09=09=09=09
007 Customers x007 deletecustomer customer admin/customer_comments custom=
er=3D[cgi customer] Feedback 0=09=09=09=09=09=09=09=09
008 Customers x008 deletecustomer customer admin/customer_all customer=3D=
[cgi customer] All 0=09=09=09=09=09=09=09=09
009 Customers x009 deletecustomer customer admin/customer_pref customer=
=3D[cgi customer] Preferences 0=09=09=09=09=09=09=09=09
010 Customers x010 deletecustomer customer admin/entry customer=3D[cgi cu=
stomer] Enter Order 0=09=09=09=09=09=09=09=09
1.1 interchange/dist/lib/UI/pages/include/menus/Design.txt
rev 1.1, prev_rev 1.0
Index: Design.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
code mgroup msort next_line indicator exclude_on depends_on page form name =
super inactive description help_name img_dn img_up img_sel img_icon url
001 01 x001 admin/layout fi=3Dproducts&st=3Ddb&co=3D1&sf=3Ddescription&=
se=3Dbrush&op=3Drm&nu=3D0&su=3D1&ml=3D50&tf=3Dtitle&to=3Dx Site layout 0=
=09=09=09=09=09=09=09
002 02 x002 admin/search_wizard Search Builder 0=09=09=09=09=09=09=09
003 03 x003 admin/button_builder Button Builder 0=09=09=09=09=09=09=
=09
004 04 x004 admin/regenerate Generate Static 0=09=09=09=09=09=09=09
005 05 x005 admin/file_transfer File Transfer 0=09=09=09=09=09=09=09
006 06 x006 admin/content Page Edit 0=09=09=09=09=09=09=09
007 x007 admin/menu_editor Menu editor 0 Edit the UI menus, and the =
menus for the site=09=09=09=09=09=09
1.1 interchange/dist/lib/UI/pages/include/menus/Items.txt
rev 1.1, prev_rev 1.0
Index: Items.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
code mgroup msort next_line indicator exclude_on depends_on page form name =
super inactive description help_name img_dn img_up img_sel img_icon url
001 Items x001 admin/item Item list 0=09=09=09=09=09=09=09
002 Items x002 admin/item_edit ui_new_item=3D1 =
Create new item 0=09=09=09=09=09=09=09
003 Items x003 item_id admin/item_edit ui_new_item=3D1&ui_clone_id=3D[cg=
i item_id]&ui_clone_tables=3D[var UI_ITEM_TABLES] C=
lone item 0=09=09=09=09=09=09=09
004 Items x004 item_id sku: [cgi item_id] 0=09=09=
=09=09=09=09=09
005 Items x005 1 item_id admin/item_edit item_id=3D[cgi item_id]&ui_seque=
nce_edit=3D[cgi ui_sequence_edit]&item_id_left=3D[cgi item_id_left] Edit 0=
=09=09=09=09=09=09=09
006 Items x006 item_id admin/item_price item_id=3D[cgi item_id]&ui_seque=
nce_edit=3D[cgi ui_sequence_edit]&item_id_left=3D[cgi item_id_left] Pricing=
0=09=09=09=09=09=09=09
007 Items x007 item_id admin/item_up item_id=3D[cgi item_id]&ui_sequence=
_edit=3D[cgi ui_sequence_edit]&item_id_left=3D[cgi item_id_left] Up-sell 0=
=09=09=09=09=09=09=09
008 Items x008 item_id admin/item_cross item_id=3D[cgi item_id]&ui_seque=
nce_edit=3D[cgi ui_sequence_edit]&item_id_left=3D[cgi item_id_left] Cross-s=
ell 0=09=09=09=09=09=09=09
009 Items x009 item_id admin/item_feature item_id=3D[cgi item_id]&ui_seq=
uence_edit=3D[cgi ui_sequence_edit]&item_id_left=3D[cgi item_id_left] Promo=
tion 0=09=09=09=09=09=09=09
010 Items x010 item_id admin/item_inventory item_id=3D[cgi item_id]&ui_s=
equence_edit=3D[cgi ui_sequence_edit]&item_id_left=3D[cgi item_id_left] Inv=
entory 0=09=09=09=09=09=09=09
011 Items x011 item_id admin/item_option item_id=3D[cgi item_id]&ui_sequ=
ence_edit=3D[cgi ui_sequence_edit]&item_id_left=3D[cgi item_id_left] Option=
s 0=09=09=09=09=09=09=09
1.1 interchange/dist/lib/UI/pages/include/menus/Merchandis=
ing.txt
rev 1.1, prev_rev 1.0
Index: Merchandising.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
code mgroup msort next_line indicator exclude_on depends_on page form name =
super inactive description help_name img_dn img_up img_sel img_icon url
0057 Merchandising 01 admin/merchandising Product Merchandising=09=09=
=09=09=09=09=09=09=09
0058 Merchandising 02 admin/affiliates Affiliates=09=09=09=09=09=09=09=
=09=09
0059 Merchandising 03 admin/build_related Generate "others who ..."=09=
=09=09=09=09=09=09=09=09
0060 Merchandising 04 1 affiliates admin/flex_editor page_title=3DCreate =
new affiliate&mv_data_table=3Daffiliate&help_name=3Dcreate.new.affiliate&ui=
_new_item=3D1&ui_return_to=3Dadmin/affiliates&icon_name=3Dicon_people.gif C=
reate new affiliate=09=09=09=09=09=09=09=09=09
1.1 interchange/dist/lib/UI/pages/include/menus/None.txt
rev 1.1, prev_rev 1.0
Index: None.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
code mgroup msort next_line indicator exclude_on depends_on page form name =
super inactive description help_name img_dn img_up img_sel img_icon url
0061 None 1 !nevairbe <font size=3D"-1"><b>Welcome to Interchange</b><=
/font>=09=09=09=09=09=09=09=09=09
1.1 interchange/dist/lib/UI/pages/include/menus/Orders.txt
rev 1.1, prev_rev 1.0
Index: Orders.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
code mgroup msort next_line indicator exclude_on depends_on page form name =
super inactive description help_name img_dn img_up img_sel img_icon url
001 Orders x001 !showarchive! admin/order showpending=3D1 Pending Orders=
0=09=09=09=09=09=09=09
002 Orders x002 showarchive! admin/order showarchive=3D1 Archived Orders=
0=09=09=09=09=09=09=09
003 Orders x003 admin/entry Enter Order 0=09=09=09=09=09=09=09
1.1 interchange/dist/lib/UI/pages/include/menus/Reports.txt
rev 1.1, prev_rev 1.0
Index: Reports.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
code mgroup msort next_line indicator exclude_on depends_on page form name =
super inactive description help_name img_dn img_up img_sel img_icon url
001 Reports x001 admin/orderstats Orders 0=09=09=09=09=09=09=09
002 Reports x002 admin/trafficstats Traffic 0=09=09=09=09=09=09=09
003 Reports x003 admin/tablereport Custom 0=09=09=09=09=09=09=09
1.1 interchange/dist/lib/UI/pages/include/menus/Top.txt
rev 1.1, prev_rev 1.0
Index: Top.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
code mgroup msort next_line indicator exclude_on depends_on page form name =
super inactive description help_name img_dn img_up img_sel img_icon url
001 Top x001 Orders order admin/order Orders 0 View and manage incoming=
orders, archive and access past orders B2.gif B2_b.gif B2_b.gif icon_orde=
rs.gif=09
002 Top x002 Customers userdb admin/customer Customers 0 View and manag=
e customer information and order history B3.gif B3_b.gif B3_b.gif icon_peo=
ple.gif=09
003 Top x003 Items item admin/item Items 0 Add and edit items displayed=
for sale on the site B4.gif B4_b.gif B4_b.gif icon_item.gif=09
004 Top x004 Content content admin/content Content 0 Create, edit, uplo=
ad and download pages B5.gif B5_b.gif B5_b.gif icon_pages.gif=09
005 Top x005 Design layout admin/layout Design 0 Organize site navigati=
on, manage site layout B6.gif B6_b.gif B6_b.gif icon_design.gif=09
006 Top x006 Merchandising item admin/merchandising Merchandising 0 Set=
up quantity pricing, up-sell, promotions, and affiliates B7.gif B7_b.gif =
B7_b.gif icon_merch.gif=09
007 Top x007 Reports stats admin/orderstats Reports 0 View statistics o=
n orders and site traffic, create custom reports B8.gif B8_b.gif B8_b.gif =
icon_stats.gif=09
008 Top x008 Admin admin admin/genconfig Administration 0 Administrator=
and developer-oriented tools B9.gif B9_b.gif B9_b.gif icon_config.gif=09
009 Top x009 Accounting admin/accounting/index Accounting 1 SQL-Ledger=
accounting interface BA.gif BA_b.gif BA_b.gif icon_account.png=09
1.1 interchange/dist/lib/UI/pages/include/menus/Wizard.txt
rev 1.1, prev_rev 1.0
Index: Wizard.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
code mgroup msort next_line indicator exclude_on depends_on page form name =
super inactive description help_name img_dn img_up img_sel img_icon url
001 Wizard 0 groupcomp admin/wizard/index About Your Company 1 0 group=
comp=09=09=09=09=09
002 Wizard 1 1 company admin/wizard/step_company Company Information 1 0=
compinfo=09=09=09=09=09
003 Wizard 1 1 email admin/wizard/step_email Company E-mail Addresses 1 =
0 compemail=09=09=09=09=09
004 Wizard 0 grouppolicy admin/wizard/step_grouppolicy About Your Prefe=
rences 1 0 grouppolicy=09=09=09=09=09
005 Wizard 1 1 tax admin/wizard/step_tax Tax Information 1 0 taxcalc=09=
=09=09=09=09
006 Wizard 1 1 ship admin/wizard/step_ship Shipping Preferences 1 0 shi=
pinfo=09=09=09=09=09
007 Wizard 1 1 pay admin/wizard/step_pay Payment Preferences 1 0 paymen=
t=09=09=09=09=09
008 Wizard 1 1 security admin/wizard/step_security Security Preferences =
1 0 general=09=09=09=09=09
009 Wizard 0 groupcontent admin/wizard/step_content About Your Site 1 0=
groupcontent=09=09=09=09=09
010 Wizard 1 1 index admin/wizard/step_index Index page 1 0 content=09=
=09=09=09=09
011 Wizard 1 1 about admin/wizard/step_about About us 1 0 content=09=09=
=09=09=09
012 Wizard 0 products admin/wizard/step_products About Your Products 1 =
0 sprdsht=09=09=09=09=09
013 Wizard 0 preview admin/wizard/step_preview Preview 1 0 general=09=
=09=09=09=09
014 Wizard 0 launch admin/wizard/step_launch Launch 1 0 general=09=09=
=09=09=09
2.19 +50 -110 interchange/dist/lib/UI/vars/UI_STD_HEAD
rev 2.19, prev_rev 2.18
Index: UI_STD_HEAD
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/dist/lib/UI/vars/UI_STD_HEAD,v
retrieving revision 2.18
retrieving revision 2.19
diff -u -r2.18 -r2.19
--- UI_STD_HEAD 4 Aug 2002 22:25:09 -0000 2.18
+++ UI_STD_HEAD 7 Aug 2002 08:11:01 -0000 2.19
@@ -61,6 +61,7 @@
se=3D$ui_tag
op=3Drm
EOF
+ $Scratch->{ui_class} =3D $ui_tag;
$Scratch->{"ui_class_$ui_tag"} =3D 1;
$Scratch->{ui_menu_sparams} =3D $sparams;
return;
@@ -198,131 +199,70 @@
=20
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
<tr bgcolor=3D"#000000">=20
- <td><img src=3D"spacer1.gif" width=3D"1" height=3D"1" alt=3Dline></td>
+ <td colspan=3D2><img src=3D"spacer1.gif" width=3D"1" height=3D"1" alt=
=3Dline></td>
</tr>
<tr bgcolor=3D"#FFFFFF">=20
- <td><img src=3D"spacer2.gif" width=3D"1" height=3D"1" alt=3Dline></td>
+ <td colspan=3D2><img src=3D"spacer2.gif" width=3D"1" height=3D"1" alt=
=3Dline></td>
</tr>
<tr bgcolor=3D"__UI_C_INTBLOCKBAR__">=20
<td nowrap>=20
- <div align=3D"left"><img src=3D"B1.gif" width=3D"9" height=3D"19" al=
t=3Dline>[loop
- prefix=3Dam
- search=3D"
- fi=3D@_UI_MENU_TABLE_@
- st=3Ddb
- co=3Dyes
-
- sf=3Dmgroup
- se=3DTop
- op=3Deq
-
- tf=3Dmsort
- rf=3D*
- "
+ <div align=3D"left"><img src=3D"B1.gif" width=3D"9" height=3D"19" al=
t=3Dline>[menu
+ name=3DTop
+ inactive=3Dinactive
+ localize=3Dname
+ indicator=3Dindicator
+ ui_security=3Ddepends_on
lr=3D1]
- [if-am-param !inactive]
- [if-mm advanced [am-param depends_on]]
- [if-am-param img_dn]
- <!-- class=3D[am-param name]=3D[scratch ui_class_[am-param name]] -->
- <a href=3D"[area href=3D'[am-param page]' form=3D'[am-param form]']" on=
MouseOut=3D"MM_swapImgRestore()" onMouseOver=3D"MM_swapImage('[am-param nam=
e]','','[am-param img_up]',1)"><img name=3D"[am-param name]" alt=3D"[am-par=
am name]" border=3D"0" src=3D"[if scratch ui_class_[am-param name]][am-para=
m img_up][else][am-param img_dn][/else][/if]"></a>
- [/if-am-param]
- [if-am-param !img_dn]
- <a href=3D"[area href=3D'[am-param page]' form=3D'[am-param form]']" c=
lass=3Dctitle>[msg][am-param name][/msg]</a>
- [/if-am-param]
- [/if-mm]
- [/if-am-param]
- [/loop]
- <img src=3D"B10.gif" width=3D"17" height=3D"19" alt=3Dline></div>
+ {IMG_DN?}
+ <!-- class=3D{NAME} -->
+ <a href=3D"{HREF}"
+ onMouseOut=3D"MM_swapImgRestore()"
+ onMouseOver=3D"MM_swapImage('{NAME}','','{IMG_UP}',1)"><img name=3D"{NA=
ME}" alt=3D"{NAME}" border=3D"0" src=3D"{INDICATED?IMG_UP:IMG_DN}"></a>
+ {/IMG_DN?}
+ {IMG_DN:}
+ <a href=3D"{HREF}" class=3Dctitle>{NAME}</a>
+ {/IMG_DN:}
+ [/menu]
+ <img src=3D"B10.gif" width=3D"17" height=3D"19" alt=3Dline> =
+ </div>
+ </td>
+ <td align=3Dright>
+ <A HREF=3D"[area href=3D__UI_BASE__/menu_editor form=3D"qmenu_name=3DTo=
p"]"
+ style=3D"font-size: 7pt" class=3Dctitle>edit</A>
</td>
</tr>
</table>
-
-[loop
- prefix=3Dsm
- search=3D"[scratch ui_menu_sparams]"
- safe_data=3D1
-][sm-calc]
- my $pre =3D '';
- my $post =3D '';
- my $out =3D '';
- $out .=3D <<'EOF' if ! $sm_once++;
+[menu
+ name=3D"[scratch ui_class]"
+ superuser=3Dsuper
+ depends_on=3Ddepends_on
+ expand_values=3Dname,page,form
+ localize=3Dname
+ indicator=3Dindicator,page
+ inactive=3Dinactive
+ reparse=3D1
+ nbsp=3Dname
+][menu-header]
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
<tr>=20
- <td bgcolor=3D"__UI_C_TOPBLOCKBAR__"><img src=3D"spacer3.gif" width=3D=
1 height=3D1 alt=3Dline></td>
+ <td bgcolor=3D"__UI_C_TOPBLOCKBAR__" colspan=3D2><img src=3D"spacer3.g=
if" width=3D1 height=3D1 alt=3Dline></td>
</tr>
<tr bgcolor=3D"000000">=20
- <td><img src=3D"spacer4.gif" width=3D1 height=3D1 alt=3Dline></td>
+ <td colspan=3D2><img src=3D"spacer4.gif" width=3D1 height=3D1 alt=3Dli=
ne></td>
</tr>
<tr bgcolor=3D"__UI_C_TITLEBARBG__">=20
- <td valign=3Dcenter nowrap><font face=3D"Verdana, Arial, Helvetica, sa=
ns-serif" size=3D"-1"><img src=3D"bg.gif" height=3D19 width=3D3 align=3Dmid=
dle alt=3Dx>
-EOF
- return if q{[sm-param inactive]};
- return if q{[sm-param super]} and $Tag->if_mm('!super');
- my $indicator =3D q{[sm-param indicator]};
- my $exclude =3D q{[sm-param exclude_on]};
-#Log("indicator=3D$indicator");
- my $depend =3D q{[sm-param depends_on]};
- return '' if $exclude and $CGI->{$exclude};
- return '' if $depend and ! $CGI->{$depend};
- my $name =3D errmsg(q{[sm-param name]});
- my $page =3D q{[sm-param page]};
- my $form =3D q{[sm-param form]};
- for(\$name, \$page, \$form) {
- $$_ =3D~ s/\[cgi\s+([^\[]+)\]/$CGI->{$1}/g;
- $$_ =3D~ s/\[var\s+([^\[]+)\]/$Variable->{$1}/g;
- $$_ =3D~ s/\[value\s+([^\[]+)\]/$Values->{$1}/g;
- }
-#Log("Form is: $form");
- $form =3D~ tr/&/\n/;
- my $next =3D q{[sm-param next_line]};
- if($name =3D~ s/^(( )+)//i) {
- $pre =3D $1;
- }
- if($name =3D~ s/(( )+)$//i) {
- $post =3D $1;
- }
- $name =3D~ s/ / /g;
-#Log("Form is: $form");
- $out .=3D $pre;
- $out .=3D q{</td></tr><tr bgcolor=3D"__UI_C_INTBLOCKBAR__"><td nowrap val=
ign=3Dcenter><img src=3D"bg.gif" height=3D19 width=3D3 align=3Dmiddle alt=
=3Dx>
-}
- if $next;
- $out .=3D qq{<A HREF=3D"} if $page;
- $out .=3D $Tag->area( { href =3D> $page, form =3D> $form } )
- if $page;
- $out .=3D qq{">} if $page;
- my $fc =3D q{__UI_C_TITLEBARCONT__};
- my $rev =3D $indicator =3D~ s/^!//;
-
-#Log("indicator=3D$indicator rev=3D$rev CGI=3D$CGI->{$indicator} VALUES=3D=
$Values->{$indicator}");
-
- if($indicator) {
- if($rev) {
- $fc =3D q{__UI_C_TITLEBARTXT__}
- if ! (defined $CGI->{$indicator} ? $CGI->{$indicator} : $Values->{$in=
dicator});
- }
- else {
- $fc =3D q{__UI_C_TITLEBARTXT__}
- if (defined $CGI->{$indicator} ? $CGI->{$indicator} : $Values->{$indic=
ator});
- }
- }
- elsif($Tag->var('MV_PAGE', 1) eq $page) {
-#Log("page presence select");
- $fc =3D q{__UI_C_TITLEBARTXT__};
- }
-
- $out .=3D qq{<FONT COLOR=3D"$fc" SIZE=3D"-1">$name</FONT>};
- $out .=3D '</A>' if $page;
- $out .=3D $post;
- $out .=3D ' ';
-[/sm-calc] [/loop]
- [calc]
- return unless $sm_once;
- $out =3D qq!</td></TR>!;
- $out .=3D q!<tr bgcolor=3D"#000000"><td>!;
- $out .=3D q!<IMG SRC=3D"bg.gif" WIDTH=3D"1" HEIGHT=3D"1" alt=3Dx>!;
- $out .=3D q!</td></tr></table>!;
- [/calc]
+ <td valign=3Dcenter nowrap><font face=3D"Verdana, Arial, Helvetica, sa=
ns-serif" size=3D"-1"><img src=3D"bg.gif" height=3D19 width=3D3 align=3Dmid=
dle alt=3Dx> [/menu-header]{NEXT_LINE?}</td><td></td=
></tr><tr bgcolor=3D"__UI_C_INTBLOCKBAR__"><td nowrap valign=3Dcenter><img =
src=3D"bg.gif" height=3D19 width=3D3 align=3Dmiddle alt=3Dx>
+ {/NEXT_LINE?}{PAGE?}<A
+ HREF=3D"{HREF}"
+ style=3D"
+ {INDICATED?}color: __UI_C_TITLEBARTXT__; font-size: 10pt;{/INDICATED?}
+ {INDICATED:}color: __UI_C_TITLEBARCONT__; font-size: 10pt;{/INDICATED:}
+">{NAME}</A>{/PAGE?}{PAGE:}{NAME}{/PAGE:} [menu-foo=
ter]
+ </td>
+ <td align=3Dright><A HREF=3D"[area href=3D__UI_BASE__/menu_editor form=3D=
"qmenu_name=3D[scratch ui_class]"]"
+ style=3D"font-size: 7pt" class=3Dctitle>edit</A></td></TR>
+<tr bgcolor=3D"#000000"><td colspan=3D2><IMG SRC=3D"bg.gif" WIDTH=3D"1" HE=
IGHT=3D"1" alt=3Dx></td></tr></table>
+[/menu-footer][/menu]
<!-- ----- END MENUBAR ----- -->
[if scratch ui_checklist]
[include file=3Dinclude/wizard_checklist locale=3D"[scratch mv_locale]"]
2.4 +83 -18 interchange/lib/Vend/Menu.pm
rev 2.4, prev_rev 2.3
Index: Menu.pm
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/lib/Vend/Menu.pm,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -r2.3 -r2.4
--- Menu.pm 6 Aug 2002 22:08:04 -0000 2.3
+++ Menu.pm 7 Aug 2002 08:11:01 -0000 2.4
@@ -1,6 +1,6 @@
# Vend::Menu - Interchange payment processing routines
#
-# $Id: Menu.pm,v 2.3 2002/08/06 22:08:04 mheins Exp $
+# $Id: Menu.pm,v 2.4 2002/08/07 08:11:01 mheins Exp $
#
# Copyright (C) 2002 Mike Heins, <mike@perusion.net>
#
@@ -21,12 +21,56 @@
=20
package Vend::Menu;
=20
-$VERSION =3D substr(q$Revision: 2.3 $, 10);
+$VERSION =3D substr(q$Revision: 2.4 $, 10);
=20
use Vend::Util;
use strict;
=20
my %transform =3D (
+ nbsp =3D> sub {
+ my ($row, $fields) =3D @_;
+ return 1 if ref($fields) ne 'ARRAY';
+ for(@$fields) {
+ $row->{$_} =3D~ s/ / /g;
+ }
+ return 1;
+ },
+ localize =3D> sub {
+ my ($row, $fields) =3D @_;
+ return 1 if ref($fields) ne 'ARRAY';
+ for(@$fields) {
+ $row->{$_} =3D errmsg($row->{$_});
+ }
+ return 1;
+ },
+ inactive =3D> sub {
+ my ($row, $fields) =3D @_;
+ return 1 if ref($fields) ne 'ARRAY';
+ my $status =3D 1;
+ for(@$fields) {
+ if(s/^!\s*//) {
+ $status =3D $status && $row->{$_};
+ }
+ else {
+ $status =3D $status && ! $row->{$_};
+ }
+ }
+ return $status;
+ },
+ active =3D> sub {
+ my ($row, $fields) =3D @_;
+ return 1 if ref($fields) ne 'ARRAY';
+ my $status =3D 1;
+ for(@$fields) {
+ if(s/^!\s*//) {
+ $status =3D $status && ! $row->{$_};
+ }
+ else {
+ $status =3D $status && $row->{$_};
+ }
+ }
+ return $status;
+ },
ui_security =3D> sub {
my ($row, $fields) =3D @_;
return 1 if ref($fields) ne 'ARRAY';
@@ -75,6 +119,7 @@
return 1 if ref($fields) ne 'ARRAY';
my $status =3D 1;
for(@$fields) {
+ next if ! $row->{$_};
$status =3D $status && $CGI::values{$row->{$_}};
}
return $status;
@@ -92,14 +137,29 @@
my ($row, $fields) =3D @_;
return 1 if ref($fields) ne 'ARRAY';
for(@$fields) {
- my $indicator;
+ my ($indicator,$rev, $last, $status);
next unless $indicator =3D $row->{$_};
- my $rev =3D $indicator =3D~ s/^!\s*// ? 1 : 0;
- my $status =3D defined $CGI::values{$indicator}
- ? $CGI::values{$indicator}
- : $::Values->{$indicator};
- ($row->{indicated} =3D 1, next)
- if $rev xor $status;
+ $rev =3D $indicator =3D~ s/^\s*!\s*// ? 1 : 0;
+ $last =3D $indicator =3D~ s/\s*!\s*$// ? 1 : 0;
+ if($indicator =3D~ /^\s*([-\w.:]+)\s*$/) {
+ $status =3D $CGI::values{$1};
+#::logDebug("variable thing $indicator($1)") if $row->{debug};
+ }
+ elsif ($indicator =3D~ /^\s*`(.*)`\s*$/s) {
+#::logDebug("calc thing $1") if $row->{debug};
+ $status =3D Vend::Interpolate::tag_calc($1);
+ }
+ elsif ($indicator =3D~ /\[/s) {
+#::logDebug("ITL thing") if $row->{debug};
+ $status =3D interpolate_html($indicator);
+ $status =3D~ s/\s+//g;
+ }
+#::logDebug("indicator status=3D$status rev=3D$rev last=3D$last") if $row=
->{debug};
+ if($rev xor $status) {
+ $row->{indicated} =3D 1;
+ next unless $last;
+ }
+ last if $last;
$status =3D $Global::Variable->{MV_PAGE} eq $indicator;
($row->{indicated} =3D 1, next)
if $rev xor $status;
@@ -561,17 +621,22 @@
$row =3D \%line;
}
=20
+#::logDebug("here's a row: " . ::uneval($row)) if $row->{debug};
+
for(@{$opt->{_transform}}) {
+#::logDebug("doing $_ tranform") if $row->{debug};
return unless $transform{$_}->($row, $opt->{$_});
+#::logDebug("passed $_ tranform") if $row->{debug};
}
+#::logDebug("passed transforms, row now: " . ::uneval($row)) if $row->{de=
bug};
=20
- return '<br>' unless $row->{name};
- return $row->{name} if ! $row->{page} and $row->{name} =3D~ /^\s*</;
- $row->{win} =3D $::Scratch->{win};
- $row->{form} =3D~ tr/&/\n/;
- $row->{href} =3D Vend::Tags->area( { href =3D> $row->{page}, form =3D> $r=
ow->{form} });
- $row->{name} =3D errmsg($row->{name});
- $row->{description} =3D~ s/"/"/g;
+ #return $row->{name} if ! $row->{page} and $row->{name} =3D~ /^\s*</;
+ if($row->{page}) {
+ $row->{form} =3D~ tr/&/\n/;
+ $row->{href} =3D Vend::Tags->area( { href =3D> $row->{page}, form =3D> $=
row->{form} });
+ }
+ $row->{name} =3D errmsg($row->{name});
+ $row->{description} =3D~ s/"/"/g;
return Vend::Tags->uc_attr_list($row, $template);
}
=20
@@ -648,8 +713,8 @@
}
$opt->{file} .=3D "/$opt->{name}.txt";
}
- return old_simple(@_) unless $opt->{dhtml_browser};
- return dhtml_simple(@_);
+ return old_simple($name, $opt, $template) unless $opt->{dhtml_browser};
+ return dhtml_simple($name, $opt, $template);
}
else {
logError("unknown menu_type %s", $opt->{menu_type});