diff options
| author | Unknwon <joe2010xtmf@163.com> | 2014-11-17 14:53:41 -0500 |
|---|---|---|
| committer | Unknwon <joe2010xtmf@163.com> | 2014-11-17 14:53:41 -0500 |
| commit | 32dcaefafa6039e8fe27d263290e33ce5e5d3aa5 (patch) | |
| tree | 689cfa7791c40b3d25a801c7b7cc3bf07f23ed7f /templates | |
| parent | d1a60e364383b877fd98b853d94b739cb171fe9c (diff) | |
| download | gitea-32dcaefafa6039e8fe27d263290e33ce5e5d3aa5.tar.gz gitea-32dcaefafa6039e8fe27d263290e33ce5e5d3aa5.zip | |
fox #620
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/.VERSION | 2 | ||||
| -rw-r--r-- | templates/admin/user/edit.tmpl | 14 | ||||
| -rw-r--r-- | templates/repo/settings/nav.tmpl | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/templates/.VERSION b/templates/.VERSION index 78403f16c7..43806b4f3a 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.5.8.1116 Beta
\ No newline at end of file +0.5.8.1117 Beta
\ No newline at end of file diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index 1d4cf806f1..317349935e 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -56,15 +56,19 @@ <label></label> <input type="checkbox" name="active" {{if .User.IsActive}}checked{{end}}> <strong>{{.i18n.Tr "admin.users.is_activated"}}</strong> - <br> - <label></label> - <input type="checkbox" name="admin" {{if .User.IsAdmin}}checked{{end}}> - <strong>{{.i18n.Tr "admin.users.is_admin"}}</strong> + <br> + <label></label> + <input type="checkbox" name="admin" {{if .User.IsAdmin}}checked{{end}}> + <strong>{{.i18n.Tr "admin.users.is_admin"}}</strong> + <br> + <label></label> + <input type="checkbox" name="allow_git_hook" {{if .User.AllowGitHook}}checked{{end}}> + <strong>{{.i18n.Tr "admin.users.allow_git_hook"}}</strong> </div> <div class="field"> <label></label> <button class="btn btn-green btn-large btn-radius">{{.i18n.Tr "admin.users.update_profile"}}</button> - + <button class="btn btn-large btn-red btn-radius" id="delete-account-btn" href="#delete-account-modal">{{.i18n.Tr "admin.users.delete_account"}}</button> </div> <div class="white-popup-block mfp-hide" id="delete-account-modal"> diff --git a/templates/repo/settings/nav.tmpl b/templates/repo/settings/nav.tmpl index 16128f0151..6803c56383 100644 --- a/templates/repo/settings/nav.tmpl +++ b/templates/repo/settings/nav.tmpl @@ -5,7 +5,9 @@ <li {{if .PageIsSettingsOptions}}class="current"{{end}}><a href="{{.RepoLink}}/settings">{{.i18n.Tr "repo.settings.options"}}</a></li> <li {{if .PageIsSettingsCollaboration}}class="current"{{end}}><a href="{{.RepoLink}}/settings/collaboration">{{.i18n.Tr "repo.settings.collaboration"}}</a></li> <li {{if .PageIsSettingsHooks}}class="current"{{end}}><a href="{{.RepoLink}}/settings/hooks">{{.i18n.Tr "repo.settings.hooks"}}</a></li> + {{if or .SignedUser.AllowGitHook .SignedUser.IsAdmin}} <li {{if .PageIsSettingsGitHooks}}class="current"{{end}}><a href="{{.RepoLink}}/settings/hooks/git">{{.i18n.Tr "repo.settings.githooks"}}</a></li> + {{end}} <!-- <li {{if .PageIsSettingsKeys}}class="current"{{end}}><a href="{{.RepoLink}}/settings/keys">{{.i18n.Tr "repo.settings.deploy_keys"}}</a></li> --> </ul> </div> |