Browse Source

HUE-6364 [importer] Dock the bottom bar to the bottom

Enrico Berti 8 năm trước cách đây
mục cha
commit
65e9714
26 tập tin đã thay đổi với 78 bổ sung106 xóa
  1. 0 10
      apps/about/src/about/templates/admin_wizard.mako
  2. 0 0
      apps/oozie/src/oozie/static/oozie/css/workflow.css
  3. 0 14
      apps/oozie/src/oozie/static/oozie/less/workflow.less
  4. 1 1
      apps/sqoop/src/sqoop/static/sqoop/css/sqoop.css
  5. 0 4
      apps/sqoop/src/sqoop/static/sqoop/less/sqoop.less
  6. 1 1
      apps/useradmin/src/useradmin/static/useradmin/css/useradmin.css
  7. 30 47
      apps/useradmin/src/useradmin/static/useradmin/less/useradmin.less
  8. 1 1
      apps/useradmin/src/useradmin/templates/add_ldap_users.mako
  9. 1 1
      apps/useradmin/src/useradmin/templates/change_password.mako
  10. 1 1
      apps/useradmin/src/useradmin/templates/edit_group.mako
  11. 1 1
      apps/useradmin/src/useradmin/templates/edit_permissions.mako
  12. 1 1
      apps/useradmin/src/useradmin/templates/edit_user.mako
  13. 1 1
      apps/useradmin/src/useradmin/templates/list_groups.mako
  14. 1 1
      apps/useradmin/src/useradmin/templates/list_permissions.mako
  15. 1 1
      apps/useradmin/src/useradmin/templates/list_users.mako
  16. 1 1
      apps/useradmin/src/useradmin/templates/view_user.mako
  17. 0 0
      desktop/core/src/desktop/static/desktop/css/hue.css
  18. 0 0
      desktop/core/src/desktop/static/desktop/css/hue3-extra.css
  19. 10 0
      desktop/core/src/desktop/static/desktop/less/hue-cross-version.less
  20. 0 5
      desktop/core/src/desktop/static/desktop/less/hue.less
  21. 11 0
      desktop/core/src/desktop/templates/common_header_footer_components.mako
  22. 15 0
      desktop/core/src/desktop/templates/hue.mako
  23. 0 0
      desktop/libs/indexer/src/indexer/static/indexer/css/importer.css
  24. 0 8
      desktop/libs/indexer/src/indexer/static/indexer/less/importer.less
  25. 1 1
      desktop/libs/indexer/src/indexer/templates/importer.mako
  26. 0 6
      desktop/libs/indexer/src/indexer/templates/indexer.mako

+ 0 - 10
apps/about/src/about/templates/admin_wizard.mako

@@ -248,16 +248,6 @@ ${ layout.menubar(section='quick_start') }
     margin-left: 50px;
   }
 
-  @media all and (max-height: 800px) {
-    .form-actions {
-      position:fixed;
-      bottom:0;
-      margin:0;
-      left:0;
-      right:0;
-    }
-  }
-
   ul.samples li {
     padding-bottom: 5px;
   }

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
apps/oozie/src/oozie/static/oozie/css/workflow.css


+ 0 - 14
apps/oozie/src/oozie/static/oozie/less/workflow.less

@@ -123,20 +123,6 @@ ul {
   margin-left: 10px;
 }
 
