pub-solar/forgejo
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Insert ui divider directly in templates instead of from inside heatmap vue component (#11508)

Browse source 
* ui: remove the divider between heatmap and feeds in the dashboard view

* this commit reverses 6ccd19ef86

Signed-off-by: surtur <a_mirre@utb.cz>

* add a divider to the default user dashboard view

* another one-line change, this time as a direct complement of
  2bfc71614c0c5470162825a21c13838e15ccf5a6 to implement a divider of
  sorts (as per 6ccd19ef86 originally)

Signed-off-by: surtur <a_mirre@utb.cz>

* removed the divider in heatmap.tmpl

* the separator is added by partial templates as needed

Signed-off-by: surtur <a_mirre@utb.cz>

* load proper dashboard template code in profile.tmpl

* as discussed in Discord
* includes a divider of its own

Signed-off-by: surtur <a_mirre@utb.cz>
This commit is contained in:
wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf 2020-05-19 22:24:14 +02:00 committed by GitHub
parent 50a97272b9
commit a2d7999e93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
templates/user/dashboard/dashboard.tmpl
View file

@ -7,6 +7,7 @@
<div class="ui container ten wide column"> <div class="ui container ten wide column">
{{if .EnableHeatmap}} {{if .EnableHeatmap}}
{{template "user/dashboard/heatmap" .}} {{template "user/dashboard/heatmap" .}}
<div class="ui divider"></div>
{{end}} {{end}}
{{template "user/dashboard/feeds" .}} {{template "user/dashboard/feeds" .}}
</div> </div>

1
templates/user/dashboard/heatmap.tmpl
View file

@ -4,5 +4,4 @@
<div class="ui active centered inline indeterminate text loader" id="loading-heatmap">{{.i18n.Tr "user.heatmap.loading"}}</div> <div class="ui active centered inline indeterminate text loader" id="loading-heatmap">{{.i18n.Tr "user.heatmap.loading"}}</div>
</div> </div>
</activity-heatmap> </activity-heatmap>
<div class="ui divider"></div>
</div> </div>

14
templates/user/profile.tmpl
View file

@ -104,16 +104,10 @@
</div> </div>
{{if eq .TabName "activity"}} {{if eq .TabName "activity"}}
{{if .EnableHeatmap}} {{if .EnableHeatmap}}
<div id="user-heatmap" style="padding-right: 40px"> {{template "user/dashboard/heatmap" .}}
<activity-heatmap :locale="locale" :suburl="suburl" :user="heatmapUser"> <div class="ui divider"></div>
<div slot="loading"> {{end}}
<div class="ui active centered inline indeterminate text loader" id="loading-heatmap">{{.i18n.Tr "user.heatmap.loading"}}</div>
</div>
</activity-heatmap>
</div>
<div class="ui divider"></div>
{{end}}
<div class="feeds"> <div class="feeds">
{{template "user/dashboard/feeds" .}} {{template "user/dashboard/feeds" .}}
</div> </div>

1
web_src/js/components/ActivityHeatmap.vue
View file

@ -7,7 +7,6 @@
{{ totalContributions }} total contributions in the last 12 months {{ totalContributions }} total contributions in the last 12 months
</h4> </h4>
<calendar-heatmap v-show="!isLoading" :locale="locale" :no-data-text="locale.no_contributions" :tooltip-unit="locale.contributions" :end-date="endDate" :values="values" :range-color="colorRange"/> <calendar-heatmap v-show="!isLoading" :locale="locale" :no-data-text="locale.no_contributions" :tooltip-unit="locale.contributions" :end-date="endDate" :values="values" :range-color="colorRange"/>
<div class="ui divider"></div>
</div> </div>
</template> </template>