From 8dd07c0ddd99ae626a1ec8c06f75f27fed51269f Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sat, 26 Jul 2014 00:24:27 -0400 Subject: New UI merge in progress --- templates/.VERSION | 1 + templates/VERSION | 1 - templates/home.tmpl | 95 +++++++++++++----- templates/ng/base/alert.tmpl | 2 + templates/ng/base/footer.tmpl | 27 ++++++ templates/ng/base/head.tmpl | 30 ++++++ templates/ng/base/header.tmpl | 58 +++++++++++ templates/ng/base/social.tmpl | 4 + templates/repo/bare.tmpl | 50 ++++++++++ templates/repo/create.tmpl | 166 ++++++++++++++------------------ templates/repo/home.tmpl | 161 +++++++++++++++++++++++++++++++ templates/repo/view_file.tmpl | 29 ++++++ templates/repo/view_list.tmpl | 46 +++++++++ templates/status/401.tmpl | 4 +- templates/status/403.tmpl | 6 +- templates/status/404.tmpl | 9 +- templates/status/500.tmpl | 12 +-- templates/user/dashboard.tmpl | 102 -------------------- templates/user/dashboard/dashboard.tmpl | 142 +++++++++++++++++++++++++++ templates/user/dashboard/nav.tmpl | 46 +++++++++ templates/user/delete.tmpl | 45 --------- templates/user/notification.tmpl | 9 -- templates/user/password.tmpl | 49 ---------- templates/user/publickey.tmpl | 65 ------------- templates/user/security.tmpl | 9 -- templates/user/setting.tmpl | 69 ------------- templates/user/setting_nav.tmpl | 11 --- templates/user/settings/delete.tmpl | 28 ++++++ templates/user/settings/nav.tmpl | 12 +++ templates/user/settings/password.tmpl | 37 +++++++ templates/user/settings/profile.tmpl | 50 ++++++++++ templates/user/settings/social.tmpl | 18 ++++ templates/user/settings/sshkeys.tmpl | 61 ++++++++++++ templates/user/signin.tmpl | 98 +++++++------------ templates/user/signup.tmpl | 108 ++++++++++----------- 35 files changed, 1041 insertions(+), 619 deletions(-) create mode 100644 templates/.VERSION delete mode 100644 templates/VERSION create mode 100644 templates/ng/base/alert.tmpl create mode 100644 templates/ng/base/footer.tmpl create mode 100644 templates/ng/base/head.tmpl create mode 100644 templates/ng/base/header.tmpl create mode 100644 templates/ng/base/social.tmpl create mode 100644 templates/repo/bare.tmpl create mode 100644 templates/repo/home.tmpl create mode 100644 templates/repo/view_file.tmpl create mode 100644 templates/repo/view_list.tmpl delete mode 100644 templates/user/dashboard.tmpl create mode 100644 templates/user/dashboard/dashboard.tmpl create mode 100644 templates/user/dashboard/nav.tmpl delete mode 100644 templates/user/delete.tmpl delete mode 100644 templates/user/notification.tmpl delete mode 100644 templates/user/password.tmpl delete mode 100644 templates/user/publickey.tmpl delete mode 100644 templates/user/security.tmpl delete mode 100644 templates/user/setting.tmpl delete mode 100644 templates/user/setting_nav.tmpl create mode 100644 templates/user/settings/delete.tmpl create mode 100644 templates/user/settings/nav.tmpl create mode 100644 templates/user/settings/password.tmpl create mode 100644 templates/user/settings/profile.tmpl create mode 100644 templates/user/settings/social.tmpl create mode 100644 templates/user/settings/sshkeys.tmpl (limited to 'templates') diff --git a/templates/.VERSION b/templates/.VERSION new file mode 100644 index 0000000000..036f90911f --- /dev/null +++ b/templates/.VERSION @@ -0,0 +1 @@ +0.4.7.0725 Alpha \ No newline at end of file diff --git a/templates/VERSION b/templates/VERSION deleted file mode 100644 index 7b53a20867..0000000000 --- a/templates/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.4.5.0712 Alpha \ No newline at end of file diff --git a/templates/home.tmpl b/templates/home.tmpl index 8288d21e15..249bce314d 100644 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -1,27 +1,72 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -
- {{if not .Repos}} -

