aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool/src/main/webapp
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2013-11-08 09:02:09 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2013-11-08 09:02:09 +0100
commit87600aff054cf60a1d6e272b0d993d852aaf4763 (patch)
tree9d379c79955473c0c2cc5d3bab61ef5b7839d144 /id/ConfigWebTool/src/main/webapp
parent8d417057d38d56510a1d3d2e39381a1df3dd96ee (diff)
downloadmoa-id-spss-87600aff054cf60a1d6e272b0d993d852aaf4763.tar.gz
moa-id-spss-87600aff054cf60a1d6e272b0d993d852aaf4763.tar.bz2
moa-id-spss-87600aff054cf60a1d6e272b0d993d852aaf4763.zip
BugFixes:
--LoginFormPreview: Header text UTF8 encoding error --PVP2 Login: do not show loginbutton in case of PVP2 login is not enabled
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp')
-rw-r--r--id/ConfigWebTool/src/main/webapp/index.jsp11
-rw-r--r--id/ConfigWebTool/src/main/webapp/js/common.js2
2 files changed, 7 insertions, 6 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/index.jsp b/id/ConfigWebTool/src/main/webapp/index.jsp
index f4c853792..4c78699fc 100644
--- a/id/ConfigWebTool/src/main/webapp/index.jsp
+++ b/id/ConfigWebTool/src/main/webapp/index.jsp
@@ -55,11 +55,12 @@
<s:submit key="webpages.index.login" action="authenticate"/>
</s:form>
-
- <div id="bkulogin">
- <a id="bkuloginbutton" href="servlet/pvp2login"><%=LanguageHelper.getGUIString("webpages.index.login.pvp2", request) %></a>
- </div>
-
+
+ <s:if test="isPvp2LoginActiv()">
+ <div id="bkulogin">
+ <a id="bkuloginbutton" href="servlet/pvp2login"><%=LanguageHelper.getGUIString("webpages.index.login.pvp2", request) %></a>
+ </div>
+ </s:if>
</div>
</div>
diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js
index 305e4d1ee..b94fd9ec2 100644
--- a/id/ConfigWebTool/src/main/webapp/js/common.js
+++ b/id/ConfigWebTool/src/main/webapp/js/common.js
@@ -139,7 +139,7 @@ function sendVerificationMail() {
function updateBKUFormPreview(module) {
var value = $("#"+module).val();
- $("#formCustomPreview>iframe").attr("src", "./bkuFramePreview.action?module="+module+"&value="+value.replace("#",""));
+ $("#formCustomPreview>iframe").attr("src", "./bkuFramePreview.action?module="+module+"&value="+encodeURIComponent(value.replace("#","")));
}
function userOnLoad() {
UseUserNamePassword();