Преглед изворни кода

HUE-850 [core] Bootstraps 2.1 breaking some pages

Fixed layout for a few tables, forms and components of different apps
Enrico Berti пре 13 година
родитељ
комит
4d8606c5a9

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

@@ -330,7 +330,8 @@ ${layout.menubar(section='query')}
             placement: 'bottom'
         });
         // hack!!!
-        $("select").addClass("span8");
+        $("select:not(#id_query_servers-server)").addClass("span8");
+        $("#id_query_servers-server").addClass("span12");
 
         $("a[data-form-prefix]").each(function(){
             var _prefix = $(this).attr("data-form-prefix");

+ 5 - 3
apps/filebrowser/src/filebrowser/templates/listdir_components.mako

@@ -54,7 +54,7 @@ from django.utils.translation import ugettext as _
         }
     </style>
 
-    <table class="table table-striped datatables" data-bind="">
+    <table class="table table-striped table-condensed datatables" data-bind="">
         <thead>
             <tr>
                 <th width="1%"><input id="selectAll" type="checkbox" data-bind="click: selectAll, checked: allSelected"/></th>
@@ -89,11 +89,13 @@ from django.utils.translation import ugettext as _
     <script id="fileTemplate" type="text/html">
         <tr style="cursor: pointer">
             <td class="center">
+                <label class="checkbox">
                 <input data-bind="value: path, checked: selected, visible: name != '..'" type="checkbox" data-row-selector-exclude="true"  />
+                </label>
             </td>
             <td data-bind="click: $root.viewFile" class="left"><i data-bind="css: {'icon-file': type == 'file', 'icon-folder-close': type != 'file'}"></i></td>
             <td data-bind="click: $root.viewFile">
-                <h5><a href="#" data-bind="click: $root.viewFile, text: name"></a></h5>
+                <strong><a href="#" data-bind="click: $root.viewFile, text: name"></a></strong>
             </td>
             <td data-bind="click: $root.viewFile">
                 <span data-bind="visible: type=='file', text: stats.size"></span>
@@ -101,7 +103,7 @@ from django.utils.translation import ugettext as _
             <td data-bind="click: $root.viewFile, text: stats.user"></td>
             <td data-bind="click: $root.viewFile, text: stats.group"></td>
             <td data-bind="click: $root.viewFile, text: permissions"></td>
-            <td data-bind="click: $root.viewFile, text: stats.mtime"></td>
+            <td data-bind="click: $root.viewFile, text: stats.mtime" style="white-space: nowrap;"></td>
         </tr>
     </script>
 

+ 2 - 2
apps/jobbrowser/src/jobbrowser/templates/jobbrowser_components.mako

@@ -92,15 +92,15 @@
 
 <%def name="mr_graph_maps(job)">
     <div class="progress ${get_bootstrap_class(job, 'progress')}">
-        <div class="bar" style="width: ${job.maps_percent_complete}%;"></div>
         <div class="bar-label">${job.finishedMaps} / ${job.desiredMaps}</div>
+        <div class="bar" style="margin-top:-20px;width: ${job.maps_percent_complete}%;"></div>
     </div>
 </%def>
 
 <%def name="mr_graph_reduces(job)">
     <div class="progress ${get_bootstrap_class(job, 'progress')}">
-        <div class="bar" style="width: ${job.reduces_percent_complete}%;"></div>
         <div class="bar-label">${job.finishedReduces} / ${job.desiredReduces}</div>
+        <div class="bar" style="margin-top:-20px;width: ${job.reduces_percent_complete}%;"></div>
     </div>
 </%def>
 

+ 2 - 2
apps/oozie/src/oozie/templates/editor/coordinator_properties.mako

@@ -36,8 +36,8 @@
         </thead>
         <tbody data-bind="foreach: ${ element }">
           <tr>
-            <td><input class="required" data-bind="value: name, uniqueName: false" /></td>
-            <td><input class="required" data-bind="value: value, uniqueName: false" /></td>
+            <td><input type="text" class="required" data-bind="value: name, uniqueName: false" /></td>
+            <td><input type="text" class="required" data-bind="value: value, uniqueName: false" /></td>
             <td><a class="btn btn-small" href="#" data-bind="click: $root.remove_${ element }">${ _('Delete') }</a></td>
           </tr>
         </tbody>

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

@@ -504,7 +504,8 @@ ${ layout.menubar(section='coordinators') }
     ko.applyBindings(window.viewModel);
 
     $("*[rel=popover]").popover({
-      placement: 'right'
+      placement: 'right',
+      trigger: 'hover'
     });
  });
 </script>

