update locale and org dashboard navbar

README.md

@@ -5,7 +5,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
 
 Gogs (Go Git Service) is a painless self-hosted Git service.
 
-##### Current version: 0.6.5 Beta
+##### Current version: 0.6.6 Beta
 
 <table>
     <tr>

conf/locale/locale_en-US.ini

@@ -123,6 +123,7 @@ my_repos = My Repositories
 collaborative_repos = Collaborative Repositories
 my_orgs = My Organizations
 my_mirrors = My Mirrors
+view_home = View %s
 
 issues.in_your_repos = In your repositories
 

conf/locale/locale_nl-NL.ini

@@ -76,7 +76,7 @@ run_user=Uitvoerende gebruikersnaam
 run_user_helper=Deze gebruiker moet toegang hebben tot de git repositorie directorie en moet Gogs kunnen starten
 domain=Domein
 domain_helper=Dit heeft invloed op de SSH kloon URLs
-ssh_port=SSH Port
+ssh_port=SSH-poort
 ssh_port_helper=Port number which your SSH server is using, leave it empty to disable SSH feature.
 http_port=HTTP-poort
 http_port_helper=Poortnummer waar het programma naar luistert.
@@ -124,6 +124,8 @@ collaborative_repos=Gedeelde repositories
 my_orgs=Mijn organisaties
 my_mirrors=Mijn mirrors
 
+issues.in_your_repos=In your repositories
+
 [explore]
 repos=Repositories
 
@@ -276,11 +278,14 @@ key_name=Sleutel naam
 key_content=Inhoud
 add_key_success=Nieuwe SSH sleutel '%s' werd met succes toegevoegd!
 delete_key=Verwijder
+ssh_key_deletion=SSH Key Deletion
+ssh_key_deletion_desc=Delete this SSH key will remove all related accesses for your account. Do you want to continue?
+ssh_key_deletion_success=SSH key has been deleted successfully!
 add_on=Toegevoegd op
 last_used=Laatst gebruikt op
 no_activity=Geen recente activiteiten
 key_state_desc=Deze sleutel werd gebruikt in de laatste 7 dagen
-token_state_desc=This token is used in last 7 days
+token_state_desc=Deze token is de laatste 7 dagen gebruikt
 
 manage_social=Beheer gekoppelde sociale accounts
 social_desc=Dit is een lijst van de bijbehorende sociale accounts koppelingen, Verwijder eventueel koppelingen die u niet herkent.
@@ -435,7 +440,7 @@ issues.owner=Eigenaar
 issues.sign_up_for_free=Gratis aanmelden
 issues.sign_in_require_desc=om deel te nemen in deze conversatie. Heeft u al een account? <a href="%s">Meld u aan om te reageren</a>
 issues.edit=Bewerken
-issues.cancel=Cancel
+issues.cancel=Annuleren
 issues.save=Opslaan
 issues.label_title=Labelnaam
 issues.label_color=Labelkleur

conf/locale/locale_zh-CN.ini

@@ -123,6 +123,9 @@ my_repos=我的仓库
 collaborative_repos=参与协作的仓库
 my_orgs=我的组织
 my_mirrors=我的镜像
+view_home=访问 %s
+
+issues.in_your_repos=属于该用户仓库的
 
 [explore]
 repos=探索仓库
@@ -276,6 +279,9 @@ key_name=密钥名称
 key_content=密钥内容
 add_key_success=新的 SSH 密钥 '%s' 添加成功！
 delete_key=删除
+ssh_key_deletion=删除 SSH 公钥
+ssh_key_deletion_desc=删除该 SSH 公钥将删除所有与您帐户相关的访问权限。是否继续?
+ssh_key_deletion_success=SSH 公钥删除成功！
 add_on=增加于
 last_used=上次使用在
 no_activity=没有最近活动

gogs.go

@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.6.5.0825 Beta"
+const APP_VER = "0.6.6.0825 Beta"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())

public/less/_dashboard.less

@@ -16,5 +16,11 @@
 		    color: #FFF;
 			}
 		}
+		.ui.right .head.menu {
+			margin-top: -5px;
+			.item.active {
+				color: #d26911;
+			}
+		}
 	}
 }

templates/.VERSION

@@ -1 +1 @@
-0.6.5.0825 Beta
+0.6.6.0825 Beta

templates/user/dashboard/nav.tmpl

@@ -33,11 +33,9 @@
                 </ul>
             </div>
         </li>
-        {{if not .ContextUser.IsOrganization}}
         <li class="right">
-            <a {{if $.PageIsIssues}}class="current"{{end}} href="{{.ContextUser.DashboardLink}}issues"><i class="octicon octicon-issue-opened"></i>{{.i18n.Tr "issues"}}</a>
+            <a {{if $.PageIsIssues}}class="current"{{end}} href="{{AppSubUrl}}/{{if .ContextUser.IsOrganization}}org/{{.ContextUser.Name}}/{{end}}issues"><i class="octicon octicon-issue-opened"></i>{{.i18n.Tr "issues"}}</a>
         </li>
-        {{end}}
         <!-- <li class="right">
             <a {{if .PageIsPulls}}class="current"{{end}} href="{{.ContextUser.DashboardLink}}pulls"><i class="octicon octicon-git-pull-request"></i>{{.i18n.Tr "pull_requests"}}</a>
         </li> -->

templates/user/dashboard/navbar.tmpl

@@ -26,5 +26,25 @@
     	</a>
     </div>
   </div>
+
+  {{if .ContextUser.IsOrganization}}
+  <div class="ui right">
+    <div class="ui secondary head menu">
+      <a class="{{if .PageIsNews}}active{{end}} item" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/dashboard">
+        <i class="octicon octicon-rss"></i>&nbsp;{{.i18n.Tr "news_feed"}}
+      </a>
+      <a class="{{if .PageIsIssues}}active{{end}} item" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/issues">
+        <i class="octicon octicon-issue-opened"></i>&nbsp;{{.i18n.Tr "issues"}}
+      </a>
+      <div class="right menu">
+        <div class="item">
+          <a class="ui blue basic button" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}">
+            {{.i18n.Tr "home.view_home" .ContextUser.Name}}
+          </a>
+        </div>
+      </div>
+    </div>
+  </div>
+  {{end}}
 </div>
 <div class="ui divider"></div>