[interchange-cvs] interchange - heins modified 117 files
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Fri Sep 13 16:59:01 2002
User: heins
Date: 2002-09-13 20:46:21 GMT
Modified: . MANIFEST
Modified: code/UI_Tag auto_wizard.coretag content_info.coretag
Modified: file_navigator.coretag table_editor_tpl.coretag
Modified: code/UserTag component.tag
Modified: dist/foundation catalog.cfg
Modified: dist/foundation/html index.html
Modified: dist/foundation/templates leftonly leftright noleft
Modified: dist/foundation/templates/blueyellow/regions
Modified: CATTOP_LEFTONLY_BOTTOM CATTOP_LEFTONLY_TOP
Modified: CATTOP_LEFTRIGHT_BOTTOM CATTOP_LEFTRIGHT_TOP
Modified: CATTOP_NOLEFT_BOTTOM CATTOP_NOLEFT_TOP
Modified: LEFTONLY_BOTTOM LEFTONLY_TOP LEFTRIGHT_BOTTOM
Modified: LEFTRIGHT_TOP NOLEFT_BOTTOM NOLEFT_TOP
Modified: dist/foundation/templates/components affiliate_receptor best
Modified: cart cart_display cart_tiny category_horizontal
Modified: category_vert_toggle category_vertical cross
Modified: fortune product_flyout product_tree promo random
Modified: saved_carts_list_small search_box_small
Modified: search_box_small_top upsell
Modified: dist/foundation/templates/fixedwidth/regions
Modified: CATTOP_LEFTONLY_BOTTOM CATTOP_LEFTONLY_TOP
Modified: CATTOP_LEFTRIGHT_BOTTOM CATTOP_LEFTRIGHT_TOP
Modified: CATTOP_NOLEFT_BOTTOM CATTOP_NOLEFT_TOP
Modified: LEFTONLY_BOTTOM LEFTONLY_TOP LEFTRIGHT_BOTTOM
Modified: LEFTRIGHT_TOP NOLEFT_BOTTOM NOLEFT_TOP
Modified: dist/foundation/templates/foundation/regions LEFTONLY_BOTTOM
Modified: LEFTONLY_TOP LEFTRIGHT_BOTTOM LEFTRIGHT_TOP
Modified: NOLEFT_BOTTOM NOLEFT_TOP
Modified: dist/foundation/templates/grayorange/regions
Modified: CATTOP_LEFTONLY_BOTTOM CATTOP_LEFTONLY_TOP
Modified: CATTOP_LEFTRIGHT_BOTTOM CATTOP_LEFTRIGHT_TOP
Modified: CATTOP_NOLEFT_BOTTOM CATTOP_NOLEFT_TOP
Modified: LEFTONLY_BOTTOM LEFTONLY_TOP LEFTRIGHT_BOTTOM
Modified: LEFTRIGHT_TOP NOLEFT_BOTTOM NOLEFT_TOP
Modified: dist/foundation/templates/grayscale/regions
Modified: CATTOP_LEFTONLY_BOTTOM CATTOP_LEFTONLY_TOP
Modified: CATTOP_LEFTRIGHT_BOTTOM CATTOP_LEFTRIGHT_TOP
Modified: CATTOP_NOLEFT_BOTTOM CATTOP_NOLEFT_TOP
Modified: LEFTONLY_BOTTOM LEFTONLY_TOP LEFTRIGHT_BOTTOM
Modified: LEFTRIGHT_TOP NOLEFT_BOTTOM NOLEFT_TOP
Modified: dist/foundation/templates/greens/regions
Modified: CATTOP_LEFTONLY_BOTTOM CATTOP_LEFTONLY_TOP
Modified: CATTOP_LEFTRIGHT_BOTTOM CATTOP_LEFTRIGHT_TOP
Modified: CATTOP_NOLEFT_BOTTOM CATTOP_NOLEFT_TOP
Modified: LEFTONLY_BOTTOM LEFTONLY_TOP LEFTRIGHT_BOTTOM
Modified: LEFTRIGHT_TOP NOLEFT_BOTTOM NOLEFT_TOP
Modified: dist/foundation/templates/purpleyellow/regions
Modified: CATTOP_LEFTONLY_BOTTOM CATTOP_LEFTONLY_TOP
Modified: CATTOP_LEFTRIGHT_BOTTOM CATTOP_LEFTRIGHT_TOP
Modified: CATTOP_NOLEFT_BOTTOM CATTOP_NOLEFT_TOP
Modified: LEFTONLY_BOTTOM LEFTONLY_TOP LEFTRIGHT_BOTTOM
Modified: LEFTRIGHT_TOP NOLEFT_BOTTOM NOLEFT_TOP
Modified: dist/lib/UI ContentEditor.pm ui.cfg
Modified: dist/lib/UI/pages/admin content.html content_editor.html
Modified: content_publish.html
Modified: dist/lib/UI/pages/include component_editor page_editor
Modified: template_editor
Modified: lib/Vend Util.pm
Removed: dist/foundation/templates/components none
Log:
* Revamp of content edit. I think it is starting to get there.....
* "Edit page", "Edit menu", even "edit component" links are inserted when
you are logged in as admin.
* Complete cleanup of page/template/component parsing code, now perhaps
someone besides me could understand it. 8-)
* File navigator only now used for pages, not for templates/components,
retains context.
* Hooks are there for doing an entire edit session then pushing new content=
all
at once. Theoreticially, you could create an entire new site, browse it
and test it without the public seeing it, and then push one button to
publish it all. I say theoretically because I haven't done it yet, but
it should be there soon.
* Preview now holds true for browsing catalog.
* Now can create and edit pages that have no template wrapper.
* Closed all Bugzillas relating to it.
-- New pages not creating properly
-- Unable to edit in subdirectories
-- Templates not written properly
* TODO:
-- Allow alternate DSN for staging database tables.
-- Document this puppy, finally.
-- Change templates so that left-side/right-side components interchange,
and so that most class=3Dcontent components can go vertical.
-- Vet the new [menu][/menu] component so that left-hand side
menu can be directory/location sensitive.
-- Build in the "use the index.html page in the current directory
as the template" functionality.
Revision Changes Path
2.61 +0 -1 interchange/MANIFEST
rev 2.61, prev_rev 2.60
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.60
retrieving revision 2.61
diff -u -r2.60 -r2.61
--- MANIFEST 12 Sep 2002 04:51:52 -0000 2.60
+++ MANIFEST 13 Sep 2002 20:46:17 -0000 2.61
@@ -688,7 +688,6 @@
dist/foundation/templates/components/category_vertical
dist/foundation/templates/components/cross
dist/foundation/templates/components/fortune
-dist/foundation/templates/components/none
dist/foundation/templates/components/product_flyout
dist/foundation/templates/components/product_tree
dist/foundation/templates/components/promo
1.4 +14 -7 interchange/code/UI_Tag/auto_wizard.coretag
rev 1.4, prev_rev 1.3
Index: auto_wizard.coretag
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/code/UI_Tag/auto_wizard.coretag,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- auto_wizard.coretag 28 Jun 2002 19:44:13 -0000 1.3
+++ auto_wizard.coretag 13 Sep 2002 20:46:17 -0000 1.4
@@ -179,14 +179,23 @@
=20
return $Tmp->{auto_wizard} if $opt->{show} and ! $opt->{run};
=20
+ if($opt->{compile} eq 'auto') {
+ $Session->{auto_wizard} ||=3D {};
+ undef $opt->{compile} if $wizname && $Session->{auto_wizard}{$wizname};
+ $opt->{show} =3D 1;
+ $opt->{run} =3D 1;
+ }
+
if($opt->{compile}) {
my $n;
$n =3D compile_wizard(@_)
or do {
- $Tmp->{auto_wizard} =3D errmsg(
- "Wizard %s failed to compile.",
- $wizname,
- );
+ ::logError(
+ $Tmp->{auto_wizard} =3D errmsg(
+ "Wizard %s failed to compile.",
+ $wizname,
+ )
+ );
return;
};
#Debug("compiler returned wizname=3D$n");
@@ -203,12 +212,10 @@
my $banner_var =3D $opt->{banner_scratch} || 'page_banner';
my $wiz;
=20
- return unless $wiz =3D $Session->{auto_wizard};
-
$wizname ||=3D $CGI->{wizard_name} || 'default';
#Debug("wizname=3D$wizname");
=20
- return unless $wiz =3D $wiz->{$wizname};
+ return unless $wiz =3D $Vend::Session->{auto_wizard}{$wizname};
#Debug("we have a wiz! wizname=3D$wizname");
=20
my $beg =3D $wiz->[0];
1.2 +1 -64 interchange/code/UI_Tag/content_info.coretag
rev 1.2, prev_rev 1.1
Index: content_info.coretag
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/code/UI_Tag/content_info.coretag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- content_info.coretag 16 Feb 2002 09:39:08 -0000 1.1
+++ content_info.coretag 13 Sep 2002 20:46:17 -0000 1.2
@@ -3,69 +3,6 @@
UserTag content-info Routine <<EOR
use UI::ContentEditor;
sub {
- my ($dir, $opt) =3D @_;
- $opt->{dir} =3D $dir if $dir;
-
- my $delim =3D $opt->{delimiter} || ',';
- my $type;
- if( $opt->{templates} ) {
- $type =3D 'templates';
- }
- else {
- $type =3D 'components';
- }
-
- my $tpls;
- my $comps;
- my $things;
- my $labels;
- my $classes;
-
- if($Vend::caCompCache{$type}) {
- $things =3D $Vend::caCompCache{$type};
- $labels =3D $Vend::clCompCache{$type};
- $classes =3D $Vend::ccCompCache{$type};
- }
- else {
- my $o =3D { dir =3D> $opt->{dir}, $type =3D> 1, available =3D> 1};
- $things =3D [];
- @$things =3D UI::ContentEditor::read_template(undef, $o);
- $Vend::caCompCache{$type} =3D $things;
- $labels =3D $Vend::clCompCache{$type} =3D {};
- $classes =3D $Vend::ccCompCache{$type} =3D {};
- for(@$things) {
- $Vend::clCompCache->{$_->[0]} =3D $_->[1];
- $Vend::ccCompCache->{$_->[0]} =3D $_->[2];
- }
- }
-
- if($opt->{label}) {
- return $Vend::clCompCache->{$opt->{code}};
- }
-
- if($opt->{structure}) {
- $opt->{type} =3D $opt->{ui_type} =3D 'component';
- return Vend::ContentEditor::read_template($opt->{code}, $opt);
- }
-
- if ($opt->{show_class}) {
- return $Vend::ccCompCache->{$opt->{code}};
- }
-
- ## Default is to return options
-
- my @out;
- if(my $class =3D $opt->{class}) {
- my $re =3D qr{\b(?:$class|ALL)\b};
- my @comps =3D grep $_->[2] =3D~ $re, @$things;
- $things =3D \@comps;
- }
-
- for(@$things) {
- $_->[1] =3D~ s/($delim)/'&#' . ord($1) . ';'/ge;
- push @out, join "=3D", $_->[0], $_->[1];
- }
- unshift @out, ($opt->{templates} ? "=3DNo template" : "=3DNo component");
- return join $delim, @out;
+ UI::ContentEditor::content_info(@_);
}
EOR
1.6 +2 -2 interchange/code/UI_Tag/file_navigator.coretag
rev 1.6, prev_rev 1.5
Index: file_navigator.coretag
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/code/UI_Tag/file_navigator.coretag,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- file_navigator.coretag 26 Aug 2002 02:56:27 -0000 1.5
+++ file_navigator.coretag 13 Sep 2002 20:46:17 -0000 1.6
@@ -279,8 +279,8 @@
push @dir, [$fe, $fn, $dtmpl, $perms];
}
elsif ($opt->{edit_all} || ($opt->{edit_only} && /\.html?$/) ) {
- my $rn =3D '';
- ($rn =3D $fn) =3D~ s/$idir_re// if $idir_re;
+ my $rn =3D $curdir . "/$fn";
+ $rn =3D~ s{$idir_re}{} if $idir_re;
push @plain, [$fe, $fn, $ftmpl_ed, $perms, $rn];
}
else {
1.4 +2 -1 interchange/code/UI_Tag/table_editor_tpl.coretag
rev 1.4, prev_rev 1.3
Index: table_editor_tpl.coretag
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/code/UI_Tag/table_editor_tpl.coretag,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- table_editor_tpl.coretag 30 Jun 2002 03:43:35 -0000 1.3
+++ table_editor_tpl.coretag 13 Sep 2002 20:46:17 -0000 1.4
@@ -566,7 +566,7 @@
}
### end build of error checking
=20
- $opt->{clear_image} =3D "bg.gif" if ! $opt->{clear_image};
+ $opt->{clear_image} ||=3D "bg.gif";
=20
#::logDebug("table-editor opt: " . ::uneval($opt));
my $die =3D sub {
@@ -905,6 +905,7 @@
=20
$opt_out{href} =3D $opt->{href};
$opt_out{method} =3D $opt->{method};
+ $opt_out{clear_image} =3D $opt->{clear_image};
$opt_out{tpl_sidstr} =3D $sidstr;
$opt_out{enctype} =3D $opt->{file_upload} ? ' ENCTYPE=3D"multipart/form-d=
ata"' : '';
=20
1.2 +2 -1 interchange/code/UserTag/component.tag
rev 1.2, prev_rev 1.1
Index: component.tag
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/code/UserTag/component.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- component.tag 16 Feb 2002 19:13:41 -0000 1.1
+++ component.tag 13 Sep 2002 20:46:17 -0000 1.2
@@ -23,8 +23,9 @@
}
=20
$name ||=3D $control->{component};
+ $name ||=3D $opt->{default};
=20
- if (! $name) {
+ if (! $name or $name eq 'none') {
# Increment control_index so empty component has no side effect
$::Scratch->{control_index}++;
return;
2.11 +4 -1 interchange/dist/foundation/catalog.cfg
rev 2.11, prev_rev 2.10
Index: catalog.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/foundation/catalog.cfg,v
retrieving revision 2.10
retrieving revision 2.11
diff -u -r2.10 -r2.11
--- catalog.cfg 15 Aug 2002 22:02:42 -0000 2.10
+++ catalog.cfg 13 Sep 2002 20:46:17 -0000 2.11
@@ -26,7 +26,7 @@
Require module SQL::Statement
Require module LWP::Simple
=20
-Require UserTag email email_raw var loc table_editor button
+Require UserTag email email_raw var loc table_editor button component
=20
#=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D#
=20
@@ -113,6 +113,9 @@
Variable STYLE default
endif
include templates/__STYLE__/theme.cfg
+
+# Provide some links for the admin to edit pages
+Autoload admin_links
=20
#=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D#
=20
2.3 +2 -2 interchange/dist/foundation/html/index.html
rev 2.3, prev_rev 2.2
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/foundation/html/index.html,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- index.html 16 Aug 2002 21:44:51 -0000 2.2
+++ index.html 13 Sep 2002 20:46:17 -0000 2.3
@@ -13,7 +13,7 @@
font-weight: bold;
}
A:link, A:active, A:visited {
- color: #CC3333;
+ color: #006699;
font-family: Helvetica;
font-size: 11px;
}
@@ -23,7 +23,7 @@
font-size: 11px;
}
.categorybar {
- background-color: #993333;
+ background-color: #006699
font-family: Helvetica;
font-size: 11px;
}
2.3 +1 -3 interchange/dist/foundation/templates/leftonly
rev 2.3, prev_rev 2.2
Index: leftonly
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/leftonly,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- leftonly 18 Feb 2002 21:56:50 -0000 2.2
+++ leftonly 13 Sep 2002 20:46:17 -0000 2.3
@@ -1,10 +1,8 @@
[comment]
-ui_template: leftonly
-ui_type: template
ui_name: leftonly
+ui_type: template
ui_version: 4.9.0
ui_label: Page with top/left areas.
-ui_source: templates/leftonly
ui_template_layout: LEFTONLY_TOP, UI_CONTENT, LEFTONLY_BOTTOM
=20
page_title:
2.3 +2 -10 interchange/dist/foundation/templates/leftright
rev 2.3, prev_rev 2.2
Index: leftright
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/leftright,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- leftright 18 Feb 2002 21:56:50 -0000 2.2
+++ leftright 13 Sep 2002 20:46:17 -0000 2.3
@@ -1,10 +1,8 @@
[comment]
-ui_template: leftright
-ui_type: template
ui_name: leftright
-ui_version: 4.9.0
+ui_type: template
+ui_version: 4.9.3
ui_label: Page with top/left/right areas.
-ui_source: templates/leftright
ui_template_layout: LEFTRIGHT_TOP, UI_CONTENT, LEFTRIGHT_BOTTOM
=20
page_title:
@@ -14,12 +12,6 @@
members_only:
label: Members only
type: yesno
-
-page_banner:
- code: page_banner
- label: Page Banner
- type: text
- width: 30
=20
[/comment]
=20
2.2 +31 -4 interchange/dist/foundation/templates/noleft
rev 2.2, prev_rev 2.1
Index: noleft
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/noleft,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- noleft 3 Oct 2001 02:14:32 -0000 2.1
+++ noleft 13 Sep 2002 20:46:17 -0000 2.2
@@ -1,9 +1,9 @@
[comment]
-ui_template: Yes
-ui_template_name: noleft
-ui_template_version: 4.7.3
+ui_name: noleft
+ui_type: template
+ui_template_version: 4.9.3
ui_template_layout: NOLEFT_TOP, UI_CONTENT, NOLEFT_BOTTOM
-ui_template_description: Page with top/bottom areas only, content in middl=
e.
+ui_label: Page with top/bottom areas only, content in middle.
=20
page_title:
description: Page title
@@ -16,3 +16,30 @@
[/comment]
[set page_title][/set]
[set members_only][/set]
+
+<!-- BEGIN PAGE_PICTURE -->
+<b>Representation</b><br>
+<table width=3D"100%">
+<tr>
+ <td colspan=3D2 id=3Dpicture0><a href=3D"javascript:void(0)" onclick=3D"v=
isible(0)">preamble</a></td>
+</tr>
+<tr>
+ <td colspan=3D2 id=3Dpicture1><a href=3D"javascript:void(0)" onclick=3D"v=
isible(1)">controls</a></td>
+</tr>
+<tr>
+ <td colspan=3D2 bgcolor=3D"#CCCCCC"><br>header<br> </td>
+</tr>
+<tr>
+ <td>
+ <div id=3Dcomp_picture1 style=3D"width: 100%"><a href=3D"javascript:void=
(0)" onclick=3D"visible(1,'comp')">slot 1</a></div>
+ <div id=3Dcomp_picture2 style=3D"width: 100%"><br><a href=3D"javascript:=
void(0)" onclick=3D"visible(2,'comp')">CONTENT</a><br> </div>
+ </td>
+</tr>
+<tr>
+ <td colspan=3D2 bgcolor=3D"#CCCCCC">footer</td>
+</tr>
+<tr>
+ <td colspan=3D2 id=3Dpicture2><a href=3D"javascript:void(0)" onclick=3D"v=
isible(2)">postamble</a></td>
+</tr>
+</table>
+<!-- END PAGE_PICTURE -->
1.2 +2 -1 interchange/dist/foundation/templates/blueyellow/regio=
ns/CATTOP_LEFTONLY_BOTTOM
rev 1.2, prev_rev 1.1
Index: CATTOP_LEFTONLY_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/blueyellow/regions=
/CATTOP_LEFTONLY_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CATTOP_LEFTONLY_BOTTOM 16 Aug 2002 21:44:52 -0000 1.1
+++ CATTOP_LEFTONLY_BOTTOM 13 Sep 2002 20:46:18 -0000 1.2
@@ -1,4 +1,4 @@
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
<center>
<p><a href=3D"http://www.icdevgroup.org/"><img src=3D"__THEME_IMG_DIR_=
_poweredby.gif" border=3D"0"></a></p>
@@ -11,5 +11,6 @@
</tr>
</table>
=20
+__ADL_PAGE__
</body>
</html>
1.3 +4 -4 interchange/dist/foundation/templates/blueyellow/regio=
ns/CATTOP_LEFTONLY_TOP
rev 1.3, prev_rev 1.2
Index: CATTOP_LEFTONLY_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/blueyellow/regions=
/CATTOP_LEFTONLY_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CATTOP_LEFTONLY_TOP 19 Aug 2002 01:33:30 -0000 1.2
+++ CATTOP_LEFTONLY_TOP 13 Sep 2002 20:46:18 -0000 1.3
@@ -33,7 +33,7 @@
<tr>
<td width=3D"100%" class=3D"categorybar">
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- [include file=3D"templates/components/[control component none]" grou=
p=3Dcontent][control]
+ [component group=3Dcontent]
</table>=09=09=09=09=20=20
</td>
</tr>
@@ -47,9 +47,9 @@
<tr>=20
<td width=3D"20%" valign=3D"top" align=3D"left" class=3D"menubar">=20
<table>
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
<tr><td><br></td></tr>
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
</table>
<!--Left Sidebar-->
<br>
@@ -72,5 +72,5 @@
<a href=3D"[area aboutus]"><img alt=3D"About Us" border=3D"0" src=3D"_=
_THEME_IMG_DIR__about.gif"></a>
</td>
<td width=3D"80%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +3 -2 interchange/dist/foundation/templates/blueyellow/regio=
ns/CATTOP_LEFTRIGHT_BOTTOM
rev 1.2, prev_rev 1.1
Index: CATTOP_LEFTRIGHT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/blueyellow/regions=
/CATTOP_LEFTRIGHT_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CATTOP_LEFTRIGHT_BOTTOM 16 Aug 2002 21:44:52 -0000 1.1
+++ CATTOP_LEFTRIGHT_BOTTOM 13 Sep 2002 20:46:18 -0000 1.2
@@ -1,4 +1,4 @@
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
<center>
<p><a href=3D"http://www.icdevgroup.org/"><img src=3D"__THEME_IMG_DIR_=
_poweredby.gif" border=3D"0"></a></p>
@@ -12,10 +12,11 @@
<img src=3D"__THEME_IMG_DIR__littlebar.gif" width=3D"1" height=3D"650">
</td>
<td width=3D"15%" valign=3D"top" align=3D"right" class=3D"maincontent">
- [include file=3D"templates/components/[control component none]" group=
=3Dvertical][control]
+ [component group=3Dvertical]
</td>
</tr>
</table>
=20
+__ADL_PAGE__
</body>
</html>
1.3 +4 -4 interchange/dist/foundation/templates/blueyellow/regio=
ns/CATTOP_LEFTRIGHT_TOP
rev 1.3, prev_rev 1.2
Index: CATTOP_LEFTRIGHT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/blueyellow/regions=
/CATTOP_LEFTRIGHT_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CATTOP_LEFTRIGHT_TOP 19 Aug 2002 01:33:30 -0000 1.2
+++ CATTOP_LEFTRIGHT_TOP 13 Sep 2002 20:46:18 -0000 1.3
@@ -33,7 +33,7 @@
<tr>
<td width=3D"100%" class=3D"categorybar">
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- [include file=3D"templates/components/[control component none]" grou=
p=3Dcontent][control]
+ [component group=3Dcontent]
</table>=09=09=09=09=20=20
</td>
</tr>
@@ -47,9 +47,9 @@
<tr>=20
<td width=3D"20%" valign=3D"top" align=3D"left" class=3D"menubar">=20
<table>
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
<tr><td><br></td></tr>
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
</table>
<!--Left Sidebar-->
<br>
@@ -72,5 +72,5 @@
<a href=3D"[area aboutus]"><img alt=3D"About Us" border=3D"0" src=3D"_=
_THEME_IMG_DIR__about.gif"></a>
</td>
<td width=3D"65%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +1 -0 interchange/dist/foundation/templates/blueyellow/regio=
ns/CATTOP_NOLEFT_BOTTOM
rev 1.2, prev_rev 1.1
Index: CATTOP_NOLEFT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/blueyellow/regions=
/CATTOP_NOLEFT_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CATTOP_NOLEFT_BOTTOM 16 Aug 2002 21:44:52 -0000 1.1
+++ CATTOP_NOLEFT_BOTTOM 13 Sep 2002 20:46:18 -0000 1.2
@@ -9,5 +9,6 @@
</tr>
</table>
=20
+__ADL_PAGE__
</body>
</html>
1.3 +1 -1 interchange/dist/foundation/templates/blueyellow/regio=
ns/CATTOP_NOLEFT_TOP
rev 1.3, prev_rev 1.2
Index: CATTOP_NOLEFT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/blueyellow/regions=
/CATTOP_NOLEFT_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CATTOP_NOLEFT_TOP 19 Aug 2002 01:33:30 -0000 1.2
+++ CATTOP_NOLEFT_TOP 13 Sep 2002 20:46:18 -0000 1.3
@@ -61,5 +61,5 @@
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
<tr>=20
<td width=3D"95%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +2 -1 interchange/dist/foundation/templates/blueyellow/regio=
ns/LEFTONLY_BOTTOM
rev 1.2, prev_rev 1.1
Index: LEFTONLY_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/blueyellow/regions=
/LEFTONLY_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LEFTONLY_BOTTOM 16 Aug 2002 21:44:52 -0000 1.1
+++ LEFTONLY_BOTTOM 13 Sep 2002 20:46:18 -0000 1.2
@@ -1,4 +1,4 @@
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
<br><br>
<center>
@@ -14,5 +14,6 @@
</tr>
</table>
=20
+__ADL_PAGE__
</body>
</html>
1.3 +4 -4 interchange/dist/foundation/templates/blueyellow/regio=
ns/LEFTONLY_TOP
rev 1.3, prev_rev 1.2
Index: LEFTONLY_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/blueyellow/regions=
/LEFTONLY_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LEFTONLY_TOP 19 Aug 2002 01:33:30 -0000 1.2
+++ LEFTONLY_TOP 13 Sep 2002 20:46:18 -0000 1.3
@@ -61,11 +61,11 @@
<td width=3D"20%" valign=3D"top" align=3D"left" class=3D"categorybar">=
=20
<!--Left Sidebar-->
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
+ [component group=3Dvertical]
+ [component group=3Dvertical]
</table>=09=09=09=09=20=20
</td>
<td width=3D"80%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +3 -2 interchange/dist/foundation/templates/blueyellow/regio=
ns/LEFTRIGHT_BOTTOM
rev 1.2, prev_rev 1.1
Index: LEFTRIGHT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/blueyellow/regions=
/LEFTRIGHT_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LEFTRIGHT_BOTTOM 16 Aug 2002 21:44:52 -0000 1.1
+++ LEFTRIGHT_BOTTOM 13 Sep 2002 20:46:18 -0000 1.2
@@ -1,4 +1,4 @@
- [include file=3D"templates/components/[control component none]" grou=
p=3Dcontent][control]
+ [component group=3Dcontent]
=20
<br><br>
<center>
@@ -15,10 +15,11 @@
<img src=3D"__THEME_IMG_DIR__littlebar.gif" width=3D"1" height=3D"650">
</td>
<td width=3D"15%" valign=3D"top" align=3D"right" class=3D"maincontent">
- [include file=3D"templates/components/[control component none]" group=
=3Dvertical][control]
+ [component group=3Dvertical]
</td>
</tr>
</table>
=20
+__ADL_PAGE__
</body>
</html>
1.3 +4 -4 interchange/dist/foundation/templates/blueyellow/regio=
ns/LEFTRIGHT_TOP
rev 1.3, prev_rev 1.2
Index: LEFTRIGHT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/blueyellow/regions=
/LEFTRIGHT_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LEFTRIGHT_TOP 19 Aug 2002 01:33:30 -0000 1.2
+++ LEFTRIGHT_TOP 13 Sep 2002 20:46:18 -0000 1.3
@@ -62,11 +62,11 @@
<td width=3D"20%" valign=3D"top" align=3D"left" class=3D"categorybar">=
=20
<!--Left Sidebar-->
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- [include file=3D"templates/components/[control component search_box_=
small]" group=3Dvertical][control]
- [include file=3D"templates/components/[control component category_ve=
rtical]" group=3Dvertical][control]
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component default=3Dsearch_box_small group=3Dvertical]
+ [component default=3Dcategory_vertical group=3Dvertical]
+ [component group=3Dvertical]
</table>=09=09=09=09=20=20
</td>
<td width=3D"65%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +1 -0 interchange/dist/foundation/templates/blueyellow/regio=
ns/NOLEFT_BOTTOM
rev 1.2, prev_rev 1.1
Index: NOLEFT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/blueyellow/regions=
/NOLEFT_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NOLEFT_BOTTOM 16 Aug 2002 21:44:52 -0000 1.1
+++ NOLEFT_BOTTOM 13 Sep 2002 20:46:18 -0000 1.2
@@ -12,5 +12,6 @@
</tr>
</table>
=20
+__ADL_PAGE__
</body>
</html>
1.3 +1 -1 interchange/dist/foundation/templates/blueyellow/regio=
ns/NOLEFT_TOP
rev 1.3, prev_rev 1.2
Index: NOLEFT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/blueyellow/regions=
/NOLEFT_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NOLEFT_TOP 19 Aug 2002 01:33:30 -0000 1.2
+++ NOLEFT_TOP 13 Sep 2002 20:46:18 -0000 1.3
@@ -60,5 +60,5 @@
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
<tr>=20
<td width=3D"95%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
2.2 +0 -2 interchange/dist/foundation/templates/components/affil=
iate_receptor
rev 2.2, prev_rev 2.1
Index: affiliate_receptor
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/components/affilia=
te_receptor,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- affiliate_receptor 16 Feb 2002 09:39:09 -0000 2.1
+++ affiliate_receptor 13 Sep 2002 20:46:18 -0000 2.2
@@ -1,10 +1,8 @@
[comment]
-ui_component: affiliate_receptor
ui_type: component
ui_name: affiliate_receptor
ui_class: content
ui_label: Welcome affiliate program arrivals
-ui_source: templates/components/affiliate_receptor
=20
coupon_allowed:
code: coupon_allowed
2.2 +1 -3 interchange/dist/foundation/templates/components/best
rev 2.2, prev_rev 2.1
Index: best
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/components/best,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- best 16 Feb 2002 09:39:09 -0000 2.1
+++ best 13 Sep 2002 20:46:18 -0000 2.2
@@ -1,11 +1,9 @@
[comment]
-ui_component: best
-ui_type: component
ui_name: best
+ui_type: component
ui_class: vertical, content
ui_group: promotion
ui_label: Best sellers
-ui_source: templates/components/best
=20
banner:
code: banner
2.9 +1 -3 interchange/dist/foundation/templates/components/cart
rev 2.9, prev_rev 2.8
Index: cart
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/components/cart,v
retrieving revision 2.8
retrieving revision 2.9
diff -u -r2.8 -r2.9
--- cart 28 Jun 2002 05:00:25 -0000 2.8
+++ cart 13 Sep 2002 20:46:18 -0000 2.9
@@ -1,11 +1,9 @@
[comment]
-ui_component: cart
-ui_type: component
ui_name: cart
+ui_type: component
ui_class: content
ui_group: checkout
ui_label: Shopping cart display (full)
-ui_source: templates/components/cart
=20
others_bought:
label: Use "others who bought this" here
2.3 +1 -3 interchange/dist/foundation/templates/components/cart_=
display
rev 2.3, prev_rev 2.2
Index: cart_display
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/components/cart_di=
splay,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- cart_display 1 Mar 2002 19:36:09 -0000 2.2
+++ cart_display 13 Sep 2002 20:46:18 -0000 2.3
@@ -1,11 +1,9 @@
[comment]
-ui_component: cart_display
-ui_type: component
ui_name: cart_display
+ui_type: component
ui_class: content
ui_group: info
ui_label: Smaller cart for display in content area
-ui_source: templates/components/cart_display
=20
=20
[/comment]
2.2 +1 -4 interchange/dist/foundation/templates/components/cart_=
tiny
rev 2.2, prev_rev 2.1
Index: cart_tiny
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/components/cart_ti=
ny,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- cart_tiny 16 Feb 2002 09:39:09 -0000 2.1
+++ cart_tiny 13 Sep 2002 20:46:18 -0000 2.2
@@ -1,12 +1,9 @@
[comment]
-ui_component: cart_tiny
-ui_type: component
ui_name: cart_tiny
+ui_type: component
ui_class: vertical
ui_group: info
ui_label: Small cart for left/right display
-ui_source: templates/components/cart_tiny
-
=20
[/comment]
<!-- BEGIN COMPONENT [control component cart_tiny] -->
2.2 +1 -3 interchange/dist/foundation/templates/components/categ=
ory_horizontal
rev 2.2, prev_rev 2.1
Index: category_horizontal
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/components/categor=
y_horizontal,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- category_horizontal 16 Feb 2002 09:39:09 -0000 2.1
+++ category_horizontal 13 Sep 2002 20:46:18 -0000 2.2
@@ -1,11 +1,9 @@
[comment]
-ui_component: category_horizontal
-ui_type: component
ui_name: category_horizontal
+ui_type: component
ui_class: horizontal
ui_group: navigation
ui_label: Horizontal category list
-ui_source: templates/components/category_horizontal
=20
page_class:
advanced: 1
1.3 +5 -4 interchange/dist/foundation/templates/components/categ=
ory_vert_toggle
rev 1.3, prev_rev 1.2
Index: category_vert_toggle
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/components/categor=
y_vert_toggle,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- category_vert_toggle 1 May 2002 20:55:47 -0000 1.2
+++ category_vert_toggle 13 Sep 2002 20:46:18 -0000 1.3
@@ -1,8 +1,9 @@
[comment]
-ui_component: category_vert_toggle
-ui_component_type: vertical
-ui_component_group: Navigation
-ui_component_label: Collapsable Vertical Category List
+ui_name: category_vert_toggle
+ui_type: component
+ui_class: vertical
+ui_group: Navigation
+ui_label: Collapsable Vertical Category List
=20
page_class:
label: Page class
2.3 +1 -3 interchange/dist/foundation/templates/components/categ=
ory_vertical
rev 2.3, prev_rev 2.2
Index: category_vertical
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/components/categor=
y_vertical,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- category_vertical 1 May 2002 20:55:47 -0000 2.2
+++ category_vertical 13 Sep 2002 20:46:18 -0000 2.3
@@ -1,11 +1,9 @@
[comment]
-ui_component: category_vertical
-ui_type: component
ui_name: category_vertical
+ui_type: component
ui_class: vertical
ui_group: Navigation
ui_label: Vertical category list
-ui_source: templates/components/category_vertical
=20
page_class:
advanced: 1
2.2 +1 -3 interchange/dist/foundation/templates/components/cross
rev 2.2, prev_rev 2.1
Index: cross
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/components/cross,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- cross 16 Feb 2002 09:39:09 -0000 2.1
+++ cross 13 Sep 2002 20:46:18 -0000 2.2
@@ -1,12 +1,10 @@
[comment]
-ui_component: cross
-ui_type: component
ui_name: cross
+ui_type: component
ui_class: content, vertical
ui_group: promotions
ui_help: depends on setting cross_codes or cross_category in page, falls b=
ack to featured/specials.
ui_label: Cross-sell or specific feature
-ui_source: templates/components/cross
=20
banner:
code: banner
2.2 +1 -3 interchange/dist/foundation/templates/components/fortu=
ne
rev 2.2, prev_rev 2.1
Index: fortune
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/components/fortune=
,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- fortune 16 Feb 2002 09:39:09 -0000 2.1
+++ fortune 13 Sep 2002 20:46:18 -0000 2.2
@@ -1,11 +1,9 @@
[comment]
-ui_component: fortune
-ui_type: component
ui_name: fortune
+ui_type: component
ui_class: vertical
ui_group: info
ui_label: Random saying
-ui_source: templates/components/fortune
=20
banner:
code: banner
1.2 +2 -4 interchange/dist/foundation/templates/components/produ=
ct_flyout
rev 1.2, prev_rev 1.1
Index: product_flyout
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/components/product=
_flyout,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- product_flyout 15 Aug 2002 06:18:21 -0000 1.1
+++ product_flyout 13 Sep 2002 20:46:18 -0000 1.2
@@ -1,11 +1,9 @@
[comment]
-ui_component: product_flyout
-ui_type: component
ui_name: product_flyout
+ui_type: component
ui_class: vertical
ui_group: Navigation
ui_label: Products Flyout Menu
-ui_source: templates/components/product_flyout
=20
tree_selector:
help: Defines which tree menu is selected
@@ -51,7 +49,7 @@
flyout-style=3D"[control flyout_style]"
menu-type=3Dflyout
][/menu]
-
+ __ADL_MENU__
</td>
</tr>
</table>
1.4 +2 -4 interchange/dist/foundation/templates/components/produ=
ct_tree
rev 1.4, prev_rev 1.3
Index: product_tree
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/components/product=
_tree,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- product_tree 31 Aug 2002 04:15:12 -0000 1.3
+++ product_tree 13 Sep 2002 20:46:18 -0000 1.4
@@ -1,11 +1,9 @@
[comment]
-ui_component: product_tree
-ui_type: component
ui_name: product_tree
+ui_type: component
ui_class: vertical
ui_group: Navigation
ui_label: Products Tree
-ui_source: templates/components/product_tree
=20
tree_selector:
help: Defines which tree menu is selected
@@ -74,7 +72,7 @@
no-image=3D"[control no_image]"
menu-type=3Dtree
reparse=3D0][/menu]
-
+ __ADL_MENU__
</td>
</tr>
</table>
2.6 +1 -3 interchange/dist/foundation/templates/components/promo
rev 2.6, prev_rev 2.5
Index: promo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/components/promo,v
retrieving revision 2.5
retrieving revision 2.6
diff -u -r2.5 -r2.6
--- promo 1 May 2002 20:55:47 -0000 2.5
+++ promo 13 Sep 2002 20:46:18 -0000 2.6
@@ -1,11 +1,9 @@
[comment]
-ui_component: promo
-ui_type: component
ui_name: promo
+ui_type: component
ui_class: content, vertical
ui_group: promotion
ui_label: Promotion
-ui_source: templates/components/promo
=20
promo_type:
label: Promotion type
2.2 +1 -3 interchange/dist/foundation/templates/components/random
rev 2.2, prev_rev 2.1
Index: random
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/components/random,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- random 16 Feb 2002 09:39:09 -0000 2.1
+++ random 13 Sep 2002 20:46:18 -0000 2.2
@@ -1,11 +1,9 @@
[comment]
-ui_component: random
-ui_type: component
ui_name: random
+ui_type: component
ui_class: content, vertical
ui_group: promotion
ui_label: Random items
-ui_source: templates/components/random
=20
matches:
label: Number to show
2.2 +1 -3 interchange/dist/foundation/templates/components/saved=
_carts_list_small
rev 2.2, prev_rev 2.1
Index: saved_carts_list_small
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/components/saved_c=
arts_list_small,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- saved_carts_list_small 16 Feb 2002 09:39:09 -0000 2.1
+++ saved_carts_list_small 13 Sep 2002 20:46:18 -0000 2.2
@@ -1,11 +1,9 @@
[comment]
-ui_component: saved_carts_list_small
-ui_type: component
ui_name: saved_carts_list_small
+ui_type: component
ui_class: vertical
ui_group: info
ui_label: Small saved cart list for left/right display
-ui_source: templates/components/saved_carts_list_small
=20
=20
[/comment]
2.3 +1 -3 interchange/dist/foundation/templates/components/searc=
h_box_small
rev 2.3, prev_rev 2.2
Index: search_box_small
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/components/search_=
box_small,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- search_box_small 16 Feb 2002 09:39:09 -0000 2.2
+++ search_box_small 13 Sep 2002 20:46:18 -0000 2.3
@@ -1,11 +1,9 @@
[comment]
-ui_component: search_box_small
-ui_type: component
ui_name: search_box_small
+ui_type: component
ui_class: vertical
ui_group: search
ui_label: Small search box
-ui_source: templates/components/search_box_small
=20
matches:
help: Matches to return to page
2.3 +1 -3 interchange/dist/foundation/templates/components/searc=
h_box_small_top
rev 2.3, prev_rev 2.2
Index: search_box_small_top
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/components/search_=
box_small_top,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- search_box_small_top 16 Feb 2002 09:39:09 -0000 2.2
+++ search_box_small_top 13 Sep 2002 20:46:18 -0000 2.3
@@ -1,11 +1,9 @@
[comment]
-ui_component: search_box_small_top
-ui_type: component
ui_name: search_box_small_top
+ui_type: component
ui_class: horizontal
ui_group: search
ui_label: Small search box (for top area)
-ui_source: templates/components/search_box_small_top
=20
matches:
help: Matches to return to page
2.2 +1 -3 interchange/dist/foundation/templates/components/upsell
rev 2.2, prev_rev 2.1
Index: upsell
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/components/upsell,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- upsell 16 Feb 2002 09:39:09 -0000 2.1
+++ upsell 13 Sep 2002 20:46:18 -0000 2.2
@@ -1,12 +1,10 @@
[comment]
-ui_component: upsell
-ui_type: component
ui_name: upsell
+ui_type: component
ui_class: content, vertical
ui_group: promotions
ui_help: depends on setting upsell codes in cart or flypage
ui_label: Upsell
-ui_source: templates/components/upsell
=20
banner:
label: Top row banner
1.2 +2 -2 interchange/dist/foundation/templates/fixedwidth/regio=
ns/CATTOP_LEFTONLY_BOTTOM
rev 1.2, prev_rev 1.1
Index: CATTOP_LEFTONLY_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/fixedwidth/regions=
/CATTOP_LEFTONLY_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CATTOP_LEFTONLY_BOTTOM 16 Aug 2002 21:44:52 -0000 1.1
+++ CATTOP_LEFTONLY_BOTTOM 13 Sep 2002 20:46:18 -0000 1.2
@@ -1,4 +1,4 @@
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
</td>
</tr>
@@ -16,6 +16,6 @@
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +4 -4 interchange/dist/foundation/templates/fixedwidth/regio=
ns/CATTOP_LEFTONLY_TOP
rev 1.3, prev_rev 1.2
Index: CATTOP_LEFTONLY_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/fixedwidth/regions=
/CATTOP_LEFTONLY_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CATTOP_LEFTONLY_TOP 19 Aug 2002 01:33:30 -0000 1.2
+++ CATTOP_LEFTONLY_TOP 13 Sep 2002 20:46:18 -0000 1.3
@@ -36,7 +36,7 @@
<tr>
<td width=3D"100%" class=3D"categorybar">
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- [include file=3D"templates/components/[control component none]" grou=
p=3Dcontent][control]
+ [component group=3Dcontent]
</table>=09=09=09=09=20=20
</td>
</tr>
@@ -73,9 +73,9 @@
<a href=3D"[area aboutus]"><img alt=3D"About Us" border=3D"0" src=3D"_=
_THEME_IMG_DIR__about.gif"></a>
<br><br>
<table>
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
<tr><td><br></td></tr>
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
</table>
</td>
</tr>
@@ -85,4 +85,4 @@
<table class=3D"centerwidth">
<tr>
<td>
- [include file=3D"templates/components/[control component none]" group=
=3Dhorizontal][control]
+ [component group=3Dhorizontal]
1.2 +3 -3 interchange/dist/foundation/templates/fixedwidth/regio=
ns/CATTOP_LEFTRIGHT_BOTTOM
rev 1.2, prev_rev 1.1
Index: CATTOP_LEFTRIGHT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/fixedwidth/regions=
/CATTOP_LEFTRIGHT_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CATTOP_LEFTRIGHT_BOTTOM 16 Aug 2002 21:44:52 -0000 1.1
+++ CATTOP_LEFTRIGHT_BOTTOM 13 Sep 2002 20:46:18 -0000 1.2
@@ -1,4 +1,4 @@
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
<center>
<p><a href=3D"http://www.icdevgroup.org/"><img src=3D"__THEME_IMG_DI=
R__poweredby.gif" border=3D"0"></a></p>
@@ -19,13 +19,13 @@
<table class=3D"rightwidth">
<tr>
<td>
- [include file=3D"templates/components/[control component none]" group=
=3Dvertical][control]
+ [component group=3Dvertical]
</td>
</tr>
</table>
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +4 -4 interchange/dist/foundation/templates/fixedwidth/regio=
ns/CATTOP_LEFTRIGHT_TOP
rev 1.3, prev_rev 1.2
Index: CATTOP_LEFTRIGHT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/fixedwidth/regions=
/CATTOP_LEFTRIGHT_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CATTOP_LEFTRIGHT_TOP 19 Aug 2002 01:33:30 -0000 1.2
+++ CATTOP_LEFTRIGHT_TOP 13 Sep 2002 20:46:18 -0000 1.3
@@ -36,7 +36,7 @@
<tr>
<td width=3D"100%" class=3D"categorybar">
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- [include file=3D"templates/components/[control component none]" grou=
p=3Dcontent][control]
+ [component group=3Dcontent]
</table>=09=09=09=09=20=20
</td>
</tr>
@@ -73,9 +73,9 @@
<a href=3D"[area aboutus]"><img alt=3D"About Us" border=3D"0" src=3D"_=
_THEME_IMG_DIR__about.gif"></a>
<br><br>
<table>
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
<tr><td><br></td></tr>
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
</table>
</td>
</tr>
@@ -85,5 +85,5 @@
<table class=3D"centerwidth">
<tr>
<td>
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +1 -1 interchange/dist/foundation/templates/fixedwidth/regio=
ns/CATTOP_NOLEFT_BOTTOM
rev 1.2, prev_rev 1.1
Index: CATTOP_NOLEFT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/fixedwidth/regions=
/CATTOP_NOLEFT_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CATTOP_NOLEFT_BOTTOM 16 Aug 2002 21:44:52 -0000 1.1
+++ CATTOP_NOLEFT_BOTTOM 13 Sep 2002 20:46:18 -0000 1.2
@@ -8,7 +8,7 @@
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
=20
1.3 +1 -1 interchange/dist/foundation/templates/fixedwidth/regio=
ns/CATTOP_NOLEFT_TOP
rev 1.3, prev_rev 1.2
Index: CATTOP_NOLEFT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/fixedwidth/regions=
/CATTOP_NOLEFT_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CATTOP_NOLEFT_TOP 19 Aug 2002 01:33:30 -0000 1.2
+++ CATTOP_NOLEFT_TOP 13 Sep 2002 20:46:18 -0000 1.3
@@ -64,5 +64,5 @@
<table class=3D"pagewidth" border=3D"0" cellspacing=3D"0" cellpadding=3D"0=
">
<tr>=20
<td width=3D"95%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +2 -2 interchange/dist/foundation/templates/fixedwidth/regio=
ns/LEFTONLY_BOTTOM
rev 1.2, prev_rev 1.1
Index: LEFTONLY_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/fixedwidth/regions=
/LEFTONLY_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LEFTONLY_BOTTOM 16 Aug 2002 21:44:52 -0000 1.1
+++ LEFTONLY_BOTTOM 13 Sep 2002 20:46:18 -0000 1.2
@@ -1,4 +1,4 @@
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
</td>
</tr>
@@ -16,6 +16,6 @@
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +4 -4 interchange/dist/foundation/templates/fixedwidth/regio=
ns/LEFTONLY_TOP
rev 1.3, prev_rev 1.2
Index: LEFTONLY_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/fixedwidth/regions=
/LEFTONLY_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LEFTONLY_TOP 19 Aug 2002 01:33:30 -0000 1.2
+++ LEFTONLY_TOP 13 Sep 2002 20:46:18 -0000 1.3
@@ -65,14 +65,14 @@
<td valign=3D"top" align=3D"left" class=3D"categorybar">=20
<!--Left Sidebar-->
<table class=3D"leftwidth" border=3D"0" cellspacing=3D"0" cellpadding=
=3D"0">
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
+ [component group=3Dvertical]
+ [component group=3Dvertical]
</table>=09=09=09=09=20=20
</td>
<td valign=3D"top" align=3D"center" class=3D"maincontent">=20
<table class=3D"leftonly-centerwidth">
<tr>
<td>
- [include file=3D"templates/components/[control component none]" gr=
oup=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +3 -3 interchange/dist/foundation/templates/fixedwidth/regio=
ns/LEFTRIGHT_BOTTOM
rev 1.2, prev_rev 1.1
Index: LEFTRIGHT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/fixedwidth/regions=
/LEFTRIGHT_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LEFTRIGHT_BOTTOM 16 Aug 2002 21:44:52 -0000 1.1
+++ LEFTRIGHT_BOTTOM 13 Sep 2002 20:46:18 -0000 1.2
@@ -1,4 +1,4 @@
- [include file=3D"templates/components/[control component none]" gr=
oup=3Dcontent][control]
+ [component group=3Dcontent]
=20
<center>
<p><a href=3D"http://www.icdevgroup.org/"><img src=3D"__THEME_IM=
G_DIR__poweredby.gif" border=3D"0"></a></p>
@@ -20,13 +20,13 @@
<table class=3D"rightwidth">
<tr>
<td>
- [include file=3D"templates/components/[control component none]" gr=
oup=3Dvertical][control]
+ [component group=3Dvertical]
</td>
</tr>
</table>
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +4 -4 interchange/dist/foundation/templates/fixedwidth/regio=
ns/LEFTRIGHT_TOP
rev 1.3, prev_rev 1.2
Index: LEFTRIGHT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/fixedwidth/regions=
/LEFTRIGHT_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LEFTRIGHT_TOP 19 Aug 2002 01:33:30 -0000 1.2
+++ LEFTRIGHT_TOP 13 Sep 2002 20:46:18 -0000 1.3
@@ -65,14 +65,14 @@
<td valign=3D"top" align=3D"left" class=3D"categorybar">=20
<!--Left Sidebar-->
<table class=3D"leftwidth" border=3D"0" cellspacing=3D"0" cellpadding=
=3D"0">
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
+ [component group=3Dvertical]
+ [component group=3Dvertical]
</table>=09=09=09=09=20=20
</td>
<td valign=3D"top" align=3D"center" class=3D"maincontent">=20
<table class=3D"centerwidth">
<tr>
<td>
- [include file=3D"templates/components/[control component none]" gr=
oup=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +1 -1 interchange/dist/foundation/templates/fixedwidth/regio=
ns/NOLEFT_BOTTOM
rev 1.2, prev_rev 1.1
Index: NOLEFT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/fixedwidth/regions=
/NOLEFT_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NOLEFT_BOTTOM 16 Aug 2002 21:44:52 -0000 1.1
+++ NOLEFT_BOTTOM 13 Sep 2002 20:46:18 -0000 1.2
@@ -8,6 +8,6 @@
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +1 -1 interchange/dist/foundation/templates/fixedwidth/regio=
ns/NOLEFT_TOP
rev 1.3, prev_rev 1.2
Index: NOLEFT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/fixedwidth/regions=
/NOLEFT_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NOLEFT_TOP 19 Aug 2002 01:33:30 -0000 1.2
+++ NOLEFT_TOP 13 Sep 2002 20:46:18 -0000 1.3
@@ -64,5 +64,5 @@
<table class=3D"pagewidth" border=3D"0" cellspacing=3D"0" cellpadding=3D"0=
">
<tr>=20
<td width=3D"95%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
2.2 +2 -2 interchange/dist/foundation/templates/foundation/regio=
ns/LEFTONLY_BOTTOM
rev 2.2, prev_rev 2.1
Index: LEFTONLY_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/foundation/regions=
/LEFTONLY_BOTTOM,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- LEFTONLY_BOTTOM 17 Apr 2002 17:55:49 -0000 2.1
+++ LEFTONLY_BOTTOM 13 Sep 2002 20:46:19 -0000 2.2
@@ -1,4 +1,4 @@
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
<center>
<p><a href=3D"@_INTERCHANGE_URL_@"><img src=3D"__THEME_IMG_DIR__powere=
dby.gif" border=3D"0" alt=3D"Powered by Interchange"></a></p>
@@ -10,6 +10,6 @@
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
2.4 +4 -4 interchange/dist/foundation/templates/foundation/regio=
ns/LEFTONLY_TOP
rev 2.4, prev_rev 2.3
Index: LEFTONLY_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/foundation/regions=
/LEFTONLY_TOP,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -r2.3 -r2.4
--- LEFTONLY_TOP 4 Aug 2002 20:45:48 -0000 2.3
+++ LEFTONLY_TOP 13 Sep 2002 20:46:19 -0000 2.4
@@ -67,11 +67,11 @@
<td width=3D"20%" valign=3D"top" align=3D"left" class=3D"categorybar">=
=20
<!--Left Sidebar-->
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- [include file=3D"templates/components/[control component search_box_=
small]" group=3Dvertical][control]
- [include file=3D"templates/components/[control component category_ve=
rtical]" group=3Dvertical][control]
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component default=3Dsearch_box_small group=3Dvertical]
+ [component default=3Dcategory_vertical group=3Dvertical]
+ [component group=3Dvertical]
</table>=09=09=09=09=20=20
</td>
<td width=3D"80%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
2.3 +5 -5 interchange/dist/foundation/templates/foundation/regio=
ns/LEFTRIGHT_BOTTOM
rev 2.3, prev_rev 2.2
Index: LEFTRIGHT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/foundation/regions=
/LEFTRIGHT_BOTTOM,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- LEFTRIGHT_BOTTOM 17 Apr 2002 17:55:49 -0000 2.2
+++ LEFTRIGHT_BOTTOM 13 Sep 2002 20:46:19 -0000 2.3
@@ -1,5 +1,5 @@
<!-- BEGIN LEFTRIGHT_BOTTOM -->
- [component comp-name=3D"[control component none]" group=3Dcontent]
+ [component group=3Dcontent]
=20
<center>
<p><a href=3D"@_INTERCHANGE_URL_@"><img src=3D"__THEME_IMG_DIR__powere=
dby.gif" border=3D"0" alt=3D"Powered by Interchange"></a></p>
@@ -14,14 +14,14 @@
</td>
<td width=3D"15%" valign=3D"top" align=3D"right" class=3D"maincontent">
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- [component comp-name=3D"[control component none]" group=3Dvertical]
- [component comp-name=3D"[control component none]" group=3Dvertical]
- [component comp-name=3D"[control component none]" group=3Dvertical]
+ [component group=3Dvertical]
+ [component group=3Dvertical]
+ [component group=3Dvertical]
</table>
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
<!-- END LEFTRIGHT_BOTTOM -->
2.4 +4 -4 interchange/dist/foundation/templates/foundation/regio=
ns/LEFTRIGHT_TOP
rev 2.4, prev_rev 2.3
Index: LEFTRIGHT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/foundation/regions=
/LEFTRIGHT_TOP,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -r2.3 -r2.4
--- LEFTRIGHT_TOP 4 Aug 2002 20:45:48 -0000 2.3
+++ LEFTRIGHT_TOP 13 Sep 2002 20:46:19 -0000 2.4
@@ -68,11 +68,11 @@
<td width=3D"20%" valign=3D"top" align=3D"left" class=3D"categorybar">=
=20
<!--Left Sidebar-->
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- [include file=3D"templates/components/[control component search_box_=
small]" group=3Dvertical][control]
- [include file=3D"templates/components/[control component category_ve=
rtical]" group=3Dvertical][control]
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component default=3Dsearch_box_small group=3Dvertical]
+ [component default=3Dcategory_vertical group=3Dvertical]
+ [component group=3Dvertical]
</table>=09=09=09=09=20=20
</td>
<td width=3D"65%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
2.2 +1 -1 interchange/dist/foundation/templates/foundation/regio=
ns/NOLEFT_BOTTOM
rev 2.2, prev_rev 2.1
Index: NOLEFT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/foundation/regions=
/NOLEFT_BOTTOM,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- NOLEFT_BOTTOM 17 Apr 2002 17:55:49 -0000 2.1
+++ NOLEFT_BOTTOM 13 Sep 2002 20:46:19 -0000 2.2
@@ -10,6 +10,6 @@
</table>
=20
<br>
-
+__ADL_PAGE__
</body>
</html>
2.4 +1 -1 interchange/dist/foundation/templates/foundation/regio=
ns/NOLEFT_TOP
rev 2.4, prev_rev 2.3
Index: NOLEFT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/foundation/regions=
/NOLEFT_TOP,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -r2.3 -r2.4
--- NOLEFT_TOP 4 Aug 2002 20:45:48 -0000 2.3
+++ NOLEFT_TOP 13 Sep 2002 20:46:19 -0000 2.4
@@ -67,5 +67,5 @@
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
<tr>=20
<td width=3D"95%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +2 -2 interchange/dist/foundation/templates/grayorange/regio=
ns/CATTOP_LEFTONLY_BOTTOM
rev 1.2, prev_rev 1.1
Index: CATTOP_LEFTONLY_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/grayorange/regions=
/CATTOP_LEFTONLY_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CATTOP_LEFTONLY_BOTTOM 16 Aug 2002 21:44:52 -0000 1.1
+++ CATTOP_LEFTONLY_BOTTOM 13 Sep 2002 20:46:19 -0000 1.2
@@ -1,4 +1,4 @@
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
<center>
<p><a href=3D"http://www.icdevgroup.org/"><img src=3D"__THEME_IMG_DIR_=
_poweredby.gif" border=3D"0"></a></p>
@@ -10,6 +10,6 @@
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +4 -4 interchange/dist/foundation/templates/grayorange/regio=
ns/CATTOP_LEFTONLY_TOP
rev 1.3, prev_rev 1.2
Index: CATTOP_LEFTONLY_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/grayorange/regions=
/CATTOP_LEFTONLY_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CATTOP_LEFTONLY_TOP 19 Aug 2002 01:33:30 -0000 1.2
+++ CATTOP_LEFTONLY_TOP 13 Sep 2002 20:46:19 -0000 1.3
@@ -33,7 +33,7 @@
<tr>
<td width=3D"100%" class=3D"categorybar">
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- [include file=3D"templates/components/[control component none]" grou=
p=3Dcontent][control]
+ [component group=3Dcontent]
</table>=09=09=09=09=20=20
</td>
</tr>
@@ -47,9 +47,9 @@
<tr>=20
<td width=3D"20%" valign=3D"top" align=3D"left" class=3D"menubar">=20
<table>
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
<tr><td><br></td></tr>
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
</table>
<!--Left Sidebar-->
<br>
@@ -72,5 +72,5 @@
<a href=3D"[area aboutus]"><img alt=3D"About Us" border=3D"0" src=3D"_=
_THEME_IMG_DIR__about.gif"></a>
</td>
<td width=3D"80%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +3 -3 interchange/dist/foundation/templates/grayorange/regio=
ns/CATTOP_LEFTRIGHT_BOTTOM
rev 1.2, prev_rev 1.1
Index: CATTOP_LEFTRIGHT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/grayorange/regions=
/CATTOP_LEFTRIGHT_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CATTOP_LEFTRIGHT_BOTTOM 16 Aug 2002 21:44:52 -0000 1.1
+++ CATTOP_LEFTRIGHT_BOTTOM 13 Sep 2002 20:46:19 -0000 1.2
@@ -1,4 +1,4 @@
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
<center>
<p><a href=3D"http://www.icdevgroup.org/"><img src=3D"__THEME_IMG_DIR_=
_poweredby.gif" border=3D"0"></a></p>
@@ -12,10 +12,10 @@
<img src=3D"__THEME_IMG_DIR__littlebar.gif" width=3D"1" height=3D"650">
</td>
<td width=3D"15%" valign=3D"top" align=3D"right" class=3D"maincontent">
- [include file=3D"templates/components/[control component none]" group=
=3Dvertical][control]
+ [component group=3Dvertical]
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +4 -4 interchange/dist/foundation/templates/grayorange/regio=
ns/CATTOP_LEFTRIGHT_TOP
rev 1.3, prev_rev 1.2
Index: CATTOP_LEFTRIGHT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/grayorange/regions=
/CATTOP_LEFTRIGHT_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CATTOP_LEFTRIGHT_TOP 19 Aug 2002 01:33:30 -0000 1.2
+++ CATTOP_LEFTRIGHT_TOP 13 Sep 2002 20:46:19 -0000 1.3
@@ -33,7 +33,7 @@
<tr>
<td width=3D"100%" class=3D"categorybar">
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- [include file=3D"templates/components/[control component none]" grou=
p=3Dcontent][control]
+ [component group=3Dcontent]
</table>=09=09=09=09=20=20
</td>
</tr>
@@ -47,9 +47,9 @@
<tr>=20
<td width=3D"20%" valign=3D"top" align=3D"left" class=3D"menubar">=20
<table>
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
<tr><td><br></td></tr>
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
</table>
<!--Left Sidebar-->
<br>
@@ -72,5 +72,5 @@
<a href=3D"[area aboutus]"><img alt=3D"About Us" border=3D"0" src=3D"_=
_THEME_IMG_DIR__about.gif"></a>
</td>
<td width=3D"65%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +1 -1 interchange/dist/foundation/templates/grayorange/regio=
ns/CATTOP_NOLEFT_BOTTOM
rev 1.2, prev_rev 1.1
Index: CATTOP_NOLEFT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/grayorange/regions=
/CATTOP_NOLEFT_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CATTOP_NOLEFT_BOTTOM 16 Aug 2002 21:44:52 -0000 1.1
+++ CATTOP_NOLEFT_BOTTOM 13 Sep 2002 20:46:19 -0000 1.2
@@ -8,6 +8,6 @@
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +1 -1 interchange/dist/foundation/templates/grayorange/regio=
ns/CATTOP_NOLEFT_TOP
rev 1.3, prev_rev 1.2
Index: CATTOP_NOLEFT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/grayorange/regions=
/CATTOP_NOLEFT_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CATTOP_NOLEFT_TOP 19 Aug 2002 01:33:30 -0000 1.2
+++ CATTOP_NOLEFT_TOP 13 Sep 2002 20:46:19 -0000 1.3
@@ -61,5 +61,5 @@
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
<tr>=20
<td width=3D"95%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +2 -2 interchange/dist/foundation/templates/grayorange/regio=
ns/LEFTONLY_BOTTOM
rev 1.2, prev_rev 1.1
Index: LEFTONLY_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/grayorange/regions=
/LEFTONLY_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LEFTONLY_BOTTOM 16 Aug 2002 21:44:52 -0000 1.1
+++ LEFTONLY_BOTTOM 13 Sep 2002 20:46:19 -0000 1.2
@@ -1,4 +1,4 @@
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
<br><br>
<center>
@@ -10,6 +10,6 @@
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +4 -4 interchange/dist/foundation/templates/grayorange/regio=
ns/LEFTONLY_TOP
rev 1.3, prev_rev 1.2
Index: LEFTONLY_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/grayorange/regions=
/LEFTONLY_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LEFTONLY_TOP 19 Aug 2002 01:33:30 -0000 1.2
+++ LEFTONLY_TOP 13 Sep 2002 20:46:19 -0000 1.3
@@ -61,11 +61,11 @@
<td width=3D"20%" valign=3D"top" align=3D"left" class=3D"categorybar">=
=20
<!--Left Sidebar-->
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
+ [component group=3Dvertical]
+ [component group=3Dvertical]
</table>=09=09=09=09=20=20
</td>
<td width=3D"80%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +3 -3 interchange/dist/foundation/templates/grayorange/regio=
ns/LEFTRIGHT_BOTTOM
rev 1.2, prev_rev 1.1
Index: LEFTRIGHT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/grayorange/regions=
/LEFTRIGHT_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LEFTRIGHT_BOTTOM 16 Aug 2002 21:44:52 -0000 1.1
+++ LEFTRIGHT_BOTTOM 13 Sep 2002 20:46:19 -0000 1.2
@@ -1,4 +1,4 @@
- [include file=3D"templates/components/[control component none]" grou=
p=3Dcontent][control]
+ [component group=3Dcontent]
=20
<br><br>
<center>
@@ -15,10 +15,10 @@
<img src=3D"__THEME_IMG_DIR__littlebar.gif" width=3D"1" height=3D"650">
</td>
<td width=3D"15%" valign=3D"top" align=3D"right" class=3D"maincontent">
- [include file=3D"templates/components/[control component none]" group=
=3Dvertical][control]
+ [component group=3Dvertical]
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +4 -4 interchange/dist/foundation/templates/grayorange/regio=
ns/LEFTRIGHT_TOP
rev 1.3, prev_rev 1.2
Index: LEFTRIGHT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/grayorange/regions=
/LEFTRIGHT_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LEFTRIGHT_TOP 19 Aug 2002 01:33:30 -0000 1.2
+++ LEFTRIGHT_TOP 13 Sep 2002 20:46:19 -0000 1.3
@@ -62,11 +62,11 @@
<td width=3D"20%" valign=3D"top" align=3D"left" class=3D"categorybar">=
=20
<!--Left Sidebar-->
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- [include file=3D"templates/components/[control component search_box_=
small]" group=3Dvertical][control]
- [include file=3D"templates/components/[control component category_ve=
rtical]" group=3Dvertical][control]
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component default=3Dsearch_box_small group=3Dvertical]
+ [component default=3Dcategory_vertical group=3Dvertical]
+ [component group=3Dvertical]
</table>=09=09=09=09=20=20
</td>
<td width=3D"65%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +1 -1 interchange/dist/foundation/templates/grayorange/regio=
ns/NOLEFT_BOTTOM
rev 1.2, prev_rev 1.1
Index: NOLEFT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/grayorange/regions=
/NOLEFT_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NOLEFT_BOTTOM 16 Aug 2002 21:44:52 -0000 1.1
+++ NOLEFT_BOTTOM 13 Sep 2002 20:46:19 -0000 1.2
@@ -11,6 +11,6 @@
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +1 -1 interchange/dist/foundation/templates/grayorange/regio=
ns/NOLEFT_TOP
rev 1.3, prev_rev 1.2
Index: NOLEFT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/grayorange/regions=
/NOLEFT_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NOLEFT_TOP 19 Aug 2002 01:33:30 -0000 1.2
+++ NOLEFT_TOP 13 Sep 2002 20:46:19 -0000 1.3
@@ -60,5 +60,5 @@
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
<tr>=20
<td width=3D"95%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +2 -2 interchange/dist/foundation/templates/grayscale/region=
s/CATTOP_LEFTONLY_BOTTOM
rev 1.2, prev_rev 1.1
Index: CATTOP_LEFTONLY_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/grayscale/regions/=
CATTOP_LEFTONLY_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CATTOP_LEFTONLY_BOTTOM 16 Aug 2002 21:44:53 -0000 1.1
+++ CATTOP_LEFTONLY_BOTTOM 13 Sep 2002 20:46:19 -0000 1.2
@@ -1,4 +1,4 @@
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
<center>
<p><a href=3D"http://www.icdevgroup.org/"><img src=3D"__THEME_IMG_DIR_=
_poweredby.gif" border=3D"0"></a></p>
@@ -10,6 +10,6 @@
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +4 -4 interchange/dist/foundation/templates/grayscale/region=
s/CATTOP_LEFTONLY_TOP
rev 1.3, prev_rev 1.2
Index: CATTOP_LEFTONLY_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/grayscale/regions/=
CATTOP_LEFTONLY_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CATTOP_LEFTONLY_TOP 19 Aug 2002 01:33:31 -0000 1.2
+++ CATTOP_LEFTONLY_TOP 13 Sep 2002 20:46:19 -0000 1.3
@@ -33,7 +33,7 @@
<tr>
<td width=3D"100%" class=3D"categorybar">
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- [include file=3D"templates/components/[control component none]" grou=
p=3Dcontent][control]
+ [component group=3Dcontent]
</table>=09=09=09=09=20=20
</td>
</tr>
@@ -47,9 +47,9 @@
<tr>=20
<td width=3D"20%" valign=3D"top" align=3D"left" class=3D"menubar">=20
<table>
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
<tr><td><br></td></tr>
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
</table>
<!--Left Sidebar-->
<br>
@@ -72,5 +72,5 @@
<a href=3D"[area aboutus]"><img alt=3D"About Us" border=3D"0" src=3D"_=
_THEME_IMG_DIR__about.gif"></a>
</td>
<td width=3D"80%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +3 -3 interchange/dist/foundation/templates/grayscale/region=
s/CATTOP_LEFTRIGHT_BOTTOM
rev 1.2, prev_rev 1.1
Index: CATTOP_LEFTRIGHT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/grayscale/regions/=
CATTOP_LEFTRIGHT_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CATTOP_LEFTRIGHT_BOTTOM 16 Aug 2002 21:44:53 -0000 1.1
+++ CATTOP_LEFTRIGHT_BOTTOM 13 Sep 2002 20:46:19 -0000 1.2
@@ -1,4 +1,4 @@
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
<center>
<p><a href=3D"http://www.icdevgroup.org/"><img src=3D"__THEME_IMG_DIR_=
_poweredby.gif" border=3D"0"></a></p>
@@ -12,10 +12,10 @@
<img src=3D"__THEME_IMG_DIR__littlebar.gif" width=3D"1" height=3D"650">
</td>
<td width=3D"15%" valign=3D"top" align=3D"right" class=3D"maincontent">
- [include file=3D"templates/components/[control component none]" group=
=3Dvertical][control]
+ [component group=3Dvertical]
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +4 -4 interchange/dist/foundation/templates/grayscale/region=
s/CATTOP_LEFTRIGHT_TOP
rev 1.3, prev_rev 1.2
Index: CATTOP_LEFTRIGHT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/grayscale/regions/=
CATTOP_LEFTRIGHT_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CATTOP_LEFTRIGHT_TOP 19 Aug 2002 01:33:31 -0000 1.2
+++ CATTOP_LEFTRIGHT_TOP 13 Sep 2002 20:46:19 -0000 1.3
@@ -33,7 +33,7 @@
<tr>
<td width=3D"100%" class=3D"categorybar">
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- [include file=3D"templates/components/[control component none]" grou=
p=3Dcontent][control]
+ [component group=3Dcontent]
</table>=09=09=09=09=20=20
</td>
</tr>
@@ -47,9 +47,9 @@
<tr>=20
<td width=3D"20%" valign=3D"top" align=3D"left" class=3D"menubar">=20
<table>
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
<tr><td><br></td></tr>
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
</table>
<!--Left Sidebar-->
<br>
@@ -72,5 +72,5 @@
<a href=3D"[area aboutus]"><img alt=3D"About Us" border=3D"0" src=3D"_=
_THEME_IMG_DIR__about.gif"></a>
</td>
<td width=3D"65%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +1 -1 interchange/dist/foundation/templates/grayscale/region=
s/CATTOP_NOLEFT_BOTTOM
rev 1.2, prev_rev 1.1
Index: CATTOP_NOLEFT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/grayscale/regions/=
CATTOP_NOLEFT_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CATTOP_NOLEFT_BOTTOM 16 Aug 2002 21:44:53 -0000 1.1
+++ CATTOP_NOLEFT_BOTTOM 13 Sep 2002 20:46:19 -0000 1.2
@@ -8,6 +8,6 @@
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +1 -1 interchange/dist/foundation/templates/grayscale/region=
s/CATTOP_NOLEFT_TOP
rev 1.3, prev_rev 1.2
Index: CATTOP_NOLEFT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/grayscale/regions/=
CATTOP_NOLEFT_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CATTOP_NOLEFT_TOP 19 Aug 2002 01:33:31 -0000 1.2
+++ CATTOP_NOLEFT_TOP 13 Sep 2002 20:46:19 -0000 1.3
@@ -61,5 +61,5 @@
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
<tr>=20
<td width=3D"95%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +2 -2 interchange/dist/foundation/templates/grayscale/region=
s/LEFTONLY_BOTTOM
rev 1.2, prev_rev 1.1
Index: LEFTONLY_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/grayscale/regions/=
LEFTONLY_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LEFTONLY_BOTTOM 16 Aug 2002 21:44:53 -0000 1.1
+++ LEFTONLY_BOTTOM 13 Sep 2002 20:46:19 -0000 1.2
@@ -1,4 +1,4 @@
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
<br><br>
<center>
@@ -13,6 +13,6 @@
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +4 -4 interchange/dist/foundation/templates/grayscale/region=
s/LEFTONLY_TOP
rev 1.3, prev_rev 1.2
Index: LEFTONLY_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/grayscale/regions/=
LEFTONLY_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LEFTONLY_TOP 19 Aug 2002 01:33:31 -0000 1.2
+++ LEFTONLY_TOP 13 Sep 2002 20:46:19 -0000 1.3
@@ -61,11 +61,11 @@
<td width=3D"20%" valign=3D"top" align=3D"left" class=3D"categorybar">=
=20
<!--Left Sidebar-->
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
+ [component group=3Dvertical]
+ [component group=3Dvertical]
</table>=09=09=09=09=20=20
</td>
<td width=3D"80%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +3 -3 interchange/dist/foundation/templates/grayscale/region=
s/LEFTRIGHT_BOTTOM
rev 1.2, prev_rev 1.1
Index: LEFTRIGHT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/grayscale/regions/=
LEFTRIGHT_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LEFTRIGHT_BOTTOM 16 Aug 2002 21:44:53 -0000 1.1
+++ LEFTRIGHT_BOTTOM 13 Sep 2002 20:46:19 -0000 1.2
@@ -1,4 +1,4 @@
- [include file=3D"templates/components/[control component none]" grou=
p=3Dcontent][control]
+ [component group=3Dcontent]
=20
<br><br>
<center>
@@ -15,10 +15,10 @@
<img src=3D"__THEME_IMG_DIR__littlebar.gif" width=3D"1" height=3D"650">
</td>
<td width=3D"15%" valign=3D"top" align=3D"right" class=3D"maincontent">
- [include file=3D"templates/components/[control component none]" group=
=3Dvertical][control]
+ [component group=3Dvertical]
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +4 -4 interchange/dist/foundation/templates/grayscale/region=
s/LEFTRIGHT_TOP
rev 1.3, prev_rev 1.2
Index: LEFTRIGHT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/grayscale/regions/=
LEFTRIGHT_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LEFTRIGHT_TOP 19 Aug 2002 01:33:31 -0000 1.2
+++ LEFTRIGHT_TOP 13 Sep 2002 20:46:19 -0000 1.3
@@ -62,11 +62,11 @@
<td width=3D"20%" valign=3D"top" align=3D"left" class=3D"categorybar">=
=20
<!--Left Sidebar-->
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- [include file=3D"templates/components/[control component search_box_=
small]" group=3Dvertical][control]
- [include file=3D"templates/components/[control component category_ve=
rtical]" group=3Dvertical][control]
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component default=3Dsearch_box_small group=3Dvertical]
+ [component default=3Dcategory_vertical group=3Dvertical]
+ [component group=3Dvertical]
</table>=09=09=09=09=20=20
</td>
<td width=3D"65%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +1 -1 interchange/dist/foundation/templates/grayscale/region=
s/NOLEFT_BOTTOM
rev 1.2, prev_rev 1.1
Index: NOLEFT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/grayscale/regions/=
NOLEFT_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NOLEFT_BOTTOM 16 Aug 2002 21:44:53 -0000 1.1
+++ NOLEFT_BOTTOM 13 Sep 2002 20:46:19 -0000 1.2
@@ -11,6 +11,6 @@
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +1 -1 interchange/dist/foundation/templates/grayscale/region=
s/NOLEFT_TOP
rev 1.3, prev_rev 1.2
Index: NOLEFT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/grayscale/regions/=
NOLEFT_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NOLEFT_TOP 19 Aug 2002 01:33:31 -0000 1.2
+++ NOLEFT_TOP 13 Sep 2002 20:46:19 -0000 1.3
@@ -60,5 +60,5 @@
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
<tr>=20
<td width=3D"95%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +2 -2 interchange/dist/foundation/templates/greens/regions/C=
ATTOP_LEFTONLY_BOTTOM
rev 1.2, prev_rev 1.1
Index: CATTOP_LEFTONLY_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/greens/regions/CAT=
TOP_LEFTONLY_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CATTOP_LEFTONLY_BOTTOM 16 Aug 2002 21:44:53 -0000 1.1
+++ CATTOP_LEFTONLY_BOTTOM 13 Sep 2002 20:46:20 -0000 1.2
@@ -1,4 +1,4 @@
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
<center>
<p><a href=3D"http://www.icdevgroup.org/"><img src=3D"__THEME_IMG_DIR_=
_poweredby.gif" border=3D"0"></a></p>
@@ -10,6 +10,6 @@
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +4 -4 interchange/dist/foundation/templates/greens/regions/C=
ATTOP_LEFTONLY_TOP
rev 1.3, prev_rev 1.2
Index: CATTOP_LEFTONLY_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/greens/regions/CAT=
TOP_LEFTONLY_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CATTOP_LEFTONLY_TOP 19 Aug 2002 01:33:31 -0000 1.2
+++ CATTOP_LEFTONLY_TOP 13 Sep 2002 20:46:20 -0000 1.3
@@ -33,7 +33,7 @@
<tr>
<td width=3D"100%" class=3D"categorybar">
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- [include file=3D"templates/components/[control component none]" grou=
p=3Dcontent][control]
+ [component group=3Dcontent]
</table>=09=09=09=09=20=20
</td>
</tr>
@@ -47,9 +47,9 @@
<tr>=20
<td width=3D"20%" valign=3D"top" align=3D"left" class=3D"menubar">=20
<table>
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
<tr><td><br></td></tr>
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
</table>
<!--Left Sidebar-->
<br>
@@ -72,5 +72,5 @@
<a href=3D"[area aboutus]"><img alt=3D"About Us" border=3D"0" src=3D"_=
_THEME_IMG_DIR__about.gif"></a>
</td>
<td width=3D"80%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +3 -3 interchange/dist/foundation/templates/greens/regions/C=
ATTOP_LEFTRIGHT_BOTTOM
rev 1.2, prev_rev 1.1
Index: CATTOP_LEFTRIGHT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/greens/regions/CAT=
TOP_LEFTRIGHT_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CATTOP_LEFTRIGHT_BOTTOM 16 Aug 2002 21:44:53 -0000 1.1
+++ CATTOP_LEFTRIGHT_BOTTOM 13 Sep 2002 20:46:20 -0000 1.2
@@ -1,4 +1,4 @@
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
<center>
<p><a href=3D"http://www.icdevgroup.org/"><img src=3D"__THEME_IMG_DIR_=
_poweredby.gif" border=3D"0"></a></p>
@@ -12,10 +12,10 @@
<img src=3D"__THEME_IMG_DIR__littlebar.gif" width=3D"1" height=3D"650">
</td>
<td width=3D"15%" valign=3D"top" align=3D"right" class=3D"maincontent">
- [include file=3D"templates/components/[control component none]" group=
=3Dvertical][control]
+ [component group=3Dvertical]
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +4 -4 interchange/dist/foundation/templates/greens/regions/C=
ATTOP_LEFTRIGHT_TOP
rev 1.3, prev_rev 1.2
Index: CATTOP_LEFTRIGHT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/greens/regions/CAT=
TOP_LEFTRIGHT_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CATTOP_LEFTRIGHT_TOP 19 Aug 2002 01:33:31 -0000 1.2
+++ CATTOP_LEFTRIGHT_TOP 13 Sep 2002 20:46:20 -0000 1.3
@@ -33,7 +33,7 @@
<tr>
<td width=3D"100%" class=3D"categorybar">
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- [include file=3D"templates/components/[control component none]" grou=
p=3Dcontent][control]
+ [component group=3Dcontent]
</table>=09=09=09=09=20=20
</td>
</tr>
@@ -47,9 +47,9 @@
<tr>=20
<td width=3D"20%" valign=3D"top" align=3D"left" class=3D"menubar">=20
<table>
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
<tr><td><br></td></tr>
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
</table>
<!--Left Sidebar-->
<br>
@@ -72,5 +72,5 @@
<a href=3D"[area aboutus]"><img alt=3D"About Us" border=3D"0" src=3D"_=
_THEME_IMG_DIR__about.gif"></a>
</td>
<td width=3D"65%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +1 -1 interchange/dist/foundation/templates/greens/regions/C=
ATTOP_NOLEFT_BOTTOM
rev 1.2, prev_rev 1.1
Index: CATTOP_NOLEFT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/greens/regions/CAT=
TOP_NOLEFT_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CATTOP_NOLEFT_BOTTOM 16 Aug 2002 21:44:53 -0000 1.1
+++ CATTOP_NOLEFT_BOTTOM 13 Sep 2002 20:46:20 -0000 1.2
@@ -8,6 +8,6 @@
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +1 -1 interchange/dist/foundation/templates/greens/regions/C=
ATTOP_NOLEFT_TOP
rev 1.3, prev_rev 1.2
Index: CATTOP_NOLEFT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/greens/regions/CAT=
TOP_NOLEFT_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CATTOP_NOLEFT_TOP 19 Aug 2002 01:33:31 -0000 1.2
+++ CATTOP_NOLEFT_TOP 13 Sep 2002 20:46:20 -0000 1.3
@@ -61,5 +61,5 @@
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
<tr>=20
<td width=3D"95%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +2 -2 interchange/dist/foundation/templates/greens/regions/L=
EFTONLY_BOTTOM
rev 1.2, prev_rev 1.1
Index: LEFTONLY_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/greens/regions/LEF=
TONLY_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LEFTONLY_BOTTOM 16 Aug 2002 21:44:53 -0000 1.1
+++ LEFTONLY_BOTTOM 13 Sep 2002 20:46:20 -0000 1.2
@@ -1,4 +1,4 @@
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
<br><br>
<center>
@@ -13,6 +13,6 @@
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +4 -4 interchange/dist/foundation/templates/greens/regions/L=
EFTONLY_TOP
rev 1.3, prev_rev 1.2
Index: LEFTONLY_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/greens/regions/LEF=
TONLY_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LEFTONLY_TOP 19 Aug 2002 01:33:31 -0000 1.2
+++ LEFTONLY_TOP 13 Sep 2002 20:46:20 -0000 1.3
@@ -61,11 +61,11 @@
<td width=3D"20%" valign=3D"top" align=3D"left" class=3D"categorybar">=
=20
<!--Left Sidebar-->
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
+ [component group=3Dvertical]
+ [component group=3Dvertical]
</table>=09=09=09=09=20=20
</td>
<td width=3D"80%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +3 -3 interchange/dist/foundation/templates/greens/regions/L=
EFTRIGHT_BOTTOM
rev 1.2, prev_rev 1.1
Index: LEFTRIGHT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/greens/regions/LEF=
TRIGHT_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LEFTRIGHT_BOTTOM 16 Aug 2002 21:44:53 -0000 1.1
+++ LEFTRIGHT_BOTTOM 13 Sep 2002 20:46:20 -0000 1.2
@@ -1,4 +1,4 @@
- [include file=3D"templates/components/[control component none]" grou=
p=3Dcontent][control]
+ [component group=3Dcontent]
=20
<br><br>
<center>
@@ -15,10 +15,10 @@
<img src=3D"__THEME_IMG_DIR__littlebar.gif" width=3D"1" height=3D"650">
</td>
<td width=3D"15%" valign=3D"top" align=3D"right" class=3D"maincontent">
- [include file=3D"templates/components/[control component none]" group=
=3Dvertical][control]
+ [component group=3Dvertical]
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +4 -4 interchange/dist/foundation/templates/greens/regions/L=
EFTRIGHT_TOP
rev 1.3, prev_rev 1.2
Index: LEFTRIGHT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/greens/regions/LEF=
TRIGHT_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LEFTRIGHT_TOP 19 Aug 2002 01:33:31 -0000 1.2
+++ LEFTRIGHT_TOP 13 Sep 2002 20:46:20 -0000 1.3
@@ -62,11 +62,11 @@
<td width=3D"20%" valign=3D"top" align=3D"left" class=3D"categorybar">=
=20
<!--Left Sidebar-->
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- [include file=3D"templates/components/[control component search_box_=
small]" group=3Dvertical][control]
- [include file=3D"templates/components/[control component category_ve=
rtical]" group=3Dvertical][control]
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component default=3Dsearch_box_small group=3Dvertical]
+ [component default=3Dcategory_vertical group=3Dvertical]
+ [component group=3Dvertical]
</table>=09=09=09=09=20=20
</td>
<td width=3D"65%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +1 -1 interchange/dist/foundation/templates/greens/regions/N=
OLEFT_BOTTOM
rev 1.2, prev_rev 1.1
Index: NOLEFT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/greens/regions/NOL=
EFT_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NOLEFT_BOTTOM 16 Aug 2002 21:44:53 -0000 1.1
+++ NOLEFT_BOTTOM 13 Sep 2002 20:46:20 -0000 1.2
@@ -11,6 +11,6 @@
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +1 -1 interchange/dist/foundation/templates/greens/regions/N=
OLEFT_TOP
rev 1.3, prev_rev 1.2
Index: NOLEFT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/greens/regions/NOL=
EFT_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NOLEFT_TOP 19 Aug 2002 01:33:31 -0000 1.2
+++ NOLEFT_TOP 13 Sep 2002 20:46:20 -0000 1.3
@@ -60,5 +60,5 @@
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
<tr>=20
<td width=3D"95%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +2 -2 interchange/dist/foundation/templates/purpleyellow/reg=
ions/CATTOP_LEFTONLY_BOTTOM
rev 1.2, prev_rev 1.1
Index: CATTOP_LEFTONLY_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/purpleyellow/regio=
ns/CATTOP_LEFTONLY_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CATTOP_LEFTONLY_BOTTOM 16 Aug 2002 21:44:53 -0000 1.1
+++ CATTOP_LEFTONLY_BOTTOM 13 Sep 2002 20:46:20 -0000 1.2
@@ -1,4 +1,4 @@
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
<center>
<p><a href=3D"http://www.icdevgroup.org/"><img src=3D"__THEME_IMG_DIR_=
_poweredby.gif" border=3D"0"></a></p>
@@ -10,6 +10,6 @@
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +4 -4 interchange/dist/foundation/templates/purpleyellow/reg=
ions/CATTOP_LEFTONLY_TOP
rev 1.3, prev_rev 1.2
Index: CATTOP_LEFTONLY_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/purpleyellow/regio=
ns/CATTOP_LEFTONLY_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CATTOP_LEFTONLY_TOP 19 Aug 2002 01:33:31 -0000 1.2
+++ CATTOP_LEFTONLY_TOP 13 Sep 2002 20:46:20 -0000 1.3
@@ -33,7 +33,7 @@
<tr>
<td width=3D"100%" class=3D"categorybar">
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- [include file=3D"templates/components/[control component none]" grou=
p=3Dcontent][control]
+ [component group=3Dcontent]
</table>=09=09=09=09=20=20
</td>
</tr>
@@ -47,9 +47,9 @@
<tr>=20
<td width=3D"20%" valign=3D"top" align=3D"left" class=3D"menubar">=20
<table>
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
<tr><td><br></td></tr>
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
</table>
<!--Left Sidebar-->
<br>
@@ -72,5 +72,5 @@
<a href=3D"[area aboutus]"><img alt=3D"About Us" border=3D"0" src=3D"_=
_THEME_IMG_DIR__about.gif"></a>
</td>
<td width=3D"80%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +3 -3 interchange/dist/foundation/templates/purpleyellow/reg=
ions/CATTOP_LEFTRIGHT_BOTTOM
rev 1.2, prev_rev 1.1
Index: CATTOP_LEFTRIGHT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/purpleyellow/regio=
ns/CATTOP_LEFTRIGHT_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CATTOP_LEFTRIGHT_BOTTOM 16 Aug 2002 21:44:53 -0000 1.1
+++ CATTOP_LEFTRIGHT_BOTTOM 13 Sep 2002 20:46:20 -0000 1.2
@@ -1,4 +1,4 @@
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
<center>
<p><a href=3D"http://www.icdevgroup.org/"><img src=3D"__THEME_IMG_DIR_=
_poweredby.gif" border=3D"0"></a></p>
@@ -12,10 +12,10 @@
<img src=3D"__THEME_IMG_DIR__littlebar.gif" width=3D"1" height=3D"650">
</td>
<td width=3D"15%" valign=3D"top" align=3D"right" class=3D"maincontent">
- [include file=3D"templates/components/[control component none]" group=
=3Dvertical][control]
+ [component group=3Dvertical]
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +4 -4 interchange/dist/foundation/templates/purpleyellow/reg=
ions/CATTOP_LEFTRIGHT_TOP
rev 1.3, prev_rev 1.2
Index: CATTOP_LEFTRIGHT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/purpleyellow/regio=
ns/CATTOP_LEFTRIGHT_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CATTOP_LEFTRIGHT_TOP 19 Aug 2002 01:33:31 -0000 1.2
+++ CATTOP_LEFTRIGHT_TOP 13 Sep 2002 20:46:20 -0000 1.3
@@ -33,7 +33,7 @@
<tr>
<td width=3D"100%" class=3D"categorybar">
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- [include file=3D"templates/components/[control component none]" grou=
p=3Dcontent][control]
+ [component group=3Dcontent]
</table>=09=09=09=09=20=20
</td>
</tr>
@@ -47,9 +47,9 @@
<tr>=20
<td width=3D"20%" valign=3D"top" align=3D"left" class=3D"menubar">=20
<table>
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
<tr><td><br></td></tr>
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
</table>
<!--Left Sidebar-->
<br>
@@ -72,5 +72,5 @@
<a href=3D"[area aboutus]"><img alt=3D"About Us" border=3D"0" src=3D"_=
_THEME_IMG_DIR__about.gif"></a>
</td>
<td width=3D"65%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +1 -1 interchange/dist/foundation/templates/purpleyellow/reg=
ions/CATTOP_NOLEFT_BOTTOM
rev 1.2, prev_rev 1.1
Index: CATTOP_NOLEFT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/purpleyellow/regio=
ns/CATTOP_NOLEFT_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CATTOP_NOLEFT_BOTTOM 16 Aug 2002 21:44:53 -0000 1.1
+++ CATTOP_NOLEFT_BOTTOM 13 Sep 2002 20:46:20 -0000 1.2
@@ -8,6 +8,6 @@
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +1 -1 interchange/dist/foundation/templates/purpleyellow/reg=
ions/CATTOP_NOLEFT_TOP
rev 1.3, prev_rev 1.2
Index: CATTOP_NOLEFT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/purpleyellow/regio=
ns/CATTOP_NOLEFT_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CATTOP_NOLEFT_TOP 19 Aug 2002 01:33:31 -0000 1.2
+++ CATTOP_NOLEFT_TOP 13 Sep 2002 20:46:20 -0000 1.3
@@ -61,5 +61,5 @@
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
<tr>=20
<td width=3D"95%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +2 -2 interchange/dist/foundation/templates/purpleyellow/reg=
ions/LEFTONLY_BOTTOM
rev 1.2, prev_rev 1.1
Index: LEFTONLY_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/purpleyellow/regio=
ns/LEFTONLY_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LEFTONLY_BOTTOM 16 Aug 2002 21:44:53 -0000 1.1
+++ LEFTONLY_BOTTOM 13 Sep 2002 20:46:20 -0000 1.2
@@ -1,4 +1,4 @@
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
<br><br>
<center>
@@ -13,6 +13,6 @@
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +4 -4 interchange/dist/foundation/templates/purpleyellow/reg=
ions/LEFTONLY_TOP
rev 1.3, prev_rev 1.2
Index: LEFTONLY_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/purpleyellow/regio=
ns/LEFTONLY_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LEFTONLY_TOP 19 Aug 2002 01:33:31 -0000 1.2
+++ LEFTONLY_TOP 13 Sep 2002 20:46:20 -0000 1.3
@@ -61,11 +61,11 @@
<td width=3D"20%" valign=3D"top" align=3D"left" class=3D"categorybar">=
=20
<!--Left Sidebar-->
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component group=3Dvertical]
+ [component group=3Dvertical]
+ [component group=3Dvertical]
</table>=09=09=09=09=20=20
</td>
<td width=3D"80%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +3 -3 interchange/dist/foundation/templates/purpleyellow/reg=
ions/LEFTRIGHT_BOTTOM
rev 1.2, prev_rev 1.1
Index: LEFTRIGHT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/purpleyellow/regio=
ns/LEFTRIGHT_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LEFTRIGHT_BOTTOM 16 Aug 2002 21:44:53 -0000 1.1
+++ LEFTRIGHT_BOTTOM 13 Sep 2002 20:46:20 -0000 1.2
@@ -1,4 +1,4 @@
- [include file=3D"templates/components/[control component none]" grou=
p=3Dcontent][control]
+ [component group=3Dcontent]
=20
<br><br>
<center>
@@ -15,10 +15,10 @@
<img src=3D"__THEME_IMG_DIR__littlebar.gif" width=3D"1" height=3D"650">
</td>
<td width=3D"15%" valign=3D"top" align=3D"right" class=3D"maincontent">
- [include file=3D"templates/components/[control component none]" group=
=3Dvertical][control]
+ [component group=3Dvertical]
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +4 -4 interchange/dist/foundation/templates/purpleyellow/reg=
ions/LEFTRIGHT_TOP
rev 1.3, prev_rev 1.2
Index: LEFTRIGHT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/purpleyellow/regio=
ns/LEFTRIGHT_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LEFTRIGHT_TOP 19 Aug 2002 01:33:31 -0000 1.2
+++ LEFTRIGHT_TOP 13 Sep 2002 20:46:20 -0000 1.3
@@ -62,11 +62,11 @@
<td width=3D"20%" valign=3D"top" align=3D"left" class=3D"categorybar">=
=20
<!--Left Sidebar-->
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
- [include file=3D"templates/components/[control component search_box_=
small]" group=3Dvertical][control]
- [include file=3D"templates/components/[control component category_ve=
rtical]" group=3Dvertical][control]
- [include file=3D"templates/components/[control component none]" grou=
p=3Dvertical][control]
+ [component default=3Dsearch_box_small group=3Dvertical]
+ [component default=3Dcategory_vertical group=3Dvertical]
+ [component group=3Dvertical]
</table>=09=09=09=09=20=20
</td>
<td width=3D"65%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
1.2 +1 -1 interchange/dist/foundation/templates/purpleyellow/reg=
ions/NOLEFT_BOTTOM
rev 1.2, prev_rev 1.1
Index: NOLEFT_BOTTOM
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/purpleyellow/regio=
ns/NOLEFT_BOTTOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NOLEFT_BOTTOM 16 Aug 2002 21:44:53 -0000 1.1
+++ NOLEFT_BOTTOM 13 Sep 2002 20:46:20 -0000 1.2
@@ -11,6 +11,6 @@
</td>
</tr>
</table>
-
+__ADL_PAGE__
</body>
</html>
1.3 +1 -1 interchange/dist/foundation/templates/purpleyellow/reg=
ions/NOLEFT_TOP
rev 1.3, prev_rev 1.2
Index: NOLEFT_TOP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/foundation/templates/purpleyellow/regio=
ns/NOLEFT_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NOLEFT_TOP 19 Aug 2002 01:33:31 -0000 1.2
+++ NOLEFT_TOP 13 Sep 2002 20:46:20 -0000 1.3
@@ -60,5 +60,5 @@
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
<tr>=20
<td width=3D"95%" valign=3D"top" align=3D"center" class=3D"maincontent">=
=20
- [include file=3D"templates/components/[control component none]" group=
=3Dcontent][control]
+ [component group=3Dcontent]
=20
2.7 +960 -491 interchange/dist/lib/UI/ContentEditor.pm
rev 2.7, prev_rev 2.6
Index: ContentEditor.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/dist/lib/UI/ContentEditor.pm,v
retrieving revision 2.6
retrieving revision 2.7
diff -u -r2.6 -r2.7
--- ContentEditor.pm 2 Sep 2002 16:21:28 -0000 2.6
+++ ContentEditor.pm 13 Sep 2002 20:46:20 -0000 2.7
@@ -2,7 +2,7 @@
#
# UI::ContentEditor - Interchange page/component edit
#=20
-# $Id: ContentEditor.pm,v 2.6 2002/09/02 16:21:28 mheins Exp $
+# $Id: ContentEditor.pm,v 2.7 2002/09/13 20:46:20 mheins Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -23,7 +23,7 @@
=20
package UI::ContentEditor;
=20
-$VERSION =3D substr(q$Revision: 2.6 $, 10);
+$VERSION =3D substr(q$Revision: 2.7 $, 10);
$DEBUG =3D 0;
=20
use POSIX qw/strftime/;
@@ -61,8 +61,6 @@
=20
=3Dcut
=20
-my $Tag =3D new Vend::Tags;
-
my %New =3D (
page =3D> {
},
@@ -72,17 +70,24 @@
},
);
my %Template; # Initialized at bottom of file
+my @All_templates;
+my @All_components;
+my @All_pages;
=20
my %CompCache;
=20
sub death {
my $name =3D shift;
- $Tag->error( { set =3D> errmsg(@_), name =3D> $name } );
+#::logDebug("called death for $name: " . errmsg(@_));
+ Vend::Tags->error( { set =3D> errmsg(@_), name =3D> $name } );
return undef;
}
=20
sub pain {
- $Tag->warnings(errmsg(@_));
+ my ($tag, $msg, @args) =3D @_;
+#::logDebug("called pain for $tag: " . errmsg($msg,@args));
+ $msg =3D "$tag: $msg";
+ Vend::Tags->warnings(errmsg($msg,@args));
return;
}
=20
@@ -96,12 +101,25 @@
return undef;
}
=20
+sub save_store {
+ my $type =3D shift;
+ my $name =3D shift;
+ my $value =3D shift;
+ die("Must have type and name for save_store, args were: " . join(" ", @_))
+ unless $type and $name;
+ my $store =3D $Vend::Session->{content_edit} ||=3D {};
+ $store->{$type} ||=3D {};
+ $store->{$type}{$name} =3D $value;
+}
+
sub get_store {
my $type =3D shift;
+ my $name =3D shift;
my $store =3D $Vend::Session->{content_edit} ||=3D {};
return $store unless $type;
$store->{$type} ||=3D {};
- return $store->{$type};
+ return $store->{$type} unless $name;
+ return $store->{$type}{$name};
}
=20
sub get_cdb {
@@ -143,6 +161,38 @@
my ($wanted, $opt, $components) =3D @_;
}
=20
+sub extract_template {
+ my $sref =3D shift;
+ my $opt =3D shift || {};
+ my $tname;
+ $sref =3D~ /\nui_page_template:\s*(\w+)/
+ or $sref =3D~ /\nui_template_name:\s*(\w+)/
+ or ( $sref =3D~ /\@_(\w+)_TOP_\@/ and $tname =3D lc $1);
+ $tname ||=3D $1;
+#::logDebug("extract_template read template name=3D'$tname'");
+ my $tdef;
+ my $tref;
+
+ my $allt =3D $opt->{_templates} ||=3D available_templates($opt);
+#::logDebug("extract_template got all_templates=3D" . uneval($allt));
+
+ for my $ref (@$allt) {
+ if($tname and $tname eq $ref->[0]) {
+ $tref =3D $ref;=20
+ last;
+ }
+ next unless is_yes($ref->[3]);
+ $tdef =3D $ref;=20
+ last;
+ }
+
+ $tref ||=3D $tdef || $allt->[0];
+#::logDebug("extract_template derived template name=3D$tref->[0]");
+ my $o =3D {%$opt};
+ $o->{type} =3D 'template';
+ return read_template($tref->[0], $o);
+}
+
## This must be non-destructive of $opt, may add keys with component_
sub parse_template {
my ($tref, $opt) =3D @_;
@@ -174,15 +224,15 @@
}
elsif(defined $::Variable->{$_}) {
#::logDebug("thing=3D$_ is Variable");
- push @int, $Tag->var($_);
+ push @int, Vend::Tags->var($_);
}
elsif($tdb and my $row =3D $tdb->row_hash($_)) {
#::logDebug("thing=3D$_ is Data");
push @int, $row->{comp_text};
}
- else {
- ::logDebug("parse_template: thing=3D$_ is unknown, using undef");
- push @int, undef;
+ elsif(/^[A-Z][A-Z_0-9]+$/) {
+#::logDebug("parse_template: thing=3D$_ is unknown, creating new thing");
+ push @int, qq{<!-- BEGIN $_ -->\n<!-- END $_ -->};
}
}
=20
@@ -219,27 +269,49 @@
<!--+ \s+ end \s+ component \s+ \1 \s+ --+>=20
|=20
\[ include \s+ (.*?) file \s*=3D\s*["'][^"]*/
- (?:\[control \s+ component \s+ )?
- (\w+)
+ (?:\[control \s+ component \s* )?
+ (\w*)
\]? ['"]
(.*?)
\] \s* \[control\]
|
- \[ component \s+=20
- (?:
- (.*?) comp(?:[-_]name|onent) \s*=3D\s*["']\s*
- (?:\[control \s+ component \s+ )?
- (\w+)
- \]? \s* ['"]
+ \[ component
+ (
+ (?:
+ \s+
+ \w[-\w]+\w
+=09=09=09=09=09=09
+ \s*=3D\s*
+
+ (["'\|]?)
+ \[?
+ [^\n]*?
+ \]?
+ \8
+ )+
)?
- (.*?)
+ \s*
\]
)
}gsix)
{
- my $compname =3D $1 || $5 || $8;
+ my $compname =3D $1 || $5;
my $comptype =3D $2;
- if(! $comptype) {
+ my $all =3D $7;
+#::logDebug("all=3D$all");
+ if($all) {
+ if($all =3D~ m{(?:comp[-_]name|default|component)\s*=3D\s*(['"|])(.*?)=
\1}is) {
+ $compname =3D $2;
+ $compname =3D~ s/^\s*\[control\s+component\s+//i;
+ $compname =3D~ s/\]\s*$//;
+ }
+ if($all =3D~ m{\bgroup\s*=3D\s*['"\|]?([-\w]+)}) {
+ $comptype =3D $1;
+ }
+ $compname ||=3D '';
+ $comptype ||=3D '';
+ }
+ elsif(! $comptype) {
my @stuff =3D ($4, $6, $7, $9);
#::logDebug("no comptype, stuff is: " . uneval(\@stuff));
@stuff =3D grep $_, @stuff;
@@ -252,17 +324,12 @@
push @comp, $compname;
$done_one =3D 1;
}
-
-# if(! $done_one) {
-# push @out, { where =3D> $things->[$i] };
-# }
-
}
=20
$tref->{ui_slots} =3D \@out;
$tref->{ui_display_order} ||=3D [];
- return @comp if wantarray;
- return \@comp;
+#::logDebug("parsed tref=3D" . uneval($tref));
+ return $tref;
}
=20
sub match_slots {
@@ -273,11 +340,18 @@
=20
#::logDebug("page slots in=3D" . uneval($p));
#::logDebug("tpl slots in=3D" . uneval($t));
+ $p ||=3D [];
+ $t ||=3D [];
#### Temporarily remove content slot
my $content;
my $idx;
+
+ unless (@$p) {
+ @$p =3D @$t;
+ }
+
for($idx =3D 0; $idx <=3D $#$p; $idx++) {
- next if $p->[$idx] and $p->[$idx]{where};
+ next if defined $p and $p->[$idx] and $p->[$idx]{where};
last;
}
=20
@@ -293,61 +367,64 @@
=20
#### Find content slot in template
for($idx =3D 0; $idx <=3D $#$t; $idx++) {
- next if $t->[$idx] and $t->[$idx]{where};
+ next if defined $t and $t->[$idx] and $t->[$idx]{where};
last;
}
=20
+ while ($#$p > $#$t) {
+ pop @$p;
+ }
+
+#::logDebug("splice index=3D$idx");
+ splice @$p, $idx, 0, $content;
+#::logDebug("page slots now=3D" . uneval($p));
+
if($idx > $#$t) {
pain ( 'parse_page',
"No content slot found in template %s",
$pref->{ui_page_template},
);
}
- else {
- splice @$p, $idx, 0, $content;
- }
-
- while ($#$p > $#$t) {
- pop @$p;
- }
=20
for(my $i =3D 0; $i < @$t; $i++) {
+#::logDebug("Matching slot $i");
if (! defined $p->[$i]) {
- push @$p, { %{$t->[$i]} };
+#::logDebug("slot $i not defined?");
+ $p->[$i] =3D { %{$t->[$i]} };
}
elsif ($p->[$i]) {
if($p->[$i]{class} ne $t->[$i]{class}) {
$p->[$i] =3D { %{$t->[$i]} };
}
else {
- $p->[$i]{where} =3D $t->[$i]{where}
+ $p->[$i]{where} =3D $t->[$i]{where};
}
}
}
=20
+ $#$p =3D $#$t;
#::logDebug("page slots out=3D" . uneval($p));
#::logDebug("tpl slots out=3D" . uneval($t));
+
}
=20
sub parse_page {
my ($pref, $opt) =3D @_;
$opt ||=3D {};
=20
+#::logDebug("pref ui_body=3D" . uneval($pref->{ui_body}));
my $tmpref =3D { %$pref };
$tmpref->{ui_body} =3D substr($tmpref->{ui_body},0,50);
#::logDebug("begin page ref=3D" . uneval($tmpref));
=20
+ if(my $otname =3D $pref->{ui_template_name}) {
+ $pref->{ui_page_template} ||=3D $otname;
+ }
my $tpl =3D $pref->{ui_page_template} || 'none';
-#::logDebug("parse page, template=3D$tpl");
+#::logDebug("parse page $pref->{ui_name}, template=3D$tpl");
=20
## Get template info
- my $tref;
-
- my $store =3D $Vend::Session->{content_edit};
- if($store and $store->{template}) {
- my $tmp =3D $store->{template}{$tpl};
- $tref =3D $tmp if $tmp;
- }
+ my $tref =3D get_store('template', $tpl);
=20
if(! $tref) {
#::logDebug("no tref first try...");
@@ -355,10 +432,11 @@
undef $topt->{dir};
undef $topt->{new};
$topt->{type} =3D 'template';
- #$topt->{single} =3D 1;
$tref =3D read_template($tpl, $topt);
}
=20
+#::logDebug("parse page looking for template, got " . uneval($tref));
+
assert('template_reference', $tref, 'HASH')
or undef $tref;
=20
@@ -371,6 +449,8 @@
parse_template($tref, $opt);
## Xfer needed template info
my $order =3D $pref->{ui_display_order} =3D [ @{ $tref->{ui_display_ord=
er} } ];
+#::logDebug("tref order was: " . uneval($order));
+
$pref->{ui_template_layout} =3D [ @{ $tref->{ui_template_layout} } ];
$pref->{ui_page_picture} =3D $tref->{ui_page_picture};
for(@$order) {
@@ -379,9 +459,11 @@
=20
my $body =3D delete $pref->{ui_body};
=20
+#::logDebug("page body=3D" . uneval($body));
unless(defined $body) {
### Already parsed, match slots and leave if not new page
match_slots($pref, $tref);
+#::logDebug("pref now=3D" . uneval($pref));
return unless $opt->{new};
}
=20
@@ -461,6 +543,8 @@
}
}
=20
+ $pref->{CONTENT} =3D $body unless $found;
+
my $controls;
if($pref->{CONTROLS}) {
$controls =3D $pref->{CONTROLS};
@@ -543,119 +627,198 @@
=20
}
=20
-sub read_components {
- my ($spec, $opt) =3D @_;
- $opt ||=3D {};
- $opt->{components} =3D 1;
- return read_template($spec, $opt);
+my %leg_remap =3D qw/
+ ui_component ui_name
+ ui_component_type ui_class
+ ui_template_name ui_name
+ ui_template_description ui_label
+ ui_component_group ui_group
+ ui_component_help ui_help
+ ui_component_label ui_label
+/;
+
+sub legacy_components {
+ my ($ref, $type) =3D @_;
+
+ return if $ref->{ui_name} and $ref->{ui_type} and $ref->{ui_label};
+ while( my($old, $new) =3D each %leg_remap) {
+ my $tmp =3D delete $ref->{$old};
+ next if defined $ref->{$new} and length($ref->{$new});
+ $ref->{$new} =3D $tmp;
+ }
+ $ref->{ui_type} =3D $type;
+ delete $ref->{ui_template};
+ return;
}
=20
sub read_template {
- my ($spec, $opt, $body) =3D @_;
- $opt ||=3D {};
+ my ($spec, $opt) =3D @_;
=20
- ## Default type is template, but won't get here if page
- my $tdir =3D $opt->{template_dir}
- || $::Variable->{UI_TEMPLATE_DIR} || 'templates';
-
- ## We always want {dir} first, but want to set defaults
- ## based on type of template
- my $cdir =3D $opt->{dir}
- || $opt->{component_dir}
- || $::Variable->{UI_COMPONENT_DIR} || "$tdir/components";
+ ## For syntax check
+ #use vars qw/%CompCache/;
=20
- $opt->{dir} ||=3D $Vend::Cfg->{PageDir} if $opt->{type} eq 'page';
- $opt->{dir} ||=3D $cdir if $opt->{type} eq 'component';
+ $opt ||=3D {};
=20
- my $dir =3D $opt->{dir} || $tdir;
+ my $o =3D { %$opt };
=20
- my $table =3D $opt->{table} || $::Variable->{UI_COMPONENT_TABLE};
+ my $type =3D $o->{type} =3D 'template';
=20
my $class =3D $opt->{class};
=20
- my $tmpdir =3D $Vend::Cfg->{ScratchDir} || 'tmp';
- for(\$tmpdir, \$dir, \$cdir) {
- $$_ =3D~ s!^$Vend::Cfg->{VendRoot}/!!;
- }
- $tmpdir .=3D "/components/$Vend::Session->{id}";
-#::logDebug("reading, dir=3D$dir spec=3D$spec tmpdir=3D$tmpdir");
-
- my $data;
- my %out;
- my $out =3D [];
-
my $db;
- $db =3D database_exists_ref($table) if $table;
+ $db =3D database_exists_ref($opt->{table}) if $opt->{table};
=20
- my $found_cache;
my @data;
=20
+ if($spec eq 'none') {
+ return {
+ ui_name =3D> 'none',
+ ui_type =3D> 'template',
+ ui_label =3D> 'No template',
+ ui_template_version =3D> $::VERSION,
+ ui_template_layout =3D> 'UI_CONTENT',
+ };
+ }
+
if($opt->{new}) {
# do nothing
}
- elsif($opt->{class} and my $ref =3D $CompCache{$opt->{class}}) {
- $out =3D $ref;
- $found_cache =3D 1;
- }
- elsif($opt->{components}) {
-
+ elsif($spec) {
if(! $db) {
- my @files =3D grep -f $_, glob("$cdir/*");
- for(@files) {
- push @data, [
- Vend::Util::readfile($_, $Global::NoAbsolute, 0),
- $_,
- ];
- }
+ @data =3D get_content_data($spec,$o);
}
else {
my @atoms;
- push @atoms, "select code,comp_text from $table";
- push @atoms, "where comp_type =3D '$opt->{type}'" if $opt->{type};
- push @atoms, "where comp_class =3D '$opt->{class}'" if $opt->{class};
+ my $tname =3D $db->name();
+ push @atoms, "select * from $tname";
+ push @atoms, "where code =3D '$spec'";
my $q =3D join " ", @atoms;
my $ary =3D $db->query({ sql =3D> $q, hashref =3D> 1 });
for(@$ary) {
- push @data, [ $_->{comp_text}, "$table::$_->{code}" ];
+ push @data, [ $_->{comp_text}, "$table::$spec" ];
}
}
}
- elsif($opt->{templates}) {
=20
- if(! $db) {
- my @files =3D grep -f $_, glob("$tdir/*");
- for(@files) {
- push @data, [
- Vend::Util::readfile($_, $Global::NoAbsolute, 0),
- $_,
- ];
+ if(@data > 1) {
+ logError(
+ "ambiguous %s spec, %s selected. Remaining:\n%s",
+ errmsg($type),
+ $data[0][1],
+ join(",", map { $_->[1] } @data[1 .. $#data]),
+ );
+ }
+
+ my $ref;
+ my $dref;
+
+ if(not $dref =3D $data[0]) {
+#::logDebug("no data, and new");
+ $opt->{type} ||=3D 'page';
+ my $prefix =3D "ui_$type";
+ $ref =3D {
+ ui_name =3D> $spec,
+ ui_type =3D> $type,
+ ui_source =3D> '',
+ ui_label =3D> '',
+ "${prefix}_version" =3D> Vend::Tags->version(),
+ };
+ my $name =3D uc $spec;
+ $name =3D~ s/\W/_/g;
+ $name =3D~ s/__+/_/g;
+ $ref->{ui_template_layout} =3D "${name}_TOP, UI_CONTENT, ${name}_BOTTOM";
+ }
+ else {
+ READCOMP: {
+ assert("$type reference", $dref, 'ARRAY')
+ or return death("read_$type", "Component read error for %s", $spec);
+ my ($data, $source) =3D @$dref;
+#::logDebug("template data is $data");
+ $ref =3D {};
+
+ unless (length($data)) {
+ return death("read_$type", "empty %s: %s", errmsg($type), $source);
+ }
+
+ if($data =3D~ m{^\s*<\?xml version=3D.*?>}) {
+ $ref =3D read_xml_component($data, $source);
+#::logDebug("Got this from read_xml_component: " . ::uneval($ref));
+ last READCOMP;
+ }
+
+ $ref =3D {};
+
+ $data =3D~ m{\[comment\]\s*(ui_.*?)\[/comment\]\s*(.*)}s;
+ my $structure =3D $1 || '';
+ $ref->{ui_body} =3D $2;
+ unless ($structure) {
+ return death("read_$type", "bad %s: %s", errmsg($type), $source);
+ }
+
+ my @lines =3D get_lines($structure);
+#::logDebug("Got lines from get_lines: " . ::uneval(\@lines));
+=09=09
+ parse_line($_, $ref) for @lines;
+#::logDebug("Parsed lines: " . ::uneval(\@lines));
+
+ delete $ref->{_current};
+
+ if(my $order =3D $ref->{ui_display_order}) {
+ for (@$order) {
+ remap_opts($ref->{$_});
}
}
- else {
- my @atoms;
- push @atoms, "select code,content_text from $table";
- push @atoms, "where content_type =3D '$opt->{type}'" if $opt->{type};
- push @atoms, "where content_class =3D '$opt->{class}'" if $opt->{class};
- my $q =3D join " ", @atoms;
- my $ary =3D $db->query({ sql =3D> $q, hashref =3D> 1 });
- for(@$ary) {
- push @data, [ $_->{comp_text}, "$table::$_->{code}" ];
+
+ $ref->{ui_type} =3D $type;
+ $ref->{ui_source} =3D $source;
+
+#::logDebug("read tref=3D" . uneval($ref));
+ legacy_components($ref, $type);
+#::logDebug("tref after legacy remap=3D" . uneval($ref));
+
+ if(! $ref->{ui_name}) {
+ # Compatibility with old templates
+ unless ($ref->{ui_name} =3D delete $ref->{"ui_${type}_name"}) {
+ return death("read_$type", "%s (%s) must have a name", $type, $source);
}
}
+ if($ref->{"ui_$type"} eq 'Yes') {
+ delete $ref->{"ui_$type"};
+ }
+ }
+ }
+
+ return $ref;
+
+}
+
+
+sub read_component {
+
+ my ($spec, $opt) =3D @_;
+ $opt ||=3D {};
+=09
+ my $o =3D { %$opt };
+ my $type =3D $o->{type} =3D 'component';
+
+ my $class =3D $opt->{class};
+
+ my $db;
+ $db =3D database_exists_ref($opt->{table}) if $opt->{table};
+
+ my @data;
+
+ if($opt->{new}) {
+ # do nothing
}
elsif($spec) {
if(! $db) {
- my @files =3D grep -f $_, glob("$dir/$spec");
- for(@files) {
- push @data, [
- Vend::Util::readfile($_, $Global::NoAbsolute, 0),
- $_,
- ];
- }
+ @data =3D get_content_data($spec, $o);
}
else {
+ my $tname =3D $db->name();
my @atoms;
- push @atoms, "select * from $table";
+ push @atoms, "select * from $tname";
push @atoms, "where code =3D '$spec'";
my $q =3D join " ", @atoms;
my $ary =3D $db->query({ sql =3D> $q, hashref =3D> 1 });
@@ -668,78 +831,30 @@
$opt->{new} =3D 1;
}
=20
- if($opt->{available}) {
- my @out;
-=09=09=09
- if($opt->{components}) {
- for my $dref (@data) {
- my $data =3D \$dref->[0];
- my ($name, $label, $class);
- (
- $$data =3D~ /\nui_name:\s*(.+)/
- or $$data =3D~ /\nui_component_name:\s*(.+)/
- or $$data =3D~ /\nui_component:\s*(.+)/
- or logDebug("name not found in data: $$data")
- )
- and $name =3D $1;
- (
- $$data =3D~ /\nui_label:\s*(.+)/
- or $$data =3D~ /\nui_component_label:\s*(.+)/
- or $$data =3D~ /\nui_component_description:\s*(.+)/
- )
- and $label =3D $1;
- (
- $$data =3D~ /\nui_class:\s*(.+)/
- or $$data =3D~ /\nui_component_type:\s*(.+)/
- or $$data =3D~ /\nui_component_group:\s*(.+)/
- )
- and $class =3D $1;
- push @out, [$name, $label, $class];
- }
- }
- elsif ($opt->{templates}) {
- for my $dref (@data) {
- my $data =3D \$dref->[0];
- my ($name, $label, $class);
- (
- $$data =3D~ /\nui_name:\s*(.+)/
- or $$data =3D~ /\nui_template_name:\s*(.+)/
- or $$data =3D~ /\nui_template:\s*(.+)/
- or logDebug("name not found in data: $$data")
- )
- and $name =3D $1;
- (
- $$data =3D~ /\nui_label:\s*(.+)/
- or $$data =3D~ /\nui_template_label:\s*(.+)/
- or $$data =3D~ /\nui_template_description:\s*(.+)/
- )
- and $label =3D $1;
- (
- $$data =3D~ /\nui_class:\s*(.+)/
- or $$data =3D~ /\nui_template_type:\s*(.+)/
- or $$data =3D~ /\nui_template_group:\s*(.+)/
- )
- and $class =3D $1;
- push @out, [$name, $label, $class];
- }
- }
- @out =3D sort { $a->[1] cmp $b->[1] } @out;
-#::logDebug("found these components: " . uneval(\@out));
- return wantarray ? @out : \@out;
+ if(@data > 1) {
+ logError(
+ "ambiguous %s spec, %s selected. Remaining:\n%s",
+ errmsg('component'),
+ $data[0][1],
+ join(",", map { $_->[1] } @data[1 .. $#data]),
+ );
}
=20
- my $might_be_single;
+ my $ref;
+ my $dref;
=20
- if(! @data and $opt->{new}) {
+ if(not $dref =3D $data[0]) {
#::logDebug("no data, and new");
$opt->{type} ||=3D 'page';
my $prefix =3D "ui_$opt->{type}";
- my $ref =3D {
+ $ref =3D {
ui_name =3D> $spec,
+ ui_label =3D> '',
+ ui_class =3D> '',
+ ui_group =3D> '',
ui_type =3D> $opt->{type},
ui_source =3D> '',
- $prefix =3D> $spec,
- "${prefix}_version" =3D> $Tag->version(),
+ "${prefix}_version" =3D> Vend::Tags->version(),
};
if($opt->{type} eq 'page') {
$ref->{ui_page_template} =3D $opt->{template};
@@ -750,169 +865,505 @@
$name =3D~ s/__+/_/g;
$ref->{ui_template_layout} =3D "${name}_TOP, UI_CONTENT, ${name}_BOTTOM=
";
}
- $might_be_single =3D 1;
- push @$out, $ref;
- }
-
- if(scalar @data =3D=3D 1) {
- $might_be_single =3D 1;
}
+ else {
+ READCOMP: {
+ assert("$type reference", $dref, 'ARRAY')
+ or return death("read_$type", "Component read error for %s", $spec);
+ my ($data, $source) =3D @$dref;
+#::logDebug("component data is $data");
+ $ref =3D {};
=20
- foreach my $dref (@data) {
- my ($data, $source) =3D @{$dref || []};
-#::logDebug("data is $data");
- my $type;
- my $ref;
+ unless (length($data)) {
+ return death("read_$type", "empty %s: %s", errmsg($type), $source);
+ }
=20
- next unless length($data);
if($data =3D~ m{^\s*<\?xml version=3D.*?>}) {
$ref =3D read_xml_component($data, $source);
#::logDebug("Got this from read_xml_component: " . ::uneval($ref));
- push @$out, $ref;
+ last READCOMP;
}
=20
+ $ref =3D {};
+
$data =3D~ m{\[comment\]\s*(ui_.*?)\[/comment\]\s*(.*)}s;
my $structure =3D $1 || '';
$ref->{ui_body} =3D $2;
- next unless $structure;
- my @lines =3D split /\n/, $structure;
- my $found;
- for(;;) {
- my $i =3D -1;
- for(@lines) {
- $i++;
- next unless s/\\$//;
- $found =3D $i;
- last;
- }
- last unless defined $found;
- if (defined $found) {
- my $add =3D splice @lines, $found + 1, 1;
-#::logDebug("Add is '$add', found index=3D$found");
- $lines[$found] .=3D $add;
-#::logDebug("Complete line now is '$lines[$found]'");
- undef $found;
- }
- }
- #$ref->{ui_definition} =3D join "\n", @lines;
- my $current;
-=09
- my $legacy =3D 1;
- my $ui_count =3D 0;
- for(@lines) {
- s/\s+$//;
- if(/^\s*ui_/) {
- my ($el, $el_item, $el_data) =3D split /\s*:\s*/, $_;
-#::logDebug("found el=3D$el el_item=3D$el_item el_data=3D$el_data");
- $type =3D $el_item, undef $legacy, next if $el eq 'ui_type';
- if(! defined $el_data) {
- $ref->{$el} =3D $el_item;
- }
- else {
- if($el_item eq 'ARRAY') {
- $ref->{$el} ||=3D [];
- assert($el, $ref->{$el}, 'ARRAY')
- or return undef;
- push @{$ref->{$el}}, [ split /[\s,\0]+/, $el_data ];
- }
- if($el_item eq 'HASH') {
- $ref->{$el} ||=3D {};
- assert($el, $ref->{$el}, 'HASH')
- or return undef;
- my %hash =3D get_option_hash($el_data);
- @{$ref->{$el}}{keys %hash} =3D values %hash;
- }
- }
- if(! $type) {
- $el =3D~ m{^ui_([^_]+)};
- $type =3D $1 || 'component';
- }
- if($el eq "ui_$type") {
- $ref->{ui_name} ||=3D $el_item;
- }
- $ui_count++;
- }
- elsif ( /^(\w+)\s*:\s*(.*)$/) {
- $current =3D $1;
- my $lab =3D $2;
- $ref->{ui_display_order} ||=3D [];
- push @{$ref->{ui_display_order}}, $current;
- }
- elsif( /^\s+(\w+)\s*:\s*(.*)/ ) {
- my ($fn, $fv) =3D ( lc($1), $2 );
- $ref->{$current}{$fn} =3D $fv;
- }
+ unless ($structure) {
+ return death("read_$type", "bad %s: %s", errmsg($type), $source);
}
=20
+ my @lines =3D get_lines($structure);
+=09=09
+ parse_line($_, $ref) for @lines;
+
+ delete $ref->{_current};
+
if(my $order =3D $ref->{ui_display_order}) {
for (@$order) {
remap_opts($ref->{$_});
}
}
=20=09=09
- # legacy
- if($legacy and $ui_count <=3D 2 and $ref->{ui_template}) {
-#::logDebug("found page type=3D$type ref=3D" . join(',', keys %$ref));
-
- $ref->{ui_type} =3D $type =3D 'page';
-
- $ref->{ui_page} =3D delete $ref->{ui_template};
- $ref->{ui_page_template} =3D delete $ref->{ui_template_name};
- $ref->{ui_source} =3D $source;
- my $n =3D $source;
- $n =3D~ s:^$dir/::;
- $ref->{ui_name} =3D $n;
-#::logDebug("now page type=3D$type ref=3D" . join(',', keys %$ref));
- undef $legacy;
+ $ref->{ui_type} =3D $type;
+ $ref->{ui_source} =3D $source;
+
+#::logDebug("read cref=3D" . uneval($ref));
+ legacy_components($ref, $type);
+#::logDebug("cref after legacy remap=3D" . uneval($ref));
+
+ if(! $ref->{ui_name}) {
+ return death(=09
+ "read_$type",
+ "%s (%s) must have a name",
+ errmsg($type),
+ $source,
+ );
+ }
+ }
+ }
+
+ return $ref;
+
+}
+
+sub get_content_dirs {
+ my $opt =3D shift;
+ $opt ||=3D {};
+ my $dir;
+=09
+ if($dir =3D $opt->{dir}) {
+ # look no farther
+ }
+ elsif($opt->{type} eq 'page') {
+ $dir =3D $Vend::Cfg->{PageDir};
+ }
+ else {
+ my $tdir =3D $opt->{template_dir}
+ || $::Variable->{UI_TEMPLATE_DIR} || 'templates';
+ if($opt->{type} eq 'component') {
+ $dir =3D $opt->{component_dir}
+ || $::Variable->{UI_COMPONENT_DIR} || "$tdir/components";
}
else {
- $ref->{ui_type} =3D $type;
- $ref->{ui_source} =3D $source;
+ $dir =3D $tdir;
}
+ }
+ my $tmpdir =3D $Vend::Cfg->{ScratchDir} || 'tmp';
+ for(\$tmpdir, \$dir) {
+ $$_ =3D~ s!^$Vend::Cfg->{VendRoot}/!!;
+ }
+ $tmpdir .=3D "/components/$Vend::Session->{id}";
+ return($dir, $tmpdir) if wantarray;
+ return $dir;
+}
=20
- if($legacy) {
-#::logDebug("is a legacy");
- $ref->{ui_type} =3D $type;
- $ref->{ui_class} ||=3D $ref->{"ui_${type}_type"};
- delete $ref->{"ui_${type}_type"};
+sub get_content_filenames {
+ my $spec =3D shift;
+ my $opt =3D shift;
=20
- $ref->{ui_name} =3D $ref->{"ui_${type}_name"}
- if $ref->{"ui_${type}_name"};
- delete $ref->{"ui_${type}_name"};
+ $spec ||=3D '*';
+ my $dir =3D get_content_dirs($opt);
+#::logDebug("got a dir=3D$dir for $opt->{type}");
+ return grep -f $_, glob("$dir/$spec");
+}
=20
- $ref->{"ui_${type}_label"} ||=3D $ref->{"ui_${type}_description"};
- delete $ref->{"ui_${type}_description"};
+sub get_content_data {
+ my $spec =3D shift;
+ my $opt =3D shift;
=20
- for(qw/ group label help name version /) {
- my $val =3D delete $ref->{"ui_${type}_$_"};
- $ref->{"ui_$_"} ||=3D $val;
- }
+ my @data;
+ for(get_content_filenames($spec, $opt)) {
+#::logDebug("Looking at filename $_");
+ push @data, [ Vend::Util::readfile($_, $Global::NoAbsolute, 0), $_ ];
+ }
+=09
+ return @data if wantarray;
+ return \@data;
+}
+
+sub content_info {
+ my ($dir, $opt) =3D @_;
+
+ $opt ||=3D {};
+
+ $opt->{dir} =3D $dir if $dir;
+
+ my $delim =3D $opt->{delimiter} || ',';
+ my $type;
+ if( $opt->{templates} ) {
+ $type =3D 'templates';
+ }
+ else {
+ $type =3D 'components';
+ }
+
+ my $tpls;
+ my $comps;
+ my $things;
+ my $labels;
+ my $classes;
+
+ my $o =3D { %$opt };
+
+ if($Vend::caCompCache{$type}) {
+ $things =3D $Vend::caCompCache{$type};
+ $labels =3D $Vend::clCompCache{$type};
+ $classes =3D $Vend::ccCompCache{$type};
+ }
+ else {
+ if($opt->{templates}) {
+ $things =3D available_templates($o);
+ }
+ else {
+ $things =3D available_components($o);
+ }
+ $Vend::caCompCache{$type} =3D $things;
+ $labels =3D $Vend::clCompCache{$type} =3D {};
+ $classes =3D $Vend::ccCompCache{$type} =3D {};
+ for(@$things) {
+ $Vend::clCompCache->{$_->[0]} =3D $_->[1];
+ $Vend::ccCompCache->{$_->[0]} =3D $_->[2];
}
+ }
=20
- return death('read_template', "%s (%s) must have a name", $type, $source)
- if ! $ref->{ui_name};
+ if($opt->{label}) {
+ return $Vend::clCompCache->{$opt->{code}};
+ }
=20
- push @$out, $ref;
+ if($opt->{structure}) {
+ $opt->{type} =3D $opt->{ui_type} =3D 'component';
+ return read_component($opt->{code}, $opt);
}
=20
- if(! $found_cache and $opt->{type}) {
- $CompCache{$opt->{type}} =3D $out;
+ if ($opt->{show_class}) {
+ return $Vend::ccCompCache->{$opt->{code}};
}
=20
-#::logDebug("read_template out is $out=3D" . uneval($out));
- if(wantarray) {
-#::logDebug("returning array");
- return @$out;
+ ## Default is to return options
+
+ my @out;
+ if(my $class =3D $opt->{class}) {
+ my $re =3D qr{\b(?:$class|ALL)\b};
+ my @comps =3D grep $_->[2] =3D~ $re, @$things;
+ $things =3D \@comps;
+ }
+
+ unless ($opt->{no_sort}) {
+ @$things =3D sort { $a->[1] cmp $b->[1] } @$things;
+ }
+
+ for(@$things) {
+ $_->[1] =3D~ s/($delim)/'&#' . ord($1) . ';'/ge;
+ my $def =3D is_yes($_->[3]) ? '*' : '';
+ push @out, join "=3D", $_->[0], "$_->[1]$def";
+ }
+ unshift @out, ($opt->{templates} ? "none=3DNo template" : "=3DNo componen=
t")
+ unless $opt->{no_none};
+ return join $delim, @out;
+}
+
+sub available_components {
+ my ($opt) =3D @_;
+ $opt ||=3D {};
+ my $db;
+ my $o =3D { %$opt };
+ $o->{type} =3D 'component';
+ $db =3D ::database_exists_ref($opt->{table}) if $opt->{table};
+=09
+ my @data;
+ if(! $db) {
+ @data =3D get_content_data(undef,$o);
+#::logDebug(sprintf("got %d items from get_content_data", scalar(@data)));
+ }
+ else {
+ my @atoms;
+ my $tname =3D $db->name();
+ push @atoms, "select code,comp_text from $tname";
+ push @atoms, "where comp_type =3D '$opt->{type}'" if $opt->{type};
+ push @atoms, "where comp_class =3D '$opt->{class}'" if $opt->{class};
+ my $q =3D join " ", @atoms;
+ my $ary =3D $db->query({ sql =3D> $q, hashref =3D> 1 });
+ for(@$ary) {
+ push @data, [ $_->{comp_text}, "$table::$_->{code}" ];
+ }
+ }
+ my @out;
+=09=09=09
+ for my $dref (@data) {
+ my $data =3D \$dref->[0];
+ my ($name, $label, $class);
+ (
+ $$data =3D~ /\nui_name:\s*(.+)/
+ or $$data =3D~ /\nui_component_name:\s*(.+)/
+ or $$data =3D~ /\nui_component:\s*(.+)/
+ or logDebug("name not found in data: $$data")
+ )
+ and $name =3D $1;
+ (
+ $$data =3D~ /\nui_label:\s*(.+)/
+ or $$data =3D~ /\nui_component_label:\s*(.+)/
+ or $$data =3D~ /\nui_component_description:\s*(.+)/
+ )
+ and $label =3D $1;
+ (
+ $$data =3D~ /\nui_class:\s*(.+)/
+ or $$data =3D~ /\nui_component_type:\s*(.+)/
+ or $$data =3D~ /\nui_component_group:\s*(.+)/
+ )
+ and $class =3D $1;
+ push @out, [$name, $label, $class];
}
- elsif($opt->{single} or $might_be_single) {
-#::logDebug("returning single element");
- return $out->[0];
+
+ return @out if wantarray;
+ return \@out;
+}
+
+sub available_templates {
+ my ($opt) =3D @_;
+ $opt ||=3D {};
+ my $db;
+ my $o =3D { %$opt };
+ $o->{type} =3D 'template';
+ $db =3D ::database_exists_ref($opt->{table}) if $opt->{table};
+
+ my @data;
+ if(! $db) {
+ @data =3D get_content_data(undef,$o);
}
else {
-#::logDebug("returning arrayref");
- return $out;
+ my @atoms;
+ my $tname =3D $db->name();
+ push @atoms, "select code,comp_text from $tname";
+ push @atoms, "where comp_type =3D '$opt->{type}'" if $opt->{type};
+ push @atoms, "where comp_class =3D '$opt->{class}'" if $opt->{class};
+ my $q =3D join " ", @atoms;
+ my $ary =3D $db->query({ sql =3D> $q, hashref =3D> 1 });
+ for(@$ary) {
+ push @data, [ $_->{comp_text}, "$table::$_->{code}" ];
+ }
+ }
+ my @out;
+=09=09=09
+ for my $dref (@data) {
+ my $data =3D \$dref->[0];
+ my ($name, $label, $class, $default);
+ (
+ $$data =3D~ /\nui_name:\s*(.+)/
+ or $$data =3D~ /\nui_template_name:\s*(.+)/
+ or $$data =3D~ /\nui_template:\s*(.+)/
+ or logDebug("name not found in data: $$data")
+ )
+ and $name =3D $1;
+ (
+ $$data =3D~ /\nui_label:\s*(.+)/
+ or $$data =3D~ /\nui_template_label:\s*(.+)/
+ or $$data =3D~ /\nui_template_description:\s*(.+)/
+ )
+ and $label =3D $1;
+ (
+ $$data =3D~ /\nui_class:\s*(.+)/
+ or $$data =3D~ /\nui_template_type:\s*(.+)/
+ or $$data =3D~ /\nui_template_group:\s*(.+)/
+ )
+ and $class =3D $1;
+ (
+ $$data =3D~ /\nui_default:\s*(.+)/
+ or $$data =3D~ /\nui_template_default:\s*(.+)/
+ )
+ and $default =3D $1;
+ push @out, [$name, $label, $class, $default];
+ }
+ return @out if wantarray;
+ return \@out;
+}
+
+sub get_lines {
+ my ($structure, $opt) =3D @_;
+ $opt ||=3D $_;
+ $structure =3D~ s/\s+$//;
+ my @lines =3D split /\r?\n/, $structure;
+ my $found;
+ for(;;) {
+ my $i =3D -1;
+ for(@lines) {
+ $i++;
+ next unless s/\\$//;
+ $found =3D $i;
+ last;
+ }
+ last unless defined $found;
+ if (defined $found) {
+ my $add =3D splice @lines, $found + 1, 1;
+#::logDebug("Add is '$add', found index=3D$found");
+ $lines[$found] .=3D "\n$add";
+#::logDebug("Complete line now is '$lines[$found]'");
+ undef $found;
+ }
+ }
+ return @lines;
+}
+
+sub parse_line {
+ my ($line, $ref) =3D @_;
+ $line =3D~ s/\s+$//;
+ my $type;
+ if($line =3D~ /^\s*ui_/) {
+ my ($el, $el_item, $el_data);
+ if($line =3D~ /\n/) {
+ ($el, $el_item) =3D split /\s*:\s*/, $_, 2;
+ }
+ else {
+ ($el, $el_item, $el_data) =3D split /\s*:\s*/, $_, 3;
+ }
+#::logDebug("found el=3D$el el_item=3D$el_item el_data=3D$el_data");
+ if(! defined $el_data) {
+ $ref->{$el} =3D $el_item;
+ }
+ else {
+ if($el_item eq 'ARRAY') {
+ $ref->{$el} ||=3D [];
+ assert($el, $ref->{$el}, 'ARRAY')
+ or return undef;
+ push @{$ref->{$el}}, [ split /[\s,\0]+/, $el_data ];
+ }
+ if($el_item eq 'HASH') {
+ $ref->{$el} ||=3D {};
+ assert($el, $ref->{$el}, 'HASH')
+ or return undef;
+ my %hash =3D get_option_hash($el_data);
+ @{$ref->{$el}}{keys %hash} =3D values %hash;
+ }
+ }
+ }
+ elsif ( $line =3D~ /^(\w+)\s*:\s*(.*)/) {
+ $ref->{_current} =3D $1;
+ my $lab =3D $2;
+ $ref->{ui_display_order} ||=3D [];
+ push @{$ref->{ui_display_order}}, $ref->{_current};
+ }
+ elsif( $line =3D~ /^\s+(\w+)\s*:\s*(.*)/s ) {
+ my ($fn, $fv) =3D ( lc($1), $2 );
+ $ref->{$ref->{_current}}{$fn} =3D $fv;
+ }
+ return;
+}
+
+sub read_page {
+ my ($spec, $opt) =3D @_;
+
+ my $db;
+ $db =3D database_exists_ref($opt->{table}) if $opt->{table};
+
+ my @data;
+ my $type =3D 'page';
+
+ if($opt->{new}) {
+ # do nothing
+ }
+ elsif($spec and ! $db) {
+ @data =3D get_content_data($spec, $opt);
+ }
+ elsif($spec) {
+ my $tname =3D $db->name();
+ my @atoms;
+ push @atoms, "select * from $tname";
+ push @atoms, "where code =3D '$spec'";
+ my $q =3D join " ", @atoms;
+ my $ary =3D $db->query({ sql =3D> $q, hashref =3D> 1 });
+ for(@$ary) {
+ push @data, [ $_->{comp_text}, "$table::$spec" ];
+ }
+ }
+ else {
+ $opt->{new} =3D 1;
+ }
+
+ if(@data > 1) {
+ logError(
+ "ambiguous page spec, %s selected. Remaining:\n%s",
+ $data[0][1],
+ join(",", map { $_->[1] } @data[1 .. $#data]),
+ );
+ }
+
+ my $dref =3D $data[0];
+
+ my $ref;
+
+ if(! $dref) {
+#::logDebug("no data");
+ my $prefix =3D "ui_$type";
+ $ref =3D {
+ ui_name =3D> $spec,
+ ui_type =3D> $opt->{type},
+ ui_source =3D> '',
+ ui_body =3D> '',
+ "${prefix}_version" =3D> Vend::Tags->version(),
+ };
+
+ my $tref =3D extract_template('', $opt);
+ assert('template', $tref, 'HASH')
+ or return death('Not even a default template!');
+ $ref->{ui_page_template} =3D $tref->{ui_name};
+ }
+ else {
+ READCOMP: {
+ my ($data, $source) =3D @{$dref || []};
+#::logDebug("read page from source=3D$source");
+
+ $ref =3D {};
+
+ my $tref =3D extract_template($data, $opt);
+ assert('read_page', $tref, 'HASH')
+ or return death('read_page', "%s has no %s", $source, errmsg('template=
'));
+ $ref->{ui_page_template} =3D $tref->{ui_name};
+#::logDebug("page=3D$spec template=3D$ref->{ui_page_template}");
+
+ if($data =3D~ m{^\s*<\?xml version=3D.*?>}) {
+ $ref =3D read_xml_component($data, $source);
+#::logDebug("Got this from read_xml_component: " . ::uneval($ref));
+ last READCOMP;
+ }
+
+ $data =3D~ m{\[comment\]\s*(ui_.*?)\[/comment\]\s*(.*)}s;
+ my $structure =3D $1 || '';
+ $ref->{ui_body} =3D $2;
+ if(! $structure) {
+ $structure =3D <<EOF;
+ui_name: $spec
+ui_type: page
+ui_page_template: none
+EOF
+ $ref->{ui_body} =3D $data;
+ }
+
+ my @lines =3D get_lines($structure);
+ parse_line($_, $ref) for @lines;
+
+#::logDebug("page=3D$spec ui_name=3D$ref->{ui_name} after structure parse"=
);
+
+ delete $ref->{_current};
+
+ if(my $order =3D $ref->{ui_display_order}) {
+ for (@$order) {
+ remap_opts($ref->{$_});
+ }
+ }
+
+#::logDebug("page=3D$spec ui_name=3D$ref->{ui_name} after remap_opts");
+
+ $ref->{ui_name} ||=3D $spec;
+ $ref->{ui_type} =3D $type;
+ $ref->{ui_source} =3D $source;
+
+ }
}
+#::logDebug("page=3D$spec ui_name=3D$ref->{ui_name}");
+#::logDebug("page read returning: " . uneval($ref));
+ return $ref;
}
+
sub page_component_editor {
my ($name, $pos, $comp, $pref, $opt) =3D @_;
=20
@@ -936,18 +1387,16 @@
=20
my @fields =3D 'code';
=20
- my $store =3D get_store('component');
-
my $topt =3D { %$opt };
delete $topt->{dir};
delete $topt->{new};
$topt->{type} =3D 'component';
- my $cref =3D $store->{$name} || read_template($name, $topt);
+ my $cref =3D get_store('component', $name) || read_component($name, $topt=
);
=20
ref($cref) eq 'HASH'
or $cref =3D {};
=20
- my $action =3D $Tag->area($Global::Variable->{MV_PAGE});
+ my $action =3D Vend::Tags->area($Global::Variable->{MV_PAGE});
$action =3D~ s/\?.*//;
my $extra =3D qq{ onChange=3D"
if(check_change() =3D=3D true) {
@@ -959,11 +1408,11 @@
my $meta =3D {
code =3D> {
type =3D> 'select',
- passed =3D> $Tag->content_info(),
+ passed =3D> Vend::Tags->content_info(),
label =3D> 'Component',
},
};
- my $label =3D "$name - " . $Tag->content_info( { code =3D> $name, label =
=3D> 1});
+ my $label =3D "$name - " . Vend::Tags->content_info( { code =3D> $name, l=
abel =3D> 1});
$label =3D "<H3 align=3Dcenter>$label</h3>";
my $value =3D { code =3D> $name };
=20
@@ -1010,10 +1459,9 @@
defaults =3D> 1,
extra =3D> $js,
force_defaults =3D> 1,
- form_extra =3D> qq{onSubmit=3D"submitted('slot$p')" onReset=3D"submitted=
('slot$p')"},
+ form_extra =3D> qq{onSubmit=3D"submitted('slot$p'); silent_submit(this.f=
orm)" onReset=3D"submitted('slot$p')"},
hidden =3D> $hidden,
href =3D> 'silent/ce_modify',
- #include_form =3D> $label,
js_changed =3D> qq{ onChange=3D"changed('slot$p')"},
meta =3D> $meta,
next_text =3D> 'Save',
@@ -1028,7 +1476,7 @@
);
$options{default_ref} =3D $value;
$options{item_id} =3D $name;
- return $Tag->table_editor( \%options );
+ return Vend::Tags->table_editor( \%options );
}
=20
sub page_control_editor {
@@ -1084,7 +1532,7 @@
action =3D> 'return',
defaults =3D> 1,
force_defaults =3D> 1,
- form_extra =3D> qq{onSubmit=3D"submitted('$p')" onReset=3D"submitted('$p=
')" height=3D"100%"},
+ form_extra =3D> qq{onSubmit=3D"submitted('$p'); silent_submit(this.form)=
" onReset=3D"submitted('$p')" height=3D"100%"},
hidden =3D> $hidden,
href =3D> 'silent/ce_modify',
js_changed =3D> qq{onChange=3D"changed('$p')"},
@@ -1102,7 +1550,7 @@
);
$options{default_ref} =3D $pref->{ui_values};
$options{item_id} =3D $p;
- return $Tag->table_editor( \%options );
+ return Vend::Tags->table_editor( \%options );
}
=20
sub make_control_editor {
@@ -1116,11 +1564,17 @@
ui_source =3D> $overall->{ui_source},
ui_type =3D> $overall->{ui_type},
};
+
+ my $extra;
+ my $href;
if($w) {
$widopt =3D {code =3D>'hiddentext'};
+ $href =3D 'silent/ce_modify';
+ $extra =3D qq{onSubmit=3D"submitted('$w'); silent_submit(this.form)" on=
Reset=3D"submitted('$w')"};
$hidden->{ui_content_op} =3D 'modify';
}
else {
+ $href =3D $Global::Variable->{MV_PAGE};
$hidden->{ui_content_op} =3D 'add';
}
=20
@@ -1128,8 +1582,8 @@
action =3D> 'return',
defaults =3D> 1,
force_defaults =3D> 1,
- form_extra =3D> qq{onSubmit=3D"submitted('$w')" onReset=3D"submitted('$w=
')"},
- href =3D> 'silent/ce_modify',
+ form_extra =3D> $extra,
+ href =3D> $href,
js_changed =3D> 'changed',
nocancel =3D> 1,
noexport =3D> 1,
@@ -1140,9 +1594,10 @@
widget =3D> $widopt,
hidden =3D> $hidden,
);
+
$options{default_ref} =3D $r;
$options{item_id} =3D $w;
- return $Tag->table_editor( \%options );
+ return Vend::Tags->table_editor( \%options );
}
=20
sub page_region {
@@ -1214,7 +1669,6 @@
push @tables, $r;
}
=20
- $::Scratch->{ce_modify} =3D '[content-modify]';
## Allow add of new component
if ($opt->{template_edit}) {
push @tables, { _editor_table =3D> make_control_editor('', {}, $overall)=
};
@@ -1234,6 +1688,34 @@
=20
my $comp =3D $tref->{ui_slots};
$ignore{ui_slots} =3D 1;
+=09
+ my @regions;
+ my $snum =3D 1;
+ for my $reg ( @{$tref->{ui_template_layout}} ) {
+ my $r =3D { name =3D> $reg, code =3D> $reg };
+ if($reg eq 'UI_CONTENT') {
+ $r->{contents} =3D "Slot $snum: Page content";
+ $snum++;
+ }
+ else {
+ my @things;
+ $r->{where} =3D $reg;
+ for(@$comp) {
+ next unless $_->{where} eq $reg;
+ my $code =3D $_->{code};
+ my $lab =3D '';
+ if($code) {
+ $lab =3D content_info(undef, { label =3D> 1, code =3D> $code} );
+ $lab =3D " default=3D$lab ($code)";
+ }
+ push @things, "Slot $snum: class=3D$_->{class}$lab";
+ $snum++;
+ }
+ $r->{contents} =3D join "<br>", @things;
+ $r->{slots} =3D \@things;
+ }
+ push @regions, $r;
+ }
=20
$ignore{ui_display_order} =3D 1;
=20
@@ -1280,7 +1762,7 @@
if ($opt->{template_edit}) {
push @tables, { _editor_table =3D> make_control_editor('', {}, $overall)=
};
}
- return ($overall, $comp, \@tables);
+ return ($overall, \@regions, $comp, \@tables);
}
=20
sub component_region {
@@ -1386,13 +1868,16 @@
}
=20
sub format_page {
- my ($ref) =3D @_;
+ my ($ref, $opt) =3D @_;
+ $opt ||=3D {};
my $type =3D 'page';
$ref->{ui_type} eq $type
or death("publish_$type", "Type must be %s to publish %s", $type, $type);
my $name =3D $ref->{ui_name}
or death("publish_$type", "Must have name to publish %s", $type);
=20
+ my $found_something =3D 0;
+
my @sets;
if($ref->{PREAMBLE} =3D~ /\S/) {
push @sets, "<!-- BEGIN PREAMBLE -->";
@@ -1412,9 +1897,15 @@
for my $n (@$order) {
my $r;
my $stype =3D $scratches->{$n} || 'tmpn';=20
- push @sets, "[$stype $n]" . $vals->{$n} . "[/$stype]";
+ my $val =3D $vals->{$n};
+ if($opt->{preview} and $n eq $opt->{preview}) {
+ $val =3D ($opt->{preview_tag} || '**** PREVIEW ****') . " $val";
+ }
+ push @sets, "[$stype $n]" . $val . "[/$stype]";
}
=20=09
+ $found_something +=3D scalar(@sets);
+
# Things we want every time
my $layout =3D delete $ref->{ui_template_layout} || [];
=20
@@ -1425,7 +1916,7 @@
push @header, "ui_type: $type";
push @header, "ui_name: $name";
push @header, "ui_page_template: $ref->{ui_page_template}";
- push @header, "ui_version: " . $Tag->version();
+ push @header, "ui_version: " . Vend::Tags->version();
delete $ref->{ui_name};
delete $ref->{ui_type};
delete $ref->{"ui_$type"};
@@ -1441,6 +1932,7 @@
=20
for my $r (@$slots) {
next unless $r->{where};
+ $found_something++;
push @controls, '[control-set]';
my @order =3D 'component';
my %seen =3D qw/ code 1 mv_ip 1 where 1 class 1 component 1 /;
@@ -1463,11 +1955,13 @@
push @bods, "<!-- END CONTENT -->";
}
elsif ($var =3D~ /^[A-Z]/) {
+ $found_something++;
push @bods, '@_' . $var . '_@';
}
}
=20
if($ref->{POSTAMBLE} =3D~ /\S/) {
+ $found_something++;
push @bods, "<!-- BEGIN POSTAMBLE -->";
$ref->{POSTAMBLE} =3D~ s/^\s*\n//;
$ref->{POSTAMBLE} =3D~ s/\n\s*$//;
@@ -1476,7 +1970,7 @@
}
delete $ref->{POSTAMBLE};
=20
-
+ return $body unless $found_something;
=20
for(sort keys %$ref) {
next unless /^ui_/;
@@ -1506,6 +2000,7 @@
sub format_template {
my ($ref) =3D @_;
my $type =3D 'template';
+#::logDebug("called format_template name=3D$ref->{ui_name} type=3D$ref->{u=
i_type}");
$ref->{ui_type} eq $type
or death("publish_$type", "Type must be %s to publish %s", $type, $type);
my $name =3D $ref->{ui_name}
@@ -1537,7 +2032,7 @@
push @header, "ui_$type: $name";
push @header, "ui_type: $type";
push @header, "ui_name: $name";
- push @header, "ui_version: " . $Tag->version();
+ push @header, "ui_version: " . Vend::Tags->version();
delete $ref->{ui_name};
delete $ref->{ui_type};
delete $ref->{"ui_$type"};
@@ -1550,25 +2045,48 @@
my $dir =3D $::Variable->{UI_REGION_DIR} || 'templates/regions';
=20
my $layout =3D delete $ref->{ui_template_layout} || [];
+ my $regdir;
for my $var (@$layout) {
next if $var eq 'UI_CONTENT';
my $thing =3D delete($ref->{$var});
my $r;
+ my $v;
$r =3D $Vend::Cfg->{DirConfig}
and $r =3D $r->{Variable}
- and $r =3D $r->{$var}
- and $Tag->write_relative_file($r, $thing)
+ and $v =3D $r->{$var}
+ and Vend::Tags->write_relative_file($v, $thing)
and next;
- pain('format_template',
- "unable to write dynamic variable, saving %s to regions",
- $var);
- $Tag->write_relative_file("$dir/$var", $thing)
+ if(! $regdir and ref($r) eq 'HASH') {
+ my ($k, $v);
+ while( ($k, $v) =3D each %$r) {
+ last if $k =3D~ /_(TOP|BOTTOM)$/;
+ }
+ $regdir =3D $v;
+ $regdir =3D~ s:/[^/]+$::;
+ }
+ if(! $regdir) {
+ pain('format_template',
+ "unable to write dynamic variable, saving %s to $dir",
+ $var);
+ $regdir =3D $dir;
+ }
+ Vend::Tags->write_relative_file("$regdir/$var", $thing)
or
death('format_template', "unable to write any dynamic variable, help!");
+ pain('publish_template', "Must apply changes for access to this template=
");
}
=20
$ref->{ui_template_layout} =3D join ", ", @$layout;
=20
+ if(my $pp =3D delete $ref->{ui_page_picture}) {
+ $pp =3D~ s/^\s+//;
+ $pp =3D~ s/\s+$//;
+ $pp =3D~ s{^\s*<!--+\s*BEGIN PAGE_PICTURE\s*--+>\s*}{};
+ $pp =3D~ s{\s*<!--+\s*END PAGE_PICTURE\s*--+>\s*$}{};
+ $pp =3D qq{<!-- BEGIN PAGE_PICTURE -->\n$pp\n<!-- END PAGE_PICTURE -->\n=
};
+ push @sets, $pp;
+ }
+
for(sort keys %$ref) {
next unless /^ui_/;
my $val =3D delete $ref->{$_};
@@ -1594,6 +2112,7 @@
sub format_component {
my ($ref) =3D @_;
my $type =3D 'component';
+#::logDebug("format component=3D" . ::uneval($ref));
$ref->{ui_type} eq $type
or death("publish_$type", "Type must be %s to publish %s", $type, $type);
my $name =3D $ref->{ui_name}
@@ -1651,29 +2170,29 @@
my ($record, $dest) =3D @_;
my $dir =3D $::Variable->{UI_PAGE_DIR} || 'pages';
$dest ||=3D "$dir/$record->{code}";
- $Tag->write_relative_file($dest, $record->{page_text});
+ Vend::Tags->write_relative_file($dest, $record->{page_text});
}
=20
sub write_template {
my ($record, $dest) =3D @_;
my $dir =3D $::Variable->{UI_TEMPLATE_DIR} || 'templates';
$dest ||=3D "$dir/$record->{code}";
- $Tag->write_relative_file($dest, $record->{temp_text});
+ Vend::Tags->write_relative_file($dest, $record->{temp_text});
}
=20
sub write_component {
my ($record, $dest) =3D @_;
my $dir =3D $::Variable->{UI_COMPONENT_DIR} || 'templates/components';
$dest ||=3D "$dir/$record->{code}";
- $Tag->write_relative_file($dest, $record->{comp_text});
+ Vend::Tags->write_relative_file($dest, $record->{comp_text});
}
=20
sub ref_page {
my ($ref, $opt) =3D @_;
my $vref =3D $opt->{values_ref} || \%CGI::values;
my $curtime =3D strftime("%Y%m%d%H%M%S", gmtime() );
- my $showdate =3D $Tag->filter('date_change', $vref->{ui_show_date});
- my $expdate =3D $Tag->filter('date_change', $vref->{ui_expiration_date});
+ my $showdate =3D Vend::Tags->filter('date_change', $vref->{ui_show_date});
+ my $expdate =3D Vend::Tags->filter('date_change', $vref->{ui_expiration_=
date});
my $r =3D {
content_class =3D> $ref->{ui_class},
mod_time =3D> strftime("%Y%m%d%H%M%S", gmtime()),
@@ -1698,8 +2217,8 @@
my ($ref, $opt) =3D @_;
my $vref =3D $opt->{values_ref} || \%CGI::values;
my $curtime =3D strftime("%Y%m%d%H%M%S", gmtime() );
- my $showdate =3D $Tag->filter('date_change', $vref->{ui_show_date});
- my $expdate =3D $Tag->filter('date_change', $vref->{ui_expiration_date});
+ my $showdate =3D Vend::Tags->filter('date_change', $vref->{ui_show_date});
+ my $expdate =3D Vend::Tags->filter('date_change', $vref->{ui_expiration_=
date});
my $r =3D {
reftype =3D> $ref->{ui_type},
content_class =3D> $ref->{ui_class},
@@ -1721,16 +2240,28 @@
return $r;
}
=20
+sub preview_dir {
+ my $dir =3D $Vend::Cfg->{ScratchDir};
+ $dir =3D~ s,^$Vend::Cfg->{VendRoot}/,,;
+ $dir .=3D "/previews/$Vend::Session->{id}";
+ return $dir;
+}
+
sub preview_page {
my ($ref, $opt) =3D @_;
- my $dest =3D $Vend::Cfg->{ScratchDir};
- $dest =3D~ s,^$Vend::Cfg->{VendRoot}/,,;
- $dest .=3D "/previews/$Vend::Session->{id}.$ref->{ui_name}";
+ my $dest =3D preview_dir();
+ $dest .=3D "/$ref->{ui_name}";
$::Scratch->{tmp_tmpfile} =3D $dest;
my $tmp =3D { %$ref };
my $record =3D ref_content($tmp)
or return death("preview_template", "bad news");
- my $text =3D format_page($tmp);
+ my $text =3D format_page(
+ $tmp,
+ {
+ preview =3D> $::Variable->{PAGE_TITLE_NAME} || 'page_title',
+ preview_tag =3D> errmsg('****PREVIEW****'),
+ },
+ );
$record->{page_text} =3D $text;
#::logDebug("header record: " . uneval($record));
write_page($record, $dest);
@@ -1742,7 +2273,7 @@
my $dest =3D $vref->{ui_destination};
$dest =3D~ s/\s+$//;
$dest =3D~ s/^\s+$//;
- my $record =3D ref_content($ref)
+ my $record =3D ref_content($ref, $opt)
or return death("publish_template", "bad news");
my $text =3D format_page($ref);
$record->{page_text} =3D $text;
@@ -1758,6 +2289,7 @@
$dest =3D~ s/^\s+$//;
my $record =3D ref_content($ref)
or return death("publish_template", "bad news");
+#::logDebug("Got publish_template ref=3D" . uneval($ref));
my $text =3D format_template($ref);
$record->{temp_text} =3D $text;
#::logDebug("header record: " . uneval($record));
@@ -1774,12 +2306,16 @@
or return death("publish_component", "bad news");
my $text =3D format_component($ref);
$record->{comp_text} =3D $text;
-#::logDebug("header record: " . uneval($record));
+#::logDebug("publish_component header record: " . uneval($record));
write_component($record);
}
=20
sub cancel_edit {
my ($ref, $opt) =3D @_;
+ my $dir =3D preview_dir();
+ if($ref->{ui_name} and -f "$dir/$ref->{ui_name}") {
+ unlink "$dir/$ref->{ui_name}";
+ }
my $store =3D $Vend::Session->{content_edit}
or return death('cancel', 'content store not found');
$store =3D $store->{$ref->{ui_type}}
@@ -1806,7 +2342,7 @@
=20
my @found =3D grep length($vref->{$_}), @valid_attr;
my %hash =3D map { $_ =3D> $vref->{$_} } @found;
-
+#::logDebug("add attribute hash: " . uneval(\%hash));
push @{$ref->{ui_display_order} ||=3D []}, $name;
$ref->{$name} =3D \%hash;
}
@@ -1872,7 +2408,7 @@
class =3D> $class,
where =3D> $where,
};
- my $cref =3D read_template($submitted_name,
+ my $cref =3D read_component($submitted_name,
{
type =3D> 'component',=20
component_dir =3D> $opt->{component_dir},=20
@@ -1975,7 +2511,7 @@
=20
my @found;
for(keys %$vref) {
-#::logDebug("checking $_ for legality");
+#::logDebug("checking $_ ($ref->{$_} -> $vref->{$_}) for legality");
next if $illegal->{$_};
next unless defined $ref->{$_};
#::logDebug("$_ is legal and defined in ref");
@@ -2079,12 +2615,16 @@
}
=20
my %immediate_action =3D (
- purge =3D> sub { delete $Vend::Session->{content_edit} },
+ purge =3D> sub {
+ delete $Vend::Session->{content_edit};
+ File::Path::rmtree(preview_dir());
+ },
);
=20
my %common_action =3D (
cancel =3D> \&cancel_edit,
motion =3D> \&reorder_attribute,
+ modify_top =3D> \&modify_top_attribute,
modify =3D> \&modify_attribute,
modify_body =3D> \&modify_body,
delete =3D> \&delete_attribute,
@@ -2109,79 +2649,73 @@
);
=20
sub content_modify {
- my($op, $name, $type, $opt) =3D @_;
+ my($ops, $name, $type, $opt) =3D @_;
=20
+ $opt ||=3D {};
my $vref =3D $opt->{values_ref} || \%CGI::values;
- $op ||=3D $vref->{ui_content_op};
-
-#::logDebug("content_modify: called, op=3D$op");
+ $ops ||=3D $vref->{ui_content_op};
=20
my $sub;
- if($sub =3D $immediate_action{$op}) {
+ if($sub =3D $immediate_action{$ops}) {
+#::logDebug("content modify immediate action");
return $sub->(undef, $opt);
}
+#::logDebug("content_modify: called, name=3D$name type=3D$type ops=3D$ops"=
);
=20
$type ||=3D $vref->{ui_type}
or return death('ui_type', "Must specify a type");
=20
$name ||=3D $vref->{ui_name}
or return death('ui_name', "Must specify a name for %s", $type);
+#::logDebug("content_modify: called, name=3D$name type=3D$type");
+
+ my(@ops) =3D split /[\s,\0]+/, $ops;
+#::logDebug("content_modify: ops=3D" . join(",", @ops) . " vref=3D$vref");
+
+ my $ref =3D get_store($type,$name)
+ or return death('content_modify', "%s %s not found", $type, $name);
=20
- my $store =3D $Vend::Session->{content_edit}{$type} ||=3D {};
- my $ref =3D $store->{$name}
- or return death($op, "%s %s not found", $type, $name);
+ foreach my $op (@ops) {
#::logDebug("content_modify: doing name=3D$name type=3D$type op=3D$op");
+#::logDebug("content_modify: doing name=3D$name type=3D$type op=3D$op ref=
=3D" . uneval($ref));
+
+ $sub =3D $specific_action{$type}{$op} || $common_action{$op};
+=09=09
+ if(! $sub) {
+ return death('ui_content_op', "%s %s not found", 'operation', $op );
+ }
=20
- $sub =3D $specific_action{$type}{$op} || $common_action{$op};
-=09
- if(! $sub) {
- return death(
- 'ui_content_op',
- "%s %s not found",
- 'operation',
- $op,
- );
- }
#::logDebug("ref before modify, code=3D$vref->{code}=3D" . uneval($ref));
- my $status =3D $sub->($ref, $opt);
+ if(! $sub->($ref, $opt) ) {
+ pain('content_modify', "op %s failed for %s %s.", $op, $type, $name);
+ }
#::logDebug("ref AFTER modify=3D, code=3D$vref->{code}" . uneval($ref));
- return $status;
+
+ }
+ return 1;
}
=20=20
sub page_editor {
- my($pref, $opt, $form_template) =3D @_;
+ my($name, $opt, $form_template) =3D @_;
=20=09
- my $name;
my $source;
=20
- $opt->{page_edit} ||=3D 1;
+ $opt->{page_edit} =3D 1;
=20
- my $store =3D $Vend::Session->{content_edit} ||=3D {};
- my $cstore =3D $store->{component} ||=3D {};
- my $pstore =3D $store->{page} ||=3D {};
+#::logDebug("in page_editor, name=3D$name");
+ my $pref =3D read_page($name, $opt);
=20
- my $tmp;
- if(! $pref) {
-#::logDebug("No page template");
- $opt->{new_page} =3D 1;
- $opt->{template} ||=3D $opt->{ui_page_template};
- $pref =3D read_template($opt->{ui_name}, $opt);
-#::logDebug("page template=3D$pref");
- $name =3D $opt->{ui_name} || $opt->{name} || 'new';
- $pref->{ui_name} =3D $name;
- }
- elsif(ref($pref) ne 'HASH') {
- return errmsg("Invalid component: %s", uneval($pref));
+ if(ref($pref) ne 'HASH') {
+ return death('page_editor', "Invalid page: %s", uneval($pref));
}
else {
- $name =3D $pref->{ui_name} || $opt->{name};
- $tmp =3D $pstore->{$name};
- $pref =3D $tmp if $tmp;
+ $pref =3D get_store('page', $name) || $pref;
}
=20
- $pstore->{$name} =3D $pref;
+ save_store('page', $name, $pref);
parse_page($pref, $opt);
- publish_page($pref, $opt) if $opt->{new_page};
+ publish_page($pref, $opt) if $opt->{new};
+
#::logDebug("found a template name=3D$pref->{ui_name} store=3D$pstore: " .=
uneval($pref));
=20
my ($overall, $comp) =3D page_region($pref, $opt);
@@ -2202,42 +2736,25 @@
}
=20
sub template_editor {
- my($tref, $opt, $form_template) =3D @_;
-#::logDebug("component editor called, cref=3D$cref opt=3D" . uneval($opt));
- my $name;
+ my($name, $opt, $form_template) =3D @_;
+#::logDebug("template editor called, name=3D$name, opt=3D" . uneval($opt));
my $source;
=20
- $opt->{template_edit} ||=3D 1;
+ $opt->{template_edit} =3D 1;
=20
- $Vend::Session->{content_edit} ||=3D {};
-
- my $tmp;
- my $store =3D $Vend::Session->{content_edit}{template} ||=3D {};
- if(! $tref) {
- $opt->{new} =3D 1;
- $tref =3D read_template($opt->{ui_name}, $opt);
- $name =3D $opt->{ui_name} || $opt->{name} || 'new';
- $tref->{ui_name} =3D $name;
- }
- elsif(ref($tref) ne 'HASH') {
- return errmsg("Invalid component: %s", uneval($tref));
- }
- else {
- $name =3D $tref->{ui_name} || $opt->{name};
- $tmp =3D $store->{$name};
- $tref =3D $tmp if $tmp;
- }
-
- $store->{$name} =3D $tref;
-#::logDebug("found a template name=3D$tref->{ui_name} store=3D$store: " . =
uneval($tref));
+ my $tref =3D get_store('template', $name) || read_template($name, $opt);
+ save_store('template', $name, $tref);
=20
parse_template($tref, $opt);
=20
- my ($overall, $comp, $cont) =3D template_region($tref, $opt);
+ my ($overall, $reg, $comp, $cont) =3D template_region($tref, $opt);
my $to_run =3D [
$opt->{list_prefix} || 'templates',
$opt->{prefix} || 'tem',
[$tref],
+ $opt->{region_list_prefix} || 'regions',
+ $opt->{region_prefix} || 'reg',
+ $reg,
$opt->{comp_list_prefix} || 'components',
$opt->{comp_prefix} || 'comp',
$comp,
@@ -2253,32 +2770,19 @@
}
=20
sub component_editor {
- my($cref, $opt, $form_template) =3D @_;
+ my($name, $opt, $form_template) =3D @_;
#::logDebug("component editor called, cref=3D$cref opt=3D" . uneval($opt));
- my $name;
- my $source;
-
- $opt->{component_edit} ||=3D 1;
=20
- $Vend::Session->{content_edit} ||=3D {};
+ $opt->{component_edit} =3D 1;
=20
- my $store =3D $Vend::Session->{content_edit}{component} ||=3D {};
- if(! $cref) {
- $opt->{new} =3D 1;
- $cref =3D read_template($opt->{ui_name}, $opt);
- $name =3D $opt->{ui_name} || $opt->{name} || 'new';
- }
- elsif(! ref($cref) eq 'HASH') {
- return errmsg("Invalid component: %s", uneval($cref));
- }
- else {
- $name =3D $cref->{ui_name} || $opt->{name};
- my $tmp =3D $store->{$name};
- $cref =3D $tmp if $tmp;
+ my $cref =3D read_component($name, $opt);
+ if(! ref($cref) eq 'HASH') {
+ return death('component_editor', "Invalid component: %s", uneval($cref));
}
=20
-#::logDebug("found a component name=3D$name store=3D$store: " . uneval($cr=
ef));
- $store->{$name} =3D $cref;
+ $cref =3D get_store('component', $name) || $cref;
+
+ save_store('component', $name,$cref);
=20
my ($overall, $tref) =3D component_region($cref, $opt);
my $to_run =3D ['components', 'comp', $tref];
@@ -2312,6 +2816,7 @@
=20
my %todo =3D qw/
components 1
+ regions 1
pages 1
templates 1
/;
@@ -2352,55 +2857,19 @@
sub editor {
my ($item, $opt, $form_template) =3D @_;
=20
- my $pref;
- my $tref;
- my $cref;
-
- my $template;
-
- $opt->{type} ||=3D 'page';
- $opt->{ui_page_template} ||=3D $CGI->{ui_page_template};
-
- ## If we get a ref, assume it is already parsed
- if(ref $item) {
- $template =3D $item;
- }
- ## Else it is a file/db spec, and we read it
- elsif($item) {
- $template =3D read_template($item, $opt);
- }
-
- $opt->{new} =3D 1 if ! $template;
-
- if(ref($template) eq 'ARRAY') {
- my $ary =3D $template;
- $template =3D shift(@$ary);
- # bye-bye, those waiting in line...
- $Vend::Session->{ui_components_to_edit} =3D $ary;
- }
-
- $template ||=3D {};
-#::logDebug("read this thing:\n" . ::uneval($template));
- if($template->{ui_page}) {
- $pref =3D $template;
- $opt->{type} =3D 'page';
- }
- elsif($template->{ui_template}) {
- $tref =3D $template;
- $opt->{type} =3D 'template';
+ $::Scratch->{ce_modify} =3D '[content-modify]';
+ if($opt->{type} eq 'page') {
+ return page_editor($opt->{name}, $opt, $form_template);
}
- elsif($template->{ui_component}) {
- $cref =3D $template;
- $opt->{type} =3D 'component';
+ elsif ($opt->{type} eq 'template') {
+ return template_editor($opt->{name}, $opt, $form_template);
}
-
- if($opt->{type} eq 'component') {
- return component_editor($cref, $opt, $form_template);
+ elsif ($opt->{type} eq 'component') {
+ return component_editor($opt->{name}, $opt, $form_template);
}
- if($opt->{type} eq 'template') {
- return template_editor($tref, $opt, $form_template);
+ else {
+ return errmsg("Don't know how to edit type '%s'.\n", $opt->{type});
}
- return page_editor($pref, $opt, $form_template);
}
=20
$Template{component_standard} =3D <<'EOF';
2.7 +35 -0 interchange/dist/lib/UI/ui.cfg
rev 2.7, prev_rev 2.6
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.6
retrieving revision 2.7
diff -u -r2.6 -r2.7
--- ui.cfg 18 Aug 2002 08:17:41 -0000 2.6
+++ ui.cfg 13 Sep 2002 20:46:20 -0000 2.7
@@ -43,6 +43,41 @@
}
EOR
=20
+GlobalSub <<EOS
+sub admin_links {
+ return unless $Vend::admin;
+ my $tmpd =3D $Vend::Cfg->{ScratchDir};
+ $tmpd .=3D "/previews/$Vend::SessionID";
+ $Vend::Cfg->{PreviewDir} =3D $tmpd if -d $tmpd;
+ $::Variable->{ADL_SUFFIX} =3D $Vend::Cfg->{HTMLsuffix};
+ $::Variable->{ADL_PAGE} =3D $::Variable->{ADL_PAGE_TEMPLATE} || <<EOF;
+[page href=3D"admin/content_editor" form=3D"
+ ui_name=3D[var MV_PAGE 1][var ADL_SUFFIX]
+ ui_type=3Dpage
+ "][loc]edit[/loc] [loc]page[/loc]</A>
+EOF
+
+ $::Variable->{ADL_COMPONENT} =3D $::Variable->{ADL_COMPONENT_TEMPLATE} ||=
<<EOF;
+[page href=3D"admin/content_editor" form=3D"
+ ui_name=3D[contol component]
+ ui_type=3Dcomponent
+ "][loc]edit[/loc] [control component]</A>
+EOF
+
+ $::Variable->{ADL_MENU} =3D $::Variable->{ADL_MENU_TEMPLATE} || <<EOF;
+<a class=3D"[control link_class]"
+ href=3D"[area
+ href=3Dadmin/menu_editor
+ form=3D|
+ qmenu_name=3D[either][control menu_name][or][var MV_PAGE 1][/either]
+ |
+ ]">[loc]edit[/loc] [loc]menu[/loc]</A>
+EOF
+ return;
+
+}
+EOS
+
# user tags
include lib/UI/vars/*
Profiles lib/UI/profiles/*
1.5 +21 -21 interchange/dist/lib/UI/pages/admin/content.html
rev 1.5, prev_rev 1.4
Index: content.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/content.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- content.html 18 Aug 2002 15:38:26 -0000 1.4
+++ content.html 13 Sep 2002 20:46:20 -0000 1.5
@@ -17,6 +17,10 @@
</blockquote>
[/if]
=20
+[if cgi ui_content_op]
+<!-- [content-modify] -->
+[/if]
+
[calc]
$cwd =3D $Session->{ui_cwd};
sub tmp_display_in_progress {
@@ -53,10 +57,6 @@
return;
[/calc]
=20
-[if cgi ui_content_op]
-<!-- [content-modify] -->
-[/if]
-
[if session content_edit]
<A HREF=3D"[area href=3D@@MV_PAGE@@ form=3D'ui_content_op=3Dpurge']"
onClick=3D"return confirm('Are you sure you want to purge all in-proce=
ss edits?')"
@@ -106,14 +106,15 @@
ui_type=3Dtemplate
new=3D1
]"><img src=3D"layout.gif" border=3D0 align=3Dtextmiddle> [L]New templ=
ate[/L]</A><br><br>
- [file-navigator
- initial_dir=3D"__UI_TEMPLATE_DIR__"
- start_open=3D"__UI_TEMPLATE_DIR__"
- edit_only=3D1
- edit_all=3D1
- edit_page=3Dcontent_editor
- edit_form=3D"ui_name=3D~RN~&ui_type=3Dtemplate"
- ]
+ [loop acclist=3D1 list=3D"[content-info templates=3D1 no-none=3D1]"]
+ <A HREF=3D"[area
+ href=3D__UI_BASE__/content_editor
+ form=3Dauto
+ ui_type=3Dtemplate
+ ui_name=3D"[loop-code]"
+ ]"><img src=3D"layout.gif" border=3D0 align=3Dtextmiddle>[loop-param l=
abel]</A><br>
+ [/loop]
+
</td>
=20
<td class=3Drnorm valign=3Dtop width=3D"33%">
@@ -125,15 +126,14 @@
ui_type=3Dcomponent
new=3D1
]"><img src=3D"layout.gif" border=3D0 align=3Dtextmiddle> [L]New compo=
nent[/L]</A><br><br>
- [file-navigator
- initial_dir=3D"__UI_COMPONENT_DIR__"
- start_open=3D"__UI_COMPONENT_DIR__"
- edit_only=3D1
- edit_all=3D1
- edit_page=3Dcontent_editor
- edit_form=3D"ui_name=3D~RN~&ui_type=3Dcomponent"
- ]
- [calc] $Session->{ui_cwd} =3D $cwd; return; [/calc]
+ [loop acclist=3D1 list=3D"[content-info components=3D1 no-none=3D1]"]
+ <A HREF=3D"[area
+ href=3D__UI_BASE__/content_editor
+ form=3Dauto
+ ui_type=3Dcomponent
+ ui_name=3D"[loop-code]"
+ ]"><img src=3D"layout.gif" border=3D0 align=3Dtextmiddle>[loop-param l=
abel]</A><br>
+ [/loop]
</td>
</tr>
=20
1.3 +6 -6 interchange/dist/lib/UI/pages/admin/content_editor.html
rev 1.3, prev_rev 1.2
Index: content_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/content_editor.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- content_editor.html 27 Jun 2002 20:18:36 -0000 1.2
+++ content_editor.html 13 Sep 2002 20:46:20 -0000 1.3
@@ -45,6 +45,7 @@
op =3D> 'filesafe',
body =3D> $CGI->{ui_name},
});
+ return unless $CGI->{ui_type} eq 'page';
my $pat =3D quotemeta $Config->{HTMLsuffix};
#Debug("pat=3D$pat");
$pat =3D qr/$pat$/;
@@ -69,18 +70,17 @@
</td>
<td>
[display
- name=3Dui_page_template
- type=3Dselect
- default=3D"[page-param ui_page_template]"
- passed=3D"[content-info templates=3D1]"
- ]
+ name=3Dui_page_template
+ type=3Dselect
+ passed=3D"[content-info templates=3D1]"
+ ]
</td>
</tr>
[/if]
<tr>
<td> </td>
<td>
- <input type=3Dsubmit value=3D"[L]Create new page[/L]">
+ <input type=3Dsubmit value=3D"[msg arg.0=3D`$CGI->{ui_type}`]Create new =
%s[/msg]">
</td>
</tr>
</table>
1.2 +1 -1 interchange/dist/lib/UI/pages/admin/content_publish.ht=
ml
rev 1.2, prev_rev 1.1
Index: content_publish.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/content_publish.html=
,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- content_publish.html 16 Feb 2002 09:39:10 -0000 1.1
+++ content_publish.html 13 Sep 2002 20:46:20 -0000 1.2
@@ -41,7 +41,7 @@
@existing =3D $db->query( { hashref =3D> 1, sql =3D> $q });
}
else {
- @existing =3D glob("$dir/$dest*");
+ @existing =3D $Tag->list_glob("$dir/$dest*");
}
=20
if(! $db and ! @existing) {
1.2 +16 -9 interchange/dist/lib/UI/pages/include/component_editor
rev 1.2, prev_rev 1.1
Index: component_editor
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/component_editor,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- component_editor 16 Feb 2002 09:39:10 -0000 1.1
+++ component_editor 13 Sep 2002 20:46:21 -0000 1.2
@@ -1,4 +1,4 @@
-[content-editor name=3D"[cgi ui_name]" type=3D"[cgi ui_type]"]
+[content-editor name=3D"[cgi ui_name]" type=3D"component"]
[components]
=20
<script language=3DJavaScript>
@@ -143,10 +143,13 @@
[on-match]
<h3>Component Attributes</h3>
<div align=3Dright>
- Description: <input type=3Dtext size=3D30 value=3D"[comp-param ui_label]"=
><BR>
- Classes: <input type=3Dtext size=3D30 value=3D"[comp-param ui_class]"><B=
R>
- Groups: <input type=3Dtext size=3D30 value=3D"[comp-param ui_group]"><br>
- <input type=3Dsubmit value=3D"Save" onClick=3D"return check_change()">
+ Description:
+ <input type=3Dtext name=3Dui_label size=3D30 value=3D"[comp-param ui_lab=
el]"><BR>
+ Classes:
+ <input type=3Dtext name=3Dui_class size=3D30 value=3D"[comp-param ui_cla=
ss]"><BR>
+ Groups:
+ <input type=3Dtext name=3Dui_group size=3D30 value=3D"[comp-param ui_gro=
up]"><br>
+ <input type=3Dsubmit name=3Dmv_click value=3D"[L]Save[/L]" onClick=3D"ret=
urn check_change()">
</div>
<hr>
[/on-match]
@@ -205,16 +208,20 @@
<p>
[/comp-list]
[on-match]
-[set Publish]
+[set [L]Save[/L]]
+ui_content_op=3Dmodify_top
+mv_click=3Dce_modify
+[/set]
+[set [L]Publish[/L]]
ui_content_op=3Dpublish
mv_nextpage=3D__UI_BASE__/content_publish
[/set]
-[set Cancel]
+[set [L]Cancel[/L]]
ui_content_op=3Dcancel
mv_nextpage=3D__UI_BASE__/content
[/set]
<input type=3Dhidden name=3Dui_name value=3D"[comp-param ui_name]">
-<input type=3Dhidden name=3Dui_type value=3D"[comp-param ui_type]">
+<input type=3Dhidden name=3Dui_type value=3D"component">
<input type=3Dhidden name=3Dui_source value=3D"[comp-param ui_source]">
<input type=3Dhidden name=3Dmv_action value=3D"return">
<input style=3D"font-weight: bold" type=3Dsubmit onClick=3D"return check_c=
hange()" name=3Dmv_click value=3D"[L]Publish[/L]">
@@ -244,7 +251,7 @@
action=3Dreturn
hidden.ui_content_op=3Dmodify_body
hidden.ui_name=3D[comp-param ui_name]
- hidden.ui_type=3D[comp-param ui_type]
+ hidden.ui_type=3Dcomponent
item_id=3Dui_body
href=3Dsilent/ce_modify
show_reset=3D1
1.4 +88 -5 interchange/dist/lib/UI/pages/include/page_editor
rev 1.4, prev_rev 1.3
Index: page_editor
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/page_editor,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- page_editor 15 Aug 2002 16:30:34 -0000 1.3
+++ page_editor 13 Sep 2002 20:46:21 -0000 1.4
@@ -84,7 +84,7 @@
function content_win () {
window.name =3D 'mainwindow[scratch window_name]';
var url =3D '[area
- href=3D"admin/page_upload"
+ href=3D"admin/page_portion"
form=3D|
ui_source_form=3Dcontent_edit
ui_source_var=3Dui_body_text
@@ -185,7 +185,7 @@
<form name=3Doverall action=3D"[area @@MV_PAGE@@]" method=3DPOST>
<input type=3Dhidden name=3Dui_content_op value=3D"modify">
<input type=3Dhidden name=3Dui_name value=3D"[page-param ui_name]">
- <input type=3Dhidden name=3Dui_type value=3D"[page-param ui_type]">
+ <input type=3Dhidden name=3Dui_type value=3Dpage
<input type=3Dhidden name=3Dmv_action value=3D"back">
<table width=3D"100%" cellpadding=3D0 cellspacing=3D0 cellmargin=3D3>
<tr>
@@ -295,6 +295,7 @@
id=3Dchanged_PREAMBLE
value=3D1>
</div>
+[tmpn CONTENT_shown][/tmpn]
[components]
[comp-sub tmp_slot]
return ++$slot;
@@ -318,6 +319,7 @@
id=3Dchanged_slot[comp-increment]
value=3D1>
[else]
+ [set CONTENT_shown]1[/set]
<A HREF=3D"javascript:void(0)"
style=3D"font-size: larger; font-weight: bolder"
onClick=3D"visible([comp-increment],'comp')"
@@ -331,6 +333,17 @@
[/if-comp-param]
</div>
[/components]
+[if !scratch CONTENT_shown]
+ <A HREF=3D"javascript:void(0)"
+ style=3D"font-size: larger; font-weight: bolder"
+ onClick=3D"visible('only','comp')"
+ title=3D"edit page content"
+ >CONTENT</A> <input
+ type=3Dcheckbox
+ name=3Dchanged_CONTENT
+ id=3Dchanged_CONTENT
+ value=3D1>
+[/if]
<div id=3Dclicker2
style=3D"
padding: 1px;
@@ -452,7 +465,7 @@
width.ui_body_text=3D"100%"
hidden.ui_content_op=3Dmodify_body
hidden.ui_name=3D"[page-param ui_name]"
- hidden.ui_type=3D"[page-param ui_type]"
+ hidden.ui_type=3Dpage
form-name=3Dcontent_edit
href=3D"silent/ce_modify"
item_id=3D"CONTENT"
@@ -471,8 +484,14 @@
widget.ui_body_text=3D"textarea"
view=3Dui_component
form-extra=3D|
+ [if-comp-param where]
onSubmit=3D"submitted('[comp-param where]'); return check_change()"
onReset=3D"submitted('[comp-param where]')"
+ [else]
+ onSubmit=3D"submitted('CONTENT'); return check_change()"
+ onReset=3D"submitted('CONTENT')"
+ [/else]
+ [/if-comp-param]
|
]
=20=09=09
@@ -480,6 +499,70 @@
[/if-comp-param]
</div>
[/components]
+
+[if !scratch CONTENT_shown]
+
+ <div
+ id=3D"comp_dynformonly"
+ style=3D"
+ border-style: inset;
+ border-width: thin;
+ Position:Absolute;=20
+ Left:0; Top:0; Height:100%; Width:100%;
+ Visibility: Hidden;
+ z-index:0;
+ background: #EEEEEE;
+ ">
+
+[calc]
+ $page_content =3D <<'EoPA';
+[page-param CONTENT]
+EoPA
+ $page_preamble =3D <<'EoPB';
+[page-param PREAMBLE]
+EoPB
+ $page_postamble =3D <<'EoPC';
+[page-param POSTAMBLE]
+EoPC
+ for(\$page_content, \$page_preamble, \$page_postamble) {
+ chop $$_;
+ }
+ return;
+[/calc]
+
+ [table-editor
+ action=3Dreturn
+ height.ui_body_text=3D"38"
+ width.ui_body_text=3D"100%"
+ hidden.ui_content_op=3Dmodify_body
+ hidden.ui_name=3D"[page-param ui_name]"
+ hidden.ui_type=3Dpage
+ form-name=3Dcontent_edit
+ href=3D"silent/ce_modify"
+ item_id=3D"CONTENT"
+ js_changed=3Dchanged
+ label.ui_body_text=3D| Page content<br><br><input=
type=3Dbutton onClick=3D"content_win();" Value=3D"[L]Edit in Browser[/L]">|
+ mv_nextpage=3D@@MV_PAGE@@
+ nocancel=3D1
+ notable=3D1
+ no_meta=3D1
+ override.ui_body_text=3D`$page_content`
+ show_reset=3D1
+ table=3Djunk
+ table_width=3D"100%"
+ ui_data_fields=3D"code ui_body_text"
+ ui_hide_key=3D1
+ widget.ui_body_text=3D"textarea"
+ view=3Dui_component
+ form-extra=3D|
+ onSubmit=3D"submitted('CONTENT'); return check_change()"
+ onReset=3D"submitted('CONTENT')"
+ |
+ ]
+
+ </div>
+[/if]
+
<div
id=3Ddynform0
style=3D"
@@ -497,7 +580,7 @@
width.ui_body_text=3D"100%"
hidden.ui_content_op=3Dmodify_body
hidden.ui_name=3D"[page-param ui_name]"
- hidden.ui_type=3D"[page-param ui_type]"
+ hidden.ui_type=3Dpage
href=3D"silent/ce_modify"
item_id=3D"PREAMBLE"
js_changed=3Dchanged
@@ -584,7 +667,7 @@
width.ui_body_text=3D"100%"
hidden.ui_content_op=3Dmodify_body
hidden.ui_name=3D"[page-param ui_name]"
- hidden.ui_type=3D"[page-param ui_type]"
+ hidden.ui_type=3Dpage
href=3D"silent/ce_modify"
item_id=3D"POSTAMBLE"
js_changed=3Dchanged
1.3 +74 -49 interchange/dist/lib/UI/pages/include/template_editor
rev 1.3, prev_rev 1.2
Index: template_editor
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/template_editor,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- template_editor 14 Aug 2002 20:11:31 -0000 1.2
+++ template_editor 13 Sep 2002 20:46:21 -0000 1.3
@@ -1,20 +1,44 @@
-[content-editor name=3D"[cgi ui_name]" type=3D"[cgi ui_type]"]
+[content-editor name=3D"[cgi ui_name]" type=3D"template"]
[templates]
=20
<script language=3DJavaScript>
+
+function silent_revert () {
+ var sil =3D document.getElementById('silent_display');
+ if(sil !=3D undefined)
+ sil.innerHTML =3D '[L]Template Attributes[/L]';
+ return true;
+}
+
+// Don't remove this, called with forms genned by UI::ContentEditor
function changed (code, field) {
var name =3D "changed_" + code;
+ silent_revert();
cbox =3D document.getElementById(name);
cbox.checked =3D true;
}
=20
+// Don't remove this, called with forms genned by UI::ContentEditor
function submitted (code) {
var name =3D "changed_" + code;
+ silent_revert();
cbox =3D document.getElementById(name);
cbox.checked =3D false;
return true;
}
=20
+var save_form_action;
+
+// Don't remove this, called with forms genned by UI::ContentEditor
+function silent_submit () {
+ var sil =3D document.getElementById('silent_display');
+ if(sil !=3D undefined)
+ sil.innerHTML
+ =3D '[L]Template Attributes[/L] <span class=3Dcmessage>[L]Change saved[/=
L]</span>';
+ return true;
+}
+
+// Don't remove this, called with forms genned by UI::ContentEditor
function change_alert (code) {
if(code.length =3D=3D 0) {
code =3D 'a new component';
@@ -24,8 +48,11 @@
return status;
}
=20
+// Don't remove this, called with forms genned by UI::ContentEditor
function check_change () {
var el;
+ silent_revert();
+
el =3D document.getElementById('changed_ui_body');
if(el !=3D undefined && el.checked =3D=3D true) {
return change_alert('the component body');
@@ -140,9 +167,12 @@
<td valign=3Dtop>
<form name=3Doverall action=3D"[area @@MV_PAGE@@]" method=3DPOST>
=20
-<h3>Template Attributes</h3>
+<h3 id=3Dsilent_display>Template Attributes</h3>
<div align=3Dright>
- Description: <input type=3Dtext size=3D30 value=3D"[tem-param ui_label]">=
<BR>
+ Description: <input name=3Dui_label size=3D30 value=3D"[tem-param ui_labe=
l]"><BR>
+ <input type=3Dsubmit
+ value=3D"[L]Save[/L]"
+ onClick=3D"check_change()">
</div>
<hr>
<h3>Template Controls</h3>
@@ -166,7 +196,7 @@
code=3D"[cont-param code]"
ui_content_op=3Ddelete
ui_name=3D"[cont-parent ui_name]"
- ui_type=3D"[cont-parent ui_type]"
+ ui_type=3Dtemplate
]" onClick=3D"return check_change()">delete</A>
<A HREF=3D"[area
href=3D"@@MV_PAGE@@"
@@ -175,7 +205,7 @@
code=3D"[cont-param code]"
ui_content_op=3Dmotion
ui_name=3D"[cont-parent ui_name]"
- ui_type=3D"[cont-parent ui_type]"
+ ui_type=3Dtemplate
]" onClick=3D"return check_change()">up</A>
<A HREF=3D"[area
href=3D"@@MV_PAGE@@"
@@ -184,7 +214,7 @@
code=3D"[cont-param code]"
ui_content_op=3Dmotion
ui_name=3D"[cont-parent ui_name]"
- ui_type=3D"[cont-parent ui_type]"
+ ui_type=3Dtemplate
]" onClick=3D"return check_change()">down</A><BR>
[else]
<A HREF=3D"javascript:void(0)"
@@ -201,59 +231,56 @@
<tr>
<td>
<b>Page layout</b>
-[components]
-[comp-sub tmp_slot]
- return ++$slot;
-[/comp-sub]
-[if-comp-param where]
-[comp-change 1][condition][comp-param where][/condition]
</td>
</tr>
+[regions]
+[if-reg-param where]
<tr>
-<td id=3D"comp_clicker[comp-increment]">
+<td id=3D"comp_clicker[reg-increment]">
Template area
<A HREF=3D"javascript:void(0)"
- onClick=3D"visible([comp-increment],'comp')"
- title=3D"edit [comp-param where]"
+ onClick=3D"visible([reg-increment],'comp')"
+ title=3D"edit [reg-param where]"
><span
style=3D"font-size: larger; font-weight: bolder"
- >[comp-param where]</span></A><br>
+ >[reg-param where]</span></A><br>
<INPUT TYPE=3Dcheckbox
VALUE=3D1
- NAME=3D"changed_[comp-param where]"
- id=3D"changed_[comp-param where]"
+ NAME=3D"changed_[reg-param where]"
+ id=3D"changed_[reg-param where]"
> changed<br>
-[/comp-change 1]
- [if-comp-param code]
- Slot [comp-exec tmp_slot][/comp-exec]:
- class=3D[comp-param class],
- default=3D[content-info label=3D1 code=3D"[comp-code]"] ([comp-code])<br>
- [/if-comp-param]
+ [if-reg-param contents]
+ [reg-param contents]
+ [else]
+ No components
+ [/else]
+ [/if-reg-param]
[else]
- </td>
-</tr>
<tr>
<td>
-Page content<BR>
+ [reg-param contents]
+ </td>
+</tr>
[/else]
-[/if-comp-param]
+[/if-reg-param]
</div>
-[/components]
+[/regions]
</td>
</tr>
</table>
=20
-[set Publish]
+[set [L]Publish[/L]]
ui_content_op=3Dpublish
-mv_nextpage=3D__UI_BASE__/content
+mv_nextpage=3D__UI_BASE__/content_publish
[/set]
-[set Cancel]
+[set [L]Cancel[/L]]
ui_content_op=3Dcancel
mv_nextpage=3D__UI_BASE__/content
[/set]
<input type=3Dhidden name=3Dui_name value=3D"[tem-param ui_name]">
-<input type=3Dhidden name=3Dui_type value=3D"[tem-param ui_type]">
+<input type=3Dhidden name=3Dui_type value=3Dtemplate>
<input type=3Dhidden name=3Dmv_action value=3D"return">
+<input type=3Dhidden name=3Dui_content_op value=3Dmodify_top>
<input style=3D"font-weight: bold" type=3Dsubmit onClick=3D"return check_c=
hange()" name=3Dmv_click value=3D"[L]Publish[/L]">
<input type=3Dsubmit onClick=3D"return check_change()" name=3Dmv_click val=
ue=3D"[L]Cancel[/L]"><br>
New name: <input type=3Dtext name=3Dui_destination size=3D22 value=3D"">
@@ -293,34 +320,33 @@
When you select an element to the left, it will be edited here.
</blockquote>
</div>
-[components]
+[regions]
<div
- id=3D"comp_dynform[comp-increment]"
+ id=3D"comp_dynform[reg-increment]"
style=3D"
Position:Absolute;=20
Left:0; Top:0; Height:100%; Width:100%;
Visibility: Hidden;
z-index:0;
">
- [comp-change 1][condition][comp-param where][/condition]
- [if-comp-param where]
- [set c_content][comp-parent [comp-param where]][/set]
+ [if-reg-param where]
+ [set c_content][reg-parent [reg-param where]][/set]
[table-editor
form-extra=3D|
- onSubmit=3D"submitted('[comp-param where]'); return check_change()"
- onReset=3D"submitted('[comp-param where]')"
+ onSubmit=3D"submitted('[reg-param where]'); check_change() && silent_=
submit()"
+ onReset=3D"submitted('[reg-param where]')"
|
action=3Dback
height.ui_body_text=3D"40"
- href=3D"[area @@MV_PAGE@@]"
+ href=3D"[area silent/ce_modify]"
hidden.ui_content_op=3Dmodify_body
- hidden.ui_name=3D[comp-parent ui_name]
- hidden.ui_type=3D[comp-parent ui_type]
- hidden.visible=3D[comp-increment]
+ hidden.ui_name=3D[reg-parent ui_name]
+ hidden.ui_type=3Dtemplate
+ hidden.visible=3D[reg-increment]
hidden.visible_mod=3Dcomp
- item_id=3D"[comp-param where]"
+ item_id=3D"[reg-param where]"
js_changed=3Dchanged
- label.ui_body_text=3D"[comp-param where] body"
+ label.ui_body_text=3D"[reg-param where] body"
ui_nextpage=3D@@MV_PAGE@@
nocancel=3D1
override.ui_body_text=3D`$Scratch->{c_content}`
@@ -331,10 +357,9 @@
ui_hide_key=3D1
view=3Dui_component
]
- [/if-comp-param]
- [/comp-change 1]
+ [/if-reg-param]
</div>
-[/components]
+[/regions]
[controls]
<div
id=3Ddynform[cont-increment]
2.35 +10 -7 interchange/lib/Vend/Util.pm
rev 2.35, prev_rev 2.34
Index: Util.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/Util.pm,v
retrieving revision 2.34
retrieving revision 2.35
diff -u -r2.34 -r2.35
--- Util.pm 27 Aug 2002 16:52:07 -0000 2.34
+++ Util.pm 13 Sep 2002 20:46:21 -0000 2.35
@@ -1,6 +1,6 @@
# Vend::Util - Interchange utility functions
#
-# $Id: Util.pm,v 2.34 2002/08/27 16:52:07 mheins Exp $
+# $Id: Util.pm,v 2.35 2002/09/13 20:46:21 mheins Exp $
#=20
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -82,7 +82,7 @@
use Safe;
use subs qw(logError logGlobal);
use vars qw($VERSION @EXPORT @EXPORT_OK);
-$VERSION =3D substr(q$Revision: 2.34 $, 10);
+$VERSION =3D substr(q$Revision: 2.35 $, 10);
=20
BEGIN {
eval {
@@ -1045,11 +1045,14 @@
undef $contents;
}
}
- foreach $try (
- $Vend::Cfg->{PageDir},
- @{$Vend::Cfg->{TemplateDir}},
- @{$Global::TemplateDir} )
- {
+
+ my @dirs =3D ($Vend::Cfg->{PreviewDir},
+ $Vend::Cfg->{PageDir},
+ @{$Vend::Cfg->{TemplateDir}},
+ @{$Global::TemplateDir});
+
+ foreach $try (@dirs) {
+ next unless $try;
$dir =3D $try . "/" . $pathdir;
if (-f "$dir/.access") {
if (-s _) {