diff options
| author | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-03-05 21:36:01 +0100 |
|---|---|---|
| committer | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-03-05 21:36:01 +0100 |
| commit | b757096ff32fa80908527220f8e08046015c2449 (patch) | |
| tree | 837e839c74366a2b3af0c0dacf26cba1dc6f828d /id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | |
| parent | ed54650118390e2747dece3bad6bd74b6eefec7a (diff) | |
| parent | 31a10590f3efee8aca463b43623ee689f7b0c605 (diff) | |
| download | moa-id-spss-b757096ff32fa80908527220f8e08046015c2449.tar.gz moa-id-spss-b757096ff32fa80908527220f8e08046015c2449.tar.bz2 moa-id-spss-b757096ff32fa80908527220f8e08046015c2449.zip | |
Merge branch 'bs_3_fr' into moa2_0_tlenz_bs_3
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/EHvdAttributeProviderPlugin.java
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp')
| -rw-r--r-- | id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp index cf8626ae3..78ad500ef 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp @@ -528,7 +528,7 @@ </div> - <div id="oa_vidp_area" class="oa_protocol_area hidden"> + <div id="oa_vidp_area" class="oa_protocol_area"> <h4><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h4> <p><s:checkbox name="storkOA.vidpEnabled" @@ -539,10 +539,11 @@ id="OAuseVidp" /></p> <h5><%=LanguageHelper.getGUIString("webpages.oaconfig.vidp.ap.list", request) %></h5> <table id="stork_aplist"> - <tr><th>AP Plugin</th><th>URL</th> + <tr><th>AP Plugin</th><th>URL</th><th>Attribute (CSV)</th></tr> <s:iterator value="storkOA.attributeProviderPlugins" status="stat"> <tr><td><s:select name="storkOA.attributeProviderPlugins[%{#stat.index}].name" value="%{name}" list="%{storkOA.availableAttributeProviderPlugins}"/></td> - <td><s:textfield name="storkOA.attributeProviderPlugins[%{#stat.index}].url" value="%{url}" cssClass="textfield"/></td> + <td><s:textfield name="storkOA.attributeProviderPlugins[%{#stat.index}].url" value="%{url}" cssClass="textfield_mail"/></td> + <td><s:textfield name="storkOA.attributeProviderPlugins[%{#stat.index}].attributes" value="%{attributes}" cssClass="textfield_mail"/></td> <td><input type="button" value="<%=LanguageHelper.getGUIString("webpages.oaconfig.vidp.ap.remove", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr> </s:iterator> </table> |