[interchange-cvs] interchange - heins modified 9 files

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Thu Nov 7 14:16:01 2002


User:      heins
Date:      2002-11-07 19:15:55 GMT
Modified:  .        MANIFEST
Modified:  dist/foundation/products mv_metadata.asc variable.txt
Modified:  dist/lib/UI/pages/admin db_metaconfig.html item_edit.html
Modified:           meta_editor.html
Added:     dist/lib/UI/pages/admin quick_question.html
Added:     share/interchange/en_US meta.png specmeta.png
Log:
* Add some key-checking stuff for "clone item" and "new item", to warn
  against overwrite of existing product. This is all in metadata.

* Add images for meta links.

* Add "quick_question" page, which allows using an iframe to return
  answers to things inline.

Revision  Changes    Path
2.71      +4 -0      interchange/MANIFEST


rev 2.71, prev_rev 2.70
Index: MANIFEST
===================================================================
RCS file: /var/cvs/interchange/MANIFEST,v
retrieving revision 2.70
retrieving revision 2.71
diff -u -r2.70 -r2.71
--- MANIFEST	17 Oct 2002 04:46:23 -0000	2.70
+++ MANIFEST	7 Nov 2002 19:15:54 -0000	2.71
@@ -991,6 +991,7 @@
 dist/lib/UI/pages/admin/payment.html
 dist/lib/UI/pages/admin/pref_colors.html
 dist/lib/UI/pages/admin/preferences.html
+dist/lib/UI/pages/admin/quick_question.html
 dist/lib/UI/pages/admin/quicklinks.html
 dist/lib/UI/pages/admin/reconfig.html
 dist/lib/UI/pages/admin/regen.html
@@ -1127,6 +1128,7 @@
 eg/globalsub/ccvs
 eg/globalsub/signio
 eg/globalsub/test_card
+eg/gpg_display
 eg/grant.sql
 eg/ifdef
 eg/news_feature/README
@@ -1275,6 +1277,7 @@
 share/interchange/en_US/index.gif
 share/interchange/en_US/layout.gif
 share/interchange/en_US/left.gif
+share/interchange/en_US/meta.png
 share/interchange/en_US/plus.gif
 share/interchange/en_US/poweredby.gif
 share/interchange/en_US/right.gif
@@ -1284,6 +1287,7 @@
 share/interchange/en_US/spacer3.gif
 share/interchange/en_US/spacer4.gif
 share/interchange/en_US/spacer_tall.gif
+share/interchange/en_US/specmeta.png
 share/interchange/en_US/tab_dark_left.gif
 share/interchange/en_US/tab_dark_right.gif
 share/interchange/en_US/tab_light_left.gif



2.22      +2 -2      interchange/dist/foundation/products/mv_metadata.asc


rev 2.22, prev_rev 2.21
Index: mv_metadata.asc
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/products/mv_metadata.asc,v
retrieving revision 2.21
retrieving revision 2.22
diff -u -r2.21 -r2.22
--- mv_metadata.asc	26 Oct 2002 16:48:19 -0000	2.21
+++ mv_metadata.asc	7 Nov 2002 19:15:54 -0000	2.22
@@ -175,7 +175,7 @@
 pricing	text					Pricing Settings	2														
 pricing::price_group	combo				pricing					Discount group		price_group	nullselect								
 pricing::q3	text																				
