layout.module - Convert PHPTemplate templates to Twig

Attached patch converts one-col.tpl.php and two-col.tpl.php to twig templates. Doesn't seem like much else needs to happen for converting this module to twig.

Ignore the patch from #2, left out the two column template conversion.

@duellj great work that seems to be the ticket!

Needs a bit of docblock cleanup and it's RTBC
http://drupal.org/node/1823416

I think it's just the $'s and the [] and maybe some labeling
Available variables:
@ingroup themeable

Thanks for the review @joelpittet.

I've cleaned up the docblocks and added in comments for the attributes variable.

Cool, I some manual testing and seems to do exactly as advertised. Nice work!

Just removed the whitespace error in the patch.

Whoops, wrong patch files.

#8: 1898424-7-twig-layout.patch queued for re-testing.

#8: 1898424-7-twig-layout.patch queued for re-testing.

I think we should be converting these two templates as well:

core/modules/layout/tests/layouts/static/one-col/one-col.tpl.php
core/modules/layout/tests/themes/layout_test_theme/layouts/static/two-col/two-col.tpl.php

CNW for #11.

Conversions added from #13, thanks @Cottser for spotting those.

That was quick, thanks @joelpittet :)

Minor docs tweaks and then I think we can go back to RTBC-land.

+++ b/core/modules/layout/layouts/static/one-col/one-col.html.twigundefined
@@ -0,0 +1,21 @@
+ * - content: An array of content, each item in the array is keyed to one

+++ b/core/modules/layout/layouts/static/twocol/two-col.html.twigundefined
@@ -0,0 +1,27 @@
+ * - content: An array of content, each item in the array is keyed to one

+++ b/core/modules/layout/tests/layouts/static/one-col/one-col.html.twigundefined
@@ -0,0 +1,20 @@
+ * - content: An array of content, each item in the array is keyed to one

+++ b/core/modules/layout/tests/themes/layout_test_theme/layouts/static/two-col/two-col.html.twigundefined
@@ -0,0 +1,26 @@
+ * - content: An array of content, each item in the array is keyed to one

Instead of "An array of content" how about "All content items", and instead of "each item in the array" how about "each content item"?

+++ b/core/modules/layout/layouts/static/twocol/two-col.html.twigundefined
@@ -0,0 +1,27 @@
+ * @ingroup: themeable

+++ b/core/modules/layout/tests/themes/layout_test_theme/layouts/static/two-col/two-col.html.twigundefined
@@ -0,0 +1,26 @@
+ * @ingroup: themeable

No colon after @ingroup.

Changes from #14

Add conversion summary table

Update remaining

Performed manual testing (looks great) and added testing steps to summary. This patch only rewraps comments, so RTBC!

Great work @duellj and @joelpittet :)

Add testing steps

Tweak testing steps

Remove sandbox link

Tagging for profiling.

Assigning to myself for profiling.

All tests with Stark, disabled overlay, enabled APC class loader

For admin/structure/templates/manage/static_layout%3Alayout__two-col

=== 8.x..8.x compared (5199303f89141..519932b03de94):

ct  : 33,528|33,528|0|0.0%
wt  : 195,976|196,278|302|0.2%
cpu : 192,012|192,013|1|0.0%
mu  : 10,380,160|10,379,688|-472|-0.0%
pmu : 10,495,312|10,495,248|-64|-0.0%

=== 8.x..1898424 compared (5199303f89141..519932bf58536):

ct  : 33,528|33,902|374|1.1%
wt  : 195,976|213,117|17,141|8.7%
cpu : 192,012|196,012|4,000|2.1%
mu  : 10,380,160|10,558,752|178,592|1.7%
pmu : 10,495,312|10,672,888|177,576|1.7%

For admin/structure/templates/manage/static_layout:layout__one-col

=== 8.x..8.x compared (519936bfc0e17..519936e3ba473):

ct  : 33,499|33,499|0|0.0%
wt  : 193,018|193,700|682|0.4%
cpu : 188,012|192,012|4,000|2.1%
mu  : 10,375,416|10,375,416|0|0.0%
pmu : 10,487,768|10,487,768|0|0.0%

=== 8.x..1898424 compared (519936bfc0e17..51993708753db):

