Skip to content

Commit

Permalink
update code and page modify url slash.
Browse files Browse the repository at this point in the history
  • Loading branch information
@billchen198318
billchen198318 committed Mar 23, 2019
1 parent fdcc3a7 commit 8671c38
Show file tree
Hide file tree
Showing 36 changed files with 161 additions and 154 deletions.
13 changes: 10 additions & 3 deletions core-base/src/com/netsteadfast/greenstep/util/MenuSupportUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,17 +122,24 @@ public static TbSysProg loadSysProg(String progId) throws ServiceException, Exce
}
return tbSysProg;
}


private static String getUrlPath(String url, String slash) {
if (url.endsWith(slash)) {
return url;
}
return url + slash;
}

public static String getUrl(String basePath, TbSys sys, TbSysProg sysProg, String jsessionId) throws Exception {
String url = "";
if (YesNo.YES.equals(sys.getIsLocal())) {
url = basePath + "/" + sysProg.getUrl() + ( (sysProg.getUrl().indexOf("?")>0 || sysProg.getUrl().indexOf("&")>0) ? "&" : "?" ) + Constants.IS_DOJOX_CONTENT_PANE_XHR_LOAD + "=" + YesNo.YES;
url = getUrlPath(basePath, "/") + sysProg.getUrl() + ( (sysProg.getUrl().indexOf("?")>0 || sysProg.getUrl().indexOf("&")>0) ? "&" : "?" ) + Constants.IS_DOJOX_CONTENT_PANE_XHR_LOAD + "=" + YesNo.YES;
} else {
String head = "http://";
if (basePath.startsWith("https")) {
head = "https://";
}
url = head + sys.getHost() + "/" + sys.getContextPath() + "/" + sysProg.getUrl()
url = head + getUrlPath(sys.getHost(), "/") + getUrlPath(sys.getContextPath(), "/") + sysProg.getUrl()
+ ( (sysProg.getUrl().indexOf("?")>0 || sysProg.getUrl().indexOf("&")>0) ? "&" : "?" ) + Constants.IS_DOJOX_CONTENT_PANE_XHR_LOAD + "=" + YesNo.YES;
//+ "&" + Constants.APP_SITE_CROSS_JSESS_ID_PARAM + "=" + jsessionId;

Expand Down
10 changes: 5 additions & 5 deletions core-web/WebContent/pages/common-froala-editor.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@ if (!StringUtils.isBlank(uploadOid)) {
<meta http-equiv="description" content="bambooCORE">


<link href="<%=mainSysBasePath%>/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
<link href="<%=mainSysBasePath%>font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" />


<script type="text/javascript" src="<%=mainSysBasePath%>/jquery/jquery-3.2.1.min.js"></script>
<script type="text/javascript" src="<%=mainSysBasePath%>jquery/jquery-3.2.1.min.js"></script>


<!-- Include Editor style. -->
<link href="<%=mainSysBasePath%>/froala_editor/css/froala_editor.pkgd.min.css" rel="stylesheet" type="text/css" />
<link href="<%=mainSysBasePath%>/froala_editor/css/froala_style.min.css" rel="stylesheet" type="text/css" />
<link href="<%=mainSysBasePath%>froala_editor/css/froala_editor.pkgd.min.css" rel="stylesheet" type="text/css" />
<link href="<%=mainSysBasePath%>froala_editor/css/froala_style.min.css" rel="stylesheet" type="text/css" />
<!-- Include Editor JS files. -->
<script type="text/javascript" src="<%=mainSysBasePath%>/froala_editor/js/froala_editor.pkgd.min.js"></script>
<script type="text/javascript" src="<%=mainSysBasePath%>froala_editor/js/froala_editor.pkgd.min.js"></script>


<script type="text/javascript">
Expand Down
2 changes: 1 addition & 1 deletion core-web/WebContent/pages/header.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
<table border="0" width="100%" cellpadding="0" cellspacing="0">
<tr valign="top">
<td align="left" valign="middle" bgcolor="#F5F5F5">
<img src="<%=basePath%>/images/head_logo.jpg" border="0" alt="logo" style="vertical-align:middle;margin-top:0.25em"/>&nbsp;&nbsp;<font size='2' color='#394045' style="vertical-align:middle;margin-top:0.25em"><b><s:property value="programName"/></b></font>
<img src="<%=basePath%>images/head_logo.jpg" border="0" alt="logo" style="vertical-align:middle;margin-top:0.25em"/>&nbsp;&nbsp;<font size='2' color='#394045' style="vertical-align:middle;margin-top:0.25em"><b><s:property value="programName"/></b></font>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font size='1' color="#F5F5F5">ID:&nbsp;<s:property value="programId"/></font>
<br/>
<hr color="#3794E5" size="2">
Expand Down
66 changes: 33 additions & 33 deletions core-web/WebContent/pages/index.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,30 +30,30 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
<link rel="stylesheet" href="<%=basePath%>${dojoLocal}/dijit/themes/flat/flat.css?ver=${jsVerBuild}">


<link rel="stylesheet" href="<%=basePath%>/css/core.css?ver=${jsVerBuild}" media="screen">
<link rel="stylesheet" href="<%=basePath%>css/core.css?ver=${jsVerBuild}" media="screen">

<link rel="stylesheet" href="<%=basePath%>/d3/nv.d3.css">
<link rel="stylesheet" href="<%=basePath%>d3/nv.d3.css">

<link rel="stylesheet" href="<%=basePath%>/leaflet/leaflet.css?ver=${jsVerBuild}" />
<link rel="stylesheet" href="<%=basePath%>leaflet/leaflet.css?ver=${jsVerBuild}" />

<script type="text/javascript" src="<%=basePath%>core.configJsAction.action?ver=${jsVerBuild}&lc=${LocaleCode}&refreshUUID=${uuid}"></script>
<script type="text/javascript" src="<%=basePath%>core.generateMenuJs.action?ver=${jsVerBuild}&lc=${LocaleCode}&refreshUUID=${uuid}"></script>

<script src="<%=basePath%>/leaflet/leaflet.js?ver=${jsVerBuild}"></script>
<script src="<%=basePath%>leaflet/leaflet.js?ver=${jsVerBuild}"></script>

<script>
var dojoConfig = {
parseOnLoad: true,
packages: [
{ name: "d3", location: "<%=basePath%>/d3/", main: "d3" },
{ name: "nv", location: "<%=basePath%>/d3/", main: "nv.d3" }
{ name: "d3", location: "<%=basePath%>d3/", main: "d3" },
{ name: "nv", location: "<%=basePath%>d3/", main: "nv.d3" }
]
};
</script>
<script type="text/javascript" src="<%=basePath%>${dojoLocal}/dojo/dojo.js?ver=${jsVerBuild}"></script>
<script type="text/javascript" src="<%=basePath%>/js/home.js?ver=${jsVerBuild}" djConfig="parseOnLoad: true"></script>
<script type="text/javascript" src="<%=basePath%>/js/core.js?ver=${jsVerBuild}" djConfig="parseOnLoad: true"></script>
<script type="text/javascript" src="<%=basePath%>/js/page.js?ver=${jsVerBuild}" djConfig="parseOnLoad: true"></script>
<script type="text/javascript" src="<%=basePath%>js/home.js?ver=${jsVerBuild}" djConfig="parseOnLoad: true"></script>
<script type="text/javascript" src="<%=basePath%>js/core.js?ver=${jsVerBuild}" djConfig="parseOnLoad: true"></script>
<script type="text/javascript" src="<%=basePath%>js/page.js?ver=${jsVerBuild}" djConfig="parseOnLoad: true"></script>

<s:if test=" \"Y\" == googleMapEnable ">
<!--
Expand All @@ -65,49 +65,49 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
<!-- modify applicationContext-appSettings.properties settings googleMap.enable=Y -->
</s:else>

<script type="text/javascript" src="<%=basePath%>/jquery/jquery-3.2.1.min.js"></script>
<script type="text/javascript" src="<%=basePath%>/html2canvas/html2canvas.js"></script>
<script type="text/javascript" src="<%=basePath%>/html2canvas/html2canvas.svg.js"></script>
<script type="text/javascript" src="<%=basePath%>jquery/jquery-3.2.1.min.js"></script>
<script type="text/javascript" src="<%=basePath%>html2canvas/html2canvas.js"></script>
<script type="text/javascript" src="<%=basePath%>html2canvas/html2canvas.svg.js"></script>

<script type="text/javascript" src="<%=basePath%>/canvg/canvg.js"></script>
<script type="text/javascript" src="<%=basePath%>/canvg/rgbcolor.js"></script>
<script type="text/javascript" src="<%=basePath%>/canvg/StackBlur.js"></script>
<script type="text/javascript" src="<%=basePath%>canvg/canvg.js"></script>
<script type="text/javascript" src="<%=basePath%>canvg/rgbcolor.js"></script>
<script type="text/javascript" src="<%=basePath%>canvg/StackBlur.js"></script>


<script type="text/javascript" src="<%=basePath%>/signature_pad/signature_pad.js"></script>
<script type="text/javascript" src="<%=basePath%>signature_pad/signature_pad.js"></script>


<!-- Highcharts -->
<script src="<%=basePath%>/highcharts/js/highcharts.js"></script>
<script src="<%=basePath%>/highcharts/js/highcharts-3d.js"></script>
<script src="<%=basePath%>/highcharts/js/highcharts-more.js"></script>
<script src="<%=basePath%>/highcharts/js/modules/heatmap.js"></script>
<script src="<%=basePath%>/highcharts/js/modules/exporting.js"></script>
<script src="<%=basePath%>/highcharts/js/modules/solid-gauge.js"></script>
<script src="<%=basePath%>highcharts/js/highcharts.js"></script>
<script src="<%=basePath%>highcharts/js/highcharts-3d.js"></script>
<script src="<%=basePath%>highcharts/js/highcharts-more.js"></script>
<script src="<%=basePath%>highcharts/js/modules/heatmap.js"></script>
<script src="<%=basePath%>highcharts/js/modules/exporting.js"></script>
<script src="<%=basePath%>highcharts/js/modules/solid-gauge.js"></script>


<!-- ################################################################################ -->
<!-- jqPlot -->
<script type="text/javascript" src="<%=basePath%>/jqplot/jquery.jqplot.js"></script>
<script type="text/javascript" src="<%=basePath%>/jqplot/plugins/jqplot.meterGaugeRenderer.js"></script>
<script type="text/javascript" src="<%=basePath%>jqplot/jquery.jqplot.js"></script>
<script type="text/javascript" src="<%=basePath%>jqplot/plugins/jqplot.meterGaugeRenderer.js"></script>

<!-- jqPlot plugins -->
<script type="text/javascript" src="<%=basePath%>/jqplot/plugins/jqplot.barRenderer.js"></script>
<script type="text/javascript" src="<%=basePath%>/jqplot/plugins/jqplot.categoryAxisRenderer.js"></script>
<script type="text/javascript" src="<%=basePath%>/jqplot/plugins/jqplot.pointLabels.js"></script>
<script type="text/javascript" src="<%=basePath%>jqplot/plugins/jqplot.barRenderer.js"></script>
<script type="text/javascript" src="<%=basePath%>jqplot/plugins/jqplot.categoryAxisRenderer.js"></script>
<script type="text/javascript" src="<%=basePath%>jqplot/plugins/jqplot.pointLabels.js"></script>

<script type="text/javascript" src="<%=basePath%>/jqplot/plugins/jqplot.dateAxisRenderer.js"></script>
<script type="text/javascript" src="<%=basePath%>/jqplot/plugins/jqplot.canvasTextRenderer.js"></script>
<script type="text/javascript" src="<%=basePath%>/jqplot/plugins/jqplot.canvasAxisTickRenderer.js"></script>
<script type="text/javascript" src="<%=basePath%>jqplot/plugins/jqplot.dateAxisRenderer.js"></script>
<script type="text/javascript" src="<%=basePath%>jqplot/plugins/jqplot.canvasTextRenderer.js"></script>
<script type="text/javascript" src="<%=basePath%>jqplot/plugins/jqplot.canvasAxisTickRenderer.js"></script>

<link rel="stylesheet" type="text/css" href="<%=basePath%>/jqplot/jquery.jqplot.css" />
<link rel="stylesheet" type="text/css" href="<%=basePath%>jqplot/jquery.jqplot.css" />
<!-- ################################################################################ -->


<!-- ################################################################################ -->
<!-- OrgChart -->
<script type="text/javascript" src="<%=basePath%>/OrgChart/jquery.orgchart.js"></script>
<link rel="stylesheet" type="text/css" href="<%=basePath%>/OrgChart/jquery.orgchart.css" />
<script type="text/javascript" src="<%=basePath%>OrgChart/jquery.orgchart.js"></script>
<link rel="stylesheet" type="text/css" href="<%=basePath%>OrgChart/jquery.orgchart.css" />
<!-- ################################################################################ -->

<style type="text/css">
Expand Down
4 changes: 2 additions & 2 deletions core-web/WebContent/pages/role/user-role-management.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
<style type="text/css">
.buttonBackNav {
background-image: url(<%=basePath%>/icons/stock_left.png);
background-image: url(<%=basePath%>icons/stock_left.png);
background-repeat: no-repeat;
width: 16px;
height: 16px;
text-align: center;
}
.buttonForwardNav {
background-image: url(<%=basePath%>/icons/stock_right.png);
background-image: url(<%=basePath%>icons/stock_right.png);
background-repeat: no-repeat;
width: 16px;
height: 16px;
Expand Down
26 changes: 13 additions & 13 deletions core-web/WebContent/pages/sys-common/codeeditor.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
<meta http-equiv="keywords" content="bambooCORE">
<meta http-equiv="description" content="bambooCORE">

<script src="<%=basePath%>/codemirror/lib/codemirror.js" type="text/javascript"></script>
<script src="<%=basePath%>/codemirror/addon/edit/matchbrackets.js"></script>
<script src="<%=basePath%>/codemirror/addon/hint/show-hint.js"></script>
<script src="<%=basePath%>/codemirror/mode/clike/clike.js"></script>
<script src="<%=basePath%>codemirror/lib/codemirror.js" type="text/javascript"></script>
<script src="<%=basePath%>codemirror/addon/edit/matchbrackets.js"></script>
<script src="<%=basePath%>codemirror/addon/hint/show-hint.js"></script>
<script src="<%=basePath%>codemirror/mode/clike/clike.js"></script>
<!--
<link rel="stylesheet" type="text/css" href="<%=basePath%>/codemirror/doc/docs.css" />
<link rel="stylesheet" type="text/css" href="<%=basePath%>codemirror/doc/docs.css" />
-->
<link rel="stylesheet" type="text/css" href="<%=basePath%>/codemirror/lib/codemirror.css" />
<link rel="stylesheet" href="<%=basePath%>/codemirror/addon/hint/show-hint.css">
<link rel="stylesheet" type="text/css" href="<%=basePath%>codemirror/lib/codemirror.css" />
<link rel="stylesheet" href="<%=basePath%>codemirror/addon/hint/show-hint.css">


<script src="<%=basePath%>/codemirror/mode/xml/xml.js"></script>
<script src="<%=basePath%>/codemirror/mode/javascript/javascript.js"></script>
<script src="<%=basePath%>/codemirror/mode/css/css.js"></script>
<script src="<%=basePath%>/codemirror/mode/htmlmixed/htmlmixed.js"></script>
<script src="<%=basePath%>/codemirror/addon/mode/multiplex.js"></script>
<script src="<%=basePath%>/codemirror/mode/htmlembedded/htmlembedded.js"></script>
<script src="<%=basePath%>codemirror/mode/xml/xml.js"></script>
<script src="<%=basePath%>codemirror/mode/javascript/javascript.js"></script>
<script src="<%=basePath%>codemirror/mode/css/css.js"></script>
<script src="<%=basePath%>codemirror/mode/htmlmixed/htmlmixed.js"></script>
<script src="<%=basePath%>codemirror/addon/mode/multiplex.js"></script>
<script src="<%=basePath%>codemirror/mode/htmlembedded/htmlembedded.js"></script>


<style type="text/css">
Expand Down
2 changes: 1 addition & 1 deletion core-web/WebContent/pages/sys-expression/sys-expression-create.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ function ${programId}_page_message() {
<gs:label text="${action.getText('CORE_PROG003D0002A_iframe1')}" id="CORE_PROG003D0002A_iframe1" requiredFlag="Y"></gs:label>
<gs:inputfieldNoticeMsgLabel id="CORE_PROG003D0002A_content_noticeMsgLabelOnly"></gs:inputfieldNoticeMsgLabel>
<br/>
<iframe name="CORE_PROG003D0002A_iframe1" id="CORE_PROG003D0002A_iframe1" style='width:100%;height:300px;border:0px' border='0' scrolling='no' src='<%=basePath%>/core.commonCodeEditorAction.action'></iframe>
<iframe name="CORE_PROG003D0002A_iframe1" id="CORE_PROG003D0002A_iframe1" style='width:100%;height:300px;border:0px' border='0' scrolling='no' src='<%=basePath%>core.commonCodeEditorAction.action'></iframe>

</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion core-web/WebContent/pages/sys-expression/sys-expression-edit.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ function ${programId}_page_message() {
<gs:label text="${action.getText('CORE_PROG003D0002E_iframe1')}" id="CORE_PROG003D0002E_iframe1" requiredFlag="Y"></gs:label>
<gs:inputfieldNoticeMsgLabel id="CORE_PROG003D0002E_content_noticeMsgLabelOnly"></gs:inputfieldNoticeMsgLabel>
<br/>
<iframe name="CORE_PROG003D0002E_iframe1" id="CORE_PROG003D0002E_iframe1" style='width:100%;height:300px;border:0px' border='0' scrolling='no' src='<%=basePath%>/core.commonCodeEditorAction.action?oid=${exprOid}'></iframe>
<iframe name="CORE_PROG003D0002E_iframe1" id="CORE_PROG003D0002E_iframe1" style='width:100%;height:300px;border:0px' border='0' scrolling='no' src='<%=basePath%>core.commonCodeEditorAction.action?oid=${exprOid}'></iframe>

</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion core-web/WebContent/pages/sys-form-method/sys-form-method-create.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ function ${programId}_page_message() {
<gs:label text="${action.getText('CORE_PROG001D0014A_iframe1')}" id="CORE_PROG001D0014A_iframe1" requiredFlag="Y"></gs:label>
<gs:inputfieldNoticeMsgLabel id="CORE_PROG001D0014A_expressionNoticeMsgLabelOnly"></gs:inputfieldNoticeMsgLabel>
<br/>
<iframe name="CORE_PROG001D0014A_iframe1" id="CORE_PROG001D0014A_iframe1" style='width:100%;height:300px;border:0px' border='0' scrolling='no' src='<%=basePath%>/core.commonCodeEditorAction.action'></iframe>
<iframe name="CORE_PROG001D0014A_iframe1" id="CORE_PROG001D0014A_iframe1" style='width:100%;height:300px;border:0px' border='0' scrolling='no' src='<%=basePath%>core.commonCodeEditorAction.action'></iframe>

</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion core-web/WebContent/pages/sys-form-method/sys-form-method-edit.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ function ${programId}_page_message() {
<gs:label text="${action.getText('CORE_PROG001D0014E_iframe1')}" id="CORE_PROG001D0014E_iframe1" requiredFlag="Y"></gs:label>
<gs:inputfieldNoticeMsgLabel id="CORE_PROG001D0014E_expressionNoticeMsgLabelOnly"></gs:inputfieldNoticeMsgLabel>
<br/>
<iframe name="CORE_PROG001D0014E_iframe1" id="CORE_PROG001D0014E_iframe1" style='width:100%;height:300px;border:0px' border='0' scrolling='no' src='<%=basePath%>/core.commonCodeEditorAction.action?oid=${exprOid}'></iframe>
<iframe name="CORE_PROG001D0014E_iframe1" id="CORE_PROG001D0014E_iframe1" style='width:100%;height:300px;border:0px' border='0' scrolling='no' src='<%=basePath%>core.commonCodeEditorAction.action?oid=${exprOid}'></iframe>

</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion core-web/WebContent/pages/sys-jreport/sys-jreport-management.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function CORE_PROG001D0008Q_edit(oid) {
}
function CORE_PROG001D0008Q_downloadFile(oid) {
var url = "<%=basePath%>/core.systemJreportExportAction.action?fields.oid=" + oid;
var url = "<%=basePath%>core.systemJreportExportAction.action?fields.oid=" + oid;
openCommonLoadUpload( 'download', '', { "url": url } );
}
Expand Down
4 changes: 2 additions & 2 deletions core-web/WebContent/pages/sys-menu/sys-menu-management.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
<style type="text/css">
.buttonBackNav {
background-image: url(<%=basePath%>/icons/stock_left.png);
background-image: url(<%=basePath%>icons/stock_left.png);
background-repeat: no-repeat;
width: 16px;
height: 16px;
text-align: center;
}
.buttonForwardNav {
background-image: url(<%=basePath%>/icons/stock_right.png);
background-image: url(<%=basePath%>icons/stock_right.png);
background-repeat: no-repeat;
width: 16px;
height: 16px;
Expand Down
4 changes: 2 additions & 2 deletions core-web/WebContent/pages/sys-program-menu-role/sys-program-menu-role-management.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
<style type="text/css">
.buttonBackNav {
background-image: url(<%=basePath%>/icons/stock_left.png);
background-image: url(<%=basePath%>icons/stock_left.png);
background-repeat: no-repeat;
width: 16px;
height: 16px;
text-align: center;
}
.buttonForwardNav {
background-image: url(<%=basePath%>/icons/stock_right.png);
background-image: url(<%=basePath%>icons/stock_right.png);
background-repeat: no-repeat;
width: 16px;
height: 16px;
Expand Down
14 changes: 7 additions & 7 deletions core-web/WebContent/pages/system/login.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">

<link rel="stylesheet" href="<%=basePath%>/tether/tether.min.css" crossorigin="anonymous">
<script type="text/javascript" src="<%=basePath%>/tether/tether.min.js"></script>
<script type="text/javascript" src="<%=basePath%>/popper-js/umd/popper.min.js"></script>
<script type="text/javascript" src="<%=basePath%>/jquery/jquery-3.2.1.min.js"></script>
<link rel="stylesheet" href="<%=basePath%>/bootstrap-4/css/bootstrap.css" crossorigin="anonymous">
<link href="<%=basePath%>/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
<script src="<%=basePath%>/bootstrap-4/js/bootstrap.js" crossorigin="anonymous"></script>
<link rel="stylesheet" href="<%=basePath%>tether/tether.min.css" crossorigin="anonymous">
<script type="text/javascript" src="<%=basePath%>tether/tether.min.js"></script>
<script type="text/javascript" src="<%=basePath%>popper-js/umd/popper.min.js"></script>
<script type="text/javascript" src="<%=basePath%>jquery/jquery-3.2.1.min.js"></script>
<link rel="stylesheet" href="<%=basePath%>bootstrap-4/css/bootstrap.css" crossorigin="anonymous">
<link href="<%=basePath%>font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
<script src="<%=basePath%>bootstrap-4/js/bootstrap.js" crossorigin="anonymous"></script>


<style type="text/css">
Expand Down

0 comments on commit 8671c38

Please sign in to comment.