Explorar o código

HUE-1660 [core] Moved import/export dialogs into a common mako

Enrico Berti %!s(int64=10) %!d(string=hai) anos
pai
achega
a5b3250a32

+ 2 - 38
apps/spark/src/spark/templates/notebooks.mako

@@ -15,7 +15,7 @@
 ## limitations under the License.
 
 <%!
-  from desktop.views import commonheader, commonfooter, commonshare
+  from desktop.views import commonheader, commonfooter, commonshare, commonimportexport
   from django.utils.translation import ugettext as _
 %>
 <%namespace name="actionbar" file="actionbar.mako" />
@@ -117,39 +117,7 @@ ${ commonheader(_("Notebooks"), "spark", user, "60px") | n,unicode }
   </form>
 </div>
 
-<div id="export-documents" class="modal hide">
-  <form method="POST" action="/desktop/api2/doc/export" style="display: inline">
-    ${ csrf_token(request) | n,unicode }
-    <input type="hidden" name="documents"/>
-  </form>
-</div>
-
-<div id="import-documents" class="modal hide fade fileupload-modal">
-  <div class="modal-header">
-    <a href="#" class="close" data-dismiss="modal" data-clear="fileupload">&times;</a>
-    <h3>${_('Import documents')}</h3>
-  </div>
-  <form method="POST" action="/desktop/api2/doc/import" style="display: inline" enctype="multipart/form-data">
-    <div class="modal-body form-inline">
-      <div class="pull-right">
-        <a href="#" class="btn" data-dismiss="modal" data-clear="fileupload">${ _('Cancel') }</a>
-        <input type="submit" class="btn btn-danger" value="${ _('Import') }"/>
-      </div>
-      <div class="fileupload fileupload-new" data-provides="fileupload">
-        <span class="btn btn-file" style="line-height: 29px">
-          <span class="fileupload-new">${ _('Select file') }</span>
-          <span class="fileupload-exists">${ _('Change') }</span>
-          <input type="file" name="documents" accept="application/json" />
-        </span>
-        &nbsp;&nbsp;<span class="fileupload-preview"></span>
-          <a href="#" class="fileupload-exists" data-clear="fileupload"><i class="fa fa-times"></i></a>
-      </div>
-      ${ csrf_token(request) | n,unicode }
-      <input type="hidden" name="redirect" value="${ request.get_full_path() }"/>
-    </div>
-  </form>
-</div>
-
+${ commonimportexport(request) | n,unicode }
 
 
 </div>
@@ -163,10 +131,6 @@ ${ commonshare() | n,unicode }
 <script src="${ static('desktop/ext/js/knockout.mapping-2.3.2.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/share.vm.js') }"></script>
 
