Index: openacs-4/packages/theme-selva/theme-selva.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/theme-selva.info,v diff -u -r1.4 -r1.5 --- openacs-4/packages/theme-selva/theme-selva.info 14 Sep 2005 03:27:09 -0000 1.4 +++ openacs-4/packages/theme-selva/theme-selva.info 18 Sep 2005 12:35:57 -0000 1.5 @@ -10,7 +10,7 @@ - + JM Index: openacs-4/packages/theme-selva/catalog/theme-selva.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/catalog/theme-selva.en_US.ISO-8859-1.xml,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/theme-selva/catalog/theme-selva.en_US.ISO-8859-1.xml 18 Sep 2005 12:34:14 -0000 1.1 @@ -0,0 +1,11 @@ + + + + Home + Courses + Control Panel + My Space + Preferences + Logout + + Index: openacs-4/packages/theme-selva/catalog/theme-selva.fr_FR.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/catalog/theme-selva.fr_FR.ISO-8859-1.xml,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/theme-selva/catalog/theme-selva.fr_FR.ISO-8859-1.xml 18 Sep 2005 12:34:14 -0000 1.1 @@ -0,0 +1,11 @@ + + + + Accueil + Cours + Panneau de configuration + Mon Espace + Preferences + Logout + + Index: openacs-4/packages/theme-selva/www/courses.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/courses.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/theme-selva/www/courses.adp 18 Sep 2005 12:27:08 -0000 1.1 @@ -0,0 +1,35 @@ +<% + + # + # 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@ +0 + + + +
+
+
@portlet_title@ +
+
+ +
+
+
\ No newline at end of file Index: openacs-4/packages/theme-selva/www/courses.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/Attic/courses.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/theme-selva/www/courses.tcl 18 Sep 2005 12:27:08 -0000 1.1 @@ -0,0 +1,49 @@ +# +# 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. +# + +ad_page_contract { + + My account page for a user. + + @author Ben Adida (ben@openforce.net) + @author yon (yon@openforce.net) + @creation-date 2001-11-10 + @version $Id: courses.tcl,v 1.1 2005/09/18 12:27:08 emmar Exp $ + +} -query { +} -properties { + title:onevalue + admin_p:onevalue + admin_url:onevalue + referer:onevalue +} + +set portal_id [dotlrn::get_portal_id -user_id [ad_get_user_id]] +set dotlrn_url [dotlrn::get_url] +# Make sure user is logged in +set user_id [ad_maybe_redirect_for_registration] +set portlet_title [_ theme-selva.Courses] +set title [parameter::get -localize -parameter admin_page_name] +set admin_p [dotlrn::admin_p] +set admin_url "[dotlrn::get_url]/admin" +set cockpit_url "[dotlrn::get_url]/admin/cockpit" +set referer [ns_conn url] +set admin_pretty_name [parameter::get -localize -parameter dotlrn_admin_pretty_name] +set system_owner [ad_system_owner] + +set pvt_home [ad_pvt_home] +set pvt_home_name [ad_pvt_home_name] + Index: openacs-4/packages/theme-selva/www/selva-blank-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/selva-blank-master.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/theme-selva/www/selva-blank-master.adp 26 Jul 2005 14:28:29 -0000 1.1 +++ openacs-4/packages/theme-selva/www/selva-blank-master.adp 18 Sep 2005 12:27:08 -0000 1.2 @@ -2,11 +2,13 @@ + + @title;noquote@ - + Index: openacs-4/packages/theme-selva/www/selva-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/selva-master.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/theme-selva/www/selva-master.adp 1 Aug 2005 05:04:45 -0000 1.5 +++ openacs-4/packages/theme-selva/www/selva-master.adp 18 Sep 2005 12:27:08 -0000 1.6 @@ -1,32 +1,36 @@ - + - @header_stuff;noquote@ + @header_stuff;noquote@ @context;noquote@ @context_bar;noquote@ @focus;noquote@ - @title;noquote@ @doc_type;noquote@ -
+ + +
@youarehere;noquote@

 +
- @subnavbar;noquote@ +@navbar;noquote@
- -
+ +
+
- -
-

@title;noquote@

 - -
