From 032470c3dfa6021c6d1d25dabf78bc6987357eff Mon Sep 17 00:00:00 2001
From: lealife <lifephp@gmail.com>
Date: Sat, 24 Dec 2016 15:47:57 +0800
Subject: [PATCH] v 2.2

---
 app/service/ConfigService.go               |  2 +-
 app/views/admin/index.html                 |  4 ++--
 app/views/admin/nav.html                   |  2 ++
 app/views/admin/top.html                   | 16 +++-------------
 app/views/errors/404.html                  |  2 +-
 app/views/errors/500.html                  |  2 +-
 app/views/home/find_password.html          |  2 +-
 app/views/home/find_password2.html         |  2 +-
 app/views/home/find_password2_timeout.html |  2 +-
 app/views/home/footer.html                 | 15 +++++++--------
 app/views/home/login.html                  |  2 +-
 app/views/home/register.html               |  2 +-
 app/views/member/top.html                  |  2 +-
 bin/release.sh                             |  2 +-
 14 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/app/service/ConfigService.go b/app/service/ConfigService.go
index d88d706..dee7be2 100644
--- a/app/service/ConfigService.go
+++ b/app/service/ConfigService.go
@@ -606,5 +606,5 @@ func (this *ConfigService) HomePageIsAdminsBlog() bool {
 }
 
 func (this *ConfigService) GetVersion() string {
-	return "2.0"
+	return "2.2"
 }
diff --git a/app/views/admin/index.html b/app/views/admin/index.html
index 0b718de..a661c22 100644
--- a/app/views/admin/index.html
+++ b/app/views/admin/index.html
@@ -42,7 +42,7 @@
 		</h4>
 		<ul class="list-group" id="eventsList"></ul>
 	</section>
-	
+
 	<!--
 	<section class="panel panel-default">
 		<form>
@@ -56,7 +56,7 @@
 		</footer>
 	</section>	
 	-->
