NIHVIVO-3213: and more work on layout, css, markup
This commit is contained in:
parent
4f177c31c9
commit
5e9b0de745
2 changed files with 160 additions and 118 deletions
|
@ -320,42 +320,69 @@ a.disable-delete {
|
|||
#edit-myProxy span.class-label {
|
||||
color: #7F8993;
|
||||
}
|
||||
|
||||
/* MANAGE PROXY ------> */
|
||||
#relate-proxy-profiles {
|
||||
/* MANAGE PROXY ------> */
|
||||
/* MANAGE PROXY ------> */
|
||||
/* MANAGE PROXY ------> */
|
||||
/* MANAGE PROXY ------> */
|
||||
|
||||
|
||||
.proxy-profile {
|
||||
width: 930px;
|
||||
background-color: #F7F7F4;
|
||||
border-radius: 10px;
|
||||
background-color: #e2e2dd;
|
||||
/*border-radius: 10px;
|
||||
-moz-border-radius: 10px;
|
||||
-webkit-border-radius: 10px;
|
||||
-webkit-border-radius: 10px;*/
|
||||
overflow: hidden;
|
||||
margin-bottom: 20px;
|
||||
|
||||
}
|
||||
#relate-proxy-profiles legend {
|
||||
|
||||
.bg-proxy-profile {
|
||||
background-color: #F7F7F4;
|
||||
border-bottom: 1px solid #e2e2dd;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
|
||||
.proxy-profile legend {
|
||||
display: block;
|
||||
border: 0;
|
||||
padding-left: 20px;
|
||||
}
|
||||
.relate-proxy {
|
||||
width: 450px;
|
||||
|
||||
.proxy-profile legend {
|
||||
padding-top: 1em;;
|
||||
}
|
||||
|
||||
.proxy {
|
||||
width: 430px;
|
||||
float: left;
|
||||
padding-right: 10px;
|
||||
}
|
||||
.relate-profile {
|
||||
width: 430px;
|
||||
.profile {
|
||||
width: 440px;
|
||||
float: right;
|
||||
border-left: 1px dotted #E0DFDF;
|
||||
padding-left: 10px;
|
||||
|
||||
border-left: 1px dotted #064D68;
|
||||
padding-left: 30px;
|
||||
padding-right: 1em;
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
#relate-proxy-profiles .submit {
|
||||
.proxy-profile .submit {
|
||||
clear: both;
|
||||
float: left;
|
||||
margin-left: 1em;
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
.proxy-profile .pos-submit {
|
||||
float: right;
|
||||
margin-right: 1em;
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
|
||||
#relate-proxy-profiles .acSelector {
|
||||
|
||||
|
||||
.proxy-profile .acSelector {
|
||||
margin-top: 10px;
|
||||
margin-left: 20px;
|
||||
}
|
||||
|
@ -371,14 +398,13 @@ a.disable-delete {
|
|||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
|
||||
#relate-proxy-profiles .proxyInfoElement {
|
||||
.proxy-profile .proxyInfoElement {
|
||||
margin-left: 20px;
|
||||
}
|
||||
|
||||
p.selected-editors {
|
||||
padding-top: 1.2em;
|
||||
border-top: 1px solid #E0DFDF;
|
||||
padding-left: 1.2em;
|
||||
}
|
||||
a.remove-proxy {
|
||||
font-size: .9em;
|
||||
|
@ -391,6 +417,19 @@ span.class-label {
|
|||
color: #7F8993;
|
||||
}
|
||||
|
||||
p.search-status {
|
||||
margin-top: -10px;
|
||||
font-size: .8em;
|
||||
color: #7F8993;
|
||||
padding-left: 25px;
|
||||
height: 20px;
|
||||
|
||||
}
|
||||
.proxy-item {
|
||||
margin-left: 20px;
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -24,9 +24,9 @@ ${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">
|
||||
<section class="proxy-profile">
|
||||
<form action="${formUrls.create}" method="POST">
|
||||
<fieldset class="relate-proxy">
|
||||
<fieldset class="proxy">
|
||||
<legend>Select proxies</legend>
|
||||
|
||||
<div name="proxyProxiesPanel">
|
||||
|
@ -62,18 +62,12 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/sm
|
|||
</fieldset>
|
||||
|
||||
|
||||
<fieldset class="relate-profile">
|
||||
<fieldset class="profile">
|
||||
<legend>Select profiles</legend>
|
||||
|
||||
<div class="edit-myProxy" name="proxyProfilesPanel">
|
||||
|
||||
<p><input type="text" name="proxySelectorAC" class="acSelector" size="35" value="Select an existing last name"></p>
|
||||
<p class="search-status">
|
||||
<span name='proxySelectorSearchStatus'
|
||||
moreCharsText='type more characters'
|
||||
noMatchText='no match'> </span>
|
||||
</p>
|
||||
|
||||
<div name="proxyProfilesPanel">
|
||||
<input type="text" name="proxySelectorAC" class="acSelector" size="35" value="Select an existing last name">
|
||||
<p class="search-status"><span name='proxySelectorSearchStatus' moreCharsText='type more characters' noMatchText='no match'> </span></p>
|
||||
|
||||
<#-- Magic div thst holds all of the proxy data and the template that shows how to display it. -->
|
||||
<div name="proxyData">
|
||||
|
@ -101,9 +95,9 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/sm
|
|||
</div>
|
||||
</div>
|
||||
|
||||
</fieldset>
|
||||
</fieldset>
|
||||
|
||||
<p><input class="submit" type="submit" name="createRelationship" value="Save" /></p>
|
||||
<p><input class="submit pos-submit" type="submit" name="createRelationship" value="Save" /></p>
|
||||
</form>
|
||||
</section>
|
||||
|
||||
|
@ -114,7 +108,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/sm
|
|||
<input class="submit" type="submit" name="searchBytProxy" value="Search" role="button" /> |
|
||||
|
||||
<#if page.previous??>
|
||||
<a href="${formUrls.list}?pageIndex=${page.previous}&searchTerm=${searchTerm}}">Previous</a>
|
||||
<a href="${formUrls.list}?pageIndex=${page.previous}&searchTerm=${searchTerm}">Previous</a>
|
||||
</#if>
|
||||
${page.current} of ${page.last}
|
||||
<#if page.next??>
|
||||
|
@ -123,30 +117,35 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/sm
|
|||
</form>
|
||||
</section>
|
||||
|
||||
<#-- --------------------------------->
|
||||
|
||||
|
||||
<#list relationships as r>
|
||||
<section class="proxy-profile bg-proxy-profile">
|
||||
<form action="${formUrls.edit}" method="POST">
|
||||
<table style="width: 100%;">
|
||||
<tr>
|
||||
<td style="border: thin solid black; width: 50%;">
|
||||
<fieldset class="proxy">
|
||||
<#assign p = r.proxyInfos[0]>
|
||||
<table><tr>
|
||||
<table class="proxy-item">
|
||||
<tr>
|
||||
<td>
|
||||
<img class="photo-profile" width="90" src="${p.imageUrl}" alt="${p.label}">
|
||||
<img class="photo-profile" width="120" src="${p.imageUrl}" alt="${p.label}">
|
||||
</td>
|
||||
<td class="proxyInfoElement">
|
||||
${p.label}} |
|
||||
<span class="class-label">${p.classLabel}</span>
|
||||
<td class="proxyInfoElement proxy-info">
|
||||
${p.label} | <span class="class-label">${p.classLabel}</span>
|
||||
<br>
|
||||
<input type="hidden" value="${p.uri}" name="proxyUri">
|
||||
</td>
|
||||
</tr></table>
|
||||
</tr>
|
||||
</table>
|
||||
<#--><a href="${formUrls.edit}?deleteProxy=Delete%20proxy">Delete proxy</a>-->
|
||||
<input class="submit" type="submit" name="deleteProxy" value="Delete proxy" />
|
||||
</fieldset>
|
||||
|
||||
<input type="submit" name="deleteProxy" value="Delete this proxy" />
|
||||
</td>
|
||||
<fieldset class="profile">
|
||||
<legend>Add profile</legend>
|
||||
|
||||
<td style="border: thin solid black">
|
||||
<div id="edit-myProxy" name="proxyProfilesPanel">
|
||||
<p>Add profile</p>
|
||||
<div name="proxyProfilesPanel">
|
||||
<p></p>
|
||||
<p><input type="text" name="proxySelectorAC" class="acSelector" size="35" value="Select an existing last name"></p>
|
||||
<p class="search-status">
|
||||
<span name='proxySelectorSearchStatus'
|
||||
|
@ -156,7 +155,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/sm
|
|||
|
||||
<p class="selected-editors">Selected profiles:</p>
|
||||
|
||||
<#-- Magic div thst holds all of the proxy data and the template that shows how to display it. -->
|
||||
<#-- Magic div that holds all of the proxy data and the template that shows how to display it. -->
|
||||
<div name="proxyData">
|
||||
<#list r.profileInfos as p>
|
||||
<div name="data" style="display: none">
|
||||
|
@ -190,13 +189,17 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/sm
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<input type="submit" name="modifyProfileList" value="Save changes to profiles" />
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<input class="submit" type="submit" name="modifyProfileList" value="Save changes to profiles" />
|
||||
</fieldset>
|
||||
</form>
|
||||
|
||||
</section>
|
||||
</#list>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var proxyContextInfo = {
|
||||
baseUrl: '${urls.base}',
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue