diff options
| author | Unknwon <u@gogs.io> | 2015-02-28 21:50:29 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-02-28 21:50:29 -0500 |
| commit | b0b11fd7b1bd5e556c27ccae73668b7df74cd73e (patch) | |
| tree | 134a3b875952990ffe83f5b583d461b6b2e942df /templates | |
| parent | 3a6ba39a61c68d967c6c08aa087d2de2d0bf7ec0 (diff) | |
| parent | f44204e9449c09e0fef37a4974dc2f2043593d6f (diff) | |
| download | gitea-b0b11fd7b1bd5e556c27ccae73668b7df74cd73e.tar.gz gitea-b0b11fd7b1bd5e556c27ccae73668b7df74cd73e.zip | |
Merge branch 'access' of github.com:gogits/gogs into dev
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/.VERSION | 2 | ||||
| -rw-r--r-- | templates/ng/base/footer.tmpl | 2 | ||||
| -rw-r--r-- | templates/org/home.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/header.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/sidebar.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/toolbar.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/profile.tmpl | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/templates/.VERSION b/templates/.VERSION index b9cd4a186a..0789cc30bc 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.5.14.0222 Beta
\ No newline at end of file +0.5.16.0228 Beta
\ No newline at end of file diff --git a/templates/ng/base/footer.tmpl b/templates/ng/base/footer.tmpl index e152a4ded1..89836fca23 100644 --- a/templates/ng/base/footer.tmpl +++ b/templates/ng/base/footer.tmpl @@ -1,7 +1,7 @@ </div> <footer id="footer"> <div class="container clear"> - <p class="left" id="footer-rights">© 2015 GoGits · {{.i18n.Tr "version"}}: {{AppVer}} · {{.i18n.Tr "page"}}: <strong>{{LoadTimes .PageStartTime}}</strong> · + <p class="left" id="footer-rights">© 2015 Gogs · {{.i18n.Tr "version"}}: {{AppVer}} · {{.i18n.Tr "page"}}: <strong>{{LoadTimes .PageStartTime}}</strong> · {{.i18n.Tr "template"}}: <strong>{{call .TmplLoadTimes}}</strong></p> <div class="right" id="footer-links"> diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index df29d61fc4..fdce06a298 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -27,7 +27,7 @@ </div> <div id="org-repo-list"> {{range .Repos}} - {{if or (not .IsPrivate) (.HasAccess $.SignedUser.Name)}} + {{if or (not .IsPrivate) (.HasAccess $.SignedUser)}} <div class="org-repo-item"> <ul class="org-repo-status right"> <li><i class="octicon octicon-star"></i> {{.NumStars}}</li> diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index a0b927be60..21f9cea882 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -49,7 +49,7 @@ </a> </li> <li id="repo-header-fork"> - <a id="repo-header-fork-btn" {{if or (not $.IsRepositoryTrueOwner) $.Owner.IsOrganization}}href="{{AppSubUrl}}/repo/fork?fork_id={{.Id}}"{{end}}> + <a id="repo-header-fork-btn" {{if or (not $.IsRepositoryAdmin) $.Owner.IsOrganization}}href="{{AppSubUrl}}/repo/fork?fork_id={{.Id}}"{{end}}> <button class="btn btn-gray text-bold btn-radius"> <i class="octicon octicon-repo-forked"></i>{{$.i18n.Tr "repo.fork"}} <span class="num">{{.NumForks}}</span> diff --git a/templates/repo/sidebar.tmpl b/templates/repo/sidebar.tmpl index 9d6abb47bc..1609603821 100644 --- a/templates/repo/sidebar.tmpl +++ b/templates/repo/sidebar.tmpl @@ -20,7 +20,7 @@ <!-- <li> <a class="radius" href="#"><i class="octicon octicon-organization"></i>contributors <span class="num right label label-gray label-radius">43</span></a> </li> --> - {{if .IsRepositoryTrueOwner}} + {{if .IsRepositoryAdmin}} <li class="border-bottom"></li> <li> <a class="radius" href="{{.RepoLink}}/settings"><i class="octicon octicon-tools"></i>{{.i18n.Tr "repo.settings"}}</a> diff --git a/templates/repo/toolbar.tmpl b/templates/repo/toolbar.tmpl index 6357b3c4c0..f2254d21dd 100644 --- a/templates/repo/toolbar.tmpl +++ b/templates/repo/toolbar.tmpl @@ -35,7 +35,7 @@ <li><a href="#">Pulse</a></li> <li><a href="#">Network</a></li> </ul> - </li> -->{{end}}{{if .IsRepositoryTrueOwner}} + </li> -->{{end}}{{if .IsRepositoryAdmin}} <li class="{{if .IsRepoToolbarSetting}}active{{end}}"><a href="{{.RepoLink}}/settings">Settings</a> </li>{{end}} </ul> diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index a18a8b50d6..dab90c35a2 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -74,7 +74,7 @@ <div class="tab-pane active"> <div id="org-repo-list"> {{range .Repos}} - {{if or (not .IsPrivate) (.HasAccess $.SignedUserName)}} + {{if or (not .IsPrivate) (.HasAccess $.SignedUser)}} <div class="org-repo-item"> <ul class="org-repo-status right"> <li><i class="octicon octicon-star"></i> {{.NumStars}}</li> |