From 159f018056659fa3eccae744ec513efbd2221f77 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 11 Jul 2013 15:22:05 -0500
Subject: [ticket/11388] INCLUDECSS

PHPBB3-11388
---
 phpBB/includes/template/twig/extension.php         |  1 +
 phpBB/includes/template/twig/lexer.php             |  2 ++
 phpBB/includes/template/twig/node/includecss.php   | 30 +++++++++++++++++
 .../template/twig/tokenparser/includecss.php       | 38 ++++++++++++++++++++++
 .../styles/prosilver/template/overall_header.html  |  2 ++
 .../styles/subsilver2/template/overall_header.html |  2 ++
 6 files changed, 75 insertions(+)
 create mode 100644 phpBB/includes/template/twig/node/includecss.php
 create mode 100644 phpBB/includes/template/twig/tokenparser/includecss.php

(limited to 'phpBB')

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 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_node_includecss extends phpbb_template_twig_node_includeasset
+{
+	public function get_definition_name()
+	{
+		return 'STYLESHEETS';
+	}
+
+	/**
+	 * Compiles the node to PHP.
+	 *
+	 * @param Twig_Compiler A Twig_Compiler instance
+	 */
+	public function append_asset(Twig_Compiler $compiler)
+	{
+		$compiler
+			->raw("<link href=\"' . ")
+			->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 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_tokenparser_includecss extends Twig_TokenParser
+{
+	/**
+	 * Parses a token and returns a node.
+	 *
+	 * @param Twig_Token $token A Twig_Token instance
+	 *
+	 * @return Twig_NodeInterface A Twig_NodeInterface instance
+	 */
+	public function parse(Twig_Token $token)
+	{
+		$expr = $this->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 @@
 
 <!-- EVENT overall_header_head_append -->
 
+{$STYLESHEETS}
+
 </head>
 <body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
 
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)
 
 <!-- EVENT overall_header_head_append -->
 
+{$STYLESHEETS}
+
 </head>
 <body class="{S_CONTENT_DIRECTION}">
 
-- 
cgit v1.2.1