-.form-horizontal .form-actions {
-  padding-left: 0;
-  position: fixed;
-  width: 100%;
-  bottom: 0;
-  margin-bottom: 0;
-  -webkit-box-shadow: 0 -1px 3px rgba(50, 50, 50, 0.15);
-  -moz-box-shadow: 0 -1px 3px rgba(50, 50, 50, 0.15);
-  box-shadow: 0 -1px 3px rgba(50, 50, 50, 0.15);
-  z-index: 1020;
-  margin-left: -20px;
-  left:0;
-}
-
 .draggable-button {
   display: inline;
   margin: 1px;

+ 1 - 1
apps/sqoop/src/sqoop/static/sqoop/css/sqoop.css

@@ -14,4 +14,4 @@ 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.
- */#sqoopComponents .row-selectable tr{cursor:pointer}#sqoopComponents ul.major-list{list-style-type:none;margin:0;padding:0;width:100%}#sqoopComponents ul.major-list li{cursor:pointer;border:1px solid #E3E3E3;height:60px;margin-bottom:10px;background-color:#FFFFFF}#sqoopComponents ul.major-list li div.main{padding:10px}#sqoopComponents ul.major-list li .pull-right{margin-right:10px;margin-top:18px}#sqoopComponents .main i,#sqoopComponents .top-bar h4 i{color:#999999}#sqoopComponents .sqoop-progress{width:0;background-color:#F89406;height:3px;margin-top:-2px}#sqoopComponents .waiting{color:#DDDDDD;font-size:196px}#sqoopComponents h1.emptyMessage{color:#BBBBBB;line-height:60px;margin-top:50px}#sqoopComponents .sidebar-nav{padding:9px 0;min-height:150px !important}#sqoopComponents .top-bar{position:fixed;top:28px;width:100%;background-color:#FAFAFA;border-bottom:1px solid #E3E3E3;box-shadow:0 1px 4px rgba(0,0,0,0.067);margin:0 0 20px;padding:10px 20px;text-align:left;height:30px}#sqoopComponents .top-bar h4{margin-top:4px;display:inline-block;margin-right:20px}#sqoopComponents .top-bar .pull-right{margin-top:4px;margin-right:20px}#sqoopComponents .form-actions{padding-left:20px !important}#sqoopComponents .job-form{min-height:300px}#sqoopComponents .big-btn{background-color:#F0F0F0;width:80px;height:80px;text-align:center;display:inline-block;margin-right:10px;padding:10px;padding-top:20px;cursor:pointer;line-height:32px;border:1px solid #F0F0F0;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}#sqoopComponents .big-btn:hover,#sqoopComponents .big-btn.selected{background-color:#DDDDDD}#sqoopComponents .big-btn.selected{border-color:#CCCCCC}#sqoopComponents .big-btn i{font-size:40px}#sqoopComponents .nojobs{cursor:pointer}
+ */#sqoopComponents .row-selectable tr{cursor:pointer}#sqoopComponents ul.major-list{list-style-type:none;margin:0;padding:0;width:100%}#sqoopComponents ul.major-list li{cursor:pointer;border:1px solid #E3E3E3;height:60px;margin-bottom:10px;background-color:#FFFFFF}#sqoopComponents ul.major-list li div.main{padding:10px}#sqoopComponents ul.major-list li .pull-right{margin-right:10px;margin-top:18px}#sqoopComponents .main i,#sqoopComponents .top-bar h4 i{color:#999999}#sqoopComponents .sqoop-progress{width:0;background-color:#F89406;height:3px;margin-top:-2px}#sqoopComponents .waiting{color:#DDDDDD;font-size:196px}#sqoopComponents h1.emptyMessage{color:#BBBBBB;line-height:60px;margin-top:50px}#sqoopComponents .sidebar-nav{padding:9px 0;min-height:150px !important}#sqoopComponents .top-bar{position:fixed;top:28px;width:100%;background-color:#FAFAFA;border-bottom:1px solid #E3E3E3;box-shadow:0 1px 4px rgba(0,0,0,0.067);margin:0 0 20px;padding:10px 20px;text-align:left;height:30px}#sqoopComponents .top-bar h4{margin-top:4px;display:inline-block;margin-right:20px}#sqoopComponents .top-bar .pull-right{margin-top:4px;margin-right:20px}#sqoopComponents .job-form{min-height:300px}#sqoopComponents .big-btn{background-color:#F0F0F0;width:80px;height:80px;text-align:center;display:inline-block;margin-right:10px;padding:10px;padding-top:20px;cursor:pointer;line-height:32px;border:1px solid #F0F0F0;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}#sqoopComponents .big-btn:hover,#sqoopComponents .big-btn.selected{background-color:#DDDDDD}#sqoopComponents .big-btn.selected{border-color:#CCCCCC}#sqoopComponents .big-btn i{font-size:40px}#sqoopComponents .nojobs{cursor:pointer}

+ 0 - 4
apps/sqoop/src/sqoop/static/sqoop/less/sqoop.less

@@ -96,10 +96,6 @@
     margin-right: 20px;
   }
 
