projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rt 4.2.13 ticket#13852
[freeside.git]
/
rt
/
share
/
html
/
Elements
/
SelectTimezone
diff --git
a/rt/share/html/Elements/SelectTimezone
b/rt/share/html/Elements/SelectTimezone
index
5ff603e
..
2520c0c
100644
(file)
--- a/
rt/share/html/Elements/SelectTimezone
+++ b/
rt/share/html/Elements/SelectTimezone
@@
-2,7
+2,7
@@
%#
%# COPYRIGHT:
%#
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-201
1
Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-201
6
Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
@@
-46,26
+46,18
@@
%#
%# END BPS TAGGED BLOCK }}}
<%ONCE>
%#
%# END BPS TAGGED BLOCK }}}
<%ONCE>
-my $HAS_DATETIME_TZ = eval { require DateTime::TimeZone };
-my $HAS_DATETIME = eval { require DateTime };
+use DateTime;
-my (@names, %label);
-if ( $HAS_DATETIME_TZ ) {
- @names = DateTime::TimeZone->all_names;
-}
+my @names = DateTime::TimeZone->all_names;
-if ( $HAS_DATETIME ) {
- my $dt = DateTime->now;
- for ( @names ) {
- $dt->set_time_zone( $_ );
- $label{$_} = $_ . ' ' . $dt->strftime('%z');
- }
+my %label;
+my $dt = DateTime->now;
+for ( @names ) {
+ $dt->set_time_zone( $_ );
+ $label{$_} = $_ . ' ' . $dt->strftime('%z');
}
</%ONCE>
}
</%ONCE>
-% unless ( $HAS_DATETIME_TZ && @names ) {
-<input type="text" name="<% $Name %>" value="<% $Default %>" />
-% } else {
<select name="<% $Name %>">
% if ( $ShowNullOption ) {
<option value=""><&|/l&>System Default</&></option>
<select name="<% $Name %>">
% if ( $ShowNullOption ) {
<option value=""><&|/l&>System Default</&></option>
@@
-75,7
+67,6
@@
if ( $HAS_DATETIME ) {
|n %> ><% $label{$tz} || $tz %></option>
% }
</select>
|n %> ><% $label{$tz} || $tz %></option>
% }
</select>
-% }
<%ARGS>
$ShowNullOption => 1
$Name => undef
<%ARGS>
$ShowNullOption => 1
$Name => undef