Skip to content

Commit

Permalink
Merge pull request #2249 from GluuFederation/oxtrust-issues-2248
Browse files Browse the repository at this point in the history 
feat(oxtrust): update jquery and bootstrap to latest stable versions …
  • Loading branch information
@yurem
yurem authored Sep 9, 2022
2 parents ecb5e07 + f6c87fb commit a8cbb67
Show file tree
Hide file tree
Showing 28 changed files with 2,736 additions and 4,275 deletions.
2 changes: 1 addition & 1 deletion server/src/main/resources/META-INF/richfaces/static-resource-mappings.properties
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#jquery.js=jquery-1.12.4.min.js
#jquery.js=jquery-3.6.1.min.js
bootstrap.js=bootstrap.min.js
jquery-migrate.js=4.3.7.Final/Packed/jquery.jsorg.richfaces.staticResource/jquery.js
2 changes: 1 addition & 1 deletion server/src/main/webapp/WEB-INF/incl/layout/fullWidthEmpty.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ a {
</div>
<!-- Scripts -->
<script
src='#{oxTrustConfigurationService.cssLocation}/../theme/dist/js/jquery-1.12.4.min.js'
src='#{oxTrustConfigurationService.cssLocation}/../theme/dist/js/jquery-3.6.1.min.js'
type="text/javascript"></script>
<script
src="#{oxTrustConfigurationService.cssLocation}/../theme/bootstrap/js/bootstrap.min.js"
Expand Down
255 changes: 128 additions & 127 deletions server/src/main/webapp/WEB-INF/incl/layout/newtemplate.xhtml
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<!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">
<f:view xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:b="http://bootsfaces.net/ui"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:a="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich"
xmlns:gluufn="http://www.gluu.org/jsf/functions"
contentType="text/html" locale="#{language.localeCode}">

<h:head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>#{organizationService.organization.organizationTitle}</title>
<script type="text/javascript">
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:b="http://bootsfaces.net/ui"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:a="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich"
xmlns:gluufn="http://www.gluu.org/jsf/functions"
contentType="text/html" locale="#{language.localeCode}">

<h:head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>#{organizationService.organization.organizationTitle}</title>
<script type="text/javascript">
if (top != self)
top.location.href = self.document.location;
if (parent != self)
Expand All @@ -23,67 +23,68 @@
top.location.href = self.document.location;
if (window != window.top)
top.location.href = location.href;
</script>
<link rel="icon" type="image/x-icon"
href="#{request.contextPath}/servlet/favicon" />
<script type="text/javascript"
src="#{oxTrustConfigurationService.jsLocation}/gluuCommon.js"></script>
<ui:param name="themeColor"
value="#{organizationService.organization.themeColor}" />
<ui:fragment rendered="#{not empty themeColor}">
<style type="text/css">
.rf-tb-itm, .rf-tb-emp {
height: 33px;
background-color: #{gluufn:getColor(themeColor, "00ff00")
}

.rf-tab-hdr-tabline-top {
overflow-x: auto !important;
}

#customScriptForm:scriptTypeTabPanelIdheader {
overflow-x: auto !important;
}
</style>
</ui:fragment>

<!-- Stylesheets new theme -->
<link
href="#{oxTrustConfigurationService.cssLocation}/../theme/bootstrap/css/bootstrap.min.css"
rel="stylesheet" type="text/css" />
<link
href="#{oxTrustConfigurationService.cssLocation}/../theme/bootstrap/css/font-awesome.min.css"
rel="stylesheet" type="text/css" />
<link
href="#{oxTrustConfigurationService.cssLocation}/../theme/bootstrap/css/ionicons.min.css"
rel="stylesheet" type="text/css" />
<link
href="#{oxTrustConfigurationService.cssLocation}/../theme/dist/css/gas-AdminLTE.min.css"
rel="stylesheet" type="text/css" />
<link
href="#{oxTrustConfigurationService.cssLocation}/../theme/dist/css/skins/gas-skin-green.min.css"
rel="stylesheet" type="text/css" />

<link
href="#{oxTrustConfigurationService.cssLocation}/../theme/plugins/iCheck/square/blue.css"
rel="stylesheet" type="text/css" />
<link
href="#{oxTrustConfigurationService.cssLocation}/../theme/plugins/morris/morris.css"
rel="stylesheet" type="text/css" />
<link
href="#{oxTrustConfigurationService.cssLocation}/../theme/dist/css/custom.css"
rel="stylesheet" type="text/css" />
<link
href="#{oxTrustConfigurationService.cssLocation}/../theme/dist/css/rf-override.css"
rel="stylesheet" type="text/css" />
<ui:insert name="head" />
<style type="text/css">
input[type=text], input[type=email], input[type=password], input[autocomplete=off],
input[type=url] {
padding: 5px;
border: 1px solid #ccc;
border-radius: 5px !important;
}
</script>
<link rel="icon" type="image/x-icon"
href="#{request.contextPath}/servlet/favicon"/>
<script type="text/javascript"
src="#{oxTrustConfigurationService.jsLocation}/gluuCommon.js"></script>
<ui:param name="themeColor"
value="#{organizationService.organization.themeColor}"/>
<ui:fragment rendered="#{not empty themeColor}">
<style type="text/css">
.rf-tb-itm, .rf-tb-emp {
height: 33px;
background-color: #{gluufn:getColor(themeColor, "00ff00")
}

