Index: openacs-4/packages/dotlrn/www/admin/term-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term-edit.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/admin/term-edit.tcl	23 Oct 2002 12:38:40 -0000	1.5
+++ openacs-4/packages/dotlrn/www/admin/term-edit.tcl	29 May 2003 18:05:01 -0000	1.6
@@ -15,75 +15,48 @@
 #
 
 ad_page_contract {
+
     edit a term
 
     @author yon (yon@openforce.net)
+    @author Don Baccus (dhogaza@pacifier.com)
+
     @creation-date 2002-03-14
     @version $Id$
+
 } -query {
     term_id:integer,notnull
-    {referer "terms"}
+    term_pretty_name:notnull
 } -properties {
     context_bar:onevalue
 }
 
-if {![db_0or1row select_term_info {}]} {
-    ad_return_complaint 1 "<li>[_ dotlrn.Invalid] term_id $term_id</li>"
-    ad_script_abort
-}
-
-set referer "term?[ns_conn query]"
+set referer "term?[export_vars {term_id}]"
 set context_bar [list [list terms [_ dotlrn.Terms]] [list $referer "$term_name $term_year"] [_ dotlrn.Edit]]
 
-form create edit_term
+ad_form -name edit_term -export term_pretty_name -select_query_name select_term_info -form {
 
-element create edit_term term_id \
-    -label "[_ dotlrn.Term_ID]" \
-    -datatype integer \
-    -widget hidden \
-    -value $term_id
+    term_id:key
 
-element create edit_term term_name \
-    -label "[_ dotlrn.Term_eg_Spring_Fall]" \
-    -datatype text \
-    -widget text \
-    -html {size 30}
+    {term_name:text               {label "Term (e.g. Spring, Fall)"}
+                                  {html {size 30}}}
 
-element create edit_term term_year \
-    -label "[_ dotlrn.lt_Year_eg_2003_20032004]" \
-    -datatype text \
-    -widget text \
-    -html {size 9 maxlength 9}
+    {term_year:text               {label "Year (e.g. 2003, 2003/2004)"}
+                                  {html {size 9 maxlength 9}}}
 
-element create edit_term start_date \
-    -label "[_ dotlrn.Start_Date]" \
-    -datatype date \
-    -widget date \
-    -format {MONTH DD YYYY}
+    {start_date:date              {label "Start Date"}
+                                  {format {MONTH DD YYYY}}}
 
-element create edit_term end_date \
-    -label "[_ dotlrn.End_Date]" \
-    -datatype date \
-    -widget date \
-    -format {MONTH DD YYYY}
+    {end_date:date                {label "End Date"}
+                                  {format {MONTH DD YYYY}}}
 
-element create edit_term referer \
-    -label "[_ dotlrn.Referer]" \
-    -datatype text \
-    -widget hidden \
-    -value $referer
+} -validate {
+    {start_date
+        { [template::util::date::compare $start_date $end_date] <= 0 }
+        "The term must start before it ends"
+    }
+} -edit_data {
 
-if {[form is_request edit_term]} {
-    element set_properties edit_term term_name -value $term_name
-    element set_properties edit_term term_year -value $term_year
-    element set_properties edit_term start_date -value $start_date
-    element set_properties edit_term end_date -value $end_date
-}
-
-if {[form is_valid edit_term]} {
-    form get_values edit_term \
-        term_id term_name term_year start_date end_date referer
-
     dotlrn_term::edit \
         -term_id $term_id \
         -term_name $term_name \