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

Merge user and admin menu to one single menu #9997

Merged
merged 1 commit into from Apr 7, 2016
Merged

Merge user and admin menu to one single menu #9997

merged 1 commit into from Apr 7, 2016

Conversation

tsteur
Copy link
Member

@tsteur tsteur commented Apr 4, 2016

refs #9354

@tsteur tsteur added the Pull Request WIP Indicates the current pull request is still work in progress and not ready yet for a review. label Apr 4, 2016
@tsteur tsteur added this to the 3.0.0-b1 milestone Apr 4, 2016
@tsteur
Copy link
Member Author

tsteur commented Apr 4, 2016

This will be only a first version of the new menu structure. We will tweak it over time (eg in another branch there will be already 2 links "Plugin Settings" removed)

@tsteur
Copy link
Member Author

tsteur commented Apr 4, 2016

See screenshots http://builds-artifacts.piwik.org/piwik/piwik/9354/18540/

The list for super user is currently very long and we will tweak this over time. Eg as mentioned in another pull request 2 plugin settings link will be already gone. I suggest we merge this, use it for a while and make further adjustments over time in the next weeks.

For anonymous user and users with view users the menu is still very short. For admin menu it is also not too long. For super users is quite long but it'll become shorter. When testing locally make sure to disable development mode as these menu items are usually not shown.

@tsteur tsteur added 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. and removed Pull Request WIP Indicates the current pull request is still work in progress and not ready yet for a review. labels Apr 4, 2016
@tsteur
Copy link
Member Author

tsteur commented Apr 6, 2016

@mattab is it ok to merge for now and to make further changes over time? I'd kind of like to make the 3.x branch green soon and in order for this I need to merge this branch + the settings branch. It's otherwise hard to make it green re the plugin submodules and keeping them compatible

@mattab mattab merged commit 6ba622a into 3.x-dev Apr 7, 2016
@mattab
Copy link
Member

mattab commented Apr 7, 2016

LGTM

@mattab mattab deleted the 9354 branch April 7, 2016 00:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

None yet

2 participants