Merge pull request #18 from boekkooi/Issue-18

Remove enable_yui_compressor
redkite-labs · Feb 21, 2014 · 2a76dba · 2a76dba
2 parents 5740c1a + 1594da1
commit 2a76dba
Show file tree

Hide file tree

Showing 23 changed files with 97 additions and 283 deletions.
diff --git a/src/RedKiteLabs/RedKiteCms/RedKiteCmsBundle/Controller/AlCmsController.php b/src/RedKiteLabs/RedKiteCms/RedKiteCmsBundle/Controller/AlCmsController.php
@@ -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,

diff --git a/src/RedKiteLabs/RedKiteCms/RedKiteCmsBundle/Controller/AlCmsElFinderController.php b/src/RedKiteLabs/RedKiteCms/RedKiteCmsBundle/Controller/AlCmsElFinderController.php
@@ -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()

diff --git a/src/RedKiteLabs/RedKiteCms/RedKiteCmsBundle/Controller/DeployController.php b/src/RedKiteLabs/RedKiteCms/RedKiteCmsBundle/Controller/DeployController.php
@@ -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'),
         );
     }

diff --git a/src/RedKiteLabs/RedKiteCms/RedKiteCmsBundle/Controller/ThemePreviewController.php b/src/RedKiteLabs/RedKiteCms/RedKiteCmsBundle/Controller/ThemePreviewController.php
@@ -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,
         );

diff --git a/src/RedKiteLabs/RedKiteCms/RedKiteCmsBundle/Core/Deploy/TemplateSection/AssetSection.php b/src/RedKiteLabs/RedKiteCms/RedKiteCmsBundle/Core/Deploy/TemplateSection/AssetSection.php
@@ -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()

diff --git a/src/RedKiteLabs/RedKiteCms/RedKiteCmsBundle/DependencyInjection/Configuration.php b/src/RedKiteLabs/RedKiteCms/RedKiteCmsBundle/DependencyInjection/Configuration.php
@@ -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()

diff --git a/src/RedKiteLabs/RedKiteCms/RedKiteCmsBundle/DependencyInjection/RedKiteCmsExtension.php b/src/RedKiteLabs/RedKiteCms/RedKiteCmsBundle/DependencyInjection/RedKiteCmsExtension.php
@@ -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']);

diff --git a/src/RedKiteLabs/RedKiteCms/RedKiteCmsBundle/Resources/config/config_rkcms.yml b/src/RedKiteLabs/RedKiteCms/RedKiteCmsBundle/Resources/config/config_rkcms.yml
@@ -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

diff --git a/src/RedKiteLabs/RedKiteCms/RedKiteCmsBundle/Resources/config/config_rkcms_test.yml b/src/RedKiteLabs/RedKiteCms/RedKiteCmsBundle/Resources/config/config_rkcms_test.yml
@@ -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
diff --git a/...s/RedKiteCmsBundle/Resources/views/Bootstrap/2.x/Security/Login/login-form-ajax.html.twig b/...s/RedKiteCmsBundle/Resources/views/Bootstrap/2.x/Security/Login/login-form-ajax.html.twig
@@ -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" />

diff --git a/...RedKiteCms/RedKiteCmsBundle/Resources/views/Bootstrap/2.x/Template/Cms/template.html.twig b/...RedKiteCms/RedKiteCmsBundle/Resources/views/Bootstrap/2.x/Template/Cms/template.html.twig
@@ -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" />
@@ -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>

diff --git a/...iteCms/RedKiteCmsBundle/Resources/views/Bootstrap/2.x/Template/Preview/template.html.twig b/...iteCms/RedKiteCmsBundle/Resources/views/Bootstrap/2.x/Template/Preview/template.html.twig
@@ -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" />
@@ -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>

diff --git a/...s/RedKiteCmsBundle/Resources/views/Bootstrap/3.x/Security/Login/login-form-ajax.html.twig b/...s/RedKiteCmsBundle/Resources/views/Bootstrap/3.x/Security/Login/login-form-ajax.html.twig
@@ -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 %}