diff --git a/templates/org/projects/view.tmpl b/templates/org/projects/view.tmpl
index 33346b6154..495204b06d 100644
--- a/templates/org/projects/view.tmpl
+++ b/templates/org/projects/view.tmpl
@@ -2,8 +2,10 @@
<div role="main" aria-label="{{.Title}}" class="page-content repository projects view-project">
{{template "shared/user/org_profile_avatar" .}}
<div class="ui container">
- {{template "user/overview/header" .}}
- {{template "projects/view" .}}
+ {{template "user/overview/header" .}}
+ </div>
+ <div class="ui container fluid padded">
+ {{template "projects/view" .}}
</div>
</div>
{{template "base/footer" .}}
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index fddbaa80aa..b3ad03c354 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -1,66 +1,68 @@
{{$canWriteProject := and .CanWriteProjects (or (not .Repository) (not .Repository.IsArchived))}}
-<div class="gt-df gt-sb gt-ac gt-mb-4">
- <h2 class="gt-mb-0">{{.Project.Title}}</h2>
- {{if $canWriteProject}}
- <div class="ui compact mini menu">
- <a class="item" href="{{.Link}}/edit?redirect=project">
- {{svg "octicon-pencil"}}
- {{ctx.Locale.Tr "repo.issues.label_edit"}}
- </a>
- {{if .Project.IsClosed}}
- <button class="item btn link-action" data-url="{{.Link}}/open">
- {{svg "octicon-check"}}
- {{ctx.Locale.Tr "repo.projects.open"}}
+<div class="ui container">
+ <div class="gt-df gt-sb gt-ac gt-mb-4">
+ <h2 class="gt-mb-0">{{.Project.Title}}</h2>
+ {{if $canWriteProject}}
+ <div class="ui compact mini menu">
+ <a class="item" href="{{.Link}}/edit?redirect=project">
+ {{svg "octicon-pencil"}}
+ {{ctx.Locale.Tr "repo.issues.label_edit"}}
+ </a>
+ {{if .Project.IsClosed}}
+ <button class="item btn link-action" data-url="{{.Link}}/open">
+ {{svg "octicon-check"}}
+ {{ctx.Locale.Tr "repo.projects.open"}}
+ </button>
+ {{else}}
+ <button class="item btn link-action" data-url="{{.Link}}/close">
+ {{svg "octicon-skip"}}
+ {{ctx.Locale.Tr "repo.projects.close"}}
+ </button>
+ {{end}}
+ <button class="item btn delete-button" data-url="{{.Link}}/delete" data-id="{{.Project.ID}}">
+ {{svg "octicon-trash"}}
+ {{ctx.Locale.Tr "repo.issues.label_delete"}}
</button>
- {{else}}
- <button class="item btn link-action" data-url="{{.Link}}/close">
- {{svg "octicon-skip"}}
- {{ctx.Locale.Tr "repo.projects.close"}}
+ <button class="item btn show-modal" data-modal="#new-project-column-item">
+ {{svg "octicon-plus"}}
+ {{ctx.Locale.Tr "new_project_column"}}
</button>
- {{end}}
- <button class="item btn delete-button" data-url="{{.Link}}/delete" data-id="{{.Project.ID}}">
- {{svg "octicon-trash"}}
- {{ctx.Locale.Tr "repo.issues.label_delete"}}
- </button>
- <button class="item btn show-modal" data-modal="#new-project-column-item">
- {{svg "octicon-plus"}}
- {{ctx.Locale.Tr "new_project_column"}}
- </button>
- </div>
- <div class="ui small modal new-project-column-modal" id="new-project-column-item">
- <div class="header">
- {{ctx.Locale.Tr "repo.projects.column.new"}}
</div>
- <div class="content">
- <form class="ui form">
- <div class="required field">
- <label for="new_project_column">{{ctx.Locale.Tr "repo.projects.column.new_title"}}</label>
- <input class="new-project-column" id="new_project_column" name="title" required>
- </div>
-
- <div class="field color-field">
- <label for="new_project_column_color">{{ctx.Locale.Tr "repo.projects.column.color"}}</label>
- <div class="color picker column">
- <input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_project_column_color_picker" name="color">
- {{template "repo/issue/label_precolors"}}
+ <div class="ui small modal new-project-column-modal" id="new-project-column-item">
+ <div class="header">
+ {{ctx.Locale.Tr "repo.projects.column.new"}}
+ </div>
+ <div class="content">
+ <form class="ui form">
+ <div class="required field">
+ <label for="new_project_column">{{ctx.Locale.Tr "repo.projects.column.new_title"}}</label>
+ <input class="new-project-column" id="new_project_column" name="title" required>
</div>
- </div>
- <div class="text right actions">
- <button class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>
- <button data-url="{{$.Link}}" class="ui primary button" id="new_project_column_submit">{{ctx.Locale.Tr "repo.projects.column.new_submit"}}</button>
- </div>
- </form>
+ <div class="field color-field">
+ <label for="new_project_column_color">{{ctx.Locale.Tr "repo.projects.column.color"}}</label>
+ <div class="color picker column">
+ <input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_project_column_color_picker" name="color">
+ {{template "repo/issue/label_precolors"}}
+ </div>
+ </div>
+
+ <div class="text right actions">
+ <button class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>
+ <button data-url="{{$.Link}}" class="ui primary button" id="new_project_column_submit">{{ctx.Locale.Tr "repo.projects.column.new_submit"}}</button>
+ </div>
+ </form>
+ </div>
</div>
- </div>
- {{end}}
+ {{end}}
+ </div>
+
+ <div class="content">{{$.Project.RenderedContent|Str2html}}</div>
+
+ <div class="divider"></div>
</div>
-<div class="content">{{$.Project.RenderedContent|Str2html}}</div>
-
-<div class="divider"></div>
-
<div id="project-board">
<div class="board {{if .CanWriteProjects}}sortable{{end}}">
{{range .Columns}}
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index 3f2dd9a548..377a7ff79f 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -6,6 +6,8 @@
{{template "repo/issue/navbar" .}}
<a class="ui small primary button" href="{{.RepoLink}}/issues/new/choose?project={{.Project.ID}}">{{ctx.Locale.Tr "repo.issues.new"}}</a>
</div>
+ </div>
+ <div class="ui container fluid padded">
{{template "projects/view" .}}
</div>
</div>