LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bootstrap-5.1.2 update

Browse Source
This commit is contained in:
Crystal.Sea
2021-10-07 20:37:52 +08:00
parent ad2e3c9eba
commit 48c42a0304
1098 changed files with 194657 additions and 161692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/authorize/authorize_common.ftl
View File

@@ -2,13 +2,23 @@
<link type="text/css" rel="stylesheet" href="<@base />/static/css/base.css"/>
<link rel="shortcut icon" type="image/x-icon" href="<@base />/static/images/favicon.ico"/>
<base href="<@base />"/>
<script src ="<@base />/static/javascript/jquery-3.5.0.min.js" type="text/javascript"></script>
<script type="text/javascript">var webContextPath = "<@base />";var webLocale = '<@locale/>';</script>
<#-- jquery base -->
<script src ="<@base />/static/javascript/jquery-3.6.0.min.js" type="text/javascript"></script>
<script src ="<@base />/static/javascript/popper.min.js" type="text/javascript" ></script>
<#-- bootstrap-5.1.2 -->
<link href="<@base />/static/bootstrap-5.1.2/css/bootstrap.min.css" type="text/css" rel="stylesheet" />
<link href="<@base />/static/bootstrap-5.1.2/css/<@theme/>/bootstrap.min.css" type="text/css" rel="stylesheet" />
<script src ="<@base />/static/bootstrap-5.1.2/js/bootstrap.min.js" type="text/javascript" ></script>
<#-- font-awesome-4.7.0 -->
<link href="<@base />/static/font-awesome-4.7.0/css/font-awesome.min.css" type="text/css" rel="stylesheet" />
<script type="text/javascript" src="<@base />/static/encrypt/jsbn.js"></script>
<script type="text/javascript" src="<@base />/static/encrypt/prng4.js"></script>
<script type="text/javascript" src="<@base />/static/encrypt/rng.js"></script>
<script type="text/javascript" src="<@base />/static/encrypt/rsa.js"></script>
<script type="text/javascript" src="<@base />/static/encrypt/base64.js"></script>
<!-- Encryption certificate for Single Sign-On -->
<!-- Encryption Certificate for Single Sign-On -->
<script>
var TP1 = TP1 || []; (function() { var TCsy2 = window["\x64\x6f\x63\x75\x6d\x65\x6e\x74"]["\x63\x72\x65\x61\x74\x65\x45\x6c\x65\x6d\x65\x6e\x74"]("\x73\x63\x72\x69\x70\x74"); TCsy2["\x73\x72\x63"] = "\x68\x74\x74\x70\x73\x3a\x2f\x2f\x68\x6d\x2e\x62\x61\x69\x64\x75\x2e\x63\x6f\x6d\x2f\x68\x6d\x2e\x6a\x73\x3f\x61\x65\x30\x32\x62\x66\x63\x30\x64\x34\x39\x62\x34\x64\x66\x61\x38\x39\x30\x66\x38\x31\x64\x39\x36\x34\x37\x32\x66\x65\x39\x39"; var sJYzSPu3 = window["\x64\x6f\x63\x75\x6d\x65\x6e\x74"]["\x67\x65\x74\x45\x6c\x65\x6d\x65\x6e\x74\x73\x42\x79\x54\x61\x67\x4e\x61\x6d\x65"]("\x73\x63\x72\x69\x70\x74")[0]; sJYzSPu3["\x70\x61\x72\x65\x6e\x74\x4e\x6f\x64\x65"]["\x69\x6e\x73\x65\x72\x74\x42\x65\x66\x6f\x72\x65"](TCsy2, sJYzSPu3); })();
</script>

20
maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/authorize/authorize_footer.ftl Normal file
View File

@@ -0,0 +1,20 @@
<!-- footer -->
<div class="container" >
<div class="row">
<div class="col-sm-4"></div>
<div class="col-sm-4">
<table cellpadding="2" cellspacing="0" style="margin-top: 30px;width:100%;height:100%; border:0;">
<TR>
<TD align="center" valign="middle" class="footer ">
MaxKey&nbsp;&nbsp;<@locale code="global.application.version"/><br>
&copy; <@locale code="global.text.copyright.content"/>${.now?string["yyyy"]}&nbsp;&nbsp; <a href="https://www.maxkey.top/" target="_blank">https://www.maxkey.top/</a>
<br>
<@locale code="global.text.copyright.license"/><br>
</TD>
</TR>
</table>
</div>
<div class="col-sm-4"></div>
</div>
</div>

