Skip to content

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

Merged
zeripath merged 4 commits into
go-gitea:masterfrom
wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf:master
May 19, 2020
Merged

Insert ui divider directly in templates instead of from inside heatmap vue component#11508
zeripath merged 4 commits into
go-gitea:masterfrom
wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf:master

Conversation

@wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf
Copy link
Copy Markdown
Contributor

@wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf commented May 19, 2020 •
edited
Loading

Hello there,

This change removes a redundant divider line that sits between the user heatmap and the feeds in the user dashboard view's "Public Activity" tab, so that we could move
from image
to image
effectively reverting 6ccd19e (which introduced this).

Thanks a lot for your work.
Cheers.

@wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf
ui: remove the divider between heatmap and feeds in the dashboard view
2bfc716 
* this commit reverses 6ccd19e

Signed-off-by: surtur <a_mirre@utb.cz>
kolaente
kolaente reviewed May 19, 2020
View reviewed changes
Comment thread web_src/js/components/ActivityHeatmap.vue
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 19, 2020
@6543
Copy link
Copy Markdown
Member

6543 commented May 19, 2020

@a1012112796 introduced it in #11437

Instead od adding a devider to vue we could put it specific in the home template?

@wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf
add a divider to the default user dashboard view
df5c4c0 
* another one-line change, this time as a direct complement of
  2bfc716 to implement a divider of
  sorts (as per 6ccd19e originally)

Signed-off-by: surtur <a_mirre@utb.cz>
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels May 19, 2020
@mrsdizzie
Copy link
Copy Markdown
Member

mrsdizzie commented May 19, 2020 •
edited
Loading

edit: I originally misread description 👓

@CirnoT CirnoT mentioned this pull request May 19, 2020
Closed
@wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf
Copy link
Copy Markdown
Contributor Author

wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf commented May 19, 2020 •
edited
Loading

I don't think removing one line and adding one line is going to leave you with a different amount of lines.

If you are adding a new divider to the dasbhoard template you should remove the one here which is the 2nd one you are seeing I'd guess:

gitea/templates/user/dashboard/heatmap.tmpl

Line 7 in 50a9727

<div class="ui divider"></div>

Maybe that line is showing up for some not all -- I don't currently see 2 lines on master do you see this @6543 ?

This is what the original idea behind 6ccd19e might have looked like.
image

The only issue was it introduced a double-separator appearance in the "Public Activity" of the dashboard, as per the image in the very top of the conversation. This PR should fix that.

It's more like showing the line only where it should be, rather than removing it altogether.
Although it seems it has just been resolved in a more elegant manner ( 95a6bca ) - edit: this might actually apply to another page.

mrsdizzie
mrsdizzie approved these changes May 19, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@mrsdizzie mrsdizzie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is right to remove the divider out of vue code and into template where it originally was supposed to be -- this makes #11510 not necessary then too

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels May 19, 2020
CirnoT
CirnoT reviewed May 19, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@CirnoT CirnoT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awaiting removal of broken divider from user/dashboard/heatmap.tmpl as discussed on Discord

@wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf
removed the divider in heatmap.tmpl
0f98704 
* the separator is added by partial templates as needed

Signed-off-by: surtur <a_mirre@utb.cz>
@a1012112796
Copy link
Copy Markdown
Member

a1012112796 commented May 19, 2020 •
edited
Loading

Good, I'm sorry for my fault. Maybe you should choose a better title for this pull request. Thanks

@wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf
load proper dashboard template code in profile.tmpl
4782117 
* as discussed in Discord
* includes a divider of its own

Signed-off-by: surtur <a_mirre@utb.cz>
@mrsdizzie
Copy link
Copy Markdown
Member

mrsdizzie commented May 19, 2020

Good, I'm sorry for my fault. Maybe you should choose a better title for this pull request. Thanks

No worries it all leads to a better fix : )

@wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf changed the title ui: remove the divider between heatmap and feeds in the dashboard view Insert ui divider directly in templates instead of from inside heatmap vue component May 19, 2020
@techknowlogick techknowlogick added the topic/ui Change the appearance of the Gitea UI label May 19, 2020
@techknowlogick techknowlogick added this to the 1.13.0 milestone May 19, 2020
@zeripath zeripath merged commit a2d7999 into go-gitea:master May 19, 2020
ydelafollye pushed a commit to ydelafollye/gitea that referenced this pull request Jul 31, 2020
@wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf
Insert ui divider directly in templates instead of from inside heatma…
c505472 
…p vue component (go-gitea#11508)

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

* this commit reverses 6ccd19e

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
  2bfc716 to implement a divider of
  sorts (as per 6ccd19e 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>
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@6543 6543 6543 approved these changes

+3 more reviewers

@kolaente kolaente kolaente left review comments

@CirnoT CirnoT CirnoT approved these changes

@mrsdizzie mrsdizzie mrsdizzie approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. topic/ui Change the appearance of the Gitea UI

Projects

None yet

Milestone

1.13.0

Development

Successfully merging this pull request may close these issues.

9 participants

@wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf @6543 @mrsdizzie @a1012112796 @CirnoT @kolaente @techknowlogick @zeripath @GiteaBot