做必要的判断&tag加头像

zhima1234 · zhima1234 · commit b34118badbf1 · 2017-09-03T21:20:51.000+08:00
diff --git a/config/db.sql b/config/db.sql
@@ -310,7 +310,6 @@ CREATE TABLE IF NOT EXISTS `articles` (
   PRIMARY KEY (`id`),
   UNIQUE KEY (`url`),
   KEY (`top`),
-  KEY (`author_txt`),
   KEY (`domain`),
   KEY (`ctime`)
 )ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT '网络文章聚合表';
diff --git a/src/http/controller/index.go b/src/http/controller/index.go
@@ -33,6 +33,10 @@ func (self IndexController) RegisterRoute(g *echo.Group) {
 }
 
 func (IndexController) NewIndex(ctx echo.Context) error {
+	if len(logic.WebsiteSetting.IndexNavs) == 0 {
+		return render(ctx, "new_index.html", nil)
+	}
+
 	tab := ctx.QueryParam("tab")
 	if tab == "" {
 		tab = GetFromCookie(ctx, "INDEX_TAB")
diff --git a/template/feed/tag.html b/template/feed/tag.html
@@ -23,7 +23,7 @@
 						<a href="/user/{{$user.Username}}"><img src="{{gravatar $user.Avatar $user.Email 48 $.is_https}}" class="avatar"></a>
 						{{else}}
 						<a href="javascript:">
-						<img src="https://secure.gravatar.com/avatar/3bf6178897766ebadaa830073e87374d?s=48">
+							<img class="noavatar" alt="" src="https://secure.gravatar.com/avatar/3bf6178897766ebadaa830073e87374d?s=48" data-objid="{{.Objid}}" data-objtype="{{.Objtype}}" data-author="{{.Author}}">
 						</a>
 						{{end}}
 						</td>
@@ -92,10 +92,24 @@
 </div>
 {{end}}
 {{define "js"}}
+<script type="text/javascript" src="/static/js/libs/identicon.js"></script>
 <script type="text/javascript">
 // 需要加载的侧边栏
 SG.SIDE_BARS = [
 	"/comments/recent",
 ];
+
+$(function() {
+	$('.noavatar').each(function() {
+		var objid = $(this).data('objid'),
+			objtype = $(this).data('objtype'),
+			author = $(this).data('author');
+		// var hash = md5(objid+"-"+objtype);
+		var hash = md5(author+"");
+		var data = new Identicon(hash, {format: 'svg', size: 48}).toString();
+		var imgData = 'data:image/svg+xml;base64,' + data;
+		$(this).attr('src', imgData);
+	});
+});
 </script>
 {{end}}
diff --git a/template/new_index.html b/template/new_index.html
@@ -317,7 +317,7 @@
 			objtype = $(this).data('objtype'),
 			author = $(this).data('author');
 		// var hash = md5(objid+"-"+objtype);
-		var hash = md5(author);
+		var hash = md5(author+"");
 		var data = new Identicon(hash, {format: 'svg', size: 48}).toString();
 		var imgData = 'data:image/svg+xml;base64,' + data;
 		$(this).attr('src', imgData);
