[interchange-cvs] interchange - heins modified 9 files

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Wed Aug 14 11:53:01 2002


User:      heins
Date:      2002-08-14 15:52:49 GMT
Modified:  dist/lib/UI ui.cfg
Modified:  dist/lib/UI/pages/admin customer_mailing.html
Modified:           import_table.html index.html login.html
Modified:           menu_editor.html
Modified:  dist/lib/UI/pages/admin/accounting return.html
Modified:  dist/lib/UI/pages/include wizard_checklist
Modified:  dist/lib/UI/vars UI_STD_HEAD
Log:
* Remove last vestiges of icmenu table from 4.9.

  -- Update index.html to use [menu ...]
  -- Update doomed wizard/* to use [menu]...
  -- Remove ugly exports of icmenu (can we do ichelp?)
  -- Update accounting menus to use [menu ...]
  -- icmenu keys will stay in mv_metadata.asc because they are used on
     the menu_editor page.

* Minor formatting fixes, add descriptions to menu items

Revision  Changes    Path
2.5       +1 -2      interchange/dist/lib/UI/ui.cfg


rev 2.5, prev_rev 2.4
Index: ui.cfg
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/ui.cfg,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -r2.4 -r2.5
--- ui.cfg	4 Feb 2002 03:13:35 -0000	2.4
+++ ui.cfg	14 Aug 2002 15:52:48 -0000	2.5
@@ -4,7 +4,6 @@
=20
 # Set the base for the UI pages
 Variable UI_BASE admin
-Variable UI_MENU_TABLE icmenu
 Variable UI_HELP_TABLE ichelp
 #Variable UI_HELP_URL   http://help.interchange.redhat.com/4.8
=20
@@ -12,7 +11,7 @@
 Variable UI_COUNTRY_TABLE country
=20
 # This one is MV because used internally as well
-Variable MV_OPTION_TABLE icmenu
+Variable MV_OPTION_TABLE options
=20
 Variable UI_STYLE <<EOV
=20



1.2       +1 -1      interchange/dist/lib/UI/pages/admin/customer_mailing.h=
tml


rev 1.2, prev_rev 1.1
Index: customer_mailing.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/customer_mailing.htm=
l,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- customer_mailing.html	14 Aug 2002 05:30:09 -0000	1.1
+++ customer_mailing.html	14 Aug 2002 15:52:48 -0000	1.2
@@ -200,7 +200,7 @@
 <tr>
 <td colspan=3D2>
 <TEXTAREA name=3Dmail_template cols=3D80 rows=3D15>[value name=3Dmail_temp=
late filter=3Dentities]</textarea>
-</p>
+<br>
 		<b><u>Mailing List</u>:</b><br>
 [display default=3D"[cgi target_list]" name=3Dtarget_list type=3Dselect op=
tions=3D"[scratch mail_list_options]"]
=20



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


rev 2.4, prev_rev 2.3
Index: import_table.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/import_table.html,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -r2.3 -r2.4
--- import_table.html	24 May 2002 20:56:58 -0000	2.3
+++ import_table.html	14 Aug 2002 15:52:48 -0000	2.4
@@ -1,4 +1,4 @@
-[if-mm super][flag type=3Dwrite table=3D"icmenu ichelp"][/if-mm]
+[if-mm super][flag type=3Dwrite table=3D"ichelp"][/if-mm]
 [set page_title][L]Table Import[/L][/set]
 [set table_perm]=3Di[/set]
 [set help_name]import.main[/set]



2.5       +11 -26    interchange/dist/lib/UI/pages/admin/index.html


rev 2.5, prev_rev 2.4
Index: index.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/index.html,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -r2.4 -r2.5
--- index.html	2 Aug 2002 18:57:08 -0000	2.4
+++ index.html	14 Aug 2002 15:52:48 -0000	2.5
@@ -1,5 +1,4 @@
 [if !global Windows]
-[index table=3Dicmenu export_only=3D1]
 [index table=3Dichelp export_only=3D1]
 [/if]
 [strip interpolate=3D1]
@@ -111,46 +110,32 @@
 	return $out;
 [/calc]
=20
-[loop
-	  prefix=3Dam
-	  ignore-undefined=3D1
-	  search=3D"
-	  	fi=3Dicmenu
-		st=3Ddb
-		co=3Dyes
-
-		sf=3Dmgroup
-		se=3DTop
-		op=3Deq
-
-		tf=3Dmsort
-		rf=3D*
-	  "
+[menu
+	  name=3DTop
+	  inactive=3Dinactive
+	  localize=3Dname,description
+	  ui_security=3Ddepends_on
 	  lr=3D1]
-	  [if-am-param !inactive]
-	  [if-mm advanced [am-param depends_on]]
 <tr>
 <td valign=3D"top">
-	  [if-am-param img_icon]
-<img src=3D"[am-param img_icon]">
-	  [/if-am-param]
+	  {IMG_ICON?}
+<img src=3D"{IMG_ICON}">
+	  {/IMG_ICON?}
 </td>
 <td valign=3D"top">
 <b>
 <font face=3D"Arial, Helvetica, sans-serif">
-&nbsp;<a href=3D"[area href=3D'[am-param page]' form=3D'[am-param form]']"=
>[loc][am-param name][/loc]</a></font>
+&nbsp;<a href=3D"{HREF}">{NAME}</a></font>
 </b>
 </font>
 </td>
 <td valign=3D"top">
 <font face=3D"Arial, Helvetica, sans-serif">
-[loc][am-param special][am-param description][/loc]
+{DESCRIPTION}
 </font>
 </td>
 </tr>
-	[/if-mm]
-	[/if-am-param]
-[/loop]
+[/menu]
=20
 </table>
 </div>



2.4       +0 -1      interchange/dist/lib/UI/pages/admin/login.html


rev 2.4, prev_rev 2.3
Index: login.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/login.html,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -r2.3 -r2.4
--- login.html	5 Feb 2002 20:57:04 -0000	2.3
+++ login.html	14 Aug 2002 15:52:48 -0000	2.4
@@ -9,7 +9,6 @@
 	[/if]
 [/if]
 [if !global Windows]
-[index table=3Dicmenu export_only=3D1]
 [index table=3Dichelp export_only=3D1]
 [/if]
 [set mv_no_count][/set]



2.11      +1 -1      interchange/dist/lib/UI/pages/admin/menu_editor.html


rev 2.11, prev_rev 2.10
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.10
retrieving revision 2.11
diff -u -r2.10 -r2.11
--- menu_editor.html	12 Aug 2002 16:16:18 -0000	2.10
+++ menu_editor.html	14 Aug 2002 15:52:48 -0000	2.11
@@ -1616,7 +1616,7 @@
 						overflow: auto;
 						border: 1pt gray shaded;
 						">
-[loop head-skip=3D1 lr=3D1 list=3D"[scratch qmenu_data]"][list]<div id=3Db=
ox[loop-increment] style=3D"font-size: 11pt; width=3D300px;"></div>
+[loop head-skip=3D1 lr=3D1 list=3D"[scratch qmenu_data]"][list]<div id=3Db=
ox[loop-increment] style=3D"font-size: 11pt; width=3D300px; [loop-alternate=
 2]Background: #EEEEEE;[/loop-alternate]"></div>
 [/list][no-match][set empty]1[/set][/no-match]
 [/loop]
 [loop ranges=3D1 list=3D"[scratch lastfull]..[scratch loopinc]"]<div id=3D=
box[loop-code] style=3D"font-size: 11pt; width=3D300px;">[loop-change 1]



1.2       +8 -30     interchange/dist/lib/UI/pages/admin/accounting/return.=
html


rev 1.2, prev_rev 1.1
Index: return.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/accounting/return.ht=
ml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- return.html	3 Aug 2002 19:41:43 -0000	1.1
+++ return.html	14 Aug 2002 15:52:49 -0000	1.2
@@ -70,44 +70,22 @@
 <hr noshade size=3D1>
=20
 <A href=3D"[area __UI_BASE__/index]" target=3D"_top"><b>Interchange Menu</=
b></A>
-<p>
 <font size=3D2 face=3D"Verdana,Arial,Helvetica,sans-serif">
-
-[loop
-	  prefix=3Dam
-	  search=3D"
-	  	fi=3Dicmenu
-		st=3Ddb
-		co=3Dyes
-
-		sf=3Dmgroup
-		se=3Dacc_Other
-		op=3Deq
-
-		tf=3Dmsort
-		rf=3D*
-	  "
-	  lr=3D1]
-	[if-am-param !inactive]
-	[if-mm advanced [am-param depends_on]]
-	  [if-am-param page]
-&nbsp;&nbsp;&nbsp;<a href=3D"[area href=3D'[am-param page]' form=3D'[am-pa=
ram form]']">[loc][am-param name][/loc]</a><br>
-	  [/if-am-param]
-	  [if-am-param !page]
-<b>[am-param name]</b><br>
-	  [/if-am-param]
-	[/if-mm]
-	[/if-am-param]
-[/loop]
+<br>
+[menu
+	  name=3DTop
+	  inactive=3Dinactive
+	  ui_security=3Ddepends_on
+	  localize=3Dname,description
+	  ][/menu]
 </font>
-
                 </TD>
         </TR>
 </TABLE>
 </td></tr></table>
 </center>
 </div>
-<div align=3D"center"><a href=3D"javascript:self.window.close()">&#91;[L]c=
lose[/L]]</a></div>
+<div align=3D"center"><a target=3D"_top" href=3D"[area __UI_BASE__/index]"=
>&#91;[L]close[/L]]</a></div>
 </BODY>
 </HTML>
=20



2.4       +43 -57    interchange/dist/lib/UI/pages/include/wizard_checklist


rev 2.4, prev_rev 2.3
Index: wizard_checklist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/wizard_checklist,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -r2.3 -r2.4
--- wizard_checklist	17 Apr 2002 17:55:49 -0000	2.3
+++ wizard_checklist	14 Aug 2002 15:52:49 -0000	2.4
@@ -5,6 +5,8 @@
=20
 [include include/wizard_profiles]
=20
+[tmpn wiz_img][/tmpn]
+[tmpn wiz_bg][/tmpn]
 <table border=3D0 cellspacing=3D0 cellpadding=3D7>
 <tr>
 <td width=3D"215" valign=3Dtop>
@@ -12,65 +14,49 @@
 	<tr>
 	<td bgcolor=3D"#000000" valign=3Dtop>
 		<table border=3D0 cellspacing=3D0 cellpadding=3D1 bgcolor=3Dwhite>
-[loop search=3D"
-	fi=3D@_UI_MENU_TABLE_@
-	se=3DWizard
-	sf=3Dmgroup
-	co=3Dyes
-	op=3Deq
-	tf=3Dmsort
-	rf=3Dpage,name,indicator,next_line,help_name,form
-"]
-[loop-sub fig_box]
-	shift;
-	my ($page, $name, $indicator, $next_line, $help_name, $form) =3D @{shift =
|| []};
-	my $current =3D q{@@MV_PAGE@@};
-=09
-	my $complete =3D $Tag->run_profile($indicator);
-
-	my $bgcolor;
-	my $img =3D 'box_empty.gif';
-	if($current =3D~ /^$page/) {
-		$bgcolor =3D '#99CCFF';
-	}
-	if ($complete) {
-		$bgcolor =3D '#CCCCCC' unless $bgcolor;
-		$img =3D 'box_checked.gif';
-	}
-	else {
-		$bgcolor =3D '#FFFFFF' unless $bgcolor;
-	}
-
-	$form =3D~ s/\&/\n/g;
-	$name =3D errmsg($name);
-	my $url =3D $Tag->area({
-						href =3D> $page,
-						form =3D> qq{
-					  		page_title=3D$name
-					  		help_name=3D$help_name
-							$form
-						},
-					});
-	if($next_line) {
-		return <<EOF;
-<tr>
-	<td bgcolor=3D"$bgcolor" width=3D"1%">&nbsp;</td>
-	<td bgcolor=3D"$bgcolor"><img src=3D"$img" width=3D"15" height=3D"15" alt=
=3D"" border=3D"0"></td>
-	<td bgcolor=3D"$bgcolor" width=3D"98%"><a href=3D"$url" class=3D"flowchar=
t"><font size=3D-1>$name</a></td>
+[menu
+	name=3DWizard
+	localize=3Dname
+	reparse=3D1
+	indicator_profile=3Dindicator
+	]
+{INDICATED?}
+	[set wiz_img]box_checked.gif[/set]
+	[set wiz_bg]#CCCCCC[/set]
+{/INDICATED?}
+{INDICATED:}
+	[set wiz_img]box_empty.gif[/set]
+	[set wiz_bg]#FFFFFF[/set]
+{/INDICATED:}
+{NEXT_LINE?}
+<tr bgcolor=3D"[scratch wiz_bg]">
+	<td width=3D"1%">&nbsp;</td>
+	<td><img src=3D"[scratch wiz_img]" width=3D"15" height=3D"15" alt=3D"" bo=
rder=3D"0"></td>
+	<td width=3D"98%"><a href=3D"[area
+								href=3D"{PAGE}"
+								form=3D"
+									page_title=3D{NAME}
+									help_name=3D{HELP_NAME}
+									{FORM}
+								"
+							]" class=3D"flowchart"><font size=3D-1>{NAME}</a></td>
 </tr>
-EOF
-	}
-	else {
-		return <<EOF;
-<tr>
-	<td bgcolor=3D"$bgcolor"><img src=3D"$img" width=3D"15" height=3D"15" alt=
=3D"" border=3D"0"></td>
-	<td bgcolor=3D"$bgcolor" width=3D"98%" colspan=3D2><a href=3D"$url" class=
=3D"flowchart"><font size=3D-1>$name</a></td>
+{/NEXT_LINE?}
+{NEXT_LINE:}
+<tr bgcolor=3D"[scratch wiz_bg]">
+	<td><img src=3D"[scratch wiz_img]" width=3D"15" height=3D"15" alt=3D"" bo=
rder=3D"0"></td>
+	<td width=3D"98%" colspan=3D2><a href=3D"[area
+											href=3D"{PAGE}"
+											form=3D"
+												page_title=3D{NAME}
+												help_name=3D{HELP_NAME}
+												{FORM}
+											"
+										]"
+								class=3D"flowchart"><font size=3D-1>{NAME}</a></td>
 </tr>
-EOF
-	}
-[/loop-sub]
-[loop-exec fig_box][/loop-exec]
-[/loop]
+{/NEXT_LINE:}
+[/menu]
 	</table>
 	</td>
 	</tr>



2.22      +4 -2      interchange/dist/lib/UI/vars/UI_STD_HEAD


rev 2.22, prev_rev 2.21
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.21
retrieving revision 2.22
diff -u -r2.21 -r2.22
--- UI_STD_HEAD	12 Aug 2002 16:16:18 -0000	2.21
+++ UI_STD_HEAD	14 Aug 2002 15:52:49 -0000	2.22
@@ -219,15 +219,16 @@
 	  localize=3Dname
 	  indicator=3Dindicator
 	  ui_security=3Ddepends_on
+	  entities=3Ddescription
 	  lr=3D1]
 	  {IMG_DN?}
 	  	<!-- class=3D{NAME} -->
 	  <a href=3D"{HREF}"
-	  		onMouseOut=3D"MM_swapImgRestore()"
+	  		onMouseOut=3D"MM_swapImgRestore()" title=3D"{DESCRIPTION}"
 			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>
+		  <a href=3D"{HREF}" class=3Dctitle title=3D"{DESCRIPTION}">{NAME}</a>
 	  {/IMG_DN:}
 	  [/menu]
 	  <img src=3D"B10.gif" width=3D"17" height=3D"19" alt=3Dline>&nbsp;&nbsp;=
&nbsp;
@@ -251,6 +252,7 @@
 	localize=3Dname
 	indicator=3Dindicator,page
 	inactive=3Dinactive
+	entities=3Ddescription
 	nbsp=3Dname
 ][menu-header]
 <table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">