Project

General

Profile

« Previous | Next » 

Revision 36207

Added by Nikon Gasparis over 9 years ago

css fixes

View differences:

modules/uoa-validator-web/trunk/src/main/webapp/jsps/browseJobsCompTestsTab.jsp
22 22
          <s:iterator  value="compTests" var="job">
23 23
<tr class="${property % 2 == 0 ? 'even' : 'odd'}">
24 24
<%--                                                         <td ><s:property value="validationType"/></td> --%>
25
                  <s:if test="%{#job.contentJobStatus.equals(\"finished\") && #job.usageJobStatus.equals(\"none\")}">
25
                  <s:if test="%{!#job.contentJobStatus.equals(\"none\") && #job.usageJobStatus.equals(\"none\")}">
26 26
                  	<td rowspan="2"><s:text name="browseJobs.oai.content"/></td>
27 27
                   <td rowspan="2" class="wrapword"><s:property value="contentJobStatus"/></td>
28 28
                   <td rowspan="2" class="wrapword"><s:property value="contentJobScore"/></td>   
29 29
                  </s:if>
30
                  <s:elseif test="%{#job.usageJobStatus.equals(\"finished\") && #job.contentJobStatus.equals(\"none\")}">
30
                  <s:elseif test="%{!#job.usageJobStatus.equals(\"none\") && #job.contentJobStatus.equals(\"none\")}">
31 31
                  	<td rowspan="2"><s:text name="browseJobs.oai.usage"/></td>
32 32
                   <td rowspan="2" class="wrapword"><s:property value="usageJobStatus"/></td>
33 33
                   <td rowspan="2" class="wrapword"><s:property value="usageJobScore"/></td>   
34 34
                  </s:elseif>
35
<s:elseif test="%{!#job.contentJobStatus.equals(\"none\") && !#job.usageJobStatus.equals(\"none\")}">
35
				 <s:elseif test="%{!#job.contentJobStatus.equals(\"none\") && !#job.usageJobStatus.equals(\"none\")}">
36 36
                  	<td ><s:text name="browseJobs.oai.content"/></td>
37 37
                   <td class="wrapword"><s:property value="contentJobStatus"/></td>
38 38
                   <td class="wrapword"><s:property value="contentJobScore"/></td>   
......
62 62
                  	<s:else>
63 63
                  		<td class="validationInProgress" rowspan="2"><s:property value="recordsTested"/> records tested so far..</td>
64 64
</s:else>
65
            	   <s:if test="%{(#job.contentJobScore > 50  && #job.usageJobScore > 50) || (#job.contentJobScore > 50 && #job.usageJobS.equals(\"none\")) || (#job.usageJobScore > 50 && #job.contentJobStatus.equals(\"none\"))}">
65
            	   <s:if test="%{(#job.contentJobScore > 50  && #job.usageJobScore > 50) || (#job.contentJobScore > 50 && #job.usageJobStatus.equals(\"none\")) || (#job.usageJobScore > 50 && #job.contentJobStatus.equals(\"none\"))}">
66 66
               <td rowspan="2" class="job_success"></td>
67 67
              </s:if>
68 68
              <s:elseif test="%{#job.contentJobStatus.equals(\"ongoing\") || #job.usageJobStatus.equals(\"ongoing\")}">
......
74 74
              </tr>
75 75
              <tr class="${property % 2 == 1 ? 'even' : 'odd'}">
76 76
<%--                                                         <td ><s:property value="validationType"/></td> --%>
77
<s:if test="%{!#job.contentJobStatus.equals(\"none\") && !#job.usageJobStatus.equals(\"none\")}">
77
					<s:if test="%{!#job.contentJobStatus.equals(\"none\") && !#job.usageJobStatus.equals(\"none\")}">
78 78
                  	<td ><s:text name="browseJobs.oai.usage"/></td>
79 79
                  	<td class="wrapword"><s:property value="usageJobStatus"/></td>
80 80
                  	<td class="wrapword"><s:property value="usageJobScore"/></td>

Also available in: Unified diff