[interchange-cvs] interchange - heins modified 5 files

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Fri Oct 11 14:44:00 2002


User:      heins
Date:      2002-10-11 18:42:48 GMT
Modified:  dist/lib/UI/pages/admin db_metaconfig.html flex_select.html
Modified:           item.html regenerate.html
Added:     dist/lib/UI/pages/admin db_newview.html
Log:
* Add database table view creation facility.

* Implement custom sorting on flex_select and item.

* Start adding revision numbers to these pages.

Revision  Changes    Path
2.7       +22 -1     interchange/dist/lib/UI/pages/admin/db_metaconfig.html


rev 2.7, prev_rev 2.6
Index: db_metaconfig.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/db_metaconfig.html,v
retrieving revision 2.6
retrieving revision 2.7
diff -u -r2.6 -r2.7
--- db_metaconfig.html	27 Sep 2002 07:16:52 -0000	2.6
+++ db_metaconfig.html	11 Oct 2002 18:42:47 -0000	2.7
@@ -8,6 +8,16 @@
 	[tmp tmp_dbcode][cgi ui_table][/tmp]
 	[/else]
 	[/if]
+	 
+	 
+	 
+	 
+	 
+		[page href=3Dadmin/db_newview
+			  form=3D"
+				ui_table=3D[cgi ui_table]
+			  "]Create new view</A>
+
 [/tmp]
 [set ui_class]Admin[/set]
 @_UI_STD_HEAD_@
@@ -29,7 +39,6 @@
 	[bounce href=3D"[scratchd tmp_bpage]"]
 [/if]
=20
-
 [table-editor
 	table=3Dmv_metadata
 	view=3Ddbconfig
@@ -57,11 +66,14 @@
 		name
 		extended.file_upload
 		extended.tabbed
+		extended.ui_meta_specific
=20
 		=3DSelect page display
=20
 		height
 		extended.ui_sort_field
+		extended.ui_sort_option
+		extended.ui_sort_combined
 		extended.ui_show_fields
 		extended.ui_special_add
=20
@@ -134,11 +146,14 @@
 		'extended.tab_vert_offset'		=3D> 'Tab Vertical Offset',
 		'extended.tab_width'			=3D> 'Tab Width',
 		'extended.tabbed'				=3D> 'Use tabbed display',
+		'extended.ui_meta_specific'		=3D> 'Present item-specific meta for this t=
able',
 		'extended.table_width' =3D> 'Width specification for editor table',
 		'extended.ui_data_fields'		=3D> 'Fields to edit',
 		'extended.ui_display_only'		=3D> 'Fields for display only',
 		'extended.ui_show_fields'		=3D> 'Show on select page',
 		'extended.ui_sort_field'		=3D> 'Sort by on select page',
+		'extended.ui_sort_option'		=3D> 'Sort modifier for select page',
+		'extended.ui_sort_combined'		=3D> 'Complex sort for select page',
 		'extended.ui_special_add'		=3D> 'Special Additions',
 		'extended.link_table'			=3D> 'Table to link in cell',
 		'extended.link_before'			=3D> 'Column to appear before',
@@ -174,6 +189,7 @@
 		'extended.ui_data_fields'		=3D> 'Breaks can be embedded in the fields by=
 placing &quot;=3DTitle String&quot; on a line by itself and surrounding wi=
th blank lines.',
 		'extended.ui_display_only'		=3D> 'Will not be set, only shown.',
 		'extended.ui_special_add'		=3D> 'Only applies to certain pages (Items us=
es this)',
+		'extended.ui_sort_combined'		=3D> 'WARNING: overrides sort field and sor=
t option. Should contain a comma-separated list of sort fields, with possib=
le colon-separated modifiers. Example: <blockquote>price:r, description:f</=
blockquote>',
 	}`
=20
 	widget=3D`{
@@ -196,11 +212,14 @@
 		'extended.tab_vert_offset'		=3D> 'text_5',
 		'extended.tab_width'			=3D> 'text_5',
 		'extended.tabbed'				=3D> 'yesno',
+		'extended.ui_meta_specific'		=3D> 'yesno',
 		'extended.table_width'		    =3D> 'text_8',
 		'extended.ui_data_fields'		=3D> 'move_combo_8',
 		'extended.ui_display_only'		=3D> 'text_40',
 		'extended.ui_show_fields'		=3D> 'move_combo_8',
 		'extended.ui_sort_field'		=3D> 'select',
+		'extended.ui_sort_option'		=3D> 'multiple',
+		'extended.ui_sort_combined'		=3D> 'text_50',
 		'extended.bottom_buttons'		=3D> 'yesno',
 		'extended.link_table'			=3D> 'select',
 		'extended.link_before'			=3D> 'text_12',
@@ -213,6 +232,7 @@
=20
 	filter=3D`{
 		height							=3D> 'digits',
+		'extended.ui_sort_option'		=3D> 'null_to_space',
 		'extended.ui_special_add'		=3D> 'null_to_comma',
 		'extended.spread_meta' =3D> 'null_to_space',
 	}`
@@ -247,6 +267,7 @@
 		'extended.spread_textarea'		=3D> 'columns',
 		'extended.link_table'			=3D> 'tables',
 		'extended.link_before'			=3D> '',
+		'extended.ui_sort_option'		=3D> q{=3Dnone,n=3Dnumeric,r=3Dreverse,f=3Dca=
se-insensitive},
 		'extended.ui_special_add'		=3D> q{NONE,
 Qty price;pricing:q5:rn=3DQty price,
 Options;options:o_enable:r=3DOptions,



2.16      +14 -2     interchange/dist/lib/UI/pages/admin/flex_select.html


rev 2.16, prev_rev 2.15
Index: flex_select.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/flex_select.html,v
retrieving revision 2.15
retrieving revision 2.16
diff -u -r2.15 -r2.16
--- flex_select.html	9 Oct 2002 14:23:32 -0000	2.15
+++ flex_select.html	11 Oct 2002 18:42:47 -0000	2.16
@@ -1,3 +1,4 @@
+
 <!-- [if cgi mv_more_ip]
 [calc]
 	for( qw/
@@ -353,9 +354,17 @@
 	else {
 		$CGI->{ui_text_qualification} =3D "ra=3Dyes";
 	}
+
+	if($meta->{ui_sort_combined} =3D~ /\S/) {
+		$meta->{ui_sort_field} =3D $meta->{ui_sort_combined};
+		$meta->{ui_sort_option} =3D '';
+	}
+
 	$CGI->{ui_sort_field}	||=3D $meta->{ui_sort_field}
 							||  $meta->{lookup}
 							||  $Scratch->{keyname};
+	$CGI->{ui_sort_option}	||=3D $meta->{ui_sort_option};
+	$CGI->{ui_sort_option}	=3D~ s/[\0,\s]+//g;
 	$CGI->{ui_list_size} =3D $meta->{height}
 		if ! $CGI->{ui_list_size};
=20
@@ -426,7 +435,8 @@
 	return $out_message;
 [/perl]
 </FORM>
-[set tmp_ncols][/set]
+
+[tmpn tmp_ncols][/tmpn]
 <!-- tq: [scratch sparams] -->
 <TABLE __UI_T_PROPERTIES__>
 	<FORM ACTION=3D"[area href=3D"[either][cgi ui_searchpage][or]@@MV_PAGE@@[=
/either]"]" METHOD=3DGET>
@@ -460,6 +470,7 @@
 		<A HREF=3D"[area href=3D'__UI_BASE__/flex_group'
 						form=3D'
 							mv_data_table=3D[cgi mv_data_table]
+							ui_meta_view=3D[cgi ui_meta_view]
 							mv_arg=3D[loop-code]
 						'
 					]"><IMG ALT=3D"select by [loop-code]" SRC=3D"smindex.gif" BORDER=3D0>=
</A></TH>
@@ -491,6 +502,7 @@
 	[tmp tmp_url]
 		mv_data_table=3D[cgi mv_data_table]
 		ui_page_title=3D[cgi ui_page_title]
+		ui_meta_view=3D[cgi ui_meta_view]
 		ui_page_banner=3D[cgi ui_page_banner]
 		ui_meta_specific=3D[cgi ui_meta_specific]
 		[if cgi ui_return_to]
@@ -609,4 +621,4 @@
 [update values]
=20
 @_UI_STD_FOOTER_@
-<!-- page: @@MV_PAGE@@ -->
+<!-- page: @@MV_PAGE@@ Revision: $Id: flex_select.html,v 2.16 2002/10/11 1=
8:42:47 mheins Exp $ -->



2.12      +11 -2     interchange/dist/lib/UI/pages/admin/item.html


rev 2.12, prev_rev 2.11
Index: item.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/item.html,v
retrieving revision 2.11
retrieving revision 2.12
diff -u -r2.11 -r2.12
--- item.html	24 Sep 2002 01:37:29 -0000	2.11
+++ item.html	11 Oct 2002 18:42:47 -0000	2.12
@@ -14,6 +14,7 @@
 				form=3D'
 						 ui_return_to=3D__UI_BASE__/index
 						 ui_table=3D[cgi mv_data_table]
+						 ui_view=3Ditem_select
 						 start_at=3Dheight
 				'][L]Item editor[/L]</A>
 [/tmp]
@@ -221,15 +222,23 @@
 		$CGI->{ui_text_qualification} =3D "ra=3Dyes";
 	}
=20
+	if($meta->{ui_sort_combined} =3D~ /\S/) {
+		$meta->{ui_sort_field} =3D $meta->{ui_sort_combined};
+		$meta->{ui_sort_option} =3D '';
+	}
+
 	if ($CGI->{ui_sort_field}) {
 		$CGI->{changed_qual} =3D 1;
 		delete $Scratch->{item_special_sort};
 	}
-	elsif(! $Scratch->{ui_special_sort}) {
+	elsif(! $Scratch->{item_special_sort}) {
 		$CGI->{ui_sort_field}	||=3D $meta->{ui_sort_field}
 								||  $meta->{lookup}
 								||  $Scratch->{keyname};
+		$CGI->{ui_sort_option} ||=3D $meta->{ui_sort_option};
+		$CGI->{ui_sort_option}	=3D~ s/[\0,\s]+//g;
 	}
+
 	$CGI->{ui_list_size} =3D $meta->{height}
 		if ! $CGI->{ui_list_size};
 	$CGI->{ui_show_fields} ||=3D $meta->{ui_show_fields} || $meta->{field};
@@ -561,4 +570,4 @@
 <!-- ----- END REAL STUFF ----- -->
=20
 @_UI_STD_FOOTER_@
-<!-- page: @@MV_PAGE@@ -->
+<!-- page: @@MV_PAGE@@ Revision: $Id: item.html,v 2.12 2002/10/11 18:42:47=
 mheins Exp $ -->



2.5       +1 -0      interchange/dist/lib/UI/pages/admin/regenerate.html


rev 2.5, prev_rev 2.4
Index: regenerate.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/regenerate.html,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -r2.4 -r2.5
--- regenerate.html	18 Aug 2002 08:09:05 -0000	2.4
+++ regenerate.html	11 Oct 2002 18:42:47 -0000	2.5
@@ -58,6 +58,7 @@
 			$_ =3D '' if defined $check->{$test};
 		} while ($test =3D~ s:(.*)/.*:$1:);
 	}
+	@pages =3D grep length($_), @pages;
 	$Scratch->{pages} =3D join "\n", grep $_, @pages;
=20
     # Generated selection of forced pages



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


rev 2.1, prev_rev 2.0