makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11388] INCLUDECSS

Browse source 
PHPBB3-11388
This commit is contained in:
Nathaniel Guse 2013-07-11 15:22:05 -05:00
parent 59f34bef08
commit 159f018056
10 changed files with 106 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/includes/template/twig/extension.php
View file

@ -57,6 +57,7 @@ class phpbb_template_twig_extension extends Twig_Extension
new phpbb_template_twig_tokenparser_define, new phpbb_template_twig_tokenparser_define,
new phpbb_template_twig_tokenparser_include, new phpbb_template_twig_tokenparser_include,
new phpbb_template_twig_tokenparser_includejs, new phpbb_template_twig_tokenparser_includejs,
new phpbb_template_twig_tokenparser_includecss,
new phpbb_template_twig_tokenparser_event, new phpbb_template_twig_tokenparser_event,
new phpbb_template_twig_tokenparser_includephp, new phpbb_template_twig_tokenparser_includephp,
new phpbb_template_twig_tokenparser_php, new phpbb_template_twig_tokenparser_php,

2
phpBB/includes/template/twig/lexer.php
View file

@ -35,6 +35,7 @@ class phpbb_template_twig_lexer extends Twig_Lexer
'INCLUDE', 'INCLUDE',
'INCLUDEPHP', 'INCLUDEPHP',
'INCLUDEJS', 'INCLUDEJS',
'INCLUDECSS',
'PHP', 'PHP',
'ENDPHP', 'ENDPHP',
'EVENT', 'EVENT',
@ -78,6 +79,7 @@ class phpbb_template_twig_lexer extends Twig_Lexer
'INCLUDE', 'INCLUDE',
'INCLUDEPHP', 'INCLUDEPHP',
'INCLUDEJS', 'INCLUDEJS',
'INCLUDECSS',
), $code); ), $code);
// Fix our BEGIN statements // Fix our BEGIN statements

30
phpBB/includes/template/twig/node/includecss.php Normal file
View file

@ -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" />')
;
}
}

38
phpBB/includes/template/twig/tokenparser/includecss.php Normal file
View file

@ -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';
}
}

2
phpBB/styles/prosilver/template/overall_header.html
View file

@ -76,6 +76,8 @@
<!-- EVENT overall_header_head_append --> <!-- EVENT overall_header_head_append -->
{$STYLESHEETS}
</head> </head>
<body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}"> <body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">

2
phpBB/styles/subsilver2/template/overall_header.html
View file

@ -132,6 +132,8 @@ function marklist(id, name, state)
<!-- EVENT overall_header_head_append --> <!-- EVENT overall_header_head_append -->
{$STYLESHEETS}
</head> </head>
<body class="{S_CONTENT_DIRECTION}"> <body class="{S_CONTENT_DIRECTION}">

0
tests/template/parent_templates/parent_only.css Normal file
View file

28
tests/template/template_includecss_test.php Normal file
View file

@ -0,0 +1,28 @@
<?php
/**
*
* @package testing
* @copyright (c) 2013 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
require_once dirname(__FILE__) . '/template_test_case_with_tree.php';
class phpbb_template_template_includecss_test extends phpbb_template_template_test_case_with_tree
{
public function test_includecss_compilation()
{
// Reset the engine state
$this->setup_engine(array('assets_version' => 1));
// Prepare correct result
$scripts = array(
'<link href="' . $this->test_path . '/templates/child_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen, projection" />',
'<link href="' . $this->test_path . '/parent_templates/parent_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen, projection" />',
);
// Run test
$this->run_template('includecss.html', array(), array(), array(), implode('', $scripts));
}
}

0
tests/template/templates/child_only.css Normal file
View file

3
tests/template/templates/includecss.html Normal file
View file

@ -0,0 +1,3 @@
<!-- INCLUDECSS child_only.css -->
<!-- INCLUDECSS parent_only.css -->
{$STYLESHEETS}