Problem

install-page.html.twig markup structure should be the same as page.html.twig & maintenance-page.html.twig
install-page.html.twig is having classes & markup thats used specific for the seven theme

Proposed solution

stark:
updated the markup to the same structure as stark page.html.twig
seven:
update install-page.css to follow the structure of page.html.twig
update mobile.install.js to follow the structure of page.html.twig

Seven theme
* cleaned up the order or the css to follow a mobile first approach
* changed the class selected in mobile.install.js
* moved the install-page.html.twig with the classes for horizontal & vertical center into the seven theme (where it belongs)

Issues / Todo

* Unused Regions
It not clear why the regions, sidebar first, footer, header sidebar left is there ?
if install-page.twig is only available through the seven theme it should not use regions that is not available for it

Blockers: #2011578: Markup for Stark's page.html.twig + maintenance-page.html.twig needs to be rtbc

CommentFileSizeAuthor
#73 Screen Shot 2014-01-07 at 11.37.20 PM.png185.23 KBwebchick
#71 install-page-twig-markup-2041793-71.patch11.89 KBLewisNyman
#71 interdiff.txt1.95 KBLewisNyman
#68 install-page-twig-markup-2041793-68.patch11.73 KBrteijeiro
#66 install-page-twig-markup-2041793-66.patch10.65 KBrteijeiro
#64 install-page-twig-markup-2041793-64.patch12.38 KBrteijeiro
#59 d8-install-slogan.png318.12 KBDragan Eror
#57 d8-install.png380.01 KBDragan Eror
#56 Screen Shot 2013-11-26 at 13.10.22.png1.53 MBDragan Eror
#51 install.png836.7 KBrteijeiro
#49 install-page-twig-markup-2041793-49.patch12.14 KBLewisNyman
#45 install-page-twig-markup-2041793-44.patch12.2 KBLewisNyman
#42 interdiff.txt992 bytesLewisNyman
#42 install-page-twig-markup-2041793-42.patch12.42 KBLewisNyman
#38 install-page-twig-markup-2041793-38.patch12.41 KBRainbowArray
#38 interdiff-2041793-32-38.txt4.06 KBRainbowArray
#32 2041793-32.patch12.74 KBaxe312
#29 2041793-29.patch12.66 KBmagnify
#28 2041793-28.patch12.68 KBmagnify
#26 2041793-25.patch12.67 KBzorp
#24 Screen Shot 2013-09-27 at 14.18.56.png62.74 KBzorp
#22 2041793-22.patch12.64 KBmagnify
#19 2041793-19.patch12.65 KBrteijeiro
#16 2041793-16.patch12.76 KBrteijeiro
#16 interdiff.txt858 bytesrteijeiro
#14 Screen Shot 2013-09-23 at 14.25.07.png1.39 MBLewisNyman
#13 already-installed-page.png603.72 KBrteijeiro
#13 2041793-13.patch12.76 KBrteijeiro
#13 interdiff.txt655 bytesrteijeiro
#12 Screen Shot 2013-09-11 at 18.50.32.png925.02 KBLewisNyman
#10 2041793-installpage-2.diff12.77 KBmortendk
#10 mobile-orig.png245.91 KBmortendk
#10 mobile-patch.png219.54 KBmortendk
#10 wide-orig.png311.41 KBmortendk
#10 wide-patch.png287.1 KBmortendk
#6 2041793-installpage.diff12.87 KBmortendk
#4 2041793-install-page-seven.diff11.1 KBmortendk
#3 install-twig.diff9.52 KBmortendk
#2 maintenance-install-twig.diff14.2 KBmortendk
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

mortendk’s picture

Issue tags: +dreammarkup

added tag

mortendk’s picture

first clanup of maintenance & the install page

mortendk’s picture

FileSize
9.52 KB

cleaned up the inconsistencies in use of em & px

mortendk’s picture

reorded the css to follow a mobile first approach
changed the js selector so it now works

mortendk’s picture

Title: markup & classes needs to be updated for install-page.html.twig » install-page.html.twig markup
mortendk’s picture

Issue tags: +Seven, +Stark
FileSize
12.87 KB

install-page.html.twig is having markup defined only for the seven theme - copied the file over to seven & removed the markup from stark - keeping it clean

mortendk’s picture

Status: Active » Needs review

boot get to work

mortendk’s picture

