Project

General

Profile

« Previous | Next » 

Revision 35421

Added by Nikon Gasparis about 9 years ago

css fixes for workflow jobs

View differences:

modules/uoa-validator-web/trunk/src/main/webapp/jsps/js/browseJobs.js
90 90
        ajaxCall();
91 91
        
92 92
    });
93
// 	setInterval(ajaxCall,5000);
93
 	setInterval(ajaxCall,10000);
94 94

  
95 95

  
96 96
});
modules/uoa-validator-web/trunk/src/main/webapp/jsps/browseJobsWorkflowsTab.jsp
1 1
<%@ taglib prefix="s" uri="/struts-tags"%>
2 2
   <jsp:include page="pagination.jsp"/>
3
   <table class="zebra" width="100%">
3
   <table class="zebra2" width="100%">
4 4
        <thead>
5 5
            <tr>
6 6
<%--                                                     <th scope="col" style="width:12%"><s:text name="browseJobs.validationType"/></th> --%>
......
13 13
                <th scope="col" style="width:14%"><s:text name="browseJobs.mdStore"/></th>
14 14
                <th scope="col" style="width:14%"><s:text name="browseJobs.guidelines"/></th>
15 15
                <th scope="col" style="width:5%"><s:text name="browseJobs.details"/></th>
16
                <th scope="col" style="width:5%"></th>
16 17
            </tr>
17 18
        </thead>
18 19
        <tbody>
......
27 28
                    <td class="wrapword"><s:property value="duration"/></td>
28 29
                    <td class="wrapword"><s:property value="baseUrl"/></td>
29 30
                    <td><s:property value="guidelinesShortName"/></td>
31
                    
32
                   <s:if test="%{#job.contentJobStatus.equals(\"finished\")}">
30 33
                    <td>
31
                       	<s:if test="%{!#job.error.equals(\"no errors\")}">
32
                        	<a href='<s:url action="prepareSummary"><s:param name="jobId" value="%{#job.id}"/></s:url>' class="button-default"><s:text name="browseJobs.link2errors"/></a>
33
                        </s:if>	
34
                        <s:elseif test="%{#job.contentJobStatus.equals(\"finished\")}">
35
                        	<a href='<s:url action="prepareSummary"><s:param name="jobId" value="%{#job.id}"/></s:url>' class="button-default"><s:text name="browseJobs.summary"/></a>
36
                        </s:elseif>
37
                        <s:elseif test="%{#job.contentJobStatus.equals(\"finished-failed\")}">
38
                        	 <s:property value="error_information"/>
39
                        </s:elseif> 
40
                        <s:else>                                        
41
                    		<td class="validationInProgress" rowspan="1"><s:property value="recordsTested"/> records tested so far..</td>
42
<%--                                                                 <s:text name="browseJobs.resultNotYet"/> --%>
43
                        </s:else>
44
                        <%--<a href='<s:url action="prepareJobDetails"><s:param name="jobId" value="%{#job.id}"/></s:url>'><s:text name="browseJobs.go"/></a>--%>
45
                    </td>
34
                        <div class = "job_actions_link">
35
                      	<s:if test="%{!#job.error.equals(\"no errors\")}">
36
                        	<a href='<s:url action="prepareSummary"><s:param name="jobId" value="%{#job.id}"/></s:url>' class="view_more"><s:text name="browseJobs.link2errors"/></a>
37
                       </s:if>	
38
                       <s:else>
39
                         		<a href='<s:url action="prepareSummary"><s:param name="jobId" value="%{#job.id}"/></s:url>' class="view_more"><s:text name="browseJobs.summary"/></a>
40
                  		</s:else>
41
                      	</div>
42
                      	
43
                      </td>
44
                    </s:if>
45
                  	<s:else>
46
                  		<td class="validationInProgress"><s:property value="recordsTested"/> records tested so far..</td>
47
					</s:else>
48
					<s:if test="%{(#job.contentJobScore > 50)}">
49
		                <td class="job_success"></td>
50
		            </s:if>
51
		            <s:elseif test="%{#job.contentJobStatus.equals(\"ongoing\")}">
52
		            	<td class="job_ongoing"></td>
53
		            </s:elseif>
54
		            <s:else>
55
		                <td class="job_failure"></td>
56
		            </s:else>
46 57
                </tr>
47 58
            </s:iterator>
48 59
        </tbody>

Also available in: Unified diff