Index: openacs-4/packages/acs-lang/www/admin/display-grouped-messages.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/Attic/display-grouped-messages.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/www/admin/display-grouped-messages.adp	21 Oct 2002 11:39:14 -0000	1.2
+++ openacs-4/packages/acs-lang/www/admin/display-grouped-messages.adp	25 Oct 2002 15:12:14 -0000	1.3
@@ -1,7 +1,7 @@
-<master src="master" />
- <property name="title">Messages Administration</property>
+<master>
+ <property name="title">@page_title@</property>
 
-<h2>Localized Messages</h2>
+<h2>@page_title@</h2>
 
 @context_bar@
 
Index: openacs-4/packages/acs-lang/www/admin/display-grouped-messages.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/Attic/display-grouped-messages.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/www/admin/display-grouped-messages.tcl	21 Oct 2002 11:39:14 -0000	1.2
+++ openacs-4/packages/acs-lang/www/admin/display-grouped-messages.tcl	25 Oct 2002 15:12:14 -0000	1.3
@@ -12,7 +12,8 @@
 }
 
 set return_url "index?tab=[ns_urlencode localized-messages]"
-set context_bar [ad_context_bar [list $return_url "Locales & Messages"] "Listing"]
+set page_title "Messages"
+set context_bar [ad_context_bar $page_title]
 set default_locale en_US
 
 if { ![info exists locales] } {
Index: openacs-4/packages/acs-lang/www/admin/display-localized-messages.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/Attic/display-localized-messages.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/www/admin/display-localized-messages.adp	21 Oct 2002 11:39:14 -0000	1.2
+++ openacs-4/packages/acs-lang/www/admin/display-localized-messages.adp	25 Oct 2002 15:12:14 -0000	1.3
@@ -1,5 +1,5 @@
-<master src="master" />
-<property name="title">Messages Administration</property>
+<master>
+  <property name="title">Messages Administration</property>
 
 <h2>Localized Messages</h2>
 @context_bar@
@@ -16,7 +16,7 @@
 
 <else>
 
-<p>Messages that <strong>need</strong> translation.</p>
+<p>Messages that <strong>need</strong> translation in the <b>@package_key@</b> package.</p>
 
 <table cellpadding="0" cellspacing="0" border="0">
  <tr>
Index: openacs-4/packages/acs-lang/www/admin/display-localized-messages.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/Attic/display-localized-messages.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/www/admin/display-localized-messages.tcl	21 Oct 2002 11:39:14 -0000	1.2
+++ openacs-4/packages/acs-lang/www/admin/display-localized-messages.tcl	25 Oct 2002 15:12:15 -0000	1.3
@@ -15,7 +15,7 @@
 
 set tab [ns_urlencode "localized-messages"]
 set return_url "display-grouped-messages?tab=$tab&locales=$locales"
-set context_bar [ad_context_bar [list "index?tab=$tab" "Locales & Messages"] [list $return_url Listing] "Messages"]
+set context_bar [ad_context_bar [list $return_url Listing] "Messages"]
 set default_locale [ad_parameter DefaultLocale]
 set default_locale en_US
 
Index: openacs-4/packages/acs-lang/www/admin/edit-localized-message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/edit-localized-message.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/www/admin/edit-localized-message.adp	21 Oct 2002 11:39:14 -0000	1.2
+++ openacs-4/packages/acs-lang/www/admin/edit-localized-message.adp	25 Oct 2002 15:12:15 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
  <property name="title">Edit a message</property>
  <property name="header_stuff">@header_stuff@</property>
 
Index: openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl	21 Oct 2002 11:39:14 -0000	1.2
+++ openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl	25 Oct 2002 15:12:15 -0000	1.3
@@ -12,7 +12,8 @@
     locales
     message_key
     package_key
-    {translated_p}
+    {translated_p 0}
+    {return_url "display-localized-messages?[export_vars { package_key locales translated_p }]"}
 } -properties {
 }
 
@@ -22,13 +23,11 @@
     set current_locale [ad_conn locale]
 }
 