+ 9 - 8
apps/oozie/src/oozie/templates/editor/edit_workflow.mako

@@ -32,14 +32,14 @@ ${ layout.menubar(section='workflows') }
 
   <div class="well">
     ${ _('Description:') } ${ workflow.description or "N/A" }
-    <div class="control-group pull-right">
-      <label class="control-label"></label>
-      <div class="controls">
-        <a href="/filebrowser/view${ workflow.deployment_dir }" class="btn">
-          ${ _('Upload') }
-        </a> ${ _('files to deployment directory') }
+    <div class="pull-right" style="margin-top:-5px">
+        <label>
+            <a href="/filebrowser/view${ workflow.deployment_dir }" class="btn">
+              ${ _('Upload') }
+            </a>
+            ${ _('files to deployment directory') }
+        </label>
       </div>
-    </div>
   </div>
 
   <ul class="nav nav-tabs">
@@ -301,7 +301,8 @@ modal-window .modal-content {
     $("a[data-row-selector='true']").jHueRowSelector();
 
     $("*[rel=popover]").popover({
-      placement: 'right'
+      placement: 'right',
+      trigger: 'hover'
     });
   });
 </script>

+ 11 - 10
apps/oozie/src/oozie/templates/editor/edit_workflow_action.mako

@@ -80,10 +80,10 @@ ${ layout.menubar(section='workflows') }
               <tbody data-bind="foreach: prepares">
                 <tr>
                   <td>
-                    <span class="span3 required" data-bind="text: type" />
+                    <span class="span4 required" data-bind="text: type" />
                   </td>
                   <td>
-                    <input class="input span5 required pathChooserKo" data-bind="fileChooser: $data, value: value, uniqueName: false" />
+                    <input type="text" class="input span4 required pathChooserKo" data-bind="fileChooser: $data, value: value, uniqueName: false" />
                   </td>
                   <td><a class="btn" href="#" data-bind="click: $root.removePrepare">${ _('Delete') }</a></td>
                 </tr>
@@ -118,10 +118,10 @@ ${ layout.menubar(section='workflows') }
               <tbody data-bind="foreach: params">
                 <tr>
                   <td>
-                    <span class="span3 required" data-bind="text: type" />
+                    <span class="span4 required" data-bind="text: type" />
                   </td>
                   <td>
-                    <input class="input span5 required pathChooserKo" data-bind="fileChooser: $data, value: value, uniqueName: false" />
+                    <input type="text" class="input span4 required pathChooserKo" data-bind="fileChooser: $data, value: value, uniqueName: false" />
                   </td>
                   <td><a class="btn" href="#" data-bind="click: $root.removeParam">${ _('Delete') }</a></td>
                 </tr>
@@ -165,9 +165,9 @@ ${ layout.menubar(section='workflows') }
             </thead>
             <tbody data-bind="foreach: properties">
               <tr>
-                <td><input class="span4 required propKey" data-bind="value: name, uniqueName: false" /></td>
-                <td class="pathChooserKo"><input class="span5 required pathChooserKo" data-bind="fileChooser: $data, value: value, uniqueName: false" /></td>
-                <td><a class="btn btn-small" href="#" data-bind="click: $root.removeProp">${ _('Delete') }</a></td>
+                <td><input type="text" class="span4 required propKey" data-bind="value: name, uniqueName: false" /></td>
+                <td><input type="text" class="span4 required pathChooserKo" data-bind="fileChooser: $data, value: value, uniqueName: false" /></td>
+                <td><a class="btn" href="#" data-bind="click: $root.removeProp">${ _('Delete') }</a></td>
               </tr>
             </tbody>
           </table>
@@ -192,7 +192,7 @@ ${ layout.menubar(section='workflows') }
               <table class="table-condensed designTable" data-bind="visible: files().length > 0">
                 <tbody data-bind="foreach: files">
                   <tr>
