Эх сурвалжийг харах

[core] Moved login_modal to common footer and added request to it

Enrico Berti 10 жил өмнө
parent
commit
75ed206
100 өөрчлөгдсөн 118 нэмэгдсэн , 99 устгасан
  1. 1 1
      apps/about/src/about/templates/admin_wizard.mako
  2. 1 1
      apps/beeswax/src/beeswax/templates/configuration.mako
  3. 1 1
      apps/beeswax/src/beeswax/templates/create_database.mako
  4. 1 1
      apps/beeswax/src/beeswax/templates/create_table_manually.mako
  5. 1 1
      apps/beeswax/src/beeswax/templates/execute.mako
  6. 1 1
      apps/beeswax/src/beeswax/templates/import_wizard_choose_delimiter.mako
  7. 1 1
      apps/beeswax/src/beeswax/templates/import_wizard_choose_file.mako
  8. 1 1
      apps/beeswax/src/beeswax/templates/import_wizard_define_columns.mako
  9. 1 1
      apps/beeswax/src/beeswax/templates/list_designs.mako
  10. 1 1
      apps/beeswax/src/beeswax/templates/list_history.mako
  11. 1 1
      apps/beeswax/src/beeswax/templates/list_trashed_designs.mako
  12. 1 1
      apps/beeswax/src/beeswax/templates/my_queries.mako
  13. 1 1
      apps/beeswax/src/beeswax/templates/save_results.mako
  14. 1 1
      apps/beeswax/src/beeswax/templates/watch_results.mako
  15. 1 1
      apps/filebrowser/src/filebrowser/templates/display.mako
  16. 1 1
      apps/filebrowser/src/filebrowser/templates/edit.mako
  17. 1 1
      apps/filebrowser/src/filebrowser/templates/fileop.mako
  18. 1 1
      apps/filebrowser/src/filebrowser/templates/listdir.mako
  19. 1 1
      apps/hbase/src/hbase/templates/app.mako
  20. 1 1
      apps/help/src/help/templates/display.mako
  21. 1 1
      apps/impala/src/impala/templates/dashboard.mako
  22. 1 1
      apps/jobbrowser/src/jobbrowser/templates/attempt.mako
  23. 1 1
      apps/jobbrowser/src/jobbrowser/templates/attempt_logs.mako
  24. 1 1
      apps/jobbrowser/src/jobbrowser/templates/container.mako
  25. 1 1
      apps/jobbrowser/src/jobbrowser/templates/job.mako
  26. 1 1
      apps/jobbrowser/src/jobbrowser/templates/job_attempt_logs.mako
  27. 1 1
      apps/jobbrowser/src/jobbrowser/templates/job_not_assigned.mako
  28. 1 1
      apps/jobbrowser/src/jobbrowser/templates/jobs.mako
  29. 1 1
      apps/jobbrowser/src/jobbrowser/templates/task.mako
  30. 1 1
      apps/jobbrowser/src/jobbrowser/templates/tasks.mako
  31. 1 1
      apps/jobbrowser/src/jobbrowser/templates/tasktracker.mako
  32. 1 1
      apps/jobbrowser/src/jobbrowser/templates/tasktrackers.mako
  33. 1 1
      apps/jobsub/src/jobsub/templates/designs.mako
  34. 1 1
      apps/metastore/src/metastore/templates/describe_partitions.mako
  35. 1 1
      apps/metastore/src/metastore/templates/metastore.mako
  36. 1 1
      apps/oozie/src/oozie/templates/dashboard/list_oozie_bundle.mako
  37. 1 1
      apps/oozie/src/oozie/templates/dashboard/list_oozie_bundles.mako
  38. 1 1
      apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinator.mako
  39. 1 1
      apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinators.mako
  40. 1 1
      apps/oozie/src/oozie/templates/dashboard/list_oozie_info.mako
  41. 1 1
      apps/oozie/src/oozie/templates/dashboard/list_oozie_sla.mako
  42. 1 1
      apps/oozie/src/oozie/templates/dashboard/list_oozie_workflow.mako
  43. 1 1
      apps/oozie/src/oozie/templates/dashboard/list_oozie_workflow_action.mako
  44. 1 1
      apps/oozie/src/oozie/templates/dashboard/list_oozie_workflows.mako
  45. 1 1
      apps/oozie/src/oozie/templates/editor/create_bundle.mako
  46. 1 1
      apps/oozie/src/oozie/templates/editor/create_coordinator.mako
  47. 1 1
      apps/oozie/src/oozie/templates/editor/create_workflow.mako
  48. 1 1
      apps/oozie/src/oozie/templates/editor/edit_bundle.mako
  49. 1 1
      apps/oozie/src/oozie/templates/editor/edit_coordinator.mako
  50. 1 1
      apps/oozie/src/oozie/templates/editor/edit_workflow.mako
  51. 1 1
      apps/oozie/src/oozie/templates/editor/import_coordinator.mako
  52. 1 1
      apps/oozie/src/oozie/templates/editor/import_workflow.mako
  53. 1 1
      apps/oozie/src/oozie/templates/editor/list_bundles.mako
  54. 1 1
      apps/oozie/src/oozie/templates/editor/list_coordinators.mako
  55. 1 1
      apps/oozie/src/oozie/templates/editor/list_history.mako
  56. 1 1
      apps/oozie/src/oozie/templates/editor/list_history_record.mako
  57. 1 1
      apps/oozie/src/oozie/templates/editor/list_trashed_bundles.mako
  58. 1 1
      apps/oozie/src/oozie/templates/editor/list_trashed_coordinators.mako
  59. 1 1
      apps/oozie/src/oozie/templates/editor2/bundle_editor.mako
  60. 1 1
      apps/oozie/src/oozie/templates/editor2/coordinator_editor.mako
  61. 1 1
      apps/oozie/src/oozie/templates/editor2/workflow_editor.mako
  62. 1 1
      apps/pig/src/pig/templates/app.mako
  63. 1 1
      apps/rdbms/src/rdbms/templates/error.mako
  64. 1 1
      apps/rdbms/src/rdbms/templates/execute.mako
  65. 1 1
      apps/search/src/search/templates/admin_collections.mako
  66. 1 1
      apps/search/src/search/templates/no_collections.mako
  67. 1 1
      apps/search/src/search/templates/search.mako
  68. 1 1
      apps/security/src/security/templates/hdfs.mako
  69. 1 1
      apps/security/src/security/templates/hive.mako
  70. 1 1
      apps/sqoop/src/sqoop/templates/app.mako
  71. 1 1
      apps/useradmin/src/useradmin/templates/add_ldap_users.mako
  72. 1 1
      apps/useradmin/src/useradmin/templates/change_password.mako
  73. 1 1
      apps/useradmin/src/useradmin/templates/confirm.mako
  74. 1 1
      apps/useradmin/src/useradmin/templates/edit_group.mako
  75. 1 1
      apps/useradmin/src/useradmin/templates/edit_permissions.mako
  76. 1 1
      apps/useradmin/src/useradmin/templates/edit_user.mako
  77. 1 1
      apps/useradmin/src/useradmin/templates/list_groups.mako
  78. 1 1
      apps/useradmin/src/useradmin/templates/list_permissions.mako
  79. 1 1
      apps/useradmin/src/useradmin/templates/list_users.mako
  80. 1 1
      apps/useradmin/src/useradmin/templates/view_user.mako
  81. 1 1
      apps/zookeeper/src/zookeeper/templates/clients.mako
  82. 1 1
      apps/zookeeper/src/zookeeper/templates/create.mako
  83. 1 1
      apps/zookeeper/src/zookeeper/templates/edit.mako
  84. 1 1
      apps/zookeeper/src/zookeeper/templates/index.mako
  85. 1 1
      apps/zookeeper/src/zookeeper/templates/tree.mako
  86. 1 1
      apps/zookeeper/src/zookeeper/templates/view.mako
  87. 1 1
      desktop/core/src/desktop/templates/403.mako
  88. 1 1
      desktop/core/src/desktop/templates/403_csrf.mako
  89. 1 1
      desktop/core/src/desktop/templates/404.mako
  90. 1 1
      desktop/core/src/desktop/templates/500.mako
  91. 18 0
      desktop/core/src/desktop/templates/common_footer.mako
  92. 1 1
      desktop/core/src/desktop/templates/dump_config.mako
  93. 1 1
      desktop/core/src/desktop/templates/error.mako
  94. 1 1
      desktop/core/src/desktop/templates/home.mako
  95. 1 1
      desktop/core/src/desktop/templates/home2.mako
  96. 1 1
      desktop/core/src/desktop/templates/login.mako
  97. 1 1
      desktop/core/src/desktop/templates/logs.mako
  98. 1 1
      desktop/core/src/desktop/templates/popup_error.mako
  99. 2 1
      desktop/core/src/desktop/views.py
  100. 1 1
      desktop/libs/indexer/src/indexer/templates/collections.mako

