Changeset 655 for trunk/grails-app/views
- Timestamp:
- Sep 24, 2010, 2:30:48 AM (14 years ago)
- Location:
- trunk/grails-app/views/assetDetailed
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/views/assetDetailed/edit.gsp
r410 r655 27 27 28 28 <tr class="prop"> 29 <td valign="top" class="name"> 29 <td valign="top" class="groupHeader"> 30 <label for="name">Asset</label> 31 </td> 32 <td valign="top" class="value"> 33 </td> 34 </tr> 35 36 <tr class="prop"> 37 <td valign="top" class="groupName"> 30 38 <label for="name">Name:</label> 31 39 </td> … … 36 44 37 45 <tr class="prop"> 38 <td valign="top" class=" name">46 <td valign="top" class="groupName"> 39 47 <label for="description">Description:</label> 40 48 </td> … … 45 53 46 54 <tr class="prop"> 47 <td valign="top" class=" name">55 <td valign="top" class="groupName"> 48 56 <label for="comment">Comment:</label> 49 57 </td> … … 54 62 55 63 <tr class="prop"> 56 <td valign="top" class=" name">64 <td valign="top" class="groupName"> 57 65 <label for="isActive">Is Active:</label> 58 66 </td> … … 63 71 64 72 <tr class="prop"> 65 <td valign="top" class=" name">73 <td valign="top" class="groupName"> 66 74 <label for="section">Section:</label> 67 75 </td> … … 72 80 73 81 <tr class="prop"> 74 <td valign="top" class=" name">75 <label for="assetExtendedAttributes">Asset Extended Attributes:</label>82 <td valign="top" class="groupHeader">Extended Attributes</td> 83 <td valign="top" style="text-align:left;" class="value"> 76 84 </td> 77 <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'assetExtendedAttributes','errors')}"> 85 </tr> 86 87 <g:each var="a" in="${assetInstance.assetExtendedAttributes.sort { p1, p2 -> p1.extendedAttributeType.name.compareToIgnoreCase(p2.extendedAttributeType.name) }}"> 88 <tr class="prop"> 89 <td valign="top" class="groupName"> 90 ${a.extendedAttributeType.name.encodeAsHTML()}: 91 </td> 78 92 79 <ul> 80 <g:each var="a" in="${assetInstance?.assetExtendedAttributes?}"> 81 <li><g:link controller="assetExtendedAttributeDetailed" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li> 82 </g:each> 83 </ul> 84 <g:link controller="assetExtendedAttributeDetailed" params="['asset.id':assetInstance?.id]" action="create">+Add Extended Attribute</g:link> 85 93 <td valign="top" style="text-align:left;" class="value"> 94 <g:link controller="assetExtendedAttributeDetailed" action="edit" id="${a.id}"> 95 ${a.value.encodeAsHTML()} 96 </g:link> 97 </td> 98 99 </tr> 100 </g:each> 101 102 <tr class="prop"> 103 <td valign="top" class="name"></td> 104 <td valign="top" style="text-align:left;" class="value"> 105 <g:link controller="assetExtendedAttributeDetailed" params="['asset.id':assetInstance?.id]" action="create">+Add Extended Attribute</g:link> 106 </td> 107 </tr> 108 109 <tr class="prop"> 110 <td valign="top" class="groupHeader"> 111 <label for="assetSubItems">Asset Sub Items</label> 112 </td> 113 <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'assetSubItems','errors')}"> 86 114 </td> 87 115 </tr> … … 89 117 <tr class="prop"> 90 118 <td valign="top" class="name"> 91 <label for="assetSubItems">Asset Sub Items:</label>92 119 </td> 93 120 <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'assetSubItems','errors')}"> … … 104 131 105 132 <tr class="prop"> 106 <td valign="top" class=" name">107 <label for="maintenanceActions">Maintenance Actions :</label>133 <td valign="top" class="groupHeader"> 134 <label for="maintenanceActions">Maintenance Actions</label> 108 135 </td> 109 <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'maintenanceActions','errors')}"> 110 111 <ul> 112 <g:each var="m" in="${assetInstance?.maintenanceActions?}"> 113 <li><g:link controller="maintenanceActionDetailed" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li> 114 </g:each> 115 </ul> 116 <g:link controller="maintenanceActionDetailed" params="['asset.id':assetInstance?.id]" action="create">+Add Maintenance Action</g:link> 117 136 <td valign="top" class="value"> 118 137 </td> 119 138 </tr> 139 140 <g:each var="m" in="${assetInstance?.maintenanceActions?}"> 141 <tr class="prop"> 142 <td valign="top" class="name"> 143 </td> 144 <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'maintenanceActions','errors')}"> 145 <g:link controller="maintenanceActionDetailed" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link> 146 </td> 147 </tr> 148 </g:each> 149 150 <tr class="prop"> 151 <td valign="top" class="name"></td> 152 <td valign="top" style="text-align:left;" class="value"> 153 <g:link controller="maintenanceActionDetailed" params="['asset.id':assetInstance?.id]" action="create">+Add Maintenance Action</g:link> 154 </td> 155 </tr> 120 156 121 157 </tbody> -
trunk/grails-app/views/assetDetailed/show.gsp
r370 r655 19 19 20 20 <tr class="prop"> 21 <td valign="top" class="name">Id:</td> 21 <td valign="top" class="groupHeader"> 22 <label for="name">Asset</label> 23 </td> 24 <td valign="top" class="value"> 25 </td> 26 </tr> 27 28 <tr class="prop"> 29 <td valign="top" class="groupName">Id:</td> 22 30 23 31 <td valign="top" class="value">${fieldValue(bean:assetInstance, field:'id')}</td> … … 26 34 27 35 <tr class="prop"> 28 <td valign="top" class=" name">Asset:</td>36 <td valign="top" class="groupName">Name:</td> 29 37 30 38 <td valign="top" style="text-align:left;" class="value"> 31 <g:render template="/shared/assetTree" />39 ${assetInstance.name.encodeAsHTML()} 32 40 </td> 33 41 … … 35 43 36 44 <tr class="prop"> 37 <td valign="top" class=" name">Description:</td>45 <td valign="top" class="groupName">Description:</td> 38 46 39 47 <td valign="top" class="value">${fieldValue(bean:assetInstance, field:'description')}</td> … … 42 50 43 51 <tr class="prop"> 44 <td valign="top" class=" name">Comment:</td>52 <td valign="top" class="groupName">Comment:</td> 45 53 46 54 <td valign="top" class="value">${fieldValue(bean:assetInstance, field:'comment')}</td> … … 49 57 50 58 <tr class="prop"> 51 <td valign="top" class=" name">Is Active:</td>59 <td valign="top" class="groupName">Is Active:</td> 52 60 53 61 <td valign="top" class="value">${fieldValue(bean:assetInstance, field:'isActive')}</td> … … 56 64 57 65 <tr class="prop"> 58 <td valign="top" class=" name">Section:</td>66 <td valign="top" class="groupName">Section:</td> 59 67 60 68 <td valign="top" class="value"><g:link controller="sectionDetailed" action="show" id="${assetInstance?.section?.id}">${assetInstance?.section?.encodeAsHTML()}</g:link></td> … … 63 71 64 72 <tr class="prop"> 65 <td valign="top" class=" name">Asset Extended Attributes:</td>73 <td valign="top" class="groupHeader">Extended Attributes</td> 66 74 67 75 <td valign="top" style="text-align:left;" class="value"> 68 <ul>69 <g:each var="a" in="${assetInstance.assetExtendedAttributes}">70 <li><g:link controller="assetExtendedAttributeDetailed" action="edit" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>71 </g:each>72 </ul>73 76 </td> 74 77 75 78 </tr> 76 79 80 <g:each var="a" in="${assetInstance.assetExtendedAttributes.sort { p1, p2 -> p1.extendedAttributeType.name.compareToIgnoreCase(p2.extendedAttributeType.name) }}"> 81 <tr class="prop"> 82 <td valign="top" class="groupName"> 83 ${a.extendedAttributeType.name.encodeAsHTML()}: 84 </td> 85 86 <td valign="top" style="text-align:left;" class="value"> 87 <g:link controller="assetExtendedAttributeDetailed" action="edit" id="${a.id}"> 88 ${a.value.encodeAsHTML()} 89 </g:link> 90 </td> 91 92 </tr> 93 </g:each> 94 77 95 <tr class="prop"> 78 <td valign="top" class="name">Maintenance Actions:</td> 96 <td valign="top" class="groupHeader"> 97 <label for="assetSubItems">Asset Sub Items</label> 98 </td> 99 <td valign="top" class="value"> 100 </td> 101 </tr> 102 103 <tr class="prop"> 104 <td valign="top" class="name"> 105 </td> 106 <td valign="top" class="value"> 107 <g:render template="/shared/assetTree" /> 108 </td> 109 </tr> 110 111 <tr class="prop"> 112 <td valign="top" class="groupHeader">Maintenance Actions</td> 79 113 80 114 <td valign="top" style="text-align:left;" class="value"> 81 <ul>82 <g:each var="m" in="${assetInstance.maintenanceActions}">83 <li><g:link controller="maintenanceActionDetailed" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>84 </g:each>85 </ul>86 115 </td> 87 116 88 117 </tr> 118 119 120 <g:each var="m" in="${assetInstance.maintenanceActions}"> 121 <tr class="prop"> 122 <td valign="top" class="name"></td> 123 124 <td valign="top" style="text-align:left;" class="value"> 125 <g:link controller="maintenanceActionDetailed" action="show" id="${m.id}"> 126 ${m?.encodeAsHTML()} 127 </g:link> 128 </td> 129 130 </tr> 131 </g:each> 89 132 90 133 </tbody>
Note: See TracChangeset
for help on using the changeset viewer.