Hey there, welcome to the land of Gogs!

-

If you just got your Gogs server running, go to the install guide page, which will guide you through your initial setup.

- - {{else}} -

Hey there, welcome to the land of Gogs!

-
Here are some recent updated repositories:
-
-
    - {{range .Repos}} -
  • -
    {{.NumForks}}
    -

    - {{.Name}} -

    -

    {{.Description}}

    -
    Last updated {{.Updated|TimeSince}}
    -
    • - {{end}} -
+{{template "ng/base/head" .}} +{{template "ng/base/header" .}} +
+
+ +
+

Gogs

+

{{.i18n.Tr "app_desc"}}

+
+ {{.CsrfTokenHtml}} + + + + + +
+ +
 
- {{end}}
-{{template "base/footer" .}} +
+
+ {{if eq .Lang "zh-CN"}} +
+ + 易安装 +

您除了可以根据操作系统平台通过 二进制运行，还可以通过 Docker 或 Vagrant，以及 包管理 安装。

+
+
+ + 跨平台 +

任何 Go 语言 支持的平台都可以运行 Gogs，包括 Windows、Mac、Linux 以及 ARM。挑一个您喜欢的就行！

+
+
+ + 轻量级 +

一个廉价的树莓派的配置足以满足 Gogs 的最低系统硬件要求。最大程度上节省您的服务器资源！

+
+
+ + 开源化 +

所有的代码都开源在 GitHub 上，赶快加入我们来共同发展这个伟大的项目！还等什么？成为贡献者吧！

+
+ {{else}} +
+ + Easy to install +

Simply run the binary for your platform. Or ship Gogs with Docker or Vagrant, or get it packaged.

+
+
+ + Cross-platform +

Gogs runs anywhere Go can compile for: Windows, Mac OS X, Linux, ARM, etc. Choose the one you love!

+
+
+ + Lightweight +

Gogs has low minimal requirements and can run on an inexpensive Raspberry Pi. Save your machine energy!

+
+
+ + Open Source +

It's all on GitHub! Join us by contributing to make this project even better. Don't be shy to be a contributor!

+
+ {{end}} +
+
+{{template "ng/base/footer" .}} \ No newline at end of file diff --git a/templates/ng/base/alert.tmpl b/templates/ng/base/alert.tmpl new file mode 100644 index 0000000000..df14d3c3bf --- /dev/null +++ b/templates/ng/base/alert.tmpl @@ -0,0 +1,2 @@ +{{if .Flash.ErrorMsg}}{{.Flash.ErrorMsg}}{{end}} +{{if .Flash.SuccessMsg}}
{{.Flash.SuccessMsg}}
{{end}} \ No newline at end of file diff --git a/templates/ng/base/footer.tmpl b/templates/ng/base/footer.tmpl new file mode 100644 index 0000000000..734533a108 --- /dev/null +++ b/templates/ng/base/footer.tmpl @@ -0,0 +1,27 @@ +
+
+
+ + + +
+
+ + \ No newline at end of file diff --git a/templates/ng/base/head.tmpl b/templates/ng/base/head.tmpl new file mode 100644 index 0000000000..0cd7686ffb --- /dev/null +++ b/templates/ng/base/head.tmpl @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + {{if .Title}}{{.Title}} - {{end}}{{AppName}} + + +
+ \ No newline at end of file diff --git a/templates/ng/base/header.tmpl b/templates/ng/base/header.tmpl new file mode 100644 index 0000000000..ce1e170319 --- /dev/null +++ b/templates/ng/base/header.tmpl @@ -0,0 +1,58 @@ + \ No newline at end of file diff --git a/templates/ng/base/social.tmpl b/templates/ng/base/social.tmpl new file mode 100644 index 0000000000..153239f743 --- /dev/null +++ b/templates/ng/base/social.tmpl @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/templates/repo/bare.tmpl b/templates/repo/bare.tmpl new file mode 100644 index 0000000000..241fea8519 --- /dev/null +++ b/templates/repo/bare.tmpl @@ -0,0 +1,50 @@ +{{template "ng/base/head" .}} +{{template "ng/base/header" .}} +
+ +
+
+
+

