Insert ui divider directly in templates instead of from inside heatmap vue component (#11508)
* ui: remove the divider between heatmap and feeds in the dashboard view * this commit reverses6ccd19ef86Signed-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 per6ccd19ef86originally) 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:
		
							parent
							
								
									50a97272b9
								
							
						
					
					
						commit
						a2d7999e93
					
				
					 4 changed files with 5 additions and 12 deletions
				
			
		|  | @ -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> | ||||
|  |  | |||
|  | @ -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> | ||||
|  |  | |||
|  | @ -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> | ||||
|  |  | |||
|  | @ -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> | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue