瀏覽代碼

HUE-6556 [frontend] Filechooser should use a global modal

Enrico Berti 8 年之前
父節點
當前提交
17371bff39

+ 0 - 13
apps/beeswax/src/beeswax/templates/create_database.mako

@@ -185,19 +185,6 @@ ${ assist.assistPanel() }
 
 
 
-<div id="chooseFile" class="modal hide fade">
-    <div class="modal-header">
-      <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>
-      <h2 class="modal-title">${ _('Choose a file') }</h2>
-    </div>
-    <div class="modal-body">
-        <div id="filechooser">
-        </div>
-    </div>
-    <div class="modal-footer">
-    </div>
-</div>
-
 <style type="text/css">
   #filechooser {
     min-height: 100px;

+ 0 - 13
apps/beeswax/src/beeswax/templates/create_table_manually.mako

@@ -497,19 +497,6 @@ ${ assist.assistPanel() }
 
 
 
-<div id="chooseFile" class="modal hide fade">
-    <div class="modal-header">
-      <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>
-      <h2 class="modal-title">${ _('Choose a file') }</h2>
-    </div>
-    <div class="modal-body">
-        <div id="filechooser">
-        </div>
-    </div>
-    <div class="modal-footer">
-    </div>
-</div>
-
 <style type="text/css">
   #filechooser {
     min-height: 100px;

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

@@ -624,19 +624,6 @@ ${ layout.menubar(section='query') }
   </div>
 
 
-  <div id="chooseFile" class="modal hide fade">
-    <div class="modal-header">
-      <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>
-      <h2 class="modal-title">${ _('Choose a file') }</h2>
-    </div>
-    <div class="modal-body">
-      <div id="filechooser">
-      </div>
-    </div>
-    <div class="modal-footer">
-    </div>
-  </div>
-
   <div id="chooseFolder" class="modal hide fade">
     <div class="modal-header">
       <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>

+ 0 - 14
apps/beeswax/src/beeswax/templates/import_wizard_choose_file.mako

@@ -178,20 +178,6 @@ ${ assist.assistPanel() }
 
 
 
-<div id="chooseFile" class="modal hide fade">
-    <div class="modal-header">
-      <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>
-      <h2 class="modal-title">${ _('Choose a file') }</h2>
-    </div>
-    <div class="modal-body">
-        <div id="filechooser">
-        </div>
-    </div>
-    <div class="modal-footer">
-    </div>
-</div>
-
-
 <style type="text/css">
   #filechooser {
     min-height: 100px;

+ 0 - 14
apps/oozie/src/oozie/templates/editor2/bundle_editor.mako

@@ -220,20 +220,6 @@ ${ layout.menubar(section='bundles', is_editor=True, pullright=buttons, is_embed
 
 </div>
 
-<div id="chooseFile" class="modal hide fade" style="z-index: 10000;">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>
-    <h2 id="myModalLabel" class="modal-title">${_('Choose a file')}</h2>
-  </div>
-  <div class="modal-body">
-      <div id="filechooser">
-      </div>
-  </div>
-  <div class="modal-footer">
-  </div>
-</div>
-
-
 <script type="text/html" id="calendar-dropdown">
 <div class="btn-group">
   <a class="btn btn-default dropdown-toggle" data-toggle="dropdown">

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

@@ -90,20 +90,6 @@ ${ scheduler.import_modals() }
 
 <div class="submit-modal modal hide"></div>
 
-<div id="chooseFile" class="modal hide fade">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>
-    <h2 class="modal-title">${_('Choose a file')}</h2>
-  </div>
-  <div class="modal-body">
-      <div id="filechooser">
-      </div>
-  </div>
-  <div class="modal-footer">
-  </div>
-</div>
-
-
 </div>
 
 <link rel="stylesheet" href="${ static('desktop/ext/css/hue-filetypes.css') }">

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

@@ -104,19 +104,6 @@
   </div>
 </form>
 
-<div id="chooseFile" class="modal hide fade">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>
-    <h2 class="modal-title">${_('Choose a file')}</h2>
-  </div>
-  <div class="modal-body">
-    <div id="filechooser">
-    </div>
-  </div>
-  <div class="modal-footer">
-  </div>
-</div>
-
 
 <link rel="stylesheet" href="${ static('desktop/ext/css/bootstrap-datepicker.min.css') }" type="text/css" media="screen" title="no title" charset="utf-8" />
 <link rel="stylesheet" href="${ static('desktop/ext/css/bootstrap-timepicker.min.css') }" type="text/css" media="screen" title="no title" charset="utf-8" />

+ 0 - 13
apps/oozie/src/oozie/templates/editor2/workflow_editor.mako

@@ -606,19 +606,6 @@ ${ workflow.render() }
 
 <div class="submit-modal modal hide"></div>
 
-<div id="chooseFile" class="modal hide fade">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>
-    <h2 class="modal-title">${_('Choose a file')}</h2>
-  </div>
-  <div class="modal-body">
-    <div id="filechooser">
-    </div>
-  </div>
-  <div class="modal-footer">
-  </div>
-</div>
-
 
 </div>
 

+ 4 - 4
apps/oozie/src/oozie/templates/utils.inc.mako

@@ -324,7 +324,7 @@
 
 
 <%def name="path_chooser_libs(select_folder=False, skip_init=False)">
-  <div id="chooseFile" class="modal hide fade">
+  <div id="chooseFileModal" class="modal hide fade">
     <div class="modal-header">
       <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>
       <h2 class="modal-title">${ _('Choose a') } ${ if_true(select_folder, _('folder'), _('file')) }</h2>
@@ -378,12 +378,12 @@
             onFolderChoose:function (filePath) {
               handleChoice(filePath);
               if (selectFolder) {
-                $("#chooseFile").modal("hide");
+                $("#chooseFileModal").modal("hide");
               }
             },
             onFileChoose:function (filePath) {
               handleChoice(filePath);
-              $("#chooseFile").modal("hide");
+              $("#chooseFileModal").modal("hide");
             },
             createFolder:false,
             uploadFile:true,
@@ -391,7 +391,7 @@
             errorRedirectPath:"",
             forceRefresh:true
           });
