13
3
Fork 0
Wiki Issues 89 resources competences Projects 8 Code Pull Requests Releases Activity
Browse Source

Cleaner ui for admin, repo settings, and user settings page (#1269) (#1270)

tags/v1.2.0-rc1
Patrick G 8 years ago committed by Kim "BKC" Carlbäcker
parent
03d79983ee
commit
efbb895ebe
37 changed files with 2075 additions and 2187 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      public/css/index.css
  2. 9
      public/less/_base.less
  3. 6
      templates/admin/auth/edit.tmpl
  4. 6
      templates/admin/auth/list.tmpl
  5. 6
      templates/admin/auth/new.tmpl
  6. 6
      templates/admin/config.tmpl
  7. 6
      templates/admin/dashboard.tmpl
  8. 6
      templates/admin/monitor.tmpl
  9. 5
      templates/admin/navbar.tmpl
  10. 6
      templates/admin/notice.tmpl
  11. 6
      templates/admin/org/list.tmpl
  12. 6
      templates/admin/repo/list.tmpl
  13. 6
      templates/admin/user/edit.tmpl
  14. 6
      templates/admin/user/list.tmpl
  15. 6
      templates/admin/user/new.tmpl
  16. 2
      templates/repo/header.tmpl
  17. 6
      templates/repo/settings/branches.tmpl
  18. 6
      templates/repo/settings/collaboration.tmpl
  19. 6
      templates/repo/settings/deploy_keys.tmpl
  20. 6
      templates/repo/settings/githook_edit.tmpl
  21. 6
      templates/repo/settings/githooks.tmpl
  22. 10
      templates/repo/settings/hook_list.tmpl
  23. 6
      templates/repo/settings/hook_new.tmpl
  24. 4
      templates/repo/settings/hooks.tmpl
  25. 5
      templates/repo/settings/navbar.tmpl
  26. 6
      templates/repo/settings/options.tmpl
  27. 6
      templates/user/settings/account_link.tmpl
  28. 6
      templates/user/settings/applications.tmpl
  29. 6
      templates/user/settings/avatar.tmpl
  30. 6
      templates/user/settings/delete.tmpl
  31. 6
      templates/user/settings/email.tmpl
  32. 5
      templates/user/settings/navbar.tmpl
  33. 6
      templates/user/settings/password.tmpl
  34. 6
      templates/user/settings/profile.tmpl
  35. 6
      templates/user/settings/sshkeys.tmpl
  36. 6
      templates/user/settings/twofa.tmpl
  37. 6
      templates/user/settings/twofa_enroll.tmpl

8
public/css/index.css
Unescape View File

@ -420,6 +420,14 @@ footer .ui.language .menu {
background: inherit !important;
padding: 0 !important;
}
.ui.menu.new-menu {
justify-content: center !important;
padding-top: 15px !important;
margin-top: -15px !important;
margin-bottom: 15px !important;
background-color: #FAFAFA !important;
border-width: 1px !important;
}
.markdown:not(code) {
overflow: hidden;
font-family: "Helvetica Neue", Helvetica, "Segoe UI", Arial, freesans, sans-serif;

9
public/less/_base.less
Unescape View File

@ -411,3 +411,12 @@ footer {
background: inherit !important;
padding: 0 !important;
}
.ui.menu.new-menu {
justify-content: center !important;
padding-top: 15px !important;
margin-top: -15px !important;
margin-bottom: 15px !important;
background-color: #FAFAFA !important;
border-width: 1px !important;
}

6
templates/admin/auth/edit.tmpl
Unescape View File

@ -1,9 +1,7 @@
{{template "base/head" .}}
<div class="admin edit authentication">
<div class="ui container">
<div class="ui grid">
{{template "admin/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "admin.auths.edit"}}
@ -194,8 +192,6 @@
</form>
</div>
</div>
</div>
</div>
</div>
<div class="ui small basic delete modal">

6
templates/admin/auth/list.tmpl
Unescape View File

@ -1,9 +1,7 @@
{{template "base/head" .}}
<div class="admin authentication">
<div class="ui container">
<div class="ui grid">
{{template "admin/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "admin.auths.auth_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
@ -40,7 +38,5 @@
</table>
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

6
templates/admin/auth/new.tmpl
Unescape View File

@ -1,9 +1,7 @@
{{template "base/head" .}}
<div class="admin new authentication">
<div class="ui container">
<div class="ui grid">
{{template "admin/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "admin.auths.new"}}
@ -199,7 +197,5 @@
<p>{{.i18n.Tr "admin.auths.tip.github"}}</p>
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

6
templates/admin/config.tmpl
Unescape View File

@ -1,9 +1,7 @@
{{template "base/head" .}}
<div class="admin config">
<div class="ui container">
<div class="ui grid">
{{template "admin/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "admin.config.server_config"}}
@ -275,7 +273,5 @@
</dl>
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

6
templates/admin/dashboard.tmpl
Unescape View File

@ -1,9 +1,7 @@
{{template "base/head" .}}
<div class="admin dashboard">
<div class="ui container">
<div class="ui grid">
{{template "admin/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "admin.dashboard.statistic"}}
@ -119,7 +117,5 @@
</dl>
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

6
templates/admin/monitor.tmpl
Unescape View File

@ -1,9 +1,7 @@
{{template "base/head" .}}
<div class="admin monitor">
<div class="ui container">
<div class="ui grid">
{{template "admin/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "admin.monitor.cron"}}
@ -59,7 +57,5 @@
</table>
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

5
templates/admin/navbar.tmpl
Unescape View File

@ -1,6 +1,4 @@
<div class="four wide column">
<div class="ui vertical menu">
<div class="header item">{{.i18n.Tr "admin_panel"}}</div>
<div class="ui secondary pointing tabular top attached borderless menu stackable new-menu navbar">
<a class="{{if .PageIsAdminDashboard}}active{{end}} item" href="{{AppSubUrl}}/admin">
{{.i18n.Tr "admin.dashboard"}}
</a>
@ -25,5 +23,4 @@
<a class="{{if .PageIsAdminMonitor}}active{{end}} item" href="{{AppSubUrl}}/admin/monitor">
{{.i18n.Tr "admin.monitor"}}
</a>
</div>
</div>

6
templates/admin/notice.tmpl
Unescape View File

@ -1,9 +1,7 @@
{{template "base/head" .}}
<div class="admin notice">
<div class="ui container">
<div class="ui grid">
{{template "admin/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "admin.notices.system_notice_list"}} ({{.i18n.Tr "admin.total" .Total}})
@ -90,8 +88,6 @@
{{end}}
{{end}}
</div>
</div>
</div>
</div>
<div class="ui modal" id="detail-modal">

6
templates/admin/org/list.tmpl
Unescape View File

@ -1,9 +1,7 @@
{{template "base/head" .}}
<div class="admin user">
<div class="ui container">
<div class="ui grid">
{{template "admin/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "admin.orgs.org_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
@ -42,7 +40,5 @@
{{template "base/paginate" .}}
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

6
templates/admin/repo/list.tmpl
Unescape View File

@ -1,9 +1,7 @@
{{template "base/head" .}}
<div class="admin user">
<div class="ui container">
<div class="ui grid">
{{template "admin/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "admin.repos.repo_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
@ -46,8 +44,6 @@
{{template "base/paginate" .}}
</div>
</div>
</div>
</div>
<div class="ui small basic delete modal">

6
templates/admin/user/edit.tmpl
Unescape View File

@ -1,9 +1,7 @@
{{template "base/head" .}}
<div class="admin edit user">
<div class="ui container">
<div class="ui grid">
{{template "admin/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "admin.users.edit_account"}}
@ -115,8 +113,6 @@
</form>
</div>
</div>
</div>
</div>
</div>
<div class="ui small basic delete modal">

6
templates/admin/user/list.tmpl
Unescape View File

@ -1,9 +1,7 @@
{{template "base/head" .}}
<div class="admin user">
<div class="ui container">
<div class="ui grid">
{{template "admin/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "admin.users.user_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
@ -53,7 +51,5 @@
{{template "base/paginate" .}}
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

6
templates/admin/user/new.tmpl
Unescape View File

@ -1,9 +1,7 @@
{{template "base/head" .}}
<div class="admin new user">
<div class="ui container">
<div class="ui grid">
{{template "admin/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "admin.users.new_account"}}
@ -60,7 +58,5 @@
</form>
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

2
templates/repo/header.tmpl
Unescape View File

@ -48,7 +48,7 @@
{{end}}
{{if not (or .IsBareRepo .IsDiffCompare)}}
<div class="ui tabs container">
<div class="ui tabular menu navbar">
<div class="ui tabular stackable menu navbar">
{{if .Repository.EnableUnit $.UnitTypeCode}}
<a class="{{if .PageIsViewCode}}active{{end}} item" href="{{.RepoLink}}">
<i class="octicon octicon-code"></i> {{.i18n.Tr "repo.code"}}

6
templates/repo/settings/branches.tmpl
Unescape View File

@ -1,10 +1,8 @@
{{template "base/head" .}}
<div class="repository settings edit">
{{template "repo/header" .}}
<div class="ui container">
<div class="ui grid">
{{template "repo/settings/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "repo.default_branch"}}
@ -83,7 +81,5 @@
</div>
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

6
templates/repo/settings/collaboration.tmpl
Unescape View File

@ -1,10 +1,8 @@
{{template "base/head" .}}
<div class="repository settings collaboration">
{{template "repo/header" .}}
<div class="ui container">
<div class="ui grid">
{{template "repo/settings/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "repo.settings.collaboration"}}
@ -53,8 +51,6 @@
</form>
</div>
</div>
</div>
</div>
</div>
<div class="ui small basic delete modal">

6
templates/repo/settings/deploy_keys.tmpl
Unescape View File

@ -1,10 +1,8 @@
{{template "base/head" .}}
<div class="repository settings">
{{template "repo/header" .}}
<div class="ui container">
<div class="ui grid">
{{template "repo/settings/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "repo.settings.deploy_keys"}}
@ -70,8 +68,6 @@
</div>
</div>
</div>
</div>
</div>
</div>
<div class="ui small basic delete modal">

6
templates/repo/settings/githook_edit.tmpl
Unescape View File

@ -1,10 +1,8 @@
{{template "base/head" .}}
<div class="repository settings edit githook">
{{template "repo/header" .}}
<div class="ui container">
<div class="ui grid">
{{template "repo/settings/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "repo.settings.githooks"}}
@ -30,7 +28,5 @@
</form>
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

6
templates/repo/settings/githooks.tmpl
Unescape View File

@ -1,10 +1,8 @@
{{template "base/head" .}}
<div class="repository settings githooks">
{{template "repo/header" .}}
<div class="ui container">
<div class="ui grid">
{{template "repo/settings/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "repo.settings.githooks"}}
@ -24,7 +22,5 @@
</div>
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

10
templates/repo/settings/hook_list.tmpl
Unescape View File

@ -1,6 +1,5 @@
<div class="twelve wide column content">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "repo.settings.hooks"}}
<div class="ui right">
<div class="ui floating1 jump dropdown">
@ -15,8 +14,8 @@
</div>
</div>
</div>
</h4>
<div class="ui attached table segment">
</h4>
<div class="ui attached table segment">
<div class="ui hook list">
<div class="item">
{{.Description | Str2html}}
@ -38,7 +37,6 @@
</div>
{{end}}
</div>
</div>
</div>
{{template "repo/settings/hook_delete_modal" .}}

6
templates/repo/settings/hook_new.tmpl
Unescape View File

@ -1,10 +1,8 @@
{{template "base/head" .}}
<div class="repository settings new webhook">
{{template "repo/header" .}}
<div class="ui container">
<div class="ui grid">
{{template "repo/settings/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}}
@ -23,7 +21,5 @@
{{template "repo/settings/hook_history" .}}
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

4
templates/repo/settings/hooks.tmpl
Unescape View File

@ -1,11 +1,9 @@
{{template "base/head" .}}
<div class="repository settings webhooks">
{{template "repo/header" .}}
<div class="ui container">
<div class="ui grid">
{{template "repo/settings/navbar" .}}
<div class="ui container">
{{template "repo/settings/hook_list" .}}
</div>
</div>
</div>
{{template "base/footer" .}}

5
templates/repo/settings/navbar.tmpl
Unescape View File

@ -1,6 +1,4 @@
<div class="four wide column">
<div class="ui vertical menu">
<div class="header item">{{.i18n.Tr "repo.settings"}}</div>
<div class="ui secondary pointing tabular top attached borderless menu stackable new-menu navbar">
<a class="{{if .PageIsSettingsOptions}}active{{end}} item" href="{{.RepoLink}}/settings">
{{.i18n.Tr "repo.settings.options"}}
</a>
@ -23,5 +21,4 @@
<a class="{{if .PageIsSettingsKeys}}active{{end}} item" href="{{.RepoLink}}/settings/keys">
{{.i18n.Tr "repo.settings.deploy_keys"}}
</a>
</div>
</div>

6
templates/repo/settings/options.tmpl
Unescape View File

@ -1,10 +1,8 @@
{{template "base/head" .}}
<div class="repository settings options">
{{template "repo/header" .}}
<div class="ui container">
<div class="ui grid">
{{template "repo/settings/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "repo.settings.basic_settings"}}
@ -250,8 +248,6 @@
</div>
{{end}}
</div>
</div>
</div>
</div>
{{if .IsRepositoryOwner}}

6
templates/user/settings/account_link.tmpl
Unescape View File

@ -1,9 +1,7 @@
{{template "base/head" .}}
<div class="user settings account_link">
<div class="ui container">
<div class="ui grid">
{{template "user/settings/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "settings.manage_account_links"}}
@ -31,8 +29,6 @@
</div>
</div>
</div>
</div>
</div>
</div>
<div class="ui small basic delete modal">

6
templates/user/settings/applications.tmpl
Unescape View File

@ -1,9 +1,7 @@
{{template "base/head" .}}
<div class="user settings">
<div class="ui container">
<div class="ui grid">
{{template "user/settings/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "settings.manage_access_token"}}
@ -59,8 +57,6 @@
</div>
</div>
</div>
</div>
</div>
</div>
<div class="ui small basic delete modal">

6
templates/user/settings/avatar.tmpl
Unescape View File

@ -1,9 +1,7 @@
{{template "base/head" .}}
<div class="user settings avatar">
<div class="ui container">
<div class="ui grid">
{{template "user/settings/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "settings.avatar"}}
@ -44,7 +42,5 @@
</form>
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

6
templates/user/settings/delete.tmpl
Unescape View File

@ -1,9 +1,7 @@
{{template "base/head" .}}
<div class="user settings delete">
<div class="ui container">
<div class="ui grid">
{{template "user/settings/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached warning header">
{{.i18n.Tr "settings.delete_account"}}
@ -28,8 +26,6 @@
</form>
</div>
</div>
</div>
</div>
</div>
<div class="ui small basic delete modal">

6
templates/user/settings/email.tmpl
Unescape View File

@ -1,9 +1,7 @@
{{template "base/head" .}}
<div class="user settings emails">
<div class="ui container">
<div class="ui grid">
{{template "user/settings/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "settings.manage_emails"}}
@ -53,8 +51,6 @@
</form>
</div>
</div>
</div>
</div>
</div>
<div class="ui small basic delete modal">

5
templates/user/settings/navbar.tmpl
Unescape View File

@ -1,6 +1,4 @@
<div class="four wide column">
<div class="ui vertical menu">
<div class="header item">{{.i18n.Tr "settings"}}</div>
<div class="ui secondary pointing tabular top attached borderless menu stackable new-menu navbar">
<a class="{{if .PageIsSettingsProfile}}active{{end}} item" href="{{AppSubUrl}}/user/settings">
{{.i18n.Tr "settings.profile"}}
</a>
@ -28,5 +26,4 @@
<a class="{{if .PageIsSettingsDelete}}active{{end}} item" href="{{AppSubUrl}}/user/settings/delete">
{{.i18n.Tr "settings.delete"}}
</a>
</div>
</div>

6
templates/user/settings/password.tmpl
Unescape View File

@ -1,9 +1,7 @@
{{template "base/head" .}}
<div class="user settings password">
<div class="ui container">
<div class="ui grid">
{{template "user/settings/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "settings.change_password"}}
@ -39,7 +37,5 @@
{{end}}
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

6
templates/user/settings/profile.tmpl
Unescape View File

@ -1,9 +1,7 @@
{{template "base/head" .}}
<div class="user settings profile">
<div class="ui container">
<div class="ui grid">
{{template "user/settings/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "settings.public_profile"}}
@ -49,7 +47,5 @@
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

6
templates/user/settings/sshkeys.tmpl
Unescape View File

@ -1,9 +1,7 @@
{{template "base/head" .}}
<div class="user settings sshkeys">
<div class="ui container">
<div class="ui grid">
{{template "user/settings/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "settings.manage_ssh_keys"}}
@ -66,8 +64,6 @@
</div>
</div>
</div>
</div>
</div>
</div>
<div class="ui small basic delete modal">

6
templates/user/settings/twofa.tmpl
Unescape View File

@ -1,9 +1,7 @@
{{template "base/head" .}}
<div class="user settings delete">
<div class="ui container">
<div class="ui grid">
{{template "user/settings/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "settings.twofa"}}
@ -30,8 +28,6 @@
{{end}}
</div>
</div>
</div>
</div>
</div>
<div class="ui small basic delete modal">

6
templates/user/settings/twofa_enroll.tmpl
Unescape View File

@ -1,9 +1,7 @@
{{template "base/head" .}}
<div class="user settings delete">
<div class="ui container">
<div class="ui grid">
{{template "user/settings/navbar" .}}
<div class="twelve wide column content">
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "settings.twofa_enroll"}}
@ -26,8 +24,6 @@
</form>
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

Write Preview
Loading…
Cancel
Save