srchub

srchub Commit Details


Date:2015-09-06 14:42:10 (9 years 6 months ago)
Author:Natalie Adams
Branch:master
Commit:8b486e74eac359bb630eb0f326abdd15ea3a5978
Parents: 420d4fdd26d65406db5520c94cbb67fd87a9fbff
Message:Issue 76: Time on issues should show time as well as date
Changes:

File differences

indefero/src/IDF/Form/UserAccount.php
187187
188188
189189
190
191
192
193
194
195
196
190197
191198
192199
                                                'size' => 32,␊
                                            ),␊
                                        ));␊
␊
        $this->fields['timezone'] = new Pluf_Form_Field_TimeZone(␊
            array('required' => false,␊
                'label' => __('Change Timezone'),␊
                'initial' => $this->user->timezone,␊
                'help_text' => __('This will change the way some of the date and times are displayed on the site.'),␊
            ));␊
    }␊
␊
␊
indefero/src/IDF/templates/idf/issues/view.html
2222
2323
2424
25
25
2626
2727
2828
2929
30
30
3131
3232
3333
<img style="float:right; position: relative; max-height: 60px; max-width: 60px;" src="http://www.gravatar.com/avatar/{$submitter.email|md5}.jpg?s=60&amp;d={media}/idf/img/spacer.gif" alt=" " />␊
{/if}␊
{if $i == 0}␊
<p>{blocktrans}Reported by {$submitter}, {$c.creation_dtime|date}{/blocktrans}</p>␊
<p>{blocktrans}Reported by {$submitter}, {/blocktrans}<span title="{$c.creation_dtime} GMT">{$request.user.convertToUserTimezone($c.creation_dtime)}</span></p>␊
{else}␊
{aurl 'url', 'IDF_Views_Issue::view', array($project.shortname, $issue.id)}␊
{assign $id = $c.id}␊
{assign $url = $url~'#ic'~$c.id}␊
<p>{blocktrans}Comment <a href="{$url}">{$i}</a> by {$submitter}, {$c.creation_dtime|date}{/blocktrans}</p>␊
<p>{blocktrans}Comment <a href="{$url}">{$i}</a> by {$submitter}, {/blocktrans}<span title="{$c.creation_dtime} GMT">{$request.user.convertToUserTimezone($c.creation_dtime)}</span></p>␊
{/if}␊
␊
␊
indefero/src/IDF/templates/idf/user/myaccount.html
3535
3636
3737
38
39
40
41
42
43
44
3845
3946
4047
</td>␊
</tr>␊
<tr>␊
    <th><strong>{$form.f.timezone.labelTag}:</strong></th>␊
    <td>{if $form.f.timezone.errors}{$form.f.timezone.fieldErrors}{/if}␊
        {$form.f.timezone|unsafe}<br />␊
        <span class="helptext">{$form.f.timezone.help_text}</span>␊
    </td>␊
</tr>␊
<tr>␊
<th>{$form.f.language.labelTag}:</th>␊
<td>{if $form.f.language.errors}{$form.f.language.fieldErrors}{/if}␊
{$form.f.language|unsafe}␊
pluf/src/Pluf/Form/Field/TimeZone.php
1
2
3
4
5
6
7
8
<?php␊
␊
class Pluf_Form_Field_TimeZone extends Pluf_Form_Field␊
{␊
    public $widget = 'Pluf_Form_Widget_TimeZoneInput';␊
␊
␊
}␊
pluf/src/Pluf/Form/Widget/TimeZoneInput.php
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
<?php␊
␊
class Pluf_Form_Widget_TimeZoneInput extends Pluf_Form_Widget_Input␊
{␊
    public $input_type = 'text';␊
    public $initial = "";␊
␊
    public function __construct($attrs = []) {␊
        parent::__construct($attrs);␊
    }␊
␊
    public function render($name, $value, $extra_attrs=array()) {␊
        return Pluf_Template::markSafe($this->getHTML($name, $value));␊
    }␊
␊
    public function getHTML($name, $value) {␊
        // Based off snippet here: http://stackoverflow.com/a/17355238/195722␊
        static $regions = array(␊
            DateTimeZone::AFRICA,␊
            DateTimeZone::AMERICA,␊
            DateTimeZone::ANTARCTICA,␊
            DateTimeZone::ASIA,␊
            DateTimeZone::ATLANTIC,␊
            DateTimeZone::AUSTRALIA,␊
            DateTimeZone::EUROPE,␊
            DateTimeZone::INDIAN,␊
            DateTimeZone::PACIFIC,␊
        );␊
␊
        $timezones = array();␊
        foreach( $regions as $region )␊
        {␊
            $timezones = array_merge( $timezones, DateTimeZone::listIdentifiers( $region ) );␊
        }␊
␊
        $timezone_offsets = array();␊
        foreach( $timezones as $timezone )␊
        {␊
            $tz = new DateTimeZone($timezone);␊
            $timezone_offsets[$timezone] = $tz->getOffset(new DateTime);␊
        }␊
␊
        // sort timezone by timezone name␊
        ksort($timezone_offsets);␊
␊
        $timezone_list = array();␊
        foreach( $timezone_offsets as $timezone => $offset )␊
        {␊
            $offset_prefix = $offset < 0 ? '-' : '+';␊
            $offset_formatted = gmdate( 'H:i', abs($offset) );␊
␊
            $pretty_offset = "UTC${offset_prefix}${offset_formatted}";␊
␊
            $t = new DateTimeZone($timezone);␊
            $c = new DateTime(null, $t);␊
            $current_time = $c->format('g:i A');␊
␊
            $timezone_list[$timezone] = "(${pretty_offset}) $timezone - $current_time";␊
        }␊
␊
        $listArray = [];␊
        foreach($timezone_list as $key => $val) {␊
            if ($key == $value) {␊
                $listArray[] = "<option selected=\"selected\" value=\"$key\">$val</option>";␊
            } else {␊
                $listArray[] = "<option value=\"$key\">$val</option>";␊
            }␊
        }␊
␊
        return "<select name=\"$name\">" . implode("\n", $listArray) . "</select>";␊
    }␊
}
pluf/src/Pluf/User.php
233233
234234
235235
236
237
238
239
240
241
236242
237243
238244
        }␊
    }␊
␊
    public function convertToUserTimezone($date) {␊
        $currentDateTime = new \DateTime(date('Y-m-d H:i:s', strtotime($date.' GMT')));␊
        $currentDateTime->setTimezone(new \DateTimeZone($this->timezone));␊
        return $currentDateTime->format("M, j Y g:i:s A");␊
    }␊
␊
    /**␊
     * Set the password of a user.␊
     *␊

Archive Download the corresponding diff file

Branches

Number of commits:
Page rendered in 0.12303s using 20 queries.