Index: applications/j2-admin/src/webapp/WEB-INF/security/permissions/view.vm
===================================================================
--- applications/j2-admin/src/webapp/WEB-INF/security/permissions/view.vm	(revision 472892)
+++ applications/j2-admin/src/webapp/WEB-INF/security/permissions/view.vm	(working copy)
@@ -26,159 +26,157 @@
     layoutChildPriority="left-right"
     style="width: 100%">
 
-<div id="mainTabContainer" dojoType="TabContainer" selectedChild="portlets" doLayout="false">
+  <div id="mainTabContainer" dojoType="TabContainer" selectedChild="portlets" doLayout="false">
 
-<div id="portlets" dojoType="ContentPane" label="Portlets">
-<div class="tableContainer">
-<table dojoType="jetspeed:EditorTable" widgetId="portletsTable" class="permissions" headClass="fixedHeader" tbodyClass="scrollContent" enableMultipleSelect="true" enableAlternateRows="true" rowAlternateClass="alternateRow" templateCssPath="/j2-admin/css/security-permissions.css" cellpadding="0" cellspacing="0" border="0">
+    <div id="portlets" dojoType="ContentPane" label="Portlets">
+      <div class="tableContainer">
 
-<col width="45%"></col>
-<col width="15%"></col>
-<col width="35%"></col>
+        <table dojoType="jetspeed:EditorTable" widgetId="portletsTable" class="permissions" headClass="fixedHeader" tbodyClass="scrollContent" enableMultipleSelect="true" enableAlternateRows="true" rowAlternateClass="alternateRow" templateCssPath="/j2-admin/css/security-permissions.css" cellpadding="0" cellspacing="0" border="0">
+          <col width="45%"></col>
+          <col width="15%"></col>
+          <col width="35%"></col>
+          <thead>
+          <tr>
+          <th field="name" dataType="String">Resource</th>
+          <th field="actions" dataType="String">Actions</th>
+          <th field="roles" dataType="String">Roles</th>        
+          </tr>
+          </thead>
+          <tbody>
+          </tbody>
+        </table>
 
-<thead>
-<tr>
-    <th field="name" dataType="String">Resource</th>
-    <th field="actions" dataType="String">Actions</th>
-    <th field="roles" dataType="String">Roles</th>        
-</tr>
-</thead>
-<tbody>
-</tbody>
-</table>
-</div>
-</div>
-<div id="folders" dojoType="ContentPane" label="Folders">
-<div class="tableContainer">
-<table dojoType="jetspeed:EditorTable" widgetId="foldersTable" class="permissions" headClass="fixedHeader" tbodyClass="scrollContent" enableMultipleSelect="true" enableAlternateRows="true" rowAlternateClass="alternateRow" templateCssPath="/j2-admin/css/security-permissions.css" cellpadding="0" cellspacing="0" border="0">
+      </div>
+    </div>
 
-<col width="45%"></col>
-<col width="15%"></col>
-<col width="35%"></col>
+    <div id="folders" dojoType="ContentPane" label="Folders">
+      <div class="tableContainer">
 
-<thead>
-<tr>
-    <th field="name" dataType="String">Resource</th>
-    <th field="actions" dataType="String">Actions</th>
-    <th field="roles" dataType="String">Roles</th>        
-</tr>
-</thead>
-<tbody>
-</tbody>
-</table>
-</div>
-</div>
-<div id="pages" dojoType="ContentPane" label="Pages">
-<div class="tableContainer">
-<table dojoType="jetspeed:EditorTable" widgetId="pagesTable" class="permissions" headClass="fixedHeader" tbodyClass="scrollContent" enableMultipleSelect="true" enableAlternateRows="true" rowAlternateClass="alternateRow" templateCssPath="/j2-admin/css/security-permissions.css" cellpadding="0" cellspacing="0" border="0">
+        <table dojoType="jetspeed:EditorTable" widgetId="foldersTable" class="permissions" headClass="fixedHeader" tbodyClass="scrollContent" enableMultipleSelect="true" enableAlternateRows="true" rowAlternateClass="alternateRow" templateCssPath="/j2-admin/css/security-permissions.css" cellpadding="0" cellspacing="0" border="0">
+        <col width="45%"></col>
+        <col width="15%"></col>
+        <col width="35%"></col>
+        <thead>
+        <tr>
+        <th field="name" dataType="String">Resource</th>
+        <th field="actions" dataType="String">Actions</th>
+        <th field="roles" dataType="String">Roles</th>        
+        </tr>
+        </thead>
+        <tbody>
+        </tbody>
+        </table>
 
