diff options
| author | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-09-04 13:35:57 +0200 |
|---|---|---|
| committer | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-09-04 13:35:57 +0200 |
| commit | c9685e638ee5de0d049c8f58fd91848c2dc8a0ba (patch) | |
| tree | 110bcbb0463868a39eba0880336ff32cc545034e /id/ConfigWebTool/src/main/webapp/jsp/snippets | |
| parent | 33b76e7bb23d8772b3a2533aadd0c3313af4b29f (diff) | |
| parent | c109c1e86a228bd3b3ed49b97e182b3cd2136d00 (diff) | |
| download | moa-id-spss-c9685e638ee5de0d049c8f58fd91848c2dc8a0ba.tar.gz moa-id-spss-c9685e638ee5de0d049c8f58fd91848c2dc8a0ba.tar.bz2 moa-id-spss-c9685e638ee5de0d049c8f58fd91848c2dc8a0ba.zip | |
Merge branch 'merge' into moa-2.1-Snapshot
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp/jsp/snippets')
| -rw-r--r-- | id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/bPKDecryption.jsp | 75 | ||||
| -rw-r--r-- | id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp | 4 |
2 files changed, 77 insertions, 2 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/bPKDecryption.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/bPKDecryption.jsp new file mode 100644 index 000000000..9f506e7da --- /dev/null +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/bPKDecryption.jsp @@ -0,0 +1,75 @@ +<%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%> +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<html> + <div class="oa_config_block"> + <h3><%=LanguageHelper.getGUIString("webpages.oaconfig.bPKEncDec.header", request) %></h3> + +<!-- <div class="oa_protocol_area"> --> + <%-- <h4><%=LanguageHelper.getGUIString("webpages.oaconfig.bPKEncDec.keystore.header", request) %></h4> --%> + <s:iterator value="%{BPKEncDecr.keyStoreFileUploadFileName}" var="fileNameBKU"> + <div class="floatClass"> + <s:label key="webpages.oaconfig.bPKEncDec.filename" + value="%{fileNameBKU}"/> + <s:label key="webpages.oaconfig.bPKEncDec.keyAlias" + value="%{BPKEncDecr.keyAlias}"/> + <s:checkbox key="webpages.oaconfig.bPKEncDec.delete" + labelposition="left" + cssClass="checkbox" + name="BPKEncDecr.deletekeyStore"></s:checkbox> + </div> + <s:if test="BPKEncDecr.validationError"> + <div id="pvp2_certificate_upload"> + <s:file name="BPKEncDecr.keyStoreFileUpload" key="webpages.oaconfig.bPKEncDec.upload" cssClass="textfield_long"></s:file> + <s:password name="BPKEncDecr.keyStorePassword" + labelposition="left" + key="webpages.oaconfig.bPKEncDec.keyStorePassword" + cssClass="textfield_long" + showPassword="false"> + </s:password> + + <s:textfield name="BPKEncDecr.keyAlias" + value="%{BPKEncDecr.keyAlias}" + labelposition="left" + key="webpages.oaconfig.bPKEncDec.keyAlias" + cssClass="textfield_long"> + </s:textfield> + + <s:password name="BPKEncDecr.keyPassword" + labelposition="left" + key="webpages.oaconfig.bPKEncDec.keyPassword" + cssClass="textfield_long" + showPassword="false"> + </s:password> + </div> + </s:if> + </s:iterator> + <s:if test="BPKEncDecr.keyStoreFileUploadFileName.size() == 0"> + <div id="pvp2_certificate_upload"> + <s:file name="BPKEncDecr.keyStoreFileUpload" key="webpages.oaconfig.bPKEncDec.upload" cssClass="textfield_long"></s:file> + + <s:password name="BPKEncDecr.keyStorePassword" + labelposition="left" + key="webpages.oaconfig.bPKEncDec.keyStorePassword" + cssClass="textfield_long"> + </s:password> + + <s:textfield name="BPKEncDecr.keyAlias" + value="%{BPKEncDecr.keyAlias}" + labelposition="left" + key="webpages.oaconfig.bPKEncDec.keyAlias" + cssClass="textfield_long"> + </s:textfield> + + <s:password name="BPKEncDecr.keyPassword" + labelposition="left" + key="webpages.oaconfig.bPKEncDec.keyPassword" + cssClass="textfield_long"> + </s:password> + </div> + </s:if> +<!-- </div> --> + + </div> +</html>
\ No newline at end of file diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp index 261966a86..b8bd1dc02 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp @@ -46,8 +46,8 @@ </s:select> </s:else> - <s:checkbox name="subTargetSet" - value="%{subTargetSet}" + <s:checkbox name="targetConfig.subTargetSet" + value="%{targetConfig.subTargetSet}" labelposition="left" key="webpages.oaconfig.general.target.subsector.checkbox" cssClass="checkbox" |