Quick Start

+
+
+

Clone this repository

+ + + + +

Need help cloning? Visit Help!

+
+
+
+

Create a new repository on the command line

+ 
touch README.md
+git init
+git add README.md
+git commit -m "first commit"
+git remote add origin {{.CloneLink.SSH}}
+git push -u origin master
+
+
+
+
+

Push an existing repository from the command line

+ 
git remote add origin {{.CloneLink.SSH}}
+git push -u origin master
+
+
+
+
+
+
+
+{{template "ng/base/footer" .}} \ No newline at end of file diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index ed01d9772b..6ec713f664 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -1,105 +1,81 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -
-
+{{template "ng/base/head" .}} +{{template "ng/base/header" .}} +
+ {{.CsrfTokenHtml}} -

Create New Repository

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

{{.i18n.Tr "new_repo"}}

+
+ {{template "ng/base/alert" .}} +
+ + +
+ + user-avatar + {{.ContextUser.Name}} + +
- -
- -
- -
- - Great repository names are short and memorable. +
+ + + + {{.i18n.Tr "repo.repo_name_helper" | Str2html}}
-
- -
- -
-
- -
+

+ + + {{.i18n.Tr "repo.visiblity_helper" | Str2html}} +

+
+ +
-
- -
- -
- -
-
- -
- -
- + + {{range .Gitignores}} + + {{end}} -
-
Need more .gitignore? Go gitignore.io.
-
-
- -
- -
- + + {{range .Licenses}} + + {{end}} -
-
- -
-
-
- -
-
-
- -
-
- - Cancel -
+

+

+ + + {{.i18n.Tr "repo.init_readme"}} +

+

+ + + {{.i18n.Tr "cancel"}} +

-{{template "base/footer" .}} \ No newline at end of file +{{template "ng/base/footer" .}} \ No newline at end of file diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl new file mode 100644 index 0000000000..1958c40998 --- /dev/null +++ b/templates/repo/home.tmpl @@ -0,0 +1,161 @@ +{{template "ng/base/head" .}} +{{template "ng/base/header" .}} +
+ +
+
+

+ {{.Repository.DescriptionHtml}} + {{.Repository.Website}} +

+ + {{if .IsFile}} + {{template "repo/view_file" .}} + {{else}} + {{template "repo/view_list" .}} + {{end}} +
+ +
+
+{{template "ng/base/footer" .}} \ No newline at end of file diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl new file mode 100644 index 0000000000..be54419404 --- /dev/null +++ b/templates/repo/view_file.tmpl @@ -0,0 +1,29 @@ +
+

+ {{if .ReadmeExist}} + + {{if .ReadmeInHome}} + {{.FileName}} + {{else}} + {{.FileName}}{{FileSize .FileSize}} + {{end}} + {{else}} + + {{.FileName}}{{FileSize .FileSize}} + {{end}} +

+
+ {{if .ReadmeExist}} + {{.FileContent | Str2html}} + {{else if .FileSize}} + + + + + + + + 
{{.FileContent}}
+ {{end}} +
+
\ No newline at end of file diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl new file mode 100644 index 0000000000..26e7dd4597 --- /dev/null +++ b/templates/repo/view_list.tmpl @@ -0,0 +1,46 @@ + + + + + + + + {{if .HasParentPath}} + + + + + + + {{end}} + {{range $item := .Files}} + {{$entry := index $item 0}} + {{$commit := index $item 1}} + + + + + + + {{end}} + +
+ + + {{.LastCommit.Author.Name}}: + + + {{ShortSha .LastCommit.Id.String}} + {{.LastCommit.Summary}} + + {{TimeSince .LastCommit.Author.When .i18n.Lang}} +
..
+ + + {{$entry.Name}} + + {{$commit.Summary}} + {{TimeSince $commit.Committer.When $.i18n.Lang}}
+{{if .ReadmeExist}} + {{template "repo/view_file" .}} +{{end}} \ No newline at end of file diff --git a/templates/status/401.tmpl b/templates/status/401.tmpl index 98995381af..6e24302fef 100644 --- a/templates/status/401.tmpl +++ b/templates/status/401.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}} -{{template "base/navbar" .}} +{{template "base/header" .}}
- 401 Unauthorized + 401 Unauthorized: {{.ErrorMsg}}
{{template "base/footer" .}} \ No newline at end of file diff --git a/templates/status/403.tmpl b/templates/status/403.tmpl index 03a88479dd..f252146773 100644 --- a/templates/status/403.tmpl +++ b/templates/status/403.tmpl @@ -1,6 +1,6 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} +{{template "ng/base/head" .}} +{{template "ng/base/header" .}}
403 Forbidden
-{{template "base/footer" .}} \ No newline at end of file +{{template "ng/base/footer" .}} \ No newline at end of file diff --git a/templates/status/404.tmpl b/templates/status/404.tmpl index 6adb3d7163..7062fb122e 100644 --- a/templates/status/404.tmpl +++ b/templates/status/404.tmpl @@ -1,9 +1,10 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} +{{template "ng/base/head" .}} +{{template "ng/base/header" .}}
-

