From 88291745747ffb200b55ca62e1054d1d2c4315d3 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Fri, 29 Aug 2014 15:32:52 +0800 Subject: Finish new admin users pages --- templates/.VERSION | 2 +- templates/admin/dashboard.tmpl | 2 +- templates/admin/user/edit.tmpl | 180 ++++++++++++++--------------------- templates/admin/user/list.tmpl | 62 ++++++++++++ templates/admin/user/new.tmpl | 140 ++++++++++----------------- templates/admin/users.tmpl | 49 ---------- templates/ng/base/head.tmpl | 13 ++- templates/org/edit_team.tmpl | 75 --------------- templates/org/team.tmpl | 106 --------------------- templates/user/auth/signup.tmpl | 2 +- templates/user/settings/profile.tmpl | 2 +- 11 files changed, 202 insertions(+), 431 deletions(-) create mode 100644 templates/admin/user/list.tmpl delete mode 100644 templates/admin/users.tmpl delete mode 100644 templates/org/edit_team.tmpl delete mode 100644 templates/org/team.tmpl (limited to 'templates') diff --git a/templates/.VERSION b/templates/.VERSION index f7f2473b..102c7429 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.4.7.0827 Alpha \ No newline at end of file +0.4.7.0829 Alpha \ No newline at end of file diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl index 81c262e2..09e10582 100644 --- a/templates/admin/dashboard.tmpl +++ b/templates/admin/dashboard.tmpl @@ -22,7 +22,7 @@
{{.i18n.Tr "admin.dashboard.operations"}}
-
+
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index 5975832f..e8812670 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -1,110 +1,78 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -
- {{template "admin/nav" .}} -
-
-
- Edit Account -
- -
-
-
- {{.CsrfTokenHtml}} - {{template "base/alert" .}} -
- -
- -
-
- -
- -
- -
-
- -
- - -
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
-
-
-
+
+
-{{template "base/footer" .}} +{{template "ng/base/footer" .}} diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl new file mode 100644 index 00000000..39e348fd --- /dev/null +++ b/templates/admin/user/list.tmpl @@ -0,0 +1,62 @@ +{{template "ng/base/head" .}} +{{template "ng/base/header" .}} +
+
+
+ {{template "admin/nav" .}} +
+
+ {{template "ng/base/alert" .}} +
+
+
+ {{.i18n.Tr "admin.users.user_manage_panel"}} +
+
+ {{.i18n.Tr "admin.users.new_account"}} +
+
+ + + + + + + + + + + + + + {{range .Users}} + + + + + + + + + + + {{end}} + +
Id{{.i18n.Tr "admin.users.name"}}{{.i18n.Tr "admin.users.email"}}{{.i18n.Tr "admin.users.activated"}}{{.i18n.Tr "admin.users.admin"}}{{.i18n.Tr "admin.users.repos"}}{{.i18n.Tr "admin.users.created"}}{{.i18n.Tr "admin.users.edit"}}
{{.Id}}{{.Name}}{{.Email}}{{.NumRepos}}{{DateFormat .Created "M d, Y"}}
+ {{if or .LastPageNum .NextPageNum}} +
    + {{if .LastPageNum}}
  • « Prev.
    • {{end}} + {{if .NextPageNum}}
  • » Next
    • {{end}} +
