Index: openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl,v
diff -u -r1.44 -r1.45
--- openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl 17 Jul 2018 11:42:26 -0000 1.44
+++ openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl 17 Jul 2018 13:32:18 -0000 1.45
@@ -108,7 +108,7 @@
@see ad_context_bar_html
} {
if {![parameter::get -package_id [ad_conn subsite_id] -parameter ShowContextBarP -default 1]} {
- return ""
+ return ""
}
if { $node_id eq "" } {
@@ -129,7 +129,7 @@
template::multirow create $multirow url label
foreach elm [ad_context_node_list -from_node $from_node $node_id] {
- lassign $elm elm_0 elm_1
+ lassign $elm elm_0 elm_1
if { $node_id_url_end > 0 && [string match -nocase $node_id_url [string range $elm_0 0 ${node_id_url_end}-1] ] } {
set elm_0 [string range $elm_0 $node_id_url_end end]
}
@@ -169,7 +169,7 @@
@see ad_context_bar_html
} {
if {![parameter::get -package_id [ad_conn subsite_id] -parameter ShowContextBarP -default 1]} {
- return ""
+ return ""
}
if { $node_id eq "" } {
@@ -187,10 +187,10 @@
# fix last element to just be literal string
lset context end [lindex $context end 1]
} else {
- if {![string match "\{*" $args]} {
- # args is not a list, transform it into one.
- set args [list $args]
- }
+ if {![string match "\{*" $args]} {
+ # args is not a list, transform it into one.
+ set args [list $args]
+ }
}
lappend context {*}$args
if { [info exists separator] } {
@@ -218,12 +218,12 @@
set counter 0
foreach arg $args {
lappend link_list [subst {[ns_quotehtml [lindex $element 1]]}]
- incr counter
+ incr counter
}
if { $counter } {
- return "\[[join $link_list " | "]\]"
+ return "\[[join $link_list " | "]\]"
} else {
- return ""
+ return ""
}
}
@@ -237,19 +237,19 @@
set return_list [list]
foreach value $values {
- if { $default eq $value } {
- lappend return_list "[lindex $items $count]"
- } else {
- lappend return_list [subst {[ns_quotehtml [lindex $items $count]]}]
- }
+ if { $default eq $value } {
+ lappend return_list "[lindex $items $count]"
+ } else {
+ lappend return_list [subst {[ns_quotehtml [lindex $items $count]]}]
+ }
- incr count
+ incr count
}
if { [llength $return_list] > 0 } {
return "\[[join $return_list " | "]\]"
} else {
- return ""
+ return ""
}
}
@@ -299,13 +299,13 @@
# Netscape browser just have Mozilla in their user-agent header
if {$internet_explorer_p == 0} {
- set netscape_p [regexp -nocase "mozilla" $user_agent match]
+ set netscape_p [regexp -nocase "mozilla" $user_agent match]
}
set java_script_p 0
if { ($netscape_p && ($version >= 3)) || ($internet_explorer_p && ($version >= 4)) } {
- set java_script_p 1
+ set java_script_p 1
}
return $java_script_p
@@ -328,13 +328,13 @@
# Netscape browser just have Mozilla in their user-agent header
if {$internet_explorer_p == 0} {
- set netscape_p [regexp -nocase "mozilla" $user_agent match]
+ set netscape_p [regexp -nocase "mozilla" $user_agent match]
}
set netscape3_p 0
if { $netscape_p && $version == 3 } {
- set netscape3_p 1
+ set netscape3_p 1
}
return $netscape3_p
@@ -358,25 +358,25 @@
-script {go_to_url(this.options[this.selectedIndex].value);}
foreach item $items {
- set url_stub [ad_conn url]
+ set url_stub [ad_conn url]
- # if the url matches the url you would redirect to, as determined
- # either by highlight_url, or if highlight_url is not set,
- # the current url then select it
- if {$highlight_url ne "" && $highlight_url == [lindex $urls $counter]} {
- append return_string [subst {