Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ox auth issues 1896 #1898

Merged
merged 3 commits into from
Apr 2, 2024
Merged

Ox auth issues 1896 #1898

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d9207f
fix(oxauth-server): change js lib path
shekhar16 Mar 25, 2024
e56a0f8
fix(oxauth-server): change js lib path
shekhar16 Apr 1, 2024
746d07b
Merge branch 'master' into oxAuth_issues_1896
yurem Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 35 additions & 35 deletions Server/src/main/webapp/WEB-INF/incl/layout/login-extended-template.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,49 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html">
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html">
<f:view transient="true" locale="#{language.locale}">
<h:head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title><ui:insert name="pageTitle" /></title>
<link rel="icon" href="#{request.contextPath}/servlet/favicon" type='image/x-icon' />
<link type="text/css" rel="stylesheet"
href="#{oxAuthConfigurationService.getCssLocation()}/style.css" />
href="#{oxAuthConfigurationService.getCssLocation()}/style.css" />
<link type="text/css" rel="stylesheet"
href="#{oxAuthConfigurationService.getCssLocation()}/bootstrap.min.css" />
href="#{oxAuthConfigurationService.getCssLocation()}/bootstrap.min.css" />
<link type="text/css" rel="stylesheet"
href="#{oxAuthConfigurationService.getCssLocation()}/bootstrap-responsive.css" />
href="#{oxAuthConfigurationService.getCssLocation()}/bootstrap-responsive.css" />
<link type="text/css" rel="stylesheet"
href="#{oxAuthConfigurationService.getCssLocation()}/bootstrap-reboot.min.css" />
href="#{oxAuthConfigurationService.getCssLocation()}/bootstrap-reboot.min.css" />
<link type="text/css" rel="stylesheet"
href="#{oxAuthConfigurationService.getCssLocation()}/bootstrap-grid.min.css" />
href="#{oxAuthConfigurationService.getCssLocation()}/bootstrap-grid.min.css" />
<link rel="stylesheet"
href="#{oxAuthConfigurationService.getCssLocation()}/fontawesome.min.css" />
href="#{oxAuthConfigurationService.getCssLocation()}/fontawesome.min.css" />
<link rel="stylesheet"
href="#{oxAuthConfigurationService.getCssLocation()}/authorize.css" />
href="#{oxAuthConfigurationService.getCssLocation()}/authorize.css" />
<link type="text/css" rel="stylesheet"
href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600" />
href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600" />
<script
src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
src="#{oxAuthConfigurationService.getJsLocation()}/jquery-3.6.0.min.js"></script>
<script
src="#{oxAuthConfigurationService.getJsLocation()}/popper.min.js"></script>
src="#{oxAuthConfigurationService.getJsLocation()}/popper.min.js"></script>
<script
src="#{oxAuthConfigurationService.getJsLocation()}/fontawesome.min.js"></script>
src="#{oxAuthConfigurationService.getJsLocation()}/fontawesome.min.js"></script>
<script
src="#{oxAuthConfigurationService.getJsLocation()}/bootstrap.min.js"></script>
src="#{oxAuthConfigurationService.getJsLocation()}/bootstrap.min.js"></script>
<script
src="#{oxAuthConfigurationService.getJsLocation()}/bootstrap.bundle.min.js"></script>
src="#{oxAuthConfigurationService.getJsLocation()}/bootstrap.bundle.min.js"></script>
<script
src="#{oxAuthConfigurationService.getJsLocation()}/platform.js"></script>
src="#{oxAuthConfigurationService.getJsLocation()}/platform.js"></script>
<script
src="#{oxAuthConfigurationService.getJsLocation()}/jquery-qrcode-0.17.0.min.js"></script>
src="#{oxAuthConfigurationService.getJsLocation()}/jquery-qrcode-0.17.0.min.js"></script>
<script
src="#{oxAuthConfigurationService.getJsLocation()}/gluu-auth.js" />
src="#{oxAuthConfigurationService.getJsLocation()}/gluu-auth.js" />
<script
src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.13.2/jquery-ui.min.js"></script>
src="#{oxAuthConfigurationService.getJsLocation()}/jquery-ui.min.js"></script>
<ui:insert name="head" />

<style>
Expand All @@ -68,34 +68,34 @@ body {
<div>
<div class="login-logo">
<img style="max-height: 70px; padding-bottom: 2px;" id="AppLogo"
src="#{request.contextPath}/servlet/logo" />
src="#{request.contextPath}/servlet/logo" />
</div>
<div class="bs-docs-section"
style="border-top: 2px solid #1ab26b !important; margin-bottom: 5px !important; margin-top: 1px !important; padding-top: 1px !important;"></div>
style="border-top: 2px solid #1ab26b !important; margin-bottom: 5px !important; margin-top: 1px !important; padding-top: 1px !important;"></div>
</div>
<div class="body">
<ui:insert name="body" />
</div>
</h:body>
<footer class="footer" id="appFooter">
<div class="row" style="margin-top:20px;">
<div class="col-sm-3"></div>
<div class="col-sm-6 centered" style="text-align:center;">
<p class="centered">
&copy; <a target="_blank"
href="https://github.com/GluuFederation/oxAuth/blob/master/LICENSE"><h:outputText
<div class="row" style="margin-top:20px;">
<div class="col-sm-3"></div>
<div class="col-sm-6 centered" style="text-align:center;">
<p class="centered">
&copy; <a target="_blank"
href="https://github.com/GluuFederation/oxAuth/blob/master/LICENSE"><h:outputText
value="#{msgs['common.gluuInc']}" escape="false" /></a> | <a
target="_blank" href="#{client.policyUri}"><h:outputText
target="_blank" href="#{client.policyUri}"><h:outputText
value="#{msgs['common.privacyPolicy']}" escape="false" /></a> | <a
target="_blank" href="#{client.tosUri}"><h:outputText
target="_blank" href="#{client.tosUri}"><h:outputText
value="#{msgs['common.termsOfService']}" escape="false" /></a>
</p>
</p>
</div>
<div class="col-sm-3"></div>
</div>
<div class="col-sm-3"></div>
</div>
</footer>
<script type="text/javascript">
//<![CDATA[
//<![CDATA[
$(document)
.ready(
function() {
Expand Down
Loading