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

Refactored Twig templates using a single base layout #7040

Merged
merged 1 commit into from Jan 21, 2015
Merged

Conversation

mnapoli
Copy link
Contributor

@mnapoli mnapoli commented Jan 16, 2015

There were several base layout files:

  • dashboard
  • admin
  • user settings
  • login

Those had a lot of similarities of course, and few discrepancies which could create bugs like #7036 or inconsistent stuff (e.g. missing favicon, missing description tag, CSS included twice in login, angularjs not initialized, …).

I added a new layout.twig file that defines the base HTML layout for pages. Other layouts extend it by redefining Twig blocks.

Also fixes #7036

@mnapoli mnapoli added the Enhancement For new feature suggestions that enhance Matomo's capabilities or add a new report, new API etc. label Jan 16, 2015
@mnapoli mnapoli self-assigned this Jan 16, 2015
@mnapoli mnapoli added this to the Piwik 2.11.0 milestone Jan 16, 2015
@mnapoli
Copy link
Contributor Author

mnapoli commented Jan 21, 2015

No comments, merging.

mnapoli added a commit that referenced this pull request Jan 21, 2015
Refactored Twig templates using a single base layout
@mnapoli mnapoli merged commit 1000b41 into master Jan 21, 2015
@mnapoli mnapoli deleted the template-layout branch January 21, 2015 01:02
@tsteur
Copy link
Member

tsteur commented Jan 21, 2015

The login does no longer work now see failing UI tests, I will investigate if I can find the cause

tsteur added a commit that referenced this pull request Jan 21, 2015
@mattab
Copy link
Member

mattab commented Feb 16, 2015

👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Enhancement For new feature suggestions that enhance Matomo's capabilities or add a new report, new API etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants