Changeset 4473

Timestamp:

01/16/12 15:33:21 (4 months ago)

Author:

tboutell

Message:

Reusable slideshows now have a rich text "blurb" field as well as a label. The blurb field is displayed in the normal view if the 'slideshowBlurb' option is true. This hasn't been styled yet

Location:

plugins/apostropheExtraSlotsPlugin/trunk

Files:

• config/apostropheExtraSlotsPluginConfiguration.class.php (modified) (1 diff)
• config/doctrine/schema.yml (modified) (1 diff)
• lib/form/aReusableSlideshowSlotEditForm.class.php (modified) (2 diffs)
• modules/aReusableSlideshowSlot/actions/actions.class.php (modified) (3 diffs)
• modules/aReusableSlideshowSlot/actions/components.class.php (modified) (3 diffs)
• modules/aReusableSlideshowSlot/templates/_editView.php (modified) (2 diffs)
• modules/aReusableSlideshowSlot/templates/_normalView.php (modified) (2 diffs)

plugins/apostropheExtraSlotsPlugin/trunk/config/apostropheExtraSlotsPluginConfiguration.class.php

@@ -27 +27 @@
       $migrate->sql(array('CREATE TABLE a_reusable_slot (id BIGINT AUTO_INCREMENT, label VARCHAR(100) NOT NULL, type VARCHAR(100) NOT NULL, page_id BIGINT NOT NULL, area_name TEXT NOT NULL, permid BIGINT NOT NULL, PRIMARY KEY(id)) ENGINE = INNODB DEFAULT CHARSET=utf8;'));
     }
+    if (!$migrate->columnExists('a_reusable_slot', 'blurb'))
+    {
+      $migrate->sql(array('ALTER TABLE a_reusable_slot ADD COLUMN blurb LONGTEXT'));
+    }
   }
 }

plugins/apostropheExtraSlotsPlugin/trunk/config/doctrine/schema.yml

@@ -280 +280 @@
       type: string(100)
       notnull: true
+    blurb:
+      type: clob
     type: 
       type: string(100)

plugins/apostropheExtraSlotsPlugin/trunk/lib/form/aReusableSlideshowSlotEditForm.class.php

@@ -55 +55 @@
     // See validateCallback
     $this->setValidator('label', new sfValidatorPass(array('required' => false)));
+    
+    // The rest of the options passed become attributes of the widget
+    $this->setWidget('blurb', new aWidgetFormRichTextarea());
+    $this->setValidator('blurb', new sfValidatorHtml(array('required' => false)));
+    
     $page = aTools::getCurrentPage();
     $reusableSlots = Doctrine::getTable('aReusableSlot')->createQuery('r')->where('r.type = ? AND r.id <> ? AND r.page_id <> ?', array($this->slot->type, $this->aReusableSlot ? $this->aReusableSlot->id : 0, $page ? $page->id : 0))->orderBy('r.label')->fetchArray();
@@ -79 +84 @@
     $this->validatorSchema->setPostValidator(new sfValidatorCallback(array('callback' => array($this, 'validateCallback'))));
     
-    // Ensures unique IDs throughout the page. Hyphen between slot and form to please our CSS
-    $this->widgetSchema->setNameFormat('slot-form-' . $this->id . '[%s]');
+    // There are problems with AJAX plus FCK plus Symfony forms. FCK insists on making the name and ID
+    // the same and brackets are not valid in IDs which can lead to problems in strict settings
+    // like AJAX in IE. Work around this by not attempting to use brackets here
+    $this->widgetSchema->setNameFormat('slot-form-' . $this->id . '-%s');
+ 
     
     // You don't have to use our form formatter, but it makes things nice

plugins/apostropheExtraSlotsPlugin/trunk/modules/aReusableSlideshowSlot/actions/actions.class.php

@@ -26 +26 @@
     $aReusableSlot = Doctrine::getTable('aReusableSlot')->findOneBySlot($this->pageid, $this->name, $this->permid);
     
-    $value = $this->getRequestParameter('slot-form-' . $this->id);
+    // Work around FCK's incompatibility with AJAX and bracketed field names
+    // (it insists on making the ID bracketed too which won't work for AJAX)
+    
+    // Don't forget, there's a CSRF field out there too. We need to grep through
+    // the submitted fields and get all of the relevant ones, reinventing what
+    // PHP's bracket syntax would do for us if FCK were compatible with it
+    
+    $values = $request->getParameterHolder()->getAll();
+    $value = array();
+    foreach ($values as $k => $v)
+    {
+      if (preg_match('/^slot-form-' . $this->id . '-(.*)$/', $k, $matches))
+      {
+        $value[$matches[1]] = $v;
+      }
+    }
+    
     if ($value)
     {
@@ -44 +60 @@
           }
           $aReusableSlot->label = $this->form->getValue('label');
