From 779c48c68382e344dac0a3eaff9fdedaf63021a1 Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 22 Dec 2011 15:32:12 +0000
Subject: [PATCH] NIHVIVO-3523 Improve the layout of admin/showAuth

---
 webapp/web/css/showAuth.css                   | 10 ++---
 .../freemarker/body/admin/admin-showAuth.ftl  | 37 ++++++++++---------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/webapp/web/css/showAuth.css b/webapp/web/css/showAuth.css
index f5270119d..6f4d3721b 100644
--- a/webapp/web/css/showAuth.css
+++ b/webapp/web/css/showAuth.css
@@ -2,20 +2,20 @@
 
 /* Styles for Freemarker template showAuth */
 
-#show-auth * h3 {
+#show-auth h3 {
     padding: 20px 0 12px 0;
 }
-#show-auth * caption {
-    padding: 20px 0 12px 0;
+#show-auth h4 {
+    padding: 30px 0 12px 0;
     margin: 0;
     text-align: left;
 }
-#show-auth * th {
+#show-auth th {
     padding: 4px 10px 4px 10px;
     border: 1px solid black;
     text-align: right;
 }
-#show-auth * td {
+#show-auth td {
     padding: 4px 10px 4px 10px;
     text-align: left;
     border: 1px solid black;
diff --git a/webapp/web/templates/freemarker/body/admin/admin-showAuth.ftl b/webapp/web/templates/freemarker/body/admin/admin-showAuth.ftl
index bb1d64f6f..3e9e02818 100644
--- a/webapp/web/templates/freemarker/body/admin/admin-showAuth.ftl
+++ b/webapp/web/templates/freemarker/body/admin/admin-showAuth.ftl
@@ -7,9 +7,9 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showAuth.css" /
 <h2>Authorization Info</h2>
 
 <section id="show-auth" role="region">
+    <h4>Current user</h4>
+    <table summary="Information about the current user">
     <#if currentUser?has_content>
-        <table summary="Information about the current user" style="border: 1">
-            <caption>Current user</caption>
             <tr><th>URI:</th><td>${currentUser.uri}</td></tr>
             <tr><th>First name:</th><td>${currentUser.firstName}</td></tr>
             <tr><th>Last name:</th><td>${currentUser.lastName}</td></tr>
@@ -19,13 +19,13 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showAuth.css" /
             <#list currentUser.permissionSetUris as role>
                 <tr><th>Role:</th><td>${role}</td></tr>
             </#list>
-        </table>
     <#else>
-        <h3>Not logged in</h3>
+        <tr><th>Not logged in</th></tr>
     </#if>
+    </table>
    
-    <table summary="VIVO revision's levels table">
-        <caption>Identifiers:</caption>
+    <h4>Identifiers:</h4>
+    <table summary="Identifiers">
         <#list identifiers as identifier>
             <tr>
                 <td>${identifier}</td>
@@ -33,14 +33,15 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showAuth.css" /
         </#list>
     </table>
 
-    <table summary="Associated Individuals">
-        <caption>AssociatedIndividuals: 
-            <#if matchingProperty??>
-                (match by <pre>${matchingProperty}</pre>)
-            <#else>
-                (matching property is not defined)
-            </#if>
-        </caption>
+    <h4>
+        AssociatedIndividuals: 
+        <#if matchingProperty??>
+            (match by ${matchingProperty})
+        <#else>
+            (matching property is not defined)
+        </#if>
+    </h4>
+    <table summary="Associated Individuals" width="100%">
         <#if associatedIndividuals?has_content>
             <#list associatedIndividuals as associatedIndividual>
                 <tr>
@@ -57,8 +58,8 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showAuth.css" /
         </#if>
     </table>
 
-    <table summary="Active Identifier Factories">
-        <caption>Identifier factories:</caption>
+    <h4>Identifier factories:</h4>
+    <table summary="Active Identifier Factories" width="100%">
         <#list factories as factory>
             <tr>
                 <td>${factory}</td>
@@ -66,8 +67,8 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showAuth.css" /
         </#list>
     </table>
 
-    <table summary="Policies">
-        <caption>Policies:</caption>
+    <h4>Policies:</h4>
+    <table summary="Policies" width="100%">
         <#list policies as policy>
             <tr>
                 <td>${policy}</td>