소스 검색

HUE-767 [jb] Make kill column not clickable

Hide empty tabs of a retired job
Romain Rigaux 13 년 전
부모
커밋
11c9e52
2개의 변경된 파일30개의 추가작업 그리고 24개의 파일을 삭제
  1. 25 20
      apps/jobbrowser/src/jobbrowser/templates/job.mako
  2. 5 4
      apps/jobbrowser/src/jobbrowser/templates/jobs.mako

+ 25 - 20
apps/jobbrowser/src/jobbrowser/templates/job.mako

@@ -13,13 +13,15 @@
 ## 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.
+
 <%namespace name="comps" file="jobbrowser_components.mako" />
+
 <%!
-  from jobbrowser.views import format_counter_name
-  from filebrowser.views import location_to_url
   import os
-  import re
+  from jobbrowser.views import format_counter_name
+  from filebrowser.views import location_to_url  
   from desktop.views import commonheader, commonfooter
+
   from django.template.defaultfilters import urlencode
   from django.utils.translation import ugettext as _
 %>
@@ -42,6 +44,7 @@
         </tbody>
     </table>
 </%def>
+
 <%def name="rows_for_conf_vars(rows)">
     %  for k, v in rows.iteritems():
         <tr>
@@ -92,8 +95,10 @@ ${commonheader(_('Job: %(jobId)s - Job Browser') % dict(jobId=job.jobId), "jobbr
                     </li>
                     % if job.status.lower() == 'running' or job.status.lower() == 'pending':
                         <li class="nav-header">${_('Kill Job')}</li>
-                        <li><a href="#" title="${_('Kill this job')}" onclick="$('#kill-job').submit()">${_('Kill this job')}</a>
-                        <form id="kill-job" action="${url('jobbrowser.views.kill_job', jobid=job.jobId)}?next=${request.get_full_path()|urlencode}" method="POST"></form></li>
+                        <li>
+                          <a href="#" title="${_('Kill this job')}" onclick="$('#kill-job').submit()">${_('Kill this job')}</a>
+                          <form id="kill-job" action="${url('jobbrowser.views.kill_job', jobid=job.jobId)}?next=${request.get_full_path()|urlencode}" method="POST"></form>
+                        </li>
                     % endif
                     % if not job.is_retired:
                         <li class="nav-header">${_('Maps:')}</li>
@@ -131,7 +136,9 @@ ${commonheader(_('Job: %(jobId)s - Job Browser') % dict(jobId=job.jobId), "jobbr
             <ul class="nav nav-tabs">
                 <li class="active"><a href="#tasks" data-toggle="tab">${_('Tasks')}</a></li>
                 <li><a href="#metadata" data-toggle="tab">${_('Metadata')}</a></li>
+                % if not job.is_retired:
                 <li><a href="#counters" data-toggle="tab">${_('Counters')}</a></li>
+                % endif
             </ul>
 
             <div class="tab-content">
@@ -140,9 +147,8 @@ ${commonheader(_('Job: %(jobId)s - Job Browser') % dict(jobId=job.jobId), "jobbr
                        ${ _('This jobs is ')} <span class="label label-warning">${ _('retired') }</span> ${ _(' and so has little information available.') }
                        <br/>
                        <br/>
-                    % endif
-
-                    %if failed_tasks:
+                    % else:
+                        %if failed_tasks:
                             <div>
                                 <h3>
                                     <a href="${url('jobbrowser.views.tasks', jobid=job.jobId)}?taskstate=failed">${_('View Failed Tasks')} &raquo;</a>
@@ -152,17 +158,17 @@ ${commonheader(_('Job: %(jobId)s - Job Browser') % dict(jobId=job.jobId), "jobbr
                                 ${task_table(failed_tasks)}
                                 </div>
                             </div>
-                    %endif
-                    <div>
-                        <a style="float:right;margin-right:10px" href="${url('jobbrowser.views.tasks', jobid=job.jobId)}">${_('View All Tasks')} &raquo;</a>
-                        <h3>
-                            ${_('Recent Tasks')}
-                        </h3>
+                        %endif
                         <div>
-                            ${task_table(recent_tasks)}
+                            <a style="float:right;margin-right:10px" href="${url('jobbrowser.views.tasks', jobid=job.jobId)}">${_('View All Tasks')} &raquo;</a>
+                            <h3>
+                                ${_('Recent Tasks')}
+                            </h3>
+                            <div>
+                                ${task_table(recent_tasks)}
+                            </div>
                         </div>
-                    </div>
-
+                    % endif
                 </div>
                 <div id="metadata" class="tab-pane">
                     <div class="well hueWell">
@@ -223,8 +229,7 @@ ${commonheader(_('Job: %(jobId)s - Job Browser') % dict(jobId=job.jobId), "jobbr
                         <th>${_('Value')}</th>
                         </thead>
                         <tbody>
-
-                                % for key, value in sorted(job.full_job_conf.items()):
+                            % for key, value in sorted(job.full_job_conf.items()):
                                 <tr>
                                     <td width="20%">${key}</td>
                                     <td>
@@ -233,7 +238,7 @@ ${commonheader(_('Job: %(jobId)s - Job Browser') % dict(jobId=job.jobId), "jobbr
                                         </div>
                                     </td>
                                 </tr>
-                                % endfor
+                            % endfor
                         </tbody>
                     </table>
 

+ 5 - 4
apps/jobbrowser/src/jobbrowser/templates/jobs.mako

@@ -88,7 +88,7 @@ ${commonheader(_('Job Browser'), "jobbrowser")}
             <th>${_('Priority')}</th>
             <th>${_('Duration')}</th>
             <th>${_('Date')}</th>
-            <th></th>
+            <th data-row-selector-exclude="true"></th>
         </tr>
     </thead>
     <tbody>
@@ -128,7 +128,7 @@ ${commonheader(_('Job Browser'), "jobbrowser")}
             </td>
             <td class="center">${job.queueName}</td>
             <td class="center">${job.priority.lower()}</td>
-            <td class="center">
+            <td class="center" data-row-selector-exclude="true">
                 <span alt="${job.finishTimeMs-job.startTimeMs}">
                     % if job.is_retired:
                         ${_('N/A')}
@@ -141,7 +141,9 @@ ${commonheader(_('Job Browser'), "jobbrowser")}
             <td>
                 % if job.status.lower() == 'running' or job.status.lower() == 'pending':
                 % if request.user.is_superuser or request.user.username == job.user:
-                <a href="#" title="${_('Kill this job')}" kill-action="${url('jobbrowser.views.kill_job', jobid=job.jobId)}?next=${request.get_full_path()|urlencode}" data-backdrop="static" data-keyboard="true" class="btn btn-mini kill"><i class="icon-remove"></i> ${_('Kill')}</a>
+                <a href="#" title="${_('Kill this job')}" kill-action="${url('jobbrowser.views.kill_job', jobid=job.jobId)}?next=${request.get_full_path()|urlencode}" data-row-selector-exclude="true" data-keyboard="true" class="btn btn-mini kill">
+                  <i class="icon-remove"></i> ${_('Kill')}
+                </a>
                 % endif
                 % endif
             </td>
@@ -209,7 +211,6 @@ ${commonheader(_('Job Browser'), "jobbrowser")}
         $(".kill").live("click", function(e){
             $("#kill-job").attr("action", $(e.target).attr("kill-action"));
             $("#killModal").modal({
-                backdrop: "static",
                 keyboard: true,
                 show: true
             });