瀏覽代碼

HUE-7379 [fb] Avoid usernames and groups to go to a new line

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

+ 8 - 8
apps/filebrowser/src/filebrowser/templates/listdir_components.mako

@@ -642,22 +642,22 @@ from filebrowser.conf import ENABLE_EXTRACT_UPLOADED_ARCHIVE
       <td>
         <span data-bind="visible: type == 'file', text: stats.size"></span>
       </td>
-      <td>
+      <td class="truncate-text" style="max-width: 150px">
         % if is_fs_superuser:
-        <span data-bind="text: stats.user, visible: !selected() || $root.isCurrentDirSentryManaged() || isSentryManaged"></span>
+        <span data-bind="text: stats.user, visible: !selected() || $root.isCurrentDirSentryManaged() || isSentryManaged, attr: { 'title':  stats.user }"></span>
         <a href="#" rel="tooltip" title="${_('Change owner')}" data-original-title="${_('Change owner')}"
-            data-bind="text: stats.user, visible: !$root.inTrash() && selected() && !$root.isCurrentDirSentryManaged() && !isSentryManaged, click: $root.changeOwner, enable: $root.selectedFiles().length > 0"></a>
+            data-bind="text: stats.user, visible: !$root.inTrash() && selected() && !$root.isCurrentDirSentryManaged() && !isSentryManaged, click: $root.changeOwner, enable: $root.selectedFiles().length > 0, attr: { 'title':  stats.user }"></a>
         % else:
-        <span data-bind="text: stats.user"></span>
+        <span data-bind="text: stats.user, attr: { 'title':  stats.user }"></span>
         % endif
       </td>
-      <td>
+      <td class="truncate-text" style="max-width: 150px">
         % if is_fs_superuser:
-        <span data-bind="text: stats.group, visible: ! selected() || $root.isCurrentDirSentryManaged() || isSentryManaged"></span>
+        <span data-bind="text: stats.group, visible: ! selected() || $root.isCurrentDirSentryManaged() || isSentryManaged, attr: { 'title':  stats.group }"></span>
         <a href="#" rel="tooltip" title="${_('Change group')}" data-original-title="${_('Change group')}"
-            data-bind="text: stats.group, visible: !$root.inTrash() && selected() && !$root.isCurrentDirSentryManaged() && !isSentryManaged, click: $root.changeOwner"></a>
+            data-bind="text: stats.group, visible: !$root.inTrash() && selected() && !$root.isCurrentDirSentryManaged() && !isSentryManaged, click: $root.changeOwner, attr: { 'title':  stats.group }"></a>
         % else:
-        <span data-bind="text: stats.group"></span>
+        <span data-bind="text: stats.group, attr: { 'title':  stats.group }"></span>
         % endif
       </td>
       <td>

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

@@ -30,14 +30,14 @@ ${ comps.menubar() }
       <div class="sidebar-nav" style="padding-top: 0">
         <ul class="nav nav-list">
           <li class="nav-header">${_('Attempt ID')}</li>
-          <li class="white truncate" title="${attempt.attemptId_short}">${attempt.attemptId_short}</li>
+          <li class="white truncate-text" title="${attempt.attemptId_short}">${attempt.attemptId_short}</li>
           <li class="nav-header">${_('Task')}</li>
           <li><a href="${url('jobbrowser.views.single_task', job=joblnk.jobId, taskid=taskid)}"
-                 class="truncate" title="${task.taskId_short}">${task.taskId_short}</a>
+                 class="truncate-text" title="${task.taskId_short}">${task.taskId_short}</a>
           </li>
           <li class="nav-header">${_('Job')}</li>
           <li><a href="${url('jobbrowser.views.single_job', job=joblnk.jobId)}"
-                 class="truncate" title="${joblnk.jobId_short}">${joblnk.jobId_short}</a></li>
+                 class="truncate-text" title="${joblnk.jobId_short}">${joblnk.jobId_short}</a></li>
           <li class="nav-header">${_('Status')}</li>
           <li class="white">
             <%

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

@@ -28,12 +28,12 @@ ${ comps.menubar() }
       <div class="sidebar-nav" style="padding-top: 0">
         <ul class="nav nav-list">
           <li class="nav-header">${_('Attempt ID')}</li>
-          <li class="white truncate" title="${attempt.attemptId_short}">${attempt.attemptId_short}</li>
+          <li class="white truncate-texts" title="${attempt.attemptId_short}">${attempt.attemptId_short}</li>
           <li class="nav-header">${_('Task')}</li>
-          <li><a href="${url('jobbrowser.views.single_task', job=joblnk.jobId, taskid=taskid)}" class="truncate" title="${task.taskId_short}">${task.taskId_short}</a>
+          <li><a href="${url('jobbrowser.views.single_task', job=joblnk.jobId, taskid=taskid)}" class="truncate-text" title="${task.taskId_short}">${task.taskId_short}</a>
           </li>
           <li class="nav-header">${_('Job')}</li>
-          <li><a href="${url('jobbrowser.views.single_job', job=joblnk.jobId)}" class="truncate" title="${joblnk.jobId_short}">${joblnk.jobId_short}</a></li>
+          <li><a href="${url('jobbrowser.views.single_job', job=joblnk.jobId)}" class="truncate-text" title="${joblnk.jobId_short}">${joblnk.jobId_short}</a></li>
           <li class="nav-header">${_('Status')}</li>
           <li class="white">
               <%

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

