[interchange-cvs] interchange - heins modified 3 files
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Wed Dec 11 16:18:01 2002
User: heins
Date: 2002-12-11 21:17:58 GMT
Modified: code/UserTag history_scan.tag
Modified: dist catalog_before.cfg
Modified: dist/foundation/templates/components category_vert_toggle
Log:
* Update from Randy Moore for the category_vert_toggle component.
I may have finally gotten it in right...
Revision Changes Path
1.8 +5 -0 interchange/code/UserTag/history_scan.tag
rev 1.8, prev_rev 1.7
Index: history_scan.tag
===================================================================
RCS file: /var/cvs/interchange/code/UserTag/history_scan.tag,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- history_scan.tag 15 Aug 2002 16:30:33 -0000 1.7
+++ history_scan.tag 11 Dec 2002 21:17:57 -0000 1.8
@@ -5,6 +5,10 @@
mv_credit_card_number 1
mv_pc 1
mv_session_id 1
+ expand 1
+ collapse 1
+ expandall 1
+ collapseall 1
/);
sub {
my ($find, $exclude, $default, $opt) = @_;
@@ -34,6 +38,7 @@
$form .= "\n$_=";
$form .= join("\n$_=", split /\0/, $cgi->{$_});
}
+ $href =~ s|/+|/|g;
return $Tag->area( { href => $href, form => $form} );
}
EOR
2.7 +14 -4 interchange/dist/catalog_before.cfg
rev 2.7, prev_rev 2.6
Index: catalog_before.cfg
===================================================================
RCS file: /var/cvs/interchange/dist/catalog_before.cfg,v
retrieving revision 2.6
retrieving revision 2.7
diff -u -r2.6 -r2.7
--- catalog_before.cfg 18 Aug 2002 15:11:32 -0000 2.6
+++ catalog_before.cfg 11 Dec 2002 21:17:57 -0000 2.7
@@ -73,6 +73,7 @@
my $anchor;
my $highlight;
my $first;
+ my $expand;
LINK: {
if($record->{link_type} eq 'external') {
@@ -115,15 +116,15 @@
push @out, $record->{search}
if $record->{search} =~ /^\s*\w\w=/;
- push @out, qq{va=banner_image=$record->{banner_image}};
- push @out, qq{va=banner_text=$record->{banner_text}};
+ push @out, qq{va=banner_image=$record->{banner_image}} if ($record->{banner_image});
+ push @out, qq{va=banner_text=$record->{banner_text}} if ($record->{banner_text});
$options{arg} = join "\n", @out;
$url = $Tag->area(\%options);
}
elsif ($record->{link_type} eq 'complex') {
$record->{search} =~ s/[\r\n+]/\n/g;
- $record->{search} .= qq{\nva=banner_text=$record->{banner_text}};
- $record->{search} .= qq{\nva=banner_image=$record->{banner_image}};
+ $record->{search} .= qq{\nva=banner_text=$record->{banner_text}} if ($record->{banner_text});
+ $record->{search} .= qq{\nva=banner_image=$record->{banner_image}} if ($record->{banner_image});
$url = $Tag->area('scan', $record->{search});
}
else {
@@ -159,11 +160,20 @@
}
return $url if ! $anchor;
return $anchor if ! $url;
+ EXPAND: {
+ if ($url =~ /\?/) {
+ $expand = "&expand=$code";
+ }
+ else {
+ $expand = "?expand=$code";
+ }
+ }
my $tmpl = $record->{link_template}
|| $extra
|| $Variable->{BAR_LINK_TEMPLATE}
|| q{<A HREF="$URL$" class=barlink>$ANCHOR$</A>};
$record->{ANCHOR} = $anchor;
+ $record->{EXPAND} = $expand;
$record->{URL} = $url;
$tmpl =~ s!{HIGHLIGHT}(.*?){/HIGHLIGHT}! $highlight ? $1 : '' !gise;
$tmpl =~ s/\$(\w+)\$/$record->{$1}/g;
1.5 +63 -87 interchange/dist/foundation/templates/components/category_vert_toggle
rev 1.5, prev_rev 1.4
Index: category_vert_toggle
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/templates/components/category_vert_toggle,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- category_vert_toggle 12 Nov 2002 17:11:01 -0000 1.4
+++ category_vert_toggle 11 Dec 2002 21:17:58 -0000 1.5
@@ -6,7 +6,7 @@
page_class:
label: Page class
- widget: select
+ type: select
lookup: which_page
db: area
help: Defines which sets of items should be displayed
@@ -14,7 +14,7 @@
set_selector:
label: Page area selector
- widget: select
+ type: select
db: area
lookup: sel
help: Defines which sets of items should be displayed
@@ -22,14 +22,15 @@
timed:
label: Use timed build
- widget: select
+ type: select
help: Makes more efficient for large/busy catalogs
options: 0=No, 5=5 minutes, 10=10 minutes, 20=20 minutes, 60=60 minutes, 1440=Daily
advanced: 1
+ code: timed
toggleswitchon:
label: Toggle Open Switch
- widget: text
+ type: text
help: Image to use for opening a category, leave blank to leave default +
advanced: 1
@@ -41,21 +42,19 @@
imagedirpath:
label: Override default image directory path
- widget: text
+ type: text
help: Image directory path defaults to '__DOCROOT__/__IMAGE_DIR__'
advanced: 1
imagedirurl:
label: Override default image directory URL
- widget: text
+ type: text
help: Image directory URL defaults to '' (include trailing '/')
advanced: 1
[/comment]
<tr><td align="left" class="categorybar">
-
- <table width="90%" align="center" cellpadding=0 cellspacing=0 border=0>
-
+ <table width="90%" align="center">
<!-- BEGIN COMPONENT [control component category_vert_toggle] -->
@@ -65,8 +64,20 @@
[set imagedirurl][/set]
[set imagedirpath]__DOCROOT__/__IMAGE_DIR__[/set]
+[seti showtoggleon][if type=file term="[control imagedirpath]/[control toggleswitchon]"]
+ <img border=0 src="[control imagedirurl][control toggleswitchon]">
+ [else]
+ <font class="categorybar"><font size="+1">+</font></font>
+ [/else]
+ [/if][/seti]
+[seti showtoggleoff][if type=file term="[control imagedirpath]/[control toggleswitchoff]"]
+ <img border=0 src="[control imagedirurl][control toggleswitchoff]">
+ [else]
+ <font class="categorybar"><font size="+1">-</font></font>
+ [/else]
+ [/if][/seti]
+
[timed-build auto=1 if="[control timed 0]" minutes="[control timed 0]"]
-[set found_cat][/set]
[perl]
if ($CGI->{expand}) {
$area = $CGI->{expand};
@@ -95,137 +106,102 @@
<tr>
<td valign="top" align="right" colspan=3>
<a href="[history-scan]&expandall=1">
- [if type=file term="[control imagedirpath]/[control toggleswitchon]"]
- <img border=0 src="[control imagedirurl][control toggleswitchon]">
- [else]
- <font class="categorybar"><font size="+1">+</font></font>
- [/else]
- [/if]
- <font class="categorybar">
- <b>Show All Subcategories</b></a>
+ [scratch showtoggleon]
+ <font class="categorybar"><b>Show All Subcategories</b></a>
</tr>
<tr>
<td valign="top" align="right" colspan=3>
<a href="[history-scan]&collapseall=1">
- [if type=file term="[control imagedirpath]/[control toggleswitchoff]"]
- <img border=0 src="[control imagedirurl][control toggleswitchoff]">
- [else]
- <font class="categorybar"><font size="+1">-</font></font>
- [/else]
- [/if]
+ [scratch showtoggleoff]
<font class="categorybar">
<b>Collapse All Categories</b></a>
</td>
</tr>
-[loop
- prefix=box
- search="
- fi=area
- st=db
- tf=sort
- ac=0
- ac=0
- co=yes
- sf=sel
- op=eq
- se=[control set_selector left]
-
- sf=which_page
- op=rm
- se=[control page_class all|@@MV_PAGE@@]
+[set found_cat][/set]
+[loop
+ prefix=box
+ search="
+ fi=area
+ st=db
+ tf=sort
+ ac=0
+ ac=0
+ co=yes
+
+ sf=sel
+ op=eq
+ se=[control set_selector left]
+
+ sf=which_page
+ op=rm
+ se=[control page_class all|@@MV_PAGE@@]
"]
- [if CGI expandall]
- [perl]
- $area = "[box-code]";
- $Scratch->{expandarea}{$area} = 1;
- return('');
- [/perl]
- [/if]
- [if CGI collapseall]
- [perl]
- $area = "[box-code]";
- undef $Scratch->{expandarea}{$area};
- return('');
- [/perl]
- [/if]
-
[set found_cat]1[/set]
+ [perl]
+ $Scratch->{expandarea}{"[box-code]"} = 1 if ($CGI->{expandall});
+ undef $Scratch->{expandarea}{"[box-code]"} if ($CGI->{collapseall});
+ return('');
+ [/perl]
<tr>
- <td valign="top">
+ <td>
[if explicit]
[condition]
- $area = "[box-code]";
- return($Scratch->{expandarea}{$area});
+ return($Scratch->{expandarea}{"[box-code]"});
[/condition]
- <a href="[history-scan]&collapse=[box-code]">
- [if type=file term="[control imagedirpath]/[control toggleswitchoff]"]
- <img border=0 src="[control imagedirurl][control toggleswitchoff]">
- [else]
- <font class="categorybar"><font size="+1">-</font></font>
- [/else]
- [/if]
- </a>
+ <a href="[history-scan]&collapse=[box-code]">[scratch showtoggleoff]</a>
[else]
- <a href="[history-scan]&expand=[box-code]">
- [if type=file term="[control imagedirpath]/[control toggleswitchon]"]
- <img border=0 src="[control imagedirurl][control toggleswitchon]">
- [else]
- <font class="categorybar"><font size="+1">+</font></font>
- [/else]
- [/if]
- </a>
+ <a href="[history-scan]&expand=[box-code]">[scratch showtoggleon]</a>
[/else]
[/if]
</td>
- <td valign="top" class="categorybar" colspan=2>
+ <td class="categorybar" colspan=2>
<b> [box-exec bar_link]area <A HREF="$URL$$EXPAND$" class=barlink>$ANCHOR$</A>[/box-exec]</b>
</td>
</tr>
[if explicit]
[condition]
- $area = "[box-code]";
- return($Scratch->{expandarea}{$area});
+ return($Scratch->{expandarea}{"[box-code]"});
[/condition]
<tr>
<td> </td>
<td> </td>
- <td valign="top" class="categorybar">
+ <td class="categorybar">
[loop prefix=cat
search="
fi=cat
st=db
+ co=yes
tf=sort
tf=name
rf=code,name
sf=sel
se=[box-code]
- "
- ]
+ "]
[cat-exec bar_link]cat[/cat-exec]<br>
[/loop]
</td>
</tr>
[/if]
[/loop]
+
<tr>
<td> </td>
</tr>
[if !scratch found_cat]
- <tr>
- <td class="categorybar">
[loop
search="
ra=yes
tf=description
- "
- ]
- [page [loop-code]][loop-field description][/page]<BR>
+ "]
+ <tr>
+ <td class="categorybar">
+ <b>[page [loop-code]]<font class="categorybar">[loop-field description]</font>[/page]</b>
+ </td>
+ </tr>
[/loop]
- </td>
- </tr>
[/if]
[/timed-build]