ct  : 33,499|33,873|374|1.1%
wt  : 193,018|211,519|18,501|9.6%
cpu : 188,012|200,012|12,000|6.4%
mu  : 10,375,416|10,554,456|179,040|1.7%
pmu : 10,487,768|10,668,264|180,496|1.7%

Ignore above numbers, talked to @Cottser and I did not have a node displayed on the page.

I'll run through this one, thanks @mr.baileys!

Profiling is looking good on this one, not much fluctuation.

one-col template:

=== 8.x..8.x compared (519bea45d25a7..519beb006fe33):

ct  : 49,589|49,589|0|0.0%
wt  : 317,900|317,069|-831|-0.3%
cpu : 297,058|296,950|-108|-0.0%
mu  : 21,353,424|21,353,424|0|0.0%
pmu : 21,485,680|21,485,680|0|0.0%

http://www.lionsad.de/xhprof-kit/xhprof/xhprof_html/?run1=519bea45d25a7&...

=== 8.x..layout-1898424-16 compared (519bea45d25a7..519beac12c1aa):

ct  : 49,589|49,672|83|0.2%
wt  : 317,900|318,232|332|0.1%
cpu : 297,058|298,208|1,150|0.4%
mu  : 21,353,424|21,383,296|29,872|0.1%
pmu : 21,485,680|21,517,080|31,400|0.1%

http://www.lionsad.de/xhprof-kit/xhprof/xhprof_html/?run1=519bea45d25a7&...

two-col template

=== 8.x..8.x compared (519c10e55cf0a..519c113513469):

ct  : 49,628|49,628|0|0.0%
wt  : 319,561|318,978|-583|-0.2%
cpu : 298,990|298,655|-335|-0.1%
mu  : 21,357,040|21,357,040|0|0.0%
pmu : 21,492,696|21,492,696|0|0.0%

http://www.lionsad.de/xhprof-kit/xhprof/xhprof_html/?run1=519c10e55cf0a&...

=== 8.x..layout-1898424-16 compared (519c10e55cf0a..519c116a1cb99):

ct  : 49,628|49,719|91|0.2%
wt  : 319,561|318,938|-623|-0.2%
cpu : 298,990|297,353|-1,637|-0.5%
mu  : 21,357,040|21,389,112|32,072|0.2%
pmu : 21,492,696|21,526,712|34,016|0.2%

http://www.lionsad.de/xhprof-kit/xhprof/xhprof_html/?run1=519c10e55cf0a&...

Docs tweak please and then back to RTBC and ready to be alexpotted :)

+++ b/core/modules/layout/layouts/static/one-col/one-col.html.twigundefined
@@ -0,0 +1,21 @@
+ * - attributes: Attributes to be placed on the wrapping element.
+ * - content: All content items, each content item is keyed to one region of the
+ *   layout. This layout supports only one section:
+ *   - content.content: Content in the content column.

+++ b/core/modules/layout/layouts/static/twocol/two-col.html.twigundefined
@@ -0,0 +1,27 @@
+ * - content: All content items, each content item is keyed to one region of the
+ *   layout. This layout supports the following sections:
+ *   - content.first: Content in the first column.
+ *   - content.second: Content in the second column.

+++ b/core/modules/layout/tests/layouts/static/one-col/one-col.html.twigundefined
@@ -0,0 +1,20 @@
+ * - content: All content items, each content item is keyed to one region of the
+ *   layout. This layout supports the following sections:
+ *   - content.middle: The only region in the layout.

+++ b/core/modules/layout/tests/themes/layout_test_theme/layouts/static/two-col/two-col.html.twigundefined
@@ -0,0 +1,26 @@
+ * - content: All content items, each content item is keyed to one region of the
+ *   layout. This layout supports the following sections:
+ *   - content.left: Content in the left column.
+ *   - content.right: Content in the right column.

Can we please change all these so that we are not doing e.g. 'content.content', since we want indenting in a list to mean 'add a dot'. Along these lines I also suggest we be a bit more clear and say e.g. 'content' contains the following sections: instead of This layout supports the following sections:?

Thanks!

Was this what you had in mind Cottser? I also changed the pluralization for the one column templates

Looks good to me, thanks @duellj!

+1. Ready for #1987510: [meta] Convert all core *.tpl.php templates to Twig as singular patch

Updated issue summary.

Add commit message

Committed 43934a3 and pushed to 8.x. Thanks!