Added the ability to specify a skin for all forms via the config file…

… or for a single form.
petesiss · May 24, 2012 · 5bac201 · 5bac201
1 parent d585c50
commit 5bac201
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -119,7 +119,13 @@ public function getConfigTreeBuilder()
                     ->defaultNull()
                     ->setInfo("The location of the script that handles file uploads in the Flash dialog window.")
                 ->end()
-            ->end()   
+            ->end()
+			->children()
+                ->scalarNode('skin')
+                    ->defaultNull()
+                    ->setInfo("The location and name of the skin to be used.")
+                ->end()
+            ->end()
         ;
 
         return $treeBuilder;

diff --git a/DependencyInjection/TrsteelCkeditorExtension.php b/DependencyInjection/TrsteelCkeditorExtension.php
@@ -45,6 +45,7 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setParameter('trsteel_ckeditor.ckeditor.filebrowser_image_upload_url', $config['filebrowser_image_upload_url']);
         $container->setParameter('trsteel_ckeditor.ckeditor.filebrowser_flash_browse_url', $config['filebrowser_flash_browse_url']);
         $container->setParameter('trsteel_ckeditor.ckeditor.filebrowser_flash_upload_url', $config['filebrowser_flash_upload_url']);
+		$container->setParameter('trsteel_ckeditor.ckeditor.skin', $config['skin']);
     }
 
     private function getDefaultGroups()

diff --git a/Form/Type/CkeditorType.php b/Form/Type/CkeditorType.php
@@ -62,6 +62,7 @@ public function buildForm(FormBuilder $builder, array $options)
             ->setAttribute('filebrowser_image_upload_url', $options['filebrowser_image_upload_url'])
             ->setAttribute('filebrowser_flash_browse_url', $options['filebrowser_flash_browse_url'])
             ->setAttribute('filebrowser_flash_upload_url', $options['filebrowser_flash_upload_url'])
+			->setAttribute('skin', $options['skin'])
         ;
     }
 
@@ -107,6 +108,7 @@ public function buildView(FormView $view, FormInterface $form)
             ->set('filebrowser_image_upload_url', $form->getAttribute('filebrowser_image_upload_url'))
             ->set('filebrowser_flash_browse_url', $form->getAttribute('filebrowser_flash_browse_url'))
             ->set('filebrowser_flash_upload_url', $form->getAttribute('filebrowser_flash_upload_url'))
+			->set('skin', $form->getAttribute('skin'))
         ;
     }
 
@@ -130,7 +132,8 @@ public function getDefaultOptions()
             'filebrowser_image_browse_url' => $this->container->getParameter('trsteel_ckeditor.ckeditor.filebrowser_image_browse_url'),
             'filebrowser_image_upload_url' => $this->container->getParameter('trsteel_ckeditor.ckeditor.filebrowser_image_upload_url'),
             'filebrowser_flash_browse_url' => $this->container->getParameter('trsteel_ckeditor.ckeditor.filebrowser_flash_browse_url'),
-            'filebrowser_flash_upload_url' => $this->container->getParameter('trsteel_ckeditor.ckeditor.filebrowser_flash_upload_url'),            
+            'filebrowser_flash_upload_url' => $this->container->getParameter('trsteel_ckeditor.ckeditor.filebrowser_flash_upload_url'),
+			'skin'                         => $this->container->getParameter('trsteel_ckeditor.ckeditor.skin'),
         );
     }
 

diff --git a/Resources/views/Form/ckeditor_widget.html.twig b/Resources/views/Form/ckeditor_widget.html.twig
@@ -40,6 +40,9 @@
             {% endif %}
             {% if filebrowser_flash_upload_url is not null %}
                 filebrowserFlashUploadUrl: '{{ filebrowser_flash_upload_url }}',
+            {% endif %}
+			{% if skin is not null %}
+                skin: '{{ skin }}',
             {% endif %}
             toolbar: {{ toolbar | json_encode | raw }}
         });

diff --git a/Tests/Form/CkeditorTypeTest.php b/Tests/Form/CkeditorTypeTest.php
@@ -421,5 +421,20 @@ public function testFilebrowserFlashUploadUrl()
         $filebrowserFlashUploadUrl = $view->get('filebrowser_flash_upload_url');
 
         $this->assertEquals($filebrowserFlashUploadUrl, '/myfilebrowser/uploads');
-    }    
+    }
+
+	/**
+     * Checks skin property
+     */
+    public function testSkin()
+    {
+        $form = $this->factory->create('ckeditor', null, array(
+            'skin' => 'myskin,/skins/myskin/',
+        ));
+
+        $view = $form->createView();
+        $skin = $view->get('skin');
+
+        $this->assertEquals($skin, 'myskin,/skins/myskin/');
+    }
 }