Index: trunk/grails-app/views/supplierDetailed/create.gsp
===================================================================
--- trunk/grails-app/views/supplierDetailed/create.gsp	(revision 372)
+++ trunk/grails-app/views/supplierDetailed/create.gsp	(revision 374)
@@ -6,11 +6,11 @@
         <meta name="layout" content="main" />
         <title>Create Supplier</title>
+        <nav:resources override="true"/>
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><g:link class="list" action="list">Supplier List</g:link></span>
+            <nav:renderSubItems group="navAlt"/>
         </div>
         <div class="body">
-            <h1>Create Supplier</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
@@ -25,4 +25,13 @@
                     <table>
                         <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="name">Name:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:supplierInstance,field:'name','errors')}">
+                                    <input type="text" id="name" name="name" value="${fieldValue(bean:supplierInstance,field:'name')}"/>
+                                </td>
+                            </tr> 
                         
                             <tr class="prop">
@@ -41,13 +50,4 @@
                                 <td valign="top" class="value ${hasErrors(bean:supplierInstance,field:'isActive','errors')}">
                                     <g:checkBox name="isActive" value="${supplierInstance?.isActive}" ></g:checkBox>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="name">Name:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:supplierInstance,field:'name','errors')}">
-                                    <input type="text" id="name" name="name" value="${fieldValue(bean:supplierInstance,field:'name')}"/>
                                 </td>
                             </tr> 
Index: trunk/grails-app/views/supplierDetailed/edit.gsp
===================================================================
--- trunk/grails-app/views/supplierDetailed/edit.gsp	(revision 372)
+++ trunk/grails-app/views/supplierDetailed/edit.gsp	(revision 374)
@@ -6,12 +6,11 @@
         <meta name="layout" content="main" />
         <title>Edit Supplier</title>
+        <nav:resources override="true"/>
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><g:link class="list" action="list">Supplier List</g:link></span>
-            <span class="menuButton"><g:link class="create" action="create">New Supplier</g:link></span>
+            <nav:renderSubItems group="navAlt"/>
         </div>
         <div class="body">
-            <h1>Edit Supplier</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
@@ -31,8 +30,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="description">Description:</label>
+                                    <label for="name">Name:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:supplierInstance,field:'description','errors')}">
-                                    <input type="text" id="description" name="description" value="${fieldValue(bean:supplierInstance,field:'description')}"/>
+                                <td valign="top" class="value ${hasErrors(bean:supplierInstance,field:'name','errors')}">
+                                    <input type="text" id="name" name="name" value="${fieldValue(bean:supplierInstance,field:'name')}"/>
                                 </td>
                             </tr> 
@@ -40,8 +39,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="inventoryItems">Inventory Items:</label>
+                                    <label for="description">Description:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:supplierInstance,field:'inventoryItems','errors')}">
-                                    
+                                <td valign="top" class="value ${hasErrors(bean:supplierInstance,field:'description','errors')}">
+                                    <input type="text" id="description" name="description" value="${fieldValue(bean:supplierInstance,field:'description')}"/>
                                 </td>
                             </tr> 
@@ -58,13 +57,4 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="name">Name:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:supplierInstance,field:'name','errors')}">
-                                    <input type="text" id="name" name="name" value="${fieldValue(bean:supplierInstance,field:'name')}"/>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
                                     <label for="supplierType">Supplier Type:</label>
                                 </td>
@@ -73,4 +63,17 @@
                                 </td>
                             </tr> 
+                    
+                            <tr class="prop">
+                                <td valign="top" class="name">Inventory Items:</td>
+                                
+                                <td  valign="top" style="text-align:left;" class="value">
+                                    <ul>
+                                    <g:each var="i" in="${supplierInstance.inventoryItems}">
+                                        <li><g:link controller="inventoryItemDetailed" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li>
+                                    </g:each>
+                                    </ul>
+                                </td>
+                                
+                            </tr>
                         
                         </tbody>
@@ -79,4 +82,5 @@
                 <div class="buttons">
                     <span class="button"><g:actionSubmit class="save" value="Update" /></span>
+                    <span class="button"><g:actionSubmit class="cancel" value="Cancel" action="Show"/></span>
                     <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
                 </div>
Index: trunk/grails-app/views/supplierDetailed/list.gsp
===================================================================
--- trunk/grails-app/views/supplierDetailed/list.gsp	(revision 372)
+++ trunk/grails-app/views/supplierDetailed/list.gsp	(revision 374)
@@ -6,11 +6,11 @@
         <meta name="layout" content="main" />
         <title>Supplier List</title>
