فهرست منبع

HUE-3557 [home] Last modified date doesn’t look like the other dates in general

With this change we'll use moment to format all the document dates, moment.js has also been promoted to the common_header as it's used in lots of places.
Johan Ahlen 9 سال پیش
والد
کامیت
dc7abbf
23فایلهای تغییر یافته به همراه16 افزوده شده و 33 حذف شده
  1. 0 3
      apps/beeswax/src/beeswax/templates/execute.mako
  2. 0 3
      apps/beeswax/src/beeswax/templates/list_designs.mako
  3. 0 3
      apps/beeswax/src/beeswax/templates/list_history.mako
  4. 0 3
      apps/beeswax/src/beeswax/templates/my_queries.mako
  5. 0 2
      apps/impala/src/impala/templates/dashboard.mako
  6. 0 1
      apps/jobsub/src/jobsub/templates/designs.mako
  7. 0 1
      apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinator.mako
  8. 0 1
      apps/oozie/src/oozie/templates/dashboard/list_oozie_workflow.mako
  9. 0 1
      apps/oozie/src/oozie/templates/editor2/coordinator_editor.mako
  10. 1 1
      apps/oozie/src/oozie/templates/editor2/list_editor_bundles.mako
  11. 1 1
      apps/oozie/src/oozie/templates/editor2/list_editor_coordinators.mako
  12. 1 1
      apps/oozie/src/oozie/templates/editor2/list_editor_workflows.mako
  13. 0 1
      apps/oozie/src/oozie/templates/editor2/submit_job_popup.mako
  14. 0 1
      apps/oozie/src/oozie/templates/utils.inc.mako
  15. 0 1
      apps/search/src/search/templates/search.mako
  16. 0 1
      apps/security/src/security/templates/hive.mako
  17. 0 1
      apps/security/src/security/templates/sentry.mako
  18. 0 1
      apps/sqoop/src/sqoop/templates/app.mako
  19. 1 1
      desktop/core/src/desktop/templates/assist.mako
  20. 9 0
      desktop/core/src/desktop/templates/common_header.mako
  21. 1 1
      desktop/core/src/desktop/templates/file_browser.mako
  22. 1 3
      desktop/libs/notebook/src/notebook/templates/editor_components.mako
  23. 1 1
      desktop/libs/notebook/src/notebook/templates/notebooks.mako

+ 0 - 3
apps/beeswax/src/beeswax/templates/execute.mako

@@ -836,7 +836,6 @@ ${ commonshare() | n,unicode }
 
 <link href="${ static('desktop/ext/css/bootstrap-editable.css') }" rel="stylesheet">
 <script src="${ static('desktop/ext/js/bootstrap-editable.min.js') }"></script>
-<script src="${ static('desktop/ext/js/moment-with-locales.min.js') }"></script>
 
 <script src="${ static('beeswax/js/stats.utils.js') }"></script>
 