404

+

404

+

Application Version: {{AppVer}}

If you think this is an error, please open an issue on GitHub.

-{{template "base/footer" .}} +{{template "ng/base/footer" .}} diff --git a/templates/status/500.tmpl b/templates/status/500.tmpl index 07edd3620a..692525aa40 100644 --- a/templates/status/500.tmpl +++ b/templates/status/500.tmpl @@ -1,10 +1,10 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} +{{template "ng/base/head" .}} +{{template "ng/base/header" .}}
-

404

- {{if .ErrorMsg}}
-

An error is occurred : {{.ErrorMsg}}

{{end}} +

500

+
+ {{if .ErrorMsg}}

An error is occurred : {{.ErrorMsg}}

{{end}}

Application Version: {{AppVer}}

-{{template "base/footer" .}} \ No newline at end of file +{{template "ng/base/footer" .}} \ No newline at end of file diff --git a/templates/user/dashboard.tmpl b/templates/user/dashboard.tmpl deleted file mode 100644 index 2cb19cef16..0000000000 --- a/templates/user/dashboard.tmpl +++ /dev/null @@ -1,102 +0,0 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -
-
-
- - -
- -
-
- -
-
- -
- {{if .HasInfo}}
{{.InfoMsg}}
{{end}} -
-
    - {{range .Feeds}} -
  • - -
    {{TimeSince .Created}}
    {{ActionDesc . | str2html}}
    - -
    • - {{else}} -
  • Oh. Looks like there isn't any activity here yet. Get Busy!
    • - {{end}} -
-
-
-
-
{{if not .PageIsOrgDashboard}}Your {{end}}Repositories -
- -
- -
-
-
- -
- -
-
- - {{if not .PageIsOrgDashboard}} -
-
Collaborative Repositories
-
- -
-
- {{end}} -
-
-{{template "base/footer" .}} diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl new file mode 100644 index 0000000000..e9027230a5 --- /dev/null +++ b/templates/user/dashboard/dashboard.tmpl @@ -0,0 +1,142 @@ +{{template "ng/base/head" .}} +{{template "ng/base/header" .}} +{{template "user/dashboard/nav" .}} +
+
+
+ {{range .Feeds}} +
+
+ +
+
+

+ {{.GetActUserName}} + {{if eq .GetOpType 1}} + {{$.i18n.Tr "action.create_repo" .GetRepoLink .GetRepoLink | Str2html}} + {{else if eq .GetOpType 5}} + {{$.i18n.Tr "action.commit_repo" .GetRepoLink .GetBranch .GetBranch .GetRepoLink .GetRepoLink | Str2html}} + {{else if eq .GetOpType 6}} + {{ $index := index .GetIssueInfos 0}} + {{$.i18n.Tr "action.create_issue" .GetRepoLink $index .GetRepoLink $index | Str2html}} + {{else if eq .GetOpType 10}} + {{ $index := index .GetIssueInfos 0}} + {{$.i18n.Tr "action.comment_issue" .GetRepoLink $index .GetRepoLink $index | Str2html}} + {{end}} +