-set return_url "display-localized-messages?package_key=[ns_urlencode $package_key]&locales=[ns_urlencode $locales]&translated_p=$translated_p"
-
 set tab [ns_urlencode "localized-messages"]
 
 set context_bar [ad_context_bar [list "index?tab=$tab" "Locales & Messages"] \
     [list "display-grouped-messages?tab=$tab&locales=$locales" "Listing"] \
-    [list $return_url "Messages"] "Edit"]
+    [list "display-localized-messages?[export_vars { package_key locales translated_p }]" "Messages"] "Edit"]
 
 
 # This has an ugly smell: But let's hardcode the default to en_US
@@ -38,30 +37,31 @@
 # The part that deals with images is removed - so all messages are treated
 # as simple text.
 
-template::form create message_editing
+form create message_editing
 
-template::element create message_editing original_message \
+element create message_editing original_message \
     -label "Original Message" -datatype text -widget inform
 
-template::element create message_editing message -label "Message" \
+element create message_editing message -label "Message" \
     -datatype text -widget textarea -html { rows 6 cols 40 }
 
 # The hidden elements for passing package key, message key and locale
 
-template::element create message_editing message_key -datatype text -widget hidden
+element create message_editing message_key -datatype text -widget hidden
 
-template::element create message_editing package_key -datatype text -widget hidden
+element create message_editing package_key -datatype text -widget hidden
 
-template::element create message_editing locales -datatype text -widget hidden
+element create message_editing locales -datatype text -widget hidden
 
-template::element create message_editing translated_p -label "translated_p" -datatype text -widget hidden -value $translated_p
+element create message_editing translated_p -label "translated_p" -datatype text -widget hidden -value $translated_p
+element create message_editing return_url -datatype text -widget hidden -value $return_url
 
 set locale_label [ad_locale_get_label $current_locale]
 
 # Header Stuff ... We make sure that this page doesn't get cached.
 set header_stuff "<meta http-equiv=\"Pragma\" content=\"no-cache\" />" 
 
