diff --git a/webapp/web/css/account/account.css b/webapp/web/css/account/account.css index 477b11bfc..b6e4cb3aa 100644 --- a/webapp/web/css/account/account.css +++ b/webapp/web/css/account/account.css @@ -321,13 +321,8 @@ a.disable-delete { #edit-myProxy span.class-label { color: #7F8993; } -/* MANAGE PROXY ------> */ -/* MANAGE PROXY ------> */ -/* MANAGE PROXY ------> */ -/* MANAGE PROXY ------> */ -/* MANAGE PROXY ------> */ - +/* MANAGE PROXY ------> */ .proxy-profile { width: 930px; /*background-color: #eaeae8;*/ @@ -339,8 +334,7 @@ a.disable-delete { margin-bottom: 20px; } - -.bg-proxy-profile { +.list-proxy-profile { /*background-color: #F7F7F4;*/ background-color: #F7F7F4; border-bottom: 1px dotted #e2e2dd; @@ -348,16 +342,14 @@ a.disable-delete { border-radius: 0; -moz-border-radius: 0; -webkit-border-radius: 0; + padding-top: 1.3em; } - - .proxy-profile legend { display: block; border: 0; padding-left: 20px; color: #064D68; } - .proxy { width: 430px; float: left; @@ -383,25 +375,18 @@ a.disable-delete { margin-bottom: 1em; background-color: #317e95; } - - - .proxy-profile .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; } - .proxy-profile .proxyInfoElement { margin-left: 20px; } @@ -432,13 +417,4 @@ p.search-status { .proxy-item { margin-left: 20px; margin-top: 20px; -} - - - - - - - - - +} \ No newline at end of file diff --git a/webapp/web/js/account/proxyUtils.js b/webapp/web/js/account/proxyUtils.js index 0d5bcd67b..458a7b189 100644 --- a/webapp/web/js/account/proxyUtils.js +++ b/webapp/web/js/account/proxyUtils.js @@ -1,7 +1,22 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ $(document).ready(function(){ + + //Remove initial value of input text 'Select an existing last name' $('input[name="proxySelectorAC"]').click(function(){ $(this).val(''); - }) -}); \ No newline at end of file + }); + + //Alert when user doesn't select an editor and a profile + $('input[name="createRelationship"]').click(function(){ + var $proxyUri = $('#add-relation input[name="proxyUri"]').val(); + var $profileUri = $('#add-relation input[name="profileUri"]').val(); + + if ($proxyUri == undefined || $profileUri == undefined){ + $('#error-alert').removeClass('hidden'); + $('#error-alert p').append("You must select a minimum of 1 editor and profile."); + return false; + } + }); +}); + diff --git a/webapp/web/templates/freemarker/body/manageproxies/manageProxies-list.ftl b/webapp/web/templates/freemarker/body/manageproxies/manageProxies-list.ftl index 8976f401e..386a1349d 100644 --- a/webapp/web/templates/freemarker/body/manageproxies/manageProxies-list.ftl +++ b/webapp/web/templates/freemarker/body/manageproxies/manageProxies-list.ftl @@ -8,7 +8,7 @@ ${stylesheets.add('')} ${stylesheets.add('')} -

Manage proxy self editors & profiles

+

Manage profile editing

<#if message??>
@@ -22,13 +22,18 @@ ${stylesheets.add('Relate proxy self editors and profiles + + +

Relate profile editors and profilesi

-
+
- Select proxies + Select editors
@@ -82,7 +87,7 @@ ${stylesheets.add(' + %label% %label% | %classLabel% @@ -102,9 +107,11 @@ ${stylesheets.add(' -

Proxy self editors

+ | @@ -122,14 +129,15 @@ ${stylesheets.add(' - +
+ +
<#assign p = r.proxyInfos[0]>
- ${p.label} + ${p.label} ${p.label} | ${p.classLabel} @@ -138,7 +146,7 @@ ${stylesheets.add('Delete proxy--> + @@ -176,7 +184,7 @@ ${stylesheets.add(' + %label% %label% | %classLabel%