-<script src="${ static('desktop/ext/js/bootstrap-fileupload.js') }" type="text/javascript" charset="utf-8"></script>
-<link rel="stylesheet" href="${ static('desktop/ext/css/bootstrap-fileupload.css') }">
-
-
 <script type="text/javascript" charset="utf-8">
   var Editor = function () {
     var self = this;

+ 9 - 1
desktop/core/src/desktop/static/desktop/ext/css/bootstrap-fileupload.css

@@ -1,2 +1,10 @@
-/* CSS crunched with Crunch - http://crunchapp.net/ */
+/*!
+ * Jasny Bootstrap Extensions j3
+ *
+ * Copyright 2012 Jasny BV
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Extended with pride by @ArnoldDaniels of jasny.net
+ */
 .btn-file{overflow:hidden;position:relative;vertical-align:middle}.btn-file>input{position:absolute;top:0;right:0;margin:0;opacity:0;filter:alpha(opacity=0);transform:translate(-300px, 0) scale(4);font-size:23px;direction:ltr;cursor:pointer}.fileupload{margin-bottom:9px}.fileupload .uneditable-input{display:inline-block;margin-bottom:0px;vertical-align:middle;cursor:text}.fileupload .thumbnail{overflow:hidden;display:inline-block;margin-bottom:5px;vertical-align:middle;text-align:center}.fileupload .thumbnail>img{display:inline-block;vertical-align:middle;max-height:100%}.fileupload .btn{vertical-align:middle}.fileupload-exists .fileupload-new,.fileupload-new .fileupload-exists{display:none}.fileupload-inline .fileupload-controls{display:inline}.fileupload-new .input-append .btn-file{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.thumbnail-borderless .thumbnail{border:none;padding:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.fileupload-new.thumbnail-borderless .thumbnail{border:1px solid #ddd}.control-group.warning .fileupload .uneditable-input{color:#a47e3c;border-color:#a47e3c}.control-group.warning .fileupload .fileupload-preview{color:#a47e3c}.control-group.warning .fileupload .thumbnail{border-color:#a47e3c}.control-group.error .fileupload .uneditable-input{color:#b94a48;border-color:#b94a48}.control-group.error .fileupload .fileupload-preview{color:#b94a48}.control-group.error .fileupload .thumbnail{border-color:#b94a48}.control-group.success .fileupload .uneditable-input{color:#468847;border-color:#468847}.control-group.success .fileupload .fileupload-preview{color:#468847}.control-group.success .fileupload .thumbnail{border-color:#468847}

+ 54 - 0
desktop/core/src/desktop/templates/common_import_export.mako

@@ -0,0 +1,54 @@
+## Licensed to Cloudera, Inc. under one
+## or more contributor license agreements.  See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership.  Cloudera, Inc. licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License.  You may obtain a copy of the License at
+##
+##     http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+<%!
+from django.utils.translation import ugettext as _
+%>
+
+<script src="${ static('desktop/ext/js/bootstrap-fileupload.js') }" type="text/javascript" charset="utf-8"></script>
+<link rel="stylesheet" href="${ static('desktop/ext/css/bootstrap-fileupload.css') }">
+
+<div id="export-documents" class="modal hide">
+  <form method="POST" action="/desktop/api2/doc/export" style="display: inline">
+    ${ csrf_token(request) | n,unicode }
+    <input type="hidden" name="documents"/>
+  </form>
+</div>
+
+<div id="import-documents" class="modal hide fade fileupload-modal">
+  <div class="modal-header">
+    <a href="#" class="close" data-dismiss="modal" data-clear="fileupload">&times;</a>
+    <h3>${_('Import documents')}</h3>
+  </div>
+  <form method="POST" action="/desktop/api2/doc/import" style="display: inline" enctype="multipart/form-data">
+    <div class="modal-body form-inline">
+      <div class="pull-right">
+        <a href="#" class="btn" data-dismiss="modal" data-clear="fileupload">${ _('Cancel') }</a>
+        <input type="submit" class="btn btn-danger" value="${ _('Import') }"/>
+      </div>
+      <div class="fileupload fileupload-new" data-provides="fileupload">
+        <span class="btn btn-file" style="line-height: 29px">
+          <span class="fileupload-new">${ _('Select file') }</span>
+          <span class="fileupload-exists">${ _('Change') }</span>
+          <input type="file" name="documents" accept="application/json" />
+        </span>
+        &nbsp;&nbsp;<span class="fileupload-preview"></span>
+          <a href="#" class="fileupload-exists" data-clear="fileupload"><i class="fa fa-times"></i></a>
+      </div>
+      ${ csrf_token(request) | n,unicode }
+      <input type="hidden" name="redirect" value="${ request.get_full_path() }"/>
+    </div>
+  </form>
+</div>

+ 3 - 0
desktop/core/src/desktop/views.py

@@ -376,6 +376,9 @@ def commonheader(title, section, user, padding="90px"):
 def commonshare():
   return django_mako.render_to_string("common_share.mako", {})
 
+def commonimportexport(request):
+  return django_mako.render_to_string("common_import_export.mako", {'request': request})
+
 def commonfooter(messages=None):
   """
   Returns the rendered common footer