-                    <td><input class="input span5 required pathChooserKo"
+                    <td><input type="text" class="input span5 required pathChooserKo"
                             data-bind="fileChooser: $data, value: name, uniqueName: false" />
                     </td>
                     <td><a class="btn" href="#" data-bind="click: $root.removeFile">${ _('Delete') }</a></td>
@@ -219,7 +219,7 @@ ${ layout.menubar(section='workflows') }
             <tbody data-bind="foreach: archives">
               <tr>
                 <td>
-                  <input class="input span5 required pathChooserKo"
+                  <input type="text" class="input span5 required pathChooserKo"
                       data-bind="fileChooser: $data, value: name, uniqueName: false" />
                 </td>
                 <td><a class="btn" href="#" data-bind="click: $root.removeArchive">${ _('Delete') }</a></td>
@@ -464,7 +464,8 @@ ${ layout.menubar(section='workflows') }
     $(".propKey").each(addAutoComplete);
 
     $("*[rel=popover]").popover({
-      placement: 'right'
+      placement: 'right',
+      trigger: 'hover'
     });
   });
 </script>

+ 2 - 2
apps/oozie/src/oozie/templates/editor/job_action_properties.mako

@@ -36,8 +36,8 @@
         </thead>
         <tbody data-bind="foreach: ${ element }">
           <tr>
-            <td><input class="required" data-bind="value: name, uniqueName: false" /></td>
-            <td><input class="required" data-bind="value: value, uniqueName: false" /></td>
+            <td><input type="text" class="required" data-bind="value: name, uniqueName: false" /></td>
+            <td><input type="text" class="required" data-bind="value: value, uniqueName: false" /></td>
             <td><a class="btn btn-small" href="#" data-bind="click: $root.remove_${ element }">${ _('Delete') }</a></td>
           </tr>
         </tbody>

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

@@ -37,7 +37,7 @@ ${layout.menubar(section='groups', _=_)}
             ${_('Filter: ')}<input type="text" id="filterInput" class="input-xxlarge search-query" placeholder="${_('Search for group name, members, etc...')}">
         </form>
     </div>
-    <table class="table table-striped datatables">
+    <table class="table table-striped table-condensed datatables">
     <thead>
       <tr>
         <th>${_('Group Name')}</th>
@@ -84,7 +84,7 @@ ${layout.menubar(section='groups', _=_)}
                     { "sWidth": "20%" },
                     null,
                     %if user.is_superuser == True:
-                    { "sWidth": "120px", "bSortable": false },
+                    { "sWidth": "140px", "bSortable": false },
                     %endif
                  ]
             });

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

@@ -32,7 +32,7 @@ ${layout.menubar(section='permissions', _=_)}
                 ${_('Filter: ')}<input type="text" id="filterInput" class="input-xxlarge search-query" placeholder="${_('Search for application name, description, etc...')}">
         </form>
     </div>
-    <table class="table table-striped datatables">
+    <table class="table table-striped table-condensed datatables">
         <thead>
         <tr>
             <th>${_('Application')}</th>

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

@@ -38,7 +38,7 @@ ${layout.menubar(section='users', _=_)}
             ${_('Filter: ')}<input type="text" id="filterInput" class="input-xxlarge search-query" placeholder="${_('Search for username, name, e-mail, etc...')}">
         </form>
     </div>
-    <table class="table table-striped datatables">
+    <table class="table table-striped table-condensed datatables">
         <thead>
             <tr>
                 <th>${_('Username')}</th>

+ 1 - 2
desktop/core/static/css/hue2.css

@@ -102,6 +102,7 @@
     overflow: hidden;
     background-color: #01639c;
     border-right: 1px solid #2c7fb3;
+    border-left: 0;
 }
 
 .navbar .nav > li > a {
@@ -933,8 +934,6 @@ div.box {
 }
 
 .bar-label {
-    margin-top: -18px;
-    position: relative;
     text-align: center;
     color: #FFFFFF;
     font-size: 12px;

+ 2 - 3
desktop/core/static/ext/css/fileuploader.css

@@ -8,9 +8,8 @@
     padding: 4px 10px 4px;
     margin-bottom: 0;
     *margin-left: .3em;
-    font-size: 13px;
-    line-height: 18px;
-    *line-height: 20px;
+    font-size: 14px;
+    line-height: 20px;
     color: #333333;
     text-align: center;
     text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);