diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/.VERSION | 2 | ||||
| -rw-r--r-- | templates/org/header.tmpl | 16 | ||||
| -rw-r--r-- | templates/org/home.tmpl | 9 | ||||
| -rw-r--r-- | templates/org/invite.tmpl | 15 | ||||
| -rw-r--r-- | templates/org/members.tmpl | 97 | ||||
| -rw-r--r-- | templates/org/settings.tmpl | 130 | ||||
| -rw-r--r-- | templates/user/dashboard/dashboard.tmpl | 2 |
7 files changed, 83 insertions, 188 deletions
diff --git a/templates/.VERSION b/templates/.VERSION index f398e90110..906c01dc84 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.4.7.0814 Alpha
\ No newline at end of file +0.4.7.0815 Alpha
\ No newline at end of file diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl new file mode 100644 index 0000000000..8566d0a3c5 --- /dev/null +++ b/templates/org/header.tmpl @@ -0,0 +1,16 @@ +<div class="org-header" id="org-header"> + <div class="container"> + <a class="text-black left" href="/org/{{.Org.LowerName}}"> + <img class="avatar-48 left" src="{{.Org.AvatarLink}}?s=100"> + <span class="org-name">{{.Org.FullName}}</span> + </a> + <ul class="menu menu-line container"> + <li class="right"> + <a {{if .PageIsOrgTeams}}class="current"{{end}} href="{{.OrgLink}}/teams"><i class="octicon octicon-jersey"></i> {{.i18n.Tr "org.teams"}} <span class="label label-gray label-radius">{{.Org.NumTeams}}</span></a> + </li> + <li class="right"> + <a {{if .PageIsOrgMembers}}class="current"{{end}} href="{{.OrgLink}}/members"><i class="octicon octicon-organization"></i> {{.i18n.Tr "org.people"}} <span class="label label-gray label-radius">{{.Org.NumMembers}}</span></a> + </li> + </ul> + </div> +</div>
\ No newline at end of file diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index 205318b0e9..d96624010f 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -17,7 +17,9 @@ <div class="container"> <div id="org-home-repo-list" class="left grid-2-3"> <div class="clear"> + {{if .IsAdminTeam}} <a class="btn btn-green btn-large btn-link btn-radius right" href="/repo/create?org={{.Org.Id}}"><i class="octicon octicon-repo-create"></i> {{.i18n.Tr "new_repo"}}</a> + {{end}} </div> <div id="org-repo-list"> {{range .Repos}} @@ -45,9 +47,11 @@ <a href="/{{.Name}}"><img src="{{.AvatarLink}}"></a> {{end}} </div> + {{if .IsAdminTeam}} <div class="panel-footer"> - <a class="btn btn-medium btn-blue btn-link btn-radius" href="">{{.i18n.Tr "org.invite_someone"}}</a> + <a class="btn btn-medium btn-blue btn-link btn-radius" href="/org/{{.Org.LowerName}}/invitations/new">{{.i18n.Tr "org.invite_someone"}}</a> </div> + {{end}} </div> <br> <div class="panel panel-radius"> @@ -65,9 +69,12 @@ {{end}} </ul> </div> + {{if .IsOrganizationOwner}} <div class="panel-footer"> <a class="btn btn-medium btn-blue btn-link btn-radius" href="/org/{{$.Org.LowerName}}/teams/new">{{.i18n.Tr "org.create_new_team"}}</a> </div> + + {{end}} </div> </div> </div> diff --git a/templates/org/invite.tmpl b/templates/org/invite.tmpl new file mode 100644 index 0000000000..400622fdd8 --- /dev/null +++ b/templates/org/invite.tmpl @@ -0,0 +1,15 @@ +{{template "ng/base/head" .}} +{{template "ng/base/header" .}} +{{template "org/header" .}} +<div class="container"> + <div class="invite-box"> + {{template "ng/base/alert" .}} + <h3>{{.i18n.Tr "org.members.invite_desc" .Org.FullName}}</h3> + <form action="{{.OrgLink}}/invitations/new" method="post"> + {{.CsrfTokenHtml}} + <input class="ipt ipt-large ipt-radius" name="uname" required> + <button class="btn btn-blue btn-large btn-radius">{{.i18n.Tr "org.members.invite_now"}}</button> + </form> + </div> +</div> +{{template "ng/base/footer" .}}
\ No newline at end of file diff --git a/templates/org/members.tmpl b/templates/org/members.tmpl index ba14cb4cc9..bea4340ffb 100644 --- a/templates/org/members.tmpl +++ b/templates/org/members.tmpl @@ -1,56 +1,43 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -<div id="body-nav" class="org-nav org-nav-auto"> - <div class="container clearfix"> - <div id="org-nav-wrapper"> - <ul class="nav nav-pills pull-right"> - <li class="active"><a href="#"><i class="fa fa-users"></i>Members - <span class="label label-default">5</span></a> - </li> - <li><a href="#"><i class="fa fa-tags"></i>Teams - <span class="label label-default">2</span></a> - </li> - </ul> - <img class="pull-left org-small-logo" src="https://avatars3.githubusercontent.com/u/6656686?s=140" alt="" width="60"/> - <div id="org-nav-info"> - <h2 class="org-name">Organization Name</h2> - </div> - </div> - - </div> +{{template "ng/base/head" .}} +{{template "ng/base/header" .}} +{{template "org/header" .}} +<div class="container"> + {{template "ng/base/alert" .}} + <div class="clear" id="org-member-toolbar"> + {{if .IsAdminTeam}} + <a class="btn btn-green btn-large btn-link btn-radius right" href="{{.OrgLink}}/invitations/new"><i class="octicon octicon-repo-create"></i> {{.i18n.Tr "org.invite_someone"}}</a> + {{end}} + </div> + <div id="org-member-list"> + {{range .Members}} + <div class="org-member-item"> + <img class="avatar-48 left" src="{{.AvatarLink}}?s=100"> + <a class="text-black" href="/{{.Name}}"><span class="member-name"><strong>{{.FullName}}</strong>({{.Name}})</span></a> + <ul class="grid-6-12 right"> + <li class="grid-1-3"> + {{ $isPublic := .IsPublicMember $.Org.Id}} + {{if $isPublic}} + {{$.i18n.Tr "org.members.public"}} + {{if eq $.SignedUser.Id .Id}}(<a href="{{$.OrgLink}}/members/action/private?uid={{.Id}}">{{$.i18n.Tr "org.members.public_helper"}}</a>){{end}} + {{else}} + {{$.i18n.Tr "org.members.private"}} + {{if eq $.SignedUser.Id .Id}}(<a href="{{$.OrgLink}}/members/action/public?uid={{.Id}}">{{$.i18n.Tr "org.members.private_helper"}}</a>){{end}} + {{end}} + </li> + <li class="grid-1-4">{{if .IsUserOrgOwner $.Org.Id}}<strong>{{$.i18n.Tr "org.members.owner"}}</strong>{{else}}{{$.i18n.Tr "org.members.member"}}{{end}}</li> + {{if $.IsOrganizationOwner}} + <li class="grid-1-6 right"> + <a class="btn btn-red btn-link btn-radius" href="{{$.OrgLink}}/members/action/remove?uid={{.Id}}">{{$.i18n.Tr "org.members.remove"}}</a> + </li> + {{if $isPublic}} + <li class="grid-1-6 right"> + <a class="btn btn-blue btn-link btn-radius" href="{{$.OrgLink}}/members/action/private?uid={{.Id}}">{{$.i18n.Tr "org.members.conceal"}}</a> + </li> + {{end}} + {{end}} + </ul> + </div> + {{end}} + </div> </div> -<div id="body" class="container"> - <div id="org"> - <div id="org-members"> - <div class="member"> - <div class="avatar col-md-1"> - <img src="https://avatars3.githubusercontent.com/u/2142787?s=140" alt=""/> - </div> - <div class="name col-md-4"> - <a href="#"><strong>fuxiaohei</strong><span class="nick">傅小黑</span></a> - </div> - <div class="role col-md-2 pull-right"> - <strong>Member</strong> - </div> - <div class="status col-md-1 pull-right"> - <strong>Public</strong> - </div> - </div> - <div class="member"> - <div class="avatar col-md-1"> - <img src="https://avatars3.githubusercontent.com/u/2142787?s=140" alt=""/> - </div> - <div class="name col-md-4"> - <a href="#"><strong>fuxiaohei</strong><span class="nick">傅小黑</span></a> - </div> - <div class="role col-md-2 pull-right"> - <strong><i class="fa fa-user"></i>Owner</strong> - </div> - <div class="status col-md-1 pull-right"> - <i class="fa fa-lock"></i>Private - </div> - </div> - </div> - </div> -</div> -{{template "base/footer" .}} +{{template "ng/base/footer" .}}
\ No newline at end of file diff --git a/templates/org/settings.tmpl b/templates/org/settings.tmpl deleted file mode 100644 index fd0d6a1c14..0000000000 --- a/templates/org/settings.tmpl +++ /dev/null @@ -1,130 +0,0 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -<div id="body-nav"> - <div class="container"> - <div class="btn-group pull-left" id="dashboard-switch"> - <button type="button" class="btn btn-default"> - <img src="{{.Org.AvatarLink}}?s=28" alt="user-avatar" title="username"> - {{.Org.Name}} - </button> - </div> - <ul class="nav nav-pills pull-right"> - <li><a href="/org/{{.Org.Name}}/dashboard/">News Feed</a></li> - <li><a href="/org/{{.Org.Name}}/dashboard/issues">Issues</a></li> - <li class="active"><a href="/org/{{.Org.Name}}/settings">Settings</a></li> - <!-- <li><a href="/pulls">Pull Requests</a></li> - <li><a href="/stars">Stars</a></li> --> - </ul> - </div> -</div> - -<div id="body" class="container" data-page="org"> - <div id="user-setting-nav" class="col-md-2 repo-setting-nav"> - <ul class="list-group"> - <li class="list-group-item active"><a href="#">Options</a></li> - </ul> - </div> - <div id="repo-setting-container" class="col-md-10"> - {{template "base/alert" .}} - <div class="panel panel-default"> - <div class="panel-heading"> - Organization Options - </div> - - <div class="panel-body"> - <form action="/org/{{.Org.Name}}/settings" method="post" class="form-horizontal"> - {{.CsrfTokenHtml}} - <input type="hidden" name="action" value="update"> - - <div class="form-group{{if .Err_DisplayName}} has-error has-feedback{{end}}"> - <label class="col-md-3 text-right" for="org-setting-name">Display Name</label> - <div class="col-md-9"> - <input class="form-control" name="display_name" value="{{.Org.FullName}}" title="" id="org-setting-name"/> - </div> - </div> - - <div class="form-group{{if .Err_Email}} has-error has-feedback{{end}}"> - <label class="col-md-3 text-right" for="org-email">Email</label> - <div class="col-md-9"> - <input class="form-control" name="email" value="{{.Org.Email}}" title="" id="org-email" type="email"/> - </div> - </div> - - <div class="form-group{{if .Err_Description}} has-error has-feedback{{end}}"> - <label class="col-md-3 text-right" for="org-desc">Description</label> - <div class="col-md-9"> - <textarea class="form-control" name="desc" id="org-desc" rows="3">{{.Org.Description}}</textarea> - </div> - </div> - - <div class="form-group{{if .Err_Website}} has-error has-feedback{{end}}"> - <label class="col-md-3 text-right" for="org-site">Official Site</label> - <div class="col-md-9"> - <input type="url" class="form-control" name="site" value="{{.Org.Website}}" id="org-site"/> - </div> - </div> - - <div class="form-group{{if .Err_Location}} has-error has-feedback{{end}}"> - <label class="col-md-3 text-right" for="org-location">Location</label> - <div class="col-md-9"> - <input class="form-control" name="location" value="{{.Org.Location}}" title="" id="org-location"/> - </div> - </div> - - <div class="form-group"> - <div class="col-md-9 col-md-offset-3"> - <button class="btn btn-primary" type="submit">Save Options</button> - </div> - </div> - </form> - </div> - </div> - - <div class="panel panel-warning"> - <div class="panel-heading"> - Danger Zone - </div> - <div class="panel-body"> - <button type="button" class="btn btn-default pull-right" href="#delete-org-modal" data-toggle="modal"> - Delete this organization - </button> - <dd> - <dt>Delete this organization</dt> - <dl>Once you delete this organization and all repositories in, there is no going back. Please be - certain. - </dl> - </dd> - - <div class="modal fade" id="delete-org-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" - aria-hidden="true"> - <div class="modal-dialog"> - <form action="/org/{{.Org.Name}}/settings/delete" method="post" - class="modal-content"> - {{.CsrfTokenHtml}} - <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" - aria-hidden="true">×</button> - <h4 class="modal-title" id="myModalLabel">Delete organization</h4> - </div> - - <div class="modal-body"> - <div class="form-group"> - <label>Make sure your are owner of this organization. Please enter your password.<strong class="text-danger">*</strong></label> - <input name="password" class="form-control" type="password" placeholder="Type your account password" required="required"> - </div> - </div> - - <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> - <button class="btn btn-danger btn-lg">I understand the consequences, delete this - organization - </button> - </div> - </form> - </div> - </div> - </div> - </div> - </div> -</div> -{{template "base/footer" .}} diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl index c19c177e83..d0789b96d6 100644 --- a/templates/user/dashboard/dashboard.tmpl +++ b/templates/user/dashboard/dashboard.tmpl @@ -30,7 +30,7 @@ {{ $push := ActionContent2Commits .}} {{ $repoLink := .GetRepoLink}} {{range $push.Commits}} - <li><img src="{{AvatarLink .AuthorEmail}}?s=16"> <a href="/{{$repoLink}}/commit/{{.Sha1}}">{{ShortSha .Sha1}}</a> {{.Message}}</li> + <li><img class="avatar-16" src="{{AvatarLink .AuthorEmail}}?s=16"> <a href="/{{$repoLink}}/commit/{{.Sha1}}">{{ShortSha .Sha1}}</a> {{.Message}}</li> {{end}} </ul> </div> |