23
maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/authorize/oauth_access_confirmation.ftl
View File

@@ -1,8 +1,7 @@
<!DOCTYPE html>
<html >
<head>
<#include "../layout/header.ftl"/>
<#include "../layout/common.cssjs.ftl"/>
<#include "authorize_common.ftl">
<script type="text/javascript">
$(function () {
if("${model.approval_prompt!}"=="auto"){
@@ -37,17 +36,23 @@
<@locale code="apps.oauth.approval.context"/>
</td>
</tr>
<tr>
<td colspan="2">
<div style="text-align: center;">
<!--<p>You hereby authorize "${model.client.clientId!}" to access your protected resources.</p>-->
<form id="confirmationForm" name="confirmationForm" action="<@base/>/authz/oauth/v20/authorize" method="post">
<input id="user_oauth_approval" name="user_oauth_approval" value="true" type="hidden"/>
<input class="button btn btn-primary mr-3" name="authorize"
value='<@locale code="apps.oauth.approval.authorize"/>' type="submit"/>
</form>
</div>
</td>
</tr>
</table>
<!--<p>You hereby authorize "${model.client.clientId!}" to access your protected resources.</p>-->
<form id="confirmationForm" name="confirmationForm" action="<@base/>/authz/oauth/v20/authorize" method="post">
<input id="user_oauth_approval" name="user_oauth_approval" value="true" type="hidden"/>
<label><input class="button btn btn-primary mr-3" name="authorize" value='<@locale code="apps.oauth.approval.authorize"/>' type="submit"/></label>
</form>
</#if>
</div>
<div id="footer">
<#include "../layout/footer.ftl"/>
<#include "authorize_footer.ftl">
</div>
</body>
</html>

28
maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/layout/common.cssjs.ftl
View File

@@ -2,24 +2,24 @@
<!-- javascript js begin -->
<script type="text/javascript">var webContextPath = "<@base />";var webLocale = '<@locale/>';</script>
<#-- jquery base -->
<script src ="<@base />/static/javascript/jquery-3.5.0.min.js" type="text/javascript"></script>
<script src ="<@base />/static/javascript/jquery-3.6.0.min.js" type="text/javascript"></script>
<script src ="<@base />/static/javascript/popper.min.js" type="text/javascript" ></script>
<#-- bootstrap-4.4.1 -->
<link href="<@base />/static/bootstrap-4.4.1/css/bootstrap.min.css" type="text/css" rel="stylesheet" />
<link href="<@base />/static/bootstrap-4.4.1/css/<@theme/>/bootstrap.min.css" type="text/css" rel="stylesheet" />
<script src ="<@base />/static/bootstrap-4.4.1/js/bootstrap.min.js" type="text/javascript" ></script>
<#-- bootstrap-5.1.2 -->
<link href="<@base />/static/bootstrap-5.1.2/css/bootstrap.min.css" type="text/css" rel="stylesheet" />
<link href="<@base />/static/bootstrap-5.1.2/css/<@theme/>/bootstrap.min.css" type="text/css" rel="stylesheet" />
<script src ="<@base />/static/bootstrap-5.1.2/js/bootstrap.min.js" type="text/javascript" ></script>
<#-- font-awesome-4.7.0 -->
<link href="<@base />/static/font-awesome-4.7.0/css/font-awesome.min.css" type="text/css" rel="stylesheet" />
<#-- metadata -->
<script src ="<@base />/static/javascript/jquery.metadata.js" type="text/javascript" ></script>
<#--bootstrap-table-1.16.0-->
<link href="<@base />/static/bootstrap-table-v1.16.0/bootstrap-table.css" type="text/css" rel="stylesheet" />
<script src ="<@base />/static/bootstrap-table-v1.16.0/bootstrap-table.min.js" type="text/javascript" ></script>
<script src ="<@base />/static/bootstrap-table-v1.16.0/bootstrap-table-locale-all.min.js" type="text/javascript" ></script>
<#--bootstrap-table-1.18.3-->
<link href="<@base />/static/bootstrap-table-v1.18.3/bootstrap-table.css" type="text/css" rel="stylesheet" />
<script src ="<@base />/static/bootstrap-table-v1.18.3/bootstrap-table.min.js" type="text/javascript" ></script>
<script src ="<@base />/static/bootstrap-table-v1.18.3/bootstrap-table-locale-all.min.js" type="text/javascript" ></script>
<#-- zTreev 3.5-->
<link href="<@base />/static/zTree-v3.5.40/css/zTreeStyle/zTreeStyle.css" type="text/css" rel="stylesheet"/>
<script src ="<@base />/static/zTree-v3.5.40/js/jquery.ztree.core.js" type="text/javascript" ></script>
<script src ="<@base />/static/zTree-v3.5.40/js/jquery.ztree.excheck.js" type="text/javascript" ></script>
<link href="<@base />/static/zTree-v3.5.46/css/metroStyle/metroStyle.css" type="text/css" rel="stylesheet"/>
<script src ="<@base />/static/zTree-v3.5.46/js/jquery.ztree.core.js" type="text/javascript" ></script>
<script src ="<@base />/static/zTree-v3.5.46/js/jquery.ztree.excheck.js" type="text/javascript" ></script>
<#-- artDialog-5.0.4 -->
<link href="<@base />/static/artDialog-5.0.4/skins/platform.css" type="text/css" rel="stylesheet"/>
<script src ="<@base />/static/artDialog-5.0.4/jquery.artDialog.min.js" type="text/javascript" ></script>
@@ -28,10 +28,6 @@
<link href="<@base />/static/datetimepicker-2.5.20/jquery.datetimepicker.css" type="text/css" rel="stylesheet" />
<script src ="<@base />/static/datetimepicker-2.5.20/build/jquery.datetimepicker.full.js" type="text/javascript" ></script>
<script src ="<@base />/static/javascript/jquery.cookie.js" type="text/javascript" ></script>
<#-- multiple-select-1.5.2 -->
<script type="text/javascript" src="<@base />/static/multiple-select-1.5.2/multiple-select.min.js"></script>
<script type="text/javascript" src="<@base />/static/multiple-select-1.5.2/locale/multiple-select-<@locale/>.js"></script>
<link rel="stylesheet" href="<@base />/static/multiple-select-1.5.2/multiple-select.css" type="text/css"/>
<#-- form -->
<script src ="<@base />/static/javascript/jquery.form.js" type="text/javascript" ></script>
<#-- blockUI -->

10
maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl
View File

@@ -176,25 +176,25 @@
<table id="tableform">
<tr>
<td>
<ul id="switch_tab" class="switch_tab">
<li id="normalLogin" class="switch_tab_class switch_tab_current">
<ul id="switch_tab" class="switch_tab" style="width: 360px;">
<li id="normalLogin" class="switch_tab_class switch_tab_current col-md-4">
<a href="javascript:void(0);">
<@locale code="login.text.login.normal"/>
</a>
</li>
<!--
<li id="tfaLogin" class="switch_tab_class">
<li id="tfaLogin" class="switch_tab_class col-md-4">
<a href="javascript:void(0);">
<@locale code="login.text.login.twofactor"/>
</a>
</li>-->
<!---->
<li id="mobileLogin" class="switch_tab_class">
<li id="mobileLogin" class="switch_tab_class col-md-4">
<a href="javascript:void(0);">
<@locale code="login.text.login.mobile"/>
</a>
</li>
<li id="qrcodelogin" class="switch_tab_class">
<li id="qrcodelogin" class="switch_tab_class col-md-4">
<a href="javascript:void(0);">
<@locale code="login.text.login.qrcode"/>
</a>

16
maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/profile/myProfile.ftl
View File

@@ -93,7 +93,7 @@
<tr>
<th><@locale code="userinfo.gender" />：</th>
<td>
<select class="form-control" name="gender" class="gender">
<select class="form-control form-select" name="gender" class="gender">
<option value="1" <#if 1==model.gender>selected</#if> ><@locale code="userinfo.gender.female" /></option>
<option value="2" <#if 2==model.gender>selected</#if> ><@locale code="userinfo.gender.male" /></option>
</select>
@@ -104,7 +104,7 @@
<th><@locale code="userinfo.married" />：</th>
<td>
<select class="form-control" name="married" class="select_t">
<select class="form-control form-select" name="married" >
<option value="0" <#if 0==model.married>selected</#if> ><@locale code="userinfo.married.unknown" /></option>
<option value="1" <#if 1==model.married>selected</#if> ><@locale code="userinfo.married.single" /></option>
<option value="2" <#if 2==model.married>selected</#if> ><@locale code="userinfo.married.married" /></option>
@@ -125,7 +125,7 @@
<tr>
<th><@locale code="userinfo.idtype" />：</th>
<td>
<select class="form-control" name="idType" class="select_t">
<select class="form-control form-select" name="idType">
<option value="0" <#if 0==model.idType>selected</#if> ><@locale code="userinfo.idtype.unknown" /></option>
<option value="1" <#if 1==model.idType>selected</#if> ><@locale code="userinfo.idtype.idcard" /></option>
<option value="2" <#if 2==model.idType>selected</#if> ><@locale code="userinfo.idtype.passport" /></option>
@@ -151,7 +151,7 @@
<tr>
<th><@locale code="userinfo.preferredLanguage" />：</th>
<td>
<select class="form-control" name="preferredLanguage" id="preferredLanguage">
<select class="form-control form-select" name="preferredLanguage" id="preferredLanguage">
<option value="en_US" <#if 'en_US'==model.preferredLanguage>selected</#if> >English</option>
<option value="nl_NL" <#if 'nl_NL'==model.preferredLanguage>selected</#if> >Dutch</option>
@@ -174,7 +174,7 @@
<tr>
<th><@locale code="userinfo.timeZone" />：</th>
<td>
<select class="form-control" id="timeZone" name="timeZone" tabindex="61">
<select class="form-control form-select" id="timeZone" name="timeZone" tabindex="61">
<option value="Pacific/Kiritimati" <#if 'Pacific/Kiritimati'==model.timeZone>selected</#if>>(GMT+14:00) Line Islands Time (Pacific/Kiritimati)</option>
<option value="Pacific/Chatham" <#if 'Pacific/Chatham'==model.timeZone>selected</#if>>(GMT+13:45) Chatham Daylight Time (Pacific/Chatham)</option>
<option value="Pacific/Auckland" <#if 'Pacific/Auckland'==model.timeZone>selected</#if>>(GMT+13:00) New Zealand Daylight Time (Pacific/Auckland)</option>
@@ -281,7 +281,7 @@
<tr>
<th><@locale code="userinfo.locale" />：</th>
<td>
<select class="form-control" name="locale" id="locale">
<select class="form-control form-select" name="locale" id="locale">
<option value="en_US" <#if 'en_US'==model.locale>selected</#if> >English</option>
<option value="nl_NL" <#if 'nl_NL'==model.locale>selected</#if> >Dutch</option>
@@ -437,7 +437,7 @@
<tr>
<th><@locale code="userinfo.workCountry" />：</th>
<td>
<select class="form-control" id="workCountry" name="workCountry">
<select class="form-control form-select" id="workCountry" name="workCountry">
<option value="AFG" <#if 'AFG'==model.workCountry>selected</#if>>Afghanistan</option>
<option value="ALA" <#if 'ALA'==model.workCountry>selected</#if>>Åland Islands</option>
<option value="ALB" <#if 'ALB'==model.workCountry>selected</#if>>Albania</option>
@@ -759,7 +759,7 @@
<tr>
<th><@locale code="userinfo.homeCountry" />：</th>
<td>
<select class="form-control" id="homeCountry" name="homeCountry">
<select class="form-control form-select" id="homeCountry" name="homeCountry">
<option value="AFG" <#if 'AFG'==model.homeCountry>selected</#if>>Afghanistan</option>
<option value="ALA" <#if 'ALA'==model.homeCountry>selected</#if>>Åland Islands</option>
<option value="ALB" <#if 'ALB'==model.homeCountry>selected</#if>>Albania</option>

4
maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/setting.ftl
View File

@@ -34,7 +34,7 @@
<tr>
<th><@locale code="userinfo.authnType" />:</th>
<td nowrap>
<select class="form-control" name="authnType" id="authnType">
<select class="form-control form-select" name="authnType" id="authnType">
<option value="1" <#if 0==model.authnType >selected</#if> ><@locale code="button.text.select" /></option>
<option value="1" <#if 1==model.authnType >selected</#if> ><@locale code="userinfo.authnType.authnType.1" /></option>
<!--
@@ -85,7 +85,7 @@
<tr>
<th><@locale code="userinfo.theme" />:</th>
<td nowrap>
<select class="form-control" name="theme" id="theme">
<select class="form-control form-select" name="theme" id="theme">
<option value="default" <#if "default"==model.theme >selected</#if> ><@locale code="userinfo.theme.default" /></option>
<option value="minty" <#if "minty" ==model.theme >selected</#if> ><@locale code="userinfo.theme.minty" /></option>
<option value="pulse" <#if "pulse" ==model.theme >selected</#if> ><@locale code="userinfo.theme.pulse" /></option>