diff options
author | Florian Reimair <florian.reimair@iaik.tugraz.at> | 2014-03-05 08:35:19 +0100 |
---|---|---|
committer | Florian Reimair <florian.reimair@iaik.tugraz.at> | 2014-03-05 10:26:50 +0100 |
commit | f57dbf19485e1da5f9a60d65b0c4cc8ce6e4cd9c (patch) | |
tree | e327b1f38256daf028979a184c31c01e0eca0bf1 /id/ConfigWebTool/src/main/webapp | |
parent | dbbf8045afe2ddf9a1ba4a4f511d85ffcba32cf8 (diff) | |
download | moa-id-spss-f57dbf19485e1da5f9a60d65b0c4cc8ce6e4cd9c.tar.gz moa-id-spss-f57dbf19485e1da5f9a60d65b0c4cc8ce6e4cd9c.tar.bz2 moa-id-spss-f57dbf19485e1da5f9a60d65b0c4cc8ce6e4cd9c.zip |
config gui fixes
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp')
-rw-r--r-- | id/ConfigWebTool/src/main/webapp/js/common.js | 15 | ||||
-rw-r--r-- | id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | 2 |
2 files changed, 10 insertions, 7 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js index 5fbbdafd1..fef368b0a 100644 --- a/id/ConfigWebTool/src/main/webapp/js/common.js +++ b/id/ConfigWebTool/src/main/webapp/js/common.js @@ -45,21 +45,21 @@ function oaSSOService() { } } function oaStork() { - if ($('#OAuseSTORKLogon').attr('checked') == 'checked') { + if ($('#OAuseSTORKLogon').is(':checked')) { $('#stork_block').css('display', "block"); } else { $('#stork_block').css('display', "none"); } } function oaVIDP() { - if ($('#oa_vidp_area').css('display') == "block") { - $('#oa_vidp_area').css('display', "none"); - $('#button_vidp_show').css('display', "block"); - $('#button_vidp_hidden').css('display', "none"); - } else { + if ($('#oa_vidp_area').css('display') == "none" || $('#OAuseVidp').is(':checked')) { $('#oa_vidp_area').css('display', "block"); $('#button_vidp_show').css('display', "none"); $('#button_vidp_hidden').css('display', "block"); + } else { + $('#oa_vidp_area').css('display', "none"); + $('#button_vidp_show').css('display', "block"); + $('#button_vidp_hidden').css('display', "none"); } } function oaSAML1() { @@ -201,9 +201,12 @@ function oaOnLoad() { oaBusinessService(); oaSSOService(); oaLegacyService(); + oaStork(); AdminTarget(); oaTargetSubSector(); + oaVIDP(); + $(".colorfield").each( function() { $(this).ColorPicker({ diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp index 1f42bf092..76c347445 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp @@ -505,7 +505,7 @@ </div> - <div id="oa_vidp_area" class="oa_protocol_area hidden"> + <div id="oa_vidp_area" class="oa_protocol_area"> <h4><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h4> <p><s:checkbox name="storkOA.vidpEnabled" |