-<col width="45%"></col>
-<col width="15%"></col>
-<col width="35%"></col>
+      </div>
+    </div>
 
-<thead>
-<tr>
-    <th field="name" dataType="String">Resource</th>
-    <th field="actions" dataType="String">Actions</th>
-    <th field="roles" dataType="String">Roles</th>    
-</tr>
-</thead>
-<tbody>
-</tbody>
-</table>
-</div>
-</div>
+    <div id="pages" dojoType="ContentPane" label="Pages">
+      <div class="tableContainer">
 
-</div>
+        <table dojoType="jetspeed:EditorTable" widgetId="pagesTable" class="permissions" headClass="fixedHeader" tbodyClass="scrollContent" enableMultipleSelect="true" enableAlternateRows="true" rowAlternateClass="alternateRow" templateCssPath="/j2-admin/css/security-permissions.css" cellpadding="0" cellspacing="0" border="0">
+        <col width="45%"></col>
+        <col width="15%"></col>
+        <col width="35%"></col>
+        <thead>
+        <tr>
+        <th field="name" dataType="String">Resource</th>
+        <th field="actions" dataType="String">Actions</th>
+        <th field="roles" dataType="String">Roles</th>    
+        </tr>
+        </thead>
+        <tbody>
+        </tbody>
+        </table>
 
-<div dojoType="LayoutContainer"
-     layoutChildPriority='none'
-     style="width: 100%; height: 200px; border: 1px solid grey;"
->
+      </div>
+    </div>
 
-<div dojoType="LayoutContainer"
-	widgetId="editorTop"
-	minHeight="20"
-    layoutAlign="top"
-	style="padding: 4px; border-bottom: thin inset grey; width: 100%; height: 55px"
->
+  </div>
 
-    <div dojoType="LayoutContainer"
+  <div dojoType="LayoutContainer" layoutChildPriority='none' style="width: 100%; height: 200px; border: 1px solid grey;">
+
+    <div dojoType="LayoutContainer" widgetId="editorTop" minHeight="20" layoutAlign="top" style="padding: 4px; border-bottom: thin inset grey; width: 100%; height: 55px">
+
+      <div dojoType="LayoutContainer"
 	    widgetId="resourceNameContainer"
 	    minHeight="20"
-        layoutAlign="left"
-	    style="padding: 4px; border-right: thin inset grey; width: 70%; height: 55px"
-    >
-    <b>Resource</b><br/>
-    <input name="resourceName" id="resourceName" type="text" size="50" onChange="updateSelectedRow()">
-    </div>
+            layoutAlign="left"
+	    style="padding: 4px; border-right: thin inset grey; width: 70%; height: 55px">
+        <b>Resource</b><br/>
+        <input name="resourceName" id="resourceName" type="text" size="50" onChange="updateSelectedRow()">
+      </div>
 
-    <div dojoType="LayoutContainer"
+      <div dojoType="LayoutContainer"
 	    widgetId="editorControls"
 	    minHeight="20"
-        layoutAlign="right"
-	    style="width: 20%; height: 55px"
-    >
-    <div class="buttonbox">
+            layoutAlign="right"
+	    style="width: 20%; height: 55px">
+        <div class="buttonbox">
+
         <button widgetId="newButton" dojoType="Button" onclick="newEntry()">
             New
         </button>
+
         <button widgetId="saveButton" dojoType="Button" onclick="saveEntry()">
             Save
         </button>
+
         <button widgetId="revertButton" dojoType="Button" onclick="revertEntry()">
             Revert
         </button>
