Author: ornicar2
Date: 2010-01-29 12:13:39 +0100 (Fri, 29 Jan 2010)
New Revision: 27302
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/image/dmWidgetContentImageForm.php
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/image/dmWidgetContentImageView.php
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/text/dmWidgetContentTextForm.php
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/title/dmWidgetContentTitleForm.php
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/templates/forms/dmWidgetContentImage.php
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/templates/forms/dmWidgetContentText.php
plugins/diemPlugin/trunk/dmFrontPlugin/web/css/form.css
Log:
[Diem]
- content/image widgets can now have a link
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/image/dmWidgetContentImageForm.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/image/dmWidgetContentImageForm.php
2010-01-29 11:12:47 UTC (rev 27301)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/image/dmWidgetContentImageForm.php
2010-01-29 11:13:39 UTC (rev 27302)
@@ -23,7 +23,7 @@
'required' => false
));
- $this->widgetSchema['background'] = new sfWidgetFormInputText(array(),
array('size' =>7));
+ $this->widgetSchema['background'] = new sfWidgetFormInputText(array(),
array('size' => 7));
$this->validatorSchema['background'] = new sfValidatorString(array(
'required' => false
));
@@ -34,7 +34,13 @@
'min' => 0,
'max' => 100
));
+ $this->widgetSchema['quality']->setLabel('JPG quality');
+ $this->widgetSchema->setHelp('quality', 'Leave empty to use default
quality');
+ $this->widgetSchema['link'] = new sfWidgetFormInputText();
+ $this->validatorSchema['link'] = new dmValidatorLinkUrl(array('required'
=> false));
+ $this->widgetSchema->setHelp('link', 'Drag & Drop a page or enter an url');
+
$this->mergePostValidator(
new sfValidatorCallback(array('callback' => array($this,
'checkBackground')))
);
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/image/dmWidgetContentImageView.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/image/dmWidgetContentImageView.php
2010-01-29 11:12:47 UTC (rev 27301)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/image/dmWidgetContentImageView.php
2010-01-29 11:13:39 UTC (rev 27302)
@@ -42,4 +42,34 @@
return $vars;
}
+ protected function doRender()
+ {
+ if ($this->isCachable() && $cache = $this->getCache())
+ {
+ return $cache;
+ }
+
+ $vars = $this->getViewVars();
+
+ if (!$vars['mediaTag'])
+ {
+ $html = '';
+ }
+ else
+ {
+ $html = $vars['mediaTag']->render();
+ }
+
+ if($link = dmArray::get($vars, 'link'))
+ {
+ $html = $this->getHelper()->£link($link)->text($html);
+ }
+
+ if ($this->isCachable())
+ {
+ $this->setCache($html);
+ }
+
+ return $html;
+ }
}
\ No newline at end of file
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/text/dmWidgetContentTextForm.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/text/dmWidgetContentTextForm.php
2010-01-29 11:12:47 UTC (rev 27301)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/text/dmWidgetContentTextForm.php
2010-01-29 11:13:39 UTC (rev 27302)
@@ -11,13 +11,13 @@
$this->validatorSchema['title'] = new sfValidatorString(array('required'
=> false));
$this->widgetSchema['titleLink'] = new sfWidgetFormInputText();
- $this->validatorSchema['titleLink'] = new
sfValidatorString(array('required' => false));
+ $this->validatorSchema['titleLink'] = new
dmValidatorLinkUrl(array('required' => false));
$this->widgetSchema['text'] = new sfWidgetFormTextarea();
$this->validatorSchema['text'] = new sfValidatorString(array('required' =>
false));
$this->widgetSchema['mediaLink'] = new sfWidgetFormInputText();
- $this->validatorSchema['mediaLink'] = new
sfValidatorString(array('required' => false));
+ $this->validatorSchema['mediaLink'] = new
dmValidatorLinkUrl(array('required' => false));
$this->widgetSchema['titlePosition'] = new sfWidgetFormChoice(array(
'choices' => array('outside' => 'Outside', 'inside' => 'Inside')
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/title/dmWidgetContentTitleForm.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/title/dmWidgetContentTitleForm.php
2010-01-29 11:12:47 UTC (rev 27301)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/title/dmWidgetContentTitleForm.php
2010-01-29 11:13:39 UTC (rev 27302)
@@ -3,25 +3,21 @@
class dmWidgetContentTitleForm extends dmWidgetPluginForm
{
- protected static
- $tags = array('h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'div');
-
- public function getTags()
- {
- return dmArray::valueToKey(self::$tags);
- }
-
public function configure()
{
$this->widgetSchema['text'] = new sfWidgetFormTextarea(array(), array(
'rows' => 2
));
- $this->widgetSchema['tag'] = new sfWidgetFormChoice(array('choices' =>
self::getTags()));
+ $this->widgetSchema['tag'] = new sfWidgetFormChoice(array('choices' =>
$this->getTagNames()));
$this->validatorSchema['text'] = new sfValidatorString(array('required' =>
true));
- $this->validatorSchema['tag'] = new sfValidatorChoice(array('choices' =>
self::getTags(), 'required' => true));
+ $this->validatorSchema['tag'] = new sfValidatorChoice(array('choices' =>
$this->getTagNames(), 'required' => true));
parent::configure();
}
+ protected function getTagNames()
+ {
+ return dmArray::valueToKey(array('h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p',
'div'));
+ }
}
\ No newline at end of file
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/templates/forms/dmWidgetContentImage.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/templates/forms/dmWidgetContentImage.php
2010-01-29 11:12:47 UTC (rev 27301)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/templates/forms/dmWidgetContentImage.php
2010-01-29 11:13:39 UTC (rev 27302)
@@ -33,13 +33,11 @@
$form['method']->label(null, array('class' => 'ml10 mr10
fnone'))->field('.dm_media_method')->error()
).
£('li.dm_form_element.multi_inputs.background.clearfix.none',
- $form['width']->renderError().
+ $form['background']->renderError().
$form['background']->label()->field()->error()
).
- £('li.dm_form_element.quality.clearfix',
- $form['quality']->label(__('JPG quality'))->field()->error().
- £('p.dm_help', __('Leave empty to use default quality'))
- )
+ $form['quality']->renderRow().
+ (isset($skipLink) ? '' : $form['link']->renderRow(array('class' =>
'dm_link_droppable')))
);
}
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/templates/forms/dmWidgetContentText.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/templates/forms/dmWidgetContentText.php
2010-01-29 11:12:47 UTC (rev 27301)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/templates/forms/dmWidgetContentText.php
2010-01-29 11:13:39 UTC (rev 27302)
@@ -24,7 +24,8 @@
$sf_context->get('helper')->renderPartial('dmWidget',
'forms/dmWidgetContentImage', array(
'form' => $form,
'hasMedia' => $hasMedia,
- 'skipCssClass' => true
+ 'skipCssClass' => true,
+ 'skipLink' => true
))
),
Modified: plugins/diemPlugin/trunk/dmFrontPlugin/web/css/form.css
===================================================================
--- plugins/diemPlugin/trunk/dmFrontPlugin/web/css/form.css 2010-01-29
11:12:47 UTC (rev 27301)
+++ plugins/diemPlugin/trunk/dmFrontPlugin/web/css/form.css 2010-01-29
11:13:39 UTC (rev 27302)
@@ -2,11 +2,13 @@
font-size: 11px;
}
-.dm_form .droppable_active {
+.dm_form input.droppable_active,
+.dm_form textarea.droppable_active {
background: url(../../core/images/default_bg_yellow.png) repeat-x scroll 50%
50%;
}
-.dm_form .droppable_hover {
+.dm_form input.droppable_hover,
+.dm_form textarea.droppable_hover {
background: url(../../core/images/default_bg_green.png) repeat-x scroll 50%
50%;
}
--
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.
