diff options
Diffstat (limited to 'id/server/auth')
32 files changed, 482 insertions, 1986 deletions
diff --git a/id/server/auth/.settings/org.eclipse.wst.common.component b/id/server/auth/.settings/org.eclipse.wst.common.component index 6299c8d17..66a47bbde 100644 --- a/id/server/auth/.settings/org.eclipse.wst.common.component +++ b/id/server/auth/.settings/org.eclipse.wst.common.component @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> <wb-module deploy-name="moa-id-auth"> - <dependent-module archiveName="moa-id-lib-1.9.90-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib"> + <dependent-module archiveName="moa-id-lib-1.9.96-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib"> <dependency-type>uses</dependency-type> </dependent-module> <dependent-module archiveName="stork-saml-engine-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/stork-saml-engine/stork-saml-engine"> <dependency-type>uses</dependency-type> </dependent-module> - <dependent-module archiveName="moa-id-commons-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-commons/moa-id-commons"> + <dependent-module archiveName="moa-id-commons-1.9.96-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-commons/moa-id-commons"> <dependency-type>uses</dependency-type> </dependent-module> <property name="context-root" value="moa-id-auth"/> diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml index c68236e0e..3423deb79 100644 --- a/id/server/auth/pom.xml +++ b/id/server/auth/pom.xml @@ -2,14 +2,13 @@ <parent> <groupId>MOA.id</groupId> <artifactId>moa-id</artifactId> - <version>1.5.2</version> + <version>1.9.96-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>MOA.id.server</groupId> <artifactId>moa-id-auth</artifactId> <packaging>war</packaging> - <version>1.9.90-SNAPSHOT</version> <name>MOA ID-Auth WebService</name> <properties> @@ -58,7 +57,6 @@ <dependency> <groupId>axis</groupId> <artifactId>axis</artifactId> - <version>1.1</version> </dependency> <dependency> <groupId>org.tuckey</groupId> @@ -68,12 +66,10 @@ <dependency> <groupId>MOA.spss.server</groupId> <artifactId>moa-spss-lib</artifactId> - <!--version>${project.version}</version--> </dependency> <dependency> <groupId>MOA.id.server</groupId> <artifactId>moa-id-lib</artifactId> - <version>${project.version}</version> </dependency> <!-- transitive dependencies we don't want to include into the war --> <dependency> diff --git a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml index d33cae207..2f17c7d98 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml @@ -52,6 +52,16 @@ <to type="forward">/dispatcher?mod=id_pvp2x&action=Soap</to> </rule> + <rule match-type="regex"> + <from>^/oauth2/auth\\?(.*)$</from> + <to type="forward">/dispatcher?mod=id_oauth20&action=AUTH&%{query-string}</to> + </rule> + <rule match-type="regex"> + <from>^/oauth2/token\\?(.*)$</from> + <to type="forward">/dispatcher?mod=id_oauth20&action=TOKEN&%{query-string}</to> + </rule> + + <outbound-rule> <note> The outbound-rule specifies that when response.encodeURL is called (if diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml index e47fe26e2..dadca355c 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/web.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml @@ -21,6 +21,11 @@ <servlet-class>at.gv.egovernment.moa.id.auth.servlet.RedirectServlet</servlet-class> </servlet> <servlet> + <servlet-name>MonitoringServlet</servlet-name> + <display-name>MonitoringServlet</display-name> + <servlet-class>at.gv.egovernment.moa.id.auth.servlet.MonitoringServlet</servlet-class> + </servlet> + <servlet> <servlet-name>SSOSendAssertionServlet</servlet-name> <display-name>SSOSendAssertionServlet</display-name> <servlet-class>at.gv.egovernment.moa.id.auth.servlet.SSOSendAssertionServlet</servlet-class> @@ -154,6 +159,10 @@ <url-pattern>/RedirectServlet</url-pattern> </servlet-mapping> <servlet-mapping> + <servlet-name>MonitoringServlet</servlet-name> + <url-pattern>/MonitoringServlet</url-pattern> + </servlet-mapping> + <servlet-mapping> <servlet-name>SSOSendAssertionServlet</servlet-name> <url-pattern>/SSOSendAssertionServlet</url-pattern> </servlet-mapping> diff --git a/id/server/auth/src/main/webapp/css/2.0/stammzahl.css b/id/server/auth/src/main/webapp/css/2.0/stammzahl.css deleted file mode 100644 index 99c9ab425..000000000 --- a/id/server/auth/src/main/webapp/css/2.0/stammzahl.css +++ /dev/null @@ -1,192 +0,0 @@ -#header { - position: relative; - top: -5px; padding-top : 114px; -/* background: url("../../img/2.0/logo_dsk_szr_header.png") right top no-repeat; */ - text-align: right; - padding-top: 114px; -} - -html { - height: 100%; -} - -body { - margin: 0px; background : url(../../../img/2.0/bg_header.png) 0 0 repeat-x; - padding-bottom: 2em; - font-weight: inherit; - font-style: inherit; - font-size: 100%; - font-family: Verdana, Arial, Helvetica, sans-serif; - line-height: 1; - min-height: 101%; - background: url(../../img/2.0/bg_header.png) 0 0 repeat-x; -} - -ol,ul { - list-style-type: none; - list-style-image: none; - list-style-position: outside; -} - -#pagebase { - background: url(../../img/2.0/bg_footer.png) repeat-x left bottom; - width: 100%; -} - -#page { - min-width: 800px; - max-width: 1000px; - margin: 0 auto 5px auto; - padding: 0 5px; -} - -#homelink { - position: absolute; - top: 20px; - left: 0; -} - -#homelink a:hover,#homelink a:focus,#homelink a:active { - border-bottom: 3px solid #c51713; -} - -#mainnav { - margin-top: 0px; - margin-bottom: 0px; - margin-left: 95px; - background: url(../../img/2.0/bg_mainnav.png) right bottom repeat-x; - float: right; - padding-top: 0pt; - padding-right: 0pt; - padding-bottom: 0pt; - padding-left: 0pt; -} - -#mainnav li { - float: left; - /*font-size: 0.9em;*/ - background: #fff url(../../img/2.0/bg_mainnav_right.png) right top no-repeat; - margin-left: 2px; -} - -#mainnav li.first-item { - margin-left: 0; -} - -#mainnav li a { - display: block; - font-weight: bold; - padding: 7px 0.75em; - text-decoration: none; - color: Black; - background: url(../../img/2.0/bg_mainnav_left.png) left top no-repeat; -} - -#mainnav li a.current { - color: #c51713; -} - -#mainnav li a:hover,#mainnav li a:focus,#mainnav li a:active { - color: #c51713; - text-decoration: underline; -} - -#footer { - position: relative; - clear: both; - display: block; - height: 48px; -} - -#footer ul { - float: right; - margin-top: 0.5em; - background: url(../../img/2.0/bg_bottom_line.png) 0 3px repeat-x; -} - -#footer li { - float: left; - font-size: 0.8em; - display: inline; -} - -#footer li a { - display: block; - padding: 0 1em; - margin-top: 3px; - text-decoration: none; - border-right: 1px solid white; - color: white; -} - -#footer li a.last-item { - border-right: none; - padding-right: 0; -} - -#footer li a:hover,#footer li a:focus,#footer li a:active { - text-decoration: underline; -} - -#servicenav { - margin: 0px; - padding: 0px; position : absolute; - top: 0; - left: 0; - width: 100%; - text-align: right; - margin-top: 3px; - position: absolute; -} - -#servicenav li { - display: inline; - font-size: 0.8em; - line-height: 1.2; -} - -#servicenav li a,#servicenav li span.current { - padding: 0 0.5em; - text-decoration: none; - border-right: 1px solid white; - color: white; -} - -#servicenav li a:hover,#servicenav li a:focus,#servicenav li a:active { - text-decoration: underline; -} - -#servicenav li span.current { - color: #c51713; - font-weight: bold; -} - -#servicenav li a.last-item { - border-right: none; - padding-right: 2px; -} - -.hidden { - position: absolute; - top: -1000em; - left: -1000em; - height: 1px; - width: 1px; - overflow: hidden; -} - -.clearfix:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} - -.clearfix { - display: inline-block; -} - -.clearfix { - display: block; -}
\ No newline at end of file diff --git a/id/server/auth/src/main/webapp/css/2.0/stylesinput.css b/id/server/auth/src/main/webapp/css/2.0/stylesinput.css deleted file mode 100644 index 000888b7b..000000000 --- a/id/server/auth/src/main/webapp/css/2.0/stylesinput.css +++ /dev/null @@ -1,251 +0,0 @@ -@CHARSET "utf-8"; - -/* ************************************* */ -/* * generated css (see input.css.jsp) * */ -/* ************************************* */ -/* **** classes for value **** */ - -fieldset label.value, textarea.value, input.value { - width: 150px !important; -} - -textarea.value { - height: 50px !important; -} - -select.value { - /* Firefox ... */ - width: 154px !important; - /* IE5 - IE6 */ - _width: 156px !important; - /* IE7 */ - !width: 156px !important; -} -/* **** classes for xs **** */ - -fieldset label.xs, textarea.xs, input.xs { - width: 25px !important; -} - -select.xs { - /* Firefox ... */ - width: 29px !important; - /* IE5 - IE6 */ - _width: 31px !important; - /* IE7 */ - !width: 31px !important; -} - -/* **** classes for s **** */ - -fieldset label.s, textarea.s, input.s { - width: 50px !important; -} - -select.s { - /* Firefox ... */ - width: 54px !important; - /* IE5 - IE6 */ - _width: 56px !important; - /* IE7 */ - !width: 56px !important; -} - -/* **** classes for m **** */ - -fieldset label.m, textarea.m, input.m { - width: 75px !important; -} - -select.m { - /* Firefox ... */ - width: 79px !important; - /* IE5 - IE6 */ - _width: 81px !important; - /* IE7 */ - !width: 81px !important; -} - -/* **** classes for l **** */ - -fieldset label.l, textarea.l, input.l { - width: 100px !important; -} - -select.l { - /* Firefox ... */ - width: 104px !important; - /* IE5 - IE6 */ - _width: 106px !important; - /* IE7 */ - !width: 106px !important; -} - -/* **** classes for xl **** */ - -fieldset label.xl, textarea.xl, input.xl { - width: 200px !important; -} - -select.xl { - /* Firefox ... */ - width: 204px !important; - /* IE5 - IE6 */ - _width: 206px !important; - /* IE7 */ - !width: 206px !important; -} - -/* **** classes for xll **** */ - -fieldset label.xll, textarea.xll, input.xll { - width: 250px !important; -} - -select.xll { - /* Firefox ... */ - width: 254px !important; - /* IE5 - IE6 */ - _width: 256px !important; - /* IE7 */ - !width: 256px !important; -} - -/* **** classes for xlll **** */ - -fieldset label.xlll, textarea.xlll, input.xlll { - width: 300px !important; -} - -select.xlll { - /* Firefox ... */ - width: 304px !important; - /* IE5 - IE6 */ - _width: 306px !important; - /* IE7 */ - !width: 306px !important; -} - -/* **** classes for xllll **** */ - -fieldset label.xllll, textarea.xllll, input.xllll { - width: 350px !important; -} - -select.xllll { - /* Firefox ... */ - width: 354px !important; - /* IE5 - IE6 */ - _width: 356px !important; - /* IE7 */ - !width: 356px !important; -} - -/* **** classes for xxl **** */ - -fieldset label.xxl, textarea.xxl, input.xxl { - width: 400px !important; -} - -fieldset input[type=file].xxl { - margin-right: 5px; - width: 250px !important; - !width: 400px !important; - _width: 400px !important; -} - - - -textarea.xxl { - height: 100px !important; -} - -select.xxl { - /* Firefox ... */ - width: 404px !important; - /* IE5 - IE6 */ - _width: 406px !important; - /* IE7 */ - !width: 406px !important; -} - -/* **** classes for xxll **** */ - -fieldset label.xxll, textarea.xxll, input.xxll { - width: 450px !important; -} - -select.xxll { - /* Firefox ... */ - width: 454px !important; - /* IE5 - IE6 */ - _width: 456px !important; - /* IE7 */ - !width: 456px !important; -} - -/* **** classes for xxlll **** */ - -fieldset label.xxlll, textarea.xxlll, input.xxlll { - width: 500px !important; -} - -select.xxlll { - /* Firefox ... */ - width: 504px !important; - /* IE5 - IE6 */ - _width: 506px !important; - /* IE7 */ - !width: 506px !important; -} - -/* **** classes for xxllll **** */ - -fieldset label.xxllll, textarea.xxllll, input.xxllll { - width: 550px !important; -} - -select.xxllll { - /* Firefox ... */ - width: 554px !important; - /* IE5 - IE6 */ - _width: 556px !important; - /* IE7 */ - !width: 556px !important; -} - -/* **** classes for xxxl **** */ - -fieldset label.xxxl, textarea.xxxl, input.xxxl { - width: 600px !important; -} - -textarea.xxxl { - height: 200px !important; -} - -select.xxxl { - /* Firefox ... */ - width: 604px !important; - /* IE5 - IE6 */ - _width: 606px !important; - /* IE7 */ - !width: 606px !important; -} -fieldset label.xxxxl, textarea.xxxxl, input.xxxxl { - width: 700px !important; -} - -textarea.xxxxl { - height: 250px !important; -} - -select.xxxxl { - /* Firefox ... */ - width: 704px !important; - /* IE5 - IE6 */ - _width: 706px !important; - /* IE7 */ - !width: 706px !important; -} - diff --git a/id/server/auth/src/main/webapp/css/2.0/stylesnew.css b/id/server/auth/src/main/webapp/css/2.0/stylesnew.css deleted file mode 100644 index e9c02120f..000000000 --- a/id/server/auth/src/main/webapp/css/2.0/stylesnew.css +++ /dev/null @@ -1,830 +0,0 @@ -@CHARSET "utf-8"; - -/* TODO: check min-width for all styles */ - -/* ********************************** */ -/* Neudefinition von bestehenden Tags */ -/* ********************************** */ - -html { - margin: 0px; - padding: 0px; -} - -body { - margin: 0px; - padding: 0px; - -} - -input, textarea, html, body { - font-family: Arial, Helvetica, sans-serif; - font-size: 10pt; -} - -h1 { - font-weight: bold; - font-size: 14pt; - color: #006464; - margin: 10px 0px 10px 0px; -} - -h2, h3, h4, h5, h6 { - background-color: #CCCCCC; - font-size: 11pt; - padding: 3px; - margin: 3px 2px 4px 2px; -} - - p { - margin: 1px; - padding: 4px 3px 0px 3px; -} - -img { - border: 0px; -} - -fieldset { - border: 0px; - margin: 0px; -} - -a { - color: #D60029; - text-decoration: none; -} - -a:hover { - text-decoration: underline; -} - -textarea { - overflow: auto; -} - -/* ****************** */ -/* allgemeine Klassen */ -/* ****************** */ - -.pageWidth { - min-width: 982px; /* wegen padding vom body, 950+20px */ - margin: 5px; - /* IE 6 hack */ - _width: 982px; -} - -.info-label{ - padding:6px; - white-space:nowrap; - width:100%; - font-size: 10pt; - font-weight: normal; -} - - - -.box, .overflowedBox, .whiteBox, .debugBox { - padding: 0px 0px; -} - -.box, .overflowedBox, .debugBox { - /*background-color: #EEEEEE;*/ -} - -.box { - padding-bottom: 4px; -} - -/*.whiteBox { - background-color: #FFFFFF; - border: 2px solid #EEEEEE; -}*/ - -.overflowedBox { - overflow: auto; -} - -.marginBottomNegative { - margin-bottom: -10px; - margin-top: 5px; -} - -.redColor { - color: #CC0000; -} - -.emcolor { - color: #006464; -} - -.subheader{ - font-weight: bold; - font-size:14pt; - color: #CC0000; - padding: 0px; - border: none; - background: #FFFFF; - padding: 0px; -} - -.pathnavigation { - border: none; - font-weight: bold; - font-family: Helvetica, sans-serif; - font-size: .9em; - margin-bottom: 10px; - padding: 3px; - cursor: pointer; - margin-right: 5px; -} - -.pathnavigation.selected { - color: #FFFFFF; - background: #006464; -} - -.pathnavigation.deselected { - color: #006464; - background: #FFFFFF; -} - -.upload-remove { - margin: 0px 2px 0px 2px; - width: 75px !important; -/* display: inline !important; - float: none !important;*/ -} - -.upload { - margin-top:2px; - padding:4px 1px 0px 3px; -} - -.repeat-evenindex, tr.repeat-item.repeat-evenindex td { - background-color: #dddddd; -} - -.repeat-minimal { - margin-bottom: 0px; -} - -.repeat-minimal, .repeat-minimal-item { - overflow: auto; -} - -fieldset.box .repeat-minimal-item input, -fieldset.box .repeat-minimal-item select, -fieldset.box .repeat-minimal-item textarea { - !margin-top: 1px; -} - -.repeat-minimal-item { - padding: 2px 0px; - margin: 2px; - _height: 100%; -} - -/* vertical centering ?? */ -/*.repeat-minimal-item span, .repeat-minimal-item a, .repeat-minimal-item input { - display: block; - float: left; - vertical-align: middle; - margin-right: 3px; -}*/ - -.repeat-selector { - width: auto !important; -} - -.full-repeat-box { - overflow: auto; - margin: 10px 0px 10px 0px; -} - -.disabled, .deselected-case { - display: none !important; -} - -.output-spaced { - display: block; -} - -.output{ - padding-top: 6px; - padding-left: 6px; - vertical-align: top; - text-align: left; -} - -fieldset.box span.verylarge{ - width: 650px; -} - -fieldset.box span.selector-item { - margin: 0px 5px; -} - -.groupwide { - width: 900px; -} - -fieldset.box span { - display: block; - float: left; - padding: 0px 3px; - min-height: 14px; - _height: 14px; -} - -fieldset.box span.output { - padding-top: 4px; -} - -dl.ic { - padding: 0px; - margin: 0px; - clear: both; -} - -dl.ic dt { - width: 200px; - font-weight: bold; - float: left; - clear: none; - text-align: right; - padding: 2px 0px 2px 10px; - margin: 0 2px 0 0; -} -dl.ic dd { - padding: 2px 3px 2px 0px; - margin-left: 215px; -} - -fieldset.box div { - padding-top: 0px; - !padding-top: 0px; - _padding-top: 0px; -} - -fieldset.box div span.selector-item { - float: none; - display: inline; -} - -fieldset.box div span.selector-item span, fieldset.box div span.selector-item input { - float: none; - display: inline; - vertical-align: middle; -} - - -/*fieldset.box div span, fieldset.box span span { - display: inline; - float: none; -}*/ - -.group { - background: #EEEEEE; - padding: 2px; - margin: 5px 0px; -} - -.groupwhite { - background: #FFFFFF; - padding: 2px; - margin: 5px 0px; -} - -.repeat-item { - padding: 0px; - margin: 0px; -} - -.repeated-evenindex { - background: #dddddd; - overflow: auto; -} - -div.spacing{ - overflow: hidden; - float: left; - !margin_bottom: 2px; - _height: 100%; -} - - -/* ******************** */ -/* tag specific classes */ -/* ******************** */ - -h2.label { - /*min-width: 954px;*/ - -} - -h3.inputcommit, h4.inputcommit, h5.inputcommit, h6.inputcommit { - margin: 10px 0px 0px -10px; -} - -a.info, span.info { - margin-right: 7px; - padding-bottom: 3px; -} - -div.signaturblock { - overflow: visible; - min-height: 160px; -} - -div.signaturtop { - float: left; - font-size: 9pt; - padding-left: 13px; - padding-top: 13px; - width: 240px; -} - -#amtssignaturtext .bold { - font-weight: bold; -} - -img.signaturlogo { - /*position: absolute;*/ - border: none; - padding-bottom: 3px; - display: block; -} - -br.clearAll { - clear: both; -} - -br.clearLeft { - clear: left; -} - -span.label { - float: left; - margin: 3px 0px 3px 0px; -} - -/* **** Inputs **** */ - -/* doesn't work with IE6 */ -/*input[type=submit].value, input[type=button].value { - width: auto !important; - margin-right: 5px; -} - -input[type=radio], input[type=radio].value { - width: auto !important; -} - -input[type=checkbox], input[type=checkbox].value { - width: auto !important; - float: left; -}*/ - -input.textright { - text-align: right; -} - -input.button, fieldset.box input.button, div input.button, div div input.button{ - width: auto !important; - margin-right: 5px; -} - -input.radio, fieldset.box input.radio { - width: auto !important; - margin: 4px 3px; - !margin: 4px; -} - -fieldset.box input[type=hidden] { - width: 0px; - display: none; -} - -input.checkbox, fieldset.box input.checkbox { - width: auto !important; - float: left; - padding: 2px; -} - -tr.repeat-item td label { - width: auto; -} - -/* **** Fieldsets **** */ - -/* needed to be html4 conform, only used for screen readers */ -fieldset.box legend { - display: none; -} - -fieldset.box { - padding-bottom: 0px; - margin-bottom: 0px; -} - -fieldset.box span.required,fieldset.box span.error,fieldset.box a.info, -span.required, span.error, a.info, span.info { - display: block; - float: left; - width: 10px; - overflow: hidden; - text-align: center; - font-weight: bold; - margin-right: 4px 0px 2px 0px; - height: 14px; - padding: 3px 0px 3px; -} - -fieldset.box a.info , fieldset.box span.error, span.error, a.info, span.info, span.required { - margin-top: 4px; - margin-left: 1px; - margin-right: 1px; -} - -fieldset.box .repeat-minimal-item a.info, -fieldset.box .repeat-minimal-item span.error, -fieldset.box .repeat-minimal-item span.info { - margin-top: 3px; - !margin-top: 3px; - _margin-top: 3px; -} - -/* -fieldset.box span.error, fieldset.box a.info, fieldset.box span.required -fieldset.box input, fieldset.box select, fieldset.box textarea, fieldset.box label { - margin-bottom: 5px; -}*/ - -fieldset.box span.error, span.error { - color: white; - background-color: red; -} - -fieldset.box a.info, a.info { - background-color: #005A00; - color: white; - font-family: serif; - text-decoration: none; - margin: 4px 4px; -} - -fieldset.box label { - display: block; - float: left; - width: 150px; - text-align: right; - padding: 4px 1px 0px 10px; - margin-top: 0px; -} - -fieldset.box label.bold { - font-weight: bold; -} - -fieldset.box br { - line-height: 1px; - !line-height: 2px; /* IE7 */ -} - -fieldset.box label.labelnone { - width: 0px; -} - -fieldset.box label.labelverysmall { - width: 50px; -} - -fieldset.box label.labelabitsmall { - width: 80px; -} - -fieldset.box label.labelsmaller { - width: 100px; -} - -fieldset.box label.labelsmall { - width: 120px; -} - -fieldset.box label.labelsm { - width: 130px; -} - -fieldset.box label.labelmedium { - width: 150px; -} - -fieldset.box label.labelml { - width: 170px; -} - -fieldset.box label.labelwide { - width: 190px; /* wegen tourismus-formular-seitenbreite */ -} - -fieldset.box label.labellarge { - width: 230px; -} - -fieldset.box label.labellarger { - width: 250px; -} - -fieldset.box label.labelverylarge, -div.box dl.labelverylarge dt { - width: 650px; -} - -fieldset.box input,fieldset.box output, fieldset.box select, fieldset.box textarea { - float: left; - display: block; - width: 150px; - margin: 3px 4px 3px 0px; -} - -fieldset.box br { - clear: left; - margin: 1px; -} - -/*fieldset.box label.s { - display: block; - float: left; - width: 100px !important; - text-align: right; - padding-right: 5px; - margin-top: 2px; -} - -fieldset.box label.xxxl { - width: 300px; -}*/ - -/* **** dl Liste **** */ - -dl.tabbed, dl.info, dl.signatur { - margin: 3px 0px; - min-height: 160px; -} - -dl.tabbed dt, dl.info dt, dl.signatur dt { - font-weight: bold; - width: 250px; - float: left; - text-align: right; - padding: 1px 5px; - clear: left; -} - -dl.signatur dt { - width: 170px; - clear: none; -} - -dl.tabbed dt.labelverylarge { - width: 650px; -} - -dl.info dt { - /* doesn't work with IE, caused by the float: left */ - /*display: list-item;*/ - width: 150px; - text-align: left; - margin-left: 25px; - padding: 0px 5px 5px 5px; -} - -dl.tabbed dd, dl.info dd, dl.signatur dd { - margin-left: 160px; - padding: 1px 3px 2px 0px; -} - -dl.signatur dd { - margin-left: 440px; -} - -dl.info dd { - padding: 0px 5px 5px 5px; -} - -/* ******** */ -/* Regionen */ -/* ******** */ - -/* **** Logo **** */ -#szrlogo { - float:right; - top: 10px; - right: 10px; - text-align: right; -} - -#logotext { - white-space: nowrap; - font-weight: bold; - font-size: 14pt; - color: #006464; -} - -/* **** Empfängerinfo **** */ - -#empfaengerinfo { - - float: left; -} - -#empfaengerinfo span#empfaenger { - font-weight: bold; - display: block; -} - -/* **** Hinweisbox **** */ -#hinweisbox { - background-color: #EEEEEE; - overflow: auto; - _padding-bottom: 40px; -} - -#hinweisbox #bittebeachten { - font-size: 16px; - font-weight: bold; - background-color: #d60028; - padding: 10px; - float: left; - color: white; - margin-right: 5px; -} - -#hinweisbox .spaced { - margin: 12px 50px 0px 0px; - float: left; -} - -#hinweisbox .spaced .error, #hinweisbox .spaced .info { - margin-right: 7px; - margin-top: -2px; - padding-top: 2px; -} - -#hinweisbox .spaced .info{ - background-color: #005A00; - color: white; - font-family: serif; -} - -/* **** Fehlermeldungen **** */ - -#fehlermeldungen h2 { - border-width: 0px; - background-color: #FFFFFF; -} - -#fehlermeldungen ul { - padding-left: 15px; -} - -#fehlermeldungen h2, #fehlermeldungen ul li, #fehlermeldungen ul li a{ - color:red; - font-weight: bold; - font-size: 10pt; -} - -#erfolgsmeldungen h2, #erfolgsmeldungen ul li, #erfolgsmeldungen ul li a{ - color:#009900; - font-weight: bold; - font-size: 10pt; -} - -/* **** Fehlermeldungen Transaction **** */ - -#fehlertransaction span { - color:red; - font-weight: bold; - font-size: 10pt; -} - -/* **** Navigationsleiste **** */ - -#submitbar { - clear: both; - background-color: #EEEEEE; - margin-top: 5px; - padding: 5px 10px; - overflow: auto; -} - -#submitbar #leftbuttons { - float: left; -} - -#submitbar #centerbuttons { - text-align: center; -} - -#submitbar #rightbuttons { - float: right; -} - -#submitbar #kontrollseite { - float: right; -} - -/* **** Fußzeile **** */ - -#footerbar { - margin-top: 5px; - background-color: #EEEEEE; - padding: 0px 5px; - overflow: auto; -} - -#footerbar #serverinfo { - float: left; - padding: 15px 0px; -} - -#footerbar #support { - text-align: center; - padding: 15px 0px; -} - -#footerbar #xgovguetesiegel { - float: right; - margin: 5px 0px; -} - -#savecommitdiv input, #formabortdiv input, -#errorabortdiv input, #loadcommitdiv input { - margin-right: 5px; - vertical-align: middle; - text-align: center; -} - -#formabortdiv h3, #savecommitdiv h3,#savecommitserverdiv h3, #loadcommitdiv h3 { - border: none; - font-size: 10pt; - background-color: transparent; - margin: 6px 0px 0px -2px; -} - -#formabortdiv ul, #savecommitdiv ul, #loadcommitdiv ul { - margin-top: 3px; -} - -#formabortdiv p, #savecommitdiv p, #loadcommitdiv p { - margin: 0 0 6px 6px; -} - -#statusimage { - width: 148px; - height: 57px; - /* special IE style propertie */ - behavior: url('bku-handling/css/pngbehavior.htc'); -} - -#validateallheader { - border-spacing: 2px; - border: thin solid #CCCCCC; -} - -#validateallsubheader { - background-color: transparent; - font-size: 10pt; - margin: 0px 0px 0px -10px; - padding: 0px; -} - - -/* bei repeats radio ausrücken */ -.repeat-item .radio { - float: left; - margin-top: 11px; -} - -.repeat-item .group { - margin-left: 20px; -} - -.repeat-without-radio .group { - margin-left: 0px; -} - -.area { - background-color: #EEEEEE; - padding-bottom: 5px; -} - -.area>p { - margin-left: 10px; - margin-bottom: 10px; -} - -#numberSearch { - margin-bottom: 15px; -}
\ No newline at end of file diff --git a/id/server/auth/src/main/webapp/css/index.css b/id/server/auth/src/main/webapp/css/index.css index 2af88f24a..622f6c255 100644 --- a/id/server/auth/src/main/webapp/css/index.css +++ b/id/server/auth/src/main/webapp/css/index.css @@ -1,372 +1,451 @@ -@charset "utf-8";
-
-* {
- margin:0;
- padding:0;
- border:0;
-}
-
-body {
- margin:0;
- padding:0;
- color : #000;
- background-color : #fff;
- font-family : Verdana, Geneva, Arial, sans-serif;
- font-size:76%;
-}
-
-/* skiplink */
-
-#skiplinks {
- position:relative;
-}
-
-p#skiplinks a {
-
- position: absolute;
- top: -999em;
- left: -999em;
- height: 0;
- width: 0;
- overflow: hidden;
-}
-
-p#skiplinks a:focus,
-p#skiplinks a:hover,
-p#skiplinks a:active {
- height: auto;
- width:auto;
- left: 0;
- top: 0;
- padding: 4px;
- position: absolute;
- overflow: visible;
- text-decoration: none;
- z-index: 100;
-}
-
-/*layout */
-
-#wrapper {
- min-width:746px;
- max-width:1258px;
- padding: 0 10px;
-}
-
-#banner {
- width:100%;
- min-height:100px;
- padding-top:20px;
- position:relative;
-}
-
-#bannerleft {
- float:left;
-}
-
-#bannerleft h1 {
- font-size:2em;
- padding-top:10px;
-}
-
-#bannerright {
- float:right;
-}
-
-#main {
- clear:both;
- position:relative;
- margin-left: 45%;
-}
-
-/* left */
-
-#leftcontent {
- float:left;
- width:250px;
- margin-bottom: 25px;
-}
-
-.iframebkuselection {
- text-align: center;
- padding-bottom: 25px;
- background-color : #DDDDDD;
-}
-
-h2#tabheader, h2#contentheader {
- padding-bottom: 2px;
- padding-right: 2px;
- padding-top: 2px;
- padding-left: 5px;
- font-size:1.1em;
- color:#fff;
- border-bottom:2px solid #fff;
-}
-
-h2#tabheader.full {
- padding:5px;
- font-size:20px;
- color:#fff;
- border-bottom:2px solid #fff;
-}
-
-#selectArea {
- padding-top: 10px;
- padding-bottom: 55px;
- padding-left: 10px;
-}
-
-#selectArea.full {
- font-size: 15px;
- padding-bottom: 65px;
-}
-
-#leftcontent.full {
- width: 400px;
- margin-top: 30px;
-}
-
-#main.full {
- margin-left: 35%;
-}
-
-.setAssertionButton {
- background: #efefef;
- cursor: pointer;
- margin-top: 15px;
- width: 70px;
- height: 25px;
-}
-
-.setAssertionButton_full {
- background: #efefef;
- cursor: pointer;
- margin-top: 15px;
- width: 100px;
- height: 30px
-}
-
-#leftbutton {
- width: 35%;
- float:left;
- margin-left: 15px;
-}
-
-#rightbutton {
- width: 35%;
- float:right;
- margin-right: 25px;
- text-align: right;
-}
-
-#leftbutton.full {
- width: 30%;
- float:left;
- margin-left: 40px;
-}
-
-#rightbutton.full {
- width: 30%;
- float:right;
- margin-right: 45px;
- text-align: right;
-}
-
-#stork {
- margin-bottom: 10px;
- margin-top: 5px;
-}
-
-#bkulogin {
- overflow:hidden;
- width:250px;
-}
-
-#bkukarte {
- float:left;
- background: url(../img/karte.gif) no-repeat top center;
- padding: 90px 10px 10px 10px;
- text-align:center;
- width:40%;
-}
-
-#bkuhandy {
- float:right;
- background: url(../img/handy.gif) no-repeat top center;
- padding: 90px 10px 10px 10px;
- text-align:center;
- width:40%;
-}
-
-#mandate{
- text-align:center;
- padding : 5px 5px 5px 5px;
-}
-
-button {
- background: #efefef;
- border:1px solid #000;
- cursor: pointer;
-}
-
-input {
- background: #efefef;
- border:1px solid #000;
- cursor: pointer;
-}
-
-#installJava, #BrowserNOK {
- clear:both;
- font-size:0.8em;
- padding:4px;
-}
-
-#localBKU {
- padding:4px;
-}
-
-.selectText{
-
-}
-
-.selectTextHeader{
-
-}
-
-.sendButton {
- background-color: DarkGray;
- border-style: solid;
- border-width: 1px;
- border-color: black;
-}
-
-
-#tab {
- margin-top:2px;
- padding:2px;
- clear:both;
-}
-
-#leftcontent a {
- text-decoration:none;
- color: #000;
-/* display:block;*/
- padding:4px;
-}
-
-#leftcontent a:hover, #leftcontent a:focus, #leftcontent a:active {
- text-decoration:underline;
- color: #000;
-}
-
-#navlist {
- margin-top:20px;
-}
-
-#navlist ul {
- list-style: none;
- margin-left: 0;
-}
-
-#navlist li {
- border-bottom:1px solid #fff;
-}
-
-iframe {
- width:220px;
-}
-
-/* right */
-
-#rightcontent {
- float:right;
- width:220px;
-}
-
-#centercontent {
- width:auto;
- margin: 0 230px;
-}
-
-/* center */
-
-#content {
- padding:20px;
-}
-
-#content a {
- text-decoration:underline;
- color: #000;
-}
-
-#content a:hover, #content a:focus, #content a:active {
- text-decoration:underline;
- color: #000;
-}
-
-p {
- margin-bottom:1em;
-}
-
-.lightblock{
- text-align : left;
- padding : 5px 5px 5px 5px;
-}
-
-
-#mandateLogin {
- vertical-align: middle;
-}
-
-
-.infobutton {
- background-color: #005a00;
- color: white;
- font-family: serif;
- text-decoration: none;
- padding-top: 2px;
- padding-right: 4px;
- padding-bottom: 2px;
- padding-left: 4px;
- font-weight: bold;
-}
-
-
-/* [OPTIONAL] Geben Sie hier die Farbe fuer den hellen Hintergrund an */
-.hell {
- background-color : #DDDDDD;
-}
-
-/* [OPTIONAL] Geben Sie hier die Farbe fuer den dunklen Hintergrund an */
-.dunkel {
- background-color: #A02D2D;
-}
-
-/* [OPTIONAL] Geben Sie hier die Farbe fuer Links an */
-#leftcontent a, #content a {
- color: white;
-}
-
-.OA_header {
- background-color: white;
- font-size: 20pt;
- margin-bottom: 25px;
- margin-left: 25%;
- margin-top: 25px;
-}
-
-.main_header {
- color: black;
- font-size: 32pt;
- position: absolute;
- right: 10%;
- top: 40px;
-
-}
-
-@media print {
- #wrapper { width:100%;}
- #banner {width:640px;}
- #rightcontent {display: none;}
- #centercontent {width:400px; margin-right:0;}
-}
+ @charset "utf-8";
+
+ @media screen and (min-width: 650px) {
+
+ body {
+ margin:0;
+ padding:0;
+ color : #000;
+ background-color : #fff;
+ font-family : Verdana, Geneva, Arial, sans-serif;
+ font-size:76%;
+ text-align: center;
+ background-color: #6B7B8B;
+ }
+
+ #page {
+ display: block;
+ border: 2px solid rgb(0,0,0);
+ width: 650px;
+ height: 440px;
+ margin: 0 auto;
+ margin-top: 5%;
+ position: relative;
+ border-radius: 25px;
+ background: rgb(255,255,255);
+ }
+
+ #page1 {
+ text-align: center;
+ }
+
+ #main {
+ /* clear:both; */
+ position:relative;
+ margin: 0 auto;
+ width: 250px;
+ text-align: center;
+ }
+
+ .OA_header {
+ /* background-color: white;*/
+ font-size: 20pt;
+ margin-bottom: 25px;
+ margin-top: 25px;
+ }
+
+ #leftcontent {
+ /*float:left; */
+ width:250px;
+ margin-bottom: 25px;
+ text-align: left;
+ border: 1px solid rgb(0,0,0);
+ }
+
+ h2#tabheader.full {
+ padding:5px;
+ font-size:20px;
+ color:#fff;
+ border-bottom:2px solid #fff;
+ }
+
+ #selectArea.full {
+ font-size: 15px;
+ padding-bottom: 65px;
+ }
+
+ #leftcontent.full {
+ width: 400px;
+ margin-top: 30px;
+ }
+
+ #main.full {
+ width: 400px;
+ }
+
+ .setAssertionButton_full {
+ background: #efefef;
+ cursor: pointer;
+ margin-top: 15px;
+ width: 100px;
+ height: 30px
+ }
+
+ #leftbutton.full {
+ width: 30%;
+ float:left;
+ margin-left: 40px;
+ }
+
+ #rightbutton.full {
+ width: 30%;
+ float:right;
+ margin-right: 45px;
+ text-align: right;
+ }
+
+ }
+
+ @media screen and (max-width: 649px) {
+
+ body {
+ margin:0;
+ padding:0;
+ color : #000;
+ background-color : #fff;
+ font-family : Verdana, Geneva, Arial, sans-serif;
+ font-size:76%;
+ text-align: center;
+ background-color: #FFFFFF;
+ }
+
+ #page {
+ visibility: hidden;
+ margin-top: 0%;
+
+ }
+
+ #page1 {
+ visibility: hidden;
+ }
+
+ #main {
+ visibility: hidden;
+ }
+
+ .OA_header {
+ margin-bottom: 0px;
+ margin-top: 0px;
+ font-size: 0pt;
+ visibility: hidden;
+ }
+
+ #leftcontent {
+ visibility: visible;
+ margin-bottom: 0px;
+ text-align: left;
+ border:none;
+ width:250px;
+ }
+
+ .setAssertionButton_full {
+ background: #efefef;
+ cursor: pointer;
+ margin-top: 15px;
+ width: 70px;
+ height: 25px;
+ }
+ }
+
+ * {
+ margin:0;
+ padding:0;
+ border:0;
+ }
+
+
+ /* skiplink */
+
+ #skiplinks {
+ position:relative;
+ }
+
+ p#skiplinks a {
+
+ position: absolute;
+ top: -999em;
+ left: -999em;
+ height: 0;
+ width: 0;
+ overflow: hidden;
+ }
+
+ p#skiplinks a:focus,
+ p#skiplinks a:hover,
+ p#skiplinks a:active {
+ height: auto;
+ width:auto;
+ left: 0;
+ top: 0;
+ padding: 4px;
+ position: absolute;
+ overflow: visible;
+ text-decoration: none;
+ z-index: 100;
+ }
+
+ /*layout */
+
+ #wrapper {
+ min-width:746px;
+ max-width:1258px;
+ padding: 0 10px;
+ }
+
+ #banner {
+ width:100%;
+ min-height:100px;
+ padding-top:20px;
+ position:relative;
+ }
+
+ #bannerleft {
+ float:left;
+ }
+
+ #bannerleft h1 {
+ font-size:2em;
+ padding-top:10px;
+ }
+
+ #bannerright {
+ float:right;
+ }
+
+ /* left */
+
+ .iframebkuselection {
+ text-align: center;
+ padding-bottom: 25px;
+ background-color : #DDDDDD;
+ }
+
+ h2#tabheader, h2#contentheader {
+ padding-bottom: 2px;
+ padding-right: 2px;
+ padding-top: 2px;
+ padding-left: 5px;
+ font-size:1.1em;
+ color:#fff;
+ border-bottom:2px solid #fff;
+ }
+
+ #selectArea {
+ padding-top: 10px;
+ padding-bottom: 55px;
+ padding-left: 10px;
+ }
+
+ .setAssertionButton {
+ background: #efefef;
+ cursor: pointer;
+ margin-top: 15px;
+ width: 70px;
+ height: 25px;
+ }
+
+ #leftbutton {
+ width: 35%;
+ float:left;
+ margin-left: 15px;
+ }
+
+ #rightbutton {
+ width: 35%;
+ float:right;
+ margin-right: 25px;
+ text-align: right;
+ }
+
+ #stork {
+ margin-bottom: 10px;
+ margin-top: 5px;
+ }
+
+ #bkulogin {
+ overflow:hidden;
+ width:250px;
+ padding-top: 10px;
+ }
+
+ #bkukarte {
+ float:left;
+ background: url(../img/karte.gif) no-repeat top center;
+ padding: 90px 10px 10px 10px;
+ text-align:center;
+ width:40%;
+ }
+
+ #bkuhandy {
+ float:right;
+ background: url(../img/handy.gif) no-repeat top center;
+ padding: 90px 10px 10px 10px;
+ text-align:center;
+ width:40%;
+ }
+
+ #mandate{
+ text-align:center;
+ padding : 5px 5px 5px 5px;
+ }
+
+ button {
+ background: #efefef;
+ border:1px solid #000;
+ cursor: pointer;
+ }
+
+ input {
+ background: #efefef;
+ border:1px solid #000;
+ cursor: pointer;
+ }
+
+ #installJava, #BrowserNOK {
+ clear:both;
+ font-size:0.8em;
+ padding:4px;
+ }
+
+ #localBKU {
+ padding:4px;
+ }
+
+ .selectText{
+
+ }
+
+ .selectTextHeader{
+
+ }
+
+ .sendButton {
+ background-color: DarkGray;
+ border-style: solid;
+ border-width: 1px;
+ border-color: black;
+ }
+
+
+ #tab {
+ margin-top:2px;
+ padding:2px;
+ clear:both;
+ }
+
+ #leftcontent a {
+ text-decoration:none;
+ color: #000;
+ /* display:block;*/
+ padding:4px;
+ }
+
+ #leftcontent a:hover, #leftcontent a:focus, #leftcontent a:active {
+ text-decoration:underline;
+ color: #000;
+ }
+
+ #navlist {
+ margin-top:20px;
+ }
+
+ #navlist ul {
+ list-style: none;
+ margin-left: 0;
+ }
+
+ #navlist li {
+ border-bottom:1px solid #fff;
+ }
+
+ iframe {
+ width:250px;
+ height: 180px
+ }
+
+ /* right */
+
+ #rightcontent {
+ float:right;
+ width:220px;
+ }
+
+ #centercontent {
+ width:auto;
+ margin: 0 230px;
+ }
+
+ /* center */
+
+ #content {
+ padding:20px;
+ }
+
+ #content a {
+ text-decoration:underline;
+ color: #000;
+ }
+
+ #content a:hover, #content a:focus, #content a:active {
+ text-decoration:underline;
+ color: #000;
+ }
+
+ p {
+ margin-bottom:1em;
+ }
+
+ .lightblock{
+ text-align : left;
+ padding : 5px 5px 5px 5px;
+ }
+
+
+ #mandateLogin {
+ vertical-align: middle;
+ }
+
+
+ .infobutton {
+ background-color: #005a00;
+ color: white;
+ font-family: serif;
+ text-decoration: none;
+ padding-top: 2px;
+ padding-right: 4px;
+ padding-bottom: 2px;
+ padding-left: 4px;
+ font-weight: bold;
+ }
+
+
+ /* [OPTIONAL] Geben Sie hier die Farbe fuer den hellen Hintergrund an */
+ .hell {
+ background-color : #DDDDDD;
+ }
+
+ /* [OPTIONAL] Geben Sie hier die Farbe fuer den dunklen Hintergrund an */
+ .dunkel {
+ background-color: #A02D2D;
+ }
+
+ /* [OPTIONAL] Geben Sie hier die Farbe fuer Links an */
+ #leftcontent a, #content a {
+ color: white;
+ }
+
+ .main_header {
+ color: black;
+ font-size: 32pt;
+ position: absolute;
+ right: 10%;
+ top: 40px;
+
+ }
+
+ @media print {
+ #wrapper { width:100%;}
+ #banner {width:640px;}
+ #rightcontent {display: none;}
+ #centercontent {width:400px; margin-right:0;}
+ }
diff --git a/id/server/auth/src/main/webapp/img/2.0/bg_footer.png b/id/server/auth/src/main/webapp/img/2.0/bg_footer.png Binary files differdeleted file mode 100644 index d8a430e0f..000000000 --- a/id/server/auth/src/main/webapp/img/2.0/bg_footer.png +++ /dev/null diff --git a/id/server/auth/src/main/webapp/img/2.0/bg_header.png b/id/server/auth/src/main/webapp/img/2.0/bg_header.png Binary files differdeleted file mode 100644 index 190cf97ea..000000000 --- a/id/server/auth/src/main/webapp/img/2.0/bg_header.png +++ /dev/null diff --git a/id/server/auth/src/main/webapp/img/2.0/bg_mainnav.png b/id/server/auth/src/main/webapp/img/2.0/bg_mainnav.png Binary files differdeleted file mode 100644 index efaf93582..000000000 --- a/id/server/auth/src/main/webapp/img/2.0/bg_mainnav.png +++ /dev/null diff --git a/id/server/auth/src/main/webapp/img/2.0/bg_mainnav_left.png b/id/server/auth/src/main/webapp/img/2.0/bg_mainnav_left.png Binary files differdeleted file mode 100644 index 1dd281826..000000000 --- a/id/server/auth/src/main/webapp/img/2.0/bg_mainnav_left.png +++ /dev/null diff --git a/id/server/auth/src/main/webapp/img/2.0/bg_mainnav_right.png b/id/server/auth/src/main/webapp/img/2.0/bg_mainnav_right.png Binary files differdeleted file mode 100644 index f598be094..000000000 --- a/id/server/auth/src/main/webapp/img/2.0/bg_mainnav_right.png +++ /dev/null diff --git a/id/server/auth/src/main/webapp/img/2.0/bku_local.gif b/id/server/auth/src/main/webapp/img/2.0/bku_local.gif Binary files differdeleted file mode 100644 index 9bbf631c0..000000000 --- a/id/server/auth/src/main/webapp/img/2.0/bku_local.gif +++ /dev/null diff --git a/id/server/auth/src/main/webapp/img/2.0/bku_mobile.gif b/id/server/auth/src/main/webapp/img/2.0/bku_mobile.gif Binary files differdeleted file mode 100644 index 97c8cee35..000000000 --- a/id/server/auth/src/main/webapp/img/2.0/bku_mobile.gif +++ /dev/null diff --git a/id/server/auth/src/main/webapp/img/2.0/bku_online.gif b/id/server/auth/src/main/webapp/img/2.0/bku_online.gif Binary files differdeleted file mode 100644 index 03a54765a..000000000 --- a/id/server/auth/src/main/webapp/img/2.0/bku_online.gif +++ /dev/null diff --git a/id/server/auth/src/main/webapp/img/2.0/checkbox_checked.png b/id/server/auth/src/main/webapp/img/2.0/checkbox_checked.png Binary files differdeleted file mode 100644 index 562fbc66f..000000000 --- a/id/server/auth/src/main/webapp/img/2.0/checkbox_checked.png +++ /dev/null diff --git a/id/server/auth/src/main/webapp/img/2.0/checkbox_unchecked.gif b/id/server/auth/src/main/webapp/img/2.0/checkbox_unchecked.gif Binary files differdeleted file mode 100644 index c93a6ea06..000000000 --- a/id/server/auth/src/main/webapp/img/2.0/checkbox_unchecked.gif +++ /dev/null diff --git a/id/server/auth/src/main/webapp/img/2.0/dsk.ico b/id/server/auth/src/main/webapp/img/2.0/dsk.ico Binary files differdeleted file mode 100644 index df7e8d31e..000000000 --- a/id/server/auth/src/main/webapp/img/2.0/dsk.ico +++ /dev/null diff --git a/id/server/auth/src/main/webapp/img/2.0/logo.png b/id/server/auth/src/main/webapp/img/2.0/logo.png Binary files differdeleted file mode 100644 index dfb4351d0..000000000 --- a/id/server/auth/src/main/webapp/img/2.0/logo.png +++ /dev/null diff --git a/id/server/auth/src/main/webapp/img/2.0/logo_digitalesOE.gif b/id/server/auth/src/main/webapp/img/2.0/logo_digitalesOE.gif Binary files differdeleted file mode 100644 index ff83cd82b..000000000 --- a/id/server/auth/src/main/webapp/img/2.0/logo_digitalesOE.gif +++ /dev/null diff --git a/id/server/auth/src/main/webapp/img/2.0/logo_dsk_nav.png b/id/server/auth/src/main/webapp/img/2.0/logo_dsk_nav.png Binary files differdeleted file mode 100644 index 9b3e7055a..000000000 --- a/id/server/auth/src/main/webapp/img/2.0/logo_dsk_nav.png +++ /dev/null diff --git a/id/server/auth/src/main/webapp/img/2.0/logo_dsk_szr_header.png b/id/server/auth/src/main/webapp/img/2.0/logo_dsk_szr_header.png Binary files differdeleted file mode 100644 index b4f8be6d8..000000000 --- a/id/server/auth/src/main/webapp/img/2.0/logo_dsk_szr_header.png +++ /dev/null diff --git a/id/server/auth/src/main/webapp/img/2.0/std_handy.gif b/id/server/auth/src/main/webapp/img/2.0/std_handy.gif Binary files differdeleted file mode 100644 index 088ec0957..000000000 --- a/id/server/auth/src/main/webapp/img/2.0/std_handy.gif +++ /dev/null diff --git a/id/server/auth/src/main/webapp/img/2.0/std_karte.gif b/id/server/auth/src/main/webapp/img/2.0/std_karte.gif Binary files differdeleted file mode 100644 index 1ec7afc2e..000000000 --- a/id/server/auth/src/main/webapp/img/2.0/std_karte.gif +++ /dev/null diff --git a/id/server/auth/src/main/webapp/img/mobile-bku.png b/id/server/auth/src/main/webapp/img/mobile-bku.png Binary files differnew file mode 100644 index 000000000..697514273 --- /dev/null +++ b/id/server/auth/src/main/webapp/img/mobile-bku.png diff --git a/id/server/auth/src/main/webapp/img/online-bku.png b/id/server/auth/src/main/webapp/img/online-bku.png Binary files differnew file mode 100644 index 000000000..d7d524999 --- /dev/null +++ b/id/server/auth/src/main/webapp/img/online-bku.png diff --git a/id/server/auth/src/main/webapp/img/valid-html5-blue.png b/id/server/auth/src/main/webapp/img/valid-html5-blue.png Binary files differnew file mode 100644 index 000000000..91ebe3e87 --- /dev/null +++ b/id/server/auth/src/main/webapp/img/valid-html5-blue.png diff --git a/id/server/auth/src/main/webapp/img/w3cvalidhtml5.jpg b/id/server/auth/src/main/webapp/img/w3cvalidhtml5.jpg Binary files differnew file mode 100644 index 000000000..2cd65412e --- /dev/null +++ b/id/server/auth/src/main/webapp/img/w3cvalidhtml5.jpg diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html index 03123c2a7..eee3cd69a 100644 --- a/id/server/auth/src/main/webapp/index.html +++ b/id/server/auth/src/main/webapp/index.html @@ -3,338 +3,12 @@ <head>
<!-- [OPTIONAL] Aendern Sie hier den Titel der Seite -->
<title>
- MOA-Template zur Bürgerkartenauswahl (Musterseite)
+ MOA-ID 2.0 Mainpage
</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="Content-Style-Type" content="text/css">
- <link rel="stylesheet" type="text/css" href="css/index.css">
- <script type="text/javascript">
- // [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an
- // z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at
- var MOA_ID_STARTAUTHENTICATION = "https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample";
-
- // [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die lokale BKU an
- // z.B.: https://yoururl.at/moa-id-auth/template_localBKU.html
- var URL_TO_LOKALBKU_TEMPLATE = "https://localhost:8443/moa-id-auth/template_localBKU.html";
-
-
- window.onload=function() {
-
- document.getElementById("localBKU").style.display="none";
- return;
- }
- function bkuOnlineClicked() {
- <!-- [OPTIONAL] Um die lokale BKU auszublenden, ersetzen Sie in der folgenden Zeile "block" durch "none" -->
- document.getElementById("localBKU").style.display="block";
-
- document.getElementById("moaidform").action = MOA_ID_STARTAUTHENTICATION;
- document.getElementById("Template").value = URL_TO_LOKALBKU_TEMPLATE;
-
- document.getElementById("useMandate").value = "false";
- var checkbox = document.getElementById("mandateCheckBox")
- if (checkbox != null) {
- if (document.getElementById("mandateCheckBox").checked) {
- document.getElementById("useMandate").value = "true";
- }
- }
-
- var el = document.getElementById("bkulogin");
- var parent = el.parentNode;
-
- var iFrameURL = "iframeOnlineBKU.html" + "?";
- iFrameURL += "useMandate=" + document.getElementById("useMandate").value;
-
- var iframe = document.createElement("iframe");
- iframe.setAttribute("src", iFrameURL);
- iframe.setAttribute("width", "220");
- iframe.setAttribute("height", "165");
- iframe.setAttribute("frameborder", "0");
- iframe.setAttribute("scrolling", "no");
- iframe.setAttribute("title", "Login");
-
- parent.replaceChild(iframe, el);
- }
-
- function bkuHandyClicked() {
- document.getElementById("localBKU").style.display="none";
-
- document.getElementById("useMandate").value = "false";
- var checkbox = document.getElementById("mandateCheckBox")
- if (checkbox != null) {
- if (document.getElementById("mandateCheckBox").checked) {
- document.getElementById("useMandate").value = "true";
- }
- }
-
- var el = document.getElementById("bkulogin");
- var parent = el.parentNode;
-
- var iFrameURL = "iframeHandyBKU.html" + "?";
- iFrameURL += "useMandate=" + document.getElementById("useMandate").value;
-
- var iframe = document.createElement("iframe");
- iframe.setAttribute("src", iFrameURL);
- iframe.setAttribute("width", "220");
- iframe.setAttribute("height", "159");
- iframe.setAttribute("frameborder", "0");
- iframe.setAttribute("scrolling", "no");
- iframe.setAttribute("title", "Login");
-
- parent.replaceChild(iframe, el);
- }
-
- function storkClicked() {
- document.getElementById("localBKU").style.display="block";
-
- document.getElementById("moaidform").action = MOA_ID_STARTAUTHENTICATION;
- document.getElementById("Template").value = URL_TO_LOKALBKU_TEMPLATE;
-
- document.getElementById("useMandate").value = "false";
- var checkbox = document.getElementById("mandateCheckBox")
- if (checkbox != null) {
- if (document.getElementById("mandateCheckBox").checked) {
- document.getElementById("useMandate").value = "true";
- }
- }
-
- var ccc = "AT";
- var countrySelection = document.getElementById("cccSelection");
-
- if (countrySelection != null) {
- ccc = document.getElementById("cccSelection").value;
- }
-
- var el = document.getElementById("bkulogin");
- var parent = el.parentNode;
-
- var iFrameURL = "iframeOnlineBKU.html" + "?";
- iFrameURL += "useMandate=" + document.getElementById("useMandate").value + "&";
- iFrameURL += "ccc=" + ccc;
-
- var iframe = document.createElement("iframe");
- iframe.setAttribute("src", iFrameURL);
- iframe.setAttribute("width", "220");
- iframe.setAttribute("height", "165");
- iframe.setAttribute("frameborder", "0");
- iframe.setAttribute("scrolling", "no");
- iframe.setAttribute("title", "Login");
-
- parent.replaceChild(iframe, el);
- }
-
- </script>
</head>
<body>
- <div id="wrapper">
- <p id="skiplinks">
- <a href="#content">Zum Inhalt springen</a>
- </p>
- <div id="banner">
- <!-- [OPTIONAL] Aendern Sie hier die Titelueberschrift der Seite) -->
- <div id="bannerleft">
- <h1>MOA-Template zur Bürgerkartenauswahl (Musterseite)</h1>
- </div>
- <!-- [OPTIONAL] Aendern Sie hier das Logo der Seite (und Alternativtext fuer das Bild) -->
- <div id="bannerright">
- <img src="img/logo.jpg" alt="Logo">
- </div>
- </div>
- <div id="main">
- <div id="leftcontent">
- <h2 id="tabheader" class="dunkel">
- Login mit Bürgerkarte
- </h2>
- <div id="bkulogin" class="hell">
- <!-- No-Script Variante, wenn im Browser JavaScript deaktiviert ist -->
- <!-- Defaulteinstellung: No-Script Variante mit Anmeldung via lokaler BKU oder Handysignatur ohne Vollmacht -->
- <noscript>
- Kein JavaScript aktiviert!
-
- <!-- [OPTIONAL] kommentieren sie folgende entsprechenden Blöcke aus, wenn Sie keine No-Script Variante anbieten möchten oder nur bestimmte BKU/Vollmachten Varianten anzeigen möchten -->
-
- <!-- Block "KARTE": Anmeldung mit lokaler BKU *ohne* Vollmacht (No-Script Variante) -->
- <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an (inkl. Template-URL, bkuURI und useMandate Parameter!) -->
- <!-- z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at&Template=https://yoururl.at/moa-id-auth/template_localBKU.html&bkuURI=https://127.0.0.1:3496/https-security-layer-request&useMandate=false -->
- <a href="https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample&Template=https://localhost:8443/moa-id-auth/template_localBKU.html&bkuURI=https://127.0.0.1:3496/https-security-layer-request&useMandate=false">
- <div id="bkukarte" class="hell">
- <button name="bkuButton" type="button">KARTE</button>
- </div>
- </a>
-
-
- <!-- Block "KARTE+Vollmacht": Anmeldung mit lokaler BKU *mit* Vollmacht (No-Script Variante) -->
- <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an (inkl. Template-URL, bkuURI und useMandate Parameter!) -->
- <!-- z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at&Template=https://yoururl.at/moa-id-auth/template_localBKU.html&bkuURI=https://127.0.0.1:3496/https-security-layer-request&useMandate=true -->
- <!-- <a href="https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample&Template=https://localhost:8443/moa-id-auth/template_localBKU.html&bkuURI=https://127.0.0.1:3496/https-security-layer-request&useMandate=true">
- <div id="bkukarte" class="hell">
- <button name="bkuButton" type="button">KARTE+<br>Vollmacht</button>
- </div>
- </a> -->
-
-
- <!-- Block "HANDY": Anmeldung mit Handysignatur *ohne* Vollmacht (No-Script Variante) -->
- <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an (inkl. Template-URL, bkuURI und useMandate Parameter!) -->
- <!-- z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at&Template=https://yoururl.at/moa-id-auth/template_handyBKU.html&bkuURI=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx&useMandate=false -->
- <a href="https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample&Template=https://localhost:8443/moa-id-auth/template_localBKU.html&bkuURI=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx&useMandate=false">
- <div id="bkuhandy" class="hell">
- <button name="bkuButton" type="button">HANDY</button>
- </div>
- </a>
-
- <!-- Block "HANDY+Vollnacht": Anmeldung mit Handysignatur *mit* Vollmacht (No-Script Variante) -->
- <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an (inkl. Template-URL, bkuURI und useMandate Parameter!) -->
- <!-- z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at&Template=https://yoururl.at/moa-id-auth/template_handyBKU.html&bkuURI=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx&useMandate=true -->
- <!-- <a href="https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample&Template=https://localhost:8443/moa-id-auth/template_localBKU.html&bkuURI=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx&useMandate=true">
- <div id="bkuhandy" class="hell">
- <button name="bkuButton" type="button">HANDY</button>
- </div>
- </a> -->
-
-
- <!-- Block "Ausländische Identitäten bzw. STORK": Länderauswahl für Anmeldung ausländischer Identitäten über STORK oder lokale BKU(No-Script Variante) -->
- <!-- [MUSS] Geben Sie im Feld "action" die URL zum Aufruf von MOA-ID an (inkl. Template-URL und bkuURI) -->
- <!-- z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at&Template=https://yoururl.at/moa-id-auth/template_localBKU.html&bkuURI=https://127.0.0.1:3496/https-security-layer-request -->
- <div id="leftcontent" style="margin-bottom:10px">
- <h2 id="tabheader" class="dunkel">
- Home Country Selection
- </h2>
- </div>
- <div id="stork" class="hell" align="center">
- <p>
- <form name="storkForm" method="POST" action="https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample&Template=https://localhost:8443/moa-id-auth/template_localBKU.html&bkuURI=https://127.0.0.1:3496/https-security-layer-request">
- <select name="CCC" size="1" style="width:120px">
- <option value="BE">België/Belgique</option>
- <option value="EE">Eesti</option>
- <option value="ES">España</option>
- <option value="IS">Ísland</option>
- <option value="IT">Italia</option>
- <option value="LI">Liechtenstein</option>
- <option value="LT">Lithuania</option>
- <option value="PT">Portugal</option>
- <option value="SI">Slovenija</option>
- <option value="FI">Suomi</option>
- <option value="SE">Sverige</option>
- </select>
- <input type="submit" name="storkButton" value="Send" alt="Send" class="button"/>
- <a href="info_stork.html" target="_blank" class="infobutton" style="color:#FFF">i</a>
- </form>
- </p>
- </div>
-
- </noscript>
- <script>
- <!-- [OPTIONAL] Um die Online BKU auszublenden, kommentieren sie folgende drei Zeilen aus aus -->
- document.write("<div id=\"bkukarte\" class=\"hell\">");
- document.write("<button name=\"bkuButton\" type=\"button\" onClick=\"bkuOnlineClicked();\">KARTE</button>");
- document.write("</div>");
-
- <!-- [OPTIONAL] Um die Handysignatur auszublenden, kommentieren sie folgende drei Zeilen aus aus -->
- document.write("<div id=\"bkuhandy\" class=\"hell\">");
- document.write("<button name=\"bkuButton\" type=\"button\" onClick=\"bkuHandyClicked();\">HANDY</button>");
- document.write("</div>");
-
- <!-- [OPTIONAL] Um die Anmeldung mit Vollmachten auszublenden, kommentieren Sie folgende fünf Zeilen aus -->
- document.write("<div id=\"mandate\">");
- document.write("<input type=\"checkbox\" name=\"Mandate\" style=\"vertical-align: middle; margin-right: 5px;\" id=\"mandateCheckBox\">");
- document.write("<label>in Vertretung anmelden</label>");
- document.write(" <a href=\"info_mandates.html\" target=\"_blank\" class=\"infobutton\" style=\"color:#FFF\">i</a>");
- document.write("</div> ");
-
- <!-- [OPTIONAL] Um die Anmeldung von ausländischen Identitäten auszublenden, kommentieren Sie folgende Zeilen aus -->
- document.write("<div id=\"leftcontent\" style=\"margin-bottom:10px\">");
- document.write("<h2 id=\"tabheader\" class=\"dunkel\">");
- document.write("Home Country Selection");
- document.write("</h2>");
- document.write("</div>");
- document.write("<div id=\"stork\" class=\"hell\" align=\"center\">");
- document.write("<p>");
- document.write("<select name=\"cccSelection\" id=\"cccSelection\" size=\"1\" style=\"width: 120px; margin-right: 5px;\" >");
- document.write("<option value=\"BE\">België/Belgique</option>");
- document.write("<option value=\"EE\">Eesti</option>");
- document.write("<option value=\"ES\">España</option>");
- document.write("<option value=\"IS\">Ísland</option>");
- document.write("<option value=\"IT\">Italia</option>");
- document.write("<option value=\"LI\">Liechtenstein</option>");
- document.write("<option value=\"LT\">Lithuania</option>");
- document.write("<option value=\"PT\">Portugal</option>");
- document.write("<option value=\"SI\">Slovenija</option>");
- document.write("<option value=\"FI\">Suomi</option>");
- document.write("<option value=\"SE\">Sverige</option>");
- document.write("</select>");
- document.write("<button name=\"bkuButton\" type=\"button\" onClick=\"storkClicked();\">Send</button>");
- document.write(" <a href=\"info_stork.html\" target=\"_blank\" class=\"infobutton\" style=\"color:#FFF\">i</a>");
- document.write("</p>");
- document.write("</div>");
-
- </script>
- </div>
-
-
-
-
- <div id="localBKU" style="display:none" class="hell">
- <hr>
- <form method="post" id="moaidform">
- <input type="hidden" name="show" value="false">
- <input type="hidden" name="Template" id="Template">
- <input type="hidden" name="bkuURI" value="https://127.0.0.1:3496/https-security-layer-request">
- <input type="hidden" name="useMandate" id="useMandate">
- <input type="hidden" name="CCC" id="ccc">
- <input type="submit" size="400" value="Lokale BKU" class="sendButton">
- </form>
- <p>
- <small>Alternativ können Sie eine lokal installierte BKU verwenden.</small>
- </p>
- </div>
-
- <div id="tab" class="hell">
- <a href="info_bk.html" class="link_nav">Informationen zur Bürgerkarte</a>
- </div>
-
- <div id="navlist" class="hell">
- <ul>
- <li>
- <a href="http://www.buergerkarte.at" target="_blank">Bürgerkarte.at</a>
- </li>
- <li>
- <a href="http://www.digitales.oesterreich.gv.at/" target="_blank">Digitales Österreich</a>
- </li>
- <li>
- <a href="http://www.a-sit.at/" target="_blank">A-SIT</a>
- </li>
- <li>
- <a href="http://www.a-trust.at/" target="_blank">A-Trust</a>
- </li>
- <li>
- <a href="http://www.egiz.gv.at/" target="_blank">EGIZ</a>
- </li>
- </ul>
- </div>
- </div>
-
- <div id="rightcontent">
- <p>
- <a href="http://www.buergerkarte.at/aktivieren.de.php" target="_blank"><img src="img/bk_aktivieren.jpg" border="0" alt="B6uuml;rgerkarte aktivieren" width="210"></a>
- </p>
- </div>
-
- <div id="centercontent">
-
- <h2 id="contentheader" class="dunkel">
- Hinweise zum MOA-Template
- </h2>
-
- <div id="content" class="hell">
- <p>
- Eine Anleitung zur Nutzung des MOA-Template finden Sie hier: <a href="BKAuswahl-MOA-Template-Howto.pdf" target="_blank">BKAuswahl-MOA-Template-Howto.pdf (PDF, 190B)</a>.
- So müssen vor einem Login noch die Parameter für den MOA-ID Aufruf angegeben werden.</p>
- <p>
- Diese Musterseite erfüllt die Richtlinie für barrierefreie Webinhalte 2.0 (WCAG 2.0 des W3C) Stufe AA. Das Prüfprotokoll hierzu finden Sie hier: <a href="WCAG-Pruefprotokoll.pdf" target="_blank">Pruefprotokoll.pdf (PDF, 705kB)</a>.
- </p>
- </div>
- </div>
- </div>
- </div>
</body>
</html>
\ No newline at end of file diff --git a/id/server/auth/src/main/webapp/template_handyBKU.html b/id/server/auth/src/main/webapp/template_handyBKU.html index 0ad73a6f3..91f7fad6f 100644 --- a/id/server/auth/src/main/webapp/template_handyBKU.html +++ b/id/server/auth/src/main/webapp/template_handyBKU.html @@ -19,13 +19,13 @@ <input type="hidden" name="PushInfobox" value="<PushInfobox>">
<!-- Angabe der Parameter für die Handy-BKU -->
- <input type="hidden" name="appletWidth" value="220">
- <input type="hidden" name="appletHeight" value="159">
+ <input type="hidden" name="appletWidth" value="<APPLETWIDTH>">
+ <input type="hidden" name="appletHeight" value="<APPLETHEIGHT>">
<!-- [OPTIONAL] Aendern Sie hier die Hintergrundfarbe der Handy-BKU -->
- <input type="hidden" name="backgroundColor" value="#DDDDDD">
+ <input type="hidden" name="backgroundColor" value="<COLOR>">
- <input type="hidden" name="redirecttarget" value="_parent">
+ <input type="hidden" name="redirecttarget" value="<REDIRECTTARGET>">
</form>
<form name="CustomizedInfoForm" action="<BKU>" method="post">
diff --git a/id/server/auth/src/main/webapp/template_onlineBKU.html b/id/server/auth/src/main/webapp/template_onlineBKU.html index 565955538..534d3dc55 100644 --- a/id/server/auth/src/main/webapp/template_onlineBKU.html +++ b/id/server/auth/src/main/webapp/template_onlineBKU.html @@ -19,11 +19,12 @@ <input type="hidden" name="PushInfobox" value="<PushInfobox>">
<!-- Angabe der Parameter fuer die Online-BKU -->
- <input type="hidden" name="appletWidth" value="220">
- <input type="hidden" name="appletHeight" value="140">
+ <input type="hidden" name="appletWidth" value="<APPLETWIDTH>">
+ <input type="hidden" name="appletHeight" value="<APPLETHEIGHT>">
<!-- [OPTIONAL] Aendern Sie hier die Hintergrundfarbe der Online-BKU -->
- <input type="hidden" name="appletBackgroundColor" value="#DDDDDD">
+ <input type="hidden" name="appletBackgroundColor" value="<COLOR>">
+ <input type="hidden" name="redirectTarget" value="<REDIRECTTARGET>">
</form>
<form name="CustomizedInfoForm" action="<BKU>" method="post">
|
