diff options
| author | Christian Maierhofer <cmaierhofer@iaik.tugraz.at> | 2015-10-15 09:57:40 +0200 |
|---|---|---|
| committer | Christian Maierhofer <cmaierhofer@iaik.tugraz.at> | 2015-10-15 09:57:40 +0200 |
| commit | aed2f6f6511d9fd027b24f3810f057f5182c3d60 (patch) | |
| tree | 4194b2f7d68325da0c1c571780c27cd1cf07ea4f /id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | |
| parent | 9033146d29c45a9f9a781e0ff450981c27045c3d (diff) | |
| parent | 0e55c7882ce4ed4fcb28e60c94dea6b325462ba5 (diff) | |
| download | moa-id-spss-aed2f6f6511d9fd027b24f3810f057f5182c3d60.tar.gz moa-id-spss-aed2f6f6511d9fd027b24f3810f057f5182c3d60.tar.bz2 moa-id-spss-aed2f6f6511d9fd027b24f3810f057f5182c3d60.zip | |
Merge branch 'web-config' into moa-id-3.0.0-snapshot
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp')
| -rw-r--r-- | id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp index c98b400f7..cc4220d0e 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp @@ -6,13 +6,19 @@ <html> <head> <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> + <link rel="stylesheet" type="text/css" href="../css/bootstrap.css"> <link rel="stylesheet" type="text/css" href="../css/index.css"> + + <link rel="stylesheet" media="screen" type="text/css" href="../css/colorpicker.css" /> + <title><%=LanguageHelper.getGUIString("title", request) %></title> <script type="text/javascript" src="../js/common.js"></script> <script src="../js/jquery.js"></script> <script type="text/javascript" src="../js/colorpicker.js"></script> + <script src="../js/bootstrap-input.js"></script> + <script>$(document).ready(function(){$('input[type=file]').bootstrapFileInput();});</script> </head> <body onload="oaOnLoad()"> @@ -71,7 +77,7 @@ <button type="button" style="display:none" class="oa_buttons" onclick="oaOAuth20();" id="button_oauth20_hidden"> <%=LanguageHelper.getGUIString("webpages.oaconfig.menu.oauth20.hidden", request) %> </button> - + <s:include value="snippets/OA/saml1.jsp"></s:include> @@ -79,7 +85,8 @@ <s:param name="hideBlock">hidden</s:param> </s:include> - <s:include value="snippets/OA/openIDConnect.jsp"></s:include> + <s:include value="snippets/OA/openIDConnect.jsp"></s:include> + </div> @@ -89,7 +96,7 @@ <s:hidden name="formID" value="%{formID}"></s:hidden> - + <br/> <div id="button_area"> <s:submit key="webpages.edit.back" action="cancleandbackOA"/> |