-if { [template::form is_request message_editing] } {
+if { [form is_request message_editing] } {
 
     set sql_select_original_message {
         select message
@@ -88,28 +88,28 @@
 
     if { [exists_and_not_null translated_message] } {
 
-        template::element set_properties message_editing message -value $translated_message
+        element set_properties message_editing message -value $translated_message
 
     } else {
 
-        template::element set_properties message_editing message -value "No Translation Available"
+        element set_properties message_editing message -value "No Translation Available"
 
     }
    
-    template::element set_properties message_editing message_key -value $message_key
-    template::element set_properties message_editing package_key -value $package_key
-    template::element set_properties message_editing locales -value $current_locale
-    template::element set_properties message_editing original_message -value $message
+    element set_properties message_editing message_key -value $message_key
+    element set_properties message_editing package_key -value $package_key
+    element set_properties message_editing locales -value $current_locale
+    element set_properties message_editing original_message -value $message
 
 } else {
 
     # We are not processing a request, therefor it's a submission. Get the values
     # from the form and validate them
 
-    template::form get_values message_editing
+    form get_values message_editing
     if { $message == "" } {
 
-        template::element set_error message_editing message "Message is required"
+        element set_error message_editing message "Message is required"
         set sql_select_original_message {
             select message
             from   lang_messages
@@ -120,27 +120,28 @@
 
         db_1row select_original_message $sql_select_original_message
 
-        template::element set_properties message_editing original_message -value $message
+        element set_properties message_editing original_message -value $message
 
     }
 
 }
 
 
-if { [template::form is_valid message_editing] } {
+if { [form is_valid message_editing] } {
     # We get the values from the form
-    template::form get_values message_editing message_key
-    template::form get_values message_editing package_key
-    template::form get_values message_editing locales
-    template::form get_values message_editing message
+    form get_values message_editing message_key
+    form get_values message_editing package_key
+    form get_values message_editing locales
+    form get_values message_editing message
+    form get_values message_editing return_url
 
     # Register message via acs-lang
     lang::message::register $locales $package_key $message_key $message
 
     # Even if the country code is 2 chars, we avoid problems...
     set escaped_locale [ns_urlencode $locales]
 
-    template::forward $return_url
+    forward $return_url
     
     error $message
 
Index: openacs-4/packages/acs-lang/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-lang/www/admin/index.adp	7 Oct 2002 14:32:48 -0000	1.1
+++ openacs-4/packages/acs-lang/www/admin/index.adp	25 Oct 2002 15:12:15 -0000	1.2
@@ -1,5 +1,14 @@
-<master src="master">
+<master>
   <property name="title">Administration of Localized Messages</property>
+  <property name="header_stuff">
+    <style>
+      tr.oddrow { background: #EEEEEE;  }
+      td.tab_selected {
+          background: #333366;
+          color: #EEEEFF;
+      }     
+    </style>    
+  </property>
 
 <h2>@instance_name@</h2>
 
@@ -12,29 +21,48 @@
 <include src="locales-tabs" tab="@tab@" show_locales_p="@show_locales_p@">
 
 <if @tab@ eq "home">
+  <p>I want to ...</p>
+  <ul>
+    <p>
+      <li>
+        <a href=".?tab=locales">Edit locales</a>
+      </li>
+    </p>
+    <p>
+      <li>
+        <a href=".?tab=localized-messages">Edit Messages</a>
+      </li>
+    </p>
+    <p>
+      <li>
+        <a href="translator-mode-toggle">Toggle translator mode</a> (Currently 
+        <if @translator_mode_p@ true><font color="red"><b>ON</b></font></if>
+        <else>off</else>)
+        
+      </li>
+    </p>
+    <p>
+      <li>
+        <a href="load-catalog-files">Load all Catalog Files</a>. This
+        will overwrite any values in the database (the catalog files
+        take precedence).
+      </li>
+    </p>
 
- <!-- Start home tab -->
- <p>Maybe we should display something useful for the user here ... </p>
- <!-- End home tab -->
-
+    <p>
+      <li>
+        <a href="reload-cache">Reload the message cache</a>. 
+      </li>
+    </p>
+  </ul>
 </if>
 
 <if @tab@ eq "locales">
-
- <!-- Start locales tab -->
- <include src="locales" tab="@tab@">
- <!-- End locales tab -->
-
+  <include src="locales" tab="@tab@">
 </if>
 
 <if @tab@ eq "localized-messages">
-
- <!-- Start localized-messages tab -->
  <include src="localized-messages" tab="@tab@">
- <!-- End localized-messages tab -->
-
 </if>
 
 </div>
-
-<a href="load-catalog-files">Load all Catalog Files</a>. This will overwrite any values in the database (the catalog files take precedence).
Index: openacs-4/packages/acs-lang/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/www/admin/index.tcl	21 Oct 2002 11:39:14 -0000	1.2
+++ openacs-4/packages/acs-lang/www/admin/index.tcl	25 Oct 2002 15:12:15 -0000	1.3
@@ -8,13 +8,15 @@
     @creation-date 19 October 2001
     @cvs-id $Id$
 } {
-    {tab "locales"}
+    {tab "home"}
 }
 
 set locale_user [ad_locale user locale]
 set instance_name [ad_conn instance_name]
-set context_bar [ad_context_bar [ad_conn instance_name]]
+set context_bar [ad_context_bar]
 
+set translator_mode_p [lang::util::translator_mode_p]
+
 if { [ad_permission_p 0 admin] } {
     set show_locales_p "t"
 } else {
Index: openacs-4/packages/acs-lang/www/admin/locale-delete-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/Attic/locale-delete-confirm.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-lang/www/admin/locale-delete-confirm.adp	7 Oct 2002 14:32:48 -0000	1.1
+++ openacs-4/packages/acs-lang/www/admin/locale-delete-confirm.adp	25 Oct 2002 15:12:15 -0000	1.2
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Administration of Localized Messages</property>
 
 <h2>Delete locale</h2>
Index: openacs-4/packages/acs-lang/www/admin/locale-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/locale-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-lang/www/admin/locale-delete.adp	7 Oct 2002 14:32:48 -0000	1.1
+++ openacs-4/packages/acs-lang/www/admin/locale-delete.adp	25 Oct 2002 15:12:15 -0000	1.2
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Administration of Localized Messages</property>
 
 <h2>Delete locale</h2>
Index: openacs-4/packages/acs-lang/www/admin/locale-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/locale-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-lang/www/admin/locale-edit.adp	7 Oct 2002 14:32:48 -0000	1.1
+++ openacs-4/packages/acs-lang/www/admin/locale-edit.adp	25 Oct 2002 15:12:15 -0000	1.2
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Administration of Localized Messages</property>
 
 <h2>Edit locale</h2>
Index: openacs-4/packages/acs-lang/www/admin/locale-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/locale-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/www/admin/locale-edit.tcl	21 Oct 2002 11:39:14 -0000	1.2
+++ openacs-4/packages/acs-lang/www/admin/locale-edit.tcl	25 Oct 2002 15:12:15 -0000	1.3
@@ -23,7 +23,7 @@
 #  ns_setformencoding $encoding_charset
 #  ns_set put [ns_conn outputheaders] "content-type" "text/html; charset=$encoding_charset"
 
-set context_bar [ad_context_bar [list "index?tab=locales" "Locales"] "Editing Locale"]
+set context_bar [ad_context_bar "Editing Locale"]
 
 form create locale_editing
 
Index: openacs-4/packages/acs-lang/www/admin/locale-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/locale-new.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-lang/www/admin/locale-new.adp	7 Oct 2002 14:32:48 -0000	1.1
+++ openacs-4/packages/acs-lang/www/admin/locale-new.adp	25 Oct 2002 15:12:15 -0000	1.2
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Administration of Localized Messages</property>
 
 <h2>Create new locale</h2>
Index: openacs-4/packages/acs-lang/www/admin/locales-tabs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/Attic/locales-tabs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-lang/www/admin/locales-tabs.tcl	7 Oct 2002 14:32:48 -0000	1.1
+++ openacs-4/packages/acs-lang/www/admin/locales-tabs.tcl	25 Oct 2002 15:12:15 -0000	1.2
@@ -19,7 +19,7 @@
 
 if { $show_locales_p == "t" } {
 
-    set list_tabs [list { Locales locales } { Messages localized-messages } ]
+    set list_tabs [list { Home home } { Locales locales } { Messages localized-messages } ]
 
 } else {
 
Index: openacs-4/packages/acs-lang/www/admin/locales.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/Attic/locales.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-lang/www/admin/locales.adp	7 Oct 2002 14:32:48 -0000	1.1
+++ openacs-4/packages/acs-lang/www/admin/locales.adp	25 Oct 2002 15:12:15 -0000	1.2
@@ -26,4 +26,4 @@
   </td>
  </tr>
 </table>
-<p>(<a href="locale-new">New locale</a>)</p>
+<p>(<a href="locale-new">Create New Locale</a>)</p>
Index: openacs-4/packages/acs-lang/www/admin/localized-message-new-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/Attic/localized-message-new-2.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-lang/www/admin/localized-message-new-2.adp	7 Oct 2002 14:32:48 -0000	1.1
+++ openacs-4/packages/acs-lang/www/admin/localized-message-new-2.adp	25 Oct 2002 15:12:15 -0000	1.2
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Edit a message</property>
 
 <h2>New Localized Messages - Upload a file</h2>
Index: openacs-4/packages/acs-lang/www/admin/localized-message-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/localized-message-new.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/www/admin/localized-message-new.adp	21 Oct 2002 11:39:14 -0000	1.2
+++ openacs-4/packages/acs-lang/www/admin/localized-message-new.adp	25 Oct 2002 15:12:15 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
  <property name="title">Edit a message</property>
 
 <h2>New Localized Messages</h2>
Index: openacs-4/packages/acs-lang/www/admin/reload-cache.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/reload-cache.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/www/admin/reload-cache.tcl	25 Oct 2002 15:12:15 -0000	1.1
@@ -0,0 +1,11 @@
+ad_page_contract {
+    Load all catalog files.
+
+    @author Peter Marklund (peter@collaboraid.biz)
+    @creation-date 2002-10-07
+    @cvs-id $Id: reload-cache.tcl,v 1.1 2002/10/25 15:12:15 peterm Exp $
+}
+
+lang::message::cache
+
+ad_returnredirect "index"
Index: openacs-4/packages/acs-lang/www/admin/translator-mode-toggle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/translator-mode-toggle.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/www/admin/translator-mode-toggle.tcl	25 Oct 2002 15:12:15 -0000	1.1
@@ -0,0 +1,14 @@
+ad_page_contract {
+    Toggle translator mode on/off.
+    
+    @author Lars Pind (lars@collaboraid.biz)
+    @creation-date October 24, 2002
+    @cvs-id $Id: translator-mode-toggle.tcl,v 1.1 2002/10/25 15:12:15 peterm Exp $
+} {
+    {return_url "."}
+}
+
+lang::util::translator_mode_set [expr ![lang::util::translator_mode_p]]
+
+ad_returnredirect $return_url
+