Index: openacs-4/packages/news/www/item-create-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/Attic/item-create-oracle.xql,v
diff -u -r1.1 -r1.1.20.1
--- openacs-4/packages/news/www/item-create-oracle.xql	15 Oct 2001 13:41:03 -0000	1.1
+++ openacs-4/packages/news/www/item-create-oracle.xql	30 Jul 2008 12:38:50 -0000	1.1.20.1
@@ -3,11 +3,12 @@
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-<fullquery name="week">      
-      <querytext>
-      select sysdate + [ad_parameter ActiveDays "news" 14] from dual
-      </querytext>
-</fullquery>
+  <fullquery name="get_dates">      
+    <querytext>
+      select to_char(sysdate + [ad_parameter ActiveDays "news" 14], 'YYYY-MM-DD') as date_proj,
+             to_char(sysdate, 'YYYY-MM-DD') as date_today 
+      from dual
+    </querytext>
+  </fullquery>
 
- 
 </queryset>
Index: openacs-4/packages/news/www/item-create-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/Attic/item-create-postgresql.xql,v
diff -u -r1.2 -r1.2.14.1
--- openacs-4/packages/news/www/item-create-postgresql.xql	18 Aug 2003 10:40:55 -0000	1.2
+++ openacs-4/packages/news/www/item-create-postgresql.xql	30 Jul 2008 12:38:50 -0000	1.2.14.1
@@ -3,11 +3,12 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="week">      
-      <querytext>
-      select to_char(current_timestamp + interval '[ad_parameter ActiveDays "news" 14] days', 'YYYY-MM-DD')
-      </querytext>
-</fullquery>
+  <fullquery name="get_dates">      
+    <querytext>
+      select 
+        to_char(current_timestamp + interval '[ad_parameter ActiveDays "news" 14] days', 'YYYY-MM-DD') as date_proj,
+        to_char(current_timestamp, 'YYYY-MM-DD') as date_today
+    </querytext>
+  </fullquery>
 
- 
 </queryset>
Index: openacs-4/packages/news/www/item-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/item-create.adp,v
diff -u -r1.10.2.1 -r1.10.2.2
--- openacs-4/packages/news/www/item-create.adp	29 Jul 2008 17:22:17 -0000	1.10.2.1
+++ openacs-4/packages/news/www/item-create.adp	30 Jul 2008 12:38:50 -0000	1.10.2.2
@@ -5,50 +5,4 @@
 
 <h1>@title;noquote@</h1>
 
-<p>Use the following form to define your news item.Note that the fields marked with <span class="formRequired">*</span> are required.
-When you're done click 'Preview' to see how the news item will look and to choose an image for the article.</p>
-
-
-<form action=preview method=post enctype=multipart/form-data name=news>
-
-<p class="formLabel"><label for="publish_title">#news.Title#</label><span class="formRequired">*</span></p>
-<p class="formWidget"><input type=text size=63 maxlength=400 id="publish_title" name=publish_title value="@publish_title@"></p>
-
-<p class="formLabel"><label for="publish_lead">#news.Lead#</label></p>
-<p class="formWidget"><textarea id="publish_lead" name=publish_lead cols=50 rows=3>@publish_lead@</textarea></p>
-
-<p class="formLabel"><label for="publish_body">#news.Body#</label><span class="formRequired">*</span></p>
-<p class="formWidget"><textarea id="publish_body" name=publish_body cols=50 rows=20  wrap=soft>@publish_body@</textarea><br>
-<span class="advancedAdmin"><label for="text_file">#news.or_upload_text_file#</label><br></span>
-<p class="formWidget"><span class="advancedAdmin"><input type=file id="text_file" name=text_file size=40><br></span>
-#news.The_text_is_formatted_as# &nbsp;
-      <input type=radio name=html_p value="f" id="plain"<if @html_p@ false> checked</if>> <label for="plain">#news.Plain_text#</label>&nbsp;
-      <input type=radio name=html_p value="t" id="html"<if @html_p@ true> checked</if>> <label for="html">#news.HTML#</label>
-</p>
-
-<if @immediate_approve_p@ ne 0>
-<p class="formLabel"><label for="publish_date">#news.Release_Date#</label></p>
-<p class="formWidget">@publish_date_select;noquote@</p>
-
-<p class="formLabel"><label for="archive_date">#news.Archive_Date#</label></p>
-<p class="formWidget">@archive_date_select;noquote@<br>
-<input type=checkbox name=permanent_p value=t id="never" <if @permanent_p@ true> checked</if>> <b><label for="never">#news.never#</label></b> #news.show_it_permanently#</p>
-</p>
-</if>
-
-<p>
-   <input type=hidden name=action value="News Item">
-   <input type=submit value="#news.Preview#">	
-</p>
-</form>
-
-
-
-
-
-
-
-
-
-
-
+<formtemplate id="news"></formtemplate>
Index: openacs-4/packages/news/www/item-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/item-create.tcl,v
diff -u -r1.4 -r1.4.8.1
--- openacs-4/packages/news/www/item-create.tcl	24 Feb 2005 18:03:05 -0000	1.4
+++ openacs-4/packages/news/www/item-create.tcl	30 Jul 2008 12:38:50 -0000	1.4.8.1
@@ -41,18 +41,56 @@
 set title "[_ news.Create_News_Item]"
 set context [list $title]
 
