Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 19, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2bfc716
ui: remove the divider between heatmap and feeds in the dashboard view
wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf May 19, 2020
df5c4c0
add a divider to the default user dashboard view
wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf May 19, 2020
0f98704
removed the divider in heatmap.tmpl
wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf May 19, 2020
4782117
load proper dashboard template code in profile.tmpl
wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf May 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions templates/user/dashboard/dashboard.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<div class="ui container ten wide column">
{{if .EnableHeatmap}}
{{template "user/dashboard/heatmap" .}}
<div class="ui divider"></div>
{{end}}
{{template "user/dashboard/feeds" .}}
</div>
Expand Down
1 change: 0 additions & 1 deletion templates/user/dashboard/heatmap.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@
<div class="ui active centered inline indeterminate text loader" id="loading-heatmap">{{.i18n.Tr "user.heatmap.loading"}}</div>
</div>
</activity-heatmap>
<div class="ui divider"></div>
</div>
14 changes: 4 additions & 10 deletions templates/user/profile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,10 @@
</div>

{{if eq .TabName "activity"}}
{{if .EnableHeatmap}}
<div id="user-heatmap" style="padding-right: 40px">
<activity-heatmap :locale="locale" :suburl="suburl" :user="heatmapUser">
<div slot="loading">
<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}}
{{if .EnableHeatmap}}
{{template "user/dashboard/heatmap" .}}
<div class="ui divider"></div>
{{end}}
<div class="feeds">
{{template "user/dashboard/feeds" .}}
</div>
Expand Down
1 change: 0 additions & 1 deletion web_src/js/components/ActivityHeatmap.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
{{ totalContributions }} total contributions in the last 12 months
</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"/>
<div class="ui divider"></div>
</div>
</template>

Expand Down