-	
+
 {{template "admin/footer.html" .}}
 <script>
 $(function() {
diff --git a/app/views/admin/nav.html b/app/views/admin/nav.html
index 2c7fc9b..814aaac 100644
--- a/app/views/admin/nav.html
+++ b/app/views/admin/nav.html
@@ -225,6 +225,7 @@
 				</li>
 			</ul>
 		</li>
+		<!--
 		<li>
 			<a href="#">
 				<i class="fa fa-space-shuttle icon">
@@ -259,5 +260,6 @@
 				</li>
 			</ul>
 		</li>
+		-->
 	</ul>
 </nav>
diff --git a/app/views/admin/top.html b/app/views/admin/top.html
index 61bcc18..1fd8d8b 100644
--- a/app/views/admin/top.html
+++ b/app/views/admin/top.html
@@ -29,18 +29,8 @@
 			
 			<ul class="nav navbar-nav navbar-right m-n hidden-xs nav-user">
 				<li class="hidden-xs">
-					<a href="http://leanote.com" class="dk" target="_blank">
-						Leanote Home
-					</a>
-				</li>
-				<li class="hidden-xs">
-					<a href="https://github.com/leanote/leanote" class="dk" target="_blank">
-						Leanote Github
-					</a>
-				</li>
-				<li class="hidden-xs">
-					<a href="http://lea.leanote.com" class="dk" target="_blank">
-						Leanote Explore
+					<a href="/" class="dk">
+						Home
 					</a>
 				</li>
 				<li class="hidden-xs">
@@ -87,7 +77,7 @@
 						</section>
 						<footer class="footer lt hidden-xs b-t b-light" style="min-height: initial;
 padding: 10px 15px;text-align:center;">
-							<a href="http://leanote.com" target="_blank">leanote</a> © 2015
+							© <a href="https://leanote.com" target="_blank">Leanote</a>
 							<!--
 							<a href="#nav" data-toggle="class:nav-xs" class="pull-right btn btn-sm btn-default btn-icon">
 								<i class="fa fa-angle-left text">
diff --git a/app/views/errors/404.html b/app/views/errors/404.html
index 2b7c144..058f44f 100644
--- a/app/views/errors/404.html
+++ b/app/views/errors/404.html
@@ -26,7 +26,7 @@
 </section>
 <div id="boxFooter">
 	<p>
-		<a href="/index">leanote</a> © 2015
+		© <a href="/index">Leanote</a>
 	</p>
 </div>
 </body>
diff --git a/app/views/errors/500.html b/app/views/errors/500.html
index f3e1600..6259d7c 100644
--- a/app/views/errors/500.html
+++ b/app/views/errors/500.html
@@ -26,7 +26,7 @@
 </section>
 <div id="boxFooter">
 	<p>
-		<a href="/index">leanote</a> © 2015
+		© <a href="/index">Leanote</a>
 	</p>
 </div>
 </body>
diff --git a/app/views/home/find_password.html b/app/views/home/find_password.html
index 3b0ae87..1d2877e 100644
--- a/app/views/home/find_password.html
+++ b/app/views/home/find_password.html
@@ -27,7 +27,7 @@
 		<a href="/index">{{msg . "home"}}</a>
 	</p>
 	<p>
-		<a href="https://leanote.com">Leanote</a> © 2014-2016
+		© <a href="https://leanote.com">Leanote</a>
 	</p>
 </div>
 
diff --git a/app/views/home/find_password2.html b/app/views/home/find_password2.html
index 5207988..9b6d77c 100644
--- a/app/views/home/find_password2.html
+++ b/app/views/home/find_password2.html
@@ -36,7 +36,7 @@
 		<a href="/index">{{msg . "home"}}</a>
 	</p>
 	<p>
-		<a href="https://leanote.com">Leanote</a> © 2014-2016
+		© <a href="https://leanote.com">Leanote</a>
 	</p>
 </div>
 
diff --git a/app/views/home/find_password2_timeout.html b/app/views/home/find_password2_timeout.html
index b5a4c3c..ac915ee 100644
--- a/app/views/home/find_password2_timeout.html
+++ b/app/views/home/find_password2_timeout.html
@@ -21,7 +21,7 @@
 		<a href="/index">{{msg . "home"}}</a>
 	</p>
 	<p>
-		<a href="https://leanote.com">Leanote</a> © 2014-2016
+		© <a href="https://leanote.com">Leanote</a>
 	</p>
 </div>
 
diff --git a/app/views/home/footer.html b/app/views/home/footer.html
index 33c3b78..0297d75 100644
--- a/app/views/home/footer.html
+++ b/app/views/home/footer.html
@@ -4,22 +4,21 @@
 			<div class="col-md-6">
 				<i class="fa fa-envelope-o fa-3x icon-muted"></i>
 				<h2>Contact</h2>
-				<a href="http://weibo.com/leanotecom" target="_blank"><i class="fa fa-weibo"></i></a>
+				<a href="http://weibo.com/leanotecom" target="_blank"><i class="fa fa-weibo"></i></a> / leanote@leanote.com
 				<br />
-				leanote@leanote.com
-				<br />
-				Copyright © 2014-2016 <a href="https://leanote.com">Leanote</a>
 			</div>
 			<div class="col-md-6">
 				<i class="fa fa-globe fa-3x icon-muted"></i>
 				<h2>Join Us</h2>
-				<a href="https://github.com/leanote/leanote">Github Leanote</a>
-				<br />
-				QQ Group: <span id="qqGrup">326073529, 256076853, 158716820</span>
+				<a href="https://github.com/leanote/leanote">Github</a> / <a href="http://leanote.leanote.com/post/Leanote-groups">QQ Group</a>
 			</div>
 		</div>
 	</div>
 	
-	<div class="footer-leanote">Proudly powered by <a href="https://leanote.com">Leanote</a></div>
+	<div class="footer-leanote">
+		Copyright © <a href="https://leanote.com">Leanote</a>
+		<br/>
+		Proudly powered by <a href="https://leanote.com">Leanote</a>
+	</div>
 	
 </div>
diff --git a/app/views/home/login.html b/app/views/home/login.html
index 6889985..7c3e68d 100644
--- a/app/views/home/login.html
+++ b/app/views/home/login.html
@@ -64,7 +64,7 @@
 		<a href="/">{{msg . "home"}}</a>
 	</p>
 	<p>
-		<a href="https://leanote.com">Leanote</a> © 2014-2016
+		© <a href="https://leanote.com">Leanote</a>
 	</p>
 </div>
 
diff --git a/app/views/home/register.html b/app/views/home/register.html
index 012cf12..ac58bd8 100644
--- a/app/views/home/register.html
+++ b/app/views/home/register.html
@@ -43,7 +43,7 @@
 		<a href="/index">{{msg . "home"}}</a>
 	</p>
 	<p>
-		<a href="https://leanote.com">Leanote</a> © 2014-2016
+		© <a href="https://leanote.com">Leanote</a>
 	</p>
 </div>
 
diff --git a/app/views/member/top.html b/app/views/member/top.html
index fbefdfd..d6835fe 100644
--- a/app/views/member/top.html
+++ b/app/views/member/top.html
@@ -74,7 +74,7 @@
 						</section>
 						<footer class="footer lt hidden-xs b-t b-light" style="min-height: initial;
 padding: 10px 15px;text-align:center;">
-							<a href="http://leanote.com" target="_blank">leanote</a> © 2015
+							© <a href="https://leanote.com" target="_blank">Leanote</a>
 							<!--
 							<a href="#nav" data-toggle="class:nav-xs" class="pull-right btn btn-sm btn-default btn-icon">
 								<i class="fa fa-angle-left text">
diff --git a/bin/release.sh b/bin/release.sh
index 560ecb0..b0c5e99 100644
--- a/bin/release.sh
+++ b/bin/release.sh
@@ -9,7 +9,7 @@ SP=$(cd "$(dirname "$0")"; pwd)
 tmp="/Users/life/Desktop/leanote_release"
 
 # version
-V="v2.1"
+V="v2.2"
 
 ##=================================
 # 1. 先build 成 3个平台, 2种bit = 6种