Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1509 from EXreaction/ticket/11388
Ticket/11388 INCLUDECSS
- Loading branch information
Showing
11 changed files
with
107 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" />') | ||
; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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'; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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)); | ||
} | ||
} |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
<!-- INCLUDECSS child_only.css --> | ||
<!-- INCLUDECSS parent_only.css --> | ||
{$STYLESHEETS} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,4 +4,4 @@ | |
|
||
<!-- BLOCK overwritten --> | ||
2 | ||
<!-- ENDBLOCK --> | ||
<!-- ENDBLOCK --> |