-  .form-actions {
-    padding-left: 20px !important;
-  }
-
   .job-form {
     min-height: 300px;
   }

+ 1 - 1
apps/useradmin/src/useradmin/static/useradmin/css/useradmin.css

@@ -14,4 +14,4 @@ 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.
- */.fixed{position:fixed;top:80px;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);-webkit-box-shadow:0 1px 4px rgba(0,0,0,0.065);-moz-box-shadow:0 1px 4px rgba(0,0,0,0.065);box-shadow:0 1px 4px rgba(0,0,0,0.065)}.sortable{cursor:pointer}.file-row{height:37px}.steps{padding-top:20px;margin-bottom:100px;border:1px solid #DDDDDD;border-top:transparent}#editUserComponents .section{margin:20px}#editUserComponents input[type=submit]{margin-left:50px}#editUserComponents .nav-tabs .active{font-weight:bold}#editUserComponents .title{margin-top:5px}#editUserComponents .form-actions{padding-left:0 !important}@media all and (max-height:800px){.form-actions{z-index:2;border-top:1px solid #F1F1F1;position:fixed;bottom:0;left:0;width:100%;margin:0;padding-left:20px !important}}
+ */.useradmin .fixed{position:fixed;top:80px;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);-webkit-box-shadow:0 1px 4px rgba(0,0,0,0.065);-moz-box-shadow:0 1px 4px rgba(0,0,0,0.065);box-shadow:0 1px 4px rgba(0,0,0,0.065)}.useradmin .sortable{cursor:pointer}.useradmin .file-row{height:37px}.useradmin .steps{padding-top:20px;margin-bottom:100px}.useradmin #editUserComponents .section{margin:20px}.useradmin #editUserComponents input[type=submit]{margin-left:50px}.useradmin #editUserComponents .nav-tabs .active{font-weight:bold}.useradmin #editUserComponents .title{margin-top:5px}

+ 30 - 47
apps/useradmin/src/useradmin/static/useradmin/less/useradmin.less

@@ -16,59 +16,42 @@
  limitations under the License.
 */
 
-.fixed {
-  position: fixed;
-  top: 80px;
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
-  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
-}
-
-.sortable {
-  cursor: pointer;
-}
-
-.file-row {
-  height: 37px;
-}
+.useradmin {
+  .fixed {
+    position: fixed;
+    top: 80px;
+    filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+  }
 
-.steps {
-  padding-top: 20px;
-  margin-bottom: 100px;
-  border: 1px solid #DDDDDD;
-  border-top: transparent;
-}
+  .sortable {
+    cursor: pointer;
+  }
 
-#editUserComponents .section {
-  margin: 20px;
-}
+  .file-row {
+    height: 37px;
+  }
 
-#editUserComponents input[type=submit] {
-  margin-left: 50px;
-}
+  .steps {
+    padding-top: 20px;
+    margin-bottom: 100px;
+  }
 
-#editUserComponents .nav-tabs .active {
-  font-weight: bold;
-}
+  #editUserComponents .section {
+    margin: 20px;
+  }
 
-#editUserComponents .title {
-  margin-top: 5px;
-}
+  #editUserComponents input[type=submit] {
+    margin-left: 50px;
+  }
 
-#editUserComponents .form-actions {
-  padding-left: 0 !important;
-}
+  #editUserComponents .nav-tabs .active {
+    font-weight: bold;
+  }
 
-@media all and (max-height: 800px) {
-  .form-actions {
-    z-index: 2;
-    border-top: 1px solid #F1F1F1;
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    margin: 0;
-    padding-left: 20px !important;
+  #editUserComponents .title {
+    margin-top: 5px;
   }
 }

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

@@ -27,7 +27,7 @@ ${ commonheader(_('Hue Users'), "useradmin", user, request) | n,unicode }
 
 ${ layout.menubar(section='users') }
 
