diff --git a/models/org.go b/models/org.go
index 8b3e60ef84..28a6701c5b 100755
--- a/models/org.go
+++ b/models/org.go
@@ -208,7 +208,7 @@ func FindTopNMembersOrgs(n int) ([]*OrgScore, error) {
}
func FindTopNOpenIOrgs(n int) ([]*OrgScore, error) {
- sql := "select org_id id,num_score score from org_statistic order by num_score desc limit 10" + strconv.Itoa(n)
+ sql := "select org_id id,num_score score from org_statistic order by num_score desc limit " + strconv.Itoa(n)
return findTopNOrgs(sql)
}
diff --git a/templates/explore/organizations.tmpl b/templates/explore/organizations.tmpl
index 58615a8e5b..6d308161d9 100644
--- a/templates/explore/organizations.tmpl
+++ b/templates/explore/organizations.tmpl
@@ -83,35 +83,43 @@
-
{{$.i18n.Tr "org.star"}}
+
{{$.i18n.Tr "org.star"}}
{{ range $i,$user :=.StarOrgs}}
-
+
{{if eq $i 0}}
-
+ -
+
+
{{else if eq $i 1}}
-
+ -
+
+
{{else if eq $i 2}}
-
+ -
+
+
{{else }}
-
- {{Add $i 1}}
-
+ -
+
+ {{Add $i 1}}
+
+
{{end}}
-
-
-
{{$user.Name}}
+ {{$user.Name}}
-
+
-
{{$user.Score}}
@@ -122,36 +130,44 @@
-
-
{{$.i18n.Tr "org.member"}}
+
+
{{$.i18n.Tr "org.member"}}
- {{ range $i,$user :=.StarOrgs}}
-
+ {{ range $i,$user :=.MemberOrgs}}
+
{{if eq $i 0}}
-
+ -
+
+
{{else if eq $i 1}}
-
+ -
+
+
{{else if eq $i 2}}
-
+ -
+
+
{{else }}
-
- {{Add $i 1}}
-
+ -
+
+ {{Add $i 1}}
+
+
{{end}}
-
-
-
{{$user.Name}}
+ {{$user.Name}}
-
+
-
{{$user.Score}}
@@ -162,34 +178,43 @@
-
-
{{$.i18n.Tr "org.active"}}
+
+
{{$.i18n.Tr "org.active"}}
- {{ range $i,$user :=.StarOrgs}}
-
+ {{ range $i,$user :=.ActiveOrgs }}
+
{{if eq $i 0}}
-
+ -
+
+
{{else if eq $i 1}}
-
+ -
+
+
{{else if eq $i 2}}
-
+ -
+
+
{{else }}
-
- {{Add $i 1}}
-
+ -
+
+ {{Add $i 1}}
+
+
+
{{end}}
-
-
-
{{$user.Name}}
+ {{$user.Name}}
@@ -249,3 +274,6 @@ window.onload = function() {
}
+
\ No newline at end of file
diff --git a/web_src/less/openi.less b/web_src/less/openi.less
index f6148249eb..f7283f69fe 100644
--- a/web_src/less/openi.less
+++ b/web_src/less/openi.less
@@ -830,6 +830,7 @@ display: block;
font-size: 14px;
text-align: center;
font-family: SourceHanSansSC-light;
+ font-weight: normal !important;
}
.title_re{
margin-top: 50px !important;
@@ -881,13 +882,16 @@ display: block;
line-height: 28px;
}
.org_icon{
- margin-top: 10px;
+ margin-top: 2px;
margin-right: 10px;
padding-left: 15px;
+ width: 100% ;
+ text-align: center ;
}
-.org_icon_num{
- margin-left: 2px;
- margin-right: 13px;
+.re_style{
+ color: rgba(3, 102, 214, 100) !important;
+ font-family:SourceHanSansSC-medium;
+ font-weight: 700;
}
.org_icon_color{
color: #FA8C16;
@@ -904,6 +908,26 @@ display: block;
list-style:none;
margin-left: 2px;
}
+.score{
+ position:absolute;
+ width: 50px;
+ right:50px;
+ text-align: center;
+}
+.wi{
+ width: 15%;
+ line-height: 20px;
+}
+
+.title_icon{
+ vertical-align: sub;
+ font-size: 24px;
+}
+.title_word{
+ vertical-align: middle;
+ font-size: 18px;
+ margin-top:1px;
+}
/**seach**/
/**搜索导航条适配窄屏**/
.seachnav{