+        <nav:resources override="true"/>
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><g:link class="create" action="create">New Supplier</g:link></span>
+            <nav:renderSubItems group="navAlt"/>
         </div>
         <div class="body">
-            <h1>Supplier List</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
@@ -21,13 +21,15 @@
                         <tr>
                         
-                   	        <g:sortableColumn property="id" title="Id" />
-                        
-                   	        <g:sortableColumn property="description" title="Description" />
-                        
-                   	        <g:sortableColumn property="isActive" title="Is Active" />
-                        
-                   	        <g:sortableColumn property="name" title="Name" />
-                        
-                   	        <th>Supplier Type</th>
+                            <g:sortableColumn property="id" title="Id" />
+
+                            <g:sortableColumn property="name" title="Name" />
+
+                            <g:sortableColumn property="description" title="Description" />
+
+                            <g:sortableColumn property="isActive" title="Is Active" />
+
+                            <th>Supplier Type</th>
+                            
+                            <th></th>
                    	    
                         </tr>
@@ -35,7 +37,9 @@
                     <tbody>
                     <g:each in="${supplierInstanceList}" status="i" var="supplierInstance">
-                        <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+                        <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/supplierDetailed/show/${supplierInstance.id}"'/>
                         
-                            <td><g:link action="show" id="${supplierInstance.id}">${fieldValue(bean:supplierInstance, field:'id')}</g:link></td>
+                            <td>${fieldValue(bean:supplierInstance, field:'id')}</td>
+                        
+                            <td>${fieldValue(bean:supplierInstance, field:'name')}</td>
                         
                             <td>${fieldValue(bean:supplierInstance, field:'description')}</td>
@@ -43,7 +47,11 @@
                             <td>${fieldValue(bean:supplierInstance, field:'isActive')}</td>
                         
-                            <td>${fieldValue(bean:supplierInstance, field:'name')}</td>
-                        
                             <td>${fieldValue(bean:supplierInstance, field:'supplierType')}</td>
+
+                            <td>
+                                <g:link action="show" id="${supplierInstance.id}">
+                                    <img  src="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" />
+                                </g:link>
+                            </td>
                         
                         </tr>
Index: trunk/grails-app/views/supplierDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/supplierDetailed/show.gsp	(revision 372)
+++ trunk/grails-app/views/supplierDetailed/show.gsp	(revision 374)
@@ -6,12 +6,11 @@
         <meta name="layout" content="main" />
         <title>Show Supplier</title>
+        <nav:resources override="true"/>
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><g:link class="list" action="list">Supplier List</g:link></span>
-            <span class="menuButton"><g:link class="create" action="create">New Supplier</g:link></span>
+            <nav:renderSubItems group="navAlt"/>
         </div>
         <div class="body">
-            <h1>Show Supplier</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
@@ -30,20 +29,14 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Description:</td>
+                            <td valign="top" class="name">Name:</td>
                             
-                            <td valign="top" class="value">${fieldValue(bean:supplierInstance, field:'description')}</td>
+                            <td valign="top" class="value">${fieldValue(bean:supplierInstance, field:'name')}</td>
                             
                         </tr>
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Inventory Items:</td>
+                            <td valign="top" class="name">Description:</td>
                             
-                            <td  valign="top" style="text-align:left;" class="value">
-                                <ul>
-                                <g:each var="i" in="${supplierInstance.inventoryItems}">
-                                    <li><g:link controller="inventoryItem" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li>
-                                </g:each>
-                                </ul>
-                            </td>
+                            <td valign="top" class="value">${fieldValue(bean:supplierInstance, field:'description')}</td>
                             
                         </tr>
@@ -57,14 +50,20 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Name:</td>
+                            <td valign="top" class="name">Supplier Type:</td>
                             
-                            <td valign="top" class="value">${fieldValue(bean:supplierInstance, field:'name')}</td>
+                            <td valign="top" class="value"><g:link controller="supplierTypeDetailed" action="show" id="${supplierInstance?.supplierType?.id}">${supplierInstance?.supplierType?.encodeAsHTML()}</g:link></td>
                             
                         </tr>
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Supplier Type:</td>
+                            <td valign="top" class="name">Inventory Items:</td>
                             
-                            <td valign="top" class="value"><g:link controller="supplierType" action="show" id="${supplierInstance?.supplierType?.id}">${supplierInstance?.supplierType?.encodeAsHTML()}</g:link></td>
+                            <td  valign="top" style="text-align:left;" class="value">
+                                <ul>
+                                <g:each var="i" in="${supplierInstance.inventoryItems}">
+                                    <li><g:link controller="inventoryItemDetailed" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li>
+                                </g:each>
+                                </ul>
+                            </td>
                             
                         </tr>
