Index: openacs-4/packages/wp-slim/catalog/wp-slim.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/catalog/wp-slim.en_US.ISO-8859-1.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/wp-slim/catalog/wp-slim.en_US.ISO-8859-1.xml	22 Sep 2003 18:33:45 -0000	1.1
+++ openacs-4/packages/wp-slim/catalog/wp-slim.en_US.ISO-8859-1.xml	29 Sep 2003 02:41:33 -0000	1.2
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!-- Generated by lang::catalog::export_messages_to_file on 2003 May 17 14:39 -->
 <message_catalog package_key="wp-slim" package_version="4.0b3" locale="en_US" charset="ISO-8859-1">
 
   <msg key="_Add">the Attachment</msg>
@@ -245,6 +244,7 @@
   <msg key="My_Presentations">My Presentations</msg>
   <msg key="Namenbsp">Name:&amp;nbsp;</msg>
   <msg key="nbspImages">#&amp;nbsp;Images</msg>
+  <msg key="New_Slide">New Slide</msg>
   <msg key="next">next</msg>
   <msg key="No">No</msg>
   <msg key="No_I_want_to_cancel">No, I want to cancel.</msg>
@@ -253,8 +253,10 @@
   <msg key="No_users_found">No users found.</msg>
   <msg key="none">(none)</msg>
   <msg key="none_1">none</msg>
-  <msg key="one_presentation">&quot;one presentation&quot;</msg>
+  <msg key="One_Presentation">One Presentation</msg>
+  <msg key="one_presentation">one presentation</msg>
   <msg key="One_Revision">One Revision</msg>
+  <msg key="One_Slide">One Slide</msg>
   <msg key="one_slide">one slide</msg>
   <msg key="One_Style">One Style</msg>
   <msg key="Options">Options</msg>
Index: openacs-4/packages/wp-slim/catalog/wp-slim.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/catalog/wp-slim.es_ES.ISO-8859-1.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/wp-slim/catalog/wp-slim.es_ES.ISO-8859-1.xml	22 Sep 2003 18:33:45 -0000	1.1
+++ openacs-4/packages/wp-slim/catalog/wp-slim.es_ES.ISO-8859-1.xml	29 Sep 2003 02:41:33 -0000	1.2
@@ -201,9 +201,11 @@
   <msg key="No_users_found">No se encontrar&amp;oacute;n usuarios.</msg>
   <msg key="none">(ninguna)</msg>
   <msg key="none_1">ninguna</msg>
-  <msg key="one_presentation">&quot;una presentaci&amp;oacute;n&quot;</msg>
+  <msg key="one_presentation">una presentaci&amp;oacute;n</msg>
+  <msg key="One_Presentation">Una Presentaci&amp;oacute;n</msg>
   <msg key="One_Revision">Una Revisi&amp;oacute;n</msg>
   <msg key="one_slide">una diapositiva</msg>
+  <msg key="One_Slide">Una Diapositiva</msg>
   <msg key="One_Style">Un Estilo</msg>
   <msg key="Options">Opciones</msg>
   <msg key="or">o</msg>
Index: openacs-4/packages/wp-slim/www/create-presentation.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/create-presentation.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/wp-slim/www/create-presentation.adp	22 Sep 2003 18:41:27 -0000	1.7
+++ openacs-4/packages/wp-slim/www/create-presentation.adp	29 Sep 2003 02:41:33 -0000	1.8
@@ -67,7 +67,7 @@
   </tr>
   <tr>
     <th nowrap align=right>#wp-slim.Style#</th>
-    <td>@available_styles@
+    <td>@available_styles;noquote@
     </td>
   </tr>
   <tr>
Index: openacs-4/packages/wp-slim/www/create-slide.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/create-slide.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/create-slide.tcl	6 Sep 2002 15:32:23 -0000	1.3
+++ openacs-4/packages/wp-slim/www/create-slide.tcl	29 Sep 2003 02:41:33 -0000	1.4
@@ -18,15 +18,15 @@
 set package_id [ad_conn package_id]
 
 