+          $aReusableSlot->blurb = $this->form->getValue('blurb');
           $aReusableSlot->save();
           
@@ -53 +70 @@
           unset($values['reuse']);
           $values['label'] = $this->form->getValue('label');
+          $values['blurb'] = $this->form->getValue('blurb');
           $this->slot->setArrayValue($values);
           return $this->editSave();

plugins/apostropheExtraSlotsPlugin/trunk/modules/aReusableSlideshowSlot/actions/components.class.php

@@ -20 +20 @@
     parent::executeNormalView();
     $values = $this->slot->getArrayValue();
-    if (isset($this->options['slideshowLabel']))
+    $labelActive = isset($this->options['slideshowLabel']) && $this->options['slideshowLabel'];
+    $blurbActive = isset($this->options['slideshowBlurb']) && $this->options['slideshowBlurb'];
+    if ($labelActive || $blurbActive)
     {
       if (isset($values['reuse']['id']))
@@ -29 +31 @@
           error_log("Offending id is " . $values['reuse']['id']);
           $this->label = 'Error';
+          $this->blurb = 'Error';
         }
         else
         {
           $this->label = $aReusableSlot->label;
+          $this->blurb = $aReusableSlot->blurb;
         }
       }
@@ -38 +42 @@
       {
         $this->label = isset($values['label']) ? $values['label'] : null;
+        $this->blurb = isset($values['blurb']) ? $values['blurb'] : null;
       }
     }
-    else
+    if (!$labelActive)
     {
       $this->label = null;
     }
+    if (!$blurbActive)
+    {
+      $this->blurb = null;
+    }
+    
     $this->reusing = isset($values['reuse']);
   }

plugins/apostropheExtraSlotsPlugin/trunk/modules/aReusableSlideshowSlot/templates/_editView.php

@@ -11 +11 @@
 
 <div class="a-form-row a-label-or-reuse-row <?php echo $formName ?>_label_or_reuse">
-  <input type="radio" class="a-label-or-reuse a-js-label-or-reuse" name="<?php echo $formName ?>[label_or_reuse]" value="label" <?php echo $isLabel ?>/> Label for Reuse
+  <input type="radio" class="a-label-or-reuse a-js-label-or-reuse" name="<?php echo $formName ?>-label_or_reuse" value="label" <?php echo $isLabel ?>/> Label for Reuse
 </div>
 
@@ -18 +18 @@
 </div>
 
+<div class="a-form-indent"> 
+  <?php echo $form['blurb']->renderRow(array('class' => 'a-js-label')) ?>
+</div>
+
 <div class="a-form-row a-reuse-section <?php echo $formName ?>_label_or_reuse">
-  <input type="radio" class="a-label-or-reuse a-js-label-or-reuse" name="<?php echo $formName ?>[label_or_reuse]" value="reuse" <?php echo $isReuse ?>/> Reuse Another Slideshow
+  <input type="radio" class="a-label-or-reuse a-js-label-or-reuse" name="<?php echo $formName ?>-label_or_reuse" value="reuse" <?php echo $isReuse ?>/> Reuse Another Slideshow
 </div>
 

plugins/apostropheExtraSlotsPlugin/trunk/modules/aReusableSlideshowSlot/templates/_normalView.php

@@ -11 +11 @@
   $slot = isset($slot) ? $sf_data->getRaw('slot') : null;
   $slug = isset($slug) ? $sf_data->getRaw('slug') : null;
+  $blurb = isset($blurb) ? $sf_data->getRaw('blurb') : null;
 ?>
 <?php use_helper('a') ?>
@@ -64 +65 @@
 <?php // This is the same label that is displayed when selecting a slideshow to reuse. ?>
 <?php // Using it this way as well helps promote reuse ?>
-<?php if ($label): ?>
+<?php if (strlen($label)): ?>
   <h4><?php echo $label ?></h4>
 <?php endif ?>
+<?php if (strlen($blurb)): ?>
+  <div class="a-slideshow-blurb"><?php echo $blurb ?></div>
+<?php endif ?>