-          $("#chooseFile").modal("show");
+          $("#chooseFileModal").modal("show");
         }
 
         function handleChoice(filePath) {

+ 0 - 13
apps/pig/src/pig/templates/app.mako

@@ -687,19 +687,6 @@ ${ commonheader(None, "pig", user, request) | n,unicode }
     </div>
   </div>
 
-  <div id="chooseFile" class="modal hide fade">
-    <div class="modal-header">
-      <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>
-      <h2 class="modal-title">${_('Choose a file')}</h2>
-    </div>
-    <div class="modal-body">
-      <div id="filechooser">
-      </div>
-    </div>
-    <div class="modal-footer">
-    </div>
-  </div>
-
   <div id="confirmModal" class="modal hide fade">
     <div class="modal-header">
       <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>

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

@@ -530,20 +530,6 @@ ${ layout.menubar(section='hive1', is_embeddable=is_embeddable) }
   </div>
 </div>
 
-<div id="chooseFile" class="modal hide fade">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>
-    <h2 class="modal-title">${_('Choose a file')}</h2>
-  </div>
-  <div class="modal-body">
-    <div id="filechooser">
-    </div>
-  </div>
-  <div class="modal-footer">
-  </div>
-</div>
-
-
 <%def name="treeIcons()">
   'fa-hdd-o': isServer(),
   'fa-database-open': isDb() && (nodes().length > 0 || isLoaded()),

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

@@ -586,20 +586,6 @@ ${ layout.menubar(section=component, is_embeddable=is_embeddable) }
   </div>
 </div>
 
-<div id="chooseFile" class="modal hide fade">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>
-    <h2 class="modal-title">${_('Choose a file')}</h2>
-  </div>
-  <div class="modal-body">
-    <div id="filechooser">
-    </div>
-  </div>
-  <div class="modal-footer">
-  </div>
-</div>
-
-
 <%def name="treeIcons()">
   'fa-hdd-o': isServer(),
   'fa-database-open': isDb() && (nodes().length > 0 || isLoaded()),

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

@@ -283,17 +283,6 @@ ${ commonheader(None, "sqoop", user, request) | n,unicode }
 
   <div data-bind="template: {'name': modal.name(), 'if': modal.name()}" id="modal-container" class="modal hide fade"></div>
 
-  <div id="chooseFile" class="modal hide fade">
-    <div class="modal-header">
-      <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>
-      <h2 class="modal-title">${_('Choose a folder')}</h2>
-    </div>
-    <div class="modal-body">
-      <div id="filechooser"></div>
-    </div>
-    <div class="modal-footer"></div>
-  </div>
-
 </div>
 <script type="text/html" id="delete-job-modal">
 <div class="modal-header">

+ 12 - 0
desktop/core/src/desktop/templates/common_header_footer_components.mako

@@ -418,6 +418,18 @@ from metadata.conf import has_optimizer, OPTIMIZER
   </div>
 </div>
 
+<div id="chooseFile" class="modal hide fade" style="z-index: 10000;" tabindex="-1">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>
+    <h2 class="modal-title">${_('Choose a file')}</h2>
+  </div>
+  <div class="modal-body">
+    <div id="filechooser"></div>
+  </div>
+  <div class="modal-footer"></div>
+</div>
+
+
 <script type="text/javascript">
 
   huePubSub.subscribe('set.hue.version', function (version) {

+ 0 - 13
desktop/core/src/desktop/templates/config_ko_components.mako

@@ -348,19 +348,6 @@ from desktop.views import _ko
     <div data-bind="component: { name: 'csv-list-input', params: { value: value, inputTemplate: 'property-hdfs-file', placeholder: typeof placeholder === 'undefined' ? '' : placeholder } }"></div>
   </script>
 
-  <div id="chooseFile" class="modal hide fade">
-    <div class="modal-header">
-      <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>
-      <h2 class="modal-title">${_('Choose a file')}</h2>
-    </div>
-    <div class="modal-body">
-      <div id="filechooser">
-      </div>
-    </div>
-    <div class="modal-footer">
-    </div>
-  </div>
-
   <script type="text/html" id="property-hdfs-file">
     <div class="input-append">
       <input type="text" style="min-width: 300px" class="filechooser-input" data-bind="value: value, valueUpdate:'afterkeydown', filechooser: { value: value, isAddon: true}, filechooserOptions: { skipInitialPathIfEmpty: true }" placeholder="${ _('Path to the file, e.g. hdfs://localhost:8020/user/hue') }"/>

+ 0 - 14
desktop/libs/indexer/src/indexer/templates/collections.mako

@@ -99,20 +99,6 @@ ${ commonheader(_('Search Indexes'), "indexer", user, request, "90px") | n,unico
 </div>
 
 
-<div id="chooseFile" class="modal hide fade">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>
-    <h2 class="modal-title">${_('Choose a file')}</h2>
-  </div>
-  <div class="modal-body">
-    <div id="filechooser">
-    </div>
-  </div>
-  <div class="modal-footer">
-  </div>
-</div>
-
-
 <div data-bind="with: manage" id="deleteCollections" class="modal hide fade">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>

+ 0 - 11
desktop/libs/indexer/src/indexer/templates/importer.mako

@@ -318,17 +318,6 @@ ${ assist.assistPanel() }
   </div>
 </div>
 
-<div id="chooseFile" class="modal hide fade">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>
-    <h2 class="modal-title">${_('Choose a file')}</h2>
-  </div>
-  <div class="modal-body">
-    <div id="filechooser"></div>
-  </div>
-  <div class="modal-footer"></div>
-</div>
-
 <script type="text/html" id="create-index-wizard">
   <div data-bind="visible: createWizard.show">
     <div class="step-indicator-fixed">

+ 0 - 11
desktop/libs/indexer/src/indexer/templates/indexer.mako

@@ -168,17 +168,6 @@ ${ assist.assistPanel() }
   </div>
 </div>
 
-<div id="chooseFile" class="modal hide fade">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>
-    <h2 class="modal-title">${_('Choose a file')}</h2>
-  </div>
-  <div class="modal-body">
-    <div id="filechooser"></div>
-  </div>
-  <div class="modal-footer"></div>
-</div>
-
 <script type="text/html" id="create-index-wizard">
   <div data-bind="visible: createWizard.show">
 

+ 0 - 13
desktop/libs/notebook/src/notebook/templates/editor_components.mako

@@ -1811,19 +1811,6 @@ from notebook.conf import ENABLE_QUERY_BUILDER, ENABLE_QUERY_SCHEDULING, ENABLE_
   </div>
 </script>
 
-<div id="chooseFile" class="modal hide fade" style="z-index: 10000;" tabindex="-1">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>
-    <h2 class="modal-title">${_('Choose a file')}</h2>
-  </div>
-  <div class="modal-body">
-    <div id="filechooser">
-    </div>
-  </div>
-  <div class="modal-footer">
-  </div>
-</div>
-
 <div class="ace-filechooser" style="display:none;">
   <div class="ace-filechooser-close">
     <a class="pointer" data-bind="click: function(){ $('.ace-filechooser').hide(); }"><i class="fa fa-times"></i></a>