-<div id="addLdapUsersComponents" class="container-fluid">
+<div id="addLdapUsersComponents" class="useradmin container-fluid">
   <div class="card card-small">
     <h1 class="card-heading simple">${_('Hue Users - Add/Sync LDAP user')}</h1>
     <br/>

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

@@ -24,7 +24,7 @@ from useradmin.password_policy import is_password_policy_enabled, get_password_h
 ${ commonheader(_('Hue Users'), "useradmin", user, request) | n,unicode }
 ${ layout.menubar(section='users') }
 
-<div class="container-fluid">
+<div class="useradmin container-fluid">
   <div class="card card-small">
     <h1 class="card-heading simple">${_('Hue Users - Change password: %(username)s') % dict(username=username)}</h1>
 

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

@@ -43,7 +43,7 @@ ${layout.menubar(section='groups')}
   %endif
 </%def>
 
-<div id="editGroupComponents" class="container-fluid">
+<div id="editGroupComponents" class="useradmin container-fluid">
   <div class="card card-small">
     % if name:
         <h1 class="card-heading simple">${_('Hue Groups - Edit group: %(name)s') % dict(name=name)}</h1>

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

@@ -43,7 +43,7 @@ ${layout.menubar(section='permissions')}
   %endif
 </%def>
 
-<div id="editPermissionsComponents" class="container-fluid">
+<div id="editPermissionsComponents" class="useradmin container-fluid">
   <div class="card card-small">
     <h1 class="card-heading simple">${_('Hue Permissions - Edit app: %(app)s') % dict(app=app)}</h1>
     <br/>

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

@@ -31,7 +31,7 @@ ${ commonheader(_('Hue Users'), "useradmin", user, request) | n,unicode }
 ${ layout.menubar(section='users') }
 
 
-<div id="editUserComponents" class="container-fluid">
+<div id="editUserComponents" class="useradmin container-fluid">
   <div class="card card-small title">
     % if username:
       <h1 class="card-heading simple">${_('Hue Users - Edit user: %(username)s') % dict(username=username)}</h1>

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

@@ -30,7 +30,7 @@ ${ commonheader(_('Hue Groups'), "useradmin", user, request) | n,unicode }
 
 ${layout.menubar(section='groups')}
 
-<div id="groupsComponents" class="container-fluid">
+<div id="groupsComponents" class="useradmin container-fluid">
   <div class="card card-small">
     <h1 class="card-heading simple">${_('Hue Groups')}</h1>
 

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

@@ -27,7 +27,7 @@ ${ commonheader(_('Hue Permissions'), "useradmin", user, request) | n,unicode }
 %endif
 ${layout.menubar(section='permissions')}
 
-<div id="permissionsComponents" class="container-fluid">
+<div id="permissionsComponents" class="useradmin container-fluid">
   <div class="card card-small">
     <h1 class="card-heading simple">${_('Hue Permissions')}</h1>
     <%actionbar:render>

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

@@ -29,7 +29,7 @@ ${ commonheader(_('Hue Users'), "useradmin", user, request) | n,unicode }
 
 ${layout.menubar(section='users')}
 
-<div id="usersComponents" class="container-fluid">
+<div id="usersComponents" class="useradmin container-fluid">
   <div class="card card-small">
     <h1 class="card-heading simple">${_('Hue Users')}</h1>
 

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

@@ -23,7 +23,7 @@ from django.utils.translation import ugettext as _
 ${ commonheader(_('Hue Users'), "useradmin", user, request) | n,unicode }
 ${ layout.menubar(section='users') }
 
-<div class="container-fluid">
+<div class="useradmin container-fluid">
   <div class="card card-small">
     <h1 class="card-heading simple">${ _('User: %(username)s') % {'username': instance.username} }</h1>
 

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue.css


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue3-extra.css


+ 10 - 0
desktop/core/src/desktop/static/desktop/less/hue-cross-version.less

