nodes bugfix

zhima1234 · zhima1234 · commit f4263260c52a · 2017-06-15T12:23:09.000+08:00
diff --git a/data/programming.txt b/data/programming.txt
@@ -39,6 +39,14 @@ cli 3 n
 pprof 3 n
 runtime 3 n
 context 3 n
+liteide 3 n
+sublime  3 n
+atom 3 n
+goland 3 n
+eclipse 3 n
+vim 3 n
+vimgo 3 n
+gosublime 3 n
 vscode 3 n
 eclipse 3 n
 docker 3 n
@@ -53,4 +61,9 @@ groupcache 3 n
 python 3 n
 php 3 n
 ruby 3 n
-java 3 n
+java 3 n
+mysql 3 n
+linux 3 n
+apache 3 n
+ai 3 n
+vr 3 n
diff --git a/src/http/controller/index.go b/src/http/controller/index.go
@@ -44,7 +44,7 @@ func (IndexController) NewIndex(ctx echo.Context) error {
 	SetCookie(ctx, "INDEX_TAB", tab)
 
 	data := logic.DefaultIndex.FindData(ctx, tab)
-	data["nodes"] = logic.GenNodes()
+	data["all_nodes"] = logic.GenNodes()
 
 	return render(ctx, "new_index.html", data)
 }
diff --git a/src/logic/index.go b/src/logic/index.go
@@ -82,11 +82,12 @@ func (IndexLogic) FindData(ctx context.Context, tab string) map[string]interface
 			if err != nil {
 				break
 			}
-			users, nodes := DefaultSearcher.FillNodeAndUser(ctx, respBody)
 			if respBody.NumFound == 0 {
 				break
 			}
 
+			users, nodes := DefaultSearcher.FillNodeAndUser(ctx, respBody)
+
 			data["docs"] = respBody.Docs
 			data["users"] = users
 			data["nodes"] = nodes
diff --git a/template/new_index.html b/template/new_index.html
@@ -245,7 +245,7 @@
 			<div class="cell">
 				<span class="cc">节点导航</span>
 			</div>
-			{{range .nodes}}
+			{{range .all_nodes}}
 			<div class="cell">
 				<table cellpadding="0" cellspacing="0" border="0"><tbody>
 					<tr>
diff --git a/template/projects/detail.html b/template/projects/detail.html
@@ -18,7 +18,9 @@
 						</a>
 					</div>
 					<h1>
-						{{if .project.Logo}}<img src="{{.project.Logo}}" alt="{{.project.Name}}" width="80px" />{{end}}
+					{{if .project.Logo}}
+						<img src="{{if hasPrefix .project.Logo "http"}}{{.project.Logo}}{{else}}{{.cdn_domain}}/{{.project.Logo}}{{end}}" alt="{{.project.Name}}" width="80px" />
+					{{end}}
 						{{.project.Category}} <u>{{.project.Name}}</u>
 					</h1>
 					<small class="gray">
diff --git a/template/top/dau.html b/template/top/dau.html
@@ -31,7 +31,7 @@ <h2 style="margin-bottom: 0px; margin-top: 0px; border-bottom: none;"><span clas
 							<span style="color: #ccc;">第 {{.Uid}} 号会员</span>
 							
 						</td>
-						<td width="200" align="center">
+						<td width="150" align="center">
 							<div class="balance_area" style="font-size: 24px; line-height: 24px;">&nbsp;{{.Weight}}&nbsp;</div>
 						</td>
 					</tr>

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ func (IndexController) NewIndex(ctx echo.Context) error {`
`44`	`44`	`SetCookie(ctx, "INDEX_TAB", tab)`
`45`	`45`
`46`	`46`	`data := logic.DefaultIndex.FindData(ctx, tab)`
`47`		`- data["nodes"] = logic.GenNodes()`
	`47`	`+ data["all_nodes"] = logic.GenNodes()`
`48`	`48`
`49`	`49`	`return render(ctx, "new_index.html", data)`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,11 +82,12 @@ func (IndexLogic) FindData(ctx context.Context, tab string) map[string]interface`
`82`	`82`	`if err != nil {`
`83`	`83`	`break`
`84`	`84`	`}`
`85`		`- users, nodes := DefaultSearcher.FillNodeAndUser(ctx, respBody)`
`86`	`85`	`if respBody.NumFound == 0 {`
`87`	`86`	`break`
`88`	`87`	`}`
`89`	`88`
	`89`	`+ users, nodes := DefaultSearcher.FillNodeAndUser(ctx, respBody)`
	`90`	`+`
`90`	`91`	`data["docs"] = respBody.Docs`
`91`	`92`	`data["users"] = users`
`92`	`93`	`data["nodes"] = nodes`