litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merging 9961 to trunk

Browse source
This commit is contained in:
tworrall 2012-07-10 14:51:08 +00:00
parent a3817292a5
commit 018678463d
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
webapp/web/css/account/account.css
View file

@ -172,7 +172,7 @@ padding-right: 5px;
} }
#associated { #associated {
float:right; float:right;
display:none; display:none;
} }
#associated label { #associated label {
margin-bottom: 10px; margin-bottom: 10px;
@ -238,8 +238,8 @@ padding-right: 5px;
} }
#associateProfileBackgroundFour { #associateProfileBackgroundFour {
background-color:#f1f2ee; background-color:#f1f2ee;
padding:0 94px 26px 12px; padding:0 94px 26px 13px;
margin-top:-8px; margin-top:-3px;
margin-left:-12px; margin-left:-12px;
margin-right:-8px; margin-right:-8px;
z-index:-100; z-index:-100;

4
webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
View file

@ -148,7 +148,7 @@
<tr> <tr>
<td> <td>
<#if account.deletable> <#if account.deletable>
<input type="checkbox" name="deleteAccount" value="${account.uri}" /> <input type="checkbox" name="deleteAccount" value="${account.uri}" title="select this account to delete it"/>
<#assign disableDeleteAccount = '' /> <#assign disableDeleteAccount = '' />
<!-- ignored unless submit action is formUrls.delete --> <!-- ignored unless submit action is formUrls.delete -->
<#else> <#else>
@ -156,7 +156,7 @@
</#if> </#if>
<#if account.editUrl != ""> <#if account.editUrl != "">
<a ${disableDeleteAccount} href="${account.editUrl}" title="disable account">${account.emailAddress}</a> <a ${disableDeleteAccount} href="${account.editUrl}" title="click to view account details">${account.emailAddress}</a>
<!-- when this link is clicked, editAccount is noticed and all other fields are ignored. --> <!-- when this link is clicked, editAccount is noticed and all other fields are ignored. -->
<#else> <#else>
${account.emailAddress} ${account.emailAddress}