+ {{if eq .GetOpType 5}} +
+
    + {{ $push := ActionContent2Commits .}} + {{ $repoLink := .GetRepoLink}} + {{range $push.Commits}} +
  • {{ShortSha .Sha1}} {{.Message}}
    • + {{end}} +
+
+ {{else if eq .GetOpType 6}} +

{{index .GetIssueInfos 1}}

+ {{else if eq .GetOpType 10}} +

{{index .GetIssueInfos 1}}

+ {{end}} +

{{TimeSince .GetCreate $.i18n.Lang}}

+
+ +
+ {{end}} +
+
+ +
+
+

{{.i18n.Tr "home.my_repos"}} + {{.ContextUser.NumRepos}} +

+   +
+
+ +
+
+

{{.i18n.Tr "home.collaborative_repos"}}

+
+
+ +
+
+
+
+

{{.i18n.Tr "home.my_orgs"}}

+
+
+
+
+

{{.i18n.Tr "home.my_mirrors"}}

+
+
+
+
+
+{{template "ng/base/footer" .}} \ No newline at end of file diff --git a/templates/user/dashboard/nav.tmpl b/templates/user/dashboard/nav.tmpl new file mode 100644 index 0000000000..6064f35692 --- /dev/null +++ b/templates/user/dashboard/nav.tmpl @@ -0,0 +1,46 @@ +
+ +
\ No newline at end of file diff --git a/templates/user/delete.tmpl b/templates/user/delete.tmpl deleted file mode 100644 index fe29173560..0000000000 --- a/templates/user/delete.tmpl +++ /dev/null @@ -1,45 +0,0 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -
- {{template "user/setting_nav" .}} -
- {{template "base/alert" .}} -
-
- Delete Account -
- -
- {{if not .Flash.ErrorMsg}}

The operation will delete your account permanently. Sorry to see you go, but we know you'll back soon.

{{end}} -
- -
-
-
-
- - -
-{{template "base/footer" .}} \ No newline at end of file diff --git a/templates/user/notification.tmpl b/templates/user/notification.tmpl deleted file mode 100644 index 7c2e8425d4..0000000000 --- a/templates/user/notification.tmpl +++ /dev/null @@ -1,9 +0,0 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -
- {{template "user/setting_nav" .}} -
-

Notification

-
-
-{{template "base/footer" .}} \ No newline at end of file diff --git a/templates/user/password.tmpl b/templates/user/password.tmpl deleted file mode 100644 index 955a744e4f..0000000000 --- a/templates/user/password.tmpl +++ /dev/null @@ -1,49 +0,0 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -
- {{template "user/setting_nav" .}} -
- {{template "base/alert" .}} -
-
- Password -
- -
-
-
- {{.CsrfTokenHtml}} -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
-
-    - Forgot your password? -
-
-
-
-
-
-
-
-{{template "base/footer" .}} \ No newline at end of file diff --git a/templates/user/publickey.tmpl b/templates/user/publickey.tmpl deleted file mode 100644 index 49b6b9caac..0000000000 --- a/templates/user/publickey.tmpl +++ /dev/null @@ -1,65 +0,0 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -
- {{template "user/setting_nav" .}} -
- {{template "base/alert" .}} -
-
- SSH Keys -
- -
-
-
    -
  • SSH Key's name
    • - {{range .Keys}} -
  • - {{.Name}} - ({{.Fingerprint}}) - -
    • - {{end}} -
  • - Add SSH Key -
    • -
- -

Need help? Check out the guide to generating SSH keys or troubleshoot common SSH Problems

-
-
-
-
-
-{{template "base/footer" .}} diff --git a/templates/user/security.tmpl b/templates/user/security.tmpl deleted file mode 100644 index 7de41ebd35..0000000000 --- a/templates/user/security.tmpl +++ /dev/null @@ -1,9 +0,0 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -
- {{template "user/setting_nav" .}} -
-

Security

-
-
-{{template "base/footer" .}} \ No newline at end of file diff --git a/templates/user/setting.tmpl b/templates/user/setting.tmpl deleted file mode 100644 index b197b0eb5f..0000000000 --- a/templates/user/setting.tmpl +++ /dev/null @@ -1,69 +0,0 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -
- {{template "user/setting_nav" .}} -
- {{template "base/alert" .}} -
-
- Account Profile -
- -
-
- {{.CsrfTokenHtml}} -

