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

New design for the maintenance mode #7648

Merged
merged 12 commits into from Apr 17, 2015
Merged

New design for the maintenance mode #7648

merged 12 commits into from Apr 17, 2015

Conversation

mnapoli
Copy link
Contributor

@mnapoli mnapoli commented Apr 9, 2015

Fixes #7620

Pull request based on #7578, don't merge this one before merging #7578.

Current design:

There's not much to say in that page so it feels a bit empty…

@mnapoli mnapoli added not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. c: Design / UI For issues that impact Matomo's user interface or the design overall. Needs Review PRs that need a code review labels Apr 9, 2015
@mnapoli mnapoli added this to the Piwik 2.13.0 milestone Apr 9, 2015
@mattab
Copy link
Member

mattab commented Apr 9, 2015

the visual looks good to me, a solid improvement!

(I didn't look at code)

@mnapoli
Copy link
Contributor Author

mnapoli commented Apr 9, 2015

FYI the diff is huge because this PR is based on the other PR which is also based on another PR :)

But the commit is very simple: 71c7a7d

</div>

<div class="logo">
<img title="Piwik" alt="Piwik" src="plugins/Morpheus/images/logo-header.png"/>
Copy link
Member

Choose a reason for hiding this comment

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

Should we show a possible custom logo here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the diff for #7578 (updater redesign).

I've added support for custom logo in the maintenance mode, I'll try to add support for that in the updater in #7578.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added support for custom logos in the updater too (in #7578).

$logo = new CustomLogo();
$logoUrl = $logo->getHeaderLogoUrl();
$faviconUrl = $logo->getPathUserFavicon();
} catch (Exception $ex) {
Copy link
Member

Choose a reason for hiding this comment

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

+1 - I tested that maintenance is displayed correctly when DB is not accessible and it works thanks to this catch (case where the DB could be down during maintenance)

@mnapoli
Copy link
Contributor Author

mnapoli commented Apr 17, 2015

Keep in mind while reviewing that this PR is based on #7578, only the 2 last commits are about the maintenance.

…ftware/),

it may not be free as in beer - by removing those titles we remove some possible confusion
 (eg. we don't show "Free Web Analytics" on the login form on Piwik Cloud)
@mattab
Copy link
Member

mattab commented Apr 17, 2015

  • the subtitle we can use Piwik::getRandomTitle() instead of free/libre analytics platform
  • otherwise looks good +1 to merge

@mnapoli
Copy link
Contributor Author

mnapoli commented Apr 17, 2015

It now uses Piwik::getRandomTitle()

mattab pushed a commit that referenced this pull request Apr 17, 2015
New design for the maintenance mode
@mattab mattab merged commit 01a7d8e into master Apr 17, 2015
@mnapoli
Copy link
Contributor Author

mnapoli commented Apr 17, 2015

@mattab I'm afraid the commits are not good here :/ I was rebasing this PR because as you can see the diff includes some commits of the updater redesign, which is not good. I don't know if there are any consequences.

Only the 2 last commits should have been merged.

@mattab mattab mentioned this pull request Apr 20, 2015
10 tasks
@mnapoli mnapoli deleted the redesign-maintenance branch April 21, 2015 22:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c: Design / UI For issues that impact Matomo's user interface or the design overall. 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

4 participants