+ 1 - 1
apps/about/src/about/templates/admin_wizard.mako

@@ -410,4 +410,4 @@ $(document).ready(function(){
 </script>
 % endif
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/beeswax/src/beeswax/templates/configuration.mako

@@ -90,4 +90,4 @@ ${layout.menubar(section='configuration')}
 	});
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/beeswax/src/beeswax/templates/create_database.mako

@@ -402,4 +402,4 @@ ${ assist.assistPanel() }
 
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/beeswax/src/beeswax/templates/create_table_manually.mako

@@ -891,4 +891,4 @@ ${ assist.assistPanel() }
 
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/beeswax/src/beeswax/templates/execute.mako

@@ -2910,5 +2910,5 @@ function lineChartDataTransformer(rawDatum) {
 
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }
 

+ 1 - 1
apps/beeswax/src/beeswax/templates/import_wizard_choose_delimiter.mako

@@ -277,4 +277,4 @@ ${ assist.assistPanel() }
 </script>
 
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/beeswax/src/beeswax/templates/import_wizard_choose_file.mako

@@ -299,4 +299,4 @@ ${ assist.assistPanel() }
 </script>
 
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/beeswax/src/beeswax/templates/import_wizard_define_columns.mako

@@ -491,4 +491,4 @@ ${ assist.assistPanel() }
 </script>
 
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/beeswax/src/beeswax/templates/list_designs.mako