@@ -534,3 +534,13 @@ ul.errorlist {
 .monospace {
   font-family: @font-family-monospace;
 }
+
+.form-actions {
+  position: fixed;
+  bottom: 0;
+  margin: 0;
+  margin-left: -24px;
+  z-index: 1000;
+  padding-left: 20px !important;
+  border-top: 1px solid @cui-gray-100;
+}

+ 0 - 5
desktop/core/src/desktop/static/desktop/less/hue.less

@@ -1012,11 +1012,6 @@ a:visited {
   color: @cui-gray-600;
 }
 
-.form-actions {
-  width: initial!important;
-  position: static!important;
-}
-
 #clearNotificationHistoryModal {
   z-index: 10000;
 }

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

@@ -690,6 +690,17 @@ from metadata.conf import has_optimizer, OPTIMIZER
         }
       }, 200);
     }
+
+    var pageWidth = $(window).width();
+    if ($('.page-content').length > 0) {
+      pageWidth = $('.page-content').width();
+    }
+    else if ($('.content-panel').length > 0) {
+      pageWidth = $('.content-panel').width();
+      document.styleSheets[0].addRule('.form-actions','margin-left: -11px !important');
+    }
+
+    document.styleSheets[0].addRule('.form-actions','width: ' + pageWidth + 'px');
   });
 
   function resetPrimaryButtonsStatus() {

+ 15 - 0
desktop/core/src/desktop/templates/hue.mako

@@ -667,6 +667,20 @@ ${ smart_unicode(login_modal(request).content) | n,unicode }
           })
         });
 
+        huePubSub.subscribe('resize.form.actions', function () {
+          document.styleSheets[0].addRule('.form-actions','width: ' + $('.page-content').width() + 'px');
+          if ($('.content-panel:visible').length > 0) {
+            document.styleSheets[0].addRule('.form-actions','margin-left: -11px !important');
+          }
+        });
+
+        huePubSub.subscribe('split.panel.resized', function() {
+          huePubSub.publish('resize.form.actions');
+        });
+
+        huePubSub.publish('resize.form.actions');
+
+
         huePubSub.subscribe('open.editor.new.query', function (statementOptions) {
           self.loadApp('editor'); // Should open in Default
 
@@ -866,6 +880,7 @@ ${ smart_unicode(login_modal(request).content) | n,unicode }
           $('.embeddable').hide();
           $('#embeddable_' + app).show();
           huePubSub.publish('app.gained.focus', app);
+          huePubSub.publish('resize.form.actions');
         };
 
         self.dropzoneError = function (filename) {

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
desktop/libs/indexer/src/indexer/static/indexer/css/importer.css


+ 0 - 8
desktop/libs/indexer/src/indexer/static/indexer/less/importer.less

@@ -180,14 +180,6 @@
     vertical-align: top;
   }
 
-  .form-actions {
-    position: fixed;
-    bottom: 0;
-    margin: 0;
-    z-index: 1000;
-    border-top: 1px solid @cui-gray-100;
-  }
-
   #importerNotebook {
     height: 5px;
     float: right;

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

@@ -2084,8 +2084,8 @@ ${ assist.assistPanel() }
 
     function resizeElements () {
       var $contentPanel = $('#importerComponents').find('.content-panel-inner');
-      $('.form-actions').width($contentPanel.width() - 50);
       $('.step-indicator-fixed').width($contentPanel.width());
+      document.styleSheets[0].addRule('.form-actions','margin-left: -11px !important');
       document.styleSheets[0].addRule('.step-indicator li:first-child:before','max-width: ' + ($contentPanel.find('.step-indicator li:first-child .caption').width()) + 'px');
       document.styleSheets[0].addRule('.step-indicator li:first-child:before','left: ' + ($contentPanel.find('.step-indicator li:first-child .caption').width()/2) + 'px');
       document.styleSheets[0].addRule('.step-indicator li:last-child:before','max-width: ' + ($contentPanel.find('.step-indicator li:last-child .caption').width()) + 'px');

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

@@ -95,12 +95,6 @@ ${ assist.assistPanel() }
     vertical-align: top;
   }
 
-  .form-actions {
-    position: fixed;
-    bottom: 0;
-    margin: 0;
-  }
-
   #notebook {
     height: 5px;
     margin-top: 10px;

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác