[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[33131] trunk

[<li...@us...>]

Revision: 33131
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=33131&view=rev
Author:   lindonb
Date:     2011-02-27 07:29:24 +0000 (Sun, 27 Feb 2011)

Log Message:
-----------
[ENH] Implement 12-hour clock for view tracker item field edit window time selector for date and time field

Modified Paths:
--------------
    trunk/lib/trackers/trackerlib.php
    trunk/templates/tracker_item_field_input.tpl
    trunk/tiki-view_tracker.php

Modified: trunk/lib/trackers/trackerlib.php
===================================================================
--- trunk/lib/trackers/trackerlib.php	2011-02-27 07:04:16 UTC (rev 33130)
+++ trunk/lib/trackers/trackerlib.php	2011-02-27 07:29:24 UTC (rev 33131)
@@ -4409,6 +4409,10 @@
 			} else {
 				//if (isset($input[$ins_id.'Meridian']) && $input[$ins_id.'Meridian'] == 'pm') $input[$ins_id.'Hour'] += 12;
 				$now = $tikilib->now;
+				//Convert 12-hour clock hours to 24-hour scale to compute time
+				if (isset($input[$ins_id.'Meridian'])) {
+					$input[$ins_id.'Hour'] = date('H', strtotime($input[$ins_id.'Hour'] . ':00 ' . $input[$ins_id.'Meridian']));
+				}
 				$value = $tikilib->make_time($input[$ins_id.'Hour'], $input[$ins_id.'Minute'], 0, $tikilib->date_format("%m", $now), $tikilib->date_format("%d", $now), $tikilib->date_format("%Y", $now));
 			}
 		} else {
@@ -4416,6 +4420,10 @@
 				$value = '';
 			} else {
 				//if (isset($input[$ins_id.'Meridian']) && $input[$ins_id.'Meridian'] == 'pm') $input[$ins_id.'Hour'] += 12;
+				//Convert 12-hour clock hours to 24-hour scale to compute time
+				if (isset($input[$ins_id.'Meridian'])) {
+					$input[$ins_id.'Hour'] = date('H', strtotime($input[$ins_id.'Hour'] . ':00 ' . $input[$ins_id.'Meridian']));
+				}
 				$value = $tikilib->make_time($input[$ins_id.'Hour'], $input[$ins_id.'Minute'], 0, $input[$ins_id.'Month'], $input[$ins_id.'Day'], $input[$ins_id.'Year']);
 			}
 		}

Modified: trunk/templates/tracker_item_field_input.tpl
===================================================================
--- trunk/templates/tracker_item_field_input.tpl	2011-02-27 07:04:16 UTC (rev 33130)
+++ trunk/templates/tracker_item_field_input.tpl	2011-02-27 07:29:24 UTC (rev 33131)
@@ -340,9 +340,9 @@
 	{/if}
 	{if $field_value.options_array[0] ne 'd'}
 		{if $field_value.isMandatory ne 'y' and (isset($field_value.options_array[3]) and ($field_value.options_array[3] eq 'blank' or $field_value.options_array[3] eq 'empty'))or (isset($inExportForm) and $inExportForm eq 'y')}
-			{html_select_time prefix=$field_value.ins_id time=$time display_seconds=false all_empty=" "}
+			{html_select_time prefix=$field_value.ins_id time=$time display_seconds=false all_empty=" " use_24_hours=$use_24hr_clock}
 		{else}
-			{html_select_time prefix=$field_value.ins_id time=$time display_seconds=false}
+			{html_select_time prefix=$field_value.ins_id time=$time display_seconds=false use_24_hours=$use_24hr_clock}
 		{/if}
 	{/if}
 

Modified: trunk/tiki-view_tracker.php
===================================================================
--- trunk/tiki-view_tracker.php	2011-02-27 07:04:16 UTC (rev 33130)
+++ trunk/tiki-view_tracker.php	2011-02-27 07:29:24 UTC (rev 33131)
@@ -778,6 +778,9 @@
 	$validationjs = $validatorslib->generateTrackerValidateJS( $fields['data'] );
 	$smarty->assign('validationjs', $validationjs);
 }
+//Use 12- or 24-hour clock for $publishDate time selector based on admin and user preferences
+include_once ('lib/userprefs/userprefslib.php');
+$smarty->assign('use_24hr_clock', $userprefslib->get_user_clock_pref($user));
 
 // Display the template
 $smarty->assign('mid', 'tiki-view_tracker.tpl');


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.