+
         <button widgetId="deleteButton" dojoType="Button" onclick="deleteEntry()">
             Delete
         </button>
 
-    </div>
-    </div>
-</div>
+        </div>
+      </div>
+      
+  </div>
 
-<div dojoType="LayoutContainer"
+  <div dojoType="LayoutContainer"
 	widgetId="rolesContainer"
 	minHeight="20"
-    layoutAlign="left"
-	style="padding: 4px; border-right: thin inset grey; width: 50%; height: 100px; overflow-y: auto; overflow-x: hidden"
->
-    <b>Roles</b><br/>
+        layoutAlign="left"
+	style="padding: 4px; border-right: thin inset grey; width: 50%; height: 100px; overflow-y: auto; overflow-x: hidden">
+
+    <b>Roles</b><br />
 #foreach ($role in $roles)
-    <input type="checkbox" name="role_$velocityCount" id="role_$velocityCount" dojoType="Checkbox"/> <label for="role_$velocityCount">$role.Principal.Name</label><br />
+    <input type="checkbox" name="role_$velocityCount" id="role_$velocityCount" dojoType="Checkbox" /> <label for="role_$velocityCount">$role.Principal.Name</label><br />
 #end
-</div>
-<div dojoType="LayoutContainer"
+
+  </div>
+
+  <div dojoType="LayoutContainer"
 	widgetId="actionsContainer"
 	minHeight="20"
-    layoutAlign="left"
-	style="padding: 4px; width: 50%; height: 100px; overflow-y: auto; overflow-x: hidden"
->
+        layoutAlign="left"
+	style="padding: 4px; width: 50%; height: 100px; overflow-y: auto; overflow-x: hidden" >
     <b>Actions</b><br/>
     <input type="checkbox" name="actionview" id="actionview" dojoType="Checkbox" /> <label for="actionview">View</label><br />
     <input type="checkbox" name="actionedit" id="actionedit" dojoType="Checkbox" /> <label for="actionedit">Edit</label><br />
     <input type="checkbox" name="actionhelp" id="actionhelp" dojoType="Checkbox" /> <label for="actionhelp">Help</label><br />
+  </div>
+
 </div>
-</div>
 
 <div dojoType="dialog" id="SaveWarningDialog" bgColor="grey" bgOpacity="0.5" toggle="fade" toggleDuration="250">
-	<form onsubmit="return false;">
-		<table>
-			<tr>
-                <td>Please Save or Revert changes to the selected permissions record before proceeding.</td><td>&nbsp;</td>
-            </tr>
-			<tr>
-				<td colspan="2" align="right" class="buttonboxright">
-                    <button dojoType="Button" onClick="dojo.widget.byId( 'SaveWarningDialog' ).hide();" >Cancel</button>
-					<button dojoType="Button" onClick="dojo.widget.byId( 'SaveWarningDialog' ).hide(); revertEntry();">Revert</button>
-                    <button dojoType="Button" onClick="dojo.widget.byId( 'SaveWarningDialog' ).hide(); saveEntry();">Save</button>
-                </td>
-			</tr>
-		</table>
-	</form>
+  <form onsubmit="return false;">
+    <table>
+      <tr>
+        <td>Please Save or Revert changes to the selected permissions record before proceeding.</td><td>&nbsp;</td>
+      </tr>
+      <tr>
+        <td colspan="2" align="right" class="buttonboxright">
+          <button dojoType="Button" onClick="dojo.widget.byId( 'SaveWarningDialog' ).hide();" >Cancel</button>
+          <button dojoType="Button" onClick="dojo.widget.byId( 'SaveWarningDialog' ).hide(); revertEntry();">Revert</button>
+          <button dojoType="Button" onClick="dojo.widget.byId( 'SaveWarningDialog' ).hide(); saveEntry();">Save</button>
+        </td>
+      </tr>
+    </table>
+  </form>
 </div>
 
-
 <script language="JavaScript" type="text/javascript">
     rolePrincipals = new Array();
 #foreach ($role in $roles)