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.14 -r1.14.2.1
--- openacs-4/packages/theme-selva/theme-selva.info 28 Sep 2005 04:42:06 -0000 1.14
+++ openacs-4/packages/theme-selva/theme-selva.info 24 Feb 2006 11:20:22 -0000 1.14.2.1
@@ -8,23 +8,24 @@
<singleton-p>f</singleton-p>
<auto-mount>theme-selva</auto-mount>
- <version name="0.7d2" url="http://openacs.org/repository/download/apm/theme-selva-0.7d2.apm">
+ <version name="0.7d3" url="http://openacs.org/repository/download/apm/theme-selva-0.7d3.apm">
<owner url="http:/www.weg.ee.usyd.edu.au">Rafael Calvo</owner>
<release-date>2005-09-28</release-date>
<vendor url="http://www.weg.usyd.edu.au"></vendor>
<maturity>0</maturity>
- <provides url="theme-selva" version="0.7d2"/>
+ <provides url="theme-selva" version="0.7d3"/>
<callbacks>
</callbacks>
<parameters>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="AdditionalSubnavbarTabs" default="/dotlrn/ theme-selva.MySpace /theme-selva/courses theme-selva.Courses /theme-selva/communities theme-selva.Communities /pvt/home dotlrn.Preferences /dotlrn/control-panel theme-selva.Tools" description="list of URL Names pairs which will make it into additional subnavbar tabs"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="AdditionalSubnavbarTabs" default="/dotlrn/ #dotlrn.My_Workspace# /theme-selva/courses #dotlrn.Courses# /pvt/home #dotlrn.Preferences# /dotlrn/control-panel #dotlrn.control_panel#" description="list of URL Names pairs which will make it into additional subnavbar tabs"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="communityCssUrl" default="/resources/theme-selva/Selva/turquoise/Selva.css" description="default class css_url"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="courseCssUrl" default="/resources/theme-selva/Selva/green/Selva.css" description="default comunity css_url"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="cssUrl" default="/resources/theme-selva/Selva/default/Selva.css" description="default css_url"/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="isLogoActivated" default="1" description="Boolean to display the logo or not"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="logoUrl" default="/resources/theme-selva/Selva/images/dotLRN-logo.gif" description="url for the logo"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="SmallTitleP" default="0" description="This will take the title out from the prominent place on the top left, but add the name of community you are in as a special tab"/>
</parameters>
</version>
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 -r1.3 -r1.3.2.1
--- openacs-4/packages/theme-selva/catalog/theme-selva.en_US.ISO-8859-1.xml 25 Sep 2005 08:14:46 -0000 1.3
+++ openacs-4/packages/theme-selva/catalog/theme-selva.en_US.ISO-8859-1.xml 24 Feb 2006 11:20:23 -0000 1.3.2.1
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="theme-selva" package_version="0.5d" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="theme-selva" package_version="0.7d3" locale="en_US" charset="ISO-8859-1">
<msg key="Communities">Communities</msg>
<msg key="ControlPanel">Control Panel</msg>
<msg key="Courses">Courses</msg>
<msg key="Home">Home</msg>
<msg key="Logout">Logout</msg>
<msg key="MySpace">My Space</msg>
+ <msg key="online">online</msg>
<msg key="Preferences">Preferences</msg>
<msg key="Tools">Tools</msg>
+ <msg key="You_are_here">You are here</msg>
</message_catalog>
Index: openacs-4/packages/theme-selva/tcl/selva-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/tcl/selva-procs.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/theme-selva/tcl/selva-procs.tcl 28 Sep 2005 03:21:03 -0000 1.5
+++ openacs-4/packages/theme-selva/tcl/selva-procs.tcl 24 Feb 2006 11:20:23 -0000 1.5.2.1
@@ -35,18 +35,74 @@
for dotlrn. It is called from the selva-master template.
} {
set current_url [ad_conn url]
+
+ # Set up some basic stuff
+ set community_id [dotlrn_community::get_community_id]
+
+ # 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"
+ set dotlrn_admin_url "/dotlrn/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_name {}
+ }
set subnavbar "<ul>"
-
- foreach {url name } [parameter::get_from_package_key -package_key "theme-selva" -parameter "AdditionalSubnavbarTabs" -default ""] {
-
+
+ set tabs_list [list]
+
+ set small_title_p [parameter::get_from_package_key -package_key "theme-selva" -parameter "SmallTitleP" -default "0"]
+ if {[exists_and_not_null community_id] && $small_title_p} {
+ lappend tabs_list [list "$current_url" [dotlrn_community::get_community_name $community_id]]
+ }
+
+ foreach {url name} [parameter::get_from_package_key -package_key "theme-selva" -parameter "AdditionalSubnavbarTabs" -default ""] {
+ lappend tabs_list [list "$url" "$name"]
+ }
+
+ if { $sw_admin_p } {
+ lappend tabs_list [list "$dotlrn_admin_url" "#dotlrn.Administration_Cockpit#"]
+ }
+
+ ns_log Debug "TABS" $tabs_list
+ foreach tab_entry $tabs_list {
+ set url [lindex $tab_entry 0]
+ set name [lindex $tab_entry 1]
+ ns_log Debug "URL:: $url"
+ ns_log Debug "NAME:: $name"
# if url is /dotlrn or /dotlrn/index we highlight the "Home" tab, otherwise we highlight the tab with the current_url, if there is one, i.e. we are not in a community
if { $url == $current_url || ($url == "/dotlrn/" && $current_url == "/dotlrn/index")} {
append subnavbar "\n<li class=\"active\"><a href=\"$url\">"
#if {$picture != "null" } { append subnavbar "<img src=\"$picture\" alt=\"$picture\">" }
- append subnavbar "[_ $name]</a></li>"
+ append subnavbar "[lang::util::localize $name]</a></li>"
} else {
- append subnavbar "\n<li><a href=\"$url\">[_ $name]</a></li>"
+ append subnavbar "\n<li><a href=\"$url\">[lang::util::localize $name]</a></li>"
}
}
Index: openacs-4/packages/theme-selva/www/communities.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/communities.adp,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/theme-selva/www/communities.adp 28 Sep 2005 02:45:15 -0000 1.1
+++ openacs-4/packages/theme-selva/www/communities.adp 24 Feb 2006 11:20:23 -0000 1.1.2.1
@@ -24,12 +24,9 @@
-<div id="left-column">
-<div class="portlet-wrapper">
<div class="portlet-title"><span>@portlet_title@</span>
</div> <!-- class : portlet-title -->
<div class="portlet">
<include src="/packages/dotlrn/www/dotlrn-main-portlet" show_buttons_p="1" show_archived_p=0 title="Groups" referer="@dotlrn_url@/control-panel">
</div> <!-- class : portlet -->
- </div> <!-- classs : portlet-wrapper -->
-</div> <!-- id : left-column -->
\ No newline at end of file
+<br>
Index: openacs-4/packages/theme-selva/www/communities.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/communities.tcl,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/theme-selva/www/communities.tcl 28 Sep 2005 02:45:15 -0000 1.1
+++ openacs-4/packages/theme-selva/www/communities.tcl 24 Feb 2006 11:20:23 -0000 1.1.2.1
@@ -35,7 +35,7 @@
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 portlet_title [_ theme-selva.Communities]
set title [parameter::get -localize -parameter admin_page_name]
set admin_p [dotlrn::admin_p]
set admin_url "[dotlrn::get_url]/admin"
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 -r1.1 -r1.1.2.1
--- openacs-4/packages/theme-selva/www/courses.adp 18 Sep 2005 12:27:08 -0000 1.1
+++ openacs-4/packages/theme-selva/www/courses.adp 24 Feb 2006 11:20:23 -0000 1.1.2.1
@@ -24,12 +24,9 @@
-<div id="left-column">
-<div class="portlet-wrapper">
<div class="portlet-title"><span>@portlet_title@</span>
</div> <!-- class : portlet-title -->
<div class="portlet">
<include src="/packages/dotlrn/www/dotlrn-main-portlet" show_buttons_p="1" show_archived_p=0 title="Groups" referer="@dotlrn_url@/control-panel">
</div> <!-- class : portlet -->
- </div> <!-- classs : portlet-wrapper -->
-</div> <!-- id : left-column -->
\ No newline at end of file
+<br>
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/theme-selva/www/preferences.adp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/theme-selva/www/preferences.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/theme-selva/www/preferences.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/theme-selva/www/selva-lrn-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/selva-lrn-master.adp,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/theme-selva/www/selva-lrn-master.adp 26 Sep 2005 07:49:41 -0000 1.2
+++ openacs-4/packages/theme-selva/www/selva-lrn-master.adp 24 Feb 2006 11:20:23 -0000 1.2.2.1
@@ -9,6 +9,7 @@
<if @youarehere@ not nil><div id="youarehere">@youarehere;noquote@</div><br /></if>
+<else><div id="youarehere"></div></else>
<div id="portal-navigation">
<if @navbar@ not nil>@navbar;noquote@</if>
Index: openacs-4/packages/theme-selva/www/selva-lrn-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/selva-lrn-master.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/theme-selva/www/selva-lrn-master.tcl 26 Sep 2005 07:49:41 -0000 1.2
+++ openacs-4/packages/theme-selva/www/selva-lrn-master.tcl 24 Feb 2006 11:20:23 -0000 1.2.2.1
@@ -269,6 +269,11 @@
set youarehere "[_ theme-selva.MySpace]"
}
+ # Behaviour of the title
+ if {[parameter::get_from_package_key -package_key "theme-selva" -parameter "SmallTitleP" -default "0"]} {
+ set youarehere ""
+ }
+
set extra_spaces "<img src=\"/resources/dotlrn/spacer.gif\" alt=\"\" border=0 width=15>"
#set subnavbar [selva::portal_navbar]
set subnavbar [selva::portal_subnavbar \
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.8.2.3 -r1.8.2.4
--- openacs-4/packages/theme-selva/www/selva-master.adp 11 Oct 2005 01:01:26 -0000 1.8.2.3
+++ openacs-4/packages/theme-selva/www/selva-master.adp 24 Feb 2006 11:20:24 -0000 1.8.2.4
@@ -4,10 +4,8 @@
<else>
<master src="/packages/theme-selva/www/selva-site-master">
</else>
- <if @title@ not nil><property name="title">@title;noquote@</property></if>
- <if @context@ not nil><property name="context">@context;noquote@</property></if>
- <if @displayed_object_id@ not nil><property name="displayed_object_id">@displa
-yed_object_id;noquote@</property></if>
- <if @header_stuff@ not nil><property name="header_stuff">@header_stuff;noquote@</property></if>
-
+ <property name="title">@title;noquote@</property>
+ <property name="context">@context;noquote@</property>
+ <property name="displayed_object_id">@displayed_object_id@</property>
+ <property name="header_stuff">@header_stuff;noquote@</property>
<slave>
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.11 -r1.11.2.1
--- openacs-4/packages/theme-selva/www/selva-master.tcl 26 Sep 2005 07:49:41 -0000 1.11
+++ openacs-4/packages/theme-selva/www/selva-master.tcl 24 Feb 2006 11:20:24 -0000 1.11.2.1
@@ -5,6 +5,22 @@
# this should also allow for pages to call the dotlrn template (i.e. tabs) off
# maybe by passing a propery in a page
+if {![exists_and_not_null displayed_object_id]} {
+ set displayed_object_id ""
+}
+
+if {![exists_and_not_null title]} {
+ set title ""
+}
+
+if {![exists_and_not_null context]} {
+ set context ""
+}
+
+if {![exists_and_not_null header_stuff]} {
+ set header_stuff ""
+}
+
set dotlrn_installed_p [apm_package_installed_p dotlrn]
append url [ad_url] [ad_return_url]
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.9 -r1.9.2.1
--- openacs-4/packages/theme-selva/www/selva-site-master.adp 28 Sep 2005 03:59:53 -0000 1.9
+++ openacs-4/packages/theme-selva/www/selva-site-master.adp 24 Feb 2006 11:20:24 -0000 1.9.2.1
@@ -34,8 +34,30 @@
<br>
<div id="site-header">
+ #theme-selva.You_are_here#:
+<div id="status">
+<!-- memebers online -->
+<div class="action-list users-online">
+ <a href="@whos_online_url@">@num_users_online@ <if @num_users_online@ eq 1>member</if><else>members</else> #theme-selva.online#</a>
+ <if @untrusted_user_id@ ne 0>
+ | <a href="@logout_url@" title="#acs-subsite.Logout_from_system#">#acs-subsite.Logout#</a>
+ </if>
+ <else>
+ #acs-subsite.Not_logged_in#
+ </else>
+ </div>
+
+<!-- user greeting -->
+<div class="user-greeting">
+ <if @untrusted_user_id@ ne 0>
+ #acs-subsite.Welcome_user# |
+ </if>
+ </div>
+
+
+</div> <!-- end of status -->
+
<div id="breadcrumbs">
-<!-- displays "you are here" -->
<div id="context-bar">
<if @context_bar@ not nil>
<div id="breadcrumbs">@context_bar;noquote@</div>
@@ -56,31 +78,6 @@
<div style="clear: both;"></div>
</div>
-<div id="status">
-<!-- memebers online -->
-<div class="action-list users-online">
- <a href="@whos_online_url@">@num_users_online@ <if @num_users_online@ eq 1>member</if><else>members</else> online</a>
- <if @untrusted_user_id@ ne 0>
- | <a href="@logout_url@" title="#acs-subsite.Logout_from_system#">#acs-subsite.Logout#</a>
- </if>
- <else>
- #acs-subsite.Not_logged_in#
- </else>
- </div>
-
-
-<!-- user greeting -->
-<div class="user-greeting">
- <if @untrusted_user_id@ ne 0>
- #acs-subsite.Welcome_user# |
- </if>
- <else>
- #acs-subsite.Not_logged_in#
- </else>
- </div>
-
-
-</div> <!-- end of status -->
</div> <!-- end of breadcrumbs -->
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.4 -r1.4.2.1
--- openacs-4/packages/theme-selva/www/selva-site-master.tcl 26 Sep 2005 07:49:41 -0000 1.4
+++ openacs-4/packages/theme-selva/www/selva-site-master.tcl 24 Feb 2006 11:20:24 -0000 1.4.2.1
@@ -20,12 +20,16 @@
}
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/turquoise/Selva.css"]
-
+ set comm_type [dotlrn_community::get_community_type_from_community_id $community_id]
+ if {$comm_type == "dotlrn_club"} {
+ set css_url [parameter::get_from_package_key -package_key "theme-selva" -parameter "communityCssUrl" -default "/resources/theme-selva/Selva/turquoise/Selva.css"]
+ } else {
+ set css_url [parameter::get_from_package_key -package_key "theme-selva" -parameter "courseCssUrl" -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"]
-
}
# Get system name
Index: openacs-4/packages/theme-selva/www/resources/Selva/Selva-core.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/resources/Selva/Selva-core.css,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/theme-selva/www/resources/Selva/Selva-core.css 15 Oct 2005 13:27:29 -0000 1.2.2.1
+++ openacs-4/packages/theme-selva/www/resources/Selva/Selva-core.css 24 Feb 2006 11:20:24 -0000 1.2.2.2
@@ -65,12 +65,13 @@
#breadcrumbs {
background: #F2F1CB;
text-align: left;
- font-size: 100%;
- font-weight:bold; }
+ font-size: 100%;}
#status {
text-align: right;
+ margin-top: -13px;
}
+
#status .users-online {
float:right;
@@ -79,8 +80,7 @@
#status .user-greeting {
display:inline;
- padding-right: 2em;
-
+ padding-right: 0.4em;
}
#status .permanent-navigation {
@@ -261,9 +261,18 @@
vertical-align: top;
}
+.portlet-title h2 {
+ color: #FFFFFF;
+ font-size: 100%;
+ padding-left:0px;
+ padding-right:0px;
+ display:inline;
+}
+
.portlet-title {
margin-right: 10% !important;
}
+
.portlet-title img {
padding: 0 5px 0 5px;
text-align:right;}
@@ -286,6 +295,12 @@
padding-left: 15px;
background:url(images/bullet.gif) no-repeat 0 7px;
padding-top:0px; }
+
+.button {
+ text-decoration: underline;
+ padding-right: 5px;
+ border-right: 1px solid #666666;
+}
@@ -297,5 +312,17 @@
width: 100%;
text-align: center;
background: #F2F1CB;}
+
+/* Div Links */
+/* Contains: link which on hover displays additional information */
+
+a div#listlink {
+ display:none;
+}
+
+a:hover div#listlink {
+ display:block;
+}
+
Index: openacs-4/packages/theme-selva/www/resources/Selva/default/Selva.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/resources/Selva/default/Selva.css,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/theme-selva/www/resources/Selva/default/Selva.css 25 Sep 2005 08:14:46 -0000 1.4
+++ openacs-4/packages/theme-selva/www/resources/Selva/default/Selva.css 24 Feb 2006 11:20:24 -0000 1.4.2.1
@@ -79,4 +79,14 @@
padding: 0 5px 0 5px;
text-align:right;}
+/* Div Links */
+/* Contains: link which on hover displays additional information */
+
+a div#listlink {
+ display:none;
+}
+
+a:hover div#listlink {
+ display:block;
+}
Index: openacs-4/packages/theme-selva/www/resources/Selva/images/bullet.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/resources/Selva/images/bullet.gif,v
diff -u -r1.1.2.1 -r1.1.2.2
Binary files differ