From 52c8f691630548fe091d30bcfe8164545a05d3d5 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sun, 22 Nov 2015 01:32:09 -0500 Subject: fix #650 --- templates/org/team/members.tmpl | 81 ++++++++++----------- templates/org/team/new.tmpl | 132 +++++++++++++++++++---------------- templates/org/team/repositories.tmpl | 79 ++++++++++----------- templates/org/team/sidebar.tmpl | 67 ++++++++++-------- templates/org/team/teams.tmpl | 59 ++++++++-------- 5 files changed, 219 insertions(+), 199 deletions(-) (limited to 'templates/org/team') diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index 66f496eb..83b832e1 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -1,45 +1,46 @@ -{{template "ng/base/head" .}} -{{template "ng/base/header" .}} -{{template "org/base/header" .}} -
-
- {{template "ng/base/alert" .}} - {{template "org/team/sidebar" .}} -
-
-
-
- {{.i18n.Tr "org.teams.members"}} -
-
    - {{if .IsOrganizationOwner}} - +{{template "base/head" .}} +
    + {{template "org/header" .}} +
    + {{template "base/alert" .}} +
    + {{template "org/team/sidebar" .}} +
    +
    + {{.i18n.Tr "org.teams.members"}} +
    +
    + {{range .Team.Members}} +
    + {{if $.IsOrganizationOwner}} + {{$.i18n.Tr "org.members.remove"}} {{end}} - {{range .Team.Members}} -
  • - {{if $.IsOrganizationOwner}} - {{$.i18n.Tr "org.members.remove"}} - {{end}} - - {{.Name}} - {{.FullName}} ({{.Name}}) - -
  • - {{end}} -
