summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2015-08-26 00:01:06 +0800
committerUnknwon <u@gogs.io>2015-08-26 00:01:06 +0800
commit4330c1f0d824ea190bd07c0f68db5ca25e42f593 (patch)
treec22156ba5b1973eb5dfa37fa37af249c616e3573 /templates
parenta329bbc2159a35437d81b78f8176925904ddae08 (diff)
downloadgitea-4330c1f0d824ea190bd07c0f68db5ca25e42f593.tar.gz
gitea-4330c1f0d824ea190bd07c0f68db5ca25e42f593.zip
update locale and org dashboard navbar
Diffstat (limited to 'templates')
-rw-r--r--templates/.VERSION2
-rw-r--r--templates/user/dashboard/nav.tmpl4
-rw-r--r--templates/user/dashboard/navbar.tmpl20
3 files changed, 22 insertions, 4 deletions
diff --git a/templates/.VERSION b/templates/.VERSION
index 90fe3b1585..ad8ff378fd 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.6.5.0825 Beta \ No newline at end of file
+0.6.6.0825 Beta \ No newline at end of file
diff --git a/templates/user/dashboard/nav.tmpl b/templates/user/dashboard/nav.tmpl
index d0820c8ec1..0549bbe949 100644
--- a/templates/user/dashboard/nav.tmpl
+++ b/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> -->
diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl
index 6e14b4bdaf..e486a042cb 100644
--- a/templates/user/dashboard/navbar.tmpl
+++ b/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> \ No newline at end of file