From 102c2c021c1476744d9e67362ca75a43a60c0c20 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Sun, 21 May 2017 20:13:07 +0800
Subject: [PATCH]
---
README.md | 4 +++-
application/index/view/layout/bootstrap.html | 44 ++++++++++++++++++++++++++------------------
public/assets/js/backend/example/bootstraptable.js | 2 +-
3 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/README.md b/README.md
index f591bf0..10802d1 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,9 @@ http://demo.fastadmin.net
## **问题反馈**
-在使用中有任何问题，欢迎反馈给我，可以用以下联系方式跟我交流
+在使用中有任何问题，请使用以下联系方式联系我们
+
+交流社区: http://forum.fastadmin.net
QQ群: [636393962](https://jq.qq.com/?_wv=1027&k=487PNBb)
diff --git a/application/index/view/layout/bootstrap.html b/application/index/view/layout/bootstrap.html
index e0ce93b..c5bfe42 100644
--- a/application/index/view/layout/bootstrap.html
+++ b/application/index/view/layout/bootstrap.html
@@ -43,19 +43,28 @@
<div class="navbar-header pull-left">
<a href="{:url('/')}" class="navbar-brand">FastAdmin</a>
</div>
- <ul class="nav navbar-nav pull-right">
- <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" href="#">你好!{:$user->id?$user->nickname:'游客'} <span class="caret"></span></a>
- <ul class="dropdown-menu">
- <li><a id="userindex" href="{:url('user/index')}">会员中心</a></li>
- <li><a id="thirdlogin" href="{:url('user/login')}">第三方登录</a></li>
- <li><a id="qrcode" href="{:url('demo/qrcode')}">二维码生成</a></li>
- <li><a id="bootstrap" href="{:url('demo/bootstrap')}">Bootstrap组件</a></li>
- <li><a id="admin" href="{:url('admin/index/index')}"><span class="text text-danger">后台演示</span></a></li>
- <li><a id="home" href="http://www.fastadmin.net?ref=demo"><span class="text text-info">返回官网</span></a></li>
- </ul>
- </li>
- </ul>
+ <div class="navbar-collapse collapse navbar-responsive-collapse">
+ <ul class="nav navbar-nav">
+ <li><a href="http://www.fastadmin.net">官网</a></li>
+ <li><a href="http://doc.fastadmin.net">文档</a></li>
+ <li><a href="http://forum.fastadmin.net">论坛</a></li>
+ <li class="divider"></li>
+ <li><a href="http://www.fastadmin.net#donate">打赏</a></li>
+ <li><a href="http://demo.fastadmin.net">演示</a></li>
+ </ul>
+ <form class="navbar-form navbar-left" action="http://forum.fastadmin.net">
+ <input name="q" type="text" class="form-control col-lg-8" placeholder="搜索">
+ </form>
+ <ul class="nav navbar-nav pull-right">
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">你好!{:$user->id?$user->nickname:'游客'} <span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <li><a id="admin" href="{:url('admin/index/index')}"><span class="text text-danger">后台演示</span></a></li>
+ <li><a id="home" href="http://www.fastadmin.net?ref=demo"><span class="text text-info">返回官网</span></a></li>
+ </ul>
+ </li>
+ </ul>
+ </div>
</div>
</div>
@@ -68,12 +77,11 @@
<div class="col-xs-12">
<div class="footer-link">
<ul class="list-inline">
- <li><a href="http://www.fastadmin.net">关于我们</a></li>
+ <li><a href="http://www.fastadmin.net">官方网站</a></li>
<li><a href="http://doc.fastadmin.net">帮助文档</a></li>
<li><a href="https://git.oschina.net/karson/fastadmin">Git@OSC</a></li>
- <li><a href="https://github.com/karsonzhang/fastadmin" class="">Github</a></li>
- <li><a href="http://www.fastadmin.net/#donate" class="">打赏</a></li>
- <li><a href="http://www.fastadmin.net/#contact" class="">联系我们</a></li>
+ <li><a href="http://www.fastadmin.net/#donate" class="">捐赠打赏</a></li>
+ <li><a href="http://forum.fastadmin.net" class="">交流社区</a></li>
<li><a href="http://demo.fastadmin.net/" class="">在线演示</a></li>
</ul>
</div>
@@ -88,7 +96,7 @@
</p>
</div>
<div class="pull-right hidden-xs hidden-sm">
-
+
</div>
<div class="clearfix"></div>
</div>
diff --git a/public/assets/js/backend/example/bootstraptable.js b/public/assets/js/backend/example/bootstraptable.js
index 2f547a3..e00e5c0 100644
--- a/public/assets/js/backend/example/bootstraptable.js
+++ b/public/assets/js/backend/example/bootstraptable.js
@@ -40,7 +40,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
search: false,
//启用普通表单搜索
commonSearch: true,
- //可以控制是否默认显示搜索单表,false则隐藏,默认为true
+ //可以控制是否默认显示搜索单表,false则隐藏,默认为false
searchFormVisible: true
});
--
libgit2 0.24.0