Index: openacs-4/packages/dotlrn/tcl/navigation-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/navigation-procs.xql,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/dotlrn/tcl/navigation-procs.xql 25 Nov 2004 01:08:21 -0000 1.1.2.1 +++ openacs-4/packages/dotlrn/tcl/navigation-procs.xql 15 Jul 2005 19:01:34 -0000 1.1.2.2 @@ -8,6 +8,7 @@ sort_key from portal_pages where portal_id = :portal_id + and hidden_p = 'f' order by sort_key Index: openacs-4/packages/new-portal/sql/oracle/api-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/oracle/api-create.sql,v diff -u -r1.40.6.1 -r1.40.6.2 --- openacs-4/packages/new-portal/sql/oracle/api-create.sql 17 Jun 2004 01:23:53 -0000 1.40.6.1 +++ openacs-4/packages/new-portal/sql/oracle/api-create.sql 15 Jul 2005 19:01:34 -0000 1.40.6.2 @@ -31,6 +31,7 @@ pretty_name in portal_pages.pretty_name%TYPE default 'Untitled Page', portal_id in portal_pages.portal_id%TYPE, layout_id in portal_pages.layout_id%TYPE default null, + hidden_p in portal_pages.hidden_p%TYPE default 'f', object_type in acs_object_types.object_type%TYPE default 'portal_page', creation_date in acs_objects.creation_date%TYPE default sysdate, creation_user in acs_objects.creation_user%TYPE default null, @@ -54,6 +55,7 @@ pretty_name in portal_pages.pretty_name%TYPE default 'Untitled Page', portal_id in portal_pages.portal_id%TYPE, layout_id in portal_pages.layout_id%TYPE default null, + hidden_p in portal_pages.hidden_p%TYPE default 'f', object_type in acs_object_types.object_type%TYPE default 'portal_page', creation_date in acs_objects.creation_date%TYPE default sysdate, creation_user in acs_objects.creation_user%TYPE default null, @@ -88,9 +90,9 @@ where portal_id = portal_page.new.portal_id; insert into portal_pages - (page_id, pretty_name, portal_id, layout_id, sort_key) + (page_id, pretty_name, portal_id, layout_id, sort_key, hidden_p) values - (v_page_id, pretty_name, portal_id, v_layout_id, v_sort_key); + (v_page_id, pretty_name, portal_id, v_layout_id, v_sort_key, hidden_p); return v_page_id; Index: openacs-4/packages/new-portal/sql/oracle/portal-core-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/oracle/portal-core-create.sql,v diff -u -r1.45 -r1.45.10.1 --- openacs-4/packages/new-portal/sql/oracle/portal-core-create.sql 9 Aug 2002 20:56:27 -0000 1.45 +++ openacs-4/packages/new-portal/sql/oracle/portal-core-create.sql 15 Jul 2005 19:01:34 -0000 1.45.10.1 @@ -179,6 +179,11 @@ sort_key integer constraint portal_pages_sort_key_nn not null, + hidden_p char(1) default 'f' + constraint portal_pages_hidden_p_nn + not null + constraint portal_pages_hidden_p_ck + check (hidden_p in ('t','f')), -- Two pages on one portal canot have the same sort key constraint portal_pages_sort_key_un unique (portal_id, sort_key) Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/new-portal/sql/oracle/upgrade/upgrade-2.1.1-2.1.2d1.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v diff -u -r1.172.2.2.4.7 -r1.172.2.2.4.8 --- openacs-4/packages/new-portal/tcl/portal-procs.tcl 30 Jul 2004 01:15:50 -0000 1.172.2.2.4.7 +++ openacs-4/packages/new-portal/tcl/portal-procs.tcl 15 Jul 2005 19:01:34 -0000 1.172.2.2.4.8 @@ -446,9 +446,14 @@ set first_page_p [portal::first_page_p -portal_id $portal_id -page_id $page_id] # We allow portal page names to have embedded message keys that we localize on the fly - set page_name [lang::util::localize [portal::get_page_pretty_name -page_id $page_id]] + db_1row get_page_info {} + set page_name [lang::util::localize $pretty_name_unlocalized] set page_layout_id [portal::get_layout_id -page_id $page_id] - + if { [string equal $hidden_p t] } { + set tab_toggle_label [lang::util::localize "\#new-portal.Show_in_main_navigation\#"] + } else { + set tab_toggle_label [lang::util::localize "\#new-portal.Hide_in_main_navigation\#"] + } append template "" # @@ -464,7 +469,14 @@ - + + + + + + + + " @@ -819,6 +831,9 @@ ad_return_complaint 1 "[_ new-portal.lt_You_must_enter_new_na]" } set_page_pretty_name -pretty_name $pretty_name -page_id $page_id + } elseif { ![empty_string_p [ns_set get $form "op_toggle_tab_visibility"]] } { + set page_id [ns_set get $form page_id] + db_dml toggle_tab_visibility {} } elseif { ![empty_string_p [ns_set get $form "op_toggle_pinned"]] } { set element_id [ns_set get $form element_id] Index: openacs-4/packages/new-portal/tcl/portal-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.xql,v diff -u -r1.42.6.3 -r1.42.6.4 --- openacs-4/packages/new-portal/tcl/portal-procs.xql 9 Aug 2004 05:32:32 -0000 1.42.6.3 +++ openacs-4/packages/new-portal/tcl/portal-procs.xql 15 Jul 2005 19:01:35 -0000 1.42.6.4 @@ -80,6 +80,15 @@ + + + select pretty_name as pretty_name_unlocalized, + hidden_p + from portal_pages + where page_id = :page_id + + + select portals.name, @@ -254,6 +263,14 @@ + + + update portal_pages + set hidden_p = case when hidden_p = 't' then 'f' else 't' end + where page_id = :page_id + + + update portal_element_map