add new Card and handy-signature logos

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
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
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
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
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
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
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
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
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" />