Index: openacs-4/packages/theme-selva/sql/postgresql/theme-selva-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/sql/postgresql/theme-selva-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/theme-selva/sql/postgresql/theme-selva-create.sql 27 Jul 2005 18:32:02 -0000 1.2
+++ openacs-4/packages/theme-selva/sql/postgresql/theme-selva-create.sql 18 Sep 2005 11:43:28 -0000 1.3
@@ -1 +1,3 @@
-UPDATE apm_parameter_values SET attr_value = '/packages/theme-selva/www/selva-master' WHERE parameter_id IN (SELECT parameter_id FROM apm_parameters WHERE parameter_name='DefaultMaster' AND package_key = 'acs-subsite');
+UPDATE apm_parameter_values SET attr_value = '/packages/theme-selva/www/selva-master' WHERE parameter_id IN (SELECT parameter_id FROM apm_parameters WHERE parameter_name='DefaultMaster');
+SELECT portal_element_theme__new ('selva','Selva Theme','../../theme-selva/www/themes/selva-theme','../../theme-selva/www/themes/selva-theme');
+UPDATE portals SET theme_id = (SELECT theme_id FROM portal_element_themes WHERE name='selva');
\ No newline at end of file
Index: openacs-4/packages/theme-selva/sql/postgresql/theme-selva-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/sql/postgresql/theme-selva-drop.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/theme-selva/sql/postgresql/theme-selva-drop.sql 26 Jul 2005 14:28:29 -0000 1.1
+++ openacs-4/packages/theme-selva/sql/postgresql/theme-selva-drop.sql 18 Sep 2005 11:43:28 -0000 1.2
@@ -1 +1,21 @@
-UPDATE apm_parameter_values SET attr_value = '/packages/dotlrn/www/dotlrn-master' WHERE parameter_id IN (SELECT parameter_id FROM apm_parameters WHERE parameter_name='DefaultMaster')
\ No newline at end of file
+UPDATE apm_parameter_values SET attr_value = '/packages/dotlrn/www/dotlrn-master' WHERE parameter_id IN (SELECT parameter_id FROM apm_parameters WHERE parameter_name='DefaultMaster');
+UPDATE portals SET theme_id = (SELECT theme_id FROM portal_element_themes WHERE name LIKE '%sloan%');
+DELETE FROM portal_element_themes WHERE name = 'selva';
+
+create function inline_0 ()
+returns integer as '
+declare
+ theme portal_element_themes.theme_id%TYPE;
+begin
+ SELECT theme_id INTO theme FROM portal_element_themes WHERE name=''selva'';
+ perform acs_object__delete(theme);
+
+return 0;
+
+end;' language 'plpgsql';
+
+select inline_0();
+
+drop function inline_0();
+
+
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.3 -r1.4
--- openacs-4/packages/theme-selva/tcl/selva-procs.tcl 1 Aug 2005 05:04:45 -0000 1.3
+++ openacs-4/packages/theme-selva/tcl/selva-procs.tcl 18 Sep 2005 11:44:51 -0000 1.4
@@ -28,7 +28,33 @@
namespace eval selva {
- ad_proc -public portal_navbar {
+ ad_proc -public portal_navbar {
+
+ } {
+ A helper procedure that generates the Subnavbar (above the portal navbar, ie the tabs)
+ for dotlrn. It is called from the selva-master template.
+ } {
+ set current_url [ad_conn url]
+
+ set subnavbar "<ul>"
+
+ foreach {url name } [parameter::get_from_package_key -package_key "theme-selva" -parameter "AdditionalSubnavbarTabs" -default ""] {
+
+ # 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>"
+ } else {
+ append subnavbar "\n<li><a href=\"$url\">[_ $name]</a></li>"
+ }
+
+ }
+
+ append subnavbar "\n</ul>"
+ }
+
+ ad_proc -public portal_subnavbar {
{-user_id:required}
{-link_control_panel:required}
{-control_panel_text:required}
@@ -114,34 +140,25 @@
#page_num will be empty_string for special pages like
#My Space and Control Panel
regsub -all {[^0-9]} $page_num {} page_num
+
set navbar "<ul>\n"
db_foreach list_page_nums_select {} {
- if { ("$dotlrn_url/" == [ad_conn url] || "$dotlrn_url/index" == [ad_conn url]) && $sort_key == 0 && $page_num == ""} {
+ #if { "$dotlrn_url/" == [ad_conn url] || "$dotlrn_url/index" == [ad_conn url]) && $sort_key == 0 && $page_num == ""} {
# active tab is first tab and page_num may be ""
- append navbar "\n<li class=\"current\"><a href=\"#\">$pretty_name</a></li>"
- } elseif {$page_num == $sort_key} {
+ #append navbar "\n<li class=\"current\"><a href=\"#\">$pretty_name</a></li>"
+ #} elseif {$page_num == $sort_key} {
# We are looking at the active tab
- append navbar "\n<li class=\"current\"><a href=\"#\">$pretty_name</a></li>"
- } else {
+ # append navbar "\n<li class=\"current\"><a href=\"#\">$pretty_name</a></li>"
+ #} else {
append navbar "\n<li><a href=\"$link?page_num=$sort_key\">$pretty_name</a> </li>"
- }
+ #}
}
- #
- # Common code for the the behavior of the control panel link (class administration
- # or my account)
- #
+ if {[regexp {dotlrn/clubs/*} [ad_conn url]]} {
+ append navbar "\n<li><a href=\"one-community-admin\">Admin</a></li>"
+ }
- if {$show_control_panel} {
- if {$link_control_panel} {
- append navbar "<li><a href=\"$control_panel_url\">$control_panel_text</a></li>"
-
- } else {
- append navbar "<li class=\"current\"><a href=\"#\">$control_panel_text</a></li>"
- }
- }
-
append navbar "</ul>"
}
Index: openacs-4/packages/theme-selva/tcl/selva-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/tcl/selva-procs.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/theme-selva/tcl/selva-procs.xql 26 Jul 2005 14:28:29 -0000 1.1
+++ openacs-4/packages/theme-selva/tcl/selva-procs.xql 18 Sep 2005 11:44:51 -0000 1.2
@@ -3,7 +3,7 @@
<queryset>
- <fullquery name="selva::portal_navbar.list_page_nums_select">
+ <fullquery name="selva::portal_subnavbar.list_page_nums_select">
<querytext>
select pretty_name,
sort_key
Index: openacs-4/packages/theme-selva/www/doc/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/doc/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/theme-selva/www/doc/index.adp 26 Jul 2005 14:28:30 -0000 1.1
+++ openacs-4/packages/theme-selva/www/doc/index.adp 18 Sep 2005 11:49:37 -0000 1.2
@@ -3,15 +3,15 @@
<blockquote>
<h1>Selva for designers</h1>
+Selva simplifies the work of customizing the look and feel of your OpenACS/dotLRN website.
-Selva simplifies the work of customizing the look and feel of your website.
-
<h1>Templates</h1>
<h2>Not yet using Selva?</h2>
<ol>
-<li>Go to the <a href="/admin/site-map/">site map page</a></li>
-<li>go to the parameters link in the 'Main Site" row.</li>
-<li>Change the 'default master' parameter to /www/Selva/selva-master</li>
+<li>Go to the <a href="/acs-admin/apm">Package manager page</a></li>
+<li>Click in 'install packages'</li>
+<li>The system will check for all uninstalled packages in your local directory. Choose theme-selva.</li>
+<li>Restart the server</li></li>
</ol>
The following documentation will be useful.
@@ -38,19 +38,32 @@
<h2>Modifying SelvaFlex theme</h2>
+New themes should be added in the www/resources directory.
+Each directory should contain all images and a single selva.css file.
-<p>To be done by Zen</p>
+<h1>Selva presentation and Quality Assurance</h1>
+In order to improve and maintain the quality of the themes in Selva we would like all
+'certified' themes to be Accesible W3C Level A compliant and XHTML compliant.
-<h1>Selva presentation and QA</h1>
<h2>Making your page accessible</h2>
-to be done by Dorian
+A comple accessibility analysis was performed on the portal template used in dotlrn 2.1.1.
+You should read "<a href="http://dotlrn.org/conferences/Madrid05/">Towards an Accessible Learning Management System</a> for a full description.
+
+
<h2>Making your page XHTML compliant</h2>
-To be done by Dorian
+Check out the same document above.
<h1>Credits</h1>
-<h2>Adding themes<h2>
+A number of people has collaborated with these themes:
+<ul>
+<li>Art Director + graphic design + CSS: Dorian Peters</li>
+<li>Default Selva theme impelmentation: Jeremy Monet</li>
+<li>Selva Flex implementation: Inigo Medina Garcia</li>
+<li>Documentation and coordination: Rafael Calvo</li>
+</ul>
+
</blockquote>