diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2015-07-23 12:03:29 -0500 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2015-07-23 12:03:29 -0500 |
commit | c11fcd8110e537db70bf40b91ed14467184b0e1c (patch) | |
tree | e2a39e6d2d7b5841cf71c21b07cd0cffb1fe21da /src/lib/Bcfg2/Reporting/templates/clients | |
parent | 49ab865657f03795139e95490b1978fcceca2f41 (diff) | |
parent | 9d5524f345279a6fb6042ea5acd519549cabe5b7 (diff) | |
download | bcfg2-c11fcd8110e537db70bf40b91ed14467184b0e1c.tar.gz bcfg2-c11fcd8110e537db70bf40b91ed14467184b0e1c.tar.bz2 bcfg2-c11fcd8110e537db70bf40b91ed14467184b0e1c.zip |
Merge branch 'fix-date-format' of https://github.com/AlexanderS/bcfg2
Diffstat (limited to 'src/lib/Bcfg2/Reporting/templates/clients')
-rw-r--r-- | src/lib/Bcfg2/Reporting/templates/clients/detail.html | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Reporting/templates/clients/detailed-list.html | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Reporting/templates/clients/detail.html b/src/lib/Bcfg2/Reporting/templates/clients/detail.html index 6732bb8c9..6809dcc2d 100644 --- a/src/lib/Bcfg2/Reporting/templates/clients/detail.html +++ b/src/lib/Bcfg2/Reporting/templates/clients/detail.html @@ -39,7 +39,7 @@ span.history_links a { <select id="quick" name="quick" onchange="javascript:pageJump('quick');"> <option value="" selected="selected">--- Time ---</option> {% for i in client.interactions.all|slice:":25" %} - <option value="{% url "reports_client_detail_pk" hostname=client.name pk=i.id %}">{{i.timestamp|date:"c"}}</option> + <option value="{% url "reports_client_detail_pk" hostname=client.name pk=i.id %}">{{i.timestamp|date:"DATETIME_FORMAT"}}</option> {% endfor %} </select></span> </div> diff --git a/src/lib/Bcfg2/Reporting/templates/clients/detailed-list.html b/src/lib/Bcfg2/Reporting/templates/clients/detailed-list.html index 6a314bd88..cf778504a 100644 --- a/src/lib/Bcfg2/Reporting/templates/clients/detailed-list.html +++ b/src/lib/Bcfg2/Reporting/templates/clients/detailed-list.html @@ -32,7 +32,9 @@ This is needed for Django versions less than 1.5 <td class='right_column_narrow'>{{ entry.bad_count }}</td> <td class='right_column_narrow'>{{ entry.modified_count }}</td> <td class='right_column_narrow'>{{ entry.extra_count }}</td> - <td class='right_column'><span {% if entry.isstale %}class='dirty-lineitem'{% endif %}>{{ entry.timestamp|date:"Y-m-d\&\n\b\s\p\;H:i"|safe }}</span></td> + <td class='right_column'><span {% if entry.isstale %}class='dirty-lineitem'{% endif %} style="white-space: nowrap;"> + {{ entry.timestamp|date:"SHORT_DATETIME_FORMAT"|safe }} + </span></td> <td class='right_column_wide'> {% if entry.server %} <a href='{% add_url_filter server=entry.server %}'>{{ entry.server }}</a> |