NIHVIVO-3213: more work on layout, css, markup

webapp/web/css/account/account.css

@@ -294,7 +294,7 @@ a.disable-delete {
 .photo-profile {
     border: 2px solid #DDE4E3;
 }
-.proxyInfoElement {
+#edit-myProxy .proxyInfoElement {
     padding-top: .8em;
     border-bottom: 1px dotted #E0DFDF;
     padding-bottom: 1em;
@@ -304,6 +304,7 @@ a.disable-delete {
     font-size: .8em;
     color: #7F8993;
     padding-left: 10px;
+    height: 20px;
 }
 #edit-myProxy p.selected-editors {
     padding-top: 1.2em;
@@ -319,3 +320,82 @@ a.disable-delete {
 #edit-myProxy span.class-label {
     color: #7F8993;
 }
+
+/* MANAGE PROXY ------>  */
+#relate-proxy-profiles {
+    width: 930px;
+    background-color: #F7F7F4;
+    border-radius: 10px;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
+    overflow: hidden;
+    margin-bottom: 20px;
+}
+#relate-proxy-profiles legend {
+    display: block;
+    border: 0;
+    padding-left: 20px;
+}
+.relate-proxy {
+    width: 450px;
+    float: left;
+    padding-right: 10px;
+}
+.relate-profile {
+    width: 430px;
+    float: right;
+    border-left: 1px dotted #E0DFDF;
+    padding-left: 10px;
+    
+}
+#relate-proxy-profiles .submit {
+    clear: both;
+    float: right;
+    margin-right: 1em;
+    margin-bottom: 1em;
+}
+
+#relate-proxy-profiles .acSelector {
+    margin-top: 10px;
+    margin-left: 20px;
+}
+
+
+#search-proxy {
+    border-top: 1px solid #E1E5E7;
+    border-bottom: 1px solid #E1E5E7;
+    padding: 10px;
+}
+
+#search-proxy h4 {
+    margin-bottom: 0;
+}
+
+
+#relate-proxy-profiles .proxyInfoElement {
+    margin-left: 20px;
+}
+
+p.selected-editors {
+    padding-top: 1.2em;
+    border-top: 1px solid #E0DFDF;
+}
+a.remove-proxy {
+    font-size: .9em;
+}
+.proxy-info {
+    padding-left: 1em; 
+    vertical-align: middle;
+}
+span.class-label {
+    color: #7F8993;
+}
+
+
+
+
+
+
+
+
+

webapp/web/templates/freemarker/body/manageproxies/manageProxies-list.ftl

@@ -25,13 +25,12 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/sm
 <h4>Relate proxy self editors and profiles</h4>
 
 <section id="relate-proxy-profiles">
-    
+    <form action="${formUrls.create}" method="POST">
-<form action="${formUrls.create}" method="POST">
     <fieldset class="relate-proxy">
         <legend>Select proxies</legend>
         
         <div name="proxyProxiesPanel">
-        <p><input type="text" name="proxySelectorAC" class="acSelector" size="35" value="Select an existing last name"></p>
+            <input type="text" name="proxySelectorAC" class="acSelector" size="35" value="Select an existing last name" role="input" />
             <p class="search-status"><span name='proxySelectorSearchStatus' moreCharsText='type more characters' noMatchText='no match'>&nbsp;</span></p>
         
             <#-- Magic div that holds all of the proxy data and the template that shows how to display it. -->
@@ -63,10 +62,6 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/sm
     </fieldset>
     
 
-    
-    
-    
-    
     <fieldset class="relate-profile">
       <legend>Select profiles</legend>  
 
@@ -108,25 +103,16 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/sm
 
             </fieldset>
     
-    <input class="submit" type="submit" name="createRelationship" value="Save" />
+            <p><input class="submit" type="submit" name="createRelationship" value="Save" /></p>
-    
+    </form>
-</form>
-
-
-
 </section>
 
+<section id="search-proxy" role="region">
+    <form action="${formUrls.list}" method="POST">
+        <h4>Proxy self editors</h4>
+            <input type="text" name="searchTerm" role="input" />
+            <input class="submit" type="submit" name="searchBytProxy" value="Search" role="button" /> | 
  
-<form action="${formUrls.list}" method="POST">
-<div>
-    <p>Proxy self editors</p>
-    <p>
-        <input type="text" name="searchTerm" >
-        <input type="submit" name="searchBytProxy" value="Search">
-    </p>    
-</div>
-
-<p>
             <#if page.previous??>
                 <a href="${formUrls.list}?pageIndex=${page.previous}&searchTerm=${searchTerm}}">Previous</a>
             </#if>
@@ -134,7 +120,8 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/sm
             <#if page.next??>
                 <a href="${formUrls.list}?pageIndex=${page.next}&searchTerm=${searchTerm}">Next</a>
             </#if>
-</p> 
+    </form>
+</section>
 
 <#list relationships as r>
     <form action="${formUrls.edit}" method="POST">
@@ -207,7 +194,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/sm
             </td>
         </tr>
     </table>
-    </form>
+</form>
 </#list>
 
 <script type="text/javascript">