+ {{end}} +
+
+ +
+ + + + + + +{{template "ng/base/footer" .}} \ No newline at end of file diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl index 4f4866c4..19126ee0 100644 --- a/templates/admin/user/new.tmpl +++ b/templates/admin/user/new.tmpl @@ -1,94 +1,58 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -
- {{template "admin/nav" .}} -
-
-
- New Account -
- -
-
-
- {{.CsrfTokenHtml}} - {{template "base/alert" .}} -
- -
- -
-
- - - -
- -
- -
-
- -
- -
- -
-
- -
-
- -
- +{{template "ng/base/head" .}} +{{template "ng/base/header" .}} +
+
+
+ {{template "admin/nav" .}} +
+
+ {{template "ng/base/alert" .}} +
+
+
+ {{.i18n.Tr "admin.users.new_account"}}
-
- -
- -
- -
-
-
-
-
-
- + + {{.CsrfTokenHtml}} +
+ + +
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
- +
- -
+
- -{{template "base/footer" .}} \ No newline at end of file +{{template "ng/base/footer" .}} \ No newline at end of file diff --git a/templates/admin/users.tmpl b/templates/admin/users.tmpl deleted file mode 100644 index 0efe9092..00000000 --- a/templates/admin/users.tmpl +++ /dev/null @@ -1,49 +0,0 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -
- {{template "admin/nav" .}} -
-
-
- User Management -
- -
- New Account - - - - - - - - - - - - - - - {{range .Users}} - - - - - - - - - - - {{end}} - -
IdNameE-mailActivedAdminReposJoinEdit
{{.Id}}{{.Name}}{{.Email}}{{.NumRepos}}{{DateFormat .Created "M d, Y"}}
-
    - {{if .LastPageNum}}
  • « Prev.
    • {{end}} - {{if .NextPageNum}}
  • » Next
    • {{end}} -
-
-
-
-
-{{template "base/footer" .}} \ No newline at end of file diff --git a/templates/ng/base/head.tmpl b/templates/ng/base/head.tmpl index 817c1880..81545344 100644 --- a/templates/ng/base/head.tmpl +++ b/templates/ng/base/head.tmpl @@ -7,19 +7,26 @@ + {{if .Repository.IsGoget}}{{end}} + {{if CdnMode}} + + + + {{else}} + + + + {{end}} - - - diff --git a/templates/org/edit_team.tmpl b/templates/org/edit_team.tmpl deleted file mode 100644 index 4292575c..00000000 --- a/templates/org/edit_team.tmpl +++ /dev/null @@ -1,75 +0,0 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -
-
-
- - -
-

Organization Name

-
-
-
-
-
-
-
-

Edit team

-
- -
- - You'll use this name to mention this team in conversations. -
-
-
- -
- -
-
-
- -
-
- -

This team will be able to view and clone its repositories.

-
-
- -

This team will be able to read its repositories, as well as push to them.

-
-
- -

This team will be able to push/pull to its repositories, as well as add other collaborators to them.

-
-
-
-
-
- -
- - -
-
-
-
-
-{{template "base/footer" .}} diff --git a/templates/org/team.tmpl b/templates/org/team.tmpl deleted file mode 100644 index aab42f3e..00000000 --- a/templates/org/team.tmpl +++ /dev/null @@ -1,106 +0,0 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -
-
-
- - -
-

Organization Name

-
-
-
-
-
-
-
-
-

Team name

-

team description

-
-
-
- 1 -
Member -
-
- 1 -
Repository -
-
-
-
- - - - - - - - - -
-
-

This team grants Push, Read & Clone access: members can read from and push to the team's repositories.

-
-
-
-
-
- Members - Repositories -
-
-
- -
-
    -
    - -
    -
    -
    -
      -
    - -
    -
    - fuxiaohei傅小黑 -
    - Remove -
    -
    - -
    -
    -
    - Members - Repositories -
    -
    -
    - -
    -
      -
      - -
      -
      -
      -
      - repo-name - Remove -
      -
      -
      -
      -
      -
      -{{template "base/footer" .}} diff --git a/templates/user/auth/signup.tmpl b/templates/user/auth/signup.tmpl index b4736a07..d116ad62 100644 --- a/templates/user/auth/signup.tmpl +++ b/templates/user/auth/signup.tmpl @@ -16,7 +16,7 @@
      - +
      diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl index 33e6a944..3fff0748 100644 --- a/templates/user/settings/profile.tmpl +++ b/templates/user/settings/profile.tmpl @@ -39,7 +39,7 @@
      - +
      -- cgit v1.2.3