Index: openacs-4/packages/dotlrn/www/dotlrn-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.adp,v diff -u -r1.33.2.1.4.2 -r1.33.2.1.4.3 --- openacs-4/packages/dotlrn/www/dotlrn-master.adp 1 Jul 2004 13:36:36 -0000 1.33.2.1.4.2 +++ openacs-4/packages/dotlrn/www/dotlrn-master.adp 22 Jul 2004 16:24:47 -0000 1.33.2.1.4.3 @@ -1,29 +1,117 @@ - - - - - @header_stuff;noquote@ - - @context;noquote@ - @context_bar;noquote@ - @focus;noquote@ - @doc_type;noquote@ - @title;noquote@ + +<% -@navbar;noquote@ + # Copyright (C) 2001, 2002 MIT + # + # This file is part of dotLRN. + # + # dotLRN is free software; you can redistribute it and/or modify it under the + # terms of the GNU General Public License as published by the Free Software + # Foundation; either version 2 of the License, or (at your option) any later + # version. + # + # dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY + # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + # details. -

- -

@title;noquote@

+ + # /www/dotlrn-default-master.adp + # + # This is the 'default-master' template for dotlrn sites. + # + # Author: Arjun Sanyal (arjun@openforce.net), yon@openforce.net + # + # $Id$ + + +%> + + + + + +@title@ + + + +@header_stuff;noquote@ + + @attribute.key@="@attribute.value@"> + + + + + + + + + + + + + + + + + + + + + + +

+ + +	@text;noquote@	+ @user_name@ +
+ #dotlrn.user_portal_page_home_title# + + #dotlrn.help# + + #dotlrn.logout# +

@navbar;noquote@

+ + +

@title@

+ +

@context_bar;noquote@

+ + + + -

-@navbar;noquote@ + +

+ -

+ + + + + +

@navbar;noquote@

+ + + +

+ +

+ + Index: openacs-4/packages/dotlrn/www/dotlrn-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.tcl,v diff -u -r1.29.2.2.4.2 -r1.29.2.2.4.3 --- openacs-4/packages/dotlrn/www/dotlrn-master.tcl 1 Jul 2004 13:36:36 -0000 1.29.2.2.4.2 +++ openacs-4/packages/dotlrn/www/dotlrn-master.tcl 22 Jul 2004 16:24:48 -0000 1.29.2.2.4.3 @@ -65,6 +65,7 @@ set header_img_file "[acs_root_dir]/packages/dotlrn/www/resources/logo" set header_img_alt_text "Header Logo" +set extra_spaces "

" set td_align "align=\"center\" valign=\"top\"" if {[dotlrn::user_p -user_id $user_id]} { @@ -300,18 +301,33 @@ } if { $make_navbar_p } { + if {$link_control_panel} { + set link_control_panel 1 + } else { + set link_control_panel 0 + } + set extra_spaces "

" set navbar [dotlrn::portal_navbar \ - -user_id $user_id \ - -link_control_panel [template::util::is_true $link_control_panel] \ - -control_panel_text $control_panel_text \ - -link_all $link_all] + -user_id $user_id \ + -link_control_panel $link_control_panel \ + -control_panel_text $control_panel_text \ + -pre_html "$extra_spaces" \ + -post_html $extra_spaces \ + -link_all $link_all + ] +} else { + set navbar "
" } if { ![info exists header_stuff] } { set header_stuff "" } +if { [info exists text] } { + set text [lang::util::localize $text] +} + # This style sheet should be moved over to an external file for performance append header_stuff "