Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove enable_yui_compressor #18

Merged
merged 1 commit into from
Feb 21, 2014
Merged

Remove enable_yui_compressor #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Controller/AlCmsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ public function showAction()

$params = array(
'template' => 'RedKiteCmsBundle:Cms:Welcome/welcome.html.twig',
'enable_yui_compressor' => $this->container->getParameter('red_kite_cms.enable_yui_compressor'),
'templateStylesheets' => null,
'templateJavascripts' => null,
'available_blocks' => null,
Expand Down
4 changes: 1 addition & 3 deletions Controller/AlCmsElFinderController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ class AlCmsElFinderController extends ContainerAware
{
public function showFilesManagerAction()
{
return $this->container->get('templating')->renderResponse('RedKiteCmsBundle:Elfinder:file_manager.html.twig', array(
'enable_yui_compressor' => $this->container->getParameter('red_kite_cms.enable_yui_compressor'),
));
return $this->container->get('templating')->renderResponse('RedKiteCmsBundle:Elfinder:file_manager.html.twig');
}

public function connectMediaAction()
Expand Down
1 change: 0 additions & 1 deletion Controller/DeployController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ private function getOptions($templatesFolder)
"deployController" => $this->container->getParameter('red_kite_cms.deploy_bundle.controller'),
"webFolderPath" => $this->container->getParameter('red_kite_cms.web_folder_full_path'),
"websiteUrl" => $this->container->getParameter('red_kite_cms.website_url'),
"yuiCompressorEnabled" => $this->container->getParameter('red_kite_cms.enable_yui_compressor'),
"credits" => $this->container->getParameter('red_kite_cms.love'),
);
}
Expand Down
1 change: 0 additions & 1 deletion Controller/ThemePreviewController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ public function previewThemeAction($languageName, $pageName, $themeName, $templa
'templateJavascripts' => $this->fixAssets($this->pageTree->getExternalJavascripts()),
'templates' => array_keys($theme->getTemplates()),
'frontController' => $this->getFrontcontroller(),
'enable_yui_compressor' => $this->container->getParameter('red_kite_cms.enable_yui_compressor'),
'language_name' => $languageName,
'page_name' => $pageName,
);
Expand Down
14 changes: 6 additions & 8 deletions Core/Deploy/TemplateSection/AssetSection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,40 +42,38 @@ public function generateSection(AlPageTree $pageTree, AlThemeInterface $theme, a
{
parent::generateSection($pageTree, $theme, $options);

$yuiEnabled = $options["yuiCompressorEnabled"];
$assetsSection = $this->writeComment("Assets section");
$assetsSection .= $this->generateExternalStylesheet($yuiEnabled);
$assetsSection .= $this->generateExternalJavascripts($yuiEnabled);
$assetsSection .= $this->generateExternalStylesheet();
$assetsSection .= $this->generateExternalJavascripts();
$assetsSection .= $this->generateInternalStylesheet();
$assetsSection .= $this->generateInternalJavascripts();

return $assetsSection;
}

private function generateExternalStylesheet($yuiEnabled)
private function generateExternalStylesheet()
{
$externalStylesheets = $this->pageTree->getExternalStylesheets();
if (empty($externalStylesheets)) {
return "";
}

$sectionContent = '<link href="{{ asset_url }}" rel="stylesheet" type="text/css" media="all" />';
$filter = $yuiEnabled ? '?yui_css,cssrewrite' : '?cssrewrite';
$filter = 'cssrewrite';

return $this->writeBlock('external_stylesheets', $this->writeAssetic('stylesheets', implode(' ', array_map(function ($value) { return '"' . $value . '"'; }, $externalStylesheets )), $sectionContent, $filter), true);
}

private function generateExternalJavascripts($yuiEnabled)
private function generateExternalJavascripts()
{
$externalJavascripts = $this->pageTree->getExternalJavascripts();
if (empty($externalJavascripts)) {
return "";
}

$sectionContent = '<script src="{{ asset_url }}"></script>';
$filter = $yuiEnabled ? '?yui_js' : '';

return $this->writeBlock('external_javascripts', $this->writeAssetic('javascripts', implode(' ', array_map(function ($value) { return '"' . $value . '"'; }, $externalJavascripts )), $sectionContent, $filter), true);
return $this->writeBlock('external_javascripts', $this->writeAssetic('javascripts', implode(' ', array_map(function ($value) { return '"' . $value . '"'; }, $externalJavascripts )), $sectionContent), true);
}

private function generateInternalStylesheet()
Expand Down
1 change: 0 additions & 1 deletion DependencyInjection/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ public function getConfigTreeBuilder()
->scalarNode('upload_assets_full_path')->defaultValue('%red_kite_cms.web_folder_full_path%/uploads/assets')->end()
->scalarNode('upload_assets_absolute_path')->defaultValue('/%red_kite_cms.web_folder%/uploads/assets')->end()
->scalarNode('theme_structure_file')->defaultValue('%kernel.root_dir%/Resources/.theme_structure')->end()
->booleanNode('enable_yui_compressor')->defaultFalse()->end()
->scalarNode('love')->defaultValue('yes')->end()
->scalarNode('website_url')->defaultValue('')->end()
->scalarNode('bootstrap_version')->defaultValue('3.x')->end()
Expand Down
1 change: 0 additions & 1 deletion DependencyInjection/RedKiteCmsExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ public function load(array $configs, ContainerBuilder $container)
$container->setParameter('red_kite_cms.web_folder_full_path', $config['web_folder_dir_full_path']);
$container->setParameter('red_kite_cms.upload_assets_dir', $config['upload_assets_dir']);
$container->setParameter('red_kite_cms.love', $config['love']);
$container->setParameter('red_kite_cms.enable_yui_compressor', $config['enable_yui_compressor']);
$container->setParameter('red_kite_cms.theme_structure_file', $config['theme_structure_file']);
$container->setParameter('red_kite_cms.website_url', $config['website_url']);
$container->setParameter('red_kite_cms.bootstrap_version', $config['bootstrap_version']);
Expand Down
7 changes: 0 additions & 7 deletions Resources/config/config_rkcms.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,6 @@ assetic:
bundles: [RedKiteCmsBundle]
filters:
cssrewrite: ~
yui_css:
jar: %kernel.root_dir%/Resources/java/yuicompressor.jar
yui_js:
jar: %kernel.root_dir%/Resources/java/yuicompressor.jar

red_kite_cms:
enable_yui_compressor: true

red_kite_labs_theme_engine:
render_slot_class: RedKiteLabs\RedKiteCmsBundle\Twig\SlotRendererExtension
Expand Down
1 change: 0 additions & 1 deletion Resources/config/config_rkcms_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ swiftmailer:
disable_delivery: true

red_kite_cms:
enable_yui_compressor: true
active_theme_file: %kernel.root_dir%/Resources/.tests_active_theme
2 changes: 1 addition & 1 deletion Resources/views/Bootstrap/2.x/Security/Login/login-form-ajax.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{% extends 'RedKiteCmsBundle:Bootstrap:' ~ bootstrap_version ~ '/base.html.twig' %}

{% block body %}
{% stylesheets filter='?yui_css,cssrewrite' 'components/redkitecms/twitter-bootstrap/2.x/css/bootstrap.min.css'
{% stylesheets filter='cssrewrite' 'components/redkitecms/twitter-bootstrap/2.x/css/bootstrap.min.css'
'components/redkitecms/twitter-bootstrap/2.x/css/bootstrap-responsive.min.css'
'bundles/redkitecms/css/skins/bootstrap/skin.css' %}
<link href="{{ asset_url }}" rel="stylesheet" type="text/css" media="all" />
Expand Down
71 changes: 22 additions & 49 deletions Resources/views/Bootstrap/2.x/Template/Cms/template.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,33 +16,19 @@
{% extends 'RedKiteCmsBundle:Template:Cms/template.html.twig' %}

{% block external_stylesheets %}
{% if enable_yui_compressor is defined and enable_yui_compressor %}
{% stylesheets filter='?yui_css,cssrewrite' 'components/redkitecms/twitter-bootstrap/2.x/css/bootstrap.min.css'
'components/redkitecms/twitter-bootstrap/2.x/css/bootstrap-responsive.min.css'
'components/redkitecms/font-awesome/css/font-awesome.min.css'
'bundles/redkitecms/css/skins/bootstrap/skin.css'
'bundles/redkitecms/css/skins/bootstrap/skin_2.x.css'
'components/redkitecms/jquery-ui/themes/smoothness/*'
'bundles/redkitelabselfinder/vendor/ElFinder/vendor/jquery-ui.css'
'bundles/redkitelabselfinder/vendor/ElFinder/css/elfinder.min.css'
'bundles/redkitelabselfinder/vendor/ElFinder/css/theme.css'
%}
<link href="{{ asset_url }}" rel="stylesheet" type="text/css" media="all" />
{% endstylesheets %}
{% else %}
{% stylesheets filter='?cssrewrite' 'components/redkitecms/twitter-bootstrap/2.x/css/bootstrap.min.css'
'components/redkitecms/twitter-bootstrap/2.x/css/bootstrap-responsive.min.css'
'components/redkitecms/font-awesome/css/font-awesome.min.css'
'bundles/redkitecms/css/skins/bootstrap/skin.css'
'bundles/redkitecms/css/skins/bootstrap/skin_2.x.css'
'components/redkitecms/jquery-ui/themes/smoothness/*'
'bundles/redkitelabselfinder/vendor/ElFinder/vendor/jquery-ui.css'
'bundles/redkitelabselfinder/vendor/ElFinder/css/elfinder.min.css'
'bundles/redkitelabselfinder/vendor/ElFinder/css/theme.css'
%}
<link href="{{ asset_url }}" rel="stylesheet" type="text/css" media="screen" />
{% endstylesheets %}
{% endif %}
{% stylesheets filter='cssrewrite'
'components/redkitecms/twitter-bootstrap/2.x/css/bootstrap.min.css'
'components/redkitecms/twitter-bootstrap/2.x/css/bootstrap-responsive.min.css'
'components/redkitecms/font-awesome/css/font-awesome.min.css'
'bundles/redkitecms/css/skins/bootstrap/skin.css'
'bundles/redkitecms/css/skins/bootstrap/skin_2.x.css'
'components/redkitecms/jquery-ui/themes/smoothness/*'
'bundles/redkitelabselfinder/vendor/ElFinder/vendor/jquery-ui.css'
'bundles/redkitelabselfinder/vendor/ElFinder/css/elfinder.min.css'
'bundles/redkitelabselfinder/vendor/ElFinder/css/theme.css'
%}
<link href="{{ asset_url }}" rel="stylesheet" type="text/css" media="screen" />
{% endstylesheets %}

{% for value in templateStylesheets %}
<link href="{{ asset(value) }}" rel="stylesheet" type="text/css" media="all" />
Expand All @@ -51,31 +37,18 @@

{% block external_javascripts %}
<script src="{{ asset('bundles/redkitecms/js/lang/' ~ cms_language ~ '.js') }}"></script>

{% if enable_yui_compressor is defined and enable_yui_compressor %}
{% javascripts filter='?yui_js' 'components/jquery/jquery.min.js'
'components/redkitecms/jquery-ui/js/jquery-ui.min.js'
'components/redkitecms/twitter-bootstrap/2.x/js/bootstrap.min.js'
'components/jquery-easing/jquery.easing.min.js'
'components/holderjs/holder.js'
'bundles/redkitelabselfinder/vendor/ElFinder/js/elfinder.min.js'
'bundles/redkitecms/js/*'
%}

<script src="{{ asset_url }}"></script>
{% endjavascripts %}
{% else %}
{% javascripts 'components/jquery/jquery.min.js'
'components/redkitecms/jquery-ui/js/jquery-ui.min.js'
'components/redkitecms/twitter-bootstrap/2.x/js/bootstrap.min.js'
'components/jquery-easing/jquery.easing.min.js'
'components/holderjs/holder.js'
'bundles/redkitelabselfinder/vendor/ElFinder/js/elfinder.min.js'
'bundles/redkitecms/js/*'

{% javascripts
'components/jquery/jquery.min.js'
'components/redkitecms/jquery-ui/js/jquery-ui.min.js'
'components/redkitecms/twitter-bootstrap/2.x/js/bootstrap.min.js'
'components/jquery-easing/jquery.easing.min.js'
'components/holderjs/holder.js'
'bundles/redkitelabselfinder/vendor/ElFinder/js/elfinder.min.js'
'bundles/redkitecms/js/*'
%}
<script src="{{ asset_url }}"></script>
{% endjavascripts %}
{% endif %}

{% for value in templateJavascripts %}
<script src="{{ asset(value) }}"></script>
Expand Down
67 changes: 21 additions & 46 deletions Resources/views/Bootstrap/2.x/Template/Preview/template.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,18 @@
{% extends 'RedKiteCmsBundle:Template:Preview/template.html.twig' %}

{% block external_stylesheets %}
{% if enable_yui_compressor is defined and enable_yui_compressor %}
{% stylesheets filter='?yui_css,cssrewrite' 'components/redkitecms/jquery-ui/themes/smoothness/*'
'components/redkitecms/twitter-bootstrap/2.x/css/bootstrap.min.css'
'components/redkitecms/twitter-bootstrap/2.x/css/bootstrap-responsive.min.css'
'bundles/redkitecms/css/skins/bootstrap/skin.css'
'bundles/redkitelabselfinder/vendor/ElFinder/vendor/jquery-ui.css'
'bundles/redkitelabselfinder/vendor/ElFinder/css/elfinder.min.css'
'bundles/redkitelabselfinder/vendor/ElFinder/css/theme.css'
%}
<link href="{{ asset_url }}" rel="stylesheet" type="text/css" media="all" />
{% endstylesheets %}
{% else %}
{% stylesheets filter='?cssrewrite' 'components/redkitecms/jquery-ui/themes/smoothness/*'
'components/redkitecms/twitter-bootstrap/2.x/css/bootstrap.min.css'
'components/redkitecms/twitter-bootstrap/2.x/css/bootstrap-responsive.min.css'
'bundles/redkitecms/vendor/vendor-adapter.css'
'bundles/redkitecms/css/skins/bootstrap/skin.css'
'bundles/redkitelabselfinder/vendor/ElFinder/vendor/jquery-ui.css'
'bundles/redkitelabselfinder/vendor/ElFinder/css/elfinder.min.css'
'bundles/redkitelabselfinder/vendor/ElFinder/css/theme.css'
%}
<link href="{{ asset_url }}" rel="stylesheet" type="text/css" media="screen" />
{% endstylesheets %}
{% endif %}
{% stylesheets filter='cssrewrite'
'components/redkitecms/jquery-ui/themes/smoothness/*'
'components/redkitecms/twitter-bootstrap/2.x/css/bootstrap.min.css'
'components/redkitecms/twitter-bootstrap/2.x/css/bootstrap-responsive.min.css'
'bundles/redkitecms/vendor/vendor-adapter.css'
'bundles/redkitecms/css/skins/bootstrap/skin.css'
'bundles/redkitelabselfinder/vendor/ElFinder/vendor/jquery-ui.css'
'bundles/redkitelabselfinder/vendor/ElFinder/css/elfinder.min.css'
'bundles/redkitelabselfinder/vendor/ElFinder/css/theme.css'
%}
<link href="{{ asset_url }}" rel="stylesheet" type="text/css" media="screen" />
{% endstylesheets %}

{% for value in templateStylesheets %}
<link href="{{ asset(value) }}" rel="stylesheet" type="text/css" media="all" />
Expand All @@ -48,31 +36,18 @@

{% block external_javascripts %}
<script src="{{ asset('bundles/redkitecms/js/lang/' ~ cms_language ~ '.js') }}"></script>

{% if enable_yui_compressor is defined and enable_yui_compressor %}
{% javascripts filter='?yui_js' 'components/jquery/jquery.min.js'
'components/redkitecms/jquery-ui/js/jquery-ui.min.js'
'components/redkitecms/twitter-bootstrap/2.x/js/bootstrap.js'
'components/jquery-easing/jquery.easing.min.js'
'components/holderjs/holder.js'
'bundles/redkitelabselfinder/vendor/ElFinder/js/elfinder.min.js'
'bundles/redkitecms/js/*'
%}

<script src="{{ asset_url }}"></script>
{% endjavascripts %}
{% else %}
{% javascripts 'components/jquery/jquery.min.js'
'components/redkitecms/jquery-ui/js/jquery-ui.min.js'
'components/redkitecms/twitter-bootstrap/2.x/js/bootstrap.min.js'
'components/jquery-easing/jquery.easing.min.js'
'components/holderjs/holder.js'
'bundles/redkitelabselfinder/vendor/ElFinder/js/elfinder.min.js'
'bundles/redkitecms/js/*'

{% javascripts
'components/jquery/jquery.min.js'
'components/redkitecms/jquery-ui/js/jquery-ui.min.js'
'components/redkitecms/twitter-bootstrap/2.x/js/bootstrap.min.js'
'components/jquery-easing/jquery.easing.min.js'
'components/holderjs/holder.js'
'bundles/redkitelabselfinder/vendor/ElFinder/js/elfinder.min.js'
'bundles/redkitecms/js/*'
%}
<script src="{{ asset_url }}"></script>
{% endjavascripts %}
{% endif %}

{% for value in templateJavascripts %}
<script src="{{ asset(value) }}"></script>
Expand Down
2 changes: 1 addition & 1 deletion Resources/views/Bootstrap/3.x/Security/Login/login-form-ajax.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{% extends 'RedKiteCmsBundle:Bootstrap:' ~ bootstrap_version ~ '/base.html.twig' %}

{% block body %}
{% stylesheets filter='?yui_css,cssrewrite' 'components/redkitecms/twitter-bootstrap/3.x/css/bootstrap.min.css'
{% stylesheets filter='cssrewrite' 'components/redkitecms/twitter-bootstrap/3.x/css/bootstrap.min.css'
'bundles/redkitecms/css/skins/bootstrap/skin.css' %}
<link href="{{ asset_url }}" rel="stylesheet" type="text/css" media="all" />
{% endstylesheets %}
Expand Down
Loading