CatalogueRevamping
/
harvester-d4science
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #142 from metaodi/138-timezone-display 

[WIP] [#138] Add data attributes to support timezone conversion
This commit is contained in:
David Read 2015-07-09 22:03:18 +01:00
parent ce0aedd5b9 83dd0b4b68
commit 5801f3e083
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ckanext/harvest/templates_new/snippets/job_details.html
View File

@ -50,15 +50,27 @@ Example:
</tr> </tr>
<tr> <tr>
<th>{{ _('Created') }}</th> <th>{{ _('Created') }}</th>
<td>{{ h.render_datetime(job.created, with_hours=True) }}</td> <td>
<span class="datetime" data-datetime="{{ h.render_datetime(job.created, date_format='%Y-%m-%dT%H:%M:%S%z') }}">
{{ h.render_datetime(job.created, with_hours=True) }}
</span>
</td>
</tr> </tr>
<tr> <tr>
<th>{{ _('Started') }}</th> <th>{{ _('Started') }}</th>
<td>{{ h.render_datetime(job.gather_started, with_hours=True) }}</td> <td>
<span class="datetime" data-datetime="{{ h.render_datetime(job.gather_started, date_format='%Y-%m-%dT%H:%M:%S%z') }}">
{{ h.render_datetime(job.gather_started, with_hours=True) }}
</span>
</td>
</tr> </tr>
<tr> <tr>
<th>{{ _('Finished') }}</th> <th>{{ _('Finished') }}</th>
<td>{{ h.render_datetime(job.finished, with_hours=True) }}</td> <td>
<span class="datetime" data-datetime="{{ h.render_datetime(job.finished, date_format='%Y-%m-%dT%H:%M:%S%z') }}">
{{ h.render_datetime(job.finished, with_hours=True) }}
</span>
</td>
</tr> </tr>
<tr> <tr>
<th>{{ _('Status') }}</th> <th>{{ _('Status') }}</th>

10
ckanext/harvest/templates_new/source/job/list.html
View File

@ -25,9 +25,15 @@
{% endif %} {% endif %}
</h3> </h3>
<p> <p>
{{ _('Started:') }} {{ h.render_datetime(job.gather_started, with_hours=True) or _('Not yet') }} {{ _('Started:') }}
<span class="datetime" data-datetime="{{ h.render_datetime(job.gather_started, date_format='%Y-%m-%dT%H:%M:%S%z') }}">
{{ h.render_datetime(job.gather_started, with_hours=True) or _('Not yet') }}
</span>
&mdash; &mdash;
{{ _('Finished:') }} {{ h.render_datetime(job.finished, with_hours=True) or _('Not yet') }} {{ _('Finished:') }}
<span class="datetime" data-datetime="{{ h.render_datetime(job.finished, date_format='%Y-%m-%dT%H:%M:%S%z') }}">
{{ h.render_datetime(job.finished, with_hours=True) or _('Not yet') }}
</span>
</p> </p>
</div> </div>
{% if job.status == 'Finished' %} {% if job.status == 'Finished' %}