add functionality for global authentication protocol activation/deactivation

2 files changed, 43 insertions, 8 deletions

diff --git a/id/ConfigWebTool/src/main/webapp/css/index.css b/id/ConfigWebTool/src/main/webapp/css/index.css
index 14591f1dc..79f8b4e72 100644
--- a/id/ConfigWebTool/src/main/webapp/css/index.css
+++ b/id/ConfigWebTool/src/main/webapp/css/index.css
@@ -1,10 +1,14 @@
 @CHARSET "UTF-8";
 
+body {
+	font-size: 1em;
+}
+
 #header_area {
 	padding-bottom: 10px;
 	background-color: #6FA5D4;
 	display: block;
-	font-size: 20px;
+	font-size: 1.2em;
   /* margin-left: 25px; */
   padding-top: 10px;
   padding-left: 25px;
@@ -12,7 +16,7 @@
 }
 
 #header_area>div {
-	font-size: 20px;
+	font-size: 1.2em;
   margin-left: 25px;
   padding-top: 8px;
 }
@@ -69,7 +73,7 @@
 .menu_element {
 	margin-top: 15px;
 	margin-bottom: 15px;
-	font-size: 20px;
+	font-size: 1.2em;
 	display: block;
 /* 	background-color: red; */
 	background-color: #6FA5D4;
@@ -96,7 +100,7 @@
 }
 
 #message_area label {
-	font-size: 18px;
+	font-size: 1.1em;
 	font-weight: bold;
 }
 
@@ -105,7 +109,7 @@
 }
 
 #error_area label{
-	font-size: 18px;
+	font-size: 1.1em;
 	font-weight: bold;
 }
 
@@ -220,6 +224,11 @@
    margin-left: 10px;
 }
 
+#moageneral_active_protocol>.wwgrp {
+	float: left;
+	clear: none;
+}
+
 #moageneral_legacy_protocol>.wwgrp {
 	clear: none;
 }
@@ -318,7 +327,7 @@ div .wwgrp br {
 	border-bottom-style: none;
 	display: table-header-group;
 	font-weight: bold;
-	font-size: 18px;
+	font-size: 1.1em;
 }
 
 .listFirst {
@@ -371,7 +380,7 @@ div .wwgrp br {
     padding-left: 30px;
     position: relative;
     top: 15px;
-    font-size: 20px;
+    font-size: 1.2em;
 		text-align: center;
    	padding-top: 10px;
    	border-radius: 3px;
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 05f4a1106..de2548535 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -228,7 +228,31 @@
 						
 						<div class="oa_config_block">
 							<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.header", request) %></h3>
-													
+
+							<div id="moageneral_active_protocol" class="moageneral_protocol_area">
+								<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.allowed.header", request) %></h4>
+								<s:checkbox name="moaconfig.protocolActiveSAML1" 
+									value="%{moaconfig.protocolActiveSAML1}"
+									labelposition="left"
+									key="webpages.moaconfig.protocols.legacy.saml1"
+									cssClass="checkbox">
+								</s:checkbox>
+								<s:checkbox name="moaconfig.protocolActivePVP21" 
+									value="%{moaconfig.protocolActivePVP21}"
+									labelposition="left"
+									key="webpages.moaconfig.protocols.legacy.pvp2"
+									cssClass="checkbox">
+								</s:checkbox>
+								<s:checkbox name="moaconfig.protocolActiveOAuth" 
+									value="%{moaconfig.protocolActiveOAuth}"
+									labelposition="left"
+									key="webpages.moaconfig.protocols.oauth"
+									cssClass="checkbox">
+								</s:checkbox>
+							</div>
+	
+							<br>
+															
 							<div id="moageneral_legacy_protocol" class="moageneral_protocol_area">
 								<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.legacy.header", request) %></h4>
 								<s:checkbox name="moaconfig.legacy_saml1" 
@@ -245,6 +269,8 @@
 								</s:checkbox>
 							</div>
 							
+							<br>
+							
 							<div class="moageneral_protocol_area">
 								<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.pvp2.header", request) %></h4>