[Koha-cvs] koha bull/subscription-add.pl koha-tmpl/intrane... [rel_2_2]

[Robert Lyon]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	Robert Lyon <bob_lyon>	06/11/27 00:27:43

Modified files:
	bull           : subscription-add.pl 
	koha-tmpl/intranet-tmpl/npl/en/bull: subscription-add.tmpl 

Log message:
	Added in ability for the calendar popup to work for the preferenced date format

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/bull/subscription-add.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.5.2.5&r2=1.5.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.7&r2=1.2.2.8

Patches:
Index: bull/subscription-add.pl
===================================================================
RCS file: /sources/koha/koha/bull/Attic/subscription-add.pl,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -u -b -r1.5.2.5 -r1.5.2.6
--- bull/subscription-add.pl	24 Nov 2006 00:23:22 -0000	1.5.2.5
+++ bull/subscription-add.pl	27 Nov 2006 00:27:43 -0000	1.5.2.6
@@ -277,9 +277,19 @@
            }
            push( @sub_type_data, \%row );
         }    
+        my $dateformat;
+        my $dateformatcode = C4::Context->preference('dateformat');
+        if($dateformatcode eq 'US' || $dateformatcode eq 'us'){
+            $dateformat = '%m/%d/%Y';
+        } elsif ($dateformatcode eq 'ISO' || $dateformatcode eq 'iso'){
+            $dateformat = '%Y/%m/%d';
+        } else {
+            $dateformat = '%d/%m/%Y';
+        }
     $template->param(subtype => \@sub_type_data,
  	         weekarrayjs => $weekarrayjs,
 	         weekno => $weekno,
+                    dateformat => $dateformat,
 	);
 	output_html_with_http_headers $query, $cookie, $template->output;
 }

Index: koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/Attic/subscription-add.tmpl,v
retrieving revision 1.2.2.7
retrieving revision 1.2.2.8
diff -u -b -r1.2.2.7 -r1.2.2.8
--- koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl	26 Nov 2006 22:56:23 -0000	1.2.2.7
+++ koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl	27 Nov 2006 00:27:43 -0000	1.2.2.8
@@ -743,7 +743,7 @@
                                         <script type="text/javascript">
                                             Calendar.setup({
                                                 inputField:"acqui_date",
-                                                ifFormat       :   "%d/%m/%Y",
+                                                ifFormat       :   "<!-- TMPL_VAR NAME="dateformat" -->",
                                                 button         :   "button2",
                                                 align          :   "Tl"
                                             });
@@ -751,7 +751,7 @@
                                         <script type="text/javascript">
                                             Calendar.setup({
                                                 inputField     :   "acqui_date",
-                                                ifFormat       :   "%d/%m/%Y",
+                                                ifFormat       :   "<!-- TMPL_VAR NAME="dateformat" -->",
                                                 button         :   "acqui_date",
                                                 align          :   "Tl"
                                             });
@@ -875,7 +875,7 @@
                                         <script type="text/javascript">
                                             Calendar.setup({
                                                 inputField   : "beginning_date",
-                                                ifFormat     : "%d/%m/%Y",
+                                                ifFormat     : "<!-- TMPL_VAR NAME="dateformat" -->",
                                                 button       : "button1",
                                                 align        : "Tl"
                                             });
@@ -883,7 +883,7 @@
                                         <script type="text/javascript">
                                             Calendar.setup({
                                                 inputField   : "beginning_date",
-                                                ifFormat     : "%d/%m/%Y",
+                                                ifFormat     : "<!-- TMPL_VAR NAME="dateformat" -->",
                                                 button       : "beginning_date",
                                                 align        : "Tl"
                                             });