-db_1row get_presentaiton {
+db_1row get_presentation {
 select pres_title
 from cr_wp_presentations p,
      cr_items i
 where i.item_id = :pres_item_id
 and   i.live_revision = p.presentation_id
 }
 
-set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$pres_title"] "$pres_title"]
+set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$pres_title"] "[_ wp-slim.New_Slide]"]
 
 if {[empty_string_p $sort_key]} {
     set sort_key [db_string get_sort_key {
Index: openacs-4/packages/wp-slim/www/create-slide.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/create-slide.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/create-slide.xql	4 Oct 2001 04:29:01 -0000	1.1
+++ openacs-4/packages/wp-slim/www/create-slide.xql	29 Sep 2003 02:41:33 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <queryset>
 
-<fullquery name="get_presentaiton">      
+<fullquery name="get_presentation">      
       <querytext>
       
 select pres_title
Index: openacs-4/packages/wp-slim/www/edit-presentation.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-presentation.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/wp-slim/www/edit-presentation.adp	22 Sep 2003 18:41:27 -0000	1.6
+++ openacs-4/packages/wp-slim/www/edit-presentation.adp	29 Sep 2003 02:41:33 -0000	1.7
@@ -86,7 +86,7 @@
   </tr>
   <tr>
     <th nowrap align=right>#wp-slim.Style#</th>
-    <td>@available_styles@
+    <td>@available_styles;noquote@
   </tr>
   <tr>
     <td></td><td>
Index: openacs-4/packages/wp-slim/www/edit-slide-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-slide-2.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/wp-slim/www/edit-slide-2.tcl	22 Sep 2003 18:41:27 -0000	1.7
+++ openacs-4/packages/wp-slim/www/edit-slide-2.tcl	29 Sep 2003 02:41:33 -0000	1.8
@@ -56,7 +56,8 @@
 }
 
 if {[regexp {Upload} $button]} {
-    set context [list [list "presentation-top?[export_url_vars pres_item_id]" "[_ wp-slim.Presentation_Top]"] [list "edit-slide?[export_url_vars slide_item_id pres_item_id]" "[_ wp-slim.Edit_Slide]"] "$slide_title"]
+    db_1row get_presentation {}
+    set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$pres_title"] [list "edit-slide?[export_url_vars slide_item_id pres_item_id]" "[_ wp-slim.Edit_Slide]"] "$slide_title"]
     # get the number of attachments
     set attachment_count [db_string get_number_of_attachments {
 	select count(1) 
Index: openacs-4/packages/wp-slim/www/edit-slide-2.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-slide-2.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/edit-slide-2.xql	15 Nov 2001 01:47:13 -0000	1.2
+++ openacs-4/packages/wp-slim/www/edit-slide-2.xql	29 Sep 2003 02:41:33 -0000	1.3
@@ -13,4 +13,16 @@
 </fullquery>
 
  
+<fullquery name="get_presentation">      
+      <querytext>
+      
+select pres_title
+from cr_wp_presentations p,
+     cr_items i
+where i.item_id = :pres_item_id
+and   i.live_revision = p.presentation_id
+
+      </querytext>
+</fullquery>
+
 </queryset>
Index: openacs-4/packages/wp-slim/www/edit-slide.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-slide.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/wp-slim/www/edit-slide.tcl	22 Sep 2003 18:41:27 -0000	1.7
+++ openacs-4/packages/wp-slim/www/edit-slide.tcl	29 Sep 2003 02:41:33 -0000	1.8
@@ -25,8 +25,10 @@
 set user_id [ad_verify_and_get_user_id]
 permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation
 
-set context [list "presentation-top?[export_url_vars pres_item_id] {presentation}" "[_ wp-slim.Edit_Slide]"]
+db_1row get_presentation {}
 
+set context [list "presentation-top?[export_url_vars pres_item_id] {$pres_title}" "[_ wp-slim.Edit_Slide]"]
+
 db_1row get_slide_info {
 select s.slide_title,
        s.sort_key,
Index: openacs-4/packages/wp-slim/www/presentation-revisions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-revisions.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/wp-slim/www/presentation-revisions.tcl	22 Sep 2003 18:41:27 -0000	1.5
+++ openacs-4/packages/wp-slim/www/presentation-revisions.tcl	29 Sep 2003 02:41:33 -0000	1.6
@@ -38,9 +38,9 @@
 }  {
     set creation_date [lc_time_fmt $creation_date "%X %Q"]
 }
+db_1row get_presentation {}
+set context [list [list "presentation-top?[export_url_vars pres_item_id]"  "$pres_title"] "[_ wp-slim.All_Revisions]"]
 
-set context [list [list "presentation-top?[export_url_vars pres_item_id]"  "[_ wp-slim.Presentation]"] "[_ wp-slim.All_Revisions]"]
-
 set return_url [ns_urlencode "presentation-revisions?[export_url_vars pres_item_id]"]
 
 ad_return_template
Index: openacs-4/packages/wp-slim/www/serve-presentation.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-presentation.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/wp-slim/www/serve-presentation.adp	22 Sep 2003 18:41:27 -0000	1.9
+++ openacs-4/packages/wp-slim/www/serve-presentation.adp	29 Sep 2003 02:41:33 -0000	1.10
@@ -1,6 +1,6 @@
-<master src="wp-presentation-master">
+<master>
 <property name="title">@pres_title@</property>
-<property name="context">#wp-slim.one_presentation#</property>
+<property name="context">#wp-slim.One_Presentation#</property>
 <property name="style_id">@style@</property>
 <property name="page_signature">@page_signature@</property>
 <property name="copyright_notice">@copyright_notice@</property>
Index: openacs-4/packages/wp-slim/www/serve-slide.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/wp-slim/www/serve-slide.adp	22 Sep 2003 18:41:27 -0000	1.10
+++ openacs-4/packages/wp-slim/www/serve-slide.adp	29 Sep 2003 02:41:33 -0000	1.11
@@ -1,4 +1,4 @@
-<master src="wp-presentation-master">
+<master>
 <property name="title">@slide_title@</property>
 <property name="context">@context@</property>
 <property name="style_id">@style@</property>
@@ -7,7 +7,7 @@
 
 <table align=right>
 <tr>
-        <td>@href_back_forward@</td>
+        <td>@href_back_forward;noquote@</td>
 </tr>
 </table>
 
@@ -101,7 +101,7 @@
 
 <if @comments@ ne "">
 <h3>#wp-slim.Slide_Comments#</h3>
-@comments@
+@comments;noquote@
 </if>
 
 </if>
@@ -112,7 +112,7 @@
 <if @comment_link@ ne "">
 <ul>
 <li>
-@comment_link@
+@comment_link;noquote@
 </ul>
 </if>
 
Index: openacs-4/packages/wp-slim/www/serve-slide.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/wp-slim/www/serve-slide.tcl	22 Sep 2003 18:41:27 -0000	1.7
+++ openacs-4/packages/wp-slim/www/serve-slide.tcl	29 Sep 2003 02:41:33 -0000	1.8
@@ -64,8 +64,10 @@
 
 db_1row get_presentation_page_signature { *SQL* }
 
-set context [list [list "$subsite_name/display/$pres_item_id" "one presentation"] "[_ wp-slim.one_slide]"]
+set context [list [list "$subsite_name/display/$pres_item_id" [_ wp-slim.One_Presentation]] "[_ wp-slim.One_Slide]"]
 
+
+
 # Figure out what the previous slide link should be.
 if {$sort_key == 1} {
     set href_back "<a href=\"$subsite_name/display/$pres_item_id/\">[_ wp-slim.top]</a> | "
Index: openacs-4/packages/wp-slim/www/slides-reorder.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slides-reorder.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/wp-slim/www/slides-reorder.tcl	22 Sep 2003 18:41:27 -0000	1.5
+++ openacs-4/packages/wp-slim/www/slides-reorder.tcl	29 Sep 2003 02:41:33 -0000	1.6
@@ -20,9 +20,9 @@
 
 set header [ad_header "[_ wp-slim.Reorder_Slides]"]
 
+db_1row get_presentation {}
+set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$pres_title"] "[_ wp-slim.Reorder_Slides]"]
 
-set context [list [list "presentation-top?[export_url_vars pres_item_id]"  "[_ wp-slim.presentation]"] "[_ wp-slim.Reorder_Slides]"]
-
 set counter 0
 
 set out ""
Index: openacs-4/packages/wp-slim/www/slides-reorder.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slides-reorder.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/slides-reorder.xql	4 Oct 2001 04:29:01 -0000	1.1
+++ openacs-4/packages/wp-slim/www/slides-reorder.xql	29 Sep 2003 02:41:33 -0000	1.2
@@ -13,5 +13,16 @@
       </querytext>
 </fullquery>
 
+<fullquery name="get_presentation">      
+      <querytext>
+      
+select pres_title
+from cr_wp_presentations p,
+     cr_items i
+where i.item_id = :pres_item_id
+and   i.live_revision = p.presentation_id
+
+      </querytext>
+</fullquery>
  
 </queryset>
Index: openacs-4/packages/wp-slim/www/style-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/style-edit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/style-edit.adp	22 Sep 2003 18:41:27 -0000	1.3
+++ openacs-4/packages/wp-slim/www/style-edit.adp	29 Sep 2003 02:41:33 -0000	1.4
@@ -31,7 +31,7 @@
   </tr>
   <tr>
     <th nowrap align=right>#wp-slim.Background_Imagenbsp#</th>
-    <td>@background_images@</td>
+    <td>@background_images;noquote@</td>
   </tr>
   <tr>
     <th nowrap align=right>#wp-slim.Link_Colornbsp#</th>
@@ -47,7 +47,7 @@
   </tr>
   <tr>
     <th nowrap align=right>#wp-slim.lt_Available_to_other_pe#</th>
-    <td>@public@ </td>
+    <td>@public;noquote@ </td>
   </tr>
   <tr>
     <th nowrap align=right valign=top><br>#wp-slim.CSS_Sourcenbsp#</th>
Index: openacs-4/packages/wp-slim/www/style-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/style-list.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/style-list.tcl	22 Sep 2003 18:41:27 -0000	1.3
+++ openacs-4/packages/wp-slim/www/style-list.tcl	29 Sep 2003 02:41:33 -0000	1.4
@@ -10,7 +10,7 @@
 
 set user_id [ad_verify_and_get_user_id]
 
-set context "[_ wp-slim.your_styles]"
+set context "[_ wp-slim.Your_Styles]"
 
 
 db_multirow styles_select style_select_data { *SQL* } {
Index: openacs-4/packages/wp-slim/www/style-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/style-view.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/style-view.adp	22 Sep 2003 18:41:27 -0000	1.3
+++ openacs-4/packages/wp-slim/www/style-view.adp	29 Sep 2003 02:41:33 -0000	1.4
@@ -4,7 +4,7 @@
 
 <form name=f action=style-image-add method=post enctype=multipart/form-data>
 
-@export_form_vars@
+@export_form_vars;noquote@
 
 <p><center>
 <table border=2 cellpadding=10><tr><td>
Index: openacs-4/packages/wp-slim/www/wp-presentation-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/wp-presentation-master.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/wp-slim/www/wp-presentation-master.adp	22 Sep 2003 18:41:27 -0000	1.5
+++ openacs-4/packages/wp-slim/www/wp-presentation-master.adp	29 Sep 2003 02:41:33 -0000	1.6
@@ -1,22 +1,8 @@
-<html>
-<head>
-<link rel=stylesheet href="<%=[ad_conn package_url]%>styles/<if @style_id@ eq "-1">default</if><else>@style_id@</else>/style.css" type="text/css">
-<title>@title@</title>
-@header_stuff@
-</head>
-<body <%=[wp_header $style_id]%>>
-<if @body_start_include@ not nil>
-<include src="@body_start_include@" />
-</if>
-<slave>
+<master>
+<!-- need to pass this up <body <%=[wp_header $style_id]%>> -->
 
-<br>
-@copyright_notice@
 
-<hr />
-<address><a href="mailto:@page_signature@">@page_signature@</a></address>
-@ds_link@
-</body>
-</html>
 
 
+
+
Index: openacs-4/packages/wp-slim/www/wp-presentation-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/wp-presentation-master.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/wp-presentation-master.tcl	17 May 2003 12:50:50 -0000	1.2
+++ openacs-4/packages/wp-slim/www/wp-presentation-master.tcl	29 Sep 2003 02:41:33 -0000	1.3
@@ -1,2 +1,2 @@
-set root_directory [file dirname [string trimright [ns_info tcllib] "/"]]
-source "$root_directory/www/default-master.tcl"
+#set root_directory [file dirname [string trimright [ns_info tcllib] "/"]]
+#source "$root_directory/www/default-master.tcl"