aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2016-03-18 11:35:59 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2016-03-18 11:35:59 +0100
commit55c0cdf35eeed3965ab875d1980fc0b2ba478744 (patch)
tree4961b13f1be96556725885d974516b89246a2bcc
parent23cded37cfe100bf51480c08827166666e464c6c (diff)
downloadmoa-id-spss-55c0cdf35eeed3965ab875d1980fc0b2ba478744.tar.gz
moa-id-spss-55c0cdf35eeed3965ab875d1980fc0b2ba478744.tar.bz2
moa-id-spss-55c0cdf35eeed3965ab875d1980fc0b2ba478744.zip
add new Card and handy-signature logos
-rw-r--r--id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/StaticResourceConfiguration.java3
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/handy_deprecated.gif (renamed from id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/handy.gif)bin4460 -> 4460 bytes
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/handysign.pngbin0 -> 377212 bytes
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte.pngbin0 -> 21957 bytes
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte_deactivated.pngbin0 -> 20539 bytes
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte_deprecated.gif (renamed from id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte.gif)bin3360 -> 3360 bytes
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/mobile-bku_deprecated.png (renamed from id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/mobile-bku.png)bin4602 -> 4602 bytes
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku-deactivated_deprecated.png (renamed from id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku-deactivated.png)bin5382 -> 5382 bytes
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku_deprecated.png (renamed from id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku.png)bin6011 -> 6011 bytes
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/templates/css_template.css2
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/templates/javascript_tempalte.js2
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/templates/loginFormFull.html4
-rw-r--r--id/server/moa-id-spring-initializer/src/main/resources/applicationContext.xml2
13 files changed, 7 insertions, 6 deletions
diff --git a/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/StaticResourceConfiguration.java b/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/StaticResourceConfiguration.java
index bc71a9511..d7d99d3a7 100644
--- a/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/StaticResourceConfiguration.java
+++ b/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/StaticResourceConfiguration.java
@@ -36,7 +36,8 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
public class StaticResourceConfiguration extends WebMvcConfigurerAdapter {
private static final String[] CLASSPATH_RESOURCE_LOCATIONS = {
- "classpath:/mainGUI/"};
+ "classpath:/mainGUI/",
+ "/"};
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/handy.gif b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/handy_deprecated.gif
index 5aeb542db..5aeb542db 100644
--- a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/handy.gif
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/handy_deprecated.gif
Binary files differ
diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/handysign.png b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/handysign.png
new file mode 100644
index 000000000..2c3645774
--- /dev/null
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/handysign.png
Binary files differ
diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte.png b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte.png
new file mode 100644
index 000000000..5dfa694ca
--- /dev/null
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte.png
Binary files differ
diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte_deactivated.png b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte_deactivated.png
new file mode 100644
index 000000000..5775734f2
--- /dev/null
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte_deactivated.png
Binary files differ
diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte.gif b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte_deprecated.gif
index ee9ab7cad..ee9ab7cad 100644
--- a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte.gif
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte_deprecated.gif
Binary files differ
diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/mobile-bku.png b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/mobile-bku_deprecated.png
index 697514273..697514273 100644
--- a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/mobile-bku.png
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/mobile-bku_deprecated.png
Binary files differ
diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku-deactivated.png b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku-deactivated_deprecated.png
index c2145f12a..c2145f12a 100644
--- a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku-deactivated.png
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku-deactivated_deprecated.png
Binary files differ
diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku.png b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku_deprecated.png
index d7d524999..d7d524999 100644
--- a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku.png
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku_deprecated.png
Binary files differ
diff --git a/id/server/moa-id-frontend-resources/src/main/resources/templates/css_template.css b/id/server/moa-id-frontend-resources/src/main/resources/templates/css_template.css
index 32b9dee12..02ff9aba8 100644
--- a/id/server/moa-id-frontend-resources/src/main/resources/templates/css_template.css
+++ b/id/server/moa-id-frontend-resources/src/main/resources/templates/css_template.css
@@ -508,7 +508,7 @@
}
.bkuimage {
- width: 90%;
+ width: 70%;
height: auto;
}
diff --git a/id/server/moa-id-frontend-resources/src/main/resources/templates/javascript_tempalte.js b/id/server/moa-id-frontend-resources/src/main/resources/templates/javascript_tempalte.js
index e4e05bace..076a43b10 100644
--- a/id/server/moa-id-frontend-resources/src/main/resources/templates/javascript_tempalte.js
+++ b/id/server/moa-id-frontend-resources/src/main/resources/templates/javascript_tempalte.js
@@ -142,7 +142,7 @@ function isIE() {
var image = document.getElementById("bkuimage");
var srcatt = image.getAttribute("src");
var last = srcatt.substring(srcatt.lastIndexOf('/')+1);
- srcatt = srcatt.replace(last,'online-bku-deactivated.png');
+ srcatt = srcatt.replace(last,'karte_deactivated.png');
image.setAttribute("src",srcatt);
diff --git a/id/server/moa-id-frontend-resources/src/main/resources/templates/loginFormFull.html b/id/server/moa-id-frontend-resources/src/main/resources/templates/loginFormFull.html
index 02b86472b..6c70b57b3 100644
--- a/id/server/moa-id-frontend-resources/src/main/resources/templates/loginFormFull.html
+++ b/id/server/moa-id-frontend-resources/src/main/resources/templates/loginFormFull.html
@@ -37,13 +37,13 @@
</div>
<div id="bkuselectionarea">
<div id="bkukarte">
- <img id="bkuimage" class="bkuimage" src="$contextPath/img/online-bku.png"
+ <img id="bkuimage" class="bkuimage" src="$contextPath/img/karte.png"
alt="OnlineBKU" /> <input name="bkuButtonOnline" type="button"
onClick="bkuOnlineClicked();" tabindex="2" role="button"
value="Karte" />
</div>
<div id="bkuhandy">
- <img class="bkuimage" src="$contextPath/img/mobile-bku.png"
+ <img class="bkuimage" src="$contextPath/img/handysign.png"
alt="HandyBKU" /> <input name="bkuButtonHandy" type="button"
onClick="bkuHandyClicked();" tabindex="3" role="button"
value="HANDY" />
diff --git a/id/server/moa-id-spring-initializer/src/main/resources/applicationContext.xml b/id/server/moa-id-spring-initializer/src/main/resources/applicationContext.xml
index 42325314c..ae38c836e 100644
--- a/id/server/moa-id-spring-initializer/src/main/resources/applicationContext.xml
+++ b/id/server/moa-id-spring-initializer/src/main/resources/applicationContext.xml
@@ -20,7 +20,7 @@
<context:component-scan base-package="at.gv.egovernment.moa.id.auth.frontend" />
- <!-- <mvc:default-servlet-handler/> -->
+ <mvc:default-servlet-handler/>
<mvc:interceptors>
<bean class="at.gv.egovernment.moa.id.auth.servlet.interceptor.WebFrontEndSecurityInterceptor" />