You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2013/07/19 01:45:32 UTC

[33/39] git commit: Replaced American "mesoDate" with ISO "isoDate" in the WebUI.

Replaced American "mesoDate" with ISO "isoDate" in the WebUI.

The ISO format requires no localization and is more easily used for
searching logs.

Original review: https://reviews.apache.org/r/12608/

From: Ross Allen <ro...@mesosphe.re>
Review: https://reviews.apache.org/r/12734


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/7349da94
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/7349da94
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/7349da94

Branch: refs/heads/master
Commit: 7349da946776ef194639679d9ecc24d668695c43
Parents: 5852eb9
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Thu Jul 18 16:20:53 2013 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Thu Jul 18 16:20:53 2013 -0700

----------------------------------------------------------------------
 src/webui/master/static/framework.html  |  8 ++++----
 src/webui/master/static/frameworks.html |  8 ++++----
 src/webui/master/static/home.html       | 24 ++++++++++++------------
 src/webui/master/static/js/app.js       |  6 +++---
 src/webui/master/static/slave.html      |  8 ++++----
 src/webui/master/static/slaves.html     |  4 ++--
 6 files changed, 29 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/7349da94/src/webui/master/static/framework.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/framework.html b/src/webui/master/static/framework.html
index a0d5fe4..a192791 100644
--- a/src/webui/master/static/framework.html
+++ b/src/webui/master/static/framework.html
@@ -24,11 +24,11 @@
         <dd>{{framework.user}}</dd>
         <dt>Registered:</dt>
         <dd>
-          <abbr title="{{framework.registered_time * 1000 | mesosDate}}">
+          <abbr title="{{framework.registered_time * 1000 | isoDate}}">
             {{framework.registered_time * 1000 | relativeDate}}</abbr>
           <button class="btn btn-mini"
               clipboard
-              data-clipboard-text="{{framework.registered_time * 1000 | mesosDate}}"
+              data-clipboard-text="{{framework.registered_time * 1000 | isoDate}}"
               tooltip="Copy timestamp"
               tooltip-placement="right"
               tooltip-trigger="clipboardhover">
@@ -37,11 +37,11 @@
         <dt>Re-registered:</dt>
         <dd ng-show="!framework.reregistered_time">-</dd>
         <dd ng-show="framework.reregistered_time">
-          <abbr title="{{framework.reregistered_time * 1000 | mesosDate}}">
+          <abbr title="{{framework.reregistered_time * 1000 | isoDate}}">
             {{framework.reregistered_time * 1000 | relativeDate}}</abbr>
           <button class="btn btn-mini"
               clipboard
-              data-clipboard-text="{{framework.reregistered_time * 1000 | mesosDate}}"
+              data-clipboard-text="{{framework.reregistered_time * 1000 | isoDate}}"
               tooltip="Copy timestamp"
               tooltip-placement="right"
               tooltip-trigger="clipboardhover">

http://git-wip-us.apache.org/repos/asf/mesos/blob/7349da94/src/webui/master/static/frameworks.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/frameworks.html b/src/webui/master/static/frameworks.html
index 30ae7b9..0ea73ad 100644
--- a/src/webui/master/static/frameworks.html
+++ b/src/webui/master/static/frameworks.html
@@ -72,11 +72,11 @@
           <td>{{framework.resources.mem * (1024 * 1024) | dataSize}}</td>
           <td>{{framework.max_share * 100 | number}}%</td>
           <td>
-            <abbr title="{{framework.registered_time * 1000 | mesosDate}}">
+            <abbr title="{{framework.registered_time * 1000 | isoDate}}">
               {{framework.registered_time * 1000 | relativeDate}}</abbr>
             <button class="btn btn-mini"
               clipboard
-              data-clipboard-text="{{framework.registered_time * 1000 | mesosDate}}"
+              data-clipboard-text="{{framework.registered_time * 1000 | isoDate}}"
               tooltip="Copy timestamp"
               tooltip-placement="right"
               tooltip-trigger="clipboardhover">
@@ -84,11 +84,11 @@
           </td>
           <td ng-show="!framework.reregistered_time">-</td>
           <td ng-show="framework.reregistered_time">
-            <abbr title="{{framework.reregistered_time * 1000 | mesosDate}}">
+            <abbr title="{{framework.reregistered_time * 1000 | isoDate}}">
               {{framework.reregistered_time * 1000 | relativeDate}}</abbr>
             <button class="btn btn-mini"
               clipboard