-
+
+ + + +
+
+
+ - Index: openacs-4/packages/theme-selva/www/selva-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/selva-master.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/theme-selva/www/selva-master.tcl 11 Aug 2005 06:56:43 -0000 1.8 +++ openacs-4/packages/theme-selva/www/selva-master.tcl 18 Sep 2005 12:27:08 -0000 1.9 @@ -41,14 +41,12 @@ # Author: Arjun Sanyal (arjun@openforce.net), yon@openforce.net # # $Id$ + set user_id [ad_get_user_id] set community_id [dotlrn_community::get_community_id] set dotlrn_url [dotlrn::get_url] -# Hack for title and context bar outside of dotlrn -set in_dotlrn_p [expr [string match "[dotlrn::get_url]/*" [ad_conn url]]] - #Scope Related graphics/css parameters # Set everything for user level scope as default then modify it later as we refine the scope. set scope_name "user" @@ -167,37 +165,11 @@ } # Set up some basic stuff -# Get user information -set sw_admin_p 0 -set user_id [ad_conn user_id] -set untrusted_user_id [ad_conn untrusted_user_id] -if { $untrusted_user_id != 0 } { - set user_name [person::name -person_id $untrusted_user_id] - set pvt_home_url [ad_pvt_home] - set pvt_home_name [_ acs-subsite.Your_Account] - set logout_url [ad_get_logout_url] - - # Site-wide admin link - set admin_url {} - - set sw_admin_p [acs_user::site_wide_admin_p -user_id $untrusted_user_id] - - if { $sw_admin_p } { - set admin_url "/acs-admin/" - set locale_admin_url "/acs-lang/admin" - } else { - set subsite_admin_p [permission::permission_p \ - -object_id [subsite::get_element -element object_id] \ - -privilege admin \ - -party_id $untrusted_user_id] - - if { $subsite_admin_p } { - set admin_url "[subsite::get_element -element url]admin/" - } - } -} else { - set login_url [ad_get_login_url -return] +set user_id [ad_get_user_id] +if { [ad_conn untrusted_user_id] == 0 } { set user_name {} +} else { + set user_name [acs_user::get_element -user_id [ad_conn untrusted_user_id] -element name] } if {![exists_and_not_null title]} { @@ -328,72 +300,33 @@ set text "" } - -# Always make the subnavbar appear - -set subnavbar "" - if { $make_navbar_p } { - if {$link_control_panel} { - set link_control_panel 1 - } else { set link_control_panel 0 + + + if {[exists_and_not_null community_id]} { + set youarehere "[dotlrn_community::get_community_name $community_id]" + } else { + set youarehere "[_ theme-selva.MySpace]" } + set extra_spaces "" #set subnavbar [selva::portal_navbar] - if {$in_dotlrn_p == 1} { - set navbar "
    " - set navbar [selva::portal_navbar \ - -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 - ] - if {[exists_and_not_null navbar_list]} { - append navbar "
  • ---
    • " - foreach navbar_item $navbar_list { - append navbar "
  • [lindex $navbar_item 1]
    • " - } - } - append navbar "
" - } else { - set navbar "" - if {[exists_and_not_null navbar_list]} { - set navbar "" - } - } + set subnavbar [selva::portal_subnavbar \ + -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 + ] + + set navbar [selva::portal_navbar] + } else { set navbar " " + set subnavbar " " } @@ -447,6 +380,10 @@ set change_locale_url "/acs-lang/?[export_vars { { package_id "[ad_conn package_id]" } }]" +# Hack for title and context bar outside of dotlrn + +set in_dotlrn_p [expr [string match "[dotlrn::get_url]/*" [ad_conn url]]] + if { [info exists context] } { set context_bar [eval ad_context_bar $context] } Index: openacs-4/packages/theme-selva/www/selva-site-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/selva-site-master.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/theme-selva/www/selva-site-master.adp 1 Aug 2005 05:04:45 -0000 1.5 +++ openacs-4/packages/theme-selva/www/selva-site-master.adp 18 Sep 2005 12:27:08 -0000 1.6 @@ -1,64 +1,116 @@ - - - @title;noquote@ - - - @signatory;noquote@ - - - @focus;noquote@ - - - + + + @title;noquote@ + + + @signatory;noquote@ + + + @focus;noquote@ + + + - @header_stuff;noquote@ + + @header_stuff;noquote@ + + +
+ + + + + + + + + + +
+ +
    -
  • @user_messages.message;noquote@
    • +
  • @user_messages.message;noquote@
    •
- \ No newline at end of file Index: openacs-4/packages/theme-selva/www/selva-site-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/selva-site-master.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/theme-selva/www/selva-site-master.tcl 26 Jul 2005 14:28:29 -0000 1.1 +++ openacs-4/packages/theme-selva/www/selva-site-master.tcl 18 Sep 2005 12:27:08 -0000 1.2 @@ -15,18 +15,16 @@ if { [template::util::is_nil subnavbar_link] } { set subnavbar_link "" } + +set community_id [dotlrn_community::get_community_id] +if {[exists_and_not_null community_id]} { + set css_url [parameter::get_from_package_key -package_key "theme-selva" -parameter "communityCssUrl" -default "/resources/theme-selva/Selva/green/Selva.css"] + + } else { + set css_url [parameter::get_from_package_key -package_key "theme-selva" -parameter "cssUrl" -default "/resources/theme-selva/Selva/default/Selva.css"] + + } -# Where to find the stylesheet -# original -#set css_url "/resources/acs-subsite/site-master.css" -# diferent tries -#set css_url "" -set default_css_url "/resources/theme-selva/Selva/default/Selva.css" - - -# there will be a link extracted from the database for the css, but not right now -set css_url $default_css_url - # Get system name set system_name [ad_system_name] set system_url [ad_url] @@ -107,3 +105,11 @@ #---------------------------------------------------------------------- util_get_user_messages -multirow "user_messages" + +# logo or not logo +set error_messages "bla : " + append error_messages [parameter::get_from_package_key -package_key "theme-selva" -parameter "isLogoActivated" -default 0] + +if {[parameter::get_from_package_key -package_key "theme-selva" -parameter "isLogoActivated" -default "1"] == 1} { + set is_logo_url [parameter::get_from_package_key -package_key "theme-selva" -parameter "logoUrl" -default "/resources/theme-selva/Selva/default/images/logo.gif"] +}