@@ -107,9 +107,9 @@ ${ comps.menubar() }
       <div class="sidebar-nav" style="padding-top: 0">
         <ul class="nav nav-list">
           <li class="nav-header">${_('App ID')}</li>
-          <li class="white truncate" title="${job.jobId_short}">${job.jobId_short}</li>
+          <li class="white truncate-text" title="${job.jobId_short}">${job.jobId_short}</li>
           <li class="nav-header">${_('Type')}</li>
-          <li class="white truncate" title="${job.applicationType}">${job.applicationType}</li>
+          <li class="white truncate-text" title="${job.applicationType}">${job.applicationType}</li>
           <li class="nav-header">${_('User')}</li>
           <li class="white">${job.user}</li>
           <li class="nav-header">${_('Status')}</li>
@@ -228,9 +228,9 @@ ${ comps.menubar() }
       <div class="sidebar-nav" style="padding-top: 0">
         <ul class="nav nav-list">
           <li class="nav-header">${_('Job ID')}</li>
-          <li class="white truncate" title="${job.jobId_short}">${job.jobId_short}</li>
+          <li class="white truncate-text" title="${job.jobId_short}">${job.jobId_short}</li>
           <li class="nav-header">${_('Type')}</li>
-          <li class="white truncate" title="${job.applicationType or 'MR2'}">${job.applicationType or 'MR2'}</li>
+          <li class="white truncate-text" title="${job.applicationType or 'MR2'}">${job.applicationType or 'MR2'}</li>
           <li class="nav-header">${_('User')}</li>
           <li class="white">${job.user}</li>
           % if job.conf_keys is not None and 'hive.server2.proxy.user' in job.conf_keys:
@@ -449,9 +449,9 @@ ${ comps.menubar() }
       <div class="sidebar-nav" style="padding-top: 0">
         <ul class="nav nav-list">
           <li class="nav-header">${_('App ID')}</li>
-          <li class="white truncate" title="${job.jobId_short}">${job.jobId_short}</li>
+          <li class="white truncate-text" title="${job.jobId_short}">${job.jobId_short}</li>
           <li class="nav-header">${_('Type')}</li>
-          <li class="white truncate" title="${job.applicationType}">${job.applicationType}</li>
+          <li class="white truncate-text" title="${job.applicationType}">${job.applicationType}</li>
           <li class="nav-header">${_('User')}</li>
           <li class="white">${job.user}</li>
           <li class="nav-header">${_('Status')}</li>

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

@@ -29,7 +29,7 @@ ${ comps.menubar() }
       <div class="sidebar-nav" style="padding-top: 0">
         <ul class="nav nav-list">
           <li class="nav-header">${ _('Attempt ID') }</li>
-          <li class="white truncate" title="${ attempt_index }">${ attempt_index }</li>
+          <li class="white truncate-text" title="${ attempt_index }">${ attempt_index }</li>
         </ul>
       </div>
     </div>

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

@@ -34,7 +34,7 @@ ${ comps.menubar() }
       <div class="sidebar-nav" style="padding-top: 0">
         <ul class="nav nav-list">
           <li class="nav-header">${_('Job ID')}</li>
-          <li class="white truncate" title="${ jobid }">${ jobid }</li>
+          <li class="white truncate-text" title="${ jobid }">${ jobid }</li>
         </ul>
       </div>
     </div>

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

@@ -30,9 +30,9 @@ ${ comps.menubar() }
       <div class="sidebar-nav" style="padding-top: 0">
         <ul class="nav nav-list">
           <li class="nav-header">${_('Task ID')}</li>
-          <li class="white truncate" title="${task.taskId_short}">${task.taskId_short}</li>
+          <li class="white truncate-text" title="${task.taskId_short}">${task.taskId_short}</li>
           <li class="nav-header">${_('Job')}</li>
-          <li><a href="${url('jobbrowser.views.single_job', job=joblnk.jobId)}" class="truncate" title="${joblnk.jobId_short}">${joblnk.jobId_short}</a></li>
+          <li><a href="${url('jobbrowser.views.single_job', job=joblnk.jobId)}" class="truncate-text" title="${joblnk.jobId_short}">${joblnk.jobId_short}</a></li>
           <li class="nav-header">${_('Status')}</li>
           <li class="white">
             % if task.state.lower() == 'running' or task.state.lower() == 'pending':

文件差異過大導致無法顯示
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue.css


文件差異過大導致無法顯示
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue3-extra.css


+ 0 - 6
desktop/core/src/desktop/static/desktop/css/hue3.css

@@ -640,12 +640,6 @@ div.navigator > ul > li.oozie > ul.dropdown-menu {
   margin-bottom: 0;
 }
 
-.truncate {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
 .datatables-counter-col {
   width: 10px;
 }

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

@@ -551,3 +551,8 @@ ul.errorlist {
 .btn > svg.hi {
   font-size: 16px;
 }
+
+.truncate-text {
+  .nowrap-ellipsis();
+}
+

部分文件因文件數量過多而無法顯示