realaravinth/forgejo-federation
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Patrick G 2017-03-15 22:39:38 +00:00 committed by Kim "BKC" Carlbäcker
parent 03d79983ee
commit efbb895ebe
37 changed files with 2131 additions and 2243 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
public/css/index.css
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
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
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"}}
@ -195,8 +193,6 @@
</div>
</div>
</div>
</div>
</div>
<div class="ui small basic delete modal">
<div class="ui icon header">

6
templates/admin/auth/list.tmpl
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}})
@ -41,6 +39,4 @@
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

6
templates/admin/auth/new.tmpl
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"}}
@ -200,6 +198,4 @@
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

6
templates/admin/config.tmpl
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"}}
@ -276,6 +274,4 @@
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

6
templates/admin/dashboard.tmpl
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"}}
@ -120,6 +118,4 @@
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

6
templates/admin/monitor.tmpl
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"}}
@ -60,6 +58,4 @@
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

5
templates/admin/navbar.tmpl
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>
@ -26,4 +24,3 @@
{{.i18n.Tr "admin.monitor"}}
</a>
</div>
</div>

6
templates/admin/notice.tmpl
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}})
@ -91,8 +89,6 @@
{{end}}
</div>
</div>
</div>
</div>
<div class="ui modal" id="detail-modal">
<i class="close icon"></i>

6
templates/admin/org/list.tmpl
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}})
@ -43,6 +41,4 @@
{{template "base/paginate" .}}
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

6
templates/admin/repo/list.tmpl
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}})
@ -47,8 +45,6 @@
{{template "base/paginate" .}}
</div>
</div>
</div>
</div>
<div class="ui small basic delete modal">
<div class="ui icon header">

6
templates/admin/user/edit.tmpl
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"}}
@ -116,8 +114,6 @@
</div>
</div>
</div>
</div>
</div>
<div class="ui small basic delete modal">
<div class="ui icon header">

6
templates/admin/user/list.tmpl
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}})
@ -54,6 +52,4 @@
{{template "base/paginate" .}}
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

6
templates/admin/user/new.tmpl
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"}}
@ -61,6 +59,4 @@
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

2
templates/repo/header.tmpl
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
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"}}
@ -84,6 +82,4 @@
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

6
templates/repo/settings/collaboration.tmpl
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"}}
@ -54,8 +52,6 @@
</div>
</div>
</div>
</div>
</div>
<div class="ui small basic delete modal">
<div class="ui icon header">

6
templates/repo/settings/deploy_keys.tmpl
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"}}
@ -71,8 +69,6 @@
</div>
</div>
</div>
</div>
</div>
<div class="ui small basic delete modal">
<div class="ui icon header">

6
templates/repo/settings/githook_edit.tmpl
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"}}
@ -31,6 +29,4 @@
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

6
templates/repo/settings/githooks.tmpl
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"}}
@ -25,6 +23,4 @@
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

2
templates/repo/settings/hook_list.tmpl
View file

@ -1,4 +1,3 @@
<div class="twelve wide column content">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "repo.settings.hooks"}}
@ -39,6 +38,5 @@
{{end}}
</div>
</div>
</div>
{{template "repo/settings/hook_delete_modal" .}}

6
templates/repo/settings/hook_new.tmpl
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}}
@ -24,6 +22,4 @@
{{template "repo/settings/hook_history" .}}
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

4
templates/repo/settings/hooks.tmpl
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
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>
@ -24,4 +22,3 @@
{{.i18n.Tr "repo.settings.deploy_keys"}}
</a>
</div>
</div>

6
templates/repo/settings/options.tmpl
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"}}
@ -251,8 +249,6 @@
{{end}}
</div>
</div>
</div>
</div>
{{if .IsRepositoryOwner}}
{{if .Repository.IsMirror}}

6
templates/user/settings/account_link.tmpl
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"}}
@ -32,8 +30,6 @@
</div>
</div>
</div>
</div>
</div>
<div class="ui small basic delete modal">
<div class="ui icon header">

6
templates/user/settings/applications.tmpl
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"}}
@ -60,8 +58,6 @@
</div>
</div>
</div>
</div>
</div>
<div class="ui small basic delete modal">
<div class="ui icon header">

6
templates/user/settings/avatar.tmpl
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"}}
@ -45,6 +43,4 @@
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

6
templates/user/settings/delete.tmpl
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"}}
@ -29,8 +27,6 @@
</div>
</div>
</div>
</div>
</div>
<div class="ui small basic delete modal">
<div class="ui icon header">

6
templates/user/settings/email.tmpl
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"}}
@ -54,8 +52,6 @@
</div>
</div>
</div>
</div>
</div>
<div class="ui small basic delete modal">
<div class="ui icon header">

5
templates/user/settings/navbar.tmpl
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>
@ -29,4 +27,3 @@
{{.i18n.Tr "settings.delete"}}
</a>
</div>
</div>

6
templates/user/settings/password.tmpl
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"}}
@ -40,6 +38,4 @@
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

6
templates/user/settings/profile.tmpl
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"}}
@ -50,6 +48,4 @@
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}

6
templates/user/settings/sshkeys.tmpl
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"}}
@ -67,8 +65,6 @@
</div>
</div>
</div>
</div>
</div>
<div class="ui small basic delete modal">
<div class="ui icon header">

6
templates/user/settings/twofa.tmpl
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"}}
@ -31,8 +29,6 @@
</div>
</div>
</div>
</div>
</div>
<div class="ui small basic delete modal">
<div class="ui icon header">

6
templates/user/settings/twofa_enroll.tmpl
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"}}
@ -27,7 +25,5 @@
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}