diff --git a/clowder_server/static/js/dashboard-react.js b/clowder_server/static/js/dashboard-react.js index 1e97292..da54599 100644 --- a/clowder_server/static/js/dashboard-react.js +++ b/clowder_server/static/js/dashboard-react.js @@ -56,11 +56,23 @@ var ListItem = React.createClass({ console.log(this.state.collapsed); }, - render: function() { + dateToString: function (itemDate) { + var options = { + year: 'numeric', month: 'long', day: 'numeric', + hour: '2-digit', minute: '2-digit', + hour12: false, timeZoneName: 'short' + }, + dateAsString = new Date(itemDate).toLocaleString('en-US', options); + + return dateAsString; + }, + + render: function() { var listClass = 'service-item list-group-item service', item = this.props.item, - statusText; + statusText, + dateString = this.dateToString(item.date); if (item.passing) { listClass += ' service-passing list-group-item-success'; @@ -80,7 +92,7 @@ var ListItem = React.createClass({ {statusText}
- {item.date} + {dateString}
+ diff --git a/clowder_server/templates/dashboard.html b/clowder_server/templates/dashboard.html index 8efb342..a089d2f 100644 --- a/clowder_server/templates/dashboard.html +++ b/clowder_server/templates/dashboard.html @@ -2,7 +2,7 @@ {% load staticfiles %} {% block header %} - + @@ -22,7 +22,7 @@ { 'name': '{{ping_name.grouper}}', 'passing': {{last.is_passing|lower}}, - 'date': '{{last.create|date:"DATETIME_FORMAT"}}', + 'date': '{{last.create|date:"c"}}', 'alert': '{{last.get_closest_alert.notify_at|date:"DATETIME_FORMAT"|default:'n/a'}}', 'table': [ ['Time', 'Actual Value'],