Author: Jonathan.Wage
Date: 2010-03-03 16:55:04 +0100 (Wed, 03 Mar 2010)
New Revision: 28368
Modified:
plugins/sfSympalPlugin/trunk/config/app.yml
plugins/sfSympalPlugin/trunk/lib/events/sfSympalContextLoadFactoriesListener.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAssetsPlugin/lib/model/types/sfSympalAssetObject.class.php
plugins/sfSympalPlugin/trunk/lib/sfSympalConfiguration.class.php
Log:
[sfSympalPlugin] Synchronizing git repository to Symfony Plugins SVN
Modified: plugins/sfSympalPlugin/trunk/config/app.yml
===================================================================
--- plugins/sfSympalPlugin/trunk/config/app.yml 2010-03-03 15:24:56 UTC (rev
28367)
+++ plugins/sfSympalPlugin/trunk/config/app.yml 2010-03-03 15:55:04 UTC (rev
28368)
@@ -222,35 +222,27 @@
content_slot_types:
#MySlotType:
# label: Label of My Slot Type
- # form: MySlotForm (defaults to sfSympalInlineEditContentSlotForm)
- # form_renderer: some_module/form_partial
- # widget_class: MySlotTypeWidget (defaults to
sfWidgetFormSympalMySlotType)
+ # form: MySlotForm default:
sfSympalInlineEditContentSlotForm
+ # form_renderer: some_module/form_partial default:
sympal_edit_slot/slot_editor_form
+ # widget_class: MySlotTypeWidget default:
sfWidgetFormSympalXXXXXXType
# widget_options: []
- # validator_class: MySlotTypeValidator (defaults to
sfValidatorFormSympalMySlotType)
+ # validator_class: MySlotTypeValidator default:
sfValidatorFormSympalXXXXXXType
# validator_options: []
Text:
label: Single Line of Text
- form: sfSympalInlineEditContentSlotForm
- form_renderer: sympal_edit_slot/slot_editor_form
transformers: [replacer]
RawHtml:
label: Raw HTML
- form: sfSympalInlineEditContentSlotForm
- form_renderer: sympal_edit_slot/slot_editor_form
transformers: [replacer]
Markdown:
label: Markdown Editor
- form: sfSympalInlineEditContentSlotForm
- form_renderer: sympal_edit_slot/slot_editor_form
transformers: [replacer, markdown]
TinyMCE:
label: TinyMCE Rich Text Editor
- form: sfSympalInlineEditContentSlotForm
- form_renderer: sympal_edit_slot/slot_editor_form
widget_options:
config: 'handle_event_callback : "sympalHandleTinyMCEEvent"'
transformers: [replacer]
-
+
slot_transformers:
replacer: [sfSympalContentSlotReplacer, transformSlotContent]
markdown: [sfSympalMarkdownRenderer, convertToHtml]
Modified:
plugins/sfSympalPlugin/trunk/lib/events/sfSympalContextLoadFactoriesListener.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/events/sfSympalContextLoadFactoriesListener.class.php
2010-03-03 15:24:56 UTC (rev 28367)
+++
plugins/sfSympalPlugin/trunk/lib/events/sfSympalContextLoadFactoriesListener.class.php
2010-03-03 15:55:04 UTC (rev 28368)
@@ -19,6 +19,7 @@
$this->_symfonyContext = $event->getSubject();
$this->_invoker->setCache(new sfSympalCache($this->_invoker));
$this->_invoker->setSymfonyContext($this->_symfonyContext);
+
$this->_invoker->setProjectConfiguration($this->_symfonyContext->getConfiguration());
$this->_sympalContext =
sfSympalContext::createInstance($this->_symfonyContext, $this->_invoker);
$this->_invoker->setSympalContext($this->_sympalContext);
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAssetsPlugin/lib/model/types/sfSympalAssetObject.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAssetsPlugin/lib/model/types/sfSympalAssetObject.class.php
2010-03-03 15:24:56 UTC (rev 28367)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAssetsPlugin/lib/model/types/sfSympalAssetObject.class.php
2010-03-03 15:55:04 UTC (rev 28368)
@@ -15,7 +15,7 @@
public function __construct($filePath)
{
$this->_filePath = $filePath;
- $this->_rootPath =
sfConfig::get('sf_web_dir').sfSympalConfig::get('assets', 'root_dir',
'/uploads');
+ $this->_rootPath =
sfConfig::get('sf_web_dir').sfSympalConfig::get('assets', 'root_dir',
DIRECTORY_SEPARATOR.'uploads');
if ($this->getTypeFromExtension() != $this->_type && $this->_type !==
'file')
{
@@ -64,7 +64,7 @@
public function getPath()
{
- return realpath($this->_rootPath.'/'.$this->getFilePath());
+ return realpath($this->_rootPath.DIRECTORY_SEPARATOR.$this->getFilePath());
}
public function getRelativePath()
@@ -123,7 +123,7 @@
{
if (!$this->_original)
{
- $original =
sfSympalAssetToolkit::createAssetObject($this->getRelativePathDirectory().'/'.sfSympalConfig::get('assets',
'originals_dir').'/'.$this->getName());
+ $original =
sfSympalAssetToolkit::createAssetObject($this->getRelativePathDirectory().DIRECTORY_SEPARATOR.sfSympalConfig::get('assets',
'originals_dir').DIRECTORY_SEPARATOR.$this->getName());
if ($original->exists())
{
$this->_original = $original;
@@ -169,12 +169,12 @@
public function rename($newName)
{
- $this->move($this->getPathDirectory().'/'.$newName);
+ $this->move($this->getPathDirectory().DIRECTORY_SEPARATOR.$newName);
}
public function moveTo($path)
{
- $this->move($path.'/'.$this->getName());
+ $this->move($path.DIRECTORY_SEPARATOR.$this->getName());
}
public function move($newPath)
@@ -184,7 +184,7 @@
$this->setNewPath($newPath);
if ($original)
{
-
$original->move($this->getPathDirectory().'/'.sfSympalConfig::get('assets',
'originals_dir').'/'.$this->getName());
+
$original->move($this->getPathDirectory().DIRECTORY_SEPARATOR.sfSympalConfig::get('assets',
'originals_dir').DIRECTORY_SEPARATOR.$this->getName());
}
}
Modified: plugins/sfSympalPlugin/trunk/lib/sfSympalConfiguration.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/sfSympalConfiguration.class.php
2010-03-03 15:24:56 UTC (rev 28367)
+++ plugins/sfSympalPlugin/trunk/lib/sfSympalConfiguration.class.php
2010-03-03 15:55:04 UTC (rev 28368)
@@ -228,6 +228,17 @@
}
/**
+ * Set the project configuration instance to use
+ *
+ * @param ProjectConfiguration $projectConfiguration
+ * @return void
+ */
+ public function setProjectConfiguration(ProjectConfiguration
$projectConfiguration)
+ {
+ $this->_projectConfiguration = $projectConfiguration;
+ }
+
+ /**
* Get array of core Sympal plugins
*
* @return array $corePlugins
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