Issue summary: View changes

update the desctiption

LewisNyman’s picture

Nice clean up!

+++ b/core/themes/seven/install-page.cssundefined
@@ -38,152 +66,141 @@ body.install-page {
-    max-width: 770px;
+   max-width: 96em;

Looks like these max-widths don't match up

+++ b/core/themes/seven/install-page.cssundefined
@@ -38,152 +66,141 @@ body.install-page {
+  .install-page [role="banner"] h1 {
+    margin: 0.75em 0 0.75em 2em; /* LTR */

The left margin is wrong, it should match 50px

+++ b/core/themes/seven/install-page.cssundefined
@@ -23,11 +21,41 @@
+.install-page [role="banner"] h1 {

You could argue that we don't even need the role="banner"

+++ b/core/themes/seven/install-page.cssundefined
@@ -23,11 +21,41 @@
+.install-page .l-container {
+  background: #fff;
+  width: auto;
+  border-radius: 5px;
+  box-shadow: 0 6px 12px rgba(0, 0, 0, 0.15);

The border radius shouldn't appear on narrow views, we also need some padding and margins to match the previous design.

LewisNyman’s picture

Title: install-page.html.twig markup » install-page.html.twig markup and CSS
Assigned: mortendk » Unassigned
Status: Needs review » Needs work
Issue tags: +d8mux-css-cleanup
mortendk’s picture

Status: Needs work » Needs review
FileSize
287.1 KB
311.41 KB
219.54 KB
245.91 KB
12.77 KB

New patch rolled and screenshots attached for the changes

Mobile:
mobile-orig.png
mobile-patch.png

Wide
wide-orig.png
wide-patch.png

LewisNyman’s picture

The install process looks good, I noticed a few things on the “already installed” page.

I noticed this before I uninstalled, I guess we've lost those sidebar classes?

+++ b/core/themes/seven/install-page.cssundefined
@@ -41,152 +73,140 @@ body.install-page {
+  .install-page [role="main"] {
     -webkit-box-sizing: border-box;
     -moz-box-sizing: border-box;
     box-sizing: border-box;
     clear: none;
-    float: left;
-    padding-left: 50px; /* LTR */

Floating right makes the page look weird when there is no left sidebar. I guess we don't have the .no-sidebar class anymore?

+++ b/core/themes/seven/install-page.cssundefined
@@ -41,152 +73,140 @@ body.install-page {
-  ul{
-    padding: 15px;
-    margin: 0.25em 0 0.25em 0;

We need this ul declaration, I'm happy for it to stay this broad, it makes sense.

LewisNyman’s picture

Status: Needs review » Needs work
FileSize
925.02 KB

Screen Shot 2013-09-11 at 18.50.32.png

rteijeiro’s picture

Status: Needs work » Needs review
FileSize
655 bytes
12.76 KB
603.72 KB

Fixed #11 issues.

already-installed-page.png

LewisNyman’s picture

Status: Needs review » Needs work
FileSize
1.39 MB

There's a conflict with the "already installed page" and the normal installed page. We've moved the sidebar mark up below the main content mark up, which means we need to float the main content right in or for the sidebar to sit left of it.

I don't really want to pull in the .no-sidebar classes, the easiest way to fix this is to move the sidebar mark up back above the content. This is fine with me because the sidebar content is navigation.

Screen Shot 2013-09-23 at 14.25.07.png

rteijeiro’s picture

Assigned: Unassigned » rteijeiro

Fixing...

rteijeiro’s picture

Status: Needs work » Needs review
FileSize
858 bytes
12.76 KB

This patch fixed #14 issue and seems to work also in "already installed" page.

LewisNyman’s picture

Status: Needs review » Reviewed & tested by the community

This looks good! I'm happy with the code.

Outi’s picture

For me the latest patch doesn't apply... I couldn't simplytest it, neither.

rteijeiro’s picture

Status: Reviewed & tested by the community » Needs review
FileSize
12.65 KB

Re-rolled.

Status: Needs review » Needs work
Issue tags: -Seven, -Stark, -dreammarkup, -d8mux-css-cleanup

The last submitted patch, 2041793-19.patch, failed testing.

rteijeiro’s picture

Status: Needs work » Needs review
Issue tags: +Seven, +Stark, +dreammarkup, +d8mux-css-cleanup

#19: 2041793-19.patch queued for re-testing.

magnify’s picture

FileSize
12.64 KB

Testet patch and added missing curly brackets.

zorp’s picture

Status: Needs review » Reviewed & tested by the community

I can confirm that patch #22 passed manual testing

zorp’s picture

Status: Reviewed & tested by the community » Needs work
FileSize
62.74 KB

Update, noticed that MAIN i lacking some padding-right.

setting status as needs work.

LewisNyman’s picture

zorp’s picture

Status: Needs work » Needs review
FileSize
12.67 KB

Updated patch to include padding-right on main.

Please test and confirm it look good.

magnify’s picture

Patch #25 passed manual testing.

magnify’s picture

FileSize
12.68 KB

Added missing comment.

magnify’s picture

FileSize
12.66 KB

Removed the /* LTR */ comments they are not needed here. The padding is the same for a RTL website.

LewisNyman’s picture

Status: Needs review » Needs work

Sorry, I found some RTL issues.

  1. +++ b/core/themes/seven/install-page.css
    @@ -41,147 +73,144 @@ body.install-page {
    +  [dir="rtl"] .install-page .l-container {
    +    padding: 1em 0 3em 2em;
    +  }
    

    There is no padding set on ltr, not sure why we are setting it on rtl.

  2. +++ b/core/themes/seven/install-page.css
    @@ -41,147 +73,144 @@ body.install-page {
    +  [dir="rtl"] .install-page [role="main"] {
         float: right;
    +    padding-left: 0;
    +    padding-right: 2em;
       }
    

    We still need to remove the padding here for rtl

axe312’s picture

i am working on this

axe312’s picture

Status: Needs work » Needs review
FileSize
12.74 KB

I fixed the paddings. What do you think about it?

LewisNyman’s picture

Status: Needs review » Reviewed & tested by the community

Great, thanks!

rteijeiro’s picture

Assigned: rteijeiro » Unassigned
Xano’s picture

#32: 2041793-32.patch queued for re-testing.

star-szr’s picture

Status: Reviewed & tested by the community » Needs work

Here's my review, unfortunately this one is not ready yet. Important stuff up front followed by nitpicks.

  1. +++ b/core/themes/seven/install-page.html.twig
    @@ -0,0 +1,73 @@
    + * @file
    + * Default theme implementation to display a Drupal installation page.
    ...
    +          {% if site_name %}
    +              <h1>{{ site_name }}</h1>
    +          {% endif %}
    ...
    +     {{ messages }}
    +
    +      {{ content }}
    ...
    +  </div>{# /.l-container #}
    +
    +
    +</body>
    

    The @file should probably say something like 'Seven's implementation to display…', and also the spacing (blank lines) and alignment (some errors) of this template is very different from the core install-page.html.twig. I think when diffing the two files it should be much more obvious what we are changing between the two templates, which after tweaking looks like just the markup order of the first sidebar and adding a class to the html tag.

  2. +++ b/core/modules/system/templates/install-page.html.twig
    @@ -12,64 +13,57 @@
     <body class="install-page">
    ...
    +<div class="l-container">
    

    Should the .l-container div be indented one level within <body>? In the most recent patch, the seven install-page.html.twig does this but the system one doesn't. I would definitely lean towards indenting it but maybe there's a standard or convention I'm missing.

  3. +++ b/core/themes/seven/install-page.css
    @@ -2,8 +2,6 @@
      * @file
      * Installation styling.
      *
    - * Unfortunately we have to make our styling quite strong, to override the
    - * .in-maintenance styling.
      */
    

    If we're removing this paragraph, we need to remove the blank '*' line above it as well.

  4. +++ b/core/themes/seven/install-page.css
    @@ -23,17 +21,51 @@
    +/**
    + * Layout
    + *
    + */
    

    Extra blank '*' line here should be removed.

  5. +++ b/core/themes/seven/install-page.css
    @@ -23,17 +21,51 @@
    +@media all and  (max-width: 48em) { /* 768px */
    

    Extra space between "and" and "(max-width…" can be removed.

  6. +++ b/core/themes/seven/install-page.css
    @@ -23,17 +21,51 @@
    +  .install-page .l-container{
    

    Need a space before the { per CSS coding standards: https://drupal.org/node/1887862

  7. +++ b/core/themes/seven/install-page.css
    @@ -41,147 +73,137 @@ body.install-page {
    +  /* Positioning  sidebar & content */
    

    Extra space here between "Positioning" and "sidebar".

  8. +++ b/core/themes/seven/install-page.css
    @@ -41,147 +73,137 @@ body.install-page {
    +  /* sitename */
    +  .install-page [role="banner"] h1 {
    +    margin: 0.75em 0 0.75em 1.9em; /* LTR */
       }
    

    This comment should be at least capitalized (http://drupal.org/node/1354#drupal) if not fleshed out a bit more.

  9. +++ b/core/themes/seven/install-page.css
    @@ -41,147 +73,137 @@ body.install-page {
    +@media all and (min-width: 48em) and (max-width: 975px)  {
    

    Extra space between media query and { can be removed.

RainbowArray’s picture

Assigned: Unassigned » RainbowArray

I'll make these fixes.

RainbowArray’s picture

Here's a patch to make the fixes Cottser's suggested in #36.

I kept the same indenting as was in system, although I tend to agree that it makes sense to indent the container div.

RainbowArray’s picture

Status: Needs work » Needs review
RainbowArray’s picture

Assigned: RainbowArray » Unassigned
star-szr’s picture

Status: Needs review » Needs work

Looking much better, thanks @mdrummond!

+++ b/core/modules/system/templates/install-page.html.twig
@@ -12,64 +13,57 @@
+  <header role="banner">
+   {% if site_name or site_slogan %}
+      <div class="name-and-slogan">
+        {% if site_name %}
+          <h1>{{ site_name }}</h1>
+        {% endif %}
+        {% if site_slogan %}
+          <div class="site-slogan">{{ site_slogan }}</div>
+        {% endif %}
+      </div>{# /.name-and-slogan #}
+    {% endif %}
+  </header>

Missed this before, the opening if block needs to be indented by one more space. (Needs to be fixed in the seven template as well.)

LewisNyman’s picture

Status: Needs work » Needs review
FileSize
12.42 KB
992 bytes

Thanks @Cottser! Let's get this in.

LewisNyman’s picture

Issue summary: View changes

updated info about the maintainence template moved to seven theme folder

LewisNyman’s picture

The last submitted patch, 42: install-page-twig-markup-2041793-42.patch, failed testing.

LewisNyman’s picture

Needed a reroll.

Status: Needs review » Needs work

The last submitted patch, 45: install-page-twig-markup-2041793-44.patch, failed testing.

LewisNyman’s picture

Status: Needs work » Needs review

Status: Needs review » Needs work

The last submitted patch, 45: install-page-twig-markup-2041793-44.patch, failed testing.

LewisNyman’s picture

Status: Needs work » Needs review
FileSize
12.14 KB

Status: Needs review » Needs work

The last submitted patch, 49: install-page-twig-markup-2041793-49.patch, failed testing.

rteijeiro’s picture

FileSize
836.7 KB

After apply the patch the installer looks like the following screenshot:

Installer

Dragan Eror’s picture

Dragan Eror’s picture

The patch from #49 forks fine form me. I tested it with simplytest.me as well as on my local environment.

The last submitted patch, 49: install-page-twig-markup-2041793-49.patch, failed testing.

rteijeiro’s picture

It seems testbot is broken now. Some of the servers where updated to PHP 5.3.27 and Debian Wheezy as rfay told me and they are working to fix that.

Also thanks @Dragan. It seems I'm doing something wrong trying to test this patch. I will try again.

Dragan Eror’s picture

Assigned: Unassigned » Dragan Eror
FileSize
1.53 MB

Tested again, looks it is really broken.
Will see what I can do here...

Dragan Eror’s picture

FileSize
380.01 KB

Here is new image

d8 install

Dragan Eror’s picture

Assigned: Dragan Eror » Unassigned

I saw it, took screenshot, then I updated issue... But when I returned back to debug and work on it, I just reloaded page and everything works fine again... Tried to remove files, and to create settings.php again, but can't reproduce the BUG again :S

Dragan Eror’s picture

FileSize
318.12 KB

Here is example of showed slogan during installation. looks a bit ugly and like it doesn't follow the layout.
Drupal 8 installation page - slogan example

LewisNyman’s picture

Twig templates are cached by default, so you'd have to clear the cache to see the mark up changes.

Here is example of showed slogan during installation. looks a bit ugly and like it doesn't follow the layout.

There's an issue for that ;) #2043047: Slogan shown on installation pages

LewisNyman’s picture

Status: Needs work » Needs review
mortendk’s picture

Issue tags: +Twig
mortendk’s picture

Issue tags: -Twig +Twigtemplate
rteijeiro’s picture

New re-roll.

LewisNyman’s picture

Status: Needs review » Needs work

Saw a few things

  1. +++ b/core/themes/seven/install-page.css
    @@ -23,170 +20,181 @@
    +}
    

    We are missing some padding here. The previous #page selector was inheriting padding: 20px 0 40px 0; from Seven's style.css before.

  2. +++ b/core/themes/seven/install-page.css
    @@ -23,170 +20,181 @@
    +  /* Positioning sidebar & content */
    +  .install-page [role="main"] {
    

    I think we should have a blank line above comments. We also have a mix between block comments and one line comments.

rteijeiro’s picture

Status: Needs work » Needs review
FileSize
10.65 KB

Applied suggested changes in #65

LewisNyman’s picture

Status: Needs review » Needs work

Looks like the the Seven install.html.twig file fell out of the patch Ruben :(

rteijeiro’s picture

Status: Needs work » Needs review
FileSize
11.73 KB

Sorry, hope now it's correct :)

LewisNyman’s picture

Status: Needs review » Needs work

hmm the l-container class is missing a lot of styling. The #page selector still has the width and padding on it.

The last submitted patch, 68: install-page-twig-markup-2041793-68.patch, failed testing.

LewisNyman’s picture

Status: Needs work » Needs review
FileSize
1.95 KB
11.89 KB

Alright, I've tested this in all the things. Mobile, desktop, rtl, ltr, tlr. Let get this RTBC'd before we have to reroll again.

rteijeiro’s picture

Status: Needs review » Reviewed & tested by the community

Patch applies well and install page looks awesome. Let's go for RTBC!!

webchick’s picture

Status: Reviewed & tested by the community » Fixed
FileSize
185.23 KB

Cool, this looks like good clean-up.

Committed and pushed to 8.x. Thanks!

When testing this, I noticed that update.php and install.php are now wildly out of sync with each other in terms of look and feel. Is there a separate issue about cleaning that up?

Blue background vs. not, checkboxes vs. not, etc.

mortendk’s picture

nope there isnt an issue afaik - guess we need some design on it as well [2169655]

nod_’s picture

Issue tags: +JavaScript
philipz’s picture

Please ignore me if this is stupid question but I'm wondering why do we need two install-page.html.twig files (one in /core/themes/seven and one in /core/modules/system/templates)? It seems there's one too many ;)

LewisNyman’s picture

When testing this, I noticed that update.php and install.php are now wildly out of sync with each other in terms of look and feel. Is there a separate issue about cleaning that up?

I have been thinking about this. The installation design feels about 'loud' for update.php but we could have a tweaked version that's a little calmer. The progress elements should be more consistent at least.

#2169765: Redesign update.php to be more consistent with the installation process

Please ignore me if this is stupid question but I'm wondering why do we need two install-page.html.twig files (one in /core/themes/seven and one in /core/modules/system/templates)? It seems there's one too many ;)

/core/modules/system/templates is the default for every theme used in Drupal, the #1980004: [meta] Creating Dream Markup initiative aims to remove a lot of default Drupal html that is in 'just in case' some one needs it. If a theme requires extra elements or classes then the html should only be loaded for that theme not every theme.

philipz’s picture

@LewisNyman ok so we have two install-page.html.twig files and that's fine, thanks for clarifying that!

One last thing that bothers me is the /core/themes/seven/install-page.html.twig which should rather be in /core/themes/seven/templates/install-page.html.twig.

star-szr’s picture

Yes, I think install-page.css should probably get moved to the 'css' folder too. Can we get a small follow-up issue created to fix up those items? Thanks!

Edit: Actually there's a bunch of loose CSS, what do you think @LewisNyman? https://drupal.org/node/1887922 seems to say they should live under 'css'. Maybe there's an issue already.

philipz’s picture

I say this definitely should be cleaned up. While moving the files we might change "seven.base.css" to "base.css" to unify naming too.

Edit: duplicate issue link deleted.

LewisNyman’s picture

Wr already have an issue to move the CSS into a directory #2033211: Move Seven CSS files into css directory.

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.