Your Email address is public and will be used for any account related notifications, and any web based operations made via the site.

-
- -
- - -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
-
- -
-
-
-
-
-
-
-{{template "base/footer" .}} diff --git a/templates/user/setting_nav.tmpl b/templates/user/setting_nav.tmpl deleted file mode 100644 index 7ee7982bdd..0000000000 --- a/templates/user/setting_nav.tmpl +++ /dev/null @@ -1,11 +0,0 @@ - \ No newline at end of file diff --git a/templates/user/settings/delete.tmpl b/templates/user/settings/delete.tmpl new file mode 100644 index 0000000000..9bfc287d8e --- /dev/null +++ b/templates/user/settings/delete.tmpl @@ -0,0 +1,28 @@ +{{template "ng/base/head" .}} +{{template "ng/base/header" .}} +
+
+ {{template "user/settings/nav" .}} +
+
+ {{template "ng/base/alert" .}} +
+
+

{{.i18n.Tr "settings.delete_account"}}

+
+ {{.i18n.Tr "settings.delete_prompt" | Str2html}} +
+ {{.CsrfTokenHtml}} +

+ + +

+
+
+
+
+
+
+
+
+{{template "ng/base/footer" .}} \ No newline at end of file diff --git a/templates/user/settings/nav.tmpl b/templates/user/settings/nav.tmpl new file mode 100644 index 0000000000..d6d20dee96 --- /dev/null +++ b/templates/user/settings/nav.tmpl @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/templates/user/settings/password.tmpl b/templates/user/settings/password.tmpl new file mode 100644 index 0000000000..44e087af4e --- /dev/null +++ b/templates/user/settings/password.tmpl @@ -0,0 +1,37 @@ +{{template "ng/base/head" .}} +{{template "ng/base/header" .}} +
+
+ {{template "user/settings/nav" .}} +
+
+ {{template "ng/base/alert" .}} +
+
+

{{.i18n.Tr "settings.change_password"}}

+
+ {{.CsrfTokenHtml}} +

+ + +

+

+ + +

+

+ + +

+

+ + +

+
+
+
+
+
+
+
+{{template "ng/base/footer" .}} \ No newline at end of file diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl new file mode 100644 index 0000000000..2d09975f4d --- /dev/null +++ b/templates/user/settings/profile.tmpl @@ -0,0 +1,50 @@ +{{template "ng/base/head" .}} +{{template "ng/base/header" .}} +
+
+ {{template "user/settings/nav" .}} +
+
+ {{template "ng/base/alert" .}} +
+
+

{{.i18n.Tr "settings.public_profile"}}

+
+ {{.CsrfTokenHtml}} +

{{.i18n.Tr "settings.profile_desc"}}

+

+ + +

+

+ + +

+

+ + +

+

+ + +

+

+ + +

+

+ + +

+

+ + +

+
+
+
+
+
+
+
+{{template "ng/base/footer" .}} \ No newline at end of file diff --git a/templates/user/settings/social.tmpl b/templates/user/settings/social.tmpl new file mode 100644 index 0000000000..7ff2ea237f --- /dev/null +++ b/templates/user/settings/social.tmpl @@ -0,0 +1,18 @@ +{{template "ng/base/head" .}} +{{template "ng/base/header" .}} +
+
+ {{template "user/settings/nav" .}} +
+
+ {{template "ng/base/alert" .}} +
+
+

{{.i18n.Tr "settings.manage_social"}}

+
+
+
+
+
+
+{{template "ng/base/footer" .}} \ No newline at end of file diff --git a/templates/user/settings/sshkeys.tmpl b/templates/user/settings/sshkeys.tmpl new file mode 100644 index 0000000000..43dfb66e26 --- /dev/null +++ b/templates/user/settings/sshkeys.tmpl @@ -0,0 +1,61 @@ +{{template "ng/base/head" .}} +{{template "ng/base/header" .}} +
+
+ {{template "user/settings/nav" .}} +
+
+ {{template "ng/base/alert" .}} +
+
+

