Browse Source

HUE-1176 [jb] Broken image link 'static/art/login-spinner.gif'

Corrected paths to spinner gif
Updated background colors for killed jobs from red to grey
Paul McCaughtry 11 years ago
parent
commit
59b6259

+ 6 - 3
apps/jobbrowser/src/jobbrowser/templates/job_attempt_logs.mako

@@ -51,19 +51,22 @@ ${ comps.menubar() }
             <div class="tab-content">
               <div class="tab-pane active" id="stdout">
                 <pre id="stdout-container">
-                  ${_('Loading...')} <img src="/static/art/login-spinner.gif">
+                  <!--[if !IE]> --><i class="fa fa-spinner fa-spin"></i><!-- <![endif]-->
+                  <!--[if IE]><img src="/static/art/spinner.gif" /><![endif]-->
                 </pre>
               </div>
 
               <div class="tab-pane" id="stderr">
                 <pre id="stderr-container">
-                  ${_('Loading...')} <img src="/static/art/login-spinner.gif">
+                  <!--[if !IE]> --><i class="fa fa-spinner fa-spin"></i><!-- <![endif]-->
+                  <!--[if IE]><img src="/static/art/spinner.gif" /><![endif]-->
                 </pre>
               </div>
 
               <div class="tab-pane" id="syslog">
                 <pre id="syslog-container">
-                  ${_('Loading...')} <img src="/static/art/login-spinner.gif">
+                  <!--[if !IE]> --><i class="fa fa-spinner fa-spin"></i><!-- <![endif]-->
+                  <!--[if IE]><img src="/static/art/spinner.gif" /><![endif]-->
                 </pre>
               </div>
             </div>

+ 3 - 1
apps/jobbrowser/src/jobbrowser/templates/jobbrowser_components.mako

@@ -185,7 +185,7 @@
     additional_class = get_bootstrap_class(job, 'label')
     %>
     % if job.is_retired and not job.is_mr2:
-        <span class="label ${additional_class}"><i class="fa fa-briefcase" style="color: #FFFFFF" title="${ _('Retired') }"></i> ${job.status.lower()}</span>
+        <span class="label ${additional_class}"><i class="fa fa-briefcase" style="color: #fff" title="${ _('Retired') }"></i> ${job.status.lower()}</span>
     % else:
         <span class="label ${additional_class}">${job.status.lower()}</span>
     % endif
@@ -211,6 +211,8 @@
         additional_class += '-warning'
     elif status == 'ready':
         additional_class += '-success'
+    elif status == 'killed':
+        additional_class += '-inverse'
     else:
         if (prefix == 'label'):
             additional_class += '-important'

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

@@ -52,7 +52,7 @@ ${ components.menubar() }
         <a class="btn btn-status btn-success" data-value="completed">${ _('Succeeded') }</a>
         <a class="btn btn-status btn-warning" data-value="running">${ _('Running') }</a>
         <a class="btn btn-status btn-danger disable-feedback" data-value="failed">${ _('Failed') }</a>
-        <a class="btn btn-status btn-danger disable-feedback" data-value="killed">${ _('Killed') }</a>
+        <a class="btn btn-status btn-inverse disable-feedback" data-value="killed">${ _('Killed') }</a>
       </span>
     </%def>
   </%actionbar:render>