Index: openacs-4/packages/categories/www/cadmin/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/master.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/www/cadmin/master.adp	14 Dec 2003 15:36:58 -0000	1.2
+++ openacs-4/packages/categories/www/cadmin/master.adp	11 Feb 2004 09:00:40 -0000	1.3
@@ -3,17 +3,17 @@
 <property name="context">@context_bar;noquote@</property>
 <if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
 
-<if @change_locale@ eq t and @languages:rowcount@ gt 1>
+<if @change_locale@ eq t and @languages@ not nil>
   <div style="float: right;">
-    <form action="@current_page@">
-      @form_vars;noquote@
-      <select name=locale>
-        <multiple name=languages>
-          <option value="@languages.locale@"<if @locale@ eq @languages.locale@> selected</if>>@languages.label@
-        </multiple>
-      </select>
-      <input type=submit name=xx value="Change">
-    </form>
+    <formtemplate id="locale_form">
+      <table cellspacing="2" cellpadding="2" border="0">
+        <tr class="form-element"><td class="form-label">Language</td>
+        <td class="form-widget"><formwidget id="locale"></td></tr>
+        @form_vars;noquote@
+        <tr class="form-element">
+        <td align="left" colspan="2"><formwidget id="formbutton:ok"></td></tr>
+      </table>
+    </formtemplate>
   </div>
 </if>
 
Index: openacs-4/packages/categories/www/cadmin/master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/master.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/categories/www/cadmin/master.tcl	1 Feb 2004 19:12:51 -0000	1.4
+++ openacs-4/packages/categories/www/cadmin/master.tcl	11 Feb 2004 09:00:40 -0000	1.5
@@ -2,27 +2,19 @@
 # author: Timo Hentschel (timo@timohentschel.de)
 #
 
-# There seems to be no way to elegantly set default values here
-if { ![info exists path_id] } {
-    set path_id ""
-}
-
-if { ![info exists context_bar] } {
-    set context_bar ""
-}
-
 if { ![info exists change_locale] } {
     set change_locale t
 }
 
 if {![exists_and_not_null locale]} {
     set locale [ad_parameter DefaultLocale acs-lang "en_US"]
+    set locale [ad_conn locale]
 }
 
-# TODO: Refactor to use lang::system::get_locale_options and ad_form
-# so we don't hit the DB on every request
+set languages [lang::system::get_locale_options]
 
-db_multirow languages get_locales ""
+ad_form -name locale_form -action [ad_conn url] -export { tree_id category_id } -form {
+    {locale:text(select) {label "Language"} {value $locale} {options $languages}}
+}
 
-set current_page [ad_conn url]
-set form_vars [export_ns_set_vars form [list locale xx] [ad_conn form]]
+set form_vars [export_ns_set_vars form {locale form:mode form:id __confirmed_p __refreshing_p formbutton:ok} [ad_conn form]]
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/categories/www/cadmin/master.xql'.
Fisheye: No comparison available.  Pass `N' to diff?