aboutsummaryrefslogtreecommitdiff
path: root/id/oa/src/main/webapp
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2019-12-13 10:13:05 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2019-12-13 10:13:05 +0100
commit6fc2e600055d4737ce94d8a012eb3764bd7e93c8 (patch)
tree56aebaaac2c87458ebfd798a2c66f95718e1dd4e /id/oa/src/main/webapp
parentde2e45024694c7eb5e033bc6b1bcb90f5f499b07 (diff)
parentbea0d19650b5fbbb48fcda0f39ef3a93d6cf6f1f (diff)
downloadmoa-id-spss-6fc2e600055d4737ce94d8a012eb3764bd7e93c8.tar.gz
moa-id-spss-6fc2e600055d4737ce94d8a012eb3764bd7e93c8.tar.bz2
moa-id-spss-6fc2e600055d4737ce94d8a012eb3764bd7e93c8.zip
Merge branch 'current_development' into development_preview
# Conflicts: # id/history.txt # id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java # pom.xml
Diffstat (limited to 'id/oa/src/main/webapp')
-rw-r--r--id/oa/src/main/webapp/demoapp.jsp6
-rw-r--r--id/oa/src/main/webapp/index.jsp2
2 files changed, 7 insertions, 1 deletions
diff --git a/id/oa/src/main/webapp/demoapp.jsp b/id/oa/src/main/webapp/demoapp.jsp
index c6b005deb..7d511a5ce 100644
--- a/id/oa/src/main/webapp/demoapp.jsp
+++ b/id/oa/src/main/webapp/demoapp.jsp
@@ -31,7 +31,11 @@
<div id="demonstrator_loginInformation">
<table>
<tr>
- <td align="right">Benutzerdaten:</td>
+ <td align="right">PrincipleId: </td>
+ <td><%= bean.getPrincipleId()%></td>
+ </tr>
+ <tr>
+ <td align="right">Benutzerdaten:</td>
<td><%= bean.getGivenName()%>&nbsp;
<%= bean.getFamilyName()%>&nbsp;
<%= bean.getDateOfBirth()%></td>
diff --git a/id/oa/src/main/webapp/index.jsp b/id/oa/src/main/webapp/index.jsp
index 49f3e3e3a..628d3e7a3 100644
--- a/id/oa/src/main/webapp/index.jsp
+++ b/id/oa/src/main/webapp/index.jsp
@@ -21,6 +21,8 @@
<div id="demonstrator_leftcontent">
<input type="button" size="400" value="Login" onclick="PVP2LoginIframe('servlet/pvp2login');" id="submitbutton"/>
+ <br><br>
+ <a href="servlet/pvp2login">Login in fullFrame</a>
</div>
</div>