-products	text		50			Product information	Qty price;pricing:q5:rn,Options;options:o_enable:r,Promo;merchandising:featured:r,Inventory;inventory:quantity:rn														{'bottom_buttons' => "",'spread_textarea' => "",'tab_vert_offset' => "",'panel_height' => "700",'widget_cell_class' => "cwidget",'help_cell_class' => "chelp",'ui_sort_field' => "",'spacer_row_class' => "rspacer",'ui_show_fields' => "sku
description(30.)
prod_group
category
price(%.2f align=right)",'break_row_class' => "rmarq",'ui_data_fields' => "
=General

sku
description
prod_group
category
comment

=Pricing

price
wholesale

=Images

image
thumb
image_large

=Shipping/Tax/Other

weight
gift_cert
nontaxable",'label_cell_class' => "clabel",'tab_horiz_offset' => "",'file_upload' => "1",'spread_width' => "8",'tabbed' => "1",'spread_height' => "25",'ui_special_add' => "Qty price;pricing:q5:rn,Options;options:o_enable:r,Promo;merchandising:featured:r,Inventory;inventory:quantity:rn",'left_width' => "20%",'top_buttons' => "",'combo_row_class' => "",'spread_fields' => "sku
description
price
comment
nontaxable",'spread_textarea_rows' => "4",'table_width' => "800",'tab_height' => "",'panel_width' => "800",'spread_meta' => "comment nontaxable",'data_cell_class' => "cdata",'tab_width' => "120",'data_row_class' => "rnorm",}
+products	text		50			Product information	Qty price;pricing:q5:rn,Options;options:o_enable:r,Promo;merchandising:featured:r,Inventory;inventory:quantity:rn														{'bottom_buttons' => "",'tab_vert_offset' => "",'spread_textarea' => "",'include_form_expand' => "",'restrict_allow' => "area",'widget_cell_class' => "cwidget",'ui_sort_field' => "",'link_table' => "",'ui_show_fields' => "sku
description(30.)
prod_group
category
price(%.2f align=right)",'link_extra' => "",'break_row_class' => "rmarq",'label_cell_class' => "clabel",'tab_horiz_offset' => "",'link_before' => "",'ui_special_add' => "Qty price;pricing:q5:rn,Options;options:o_enable:r,Promo;merchandising:featured:r,Inventory;inventory:quantity:rn",'left_width' => "20%",'top_buttons' => "",'include_before' => "",'combo_row_class' => "rnorm",'spread_fields' => "sku
description
price
comment
nontaxable",'ui_meta_specific' => "",'tab_height' => "",'link_view' => "",'link_fields' => "",'spread_meta' => "comment nontaxable",'data_row_class' => "rnorm",'tab_width' => "120",'ui_sort_option' => "",'panel_height' => "700",'include_form' => "",'help_cell_class' => "chelp",'spacer_row_class' => "rspacer",'ui_sort_combined' => "",'ui_data_fields' => "=General

sku
description
prod_group
category
comment

=Pricing

price
wholesale

=Images

image
thumb
image_large

=Shipping/Tax/Other

weight
gift_cert
nontaxable",'file_upload' => "1",'spread_width' => "8",'tabbed' => "1",'spread_height' => "25",'include_form_interpolate' => "",'table_width' => "800",'spread_textarea_rows' => "4",'link_sort' => "",'panel_width' => "800",'link_key' => "",'data_cell_class' => "cdata",'view_from' => "",'link_label' => "",}
 products::artist	text	30								Artist											
 products::category	combo	20	1		products					Category	Enter in box for new category.	category	nullselect		nullselect						
 products::color	textarea	70	2																		
@@ -190,7 +190,7 @@
 products::related	multiple	5		sku	products					Related items	space-separated SKUs										
 products::sale_price	text	12								Sale Price											
 products::size__MVC_FIELDMUNGE__	textarea	70	2																		
-products::sku	text									SKU											
+products::sku	text									SKU								<script>
    function poke_iframe (value) {
        var term = 'products::sku::';
        term += value;
        var url = '[area href=admin/quick_question
                         form="
                            type=data
                            style=padding: 0; font-size: 10pt
                            yes=Key exists!
                            yes_style=color: red
                            no=Key is available
                         "]';
        url += '&term=' + term;
        var el = document.getElementById('the');
        el.src = url;
        el.load();
    }
</script>


<iframe frameborder=0 height=24 width=200 id=the src="[area
                        href=admin/quick_question
                        form="
                            type=data
                            term=products::sku::[cgi item_id]
                            style=padding: 0; font-size: 10pt
                            yes=Key exists!                            
                            yes_style=color: red
                            no=Key is available
                        "]">
Verify that SKU is unique!
</iframe>
			{ extra => 'onChange="poke_iframe(this.value)" '}
 products::thumb	imagehelper	30					images/thumb			Thumb			nullselect				[var SAMPLEURL]	<A HREF="admin/upload_file?ui_image_preview=[var IMAGE_DIR]/thumb/_UI_VALUE_&ui_upload_binary=1&ui_upload_backup=0&mv_arg=images/thumb/_UI_VALUE_&ui_start_dir=items&ui_return_to=admin/item_edit&ui_return_to=item_id=_UI_KEY_&ui_preload=_UI_TABLE_:_UI_COLUMN_">upload..</A>			
 products::title	text	30								Title			namecase								
 products::weight	text	4								Weight in pounds			digits_dot								



2.17      +2 -0      interchange/dist/foundation/products/variable.txt


rev 2.17, prev_rev 2.16
Index: variable.txt
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/products/variable.txt,v
retrieving revision 2.16
retrieving revision 2.17
diff -u -r2.16 -r2.17
--- variable.txt	17 Oct 2002 04:46:23 -0000	2.16
+++ variable.txt	7 Nov 2002 19:15:54 -0000	2.17
@@ -100,10 +100,12 @@
 UI_ABOUT_NORMAL_URL	http://www.icdevgroup.org/	Admin layout
 UI_ADMIN_TABLES	mv_metadata locale variable dict ichelp route access	Admin control
 UI_BOTTOMIMG	poweredby.gif	Admin layout
+UI_CLONE_TABLES	products* pricing* inventory merchandising options:sku	Item display
 UI_COMPONENT_DIR	templates/components	Directories and Paths
 UI_HELP_HEIGHT	480	Admin layout
 UI_HELP_WIDTH	650	Admin layout
 UI_IMAGE_DIR	__MVC_SHAREURL__/interchange/	Admin control
+UI_ITEM_TABLES	products pricing inventory merchandising options:sku	Item display
 UI_IMAGE_DIR_SECURE	__MVC_SHAREURL__/interchange/	Admin control
 UI_META_LINK	1	Admin control
 UI_PAGE_DIR	pages	Directories and Paths



2.10      +4 -1      interchange/dist/lib/UI/pages/admin/db_metaconfig.html


rev 2.10, prev_rev 2.9
Index: db_metaconfig.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/db_metaconfig.html,v
retrieving revision 2.9
retrieving revision 2.10
diff -u -r2.9 -r2.10
--- db_metaconfig.html	27 Oct 2002 05:09:39 -0000	2.9
+++ db_metaconfig.html	7 Nov 2002 19:15:54 -0000	2.10
@@ -68,6 +68,7 @@
 		extended.file_upload
 		extended.tabbed
 		extended.ui_meta_specific
+		extended.restrict_allow
 
 		=Select page display
 
@@ -139,6 +140,7 @@
 		name							=> 'Description',
 		height							=> 'Rows on select page',
 		'extended.bottom_buttons'		=> 'Buttons only on bottom',
+		'extended.restrict_allow'		=> 'Allow these ITL tags',
 		'extended.file_upload'		=> 'Allow file upload for this table',
 		'extended.left_width' => 'Width specification for label column',
 		'extended.panel_height'			=> 'Panel Height',
@@ -208,6 +210,7 @@
 		code							=> 'text_40',
 		name							=> 'text_40',
 		height							=> 'text_5',
+		'extended.restrict_allow'		=> 'text_40',
 		'extended.file_upload'			=> 'yesno',
 		'extended.left_width'			=> 'text_8',
 		'extended.panel_height'			=> 'text_5',
@@ -305,4 +308,4 @@
 
 ]
 @_UI_STD_FOOTER_@
-<!-- page: @@MV_PAGE@@ version: $Id: db_metaconfig.html,v 2.9 2002/10/27 05:09:39 mheins Exp $ -->
+<!-- page: @@MV_PAGE@@ version: $Revision: 2.10 $ -->



2.4       +11 -7     interchange/dist/lib/UI/pages/admin/item_edit.html


rev 2.4, prev_rev 2.3
Index: item_edit.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/item_edit.html,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -r2.3 -r2.4
--- item_edit.html	24 Sep 2002 01:37:29 -0000	2.3
+++ item_edit.html	7 Nov 2002 19:15:55 -0000	2.4
@@ -19,11 +19,6 @@
 	[/loop]
 	[perl tables="[cgi mv_data_table]"]
 		my $db = $Db{$CGI->{mv_data_table}} or return;
-		unless ($db->config('AUTO_SEQUENCE')) {
-			$db->config('AUTO_NUMBER', '000001')
-				unless $db->config('AUTO_NUMBER');
-			$CGI->{item_id} = $db->autonumber();
-		}
 		if ($CGI->{ui_clone_id}) {
 			$CGI->{ui_clone_tables} = '__UI_CLONE_TABLES__' || '__UI_ITEM_TABLES__';
 			my $db = $Db{$CGI->{mv_data_table}} or return;
@@ -42,6 +37,15 @@
 [set help_name]edit.item[/set]
 [set icon_name]icon_item.gif[/set]
 
+[tmp edit_item_msg]
+[if cgi ui_new_item]
+	[msg]New item[/msg]
+[else]
+	[msg arg.0="<B>[cgi item_id]</B>"]edit item %s[/msg]
+[/else]
+[/if]
+[/tmp]
+
 [if-mm super]
 [tmp page_banner][page href="__UI_BASE__/db_metaconfig"
 				 form='
@@ -50,7 +54,7 @@
 				 ui_return_to=__UI_BASE__/item
 				 mv_return_table=[cgi mv_data_table]
 				 start_at=extended.ui_data_fields
-		 '][L]Item editor[/L]</A> [msg arg.0="<B>[cgi item_id]</B>"]edit item %s[/msg]
+		 '][L]Item editor[/L]</A> [scratch edit_item_msg]
 [/tmp]
 [else]
 [tmp page_banner][L]Item editor[/L]: [msg arg.0="<B>[cgi item_id]</B>"]edit item %s[/msg][/tmp]
@@ -76,4 +80,4 @@
 [/if-mm]
 
 @_UI_STD_FOOTER_@
-<!-- page: @@MV_PAGE@@ -->
+<!-- page: @@MV_PAGE@@ version: $Revision: 2.4 $ -->



2.4       +2 -1      interchange/dist/lib/UI/pages/admin/meta_editor.html


rev 2.4, prev_rev 2.3
Index: meta_editor.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/meta_editor.html,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -r2.3 -r2.4
--- meta_editor.html	27 Oct 2002 05:09:39 -0000	2.3
+++ meta_editor.html	7 Nov 2002 19:15:55 -0000	2.4
@@ -109,6 +109,7 @@
 
 	   extended
 	"
+	widget.extended="textarea_5_50"
 	tabbed=1
 	panel_width=800
 	panel_height=700
@@ -116,4 +117,4 @@
 	][/table-editor]
 
 @_UI_STD_FOOTER_@
-<!-- page: @@MV_PAGE@@ version: $Id: meta_editor.html,v 2.3 2002/10/27 05:09:39 mheins Exp $ -->
+<!-- page: @@MV_PAGE@@ version: $Revision: 2.4 $ -->



2.1                  interchange/dist/lib/UI/pages/admin/quick_question.html


rev 2.1, prev_rev 2.0



1.1                  interchange/share/interchange/en_US/meta.png


<<meta.png: PNG image data, 16 x 16, 8-bit gray+alpha, non-interlaced>>


1.1                  interchange/share/interchange/en_US/specmeta.png


<<specmeta.png: PNG image data, 20 x 16, 8-bit/color RGBA, non-interlaced>>