.rf-tab-hdr-tabline-top {
overflow-x: auto !important;
}

#customScriptForm:scriptTypeTabPanelIdheader {
overflow-x: auto !important;
}
</style>
</ui:fragment>

<!-- Stylesheets new theme -->
<link
href="#{oxTrustConfigurationService.cssLocation}/../theme/bootstrap/css/bootstrap.min.css"
rel="stylesheet" type="text/css"/>
<link
href="#{oxTrustConfigurationService.cssLocation}/../theme/bootstrap/css/font-awesome.min.css"
rel="stylesheet" type="text/css"/>
<link
href="#{oxTrustConfigurationService.cssLocation}/../theme/bootstrap/css/ionicons.min.css"
rel="stylesheet" type="text/css"/>
<link
href="#{oxTrustConfigurationService.cssLocation}/../theme/dist/css/gas-AdminLTE.min.css"
rel="stylesheet" type="text/css"/>
<link
href="#{oxTrustConfigurationService.cssLocation}/../theme/dist/css/skins/gas-skin-green.min.css"
rel="stylesheet" type="text/css"/>

<link
href="#{oxTrustConfigurationService.cssLocation}/../theme/plugins/iCheck/square/blue.css"
rel="stylesheet" type="text/css"/>
<link
href="#{oxTrustConfigurationService.cssLocation}/../theme/plugins/morris/morris.css"
rel="stylesheet" type="text/css"/>
<link
href="#{oxTrustConfigurationService.cssLocation}/../theme/dist/css/custom.css"
rel="stylesheet" type="text/css"/>
<link
href="#{oxTrustConfigurationService.cssLocation}/../theme/dist/css/rf-override.css"
rel="stylesheet" type="text/css"/>
<ui:insert name="head"/>
<style type="text/css">
input[type=text], input[type=email], input[type=password], input[autocomplete=off],
input[type=url] {
padding: 5px;
border: 1px solid #ccc;
border-radius: 5px !important;
}