@@ -271,4 +271,4 @@ ${ layout.menubar(section='saved queries') }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/beeswax/src/beeswax/templates/list_history.mako

@@ -214,4 +214,4 @@ ${ layout.menubar(section='history') }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/beeswax/src/beeswax/templates/list_trashed_designs.mako

@@ -244,4 +244,4 @@ ${layout.menubar(section='saved queries')}
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/beeswax/src/beeswax/templates/my_queries.mako

@@ -349,4 +349,4 @@ ${layout.menubar(section='my queries')}
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/beeswax/src/beeswax/templates/save_results.mako

@@ -110,4 +110,4 @@ ${layout.menubar(section='query')}
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/beeswax/src/beeswax/templates/watch_results.mako

@@ -697,4 +697,4 @@ $(document).ready(function () {
 });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/filebrowser/src/filebrowser/templates/display.mako

@@ -469,4 +469,4 @@ ${ fb_components.menubar() }
 }());
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/filebrowser/src/filebrowser/templates/edit.mako

@@ -163,4 +163,4 @@ ${ fb_components.menubar() }
     });
   </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/filebrowser/src/filebrowser/templates/fileop.mako

@@ -47,4 +47,4 @@ ${ csrf_token(request) | n,unicode }
 </form>
 </div>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/filebrowser/src/filebrowser/templates/listdir.mako

@@ -167,4 +167,4 @@ ${ fb_components.menubar() }
 </div>
 
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/hbase/src/hbase/templates/app.mako

@@ -499,4 +499,4 @@ canWrite = ${ str(can_write).lower() };
 <script src="${ static('hbase/js/nav.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('hbase/js/app.js') }" type="text/javascript" charset="utf-8"></script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/help/src/help/templates/display.mako

@@ -76,4 +76,4 @@ ${ commonheader("Hue Help", "help", user, "40px") | n,unicode }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/impala/src/impala/templates/dashboard.mako

@@ -697,4 +697,4 @@ ${ dashboard.import_charts() }
 
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/attempt.mako

@@ -213,4 +213,4 @@ ${ comps.menubar() }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/attempt_logs.mako

@@ -202,4 +202,4 @@ ${ comps.menubar() }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/container.mako

@@ -64,4 +64,4 @@ ${ comps.menubar()}
     </div>
 </div>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/job.mako

@@ -761,4 +761,4 @@ $(document).ready(function () {
 });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/job_attempt_logs.mako

