-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Change to vertical navbar layout for secondary navbar for repo/user/a…
…dmin settings (#24246) Co-Author: @wxiaoguang This is the first step of #24229. And this PR will only includes html changes, and followed by other PRs that fine tune css and change to submenus. After: Admin Level <img width="1400" alt="Screen Shot 2023-04-21 at 10 07 16" src="https://user-images.githubusercontent.com/17645053/233523870-f848b61d-056a-4b41-9760-a9a49fea1fe8.png"> User Level <img width="1422" alt="Screen Shot 2023-04-21 at 10 07 23" src="https://user-images.githubusercontent.com/17645053/233523878-979adb20-a657-43d9-99a6-ad414010c0ef.png"> Repo Level <img width="1404" alt="Screen Shot 2023-04-21 at 10 07 07" src="https://user-images.githubusercontent.com/17645053/233523863-337440bd-c03a-4dfd-87fa-cef40300bfe0.png"> --------- Co-authored-by: wxiaoguang <[email protected]>
- Loading branch information
1 parent
476a043
commit 44e0cfa
Showing
85 changed files
with
350 additions
and
582 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,8 @@ | ||
{{template "base/head" .}} | ||
<div role="main" aria-label="{{.Title}}" class="page-content admin config"> | ||
{{template "admin/navbar" .}} | ||
<div class="ui container"> | ||
<div class="twelve wide column content"> | ||
{{template "base/alert" .}} | ||
<h4 class="ui top attached header"> | ||
{{.locale.Tr "settings.applications"}} | ||
</h4> | ||
{{template "user/settings/applications_oauth2_list" .}} | ||
</div> | ||
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}} | ||
<div class="admin-setting-content"> | ||
<h4 class="ui top attached header"> | ||
{{.locale.Tr "settings.applications"}} | ||
</h4> | ||
{{template "user/settings/applications_oauth2_list" .}} | ||
</div> | ||
</div> | ||
{{template "base/footer" .}} | ||
{{template "admin/layout_footer" .}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,6 @@ | ||
{{template "base/head" .}} | ||
<div role="main" aria-label="{{.Title}}" class="page-content admin config"> | ||
{{template "admin/navbar" .}} | ||
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}} | ||
<div class="admin-setting-content"> | ||
|
||
{{template "user/settings/applications_oauth2_edit_form" .}} | ||
</div> | ||
{{template "base/footer" .}} | ||
{{template "user/settings/applications_oauth2_edit_form" .}} | ||
</div> | ||
{{template "admin/layout_footer" .}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,9 @@ | ||
{{template "base/head" .}} | ||
<div role="main" aria-label="{{.Title}}" class="page-content admin hooks"> | ||
{{template "admin/navbar" .}} | ||
<div class="ui container"> | ||
{{template "base/alert" .}} | ||
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin hooks")}} | ||
<div class="admin-setting-content"> | ||
|
||
{{template "repo/settings/webhook/base_list" .SystemWebhooks}} | ||
{{template "repo/settings/webhook/base_list" .DefaultWebhooks}} | ||
|
||
{{template "repo/settings/webhook/delete_modal" .}} | ||
</div> | ||
</div> | ||
{{template "base/footer" .}} | ||
{{template "admin/layout_footer" .}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}} | ||
<div class="page-content"> | ||
<div class="admin-layout-right"> | ||
<div> | ||
{{/* block: admin-setting-content */}} | ||
{{end}} | ||
|
||
</div> | ||
</div> | ||
</div> | ||
{{template "base/footer" .}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{{template "base/head" .ctxData}} | ||
<div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}"> | ||
<div class="ui container stackable grid"> | ||
{{template "admin/navbar" .ctxData}} | ||
<div class="twelve wide column"> | ||
{{template "base/alert" .ctxData}} | ||
{{/* block: admin-setting-content */}} | ||
|
||
{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}} | ||
</div> | ||
</div> | ||
</div> | ||
{{end}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.