-              data-clipboard-text="{{framework.registered_time * 1000 | mesosDate}}"
+              data-clipboard-text="{{framework.registered_time * 1000 | isoDate}}"
               tooltip="Copy timestamp"
               tooltip-placement="right"
               tooltip-trigger="clipboardhover">

http://git-wip-us.apache.org/repos/asf/mesos/blob/7349da94/src/webui/master/static/home.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/home.html b/src/webui/master/static/home.html
index 380eb43..a77c172 100644
--- a/src/webui/master/static/home.html
+++ b/src/webui/master/static/home.html
@@ -23,12 +23,12 @@
         <dd>{{state.pid.split("@")[1]}}</dd>
         <dt>Built:</dt>
         <dd>
-          <abbr title="{{state.build_time * 1000 | mesosDate}}">
+          <abbr title="{{state.build_time * 1000 | isoDate}}">
             {{state.build_time * 1000 | relativeDate}}</abbr>
           by <i>{{state.build_user}}</i>
           <button class="btn btn-mini"
               clipboard
-              data-clipboard-text="{{state.build_time * 1000 | mesosDate}}"
+              data-clipboard-text="{{state.build_time * 1000 | isoDate}}"
               tooltip="Copy timestamp"
               tooltip-placement="right"
               tooltip-trigger="clipboardhover">
@@ -36,11 +36,11 @@
         </dd>
         <dt>Started:</dt>
         <dd>
-          <abbr title="{{state.start_time * 1000 | mesosDate}}">
+          <abbr title="{{state.start_time * 1000 | isoDate}}">
             {{state.start_time * 1000 | relativeDate}}</abbr>
           <button class="btn btn-mini"
               clipboard
-              data-clipboard-text="{{state.start_time * 1000 | mesosDate}}"
+              data-clipboard-text="{{state.start_time * 1000 | isoDate}}"
               tooltip="Copy timestamp"
               tooltip-placement="right"
               tooltip-trigger="clipboardhover">
@@ -197,11 +197,11 @@
           <td>{{framework.resources.mem * (1024 * 1024) | dataSize}}</td>
           <td>{{framework.max_share * 100 | number}}%</td>
           <td>
-            <abbr title="{{framework.registered_time * 1000 | mesosDate}}">
+            <abbr title="{{framework.registered_time * 1000 | isoDate}}">
               {{framework.registered_time * 1000 | relativeDate}}</abbr>
             <button class="btn btn-mini"
               clipboard
-              data-clipboard-text="{{framework.registered_time * 1000 | mesosDate}}"
+              data-clipboard-text="{{framework.registered_time * 1000 | isoDate}}"
               tooltip="Copy timestamp"
               tooltip-placement="right"
               tooltip-trigger="clipboardhover">
@@ -209,11 +209,11 @@
           </td>
           <td ng-show="!framework.reregistered_time">-</td>
           <td ng-show="framework.reregistered_time">
-            <abbr title="{{framework.reregistered_time * 1000 | mesosDate}}">
+            <abbr title="{{framework.reregistered_time * 1000 | isoDate}}">
               {{framework.reregistered_time * 1000 | relativeDate}}</abbr>
             <button class="btn btn-mini"
               clipboard
-              data-clipboard-text="{{framework.reregistered_time * 1000 | mesosDate}}"
+              data-clipboard-text="{{framework.reregistered_time * 1000 | isoDate}}"
               tooltip="Copy timestamp"
               tooltip-placement="right"
               tooltip-trigger="clipboardhover">
@@ -265,22 +265,22 @@
           <td>{{framework.user}}</td>
           <td>{{framework.name}}</td>
           <td>
-            <abbr title="{{framework.registered_time * 1000 | mesosDate}}">
+            <abbr title="{{framework.registered_time * 1000 | isoDate}}">
               {{framework.registered_time * 1000 | relativeDate}}</abbr>
             <button class="btn btn-mini"
               clipboard
-              data-clipboard-text="{{framework.reregistered_time * 1000 | mesosDate}}"
+              data-clipboard-text="{{framework.reregistered_time * 1000 | isoDate}}"
               tooltip="Copy timestamp"
               tooltip-placement="right"
               tooltip-trigger="clipboardhover">
             </button>
           </td>
           <td>