@@ -1313,8 +1312,6 @@ $(document).ready(function () {
     $("#recentLoader").show();
     $("#recentQueries").hide();
     recentQueries.fnClearTable();
-    var locale = window.navigator.userLanguage || window.navigator.language;
-    moment.locale(locale);
     $.getJSON("${ url(app_name + ':list_query_history') }?format=json&recent=true", function(data) {
       if (data && data.queries) {
         var _rows = [];

+ 0 - 3
apps/beeswax/src/beeswax/templates/list_designs.mako

@@ -144,7 +144,6 @@ ${ layout.menubar(section='saved queries') }
 </div>
 
 <script src="${ static('desktop/ext/js/knockout.min.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('desktop/ext/js/moment-with-locales.min.js') }"></script>
 
 <script type="text/javascript" charset="utf-8">
   $(document).ready(function () {
@@ -155,8 +154,6 @@ ${ layout.menubar(section='saved queries') }
 
     ko.applyBindings(viewModel);
 
-    var locale = window.navigator.userLanguage || window.navigator.language;
-    moment.locale(locale);
     $("[data-sort-value]").each(function(){
       $(this).text(moment($(this).attr("data-sort-value")*1000).format("L LTS"));
     });

+ 0 - 3
apps/beeswax/src/beeswax/templates/list_history.mako

@@ -154,7 +154,6 @@ ${ layout.menubar(section='history') }
 </div>
 
 <script src="${ static('desktop/ext/js/knockout.min.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('desktop/ext/js/moment-with-locales.min.js') }"></script>
 
 <script type="text/javascript" charset="utf-8">
   $(document).ready(function () {
@@ -170,8 +169,6 @@ ${ layout.menubar(section='history') }
 
     ko.applyBindings(new HistoryViewModel());
 
-    var locale = window.navigator.userLanguage || window.navigator.language;
-    moment.locale(locale);
     $("[data-sort-value]").each(function(){
       $(this).text(moment($(this).attr("data-sort-value")*1000).format("L LTS"));
     });

+ 0 - 3
apps/beeswax/src/beeswax/templates/my_queries.mako

@@ -181,7 +181,6 @@ ${layout.menubar(section='my queries')}
 </div>
 
 <script src="${ static('desktop/ext/js/knockout.min.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('desktop/ext/js/moment-with-locales.min.js') }"></script>
 
 <script type="text/javascript" charset="utf-8">
   $(document).ready(function () {
@@ -194,8 +193,6 @@ ${layout.menubar(section='my queries')}
 
     updateQueryCounters();
 
-    var locale = window.navigator.userLanguage || window.navigator.language;
-    moment.locale(locale);
     $("[data-sort-value]").each(function(){
       $(this).text(moment($(this).attr("data-sort-value")*1000).format("L LTS"));
     });

+ 0 - 2
apps/impala/src/impala/templates/dashboard.mako

@@ -444,8 +444,6 @@ ${ dashboard.layout_skeleton() }
 <link rel="stylesheet" href="${ static('desktop/ext/css/hue-charts.css') }">
 <link rel="stylesheet" href="${ static('desktop/ext/chosen/chosen.min.css') }">
 
-<script src="${ static('desktop/ext/js/moment-with-locales.min.js') }" type="text/javascript" charset="utf-8"></script>
-
 ${ dashboard.import_layout() }
 
 <script src="${ static('desktop/ext/js/bootstrap-editable.min.js') }" type="text/javascript" charset="utf-8"></script>

+ 0 - 1
apps/jobsub/src/jobsub/templates/designs.mako

@@ -32,7 +32,6 @@ ${ commonheader(None, "jobsub", user) | n,unicode }
 <script src="${ static('desktop/ext/js/datatables-paging-0.1.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/knockout.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/knockout-mapping.min.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('desktop/ext/js/moment-with-locales.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('oozie/js/workflow.models.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('oozie/js/workflow.node-fields.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('jobsub/js/jobsub.templates.js') }" type="text/javascript" charset="utf-8"></script>

+ 0 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinator.mako

@@ -482,7 +482,6 @@ ${ layout.menubar(section='coordinators', dashboard=True) }
 <script src="${ static('desktop/ext/js/codemirror-3.11.js') }"></script>
 <link rel="stylesheet" href="${ static('desktop/ext/css/codemirror.css') }">
 <script src="${ static('desktop/ext/js/codemirror-xml.js') }"></script>
-<script src="${ static('desktop/ext/js/moment-with-locales.min.js') }" type="text/javascript" charset="utf-8"></script>
 
 % if oozie_coordinator.has_sla:
 <script src="${ static('oozie/js/sla.utils.js') }" type="text/javascript" charset="utf-8"></script>

+ 0 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_workflow.mako

@@ -368,7 +368,6 @@ ${ layout.menubar(section='workflows', dashboard=True) }
 <script src="${ static('desktop/ext/js/codemirror-xml.js') }"></script>
 
 % if oozie_workflow.has_sla:
-<script src="${ static('desktop/ext/js/moment-with-locales.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('oozie/js/sla.utils.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery.flot.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery.flot.selection.min.js') }" type="text/javascript" charset="utf-8"></script>

+ 0 - 1
apps/oozie/src/oozie/templates/editor2/coordinator_editor.mako

@@ -512,7 +512,6 @@ ${ layout.menubar(section='coordinators', is_editor=True, pullright=buttons) }
 <link href="${ static('desktop/css/jqCron.css') }" rel="stylesheet" type="text/css" />
 <script src="${ static('desktop/js/jqCron.js') }" type="text/javascript"></script>
 
-<script src="${ static('desktop/ext/js/moment-with-locales.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/moment-timezone-with-data.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/tzdetect.js') }" type="text/javascript" charset="utf-8"></script>
 

+ 1 - 1
apps/oozie/src/oozie/templates/editor2/list_editor_bundles.mako

@@ -97,7 +97,7 @@ ${ layout.menubar(section='bundles', is_editor=True) }
         <td data-bind="text: name"></td>
         <td data-bind="text: description"></td>
         <td data-bind="text: owner"></td>
-        <td data-bind="text: last_modified, attr: { 'data-sort-value': last_modified_ts }" data-type="date"></td>
+        <td data-bind="text: localeFormat(last_modified), attr: { 'data-sort-value': last_modified_ts }" data-type="date"></td>
       </tr>
     </tbody>
   </table>

+ 1 - 1
apps/oozie/src/oozie/templates/editor2/list_editor_coordinators.mako

@@ -97,7 +97,7 @@ ${ layout.menubar(section='coordinators', is_editor=True) }
         <td data-bind="text: name"></td>
         <td data-bind="text: description"></td>
         <td data-bind="text: owner"></td>
-        <td data-bind="text: last_modified, attr: { 'data-sort-value': last_modified_ts }" data-type="date"></td>
+        <td data-bind="text: localeFormat(last_modified), attr: { 'data-sort-value': last_modified_ts }" data-type="date"></td>
       </tr>
     </tbody>
   </table>

+ 1 - 1
apps/oozie/src/oozie/templates/editor2/list_editor_workflows.mako

@@ -98,7 +98,7 @@ ${ layout.menubar(section='workflows', is_editor=True) }
         <td data-bind="text: name"></td>
         <td data-bind="text: description"></td>
         <td data-bind="text: owner"></td>
-        <td data-bind="text: last_modified, attr: { 'data-sort-value': last_modified_ts }" data-type="date"></td>
+        <td data-bind="text: localeFormat(last_modified), attr: { 'data-sort-value': last_modified_ts }" data-type="date"></td>
       </tr>
     </tbody>
   </table>

+ 0 - 1
apps/oozie/src/oozie/templates/editor2/submit_job_popup.mako

@@ -119,7 +119,6 @@
   }
 </style>
 
-<script src="${ static('desktop/ext/js/moment-with-locales.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/bootstrap-datepicker.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/bootstrap-timepicker.min.js') }" type="text/javascript" charset="utf-8"></script>
 

+ 0 - 1
apps/oozie/src/oozie/templates/utils.inc.mako

@@ -425,7 +425,6 @@
     }
   </style>
 
-  <script src="${ static('desktop/ext/js/moment-with-locales.min.js') }" type="text/javascript" charset="utf-8"></script>
   <script src="${ static('desktop/ext/js/bootstrap-datepicker.min.js') }" type="text/javascript" charset="utf-8"></script>
   <script src="${ static('desktop/ext/js/bootstrap-timepicker.min.js') }" type="text/javascript" charset="utf-8"></script>
 

+ 0 - 1
apps/search/src/search/templates/search.mako

@@ -2050,7 +2050,6 @@ ${ dashboard.layout_skeleton() }
 <link rel="stylesheet" href="${ static('desktop/ext/select2/select2.css') }">
 
 <script src="${ static('desktop/js/hue.json.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('desktop/ext/js/moment-with-locales.min.js') }" type="text/javascript" charset="utf-8"></script>
 
 ${ dashboard.import_layout(True) }
 

+ 0 - 1
apps/security/src/security/templates/hive.mako

@@ -555,7 +555,6 @@ ${ tree.import_templates(itemClick='$root.assist.setPath', iconClick='$root.assi
 <script src="${ static('desktop/js/ko.hue-bindings.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('security/js/hive.ko.js') }" type="text/javascript" charset="utf-8"></script>
 
-<script src="${ static('desktop/ext/js/moment-with-locales.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/jquery.hiveautocomplete.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/jquery.filechooser.js') }" type="text/javascript" charset="utf-8"></script>
 

+ 0 - 1
apps/security/src/security/templates/sentry.mako

@@ -596,7 +596,6 @@ ${ tree.import_templates(itemClick='$root.assist.setPath', iconClick='$root.assi
 <script src="${ static('desktop/js/ko.hue-bindings.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('security/js/sentry.ko.js') }" type="text/javascript" charset="utf-8"></script>
 
-<script src="${ static('desktop/ext/js/moment-with-locales.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/jquery.hiveautocomplete.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/jquery.filechooser.js') }" type="text/javascript" charset="utf-8"></script>
 

+ 0 - 1
apps/sqoop/src/sqoop/templates/app.mako

@@ -682,7 +682,6 @@ ${ commonheader(None, "sqoop", user) | n,unicode }
 
 <script src="${ static('desktop/ext/js/datatables-paging-0.1.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/routie-0.3.0.min.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('desktop/ext/js/moment-with-locales.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/knockout.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/knockout-mapping.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/bootstrap-editable.min.js') }"></script>

+ 1 - 1
desktop/core/src/desktop/templates/assist.mako

@@ -561,7 +561,7 @@ from desktop.views import _ko
     <!-- ko with: definition -->
     <div class="assist-details-wrap">
       <div><div class="assist-details-header">${ _('Description') }</div><div class="assist-details-value" data-bind="text: description"></div></div>
-      <div><div class="assist-details-header">${ _('Modified') }</div><div class="assist-details-value" data-bind="text: last_modified"></div></div>
+      <div><div class="assist-details-header">${ _('Modified') }</div><div class="assist-details-value" data-bind="text: localeFormat(last_modified)"></div></div>
       <div><div class="assist-details-header">${ _('Owner') }</div><div class="assist-details-value" data-bind="text: owner"></div></div>
     </div>
     <!-- /ko -->

+ 9 - 0
desktop/core/src/desktop/templates/common_header.mako

@@ -200,9 +200,18 @@ if USE_NEW_EDITOR.get():
   <script src="${ static('desktop/ext/js/bootstrap-better-typeahead.min.js') }"></script>
   <script src="${ static('desktop/ext/js/fileuploader.js') }"></script>
   <script src="${ static('desktop/js/popover-extra-placements.js') }"></script>
+  <script src="${ static('desktop/ext/js/moment-with-locales.min.js') }" type="text/javascript" charset="utf-8"></script>
 
   <script type="text/javascript" charset="utf-8">
 
+    moment.locale(window.navigator.userLanguage || window.navigator.language);
+    localeFormat = function (time) {
+      if (typeof ko !== 'undefined' && ko.isObservable(time)) {
+        return moment(time()).format("L LT");
+      }
+      return moment(time).format("L LT");
+    }
+
     //Add CSRF Token to all XHR Requests
     var xrhsend = XMLHttpRequest.prototype.send;
     XMLHttpRequest.prototype.send = function (data) {

+ 1 - 1
desktop/core/src/desktop/templates/file_browser.mako

@@ -602,7 +602,7 @@ from desktop.views import _ko
                   <!-- ko with: definition -->
                   <div class="fb-attr-col fb-type" data-bind="text: type"></div>
                   <div class="fb-attr-col fb-owner" data-bind="text: owner, attr: { 'title': owner }"></div>
-                  <div class="fb-attr-col fb-modified" data-bind="text: last_modified"></div>
+                  <div class="fb-attr-col fb-modified" data-bind="text: localeFormat(last_modified)"></div>
                   <!-- /ko -->
                 </div>
               </div>

+ 1 - 3
desktop/libs/notebook/src/notebook/templates/editor_components.mako

@@ -105,8 +105,6 @@ from desktop.views import _ko
 <script src="${ static('desktop/js/nv.d3.scatter.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/nv.d3.scatterChart.js') }" type="text/javascript" charset="utf-8"></script>
 
-<script src="${ static('desktop/ext/js/moment-with-locales.min.js') }" type="text/javascript" charset="utf-8"></script>
-
 <script src="${ static('desktop/ext/select2/select2.min.js') }" type="text/javascript" charset="utf-8"></script>
 
 <!--[if IE 9]>
@@ -536,7 +534,7 @@ ${ hueIcons.symbols() }
               <td style="width: 16%"><a href="javascript: void(0);" data-bind="text: name, click: function() { $root.openNotebook(uuid) }"></a></td>
               <td style="width: 50%; white-space: normal"><span data-bind="text: description"></span></td>
               <td style="width: 18%"><span data-bind="text: owner"></span></td>
-              <td style="width: 16%"><span data-bind="text: last_modified"></span></td>
+              <td style="width: 16%"><span data-bind="text: localeFormat(last_modified)"></span></td>
             </tr>
             </tbody>
           </table>

+ 1 - 1
desktop/libs/notebook/src/notebook/templates/notebooks.mako

@@ -89,7 +89,7 @@ ${ commonheader(_("Notebooks"), "spark", user, "60px") | n,unicode }
         <td data-bind="text: name"></td>
         <td data-bind="text: description"></td>
         <td data-bind="text: owner"></td>
-        <td data-bind="text: last_modified, attr: { 'data-sort-value': last_modified_ts }" data-type="date"></td>
+        <td data-bind="text: localeFormat(last_modified), attr: { 'data-sort-value': last_modified_ts }" data-type="date"></td>
       </tr>
     </tbody>
   </table>