Changeset 729 for trunk

Timestamp:

Nov 30, 2010, 8:35:53 AM (14 years ago)

Author:

gav

Message:

Graphical touch up of task show view with icons.

Location:

trunk

Files:

• grails-app/views/taskDetailed/show.gsp (modified) (3 diffs)
• web-app/css/main.css (modified) (1 diff)
• web-app/images/skin/bullet_go.png (added)
• web-app/images/skin/cog.png (added)
• web-app/images/skin/cog_add.png (added)

trunk/grails-app/views/taskDetailed/show.gsp

@@ -27 +27 @@
                 <h1>
                     Task #${taskInstance.id}
+
+                    <g:if test="${taskInstance.approved}" >
+                        <img  src="${resource(dir:'images/skin',file:'cog.png')}" alt="Approved" title="Approved" />
+                    </g:if>
+                    <g:if test="${taskInstance.taskStatus.id == 2}" >
+                        <img  src="${resource(dir:'images/skin',file:'bullet_go.png')}" alt="In Progress" title="In Progress" />
+                    </g:if>
                     <g:if test="${taskInstance.attentionFlag}" >
                         <img  src="${resource(dir:'images/skin',file:'flag_red.png')}" alt="Attention Flag" title="Attention Flag" />
@@ -33 +40 @@
                         <img  src="${resource(dir:'images/skin',file:'tick.png')}" alt="Complete" title="Complete" />
                     </g:if>
-                    <g:if test="${taskInstance.safetyRequirement}" >
-                        <img  src="${resource(dir:'images/skin',file:'lightning.png')}" alt="Safety Requirement" title="Safety Requirement" />
-                    </g:if>
-                    <g:if test="${taskInstance.regulatoryRequirement}" >
-                        <img  src="${resource(dir:'images/skin',file:'script_lightning.png')}" alt="Regulatory Requirement" title="Regulatory Requirement" />
-                    </g:if>
-                    <g:if test="${taskInstance.mandatoryRequirement}" >
-                        <img  src="${resource(dir:'images/skin',file:'script.png')}" alt="Mandatory Requirement" title="Mandatory Requirement" />
-                    </g:if>
                 </h1>
                 ${fieldValue(bean:taskInstance, field:'description')}
+                <g:if test="${taskInstance.safetyRequirement}" >
+                    <img  src="${resource(dir:'images/skin',file:'lightning.png')}" alt="Safety Requirement" title="Safety Requirement" />
+                    Safety
+                </g:if>
+                <g:if test="${taskInstance.regulatoryRequirement}" >
+                    <img  src="${resource(dir:'images/skin',file:'script_lightning.png')}" alt="Regulatory Requirement" title="Regulatory Requirement" />
+                    Regulatory
+                </g:if>
+                <g:if test="${taskInstance.mandatoryRequirement}" >
+                    <img  src="${resource(dir:'images/skin',file:'script.png')}" alt="Mandatory Requirement" title="Mandatory Requirement" />
+                    Mandatory
+                </g:if>
             </div>
 
@@ -176 +186 @@
 
                                     <tr class="prop">
-                                        <td valign="top" class="name">Status:</td>
-
-                                        <td valign="top" class="value">${taskInstance?.taskStatus?.encodeAsHTML()}</td>
-
-                                    </tr>
-
-                                    <tr class="prop">
-                                        <td valign="top" class="name">Budget Status:</td>
-
-                                        <td valign="top" class="value">${taskInstance?.taskBudgetStatus?.encodeAsHTML()}</td>
-
-                                    </tr>
-
-                                    <tr class="prop">
-                                        <td valign="top" class="name">Approved:</td>
-
-                                        <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'approved')}</td>
-
-                                    </tr>
-
-                                    <tr class="prop">
                                         <td valign="top" class="name">Positive Fault:</td>
 

trunk/web-app/css/main.css

@@ -494 +494 @@
 }
 .buttons input.approve {
-    background: transparent url(../images/skin/database_gear.png) 5px 50% no-repeat;
+    background: transparent url(../images/skin/cog_add.png) 5px 50% no-repeat;
     padding-left: 28px;
 }