+ + {{.i18n.Tr "settings.manage_ssh_keys"}} +

+
    +
  • {{.i18n.Tr "settings.ssh_desc"}}
    • + {{range .Keys}} +
  • + + +
    +

    {{.Name}}

    +

    {{.Fingerprint}}

    +

    {{$.i18n.Tr "settings.add_on"}} {{DateFormat .Created "M d, Y"}} — {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} {{DateFormat .Updated "M d, Y"}}{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}

    +
    +
    + {{$.CsrfTokenHtml}} + + + +
    +
    • + {{end}} +
+
+

{{.i18n.Tr "settings.ssh_helper" | Str2html}}

+
+
+ {{.CsrfTokenHtml}} +

{{.i18n.Tr "settings.add_new_key"}}

+
+

+ + +

+

+ + +

+

+ + +

+
+
+
+
+
+
+
+{{template "ng/base/footer" .}} \ No newline at end of file diff --git a/templates/user/signin.tmpl b/templates/user/signin.tmpl index 9a8aa1992d..91f56bd075 100644 --- a/templates/user/signin.tmpl +++ b/templates/user/signin.tmpl @@ -1,71 +1,39 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -
-
+{{template "ng/base/head" .}} +{{template "ng/base/header" .}} +
+ {{.CsrfTokenHtml}} - {{if .IsSocialLogin}} -

Social login: 2nd step associate account

- {{else}} -

Log in

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

{{.i18n.Tr "sign_in"}}

- - {{if not .IsSocialLogin}}
-
-
- -
-
-
{{end}} - -
-
- - {{if not .IsSocialLogin}}Forgot your password?{{end}} +
+ {{template "base/alert" .}} +

+ + +

+

+ + +

+

+ +     {{.i18n.Tr "auth.remember_me"}} +

+

+ +      + {{.i18n.Tr "auth.forget_password"}} +

+

+ + {{.i18n.Tr "auth.sign_up_now" | Str2html}} +

+
+
- - {{if not .IsSocialLogin}}
-
- Need an account? Sign up now. -
-
- - {{if .OauthEnabled}} -
-

or

- - {{if .OauthService.GitHub}}GitHub{{end}} - {{if .OauthService.Google}}Google{{end}} - {{if .OauthService.Twitter}}Twitter{{end}} - {{if not .OauthService.Tencent}}Tencent QQ{{end}} - {{if .OauthService.Weibo}}Weibo{{end}} -
- {{end}}{{end}}
-{{template "base/footer" .}} +{{template "ng/base/footer" .}} \ No newline at end of file diff --git a/templates/user/signup.tmpl b/templates/user/signup.tmpl index 209058c904..60490ceb89 100644 --- a/templates/user/signup.tmpl +++ b/templates/user/signup.tmpl @@ -1,60 +1,50 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -
-
- {{.CsrfTokenHtml}} - {{if .DisableRegistration}} - Sorry, registration has been disabled. Please contact the site administrator. - {{else}} - {{if .IsSocialLogin}} -

Social login: 2nd step complete information

- {{else}} -

Sign Up

- {{end}} - {{template "base/alert" .}} -
- -
- -
-
-
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
-
- -
-
- -
-
- {{if .IsSocialLogin}} - Already have an account? Bind now! - {{else}} - Already have an account? Sign in now! - {{end}} -
-
- {{end}} -
+{{template "ng/base/head" .}} +{{template "ng/base/header" .}} +
+
+ {{.CsrfTokenHtml}} +
+

{{.i18n.Tr "sign_up"}}

+
+
+ {{template "base/alert" .}} + {{if .DisableRegistration}} +

{{.i18n.Tr "auth.disable_register_prompt"}}

+ {{else}} +

+ + +

+

+ + +

+

+ + +

+

+ + +

+

+ + {{CreateCaptcha}} +

+

+ + +

+

+ + +

+

+ + {{.i18n.Tr "auth.register_hepler_msg"}} +

+ {{end}} +
+
-{{template "base/footer" .}} +{{template "ng/base/footer" .}} \ No newline at end of file -- cgit v1.2.3