diff options
| author | kolaente <konrad@kola-entertainments.de> | 2018-10-23 04:57:42 +0200 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2018-10-23 10:57:42 +0800 |
| commit | 6759237eda5b7ddfe9284c81900cc9deed1f6bf9 (patch) | |
| tree | d6fa6ea9da9b218fcc74bcd9d9d11dc92662a349 /templates/user | |
| parent | f38fce916ec92cb9ac9fe78fb5284bc8b55a726f (diff) | |
| download | gitea-6759237eda5b7ddfe9284c81900cc9deed1f6bf9.tar.gz gitea-6759237eda5b7ddfe9284c81900cc9deed1f6bf9.zip | |
User action heatmap (#5131)
* Added basic heatmap data
* Added extra case for sqlite
* Built basic heatmap into user profile
* Get contribution data from api & styling
* Fixed lint & added extra group by statements for all database types
* generated swagger spec
* generated swagger spec
* generated swagger spec
* fixed swagger spec
* fmt
* Added tests
* Added setting to enable/disable user heatmap
* Added locale for loading text
* Removed UseTiDB
* Updated librejs & moment.js
* Fixed import order
* Fixed heatmap in postgresql
* Update docs/content/doc/advanced/config-cheat-sheet.en-us.md
Co-Authored-By: kolaente <konrad@kola-entertainments.de>
* Added copyright header
* Fixed a bug to show the heatmap for the actual user instead of the currently logged in
* Added integration test for heatmaps
* Added a heatmap on the dashboard
* Fixed timestamp parsing
* Hide heatmap on mobile
* optimized postgresql group by query
* Improved sqlite group by statement
Diffstat (limited to 'templates/user')
| -rw-r--r-- | templates/user/dashboard/dashboard.tmpl | 5 | ||||
| -rw-r--r-- | templates/user/profile.tmpl | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl index bddcc4925b..ac094f24c7 100644 --- a/templates/user/dashboard/dashboard.tmpl +++ b/templates/user/dashboard/dashboard.tmpl @@ -5,6 +5,11 @@ {{template "base/alert" .}} <div class="ui mobile reversed stackable grid"> <div class="ten wide column"> + {{if .EnableHeatmap}} + <div class="ui active centered inline indeterminate text loader" id="loading-heatmap">{{.i18n.Tr "user.heatmap.loading"}}</div> + <div id="user-heatmap"></div> + <div class="ui divider"></div> + {{end}} {{template "user/dashboard/feeds" .}} </div> <div id="app" class="six wide column"> diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 6cac300408..3f535ba140 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -95,6 +95,11 @@ </div> {{if eq .TabName "activity"}} + {{if .EnableHeatmap}} + <div class="ui active centered inline indeterminate text loader" id="loading-heatmap">{{.i18n.Tr "user.heatmap.loading"}}</div> + <div id="user-heatmap"></div> + <div class="ui divider"></div> + {{end}} <div class="feeds"> {{template "user/dashboard/feeds" .}} </div> |