Index: trunk/grails-app/views/assetSubItemDetailed/edit.gsp
===================================================================
--- trunk/grails-app/views/assetSubItemDetailed/edit.gsp	(revision 369)
+++ trunk/grails-app/views/assetSubItemDetailed/edit.gsp	(revision 388)
@@ -64,5 +64,5 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="assetSubItemExtendedAttributes">Asset Sub Item Extended Attributes:</label>
+                                    <label for="assetSubItemExtendedAttributes">Extended Attributes:</label>
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:assetSubItemInstance,field:'assetSubItemExtendedAttributes','errors')}">
@@ -73,5 +73,5 @@
 </g:each>
 </ul>
-<g:link controller="assetSubItemExtendedAttributeDetailed" params="['assetSubItem.id':assetSubItemInstance?.id]" action="create">Add AssetSubItemExtendedAttribute</g:link>
+<g:link controller="assetSubItemExtendedAttributeDetailed" params="['assetSubItem.id':assetSubItemInstance?.id]" action="create">Add Extended Attribute</g:link>
 
                                 </td>
@@ -79,21 +79,4 @@
                         
                             <tr class="prop">
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="maintenanceActions">Maintenance Actions:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:assetSubItemInstance,field:'maintenanceActions','errors')}">
-                                    
-<ul>
-<g:each var="m" in="${assetSubItemInstance?.maintenanceActions?}">
-    <li><g:link controller="maintenanceActionDetailed" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
-</g:each>
-</ul>
-<g:link controller="maintenanceActionDetailed" params="['assetSubItem.id':assetSubItemInstance?.id]" action="create">Add MaintenanceAction</g:link>
-
-                                </td>
-                            </tr>
-
                             
                             <tr class="prop">
@@ -120,5 +103,5 @@
                                     <g:else>
                                         <ul>
-                                        <g:each var="a" in="${assetSubItemInstance.assets}">
+                                        <g:each var="a" in="${ assetSubItemInstance.assets.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }">
                                             <li><g:link controller="assetDetailed" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
                                         </g:each>
@@ -140,8 +123,24 @@
 </g:each>
 </ul>
-<g:link controller="assetSubItemDetailed" params="['parentItem.id':assetSubItemInstance?.id]" action="create">Add AssetSubItem</g:link>
+<g:link controller="assetSubItemDetailed" params="['parentItem.id':assetSubItemInstance?.id]" action="create">Add Sub Item</g:link>
 
                                 </td>
                             </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="maintenanceActions">Maintenance Actions:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:assetSubItemInstance,field:'maintenanceActions','errors')}">
+                                    
+<ul>
+<g:each var="m" in="${assetSubItemInstance?.maintenanceActions?}">
+    <li><g:link controller="maintenanceActionDetailed" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
+</g:each>
+</ul>
+<g:link controller="maintenanceActionDetailed" params="['assetSubItem.id':assetSubItemInstance?.id]" action="create">Add Maintenance Action</g:link>
+
+                                </td>
+                            </tr>
                         
                         </tbody>
Index: trunk/grails-app/views/assetSubItemDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/assetSubItemDetailed/show.gsp	(revision 369)
+++ trunk/grails-app/views/assetSubItemDetailed/show.gsp	(revision 388)
@@ -55,5 +55,5 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Asset Sub Item Extended Attributes:</td>
+                            <td valign="top" class="name">Extended Attributes:</td>
                             
                             <td  valign="top" style="text-align:left;" class="value">
@@ -61,4 +61,51 @@
                                 <g:each var="a" in="${assetSubItemInstance.assetSubItemExtendedAttributes}">
                                     <li><g:link controller="assetSubItemExtendedAttributeDetailed" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
+                                </g:each>
+                                </ul>
+                            </td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Parent Item:</td>
+                            
+                            <td valign="top" class="value">
+                                <g:if test="${assetSubItemInstance.assets}">
+                                    Assigned to assets.
+                                </g:if>
+                                <g:else>
+                                    <g:link controller="assetSubItemDetailed" action="show" id="${assetSubItemInstance?.parentItem?.id}">
+                                        ${assetSubItemInstance?.parentItem?.encodeAsHTML()}
+                                    </g:link>
+                                </g:else>
+                            </td>
+                            
+                        </tr>
+
+                        <tr class="prop">
+                            <td valign="top" class="name">Assets:</td>
+
+                            <td  valign="top" style="text-align:left;" class="value">
+                                <g:if test="${assetSubItemInstance.parentItem}" >
+                                    Assigned to parent item.
+                                </g:if>
+                                <g:else>
+                                    <ul>
+                                    <g:each var="a" in="${ assetSubItemInstance.assets.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }">
+                                        <li><g:link controller="assetDetailed" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
+                                    </g:each>
+                                    </ul>
+                                </g:else>
+                            </td>
+
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Sub Items:</td>
+                            
+                            <td  valign="top" style="text-align:left;" class="value">
+                                <ul>
+                                <g:each var="s" in="${assetSubItemInstance.subItems}">
+                                    <li><g:link controller="assetSubItemDetailed" action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li>
                                 </g:each>
                                 </ul>
@@ -80,37 +127,4 @@
                         </tr>
                     
-                        <tr class="prop">
-                            <td valign="top" class="name">Parent Item:</td>
-                            
-                            <td valign="top" class="value"><g:link controller="assetSubItemDetailed" action="show" id="${assetSubItemInstance?.parentItem?.id}">${assetSubItemInstance?.parentItem?.encodeAsHTML()}</g:link></td>
-                            
-                        </tr>
-
-                        <tr class="prop">
-                            <td valign="top" class="name">Assets:</td>
-
-                            <td  valign="top" style="text-align:left;" class="value">
-                                <ul>
-                                <g:each var="a" in="${assetSubItemInstance.assets}">
-                                    <li><g:link controller="assetDetailed" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
-                                </g:each>
-                                </ul>
-                            </td>
-
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Sub Items:</td>
-                            
-                            <td  valign="top" style="text-align:left;" class="value">
-                                <ul>
-                                <g:each var="s" in="${assetSubItemInstance.subItems}">
-                                    <li><g:link controller="assetSubItemDetailed" action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li>
-                                </g:each>
-                                </ul>
-                            </td>
-                            
-                        </tr>
-                    
                     </tbody>
                 </table>