@@ -162,4 +162,4 @@ ${ comps.menubar() }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/job_not_assigned.mako

@@ -78,4 +78,4 @@ ${ comps.menubar() }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/jobs.mako

@@ -385,4 +385,4 @@ ${ components.menubar() }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/task.mako

@@ -228,4 +228,4 @@ ${ comps.menubar() }
 </script>
 
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/tasks.mako

@@ -148,4 +148,4 @@ ${ comps.menubar() }
     });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/tasktracker.mako

@@ -74,4 +74,4 @@ ${ comps.menubar()}
     </div>
 </div>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/tasktrackers.mako

@@ -86,4 +86,4 @@ $(document).ready(function(){
 });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

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

@@ -957,4 +957,4 @@ $(document).ready(function(e) {
 });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/metastore/src/metastore/templates/describe_partitions.mako

@@ -333,4 +333,4 @@ ${ assist.assistPanel() }
 
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/metastore/src/metastore/templates/metastore.mako

@@ -1413,4 +1413,4 @@ ${ assist.assistPanel() }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_bundle.mako

@@ -529,4 +529,4 @@ ${ layout.menubar(section='bundles', dashboard=True) }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_bundles.mako

@@ -540,4 +540,4 @@ ${layout.menubar(section='bundles', dashboard=True)}
 
 ${ utils.bulk_dashboard_functions() }
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

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

@@ -1073,4 +1073,4 @@ ${ layout.menubar(section='coordinators', dashboard=True) }
 
 ${ utils.decorate_datetime_fields() }
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinators.mako

@@ -609,4 +609,4 @@ ${layout.menubar(section='coordinators', dashboard=True)}
 </script>
 ${ utils.bulk_dashboard_functions() }
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_info.mako

@@ -307,4 +307,4 @@ ${ layout.menubar(section='oozie', dashboard=True) }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_sla.mako

@@ -330,4 +330,4 @@ ${ utils.decorate_datetime_fields() }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

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

@@ -762,4 +762,4 @@ ${ utils.slaGlobal() }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_workflow_action.mako

@@ -227,4 +227,4 @@ ${ layout.menubar(section='workflows', dashboard=True) }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_workflows.mako

@@ -616,4 +616,4 @@ ${ layout.menubar(section='workflows', dashboard=True) }
 
 ${ utils.bulk_dashboard_functions() }
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/oozie/src/oozie/templates/editor/create_bundle.mako

@@ -66,4 +66,4 @@ ${ layout.menubar(section='bundles') }
 
 ${ utils.decorate_datetime_fields(False) }
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/oozie/src/oozie/templates/editor/create_coordinator.mako

@@ -237,4 +237,4 @@ ${ layout.menubar(section='coordinators') }
 
 ${ utils.decorate_datetime_fields() }
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/oozie/src/oozie/templates/editor/create_workflow.mako

@@ -93,4 +93,4 @@ ${ utils.path_chooser_libs(True, True) }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/oozie/src/oozie/templates/editor/edit_bundle.mako

@@ -526,4 +526,4 @@ ${ layout.menubar(section='bundles') }
 
 ${ utils.decorate_datetime_fields(False) }
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/oozie/src/oozie/templates/editor/edit_coordinator.mako

@@ -800,4 +800,4 @@ ${ layout.menubar(section='coordinators') }
 
 ${ utils.decorate_datetime_fields() }
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/oozie/src/oozie/templates/editor/edit_workflow.mako

@@ -1146,4 +1146,4 @@ ${ utils.path_chooser_libs(True) }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/oozie/src/oozie/templates/editor/import_coordinator.mako

@@ -65,4 +65,4 @@ ${ layout.menubar(section='coordinators') }
 </div>
 </div>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/oozie/src/oozie/templates/editor/import_workflow.mako

@@ -88,4 +88,4 @@ ${ layout.menubar(section='workflows') }
 
 ${ utils.path_chooser_libs(False) }
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/oozie/src/oozie/templates/editor/list_bundles.mako

@@ -310,4 +310,4 @@ ${ layout.menubar(section='bundles') }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/oozie/src/oozie/templates/editor/list_coordinators.mako

@@ -323,4 +323,4 @@ ${ layout.menubar(section='coordinators') }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/oozie/src/oozie/templates/editor/list_history.mako