-if { ![empty_string_p $archive_date_ansi] } {
-    set proj_archival_date $archive_date_ansi
-} else {
-    set proj_archival_date [db_string week "select sysdate + [ad_parameter ActiveDays news 14] from dual"]
-}
+set lc_format [lc_get formbuilder_date_format]
 
-set publish_date_select [dt_widget_datetime -default $publish_date_ansi publish_date days]
-set archive_date_select [dt_widget_datetime -default $proj_archival_date archive_date days]
+db_1row get_dates {}
 
-ad_return_template
+if { $publish_date_ansi eq "" || $publish_date_ansi eq "now"} {
+    set publish_date_ansi $date_today
+}
+if { $archive_date_ansi eq "" } {
+    set archive_date_ansi $date_proj
+}
 
+ad_form -name "news" -action "preview" -html {enctype "multipart/form-data"} -form {
+    {action:text(hidden)
+        {value "News Item"}}
+    {publish_title:text(text) 
+        {label "[_ news.Title]"}
+        {html {maxlength 400 size 61}}
+        {value $publish_title}}
+    {publish_lead:text(textarea),optional
+        {label "[_ news.Lead]"}
+        {html {cols 60 rows 3}}
+        {value $publish_lead}}
+    {publish_body:text(textarea),optional
+        {label "[_ news.Body]"}
+        {html {cols 60 rows 20}}
+        {value $publish_body}}
+    {text_file:text(file),optional
+        {label "[_ news.or_upload_text_file]"}}
+    {html_p:text(radio)
+        {label "[_ news.The_text_is_formatted_as]"}
+        {options {{"#news.Plain_text#" f} {"#news.HTML#" t}}}
+        {value $html_p}}
+}
 
+if { $immediate_approve_p } {
+    ad_form -extend -name "news" -form {
+        {publish_date:date,optional
+            {label "[_ news.Release_Date]"}
+            {value "[split $publish_date_ansi -]"}
+            {format {$lc_format}}
+        }
+        {archive_date:date,optional
+            {label "[_ news.Archive_Date]"}
+            {value "[split $archive_date_ansi -]"}
+            {format {$lc_format}}
+        }
+        {Permanent_p:text(checkbox)
+            {label "[_ news.never]"}
+            {options {{"#news.show_it_permanently#" t}}}}
+    }
+}
 
-
-
+ad_return_template
Index: openacs-4/packages/news/www/preview.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/preview.adp,v
diff -u -r1.10 -r1.10.2.1
--- openacs-4/packages/news/www/preview.adp	15 May 2007 20:14:50 -0000	1.10
+++ openacs-4/packages/news/www/preview.adp	30 Jul 2008 12:38:50 -0000	1.10.2.1
@@ -29,16 +29,18 @@
                      creator_link = @creator_link;noquote@>
 
 
-<p>
+<div>
     @form_action;noquote@
-    @hidden_vars;noquote@
-     <input type=submit value="#news.Confirm#">
-  </form>
+     <div>@hidden_vars;noquote@</div>
+     <div class="form-button"><input type=submit value="#news.Confirm#"></div>
+    </form>
 <if @action@ eq "News Item">
-  @edit_action;noquote@ @image_vars;noquote@
-  <input type="submit" value="Return to edit">
+  @edit_action;noquote@ 
+  <div>@image_vars;noquote@</div>
+  <div class="form-button"><input type="submit" value="Return to edit"></div>
+  </form>
 </if>
-</p>
+</div>
 
 
 
Index: openacs-4/packages/news/www/preview.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/preview.tcl,v
diff -u -r1.18 -r1.18.2.1
--- openacs-4/packages/news/www/preview.tcl	4 Mar 2008 13:08:38 -0000	1.18
+++ openacs-4/packages/news/www/preview.tcl	30 Jul 2008 12:38:50 -0000	1.18.2.1
@@ -171,10 +171,10 @@
     }
 
     if { ![template::util::date::validate $publish_date_ansi ""] } {
-	set publish_date_pretty [lc_time_fmt $publish_date_ansi "%x"]
+        set publish_date_pretty [lc_time_fmt $publish_date_ansi "%Q"]
     }
     if { ![template::util::date::validate $archive_date_ansi ""] } {
-	set archive_date_pretty [lc_time_fmt $archive_date_ansi "%x"]
+        set archive_date_pretty [lc_time_fmt $archive_date_ansi "%Q"]
     }
 
     if { [dt_interval_check $archive_date_ansi $publish_date_ansi] >= 0 } {
@@ -212,8 +212,8 @@
     set image_vars [export_form_vars publish_title publish_lead publish_body \
                         publish_date_ansi archive_date_ansi html_p \
                         permanent_p action]
-    set form_action "<form method=post action=item-create-3 enctype=multipart/form-data>"
-    set edit_action "<form method=post action=item-create>"
+    set form_action "<form method=post action=item-create-3 enctype=multipart/form-data class=\"inline-form\">"
+    set edit_action "<form method=post action=item-create class=\"inline-form\">"
 
 } else {
 
@@ -223,8 +223,8 @@
     set image_vars [export_form_vars publish_title publish_lead publish_body \
                         publish_date_ansi archive_date_ansi html_p \
                         permanent_p action item_id revision_log]
-    set form_action "<form method=post action=admin/revision-add-3>"
-    set edit_action "<form method=post action=admin/revision-add>"
+    set form_action "<form method=post action=admin/revision-add-3 class=\"inline-form\">"
+    set edit_action "<form method=post action=admin/revision-add class=\"inline-form\">"
 }
 
 # creator link