diff options
| author | Unknwon <u@gogs.io> | 2015-11-17 02:18:05 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-11-17 02:18:05 -0500 |
| commit | ff5f14431eb2df2e68e6b3765607fa4aef99c707 (patch) | |
| tree | 07fc01396d867adaf794ad47a010132ebeb0a71e /templates | |
| parent | ab9411be2ae01970f4c2c092683bd9d9b71c994b (diff) | |
| download | gitea-ff5f14431eb2df2e68e6b3765607fa4aef99c707.tar.gz gitea-ff5f14431eb2df2e68e6b3765607fa4aef99c707.zip | |
fix #1448
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/.VERSION | 2 | ||||
| -rw-r--r-- | templates/repo/settings/collaboration.tmpl | 87 | ||||
| -rw-r--r-- | templates/user/profile.tmpl | 1 |
3 files changed, 44 insertions, 46 deletions
diff --git a/templates/.VERSION b/templates/.VERSION index 482a1f393e..fe3bbea3cb 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.7.15.1116 Beta
\ No newline at end of file +0.7.16.1117 Beta
\ No newline at end of file diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 4781f667bb..c991511020 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -1,47 +1,44 @@ -{{template "ng/base/head" .}} -{{template "ng/base/header" .}} -<div id="repo-wrapper"> - {{template "repo/header_old" .}} - <div id="setting-wrapper" class="main-wrapper"> - <div id="repo-setting" class="container clear"> - {{template "repo/settings/nav" .}} - <div class="grid-4-5 left"> - <div class="setting-content"> - {{template "ng/base/alert" .}} - <div id="setting-content"> - <div id="user-profile-setting-content" class="panel panel-radius"> - <div class="panel-header"> - <strong>{{.i18n.Tr "repo.settings.collaboration"}}</strong> - </div> - <div class="panel-body"> - <ul id="repo-collab-list"> - {{range .Collaborators}} - <li class="collab"> - {{if not (eq .Id $.Owner.Id)}}<a href="{{$.RepoLink}}/settings/collaboration?remove={{.Name}}" class="remove-collab right"><i class="fa fa-times"></i></a>{{end}} - <a class="member" href="{{AppSubUrl}}/{{.Name}}"> - <img alt="{{.Name}}" class="pull-left avatar" src="{{.AvatarLink}}"> - <strong>{{.FullName}}</strong> ({{.Name}}) - </a> - </li> - <hr> - {{end}} - </ul> - </div> - <div class="panel-footer"> - <form class="form form-align" action="{{.RepoLink}}/settings/collaboration" method="post" id="repo-collab-form"> - {{.CsrfTokenHtml}} - <input class="ipt ipt-large ipt-radius" id="repo-collaborator" name="collaborator" autocomplete="off" required /> - <button class="btn btn-blue btn-large btn-radius">{{.i18n.Tr "repo.settings.add_collaborator"}}</button> - <div class="repo-user-list-block"> - <ul class="menu-down-show menu-vertical menu-radius switching-list user-list" id="repo-collaborator-list"></ul> - </div> - </form> - </div> - </div> - </div> - </div> - </div> - </div> +{{template "base/head" .}} +<div class="repository settings collaboration"> + {{template "repo/header" .}} + <div class="ui container"> + {{template "repo/sidebar" .}} + <div class="ui grid"> + {{template "repo/settings/navbar" .}} + <div class="twelve wide column content"> + {{template "base/alert" .}} + <h4 class="ui top attached header"> + {{.i18n.Tr "repo.settings.collaboration"}} + </h4> + <div class="ui attached segment collaborator list"> + {{range .Collaborators}} + <div class="item"> + {{if not (eq .Id $.Owner.Id)}} + <a href="{{$.RepoLink}}/settings/collaboration?remove={{.Name}}" class="ui right text red"><i class="fa fa-times"></i></a> + {{end}} + <a href="{{AppSubUrl}}/{{.Name}}"> + <img class="ui avatar image" src="{{.AvatarLink}}"> + {{.DisplayName}} + </a> + </div> + {{end}} + </div> + <div class="ui bottom attached segment"> + <form class="ui form" id="repo-collab-form" action="{{.Link}}" method="post"> + {{.CsrfTokenHtml}} + <div class="inline field ui left"> + <div id="search-user-box"> + <div class="ui input"> + <input class="prompt" name="collaborator" placeholder="{{.i18n.Tr "repo.settings.search_user_placeholder"}}" autocomplete="off"> + </div> + <div class="ui segment results hide"></div> + </div> + </div> + <button class="ui green button">{{.i18n.Tr "repo.settings.add_collaborator"}}</button> + </form> + </div> + </div> + </div> </div> </div> -{{template "ng/base/footer" .}}
\ No newline at end of file +{{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 9acf30ad0d..d1d92e8a20 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -82,6 +82,7 @@ {{template "user/dashboard/feeds" .}} </div> {{end}} + </div> </div> </div> </div> |