diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php index 5ffc45e75a..c279726434 100644 --- a/phpBB/includes/template/twig/extension.php +++ b/phpBB/includes/template/twig/extension.php @@ -57,6 +57,7 @@ class phpbb_template_twig_extension extends Twig_Extension new phpbb_template_twig_tokenparser_define, new phpbb_template_twig_tokenparser_include, new phpbb_template_twig_tokenparser_includejs, + new phpbb_template_twig_tokenparser_includecss, new phpbb_template_twig_tokenparser_event, new phpbb_template_twig_tokenparser_includephp, new phpbb_template_twig_tokenparser_php, diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php index d0a84a8b7f..46412ad048 100644 --- a/phpBB/includes/template/twig/lexer.php +++ b/phpBB/includes/template/twig/lexer.php @@ -35,6 +35,7 @@ class phpbb_template_twig_lexer extends Twig_Lexer 'INCLUDE', 'INCLUDEPHP', 'INCLUDEJS', + 'INCLUDECSS', 'PHP', 'ENDPHP', 'EVENT', @@ -78,6 +79,7 @@ class phpbb_template_twig_lexer extends Twig_Lexer 'INCLUDE', 'INCLUDEPHP', 'INCLUDEJS', + 'INCLUDECSS', ), $code); // Fix our BEGIN statements diff --git a/phpBB/includes/template/twig/node/includecss.php b/phpBB/includes/template/twig/node/includecss.php new file mode 100644 index 0000000000..01fda44aad --- /dev/null +++ b/phpBB/includes/template/twig/node/includecss.php @@ -0,0 +1,30 @@ +raw("raw("\$asset_file . '\"") + ->raw(' rel="stylesheet" type="text/css" media="screen, projection" />') + ; + } +} diff --git a/phpBB/includes/template/twig/tokenparser/includecss.php b/phpBB/includes/template/twig/tokenparser/includecss.php new file mode 100644 index 0000000000..6c24dda647 --- /dev/null +++ b/phpBB/includes/template/twig/tokenparser/includecss.php @@ -0,0 +1,38 @@ +parser->getExpressionParser()->parseExpression(); + + $stream = $this->parser->getStream(); + $stream->expect(Twig_Token::BLOCK_END_TYPE); + + return new phpbb_template_twig_node_includecss($expr, $this->parser->getEnvironment(), $token->getLine(), $this->getTag()); + } + + /** + * Gets the tag name associated with this token parser. + * + * @return string The tag name + */ + public function getTag() + { + return 'INCLUDECSS'; + } +} diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 3c98edec79..25094bbf5d 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -76,6 +76,8 @@ +{$STYLESHEETS} + diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index 0317d6e45c..bc2307154b 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -132,6 +132,8 @@ function marklist(id, name, state) +{$STYLESHEETS} + diff --git a/tests/template/parent_templates/parent_only.css b/tests/template/parent_templates/parent_only.css new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/template/template_includecss_test.php b/tests/template/template_includecss_test.php new file mode 100644 index 0000000000..f8999ad1a9 --- /dev/null +++ b/tests/template/template_includecss_test.php @@ -0,0 +1,28 @@ +setup_engine(array('assets_version' => 1)); + + // Prepare correct result + $scripts = array( + '', + '', + ); + + // Run test + $this->run_template('includecss.html', array(), array(), array(), implode('', $scripts)); + } +} diff --git a/tests/template/templates/child_only.css b/tests/template/templates/child_only.css new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/template/templates/includecss.html b/tests/template/templates/includecss.html new file mode 100644 index 0000000000..a09e44f240 --- /dev/null +++ b/tests/template/templates/includecss.html @@ -0,0 +1,3 @@ + + +{$STYLESHEETS} diff --git a/tests/template/templates/twig_parent.html b/tests/template/templates/twig_parent.html index af528e0da4..e9863221e1 100644 --- a/tests/template/templates/twig_parent.html +++ b/tests/template/templates/twig_parent.html @@ -4,4 +4,4 @@ 2 - \ No newline at end of file +