@@ -111,4 +111,4 @@ ${ layout.menubar(section='history') }
 
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/oozie/src/oozie/templates/editor/list_history_record.mako

@@ -91,4 +91,4 @@ ${ layout.menubar(section='history') }
 </div>
 </div>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/oozie/src/oozie/templates/editor/list_trashed_bundles.mako

@@ -265,4 +265,4 @@ ${ layout.menubar(section='bundles') }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/oozie/src/oozie/templates/editor/list_trashed_coordinators.mako

@@ -267,4 +267,4 @@ ${ layout.menubar(section='coordinators') }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

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

@@ -267,4 +267,4 @@ ${ dashboard.import_bindings() }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

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

@@ -663,4 +663,4 @@ ${ dashboard.import_bindings() }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

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

@@ -689,4 +689,4 @@ ${ dashboard.import_bindings() }
 
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/pig/src/pig/templates/app.mako

@@ -1427,4 +1427,4 @@ ${ commonshare() | n,unicode }
   }
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/rdbms/src/rdbms/templates/error.mako

@@ -52,4 +52,4 @@ ${ commonheader(_('Query'), app_name, user) | n,unicode }
 }
 </style>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/rdbms/src/rdbms/templates/execute.mako

@@ -926,4 +926,4 @@ ${ commonshare() | n,unicode }
 
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

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

@@ -233,4 +233,4 @@ ${ commonimportexport(request) | n,unicode }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

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

@@ -63,4 +63,4 @@ ${ commonheader(_('Search'), "search", user, "120px") | n,unicode }
 </div>
 
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

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

