Fix dashboard repolist alignment and repolisting (#17355)
Unfortunately #17301 broke the restriction of the dashboard repolist to the user's repos because it stopped passing in the uid for the current user. This PR restores this. There is also a weird alignment problem - not caused by that PR - where the menu items in the repolist spread over multiple lines. This PR simply reduces the padding on these items and switches the justification of the flex elements to space-evenly. Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
This commit is contained in:
parent
1f41fcc342
commit
e2a59c57fc
4 changed files with 16 additions and 1 deletions
|
@ -72,8 +72,14 @@ func Dashboard(ctx *context.Context) {
|
||||||
ctx.Data["PageIsDashboard"] = true
|
ctx.Data["PageIsDashboard"] = true
|
||||||
ctx.Data["PageIsNews"] = true
|
ctx.Data["PageIsNews"] = true
|
||||||
|
|
||||||
|
var uid int64
|
||||||
|
if ctxUser != nil {
|
||||||
|
uid = ctxUser.ID
|
||||||
|
}
|
||||||
|
|
||||||
ctx.PageData["dashboardRepoList"] = map[string]interface{}{
|
ctx.PageData["dashboardRepoList"] = map[string]interface{}{
|
||||||
"searchLimit": setting.UI.User.RepoPagingNum,
|
"searchLimit": setting.UI.User.RepoPagingNum,
|
||||||
|
"uid": uid,
|
||||||
}
|
}
|
||||||
|
|
||||||
if setting.Service.EnableUserHeatmap {
|
if setting.Service.EnableUserHeatmap {
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
<repo-search
|
<repo-search
|
||||||
:search-limit="searchLimit"
|
:search-limit="searchLimit"
|
||||||
:sub-url="subUrl"
|
:sub-url="subUrl"
|
||||||
|
:uid="uid"
|
||||||
{{if .Team}}
|
{{if .Team}}
|
||||||
:team-id="{{.Team.ID}}"
|
:team-id="{{.Team.ID}}"
|
||||||
{{end}}
|
{{end}}
|
||||||
|
@ -95,7 +96,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="ui secondary tiny pointing borderless menu center aligned grid repos-filter">
|
<div class="ui secondary tiny pointing borderless menu center grid repos-filter">
|
||||||
<a class="item" :class="{active: reposFilter === 'all'}" @click="changeReposFilter('all')">
|
<a class="item" :class="{active: reposFilter === 'all'}" @click="changeReposFilter('all')">
|
||||||
{{.i18n.Tr "all"}}
|
{{.i18n.Tr "all"}}
|
||||||
<div v-show="reposFilter === 'all'" class="ui circular mini grey label">${repoTypeCount}</div>
|
<div v-show="reposFilter === 'all'" class="ui circular mini grey label">${repoTypeCount}</div>
|
||||||
|
|
|
@ -362,6 +362,7 @@ export function initDashboardRepoList() {
|
||||||
return {
|
return {
|
||||||
searchLimit: dashboardRepoListData.searchLimit || 0,
|
searchLimit: dashboardRepoListData.searchLimit || 0,
|
||||||
subUrl: AppSubUrl,
|
subUrl: AppSubUrl,
|
||||||
|
uid: dashboardRepoListData.uid || 0,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
|
@ -1361,6 +1361,13 @@ footer {
|
||||||
margin-top: 0 !important;
|
margin-top: 0 !important;
|
||||||
border-bottom-width: 0 !important;
|
border-bottom-width: 0 !important;
|
||||||
margin-bottom: 2px !important;
|
margin-bottom: 2px !important;
|
||||||
|
justify-content: space-evenly;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
.ui.secondary.pointing.menu.repos-filter .item {
|
||||||
|
padding-left: 4.5px;
|
||||||
|
padding-right: 4.5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.repo-title {
|
.repo-title {
|
||||||
|
|
Loading…
Reference in a new issue