+ + + {{.DisplayName}} + +
+ {{end}} +
+ {{if .IsOrganizationOwner}} +
+
+ {{.CsrfTokenHtml}} + +
+
+
+ +
+
+
+
+ +
+ {{end}}
-
+
-{{template "ng/base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} \ No newline at end of file diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl index 89afd84f..8d09e2ac 100644 --- a/templates/org/team/new.tmpl +++ b/templates/org/team/new.tmpl @@ -1,70 +1,82 @@ -{{template "ng/base/head" .}} -{{template "ng/base/header" .}} -{{template "org/base/header" .}} -
-
+{{template "base/head" .}} +
+ {{template "org/header" .}} +
+
+ {{.CsrfTokenHtml}} -
-

- {{if .PageIsOrgTeamsNew}}{{.i18n.Tr "org.create_new_team"}}{{else}}{{.i18n.Tr "org.teams.settings"}}{{end}} -

-
-
- {{template "ng/base/alert" .}} +

+ {{if .PageIsOrgTeamsNew}}{{.i18n.Tr "org.create_new_team"}}{{else}}{{.i18n.Tr "org.teams.settings"}}{{end}} +

+
+ {{template "base/alert" .}} +
+ + {{if eq .Team.LowerName "owners"}} + + {{end}} + + {{.i18n.Tr "org.team_name_helper"}} +
+
+ + + {{.i18n.Tr "org.team_desc_helper"}} +
+ {{if not (eq .Team.LowerName "owners")}} +
+ +
- - {{if eq .Team.LowerName "owners"}} - - {{end}} - - - {{.i18n.Tr "org.team_name_helper"}} +
+ + + {{.i18n.Tr "org.teams.read_access_helper"}} +
- - - - {{.i18n.Tr "org.team_desc_helper"}} +
+ + + {{.i18n.Tr "org.teams.write_access_helper"}} +
- {{if not (eq .Team.LowerName "owners")}}
-

{{.i18n.Tr "org.team_permission_desc"}}

- - {{.i18n.Tr "org.teams.read_access"}} - -

{{.i18n.Tr "org.teams.read_access_helper"}}

- - {{.i18n.Tr "org.teams.write_access"}} - -

{{.i18n.Tr "org.teams.write_access_helper"}}

- - {{.i18n.Tr "org.teams.admin_access"}} - -

{{.i18n.Tr "org.teams.admin_access_helper"}}

+
+ + + {{.i18n.Tr "org.teams.admin_access_helper"}} +
-
+
+
+ {{end}} + +
+ {{if .PageIsOrgTeamsNew}} + + {{.i18n.Tr "cancel"}} + {{else}} + + {{if not (eq .Team.LowerName "owners")}} + + {{end}} {{end}} -
- - {{if .PageIsOrgTeamsNew}} - - {{.i18n.Tr "cancel"}} - {{else}} - - {{if not (eq .Team.LowerName "owners")}} -       - -
-

{{.i18n.Tr "org.teams.delete_team_title"}}

-

{{.i18n.Tr "org.teams.delete_team_desc"}}

-
- - -
- {{end}} - {{end}} -
+
- + +
+
+
+ + -{{template "ng/base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} \ No newline at end of file diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index 33d4dea8..28126bef 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -1,45 +1,46 @@ -{{template "ng/base/head" .}} -{{template "ng/base/header" .}} -{{template "org/base/header" .}} -
-
- {{template "ng/base/alert" .}} - {{template "org/team/sidebar" .}} -
-
-
-
- {{.i18n.Tr "org.teams.repositories"}} -
+{{template "base/head" .}} +
+ {{template "org/header" .}} +
+ {{template "base/alert" .}} +
+ {{template "org/team/sidebar" .}} +
+
+ {{.i18n.Tr "org.teams.repositories"}} +
+
{{$canAddRemove := and $.IsOrganizationOwner (not (eq $.Team.LowerName "owners"))}} - -
+ + + {{$.Org.Name}}/{{.Name}} + +
+ {{end}} +
+ {{if $canAddRemove}} +
+
+ {{.CsrfTokenHtml}} +
+
+
+ +
+
+
+
+ +
+
+ {{end}}
-{{template "ng/base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} \ No newline at end of file diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl index d6d92519..5abf34be 100644 --- a/templates/org/team/sidebar.tmpl +++ b/templates/org/team/sidebar.tmpl @@ -1,34 +1,41 @@ -
-
- {{if .Team.IsMember $.SignedUser.Id}} - {{$.i18n.Tr "org.teams.leave"}} - {{else if .IsOrganizationOwner}} - {{$.i18n.Tr "org.teams.join"}} - {{end}} - {{.Team.Name}} +
+

+ {{.Team.Name}} +
+ {{if .Team.IsMember $.SignedUser.Id}} + {{$.i18n.Tr "org.teams.leave"}} + {{else if .IsOrganizationOwner}} + {{$.i18n.Tr "org.teams.join"}} + {{end}}
-
-

{{if .Team.Description}}{{.Team.Description}}{{else}}{{.i18n.Tr "org.teams.no_desc"}}{{end}}

-
- -

- {{if eq .Team.LowerName "owners"}} - {{.i18n.Tr "org.teams.owners_permission_desc" | Str2html}} - {{else if (eq .Team.Authorize 1)}} - {{.i18n.Tr "org.teams.read_permission_desc" | Str2html}} - {{else if (eq .Team.Authorize 2)}} - {{.i18n.Tr "org.teams.write_permission_desc" | Str2html}} - {{else if (eq .Team.Authorize 3)}} - {{.i18n.Tr "org.teams.admin_permission_desc" | Str2html}} - {{end}} -

+

+
+
+ {{if .Team.Description}} + {{.Team.Description}} + {{else}} + {{.i18n.Tr "org.teams.no_desc"}} + {{end}}
- {{if .IsOrganizationOwner}} - + {{if .IsOrganizationOwner}} + + {{end}}
\ No newline at end of file diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl index 30df3e40..2289af12 100644 --- a/templates/org/team/teams.tmpl +++ b/templates/org/team/teams.tmpl @@ -1,42 +1,41 @@ -{{template "ng/base/head" .}} -{{template "ng/base/header" .}} -{{template "org/base/header" .}} -
-
- {{template "ng/base/alert" .}} -
-
+{{template "base/head" .}} +
+ {{template "org/header" .}} +
+ {{template "base/alert" .}} {{if .IsOrganizationOwner}} - {{.i18n.Tr "org.create_new_team"}} + +
{{end}} -
-
- {{range .Teams}} -
-
-
- {{if .IsMember $.SignedUser.Id}} - {{$.i18n.Tr "org.teams.leave"}} - {{else if $.IsOrganizationOwner}} - {{$.i18n.Tr "org.teams.join"}} - {{end}} - {{.Name}} + +
+ {{range .Teams}} +
+
+ {{.Name}} +
+ {{if .IsMember $.SignedUser.Id}} + {{$.i18n.Tr "org.teams.leave"}} + {{else if $.IsOrganizationOwner}} + {{$.i18n.Tr "org.teams.join"}} + {{end}} +
- {{if .NumMembers}} -
+
{{range .Members}} - - + + {{end}}
- {{end}} - + {{end}}
- {{end}}
-{{template "ng/base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} \ No newline at end of file -- cgit v1.2.3