webgui fixing for smaller screens

5 files changed, 25 insertions, 10 deletions

diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
index d373eab5e..385c77ad5 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
@@ -50,7 +50,7 @@ webpages.index.header=Willkommen bei der MOA-ID 3.x Konfigurationsapplikation
 webpages.index.desciption.head=Um dieses Service nutzen zu k\u00F6nnen m\u00FCssen sie sich einloggen.
 webpages.index.login=Anmelden
 webpages.index.logout=Abmelden
-webpages.index.login.pvp2=Anmeldung mit B\u00FCrgerkarte oder Handy-Signature
+webpages.index.login.pvp2=Anmeldung mit B\u00FCrgerkarte oder Handy-Signatur
 webpages.index.login.notallowed=Entweder sind Benutzername oder Passwort sind nicht korrekt oder der Account wurde noch nicht aktiviert.
 webpages.index.username.unkown=Der Benutzer ist nicht bekannt.
 webpages.index.username.notactive=Der Benutzer wurde durch den Administrator noch nicht freigeschalten.
@@ -310,7 +310,7 @@ webpages.moaconfig.stork.attributes.heading=Attributkonfiguration
 webpages.moaconfig.stork.attributes.new=Neues Attribut hinzuf\u00FCgen
 webpages.moaconfig.stork.attributes.heading.name=Attributname
 webpages.moaconfig.stork.attributes.heading.mandatory=zwingend
-webpages.moaconfig.stork.attributes.remove=l\u00F6schen
+webpages.moaconfig.stork.attributes.remove=L\u00F6schen
 webpages.moaconfig.stork.qaa=Mindest-QAA-Level f\u00FCr diese OA ausw\u00E4hlen
 
 webpages.oaconfig.protocols.saml1.header=SAML1 Konfiguration
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
index 641dc94be..814cfa055 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
@@ -308,7 +308,7 @@ webpages.moaconfig.stork.attributes.heading=Configuration of attributes
 webpages.moaconfig.stork.attributes.new=Add new attribute
 webpages.moaconfig.stork.attributes.heading.name=Name of attribute
 webpages.moaconfig.stork.attributes.heading.mandatory=mandatory
-webpages.moaconfig.stork.attributes.remove=remove
+webpages.moaconfig.stork.attributes.remove=Remove
 webpages.moaconfig.stork.qaa=Select minimal QAA-Level for current OA
 
 webpages.oaconfig.protocols.saml1.header=SAML1 configuration
diff --git a/id/ConfigWebTool/src/main/webapp/css/index.css b/id/ConfigWebTool/src/main/webapp/css/index.css
index 6e07a76ec..4cbfba19b 100644
--- a/id/ConfigWebTool/src/main/webapp/css/index.css
+++ b/id/ConfigWebTool/src/main/webapp/css/index.css
@@ -104,6 +104,7 @@ h5{
 	float: left;
 	padding-left: 25px;
 	padding-top: 16px;
+	padding-bottom: 25px;
 	width:auto;
 }
 
@@ -340,7 +341,7 @@ h5{
     padding-right: 10px;
     padding-top: 5px;
     text-align: left;
-    width: 300px;
+    width: 280px;
 }
 
 .wwctrl {
@@ -652,4 +653,14 @@ div .wwgrp br {
 	top:1px;
 }
 
+.checkboxLabel{
+	padding-left:5px;
+	padding-right:5px;
+}
 
+#stork_attributelist .wwctrl{
+	padding-left:0px;
+}
+#stork_attributelist .wwctrl input[type="checkbox"]{
+	margin-left:20px;
+}
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 8d3e80527..bc8c57ec2 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -259,7 +259,7 @@
 								labelposition="left" />
 							<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.pepslist", request) %></h4>
               <table id="stork_pepslist">
-								<tr><th>Country Shortcode</th><th>PEPS URL</th><th>Supports XMLSignatures</th></tr>
+								<tr><td>Country Shortcode</td><td style="text-align:center;">PEPS URL</td><td>Supports XMLSignatures</td></tr>
 								<s:iterator value="storkconfig.cpepslist" status="stat">
 								  <tr>
 								  	<td style="display:none;"><s:textfield name="storkconfig.cpepslist[%{#stat.index}].hjid" value="%{hjid}" cssStyle="display:none;"/></td>
@@ -279,11 +279,11 @@
 							<input class="oa_buttons" type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.newpeps", request) %>" onclick='newPeps();' />
 							<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading", request) %></h4>
 							<table id="stork_attributelist">
-								<tr><th><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading.name", request) %></th><th><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading.mandatory", request) %></th></tr>
+								<tr><td><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading.name", request) %></td><td><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading.mandatory", request) %></td></tr>
 								<s:iterator value="storkconfig.attributes" status="stat">
 									<tr><td><s:textfield name="storkconfig.attributes[%{#stat.index}].name" value="%{name}"/></td>
 										<td><s:checkbox name="storkconfig.attributes[%{#stat.index}].mandatory" value="%{mandatory}" /></td>
-										<td><input class="oa_buttons" type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.remove", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
+										<td><input class="button_narrow" type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.remove", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
 								</s:iterator>
 							</table>
 							<input class="oa_buttons" type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.new", request) %>" onclick='newStorkAttribute();' />
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/saml1.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/saml1.jsp
index a004a03a3..294d638f8 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/saml1.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/saml1.jsp
@@ -14,38 +14,42 @@
 									cssClass="checkbox">
 								</s:checkbox>
 							</s:if>
+							
 							<s:checkbox name="saml1OA.provideStammZahl" 
 								value="%{saml1OA.provideStammZahl}"
 								labelposition="left"
 								key="webpages.oaconfig.saml1.provideStammZahl"
 								cssClass="checkbox">
 							</s:checkbox>
+							<br>
 							<s:checkbox name="saml1OA.provideAuthBlock" 
 								value="%{saml1OA.provideAuthBlock}"
 								labelposition="left"
 								key="webpages.oaconfig.saml1.provideAuthBlock"
 								cssClass="checkbox">
 							</s:checkbox>
-							<br>
+							
 							<s:checkbox name="saml1OA.provideIdentityLink" 
 								value="%{saml1OA.provideIdentityLink}"
 								labelposition="left"
 								key="webpages.oaconfig.saml1.provideIdentityLink"
 								cssClass="checkbox">
-							</s:checkbox>							
+							</s:checkbox>	
+							<br>						
 							<s:checkbox name="saml1OA.provideCertificate" 
 								value="%{saml1OA.provideCertificate}"
 								labelposition="left"
 								key="webpages.oaconfig.saml1.provideCertificate"
 								cssClass="checkbox">
 							</s:checkbox>
+							<br>
 							<s:checkbox name="saml1OA.provideFullMandateData" 
 								value="%{saml1OA.provideFullMandateData}"
 								labelposition="left"
 								key="webpages.oaconfig.saml1.provideFullMandateData"
 								cssClass="checkbox">
 							</s:checkbox>
-							<br>
+							
 							<s:checkbox name="saml1OA.provideAllErrors" 
 								value="%{saml1OA.provideAllErrors}"
 								labelposition="left"