Index: openacs-4/packages/acs-subsite/acs-subsite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v
diff -u -r1.97 -r1.98
--- openacs-4/packages/acs-subsite/acs-subsite.info	7 Jun 2008 20:28:56 -0000	1.97
+++ openacs-4/packages/acs-subsite/acs-subsite.info	26 Aug 2008 01:03:43 -0000	1.98
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="5.5.0d3" url="http://openacs.org/repository/download/apm/acs-subsite-5.5.0d3.apm">
+    <version name="5.5.0d4" url="http://openacs.org/repository/download/apm/acs-subsite-5.5.0d4.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Subsite</summary>
         <release-date>2008-05-31</release-date>
@@ -16,7 +16,7 @@
         <license>GPL</license>
         <maturity>3</maturity>
 
-        <provides url="acs-subsite" version="5.5.0d3"/>
+        <provides url="acs-subsite" version="5.5.0d4"/>
         <requires url="acs-authentication" version="5.3.2"/>
         <requires url="acs-content-repository" version="5.3.2"/>
         <requires url="acs-kernel" version="5.3.2"/>
@@ -80,6 +80,7 @@
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="application"  default="default" description="Name of the ETP application to use (default, faq, wiki, or create your own with the etp::define_applicaton procedure)" section_name="EditThisPage"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="subtopic_application"  default="default" description="Name of the ETP application to use when creating a subtopic" section_name="EditThisPage"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ShowApplications"  default="1" section_name="Navigation Tabs" description="Show individual tabs for mounted applications within this subsite"/>
+            <parameter datatype="text"  min_n_values="1"  max_n_values="1"  name="NoTabApplicationList"  default="" section_name="Navigation Tabs" description="Don't show tabs for applications with the listed package keys."/>
             <parameter datatype="text"  min_n_values="1"  max_n_values="1"  name="UserNavbarTabsList"  default="home {label #acs-subsite.Subsite_Home#}" description "Navigation tabs to show to users" section_name="Navigation Tabs"/>
             <parameter datatype="text"  min_n_values="1"  max_n_values="1"  name="MembersViewNavbarTabsList"  default="members {label #acs-subsite.Members# folder members selected_patterns {*}}" description "Navigation tabs to show to those allowed to see subsite members" section_name="Navigation Tabs"/>
             <parameter datatype="text"  min_n_values="1"  max_n_values="1"  name="AdminNavbarTabsList"  default="
Index: openacs-4/packages/acs-subsite/tcl/subsite-navigation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-navigation-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/tcl/subsite-navigation-procs.tcl	8 May 2008 01:52:32 -0000	1.1
+++ openacs-4/packages/acs-subsite/tcl/subsite-navigation-procs.tcl	26 Aug 2008 01:03:43 -0000	1.2
@@ -15,6 +15,7 @@
 
 ad_proc -public subsite_navigation::define_pageflow {
     {-show_applications_p 1}
+    {-no_tab_application_list ""}
     {-initial_pageflow ""}
     {-navigation_multirow navigation}
     {-group main}
@@ -31,14 +32,17 @@
 
     @param show_applications_p If true, autogenerate tabs for applications (not declared
            boolean because the tabbed master takes this from a package parameter)
+    @param no_tab_application_list A list of application package keys to ignore when
+           autogenerating tabs for applications
     @param initial_pageflow Add these subsections before computing the rest of the page flow
     @param navigation_multirow The name of the multirow used to build the nav bars
     @param group Group name for the primary section
     @param subgroup Group name for the subsection (opened under a selected tab)
 
 } {
     set pageflow [get_pageflow_struct -initial_pageflow $initial_pageflow \
-                     -show_applications_p $show_applications_p]
+                     -show_applications_p $show_applications_p \
+                     -no_tab_application_list $no_tab_application_list]
     set base_url [subsite::get_element -element url]
 
     if { ![template::multirow exists $navigation_multirow] } {
@@ -182,8 +186,15 @@
 ad_proc -public subsite_navigation::get_pageflow_struct {
     {-initial_pageflow ""}
     {-show_applications_p 1}
+    {-no_tab_application_list ""}
 } {
     Defines the page flow structure.
+
+    @param initial_pageflow Add these subsections before computing the rest of the page flow
+    @param show_applications_p If true, autogenerate tabs for applications (not declared
+           boolean because the tabbed master takes this from a package parameter)
+    @param no_tab_application_list A list of application package keys to ignore when
+           autogenerating tabs for applications
 } {
     set pageflow $initial_pageflow
 
@@ -209,12 +220,17 @@
     }
 
     set index_redirect_url [parameter::get -parameter "IndexRedirectUrl" -package_id $subsite_id]
+    set index_internal_redirect_url [parameter::get -parameter "IndexInternalRedirectUrl" -package_id $subsite_id]
+    regsub {(.*)/packages} $index_internal_redirect_url "" index_internal_redirect_url
+    regexp {(/[-[:alnum:]]+/)(.*)$} $index_internal_redirect_url dummy index_internal_redirect_url
     set child_urls [lsort -ascii [site_node::get_children -node_id $subsite_node_id -package_type apm_application]]
 
     if { $show_applications_p } {
         foreach child_url $child_urls {
-            if { $child_url ne $index_redirect_url } {
-                array set child_node [site_node::get_from_url -exact -url $child_url]
+            array set child_node [site_node::get_from_url -exact -url $child_url]
+            if { $child_url ne $index_redirect_url  &&
+                 $child_url ne $index_internal_redirect_url &&
+                 [lsearch -exact $no_tab_application_list $child_node(package_key)] == -1 } {
                 lappend pageflow $child_node(name) [list \
                                                         label $child_node(instance_name) \
                                                         folder $child_node(name) \