Fixed Bug [#467] Border between Background image and border.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@505 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

3 files changed, 12 insertions, 1 deletions

diff --git a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java
index 333e3d70..f6d7a50c 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java
@@ -130,6 +130,8 @@ public class BKURequestHandler extends SpringBKUServlet {
         .getFormData("appletHeight"), charset);
     String background = getStringFromStream(bindingProcessor
         .getFormData("appletBackground"), charset);
+    String backgroundColor = getStringFromStream(bindingProcessor
+        .getFormData("appletBackgroundColor"), charset);
     String guiStyle = getStringFromStream(bindingProcessor
         .getFormData("appletGuiStyle"), charset);
     String hashDataDisplay = getStringFromStream(bindingProcessor
@@ -161,6 +163,10 @@ public class BKURequestHandler extends SpringBKUServlet {
       log.trace("Found applet background parameter: " + background);
       session.setAttribute("appletBackground", background);
     }
+    if (backgroundColor != null) {
+      log.trace("Faund applet background color parameter: " + backgroundColor);
+      session.setAttribute("appletBackgroundColor", backgroundColor);
+    }
     if (guiStyle != null) {
       log.trace("Found applet GUI style parameter: " + guiStyle);
       session.setAttribute("appletGuiStyle", guiStyle);
diff --git a/BKUOnline/src/main/webapp/SLRequestForm.html b/BKUOnline/src/main/webapp/SLRequestForm.html
index 997a3c82..f705a0cb 100644
--- a/BKUOnline/src/main/webapp/SLRequestForm.html
+++ b/BKUOnline/src/main/webapp/SLRequestForm.html
@@ -159,6 +159,9 @@
                     name="appletHeight" value="130" id="appletHeight">
                 <p><label for="appletBackground">Applet Background</label> <input
                     name="appletBackground" value="" id="appletBackground">
+                <p><label for="appletBackgroundColor">Applet Background Color</label> <input
+                    name="appletBackgroundColor" value="" id="appletBackgroundColor">
+                </p>
 
                 <p>
                     <label for="appletPage">Applet Page</label>
diff --git a/BKUOnline/src/main/webapp/applet.jsp b/BKUOnline/src/main/webapp/applet.jsp
index 1e38cc04..5b9f2274 100644
--- a/BKUOnline/src/main/webapp/applet.jsp
+++ b/BKUOnline/src/main/webapp/applet.jsp
@@ -36,9 +36,10 @@
                 : (Integer) session.getAttribute("appletWidth"); 
         int height = session.getAttribute("appletHeight") == null ? 130
                 : (Integer) session.getAttribute("appletHeight");
-        String backgroundImg = session.getAttribute("appletBackground") == null
+        String backgroundImg = session.getAttribute("appletBackground") == null 
                 ? "../img/chip32.png"
                 : (String) session.getAttribute("appletBackground");
+        String backgroundColor = (String) session.getAttribute("appletBackgroundColor");
         String guiStyle = (String) session.getAttribute("appletGuiStyle");
         String locale = (String) session.getAttribute("locale");
         String extension = (String) session.getAttribute("extension");
@@ -91,6 +92,7 @@
                       GuiStyle : '<%=guiStyle%>',
                       Locale : '<%=locale%>',
                       Background : '<%=backgroundImg%>',
+                      BackgroundColor : '<%=backgroundColor%>',
                       WSDL_URL :'../stal;jsessionid=<%=session.getId()%>?wsdl',
                       HelpURL : '../help/',
                       SessionID : '<%=session.getId()%>',