Skip to content
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.

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

Jump to bottom

Rearrange some menu items #12879

Merged
merged 8 commits into from May 24, 2018
Merged

Rearrange some menu items #12879

merged 8 commits into from May 24, 2018

Conversation

sgiehl
Copy link
Member

@sgiehl sgiehl commented May 9, 2018

fixes #12852, fixes #12806

@sgiehl sgiehl added not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. Needs Review PRs that need a code review labels May 9, 2018
@sgiehl sgiehl added this to the 3.6.0 milestone May 9, 2018
@mattab mattab modified the milestones: 3.6.0, 3.5.1 May 16, 2018
diosmosis
diosmosis requested changes May 18, 2018
View reviewed changes
Copy link
Member

@diosmosis diosmosis left a comment

Choose a reason for hiding this comment

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

In #12806 looks like @mattab wanted User IDs to be above Real-Time Map, but in the test screenshot it's below it:

https://builds-artifacts.matomo.org/matomo-org/matomo/renamemenu/27574/Menus_mainmenu_upper_clicked.png

@sgiehl
Copy link
Member Author

sgiehl commented May 18, 2018

@diosmosis correct. But #12852 says the location menu should be moved right above realtime map. But obviously there can only be one item be above it.
@mattab should userid be above location then or is ok to have userid last?

@mattab
Copy link
Member

mattab commented May 21, 2018

@sgiehl @diosmosis Order should be:

  • User ID
  • Locations
  • Real-time map

@sgiehl
Copy link
Member Author

sgiehl commented May 21, 2018

Ok. Changed the order accordingly. UI tests might need an update before merging

@diosmosis diosmosis merged commit 39ef2e1 into 3.x-dev May 24, 2018
@diosmosis diosmosis deleted the renamemenu branch May 24, 2018 00:37
InfinityVoid pushed a commit to InfinityVoid/matomo that referenced this pull request Oct 11, 2018
@sgiehl @InfinityVoid
Rearrange some menu items (matomo-org#12879)
d837c28 
* Rearrange some menu items

* update system test files

* Update CustomDimensions submodule.

* Update tests/travis repo (to get artifacts uploaded for plugin system tests).

* Update expected screenshots.

* Update pdf/html system tests.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@diosmosis diosmosis diosmosis requested changes

Assignees
No one assigned
Labels
Needs Review PRs that need a code review not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Milestone
3.5.1
3 participants
@sgiehl @mattab @diosmosis