@@ -2697,4 +2697,4 @@ $(document).ready(function () {
   }
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/security/src/security/templates/hdfs.mako

@@ -383,4 +383,4 @@ ${ tree.import_templates(itemClick='$root.assist.setPath', iconClick='$root.assi
 </script>
 
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

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

@@ -776,4 +776,4 @@ ${ tree.import_templates(itemClick='$root.assist.setPath', iconClick='$root.assi
     });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

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

@@ -1317,4 +1317,4 @@ $(document).ready(function () {
 
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/useradmin/src/useradmin/templates/add_ldap_users.mako

@@ -67,4 +67,4 @@ ${ layout.menubar(section='users') }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/useradmin/src/useradmin/templates/change_password.mako

@@ -128,4 +128,4 @@ $(document).ready(function(){
 
 ${layout.commons()}
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/useradmin/src/useradmin/templates/confirm.mako

@@ -26,4 +26,4 @@ ${ commonheader(title, "useradmin", user) | n,unicode }
 		<input type="submit" value="${_('Yes')}">
 	</form>
 </div>
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/useradmin/src/useradmin/templates/edit_group.mako

@@ -102,4 +102,4 @@ ${layout.menubar(section='groups')}
 
 ${layout.commons()}
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/useradmin/src/useradmin/templates/edit_permissions.mako

@@ -75,4 +75,4 @@ ${layout.menubar(section='permissions')}
 
 ${layout.commons()}
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/useradmin/src/useradmin/templates/edit_user.mako

@@ -195,4 +195,4 @@ $(document).ready(function(){
 
 ${layout.commons()}
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/useradmin/src/useradmin/templates/list_groups.mako

@@ -205,4 +205,4 @@ ${layout.menubar(section='groups')}
 
 ${layout.commons()}
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/useradmin/src/useradmin/templates/list_permissions.mako

@@ -101,4 +101,4 @@ ${layout.menubar(section='permissions')}
 
 ${layout.commons()}
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/useradmin/src/useradmin/templates/list_users.mako

@@ -236,4 +236,4 @@ ${layout.menubar(section='users')}
 
 ${layout.commons()}
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/useradmin/src/useradmin/templates/view_user.mako

@@ -43,4 +43,4 @@ ${ layout.menubar(section='users') }
 
 ${layout.commons()}
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/zookeeper/src/zookeeper/templates/clients.mako

@@ -60,4 +60,4 @@ ${ shared.header(_breadcrumbs, clusters) }
 
 ${ shared.footer() }
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/zookeeper/src/zookeeper/templates/create.mako

@@ -50,4 +50,4 @@ ${ shared.header(_breadcrumbs, clusters) }
 
 ${ shared.footer() }
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/zookeeper/src/zookeeper/templates/edit.mako

@@ -50,4 +50,4 @@ ${ shared.header(_breadcrumbs,clusters) }
 
 ${ shared.footer() }
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/zookeeper/src/zookeeper/templates/index.mako

@@ -84,4 +84,4 @@ ${ shared.footer() }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/zookeeper/src/zookeeper/templates/tree.mako

@@ -153,4 +153,4 @@ ${ shared.footer() }
 </script>
 
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
apps/zookeeper/src/zookeeper/templates/view.mako

@@ -159,4 +159,4 @@ ${ shared.header(_breadcrumbs, clusters, False) }
 
 ${ shared.footer() }
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

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

@@ -40,4 +40,4 @@ ${ commonheader(_('403 - Access forbidden'), "", user) | n,unicode }
 </div>
 
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 1 - 1
desktop/core/src/desktop/templates/403_csrf.mako

@@ -40,4 +40,4 @@ ${ commonheader(_('403 - CSRF error'), "", user) | n,unicode }
 </div>
 
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

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

@@ -38,4 +38,4 @@ ${ commonheader(_('404 - Page not found'), "", user) | n,unicode }
   </div>
 </div>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

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

@@ -86,4 +86,4 @@ ${ commonheader(_('500 - Server error'), "", user) | n,unicode }
   }
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 18 - 0
desktop/core/src/desktop/templates/common_footer.mako

@@ -16,8 +16,10 @@
 <%!
 from django.utils.translation import ugettext as _
 from django.template.defaultfilters import escape, escapejs
+from desktop.views import login_modal
 %>
 
+${ login_modal(request).content | n,unicode }
 
 <script type="text/javascript">
   $(document).ready(function () {
@@ -43,6 +45,22 @@ from django.template.defaultfilters import escape, escapejs
       %endfor
     %endif
 
+    // global catch for ajax calls after the user has logged out
+    var isLoginRequired = false;
+    $(document).ajaxSuccess(function (event, xhr, settings, data) {
+      if (data === '/* login required */' && !isLoginRequired) {
+        isLoginRequired = true;
+        $('#login-modal').modal('show');
+        window.setTimeout(function () {
+          $('.jHueNotify').remove();
+        }, 200);
+      }
+    });
+
+    $('#login-modal').on('hidden', function () {
+      isLoginRequired = false;
+    });
+
 
     $("div.navigator ul.dropdown-menu").css("maxHeight", $(window).height() - 50);
     var scrollableDropdownTimeout = -1;

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

@@ -159,4 +159,4 @@ ${ layout.menubar(section='dump_config') }
 
     </div>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

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

@@ -49,4 +49,4 @@ ${ commonheader(_('Error'), app_name, user, "40px") | n,unicode }
     </div>
   </div>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

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

@@ -598,4 +598,4 @@ $(document).ready(function(){
      </div>
    </div>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

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

@@ -226,4 +226,4 @@ ${ commonheader(_('Welcome Home'), "home", user) | n,unicode }
 ## Add a Tour?
 ##
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

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

@@ -152,4 +152,4 @@ ${ commonheader(_("Welcome to Hue"), "login", user, "50px", True) | n,unicode }
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

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

@@ -154,4 +154,4 @@ ${layout.menubar(section='log_view')}
   });
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

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

@@ -93,4 +93,4 @@ ${ commonheader(title, "", user, "40px") | n,unicode }
     }
   </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

+ 2 - 1
desktop/core/src/desktop/views.py

@@ -402,7 +402,7 @@ def commonimportexport(request):
 def login_modal(request):
   return desktop.auth.views.dt_login(request, True)
 
-def commonfooter(messages=None):
+def commonfooter(request, messages=None):
   """
   Returns the rendered common footer
   """
@@ -412,6 +412,7 @@ def commonfooter(messages=None):
   hue_settings = Settings.get_settings()
 
   return django_mako.render_to_string("common_footer.mako", {
+    'request': request,
     'messages': messages,
     'version': settings.HUE_DESKTOP_VERSION,
     'collect_usage': collect_usage(),

+ 1 - 1
desktop/libs/indexer/src/indexer/templates/collections.mako

@@ -632,4 +632,4 @@ ko.applyBindings(vm);
 
 </script>
 
-${ commonfooter(messages) | n,unicode }
+${ commonfooter(request, messages) | n,unicode }

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно