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/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 +++++++++++------------- 18 files changed, 476 insertions(+), 483 deletions(-) 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/user') 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 @@ +
+

{{.i18n.Tr "settings"}}

+
+ +
+
\ 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