[interchange-cvs] interchange - heins modified 3 files
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Sun Aug 11 20:38:01 2002
User: heins
Date: 2002-08-12 00:37:57 GMT
Modified: dist/lib/UI/pages/admin menu_editor.html
Modified: dist/lib/UI/pages/include/menus Admin.txt
Modified: dist/lib/UI/vars UI_STD_HEAD
Log:
* More improvements to menu edit subsystem
-- Edit links on menu bars
-- Uses 'icmenu' metadata by default
-- Adds help boxes for entries (showing contents and URL) and
widgets (from mv_metadata)
* Fix out-of-order Admin menu
Revision Changes Path
2.8 +79 -12 interchange/dist/lib/UI/pages/admin/menu_editor.html
rev 2.8, prev_rev 2.7
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.7
retrieving revision 2.8
diff -u -r2.7 -r2.8
--- menu_editor.html 7 Aug 2002 08:11:00 -0000 2.7
+++ menu_editor.html 12 Aug 2002 00:37:57 -0000 2.8
@@ -328,7 +328,12 @@
}
$Scratch->{qmenu_data} =3D $filedata;
$Scratch->{qmenu_name} =3D $mn;
- $menumeta =3D $Tag->meta_record("menu_editor::$mn");
+ my $mbase;
+ for $mbase ( $CGI->{ui_meta_view}, "menu_editor::$mn") {
+ $menumeta =3D $Tag->meta_record($mbase)
+ and $metabase =3D $mbase
+ and last;
+ }
}
=20
my %illegal;
@@ -425,7 +430,10 @@
var extended;
var extra =3D new Array;
var label =3D new Array;
+ var meta =3D new Array;
+ var help =3D new Array;
var widget =3D new Array;
+ var ltitle =3D new Array;
var emodes;
var evalues;
=20
@@ -433,11 +441,7 @@
my @out;
my $i =3D 0;
=20=09
- my $metabase;
- if($menumeta) {
- $metabase =3D $menumeta->{name};
- }
- $metabase ||=3D "menu_editor::$CGI->{qmenu_name}";
+ $metabase ||=3D 'icmenu';
for(@menufields) {
push @out, " var \U$_\E =3D $i;";
DOMETA: {
@@ -445,12 +449,32 @@
my $metaname =3D "${metabase}::$_";
my $mrecord =3D $Tag->meta_record($metaname)
or last DOMETA;
- if(my $lab =3D $mrecord->{label}) {
+ my $lab;
+ my $help;
+ if($lab =3D $mrecord->{label}) {
push @out, " label[$i] =3D " . $Tag->jsq($lab) . ';';
}
+ if($help =3D $mrecord->{help}) {
+ $help =3D '<span style=3D"font-size: 12pt;">' .
+ '<u>' . "$lab " . "($_)" . '</u><br>' . $help .
+ '</span>';
+ $help =3D $Tag->filter('encode_entities', $help);
+ push @out, " help[$i] =3D " . $Tag->jsq($help) . ';';
+ }
+ if( defined $Values->{ui_meta_force} && $Values->{ui_meta_force}
+ or $Variable->{UI_META_LINK}
+ )
+ {
+ my $u =3D $Tag->page({ href =3D> '__UI_BASE__/flex_editor',
+ form =3D> qq(
+ ui_meta_view=3Dmetaconfig
+ item_id=3D$metaname
+ ) });
+ push @out, " meta[$i] =3D " . $Tag->jsq($u . 'meta</a>');
+ }
if(my $type =3D $mrecord->{type}) {
$mrecord->{name} =3D "ext_$_";
- $mrecord->{extra} =3D qq{ onChange=3D"form_changed(1)"};
+ $mrecord->{extra} =3D qq{onChange=3D"form_changed(1)"};
my $wid =3D $Tag->display( {
meta =3D> $mrecord,
override =3D> 1,
@@ -784,6 +808,21 @@
return str;
}
=20
+ function show_title (idx, msg) {
+ var el =3D document.getElementById('titlebox');
+ if(el =3D=3D undefined)=20
+ return;
+ if(msg =3D=3D undefined)=20
+ msg =3D ltitle[idx];
+ if(idx =3D=3D 0 || msg.length =3D=3D 0) {
+ el.style.visibility =3D 'Hidden';
+ }
+ else {
+ el.innerHTML =3D msg;
+ el.style.visibility =3D 'Visible';
+ }
+ }
+
function set_mode (mode) {
if(mode =3D=3D 'toggle') {
if(tree_mode =3D=3D 0) {
@@ -904,6 +943,13 @@
out =3D out + 'src=3D"__UI_IMG__box_empty.gif" ';
}
=20
+ var linktitle =3D '';
+ var lzero =3D lines[0];
+ for(var k =3D 1; k < lzero.length; k++) {
+ var lstring =3D l[k] + '';
+ if(lstring.length > 0)
+ linktitle =3D linktitle + '<b>' + lzero[k] + ':</b> ' + lstring + "<b=
r>";
+ }
out =3D out + 'border=3D0 align=3Dabsbottom ' +
'id=3D"img' + idx + '"></A>' + "\n" +
'<a href=3D"javascript:motion(' + idx + ", 'up');void(0)" +
@@ -916,20 +962,26 @@
out =3D out + ' <a href=3D"javascript:loadForm(' +
idx + ');void(0)"' +
' onDblClick=3D"checkit(' + idx + ')"' +
+ ' onMouseOver=3D"show_title(' + idx + ')"' +
+ ' onMouseOut=3D"show_title(0)"' +
' title=3D"' + l[PAGE];
if(l[FORM])
out =3D out + '?' + l[FORM];
- if(l[DESCRIPTION])
- out =3D out + " : " + l[DESCRIPTION];
out =3D out + '">' + l[NAME] + '</a>';
}
else {
- out =3D out + '<b>' + l[NAME] + '</b>';
+ out =3D out + '<span style=3D"font-weight: bold"' +
+ ' onMouseOver=3D"show_title(' + idx + ')"' +
+ ' onMouseOut=3D"show_title(0)"' + '>'
+ l[NAME] + '</span>';
}
=20
if(l[MSG]) {
out =3D out + ' <i style=3D"font-size: 8pt;">(' + l[MSG] + ')</i>';
}
+
+ // Set box title array
+ ltitle[idx] =3D linktitle.replace(/\r/g, '<br>');
}
=20
var el =3D document.getElementById('box' + idx);
@@ -1542,6 +1594,18 @@
</td>
</tr>
</table>
+ <div id=3Dtitlebox style=3D"
+ position: Absolute;
+ Top: 300;
+ Left: 300;
+ border: 2pt gray solid;
+ background: #CCCCCC;
+ float: right;
+ Visibility: Hidden;
+ zAxis: 2;
+ ">
+ Test floatbox.
+ </div>
<table width=3D"95%">
<tr>
<td width=3D"40%" valign=3Dtop>[set empty][/set]
@@ -1691,6 +1755,9 @@
extra[nidx] =3D fn;
var lab =3D fn;
var wid;
+ var helptext =3D help[i];
+ if(helptext =3D=3D undefined)
+ helptext =3D '';
if(label[eidx] !=3D undefined) {
lab =3D label[eidx];
}
@@ -1701,7 +1768,7 @@
wid =3D [jsq]<input type=3Dtext name=3D"$nn" onChange=3D"form_changed=
(1);">[/jsq];
}
document.write([jsq]
- <tr>
+ <tr onMouseOver=3D"show_title(1, '$helptext')" onMouseOut=3D"show_title(=
0)">
<td class=3Dclabel>
$lab
</td>
1.2 +12 -12 interchange/dist/lib/UI/pages/include/menus/Admin.txt
rev 1.2, prev_rev 1.1
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
RCS file: /var/cvs/interchange/dist/lib/UI/pages/include/menus/Admin.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Admin.txt 7 Aug 2002 08:11:00 -0000 1.1
+++ Admin.txt 12 Aug 2002 00:37:57 -0000 1.2
@@ -1,22 +1,22 @@
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 de=
bug
+001 Admin x001 admin/genconfig Info 0=09=09=09=09=09=09=09=09
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_tabl=
e=3D[cgi mv_data_table] Search/Replace 0=09=09=09=09=09=09=09=09
+003 Admin x003 admin/ship Shipping 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_tab=
le} && return -1` admin/flex_select mv_data_table=3Dvariable&page_title=
=3DKnar%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=
=3Dmv_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
+008 Admin x008 admin/gentable Tables 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
+010 Admin x010 admin/test_code Test code 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
+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
+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
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
+016 Admin x016 no_dbmenu mv_data_table admin/search_replace mv_data_tabl=
e=3D[cgi mv_data_table] Search/Replace 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
+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
+019 Admin x019 no_dbmenu mv_data_table admin/gentable  =
; Re-select Table 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
+021 Admin x021 access_menu admin/group Groups 0=09=09=09=09=09=09=09=
=09
2.20 +22 -4 interchange/dist/lib/UI/vars/UI_STD_HEAD
rev 2.20, prev_rev 2.19
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.19
retrieving revision 2.20
diff -u -r2.19 -r2.20
--- UI_STD_HEAD 7 Aug 2002 08:11:01 -0000 2.19
+++ UI_STD_HEAD 12 Aug 2002 00:37:57 -0000 2.20
@@ -227,8 +227,16 @@
</div>
</td>
<td align=3Dright>
+ [if-mm super]
+ [if type=3Dexplicit compare=3D`
+ return $Values->{ui_meta_force}
+ if defined $Values->{ui_meta_force};
+ return $Variable->{UI_META_LINK};
+ `]
<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>
+ [/if]
+ [/if-mm]
</td>
</tr>
</table>
@@ -240,7 +248,6 @@
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">
@@ -258,9 +265,20 @@
{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>
+ </td><td align=3Dright>
+ [if-mm super]
+ [if type=3Dexplicit compare=3D`
+ if (defined $Values->{ui_meta_force}) {
+ return $Values->{ui_meta_force};
+ }
+ else {
+ return $Variable->{UI_META_LINK};
+ }
+ `]
+ <A HREF=3D"[area href=3D__UI_BASE__/menu_editor form=3D"qmenu_name=3D[scr=
atch ui_class]"]"
+ style=3D"font-size: 7pt" class=3Dctitle>edit</A>
+ [/if]
+ [/if-mm]</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 ----- -->