input[type=search] {
border: 1px solid #ccc;
Expand Down Expand Up @@ -215,61 +216,61 @@ select {
.content {
min-height: 550px;
}
</style>
</h:head>
<h:body styleClass="skin-green">
<div class="wrapper">
<h:panelGroup layout="block">
<ui:include src="topmenu.xhtml">
<ui:param name="projectName" value="oxTrust" />
</ui:include>
</h:panelGroup>
<ui:include src="leftmenu.xhtml">
<ui:param name="projectName" value="oxTrust" />
</ui:include>
<div class="#{not isLogin?'body':'loginBody'}">
<div class="content-wrapper">
<b:growl id="growlMsg" globalOnly="true" placementFrom="top"
show-detail="true" show-summary="false" allowDismiss="true"
severity="info,warn,error,fatal" delay="3000" escape="true"
auto-update="true" />
<a:status startText="Loading..."
startStyle="background-color: #006699; color: white; font-weight: bold; position: fixed; left: 0px; top: 0px; padding: 5px 5px 5px 5px;" />
<ui:insert name="body" />
</div>
<div class="gluuBusyIndicator"
style="display: none; cursor: default; border-radius: 10px;">
<img style="width: 30%; height: 20%;"
src="#{request.contextPath}/servlet/indicator" />
</div>
</div>
</div>

<!-- Scripts -->
<script
src="#{oxTrustConfigurationService.cssLocation}/../theme/bootstrap/js/bootstrap.min.js"
type="text/javascript"></script>
<script
src="#{oxTrustConfigurationService.cssLocation}/../theme/dist/js/app.min.js"
type="text/javascript"></script>
<script
src="#{oxTrustConfigurationService.cssLocation}/../theme/plugins/iCheck/icheck.min.js"
type="text/javascript"></script>
<script
src='#{oxTrustConfigurationService.cssLocation}/../theme/dist/js/jquery-ui-1.12.1.min.js'
type="text/javascript"></script>
<script
src='#{oxTrustConfigurationService.cssLocation}/../theme/dist/js/jquery.blockUI.js'
type="text/javascript"></script>
<script
src='#{oxTrustConfigurationService.cssLocation}/../theme/dist/js/clipboard.min.js'
type="text/javascript"></script>
<script>

</style>
</h:head>
<h:body styleClass="skin-green">
<div class="wrapper">
<h:panelGroup layout="block">
<ui:include src="topmenu.xhtml">
<ui:param name="projectName" value="oxTrust"/>
</ui:include>
</h:panelGroup>
<ui:include src="leftmenu.xhtml">
<ui:param name="projectName" value="oxTrust"/>
</ui:include>
<div class="#{not isLogin?'body':'loginBody'}">
<div class="content-wrapper">
<b:growl id="growlMsg" globalOnly="true" placementFrom="top"
show-detail="true" show-summary="false" allowDismiss="true"
severity="info,warn,error,fatal" delay="3000" escape="true"
auto-update="true"/>
<a:status startText="Loading..."
startStyle="background-color: #006699; color: white; font-weight: bold; position: fixed; left: 0px; top: 0px; padding: 5px 5px 5px 5px;"/>
<ui:insert name="body"/>
</div>
<div class="gluuBusyIndicator"
style="display: none; cursor: default; border-radius: 10px;">
<img style="width: 30%; height: 20%;"
src="#{request.contextPath}/servlet/indicator"/>
</div>
</div>
</div>
<!-- Scripts -->
<script
src="#{oxTrustConfigurationService.cssLocation}/../theme/bootstrap/js/bootstrap.min.js"
type="text/javascript"></script>
<script
src="#{oxTrustConfigurationService.cssLocation}/../theme/dist/js/app.min.js"
type="text/javascript"></script>
<script
src="#{oxTrustConfigurationService.cssLocation}/../theme/plugins/iCheck/icheck.min.js"
type="text/javascript"></script>
<script
src='#{oxTrustConfigurationService.cssLocation}/../theme/dist/js/jquery-ui-1.13.2.min.js'
type="text/javascript"></script>
<script
src='#{oxTrustConfigurationService.cssLocation}/../theme/dist/js/jquery.blockUI.js'
type="text/javascript"></script>
<script
src='#{oxTrustConfigurationService.cssLocation}/../theme/dist/js/clipboard.min.js'
type="text/javascript"></script>
<script>
$.blockUI.defaults.message = $('div.gluuBusyIndicator')
$.blockUI.defaults.fadeIn = 0
$.blockUI.defaults.fadeOut = 0
</script>
<div class="footer"></div>
</h:body>
</script>
<div class="footer"></div>
</h:body>
</f:view>
</html>
2 changes: 1 addition & 1 deletion server/src/main/webapp/home.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
</section>
<!-- Scripts -->
<script
src="#{oxTrustConfigurationService.cssLocation}/../theme/dist/js/jquery-ui-1.12.1.min.js"
src="#{oxTrustConfigurationService.cssLocation}/../theme/dist/js/jquery-ui-1.13.2.min.js"
type="text/javascript" />
<!-- Resolve conflict in jQuery UI tooltip with Bootstrap tooltip -->
<script>
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/webapp/person/passwordReminder.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
template="/WEB-INF/incl/layout/fullWidthEmpty.xhtml">
<ui:define name="head">
<script
src="#{oxAuthConfigurationService.jsLocation}/jquery-1.12.4.min.js"></script>
src="#{oxAuthConfigurationService.jsLocation}/jquery-3.6.1.min.js"></script>
<ui:fragment rendered="#{recaptchaService.enabled}">
<script async="async" defer="defer"
src="https://www.google.com/recaptcha/api.js" />
Expand Down
14 changes: 6 additions & 8 deletions server/src/main/webapp/resources/js/dashboard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@ $(function() {
try {

var authChartData = JSON.parse($("#authenticationChartJson").val());
console.log("authentication chart data");
console.log(authChartData);

//console.log("authentication chart data");
//console.log(authChartData);
var authenticationRequestsChartData = {
labels : authChartData.labels,
datasets : [

{
label : "Successful Logins",
fill : false,
Expand All @@ -28,7 +26,6 @@ $(function() {
backgroundColor : "#FF0000",
data : authChartData.failure
}

]
};

Expand All @@ -43,9 +40,8 @@ $(function() {
} ]
}
};
console.log(authenticationRequestsChartData);
console.log(authenticationRequestsChartOptions);

//console.log(authenticationRequestsChartData);
//console.log(authenticationRequestsChartOptions);
// Get context with jQuery - using jQuery's .get() method.
var authenticationRequestsChartCanvas = $(
"#authenticationRequestsChart").get(0).getContext("2d");
Expand All @@ -59,7 +55,9 @@ $(function() {
});

} catch (error) {
console.log("========================================");
console.log(error);
console.log("========================================");
}

});
1 change: 1 addition & 0 deletions static/src/main/resources/META-INF/resources/js/jsoneditor.min.js.map
View file

Large diffs are not rendered by default.

Loading

0 comments on commit a8cbb67

Please sign in to comment.