Skip to content

MaxKey
MaxKey

yujianwangzivayy / MaxKey
与 Fork 源项目一致

Fork自 MaxKey单点登录官方(MaxKeyTop) / MaxKey

通知 1
Star 0
Fork 0
MaxKey
MaxKey

体验新版 GitCode，发现更多精彩内容 >>

提交 1b2f924f 编写于 作者: MaxKey单点登录官方's avatar MaxKey单点登录官方
浏览文件
操作

RC1 

RC1
上级 bb8b55cf
隐藏空白更改
内联 并排
Showing with 219 addition and 120 deletion
maxkey-dao/src/test/java/org/apache/mybatis/jpa/test/AppsServiceTest.java 0 → 100644
浏览文件 @ 1b2f924f
package org.apache.mybatis.jpa.test;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.apache.mybatis.jpa.util.WebContext;
import org.junit.Before;
import org.junit.Test;
import org.maxkey.dao.service.AccountsService;
import org.maxkey.dao.service.AppsFormBasedDetailsService;
import org.maxkey.dao.service.AppsService;
import org.maxkey.domain.Accounts;
import org.maxkey.domain.apps.Apps;
import org.maxkey.domain.apps.AppsFormBasedDetails;
import org.maxkey.util.PathUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class AppsServiceTest {
private static final Logger _logger = LoggerFactory.getLogger(AppsServiceTest.class);
public static ApplicationContext context;
public static AppsService service;
public AppsService getservice() {
service=(AppsService)WebContext.getBean("appsService");
return service;
}
@Test
public void get() throws Exception{
_logger.info("get...");
Apps a=new Apps();
a.setPageNumber(2);
a.setPageSize(10);
;
getservice().queryPageResults(a);
// _logger.info("apps "+);
}
@Before
public void initSpringContext(){
if(context!=null) return;
_logger.info("init Spring Context...");
SimpleDateFormat sdf_ymdhms =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String startTime=sdf_ymdhms.format(new Date());
try{
AppsServiceTest runner=new AppsServiceTest();
runner.init();
}catch(Exception e){
e.printStackTrace();
}
_logger.info("-- --Init Start at " + startTime+" , End at "+sdf_ymdhms.format(new Date()));
}
//Initialization ApplicationContext for Project
public void init(){
_logger.info("init ...");
_logger.info("Application dir "+System.getProperty("user.dir"));
context = new ClassPathXmlApplicationContext(new String[] {"spring/applicationContext.xml"});
WebContext.applicationContext=context;
getservice();
System.out.println("init ...");
}
}
maxkey-protocols/maxkey-protocol-cas/build/reports/tests/test/index.html
浏览文件 @ 1b2f924f
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/> <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
</label> </label>
</div>Generated by </div>Generated by
<a href="http://www.gradle.org">Gradle 5.4.1</a> at 2019-11-10 12:36:07</p> <a href="http://www.gradle.org">Gradle 5.4.1</a> at 2019-11-27 22:38:38</p>
</div> </div>
</div> </div>
</body> </body>
......
maxkey-protocols/maxkey-protocol-cas/build/tmp/jar/MANIFEST.MF
浏览文件 @ 1b2f924f
Manifest-Version: 1.0 Manifest-Version: 1.0
Implementation-Title: maxkey-protocol-cas Implementation-Title: maxkey-protocol-cas
Implementation-Version: 1.0.0.RELEASE Implementation-Version: 1.0.0.RELEASE
Implementation-Date: 2019-11-12T23:06:23.516+08:00[Asia/Shanghai] Implementation-Date: 2019-11-27T22:38:18.726+08:00[Asia/Shanghai]
Created-By: org.maxkey Created-By: org.maxkey
Implementation-Vendor: https://github.com/shimingxy/MaxKey Implementation-Vendor: https://github.com/shimingxy/MaxKey
maxkey-protocols/maxkey-protocol-desktop/build/tmp/jar/MANIFEST.MF
浏览文件 @ 1b2f924f
Manifest-Version: 1.0 Manifest-Version: 1.0
Implementation-Title: maxkey-protocol-desktop Implementation-Title: maxkey-protocol-desktop
Implementation-Version: 1.0.0.RELEASE Implementation-Version: 1.0.0.RELEASE
Implementation-Date: 2019-11-12T23:06:23.610+08:00[Asia/Shanghai] Implementation-Date: 2019-11-27T22:38:18.726+08:00[Asia/Shanghai]
Created-By: org.maxkey Created-By: org.maxkey
Implementation-Vendor: https://github.com/shimingxy/MaxKey Implementation-Vendor: https://github.com/shimingxy/MaxKey
maxkey-protocols/maxkey-protocol-extendapi/build/tmp/jar/MANIFEST.MF
浏览文件 @ 1b2f924f
Manifest-Version: 1.0 Manifest-Version: 1.0
Implementation-Title: maxkey-protocol-extendapi Implementation-Title: maxkey-protocol-extendapi
Implementation-Version: 1.0.0.RELEASE Implementation-Version: 1.0.0.RELEASE
Implementation-Date: 2019-11-12T23:06:23.620+08:00[Asia/Shanghai] Implementation-Date: 2019-11-27T22:38:18.742+08:00[Asia/Shanghai]
Created-By: org.maxkey Created-By: org.maxkey
Implementation-Vendor: https://github.com/shimingxy/MaxKey Implementation-Vendor: https://github.com/shimingxy/MaxKey
maxkey-protocols/maxkey-protocol-formbased/build/tmp/jar/MANIFEST.MF
浏览文件 @ 1b2f924f
Manifest-Version: 1.0 Manifest-Version: 1.0
Implementation-Title: maxkey-protocol-formbased Implementation-Title: maxkey-protocol-formbased
Implementation-Version: 1.0.0.RELEASE Implementation-Version: 1.0.0.RELEASE
Implementation-Date: 2019-11-12T23:06:23.630+08:00[Asia/Shanghai] Implementation-Date: 2019-11-27T22:38:18.742+08:00[Asia/Shanghai]
Created-By: org.maxkey Created-By: org.maxkey
Implementation-Vendor: https://github.com/shimingxy/MaxKey Implementation-Vendor: https://github.com/shimingxy/MaxKey
maxkey-protocols/maxkey-protocol-oauth-2.0/build/tmp/jar/MANIFEST.MF
浏览文件 @ 1b2f924f
Manifest-Version: 1.0 Manifest-Version: 1.0
Implementation-Title: maxkey-protocol-oauth-2.0 Implementation-Title: maxkey-protocol-oauth-2.0
Implementation-Version: 1.0.0.RELEASE Implementation-Version: 1.0.0.RELEASE
Implementation-Date: 2019-11-12T23:06:23.644+08:00[Asia/Shanghai] Implementation-Date: 2019-11-27T22:38:18.742+08:00[Asia/Shanghai]
Created-By: org.maxkey Created-By: org.maxkey
Implementation-Vendor: https://github.com/shimingxy/MaxKey Implementation-Vendor: https://github.com/shimingxy/MaxKey
maxkey-protocols/maxkey-protocol-saml-2.0/build/tmp/jar/MANIFEST.MF
浏览文件 @ 1b2f924f
Manifest-Version: 1.0 Manifest-Version: 1.0
Implementation-Title: maxkey-protocol-saml-2.0 Implementation-Title: maxkey-protocol-saml-2.0
Implementation-Version: 1.0.0.RELEASE Implementation-Version: 1.0.0.RELEASE
Implementation-Date: 2019-11-12T23:06:23.653+08:00[Asia/Shanghai] Implementation-Date: 2019-11-27T22:38:18.758+08:00[Asia/Shanghai]
Created-By: org.maxkey Created-By: org.maxkey
Implementation-Vendor: https://github.com/shimingxy/MaxKey Implementation-Vendor: https://github.com/shimingxy/MaxKey
maxkey-protocols/maxkey-protocol-tokenbased/build/tmp/jar/MANIFEST.MF
浏览文件 @ 1b2f924f
Manifest-Version: 1.0 Manifest-Version: 1.0
Implementation-Title: maxkey-protocol-tokenbased Implementation-Title: maxkey-protocol-tokenbased
Implementation-Version: 1.0.0.RELEASE Implementation-Version: 1.0.0.RELEASE
Implementation-Date: 2019-11-12T23:06:23.669+08:00[Asia/Shanghai] Implementation-Date: 2019-11-27T22:38:18.758+08:00[Asia/Shanghai]
Created-By: org.maxkey Created-By: org.maxkey
Implementation-Vendor: https://github.com/shimingxy/MaxKey Implementation-Vendor: https://github.com/shimingxy/MaxKey
maxkey-web-manage/.project
浏览文件 @ 1b2f924f
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
<name>maxkey-web-manage</name> <name>maxkey-web-manage</name>
<comment>maxkey-web-manage</comment> <comment>maxkey-web-manage</comment>
<projects> <projects>
<project>maxkey-protocol-oauth-2.0</project>
<project>maxkey-protocol-authorize</project> <project>maxkey-protocol-authorize</project>
<project>maxkey-protocol-saml-2.0</project>
<project>maxkey-dao</project>
<project>maxkey-core</project> <project>maxkey-core</project>
<project>maxkey-jose-jwt</project> <project>maxkey-jose-jwt</project>
<project>maxkey-dao</project>
<project>maxkey-client-sdk</project> <project>maxkey-client-sdk</project>
<project>maxkey-protocol-oauth-2.0</project>
<project>maxkey-protocol-saml-2.0</project>
</projects> </projects>
<buildSpec> <buildSpec>
<buildCommand> <buildCommand>
......
maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtApplication.java
浏览文件 @ 1b2f924f
package org.maxkey; package org.maxkey;
import java.io.File;
import java.util.Date; import java.util.Date;
import javax.servlet.ServletException; import javax.servlet.ServletException;
...@@ -33,9 +34,10 @@ public class MaxKeyMgtApplication extends SpringBootServletInitializer { ...@@ -33,9 +34,10 @@ public class MaxKeyMgtApplication extends SpringBootServletInitializer {
} }
public static void main(String[] args) { public static void main(String[] args) {
ConfigurableApplicationContext applicationContext =SpringApplication.run(MaxKeyMgtApplication.class, args); ConfigurableApplicationContext applicationContext =SpringApplication.run(MaxKeyMgtApplication.class, args);
InitApplicationContext initWebContext=new InitApplicationContext(applicationContext); InitApplicationContext initWebContext=new InitApplicationContext(applicationContext);
try { try {
initWebContext.init(null); initWebContext.init(null);
} catch (ServletException e) { } catch (ServletException e) {
......
maxkey-web-manage/src/main/resources/log4j2.xml
浏览文件 @ 1b2f924f
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<Logger name="org.springframework" level="INFO"></Logger> <Logger name="org.springframework" level="INFO"></Logger>
<Logger name="org.apache.logging" level="INFO"></Logger> <Logger name="org.apache.logging" level="INFO"></Logger>
<Logger name="org.maxkey" level="DEBUG"></Logger> <Logger name="org.maxkey" level="DEBUG"></Logger>
<Logger name="org.apache.mybatis.jpa" level="DEBUG"></Logger>
<root level="INFO"> <root level="INFO">
<appender-ref ref="consolePrint" /> <appender-ref ref="consolePrint" />
......
maxkey-web-manage/src/main/resources/messages/message.properties
浏览文件 @ 1b2f924f
...@@ -366,6 +366,7 @@ apps.oauth.connect.idTokenEncryptionMethod=idToken\u52A0\u5BC6\u65B9\u6CD5 ...@@ -366,6 +366,7 @@ apps.oauth.connect.idTokenEncryptionMethod=idToken\u52A0\u5BC6\u65B9\u6CD5
apps.oauth.connect.userInfoEncryptionMethod=\u7528\u6237\u52A0\u5BC6\u65B9\u6CD5 apps.oauth.connect.userInfoEncryptionMethod=\u7528\u6237\u52A0\u5BC6\u65B9\u6CD5
#group #group
group.id=\u7EC4\u7F16\u7801
group.name=\u7528\u6237\u7EC4 group.name=\u7528\u6237\u7EC4
#account #account
......
maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAdd.ftl
浏览文件 @ 1b2f924f
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<tr> <tr>
<th><@locale code="userinfo.displayName" />：</th> <th><@locale code="userinfo.displayName" />：</th>
<td nowrap> <td nowrap>
<input readonly type="text" id="displayName" name="displayName" class="form-control displayName" title="" value="${model.displayName!}"/> <input readonly type="text" id="displayName" name="displayName" class="form-control displayName" title="" value="${model.displayName!}" style="width:70%;"/>
</td> </td>
</tr> </tr>
...@@ -56,14 +56,14 @@ ...@@ -56,14 +56,14 @@
<tr> <tr>
<th><@locale code="account.relatedUsername" />：</th> <th><@locale code="account.relatedUsername" />：</th>
<td nowrap> <td nowrap>
<input type="text" id="relatedUsername" name="relatedUsername" class="form-control" title="" value="${model.relatedUsername!}"/> <input type="text" id="relatedUsername" name="relatedUsername" class="form-control" title="" value="${model.relatedUsername!}" style="width:70%;"/>
</td> </td>
</tr> </tr>
<tr> <tr>
<th><@locale code="account.relatedPassword" />：</th> <th><@locale code="account.relatedPassword" />：</th>
<td nowrap> <td nowrap>
<input type="password" id="relatedPassword" name="relatedPassword" class="form-control" title="" value="${model.relatedPassword!}"/> <input type="password" id="relatedPassword" name="relatedPassword" class="form-control" title="" value="${model.relatedPassword!}" style="width:70%;"/>
</td> </td>
</tr> </tr>
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<input type="hidden" id="uid" name="uid" class="uid" title="" value="${model.uid!}"/> <input type="hidden" id="uid" name="uid" class="uid" title="" value="${model.uid!}"/>
<input type="hidden" id="appId" name="appId" class="appId" title="" value="${model.appId!}"/> <input type="hidden" id="appId" name="appId" class="appId" title="" value="${model.appId!}"/>
<input class="button btn btn-primary mr-3" type="button" id="submitBtn" value="<@locale code="button.text.save" />"/> <input class="button btn btn-primary mr-3" type="button" id="submitBtn" value="<@locale code="button.text.save" />"/>
<input class="button" type="button" id="closeBtn" value="<@locale code="button.text.cancel" /> "/> <input class="button btn btn-secondary mr-3" type="button" id="closeBtn" value="<@locale code="button.text.cancel" /> "/>
</td> </td>
</tr> </tr>
......
maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsList.ftl
浏览文件 @ 1b2f924f
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</div> </div>
<div class="col-12 col-lg-9 col-md-6"> <div class="col-12 col-lg-9 col-md-6">
<ol class="breadcrumb float-right"> <ol class="breadcrumb float-right">
<li><a href="index.html">Dashboard</a></li> <li><a href="<@base/>/main">Dashboard</a></li>
<li class="active">/ Dashboard 2</li> <li class="active">/ Dashboard 2</li>
</ol> </ol>
</div> </div>
......
maxkey-web-manage/src/main/resources/templates/views/apps/appsList.ftl
浏览文件 @ 1b2f924f
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
</div> </div>
<div class="col-12 col-lg-9 col-md-6"> <div class="col-12 col-lg-9 col-md-6">
<ol class="breadcrumb float-right"> <ol class="breadcrumb float-right">
<li><a href="index.html">Dashboard</a></li> <li><a href="<@base/>/main">Dashboard</a></li>
<li class="active">/ Dashboard 2</li> <li class="active">/ Dashboard 2</li>
</ol> </ol>
</div> </div>
...@@ -126,22 +126,23 @@ ...@@ -126,22 +126,23 @@
</td> </td>
<td colspan="2"> <td colspan="2">
<div id="tool_box_right"> <div id="tool_box_right">
<a class="button btn btn-success mr-3" id="addApps" style="width: 70px;"> <div class="dropdown" style="width: 110px;float: left;">
<span class="ui-button-icon-secondary ui-icon ui-icon-triangle-1-s" style="margin-top: 10px;float: left;"></span> <button class="btn btn-success dropdown-toggle mr-3 " type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<@locale code="button.text.add"/> <@locale code="button.text.add"/>
</a> </button>
<div id="menu" class="select-menu-modal " style="width: 150px;"> <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
<div class="select-menu-item"><a target="_blank" href="<@base/>/apps/formbased/forwardAdd"><div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<@locale code="apps.protocol.formbased" /></div></a></div> <a class="dropdown-item" target="_blank" href="<@base/>/apps/formbased/forwardAdd">&nbsp;&nbsp;<@locale code="apps.protocol.formbased" /></a>
<div class="select-menu-item"><a target="_blank" href="<@base/>/apps/desktop/forwardAdd"><div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<@locale code="apps.protocol.desktop" /></div></a></div> <a class="dropdown-item" target="_blank" href="<@base/>/apps/desktop/forwardAdd">&nbsp;&nbsp;<@locale code="apps.protocol.desktop" /></a>
<div class="select-menu-item"><a target="_blank" href="<@base/>/apps/tokenbased/forwardAdd"><div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<@locale code="apps.protocol.tokenbased" /></div></a></div> <a class="dropdown-item" target="_blank" href="<@base/>/apps/tokenbased/forwardAdd">&nbsp;&nbsp;<@locale code="apps.protocol.tokenbased" /></a>
<div class="select-menu-item"><a target="_blank" href="<@base/>/apps/oauth20/forwardAdd"><div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<@locale code="apps.protocol.oauth2.0" /></div></a></div> <a class="dropdown-item" target="_blank" href="<@base/>/apps/oauth20/forwardAdd">&nbsp;&nbsp;<@locale code="apps.protocol.oauth2.0" /></a>
<div class="select-menu-item"><a target="_blank" href="<@base/>/apps/saml20/forwardAdd"><div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<@locale code="apps.protocol.saml2.0" /></div></a></div> <a class="dropdown-item" target="_blank" href="<@base/>/apps/saml20/forwardAdd">&nbsp;&nbsp;<@locale code="apps.protocol.saml2.0" /></a>
<div class="select-menu-item"><a target="_blank" href="<@base/>/apps/cas/forwardAdd"><div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<@locale code="apps.protocol.cas" /></div></a></div> <a class="dropdown-item" target="_blank" href="<@base/>/apps/cas/forwardAdd">&nbsp;&nbsp;<@locale code="apps.protocol.cas" /></a>
<div class="select-menu-item"><a target="_blank" href="<@base/>/apps/extendapi/forwardAdd"><div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<@locale code="apps.protocol.extendapi" /></div></a></div> <a class="dropdown-item" target="_blank" href="<@base/>/apps/extendapi/forwardAdd">&nbsp;&nbsp;<@locale code="apps.protocol.extendapi" /></a>
<div class="select-menu-item"><a target="_blank" href="<@base/>/apps/basic/forwardAdd"><div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<@locale code="apps.protocol.basic" /></div></a></div> <a class="dropdown-item" target="_blank" href="<@base/>/apps/basic/forwardAdd">&nbsp;&nbsp;<@locale code="apps.protocol.basic" /></a>
</div>
</div> </div>
<input class="button btn btn-info mr-3 " id="modifyApps" type="button" value="<@locale code="button.text.edit"/>" /> <input style="float: left;" class="button btn btn-info mr-3 " id="modifyApps" type="button" value="<@locale code="button.text.edit"/>" />
<input class="button btn btn-danger mr-3 " id="deleteApps" type="button" value="<@locale code="button.text.delete"/>" /> <input style="float: left;" class="button btn btn-danger mr-3 " id="deleteApps" type="button" value="<@locale code="button.text.delete"/>" />
</div> </div>
</td> </td>
</tr> </tr>
......
maxkey-web-manage/src/main/resources/templates/views/apps/basic/appAdd.ftl
浏览文件 @ 1b2f924f
...@@ -44,8 +44,8 @@ $(function(){ ...@@ -44,8 +44,8 @@ $(function(){
<tr> <tr>
<td colspan=4> <td colspan=4>
<input class="button" id="status" type="hidden" name="status" value="1"/> <input class="button" id="status" type="hidden" name="status" value="1"/>
<input class="button" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/> <input class="button btn btn-primary mr-3" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/>
<input class="button" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/> <input class="button btn btn-secondary mr-3" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/>
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
maxkey-web-manage/src/main/resources/templates/views/apps/basic/appUpdate.ftl
浏览文件 @ 1b2f924f
...@@ -53,8 +53,8 @@ $(function(){ ...@@ -53,8 +53,8 @@ $(function(){
<tbody> <tbody>
<tr> <tr>
<td colspan=4> <td colspan=4>
<input class="button" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/> <input class="button btn btn-primary mr-3" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/>
<input class="button" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/> <input class="button btn btn-secondary mr-3" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/>
</td> </td>
</tr> </tr>
......
maxkey-web-manage/src/main/resources/templates/views/apps/cas/appAdd.ftl
浏览文件 @ 1b2f924f
...@@ -61,8 +61,8 @@ $(function(){ ...@@ -61,8 +61,8 @@ $(function(){
<tr> <tr>
<td colspan=4> <td colspan=4>
<input class="button" id="status" type="hidden" name="status" value="1"/> <input class="button" id="status" type="hidden" name="status" value="1"/>
<input class="button" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/> <input class="button btn btn-primary mr-3" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/>
<input class="button" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/> <input class="button btn btn-secondary mr-3" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/>
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
maxkey-web-manage/src/main/resources/templates/views/apps/cas/appUpdate.ftl
浏览文件 @ 1b2f924f
...@@ -69,8 +69,8 @@ $(function(){ ...@@ -69,8 +69,8 @@ $(function(){
</tr> </tr>
<tr> <tr>
<td colspan=4> <td colspan=4>
<input class="button" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/> <input class="button btn btn-primary mr-3" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/>
<input class="button" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/> <input class="button btn btn-secondary mr-3" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/>
</td> </td>
</tr> </tr>
......
maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appAdd.ftl
浏览文件 @ 1b2f924f
...@@ -221,8 +221,8 @@ $(function(){ ...@@ -221,8 +221,8 @@ $(function(){
</tbody> </tbody>
</table> </table>
<input id="status" type="hidden" name="status" value="1"/> <input id="status" type="hidden" name="status" value="1"/>
<input class="button" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/> <input class="button btn btn-primary mr-3" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/>
<input class="button" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/> <input class="button btn btn-secondary mr-3" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/>
</form> </form>
</body> </body>
</html> </html>
\ No newline at end of file
maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appUpdate.ftl
浏览文件 @ 1b2f924f
...@@ -225,8 +225,8 @@ $(function(){ ...@@ -225,8 +225,8 @@ $(function(){
<tbody > <tbody >
<tr> <tr>
<td colspan =4> <td colspan =4>
<input class="button" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/> <input class="button btn btn-primary mr-3" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/>
<input class="button" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/> <input class="button btn btn-secondary mr-3" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/>
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appAdd.ftl
浏览文件 @ 1b2f924f
...@@ -163,8 +163,8 @@ $(function(){ ...@@ -163,8 +163,8 @@ $(function(){
<tr> <tr>
<td colspan =4> <td colspan =4>
<input class="button" id="status" type="hidden" name="status" value="1"/> <input class="button" id="status" type="hidden" name="status" value="1"/>
<input class="button" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/> <input class="button btn btn-primary mr-3" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/>
<input class="button" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/> <input class="button btn btn-secondary mr-3" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/>
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl
浏览文件 @ 1b2f924f
...@@ -175,8 +175,8 @@ $(function(){ ...@@ -175,8 +175,8 @@ $(function(){
</tr> </tr>
</tbody> </tbody>
</table> </table>
<input class="button" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/> <input class="button btn btn-primary mr-3" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/>
<input class="button" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/> <input class="button btn btn-secondary mr-3" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/>
</form> </form>
</body> </body>
</html> </html>
\ No newline at end of file
maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appAdd.ftl
浏览文件 @ 1b2f924f
...@@ -183,8 +183,8 @@ $(function(){ ...@@ -183,8 +183,8 @@ $(function(){
<tr> <tr>
<td colspan =4> <td colspan =4>
<input id="status" type="hidden" name="status" value="1"/> <input id="status" type="hidden" name="status" value="1"/>
<input class="button" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/> <input class="button btn btn-primary mr-3" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/>
<input class="button" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/> <input class="button btn btn-secondary mr-3" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/>
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appUpdate.ftl
浏览文件 @ 1b2f924f
...@@ -190,8 +190,8 @@ $(function(){ ...@@ -190,8 +190,8 @@ $(function(){
<tbody > <tbody >
<tr> <tr>
<td colspan =4> <td colspan =4>
<input class="button" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/> <input class="button btn btn-primary mr-3" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/>
<input class="button" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/> <input class="button btn btn-secondary mr-3" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/>
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appAdd.ftl
浏览文件 @ 1b2f924f
...@@ -228,8 +228,8 @@ $(function(){ ...@@ -228,8 +228,8 @@ $(function(){
<tr> <tr>
<td colspan =4> <td colspan =4>
<input id="status" type="hidden" name="status" value="1"/> <input id="status" type="hidden" name="status" value="1"/>
<input class="button" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/> <input class="button btn btn-primary mr-3" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/>
<input class="button" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/> <input class="button btn btn-secondary mr-3" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/>
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appUpdate.ftl
浏览文件 @ 1b2f924f
...@@ -239,8 +239,8 @@ $(function(){ ...@@ -239,8 +239,8 @@ $(function(){
</tr> </tr>
</tbody> </tbody>
</table> </table>
<input class="button" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/> <input class="button btn btn-primary mr-3" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/>
<input class="button" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/> <input class="button btn btn-secondary mr-3" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/>
</form> </form>
</body> </body>
</html> </html>
\ No newline at end of file
maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appAdd.ftl
浏览文件 @ 1b2f924f
...@@ -162,8 +162,8 @@ $(function(){ ...@@ -162,8 +162,8 @@ $(function(){
<tr> <tr>
<td colspan =4> <td colspan =4>
<input id="status" type="hidden" name="status" value="1"/> <input id="status" type="hidden" name="status" value="1"/>
<input class="button" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/> <input class="button btn btn-primary mr-3" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/>
<input class="button" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/> <input class="button btn btn-secondary mr-3" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/>
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl
浏览文件 @ 1b2f924f
...@@ -174,8 +174,8 @@ $(function(){ ...@@ -174,8 +174,8 @@ $(function(){
<tr> <tr>
<td colspan =4> <td colspan =4>
<input class="button" id="status" type="hidden" name="status" value="1"/> <input class="button" id="status" type="hidden" name="status" value="1"/>
<input class="button" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/> <input class="button btn btn-primary mr-3" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/>
<input class="button" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/> <input class="button btn btn-secondary mr-3" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/>
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
maxkey-web-manage/src/main/resources/templates/views/apps/selectAppsList.ftl
浏览文件 @ 1b2f924f
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
<td width="120px"><@locale code="apps.name"/>:</td> <td width="120px"><@locale code="apps.name"/>:</td>
<td width="374px" nowrap> <td width="374px" nowrap>
<form id="basic_search_form"> <form id="basic_search_form">
<input type="text" name="name" style ="width:150px"> <input type="text" class="form-control" name="name" style ="width:150px;float: left;">
<input class="button primary" id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>"> <input class="button button btn btn-primary mr-3" id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>">
</form> </form>
</td> </td>
......
maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl
浏览文件 @ 1b2f924f
...@@ -141,8 +141,8 @@ $(function(){ ...@@ -141,8 +141,8 @@ $(function(){
<tr> <tr>
<td colspan =4> <td colspan =4>
<input class="button" id="status" type="hidden" name="status" value="1"/> <input class="button" id="status" type="hidden" name="status" value="1"/>
<input class="button" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/> <input class="button btn btn-primary mr-3" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/>
<input class="button" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/> <input class="button btn btn-secondary mr-3" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/>
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl
浏览文件 @ 1b2f924f
...@@ -148,8 +148,8 @@ $(function(){ ...@@ -148,8 +148,8 @@ $(function(){
<tr> <tr>
<td colspan =4> <td colspan =4>
<input class="button" id="status" type="hidden" name="status" value="1"/> <input class="button" id="status" type="hidden" name="status" value="1"/>
<input class="button" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/> <input class="button btn btn-primary mr-3" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/>
<input class="button" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/> <input class="button btn btn-secondary mr-3" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/>
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
maxkey-web-manage/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl
浏览文件 @ 1b2f924f
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</div> </div>
<div class="col-12 col-lg-9 col-md-6"> <div class="col-12 col-lg-9 col-md-6">
<ol class="breadcrumb float-right"> <ol class="breadcrumb float-right">
<li><a href="index.html">Dashboard</a></li> <li><a href="<@base/>/main">Dashboard</a></li>
<li class="active">/ Dashboard 2</li> <li class="active">/ Dashboard 2</li>
</ol> </ol>
</div> </div>
......
maxkey-web-manage/src/main/resources/templates/views/groupapp/addGroupAppsList.ftl
浏览文件 @ 1b2f924f
...@@ -50,13 +50,13 @@ ...@@ -50,13 +50,13 @@
<td width="120px"><@locale code="apps.name"/>:</td> <td width="120px"><@locale code="apps.name"/>:</td>
<td width="374px" nowrap> <td width="374px" nowrap>
<form id="basic_search_form"> <form id="basic_search_form">
<input type="text" name="name" style ="width:150px"> <input class="form-control" type="text" name="name" style ="width:150px;float:left;">
<input class="button primary" id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>"> <input class="button btn btn-primary mr-3" id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>">
</form> </form>
</td> </td>
<td colspan="2"> <td colspan="2">
<div> <div>
<input class="button" id="addGroupAppsBtn" type="button" value="<@locale code="button.text.add" />"> <input class="button btn btn-success mr-3" id="addGroupAppsBtn" type="button" value="<@locale code="button.text.add" />">
</div> </div>
</td> </td>
</tr> </tr>
......
maxkey-web-manage/src/main/resources/templates/views/groupapp/groupAppsList.ftl
浏览文件 @ 1b2f924f
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</div> </div>
<div class="col-12 col-lg-9 col-md-6"> <div class="col-12 col-lg-9 col-md-6">
<ol class="breadcrumb float-right"> <ol class="breadcrumb float-right">
<li><a href="index.html">Dashboard</a></li> <li><a href="<@base/>/main">Dashboard</a></li>
<li class="active">/ Dashboard 2</li> <li class="active">/ Dashboard 2</li>
</ol> </ol>
</div> </div>
...@@ -60,23 +60,23 @@ ...@@ -60,23 +60,23 @@
<table class="datatable"> <table class="datatable">
<tr> <tr>
<td width="120px"><@locale code="group.name"/>:</td> <td width="120px"><@locale code="group.name"/>:</td>
<td width="374px"> <td width="450px">
<form id="basic_search_form"> <form id="basic_search_form">
<input class="groupId" id="groupId" name="groupId" type="hidden" > <input class="groupId" id="groupId" name="groupId" type="hidden" >
<input class="groupName" style="width:200px" id="groupName" name="groupName" type="text" > <input class="form-control groupName " style="width:200px;float: left;" id="groupName" name="groupName" type="text" >
<input class="button btn btn-success mr-3" id="addBtn" type="button" value="<@locale code="button.text.select"/>" <input class="button btn btn-success mr-3" style="float: left;" id="addBtn" type="button" value="<@locale code="button.text.select"/>"
wurl="<@base/>/groups/selectGroupsList" wurl="<@base/>/groups/selectGroupsList"
wwidth="700" wwidth="700"
wheight="500" wheight="500"
target="window"> target="window">
<input class="button primary" id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>"> <input class="button btn btn-primary mr-3" style="float: left;" id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>">
<input class="button btn btn-secondary" id="advancedSearchExpandBtn" type="button" size="50" value="<@locale code="button.text.expandsearch"/>" expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>">
</form> </form>
</td> </td>
<td colspan="2"> <div id="tool_box_right"> <td colspan="2"> <div id="tool_box_right" style="width:400px">
<input class="button" id="advancedSearchExpandBtn" type="button" size="50" value="<@locale code="button.text.expandsearch"/>" expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> <input class="button btn btn-success mr-3" id="addGroupAppsBtn" type="button" value="<@locale code="button.text.add.member"/>">
<input class="button" id="addGroupAppsBtn" type="button" value="<@locale code="button.text.add.member"/>"> <input class="button btn btn-danger mr-3 " id="deleteBtn" type="button" value="<@locale code="button.text.delete.member"/>"
<input class="button" id="deleteBtn" type="button" value="<@locale code="button.text.delete.member"/>"
wurl="<@base/>/groupPrivileges/delete" /> wurl="<@base/>/groupPrivileges/delete" />
</div> </div>
</td> </td>
......
maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl
浏览文件 @ 1b2f924f
...@@ -17,8 +17,7 @@ ...@@ -17,8 +17,7 @@
<tr> <tr>
<th><@locale code="group.name" />：</th> <th><@locale code="group.name" />：</th>
<td nowrap> <td nowrap>
<span class="intspan"><input type="text" id="name" name="name" class="form-control" title="" value=""/></span> <input type="text" id="name" name="name" class="form-control" title="" value=""/>
<b class="orange">*</b><label for="name"></label>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -26,7 +25,7 @@ ...@@ -26,7 +25,7 @@
<input id="_method" type="hidden" name="_method" value="post"/> <input id="_method" type="hidden" name="_method" value="post"/>
<input id="status" type="hidden" name="status" value="1"/> <input id="status" type="hidden" name="status" value="1"/>
<input class="button btn btn-primary mr-3" id="submitBtn" type="button" value="<@locale code="button.text.save" />"> <input class="button btn btn-primary mr-3" id="submitBtn" type="button" value="<@locale code="button.text.save" />">
<input class="button" id="closeBtn" type="button" value="<@locale code="button.text.cancel" />"> <input class="button btn btn-secondary mr-3" id="closeBtn" type="button" value="<@locale code="button.text.cancel" />">
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
maxkey-web-manage/src/main/resources/templates/views/groups/groupUpdate.ftl
浏览文件 @ 1b2f924f
...@@ -14,17 +14,16 @@ ...@@ -14,17 +14,16 @@
<form id="actionForm" method="post" type="label" autoclose="true" action="<@base/>/groups/update"> <form id="actionForm" method="post" type="label" autoclose="true" action="<@base/>/groups/update">
<table border="0" cellpadding="0" cellspacing="0" class="table table-bordered"> <table border="0" cellpadding="0" cellspacing="0" class="table table-bordered">
<tbody> <tbody>
<tr> <tr style="display:none1">
<th><s:Locale code="group.id" />：</th> <th><@locale code="group.id" />：</th>
<td nowrap> <td nowrap>
<input id="id" type="text" readonly name="id" value="${model.id}"/> <input id="id" type="text" readonly name="id" class="form-control" value="${model.id}"/>
</td> </td>
</tr> </tr>
<tr> <tr>
<th><@locale code="group.name" />：</th> <th><@locale code="group.name" />：</th>
<td nowrap> <td nowrap>
<span class="intspan"><input type="text" id="name" name="name" class="form-control" title="" value="${model.name}"/></span> <input type="text" id="name" name="name" class="form-control" title="" value="${model.name}"/>
<b class="orange">*</b><label for="name"></label>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -32,7 +31,7 @@ ...@@ -32,7 +31,7 @@
<input id="_method" type="hidden" name="_method" value="post"/> <input id="_method" type="hidden" name="_method" value="post"/>
<input id="status" type="hidden" name="status" value="1"/> <input id="status" type="hidden" name="status" value="1"/>
<input class="button btn btn-primary mr-3" id="submitBtn" type="button" value="<@locale code="button.text.save" />"> <input class="button btn btn-primary mr-3" id="submitBtn" type="button" value="<@locale code="button.text.save" />">
<input class="button" id="closeBtn" type="button" value="<@locale code="button.text.cancel" />"> <input class="button btn btn-secondary mr-3" id="closeBtn" type="button" value="<@locale code="button.text.cancel" />">
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
maxkey-web-manage/src/main/resources/templates/views/groups/groupsList.ftl
浏览文件 @ 1b2f924f
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</div> </div>
<div class="col-12 col-lg-9 col-md-6"> <div class="col-12 col-lg-9 col-md-6">
<ol class="breadcrumb float-right"> <ol class="breadcrumb float-right">
<li><a href="index.html">Dashboard</a></li> <li><a href="<@base/>/main">Dashboard</a></li>
<li class="active">/ Dashboard 2</li> <li class="active">/ Dashboard 2</li>
</ol> </ol>
</div> </div>
...@@ -51,14 +51,14 @@ ...@@ -51,14 +51,14 @@
<div id="tool_box_right"> <div id="tool_box_right">
<input class="button btn btn-success mr-3" id="addBtn" type="button" value="<@locale code="button.text.add"/>" <input class="button btn btn-success mr-3" id="addBtn" type="button" value="<@locale code="button.text.add"/>"
wurl="<@base/>/groups/forwardAdd" wurl="<@base/>/groups/forwardAdd"
wwidth="400" wwidth="500"
wheight="300" wheight="200"
target="window"> target="window">
<input class="button btn btn-info mr-3 " id="modifyBtn" type="button" value="<@locale code="button.text.edit"/>" <input class="button btn btn-info mr-3 " id="modifyBtn" type="button" value="<@locale code="button.text.edit"/>"
wurl="<@base/>/groups/forwardUpdate" wurl="<@base/>/groups/forwardUpdate"
wwidth="400" wwidth="500"
wheight="300" wheight="200"
target="window"> target="window">
<input class="button btn btn-danger mr-3 " id="deleteBtn" type="button" value="<@locale code="button.text.delete"/>" <input class="button btn btn-danger mr-3 " id="deleteBtn" type="button" value="<@locale code="button.text.delete"/>"
......
maxkey-web-manage/src/main/resources/templates/views/groups/selectGroupsList.ftl
浏览文件 @ 1b2f924f
...@@ -27,16 +27,16 @@ ...@@ -27,16 +27,16 @@
<div id="tool_box"> <div id="tool_box">
<table class="datatable"> <table class="datatable">
<tr> <tr>
<td width="120px"><s:Locale code="group.name"/>:</td> <td width="120px"><@locale code="group.name"/>:</td>
<td width="374px"> <td width="374px">
<form id="basic_search_form"> <form id="basic_search_form">
<input type="text" name="name" style ="width:150px"> <input class="form-control" type="text" name="name" style ="width:150px;float: left;">
<input class="button primary" id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>"> <input class="button btn btn-success mr-3" id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>">
</form> </form>
</td> </td>
<td colspan="2"> <td colspan="2">
<div id="tool_box_right" style="width: auto;"> <div id="tool_box_right" style="width: auto;">
<input class="button" id="selectBtn" type="button" value="<@locale code="button.text.select"/>" > <input class="button btn btn-primary mr-3" id="selectBtn" type="button" value="<@locale code="button.text.select"/>" >
</div> </div>
</td> </td>
</tr> </tr>
......
maxkey-web-manage/src/main/resources/templates/views/groupuser/addGroupUsersList.ftl
浏览文件 @ 1b2f924f
...@@ -54,13 +54,13 @@ ...@@ -54,13 +54,13 @@
<td width="120px"><@locale code="userinfo.username"/>:</td> <td width="120px"><@locale code="userinfo.username"/>:</td>
<td width="374px"> <td width="374px">
<form id="basic_search_form"> <form id="basic_search_form">
<input type="text" name="name" style ="width:150px"> <input class="form-control" type="text" name="name" style ="width:150px;float:left;">
<input class="button primary" id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>"> <input class="button btn btn-primary mr-3" id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>">
</form> </form>
</td> </td>
<td colspan="2"> <td colspan="2">
<div > <div >
<input class="button" id="insertGroupUserBtn" type="button" value="<@locale code="button.text.add"/>"> <input class="button btn btn-success mr-3" id="insertGroupUserBtn" type="button" value="<@locale code="button.text.add"/>">
</div> </div>
</td> </td>
</tr> </tr>
......
maxkey-web-manage/src/main/resources/templates/views/groupuser/groupUsersList.ftl
浏览文件 @ 1b2f924f
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
</div> </div>
<div class="col-12 col-lg-9 col-md-6"> <div class="col-12 col-lg-9 col-md-6">
<ol class="breadcrumb float-right"> <ol class="breadcrumb float-right">
<li><a href="index.html">Dashboard</a></li> <li><a href="<@base/>/main">Dashboard</a></li>
<li class="active">/ Dashboard 2</li> <li class="active">/ Dashboard 2</li>
</ol> </ol>
</div> </div>
...@@ -60,23 +60,24 @@ ...@@ -60,23 +60,24 @@
<table class="datatable"> <table class="datatable">
<tr> <tr>
<td width="120px"><@locale code="group.name"/>:</td> <td width="120px"><@locale code="group.name"/>:</td>
<td width="374px"> <td width="450px">
<form id="basic_search_form"> <form id="basic_search_form" style="width:100%">
<input class="groupId" id="groupId" name="groupId" value="" type="hidden" > <input class="groupId" id="groupId" name="groupId" value="" type="hidden" >
<input class="groupName" style="width:200px" value="" id="groupName" name="groupName" type="text" > <input class="form-control groupName" style="width:200px;float: left;" value="" id="groupName" name="groupName" type="text" >
<input class="button btn btn-success mr-3" id="addBtn" type="button" value="<@locale code="button.text.select"/>" <input class="button btn btn-success mr-3" style="float: left;" id="addBtn" type="button" value="<@locale code="button.text.select"/>"
wurl="<@base/>/groups/selectGroupsList" wurl="<@base/>/groups/selectGroupsList"
wwidth="700" wwidth="700"
wheight="500" wheight="500"
target="window"> target="window">
<input class="button primary" id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>"> <input class="button btn btn-primary mr-3" style="float: left;" id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>">
<input class="button btn btn-secondary" id="advancedSearchExpandBtn" type="button" size="50" value="<@locale code="button.text.expandsearch"/>" expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>">
</form> </form>
</td> </td>
<td colspan="2"> <div id="tool_box_right"> <td colspan="2"> <div id="tool_box_right" style="width:400px">
<input class="button" id="advancedSearchExpandBtn" type="button" size="50" value="<@locale code="button.text.expandsearch"/>" expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>">
<input class="button" id="insertGroupUserBtn" type="button" value="<@locale code="button.text.add.member"/>"> <input class="button btn btn-success mr-3" id="insertGroupUserBtn" type="button" value="<@locale code="button.text.add.member"/>">
<input class="button" id="deleteBtn" type="button" value="<@locale code="button.text.delete.member"/>" <input class="button btn btn-danger mr-3 " id="deleteBtn" type="button" value="<@locale code="button.text.delete.member"/>"
wurl="<@base/>/groupMember/delete"/> wurl="<@base/>/groupMember/delete"/>
</div> </div>
</td> </td>
......
maxkey-web-manage/src/main/resources/templates/views/logs/loginAppsHistoryList.ftl
浏览文件 @ 1b2f924f
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</div> </div>
<div class="col-12 col-lg-9 col-md-6"> <div class="col-12 col-lg-9 col-md-6">
<ol class="breadcrumb float-right"> <ol class="breadcrumb float-right">
<li><a href="index.html">Dashboard</a></li> <li><a href="<@base/>/main">Dashboard</a></li>
<li class="active">/ Dashboard 2</li> <li class="active">/ Dashboard 2</li>
</ol> </ol>
</div> </div>
......
maxkey-web-manage/src/main/resources/templates/views/logs/loginHistoryList.ftl
浏览文件 @ 1b2f924f
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</div> </div>
<div class="col-12 col-lg-9 col-md-6"> <div class="col-12 col-lg-9 col-md-6">
<ol class="breadcrumb float-right"> <ol class="breadcrumb float-right">
<li><a href="index.html">Dashboard</a></li> <li><a href="<@base/>/main">Dashboard</a></li>
<li class="active">/ Dashboard 2</li> <li class="active">/ Dashboard 2</li>
</ol> </ol>
</div> </div>
......
maxkey-web-manage/src/main/resources/templates/views/logs/logsList.ftl
浏览文件 @ 1b2f924f
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</div> </div>
<div class="col-12 col-lg-9 col-md-6"> <div class="col-12 col-lg-9 col-md-6">
<ol class="breadcrumb float-right"> <ol class="breadcrumb float-right">
<li><a href="index.html">Dashboard</a></li> <li><a href="<@base/>/main">Dashboard</a></li>
<li class="active">/ Dashboard 2</li> <li class="active">/ Dashboard 2</li>
</ol> </ol>
</div> </div>
......
maxkey-web-manage/src/main/resources/templates/views/main.ftl
浏览文件 @ 1b2f924f
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</div> </div>
<div class="col-12 col-lg-9 col-md-6"> <div class="col-12 col-lg-9 col-md-6">
<ol class="breadcrumb float-right"> <ol class="breadcrumb float-right">
<li><a href="index.html">Dashboard</a></li> <li><a href="<@base/>/main">Dashboard</a></li>
<li class="active"> / Dashboard 2</li> <li class="active"> / Dashboard 2</li>
</ol> </ol>
</div> </div>
......
maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.ftl
浏览文件 @ 1b2f924f
...@@ -155,7 +155,7 @@ $(function () { ...@@ -155,7 +155,7 @@ $(function () {
</div> </div>
<div class="col-12 col-lg-9 col-md-6"> <div class="col-12 col-lg-9 col-md-6">
<ol class="breadcrumb float-right"> <ol class="breadcrumb float-right">
<li><a href="index.html">Dashboard</a></li> <li><a href="<@base/>/main">Dashboard</a></li>
<li class="active">/ Dashboard 2</li> <li class="active">/ Dashboard 2</li>
</ol> </ol>
</div> </div>
......
maxkey-web-manage/src/main/resources/templates/views/userinfo/userinfoSelect.ftl
浏览文件 @ 1b2f924f
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
</head> </head>
<body> <body>
<div> <div>
<input class="button" id="winClose" type="button" value="winClose"> <input class="button btn btn-primary mr-3" style="float: right;" id="winClose" type="button" value="<@locale code="button.text.select" />" >
</div> </div>
<!-- content --> <!-- content -->
<table class="datatable" width="100%" > <table class="datatable" width="100%" >
......
maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl
浏览文件 @ 1b2f924f
...@@ -165,7 +165,7 @@ $(function () { ...@@ -165,7 +165,7 @@ $(function () {
</div> </div>
<div class="col-12 col-lg-9 col-md-6"> <div class="col-12 col-lg-9 col-md-6">
<ol class="breadcrumb float-right"> <ol class="breadcrumb float-right">
<li><a href="index.html">Dashboard</a></li> <li><a href="<@base/>/main">Dashboard</a></li>
<li class="active">/ Dashboard 2</li> <li class="active">/ Dashboard 2</li>
</ol> </ol>
</div> </div>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或