-            <abbr title="{{framework.unregistered_time * 1000 | mesosDate}}">
+            <abbr title="{{framework.unregistered_time * 1000 | isoDate}}">
               {{framework.unregistered_time * 1000 | relativeDate}}</abbr>
             <button class="btn btn-mini"
               clipboard
-              data-clipboard-text="{{framework.unregistered_time * 1000 | mesosDate}}"
+              data-clipboard-text="{{framework.unregistered_time * 1000 | isoDate}}"
               tooltip="Copy timestamp"
               tooltip-placement="right"
               tooltip-trigger="clipboardhover">

http://git-wip-us.apache.org/repos/asf/mesos/blob/7349da94/src/webui/master/static/js/app.js
----------------------------------------------------------------------
diff --git a/src/webui/master/static/js/app.js b/src/webui/master/static/js/app.js
index 53d3a7f..9ddcf95 100644
--- a/src/webui/master/static/js/app.js
+++ b/src/webui/master/static/js/app.js
@@ -35,10 +35,10 @@ angular.module('mesos', ['ui.bootstrap']).
       return state.substring(5);
     };
   })
-  .filter('mesosDate', function($filter) {
+  .filter('isoDate', function($filter) {
     return function(date) {
-      return $filter('date')(date, 'MM/dd/yyyy H:mm:ss');
-    }
+      return $filter('date')(date, 'yyyy-MM-dd H:mm:ss');
+    };
   })
   .filter('relativeDate', function() {
     return function(date) {

http://git-wip-us.apache.org/repos/asf/mesos/blob/7349da94/src/webui/master/static/slave.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/slave.html b/src/webui/master/static/slave.html
index 0849401..92f6250 100644
--- a/src/webui/master/static/slave.html
+++ b/src/webui/master/static/slave.html
@@ -32,11 +32,11 @@
         <dd>{{state.master_hostname}}</dd>
         <dt>Started:</dt>
         <dd>
-          <abbr title="{{state.start_time * 1000 | mesosDate}}">
+          <abbr title="{{state.start_time * 1000 | isoDate}}">
             {{state.start_time * 1000 | relativeDate}}</abbr>
           <button class="btn btn-mini"
               clipboard
-              data-clipboard-text="{{state.start_time * 1000 | mesosDate}}"
+              data-clipboard-text="{{state.start_time * 1000 | isoDate}}"
               tooltip="Copy timestamp"
               tooltip-placement="right"
               tooltip-trigger="clipboardhover">
@@ -44,12 +44,12 @@
         </dd>
         <dt>Built:</dt>
         <dd>
-          <abbr title="{{state.build_time * 1000 | mesosDate}}">
+          <abbr title="{{state.build_time * 1000 | isoDate}}">
             {{state.build_time * 1000 | relativeDate}}</abbr>
           by <i>{{state.build_user}}</i>
           <button class="btn btn-mini"
               clipboard
-              data-clipboard-text="{{state.build_time * 1000 | mesosDate}}"
+              data-clipboard-text="{{state.build_time * 1000 | isoDate}}"
               tooltip="Copy timestamp"
               tooltip-placement="right"
               tooltip-trigger="clipboardhover">

http://git-wip-us.apache.org/repos/asf/mesos/blob/7349da94/src/webui/master/static/slaves.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/slaves.html b/src/webui/master/static/slaves.html
index 9d4a805..f4df71c 100644
--- a/src/webui/master/static/slaves.html
+++ b/src/webui/master/static/slaves.html
@@ -55,11 +55,11 @@
     <td>{{slave.resources.mem * (1024 * 1024) | dataSize}}</td>
     <td>{{slave.resources.disk * (1024 * 1024) | dataSize}}</td>
     <td>
-      <abbr title="{{slave.registered_time * 1000 | mesosDate}}">
+      <abbr title="{{slave.registered_time * 1000 | isoDate}}">
         {{slave.registered_time * 1000 | relativeDate}}</abbr>
       <button class="btn btn-mini"
           clipboard
-          data-clipboard-text="{{slave.registered_time * 1000 | mesosDate}}"
+          data-clipboard-text="{{slave.registered_time * 1000 | isoDate}}"
           tooltip="Copy timestamp"
           tooltip-placement="right"
           tooltip-trigger="clipboardhover">