Changeset 4470

Timestamp:

01/13/12 16:44:07 (4 months ago)

Author:

tboutell

Message:

* Button slots have a new editLink option, which defaults to true. If you set it explicitly to false, the link field does not appear in the form. To make sensible use of this there must also be a 'link' option present specifying the URL that is forced for this button. This is nice for a logo slot that always links to /. Needed for PR

* Button slot edit forms default to the title and link that were passed in by the template now, if any, rather than being initially blank.

* The "You are still editing content. Are you sure you want to leave this page?" message is not displayed if the slot has the .a-no-unload-warning class. This allows for cases where we want to put a button that takes you to the media library inside an edit form. Which, normally, I would hate, but if the form is really trivial it's reasonable to do.

Location:

plugins/apostrophePlugin/branches/1.5

Files:

• lib/action/BaseaButtonSlotActions.class.php (modified) (3 diffs)
• lib/action/BaseaButtonSlotComponents.class.php (modified) (1 diff)
• lib/form/BaseaButtonForm.class.php (modified) (2 diffs)
• modules/aButtonSlot/templates/_editView.php (modified) (1 diff)
• web/js/a.js (modified) (2 diffs)

plugins/apostrophePlugin/branches/1.5/lib/action/BaseaButtonSlotActions.class.php

@@ -29 +29 @@
       $this->slot->link('MediaItems', array($item->id));
     }
-    $this->editSave();
+    return $this->editSave();
   }
 
@@ -57 +57 @@
       }
     }
-                
-                // Trim whitespace off the front & end of the URL to avoid failing validation on a perfectly acceptable URL
-                $value['url'] = trim($value['url']); 
+
+                if ($this->getOption('editLink', null) !== false)
+                {
+                // Trim whitespace off the front & end of the URL to avoid failing validation on a perfectly acceptable URL
+                $value['url'] = trim($value['url']); 
+        }
 
     $this->form = new aButtonForm($this->id, $this->options);
@@ -65 +68 @@
     if ($this->form->isValid())
     {
-      $url = $this->form->getValue('url');
+                if ($this->getOption('editLink', null) !== false)
+                {
+        $url = $this->form->getValue('url');
+      }
       $value = $this->slot->getArrayValue();
-      $value['url'] = $url;
+                if ($this->getOption('editLink', null) !== false)
+                {
+        $value['url'] = $url;
+      }
       $value['title'] = $this->form->getValue('title');
       $value['description'] = $this->form->getValue('description');

plugins/apostrophePlugin/branches/1.5/lib/action/BaseaButtonSlotComponents.class.php

@@ -88 +88 @@
         $this->form->setDefault('url', $value['url']);      
       }
+      else
+      {
+        $this->form->setDefault('url', $this->getOption('link'));
+      }
       if (isset($value['title']))
       {
         $this->form->setDefault('title', $value['title']);      
+      }
+      else
+      {
+        // Careful, just plain true is a valid setting for this option
+        $title = $this->getOption('title');
+        if (strlen($title) && ($title !== true))
+        {
+          $this->form->setDefault('title', $title);
+        }
       }
       if (isset($value['description']))

plugins/apostrophePlugin/branches/1.5/lib/form/BaseaButtonForm.class.php

@@ -64 +64 @@
       'title' => new sfWidgetFormInputText(array(), array('class' => 'aButtonSlot'))  
     ));
-
+    
     $this->setValidators(array(
       'description' => new sfValidatorHtml(array('required' => false, 'allowed_tags' => $this->allowedTags, 'allowed_attributes' => $this->allowedAttributes, 'allowed_styles' => $this->allowedStyles)),
@@ -75 +75 @@
       'title' => new sfValidatorString(array('required' => false)) 
     ));
+
+    $editLink = $this->consumeSlotOption('editLink');
+    if ($editLink === false)
+    {
+      unset($this['url']);
+    }
 
     // Ensures unique IDs throughout the page. Hyphen between slot and form to please our CSS

plugins/apostrophePlugin/branches/1.5/modules/aButtonSlot/templates/_editView.php

@@ -34 +34 @@
 <?php endif ?>
 
-<div class="a-form-row link">
-        <?php echo $form['url']->renderLabel('Link') ?>
-        <div class="a-form-field">
-                <?php echo $form['url']->render() ?>
-        </div>
-        <?php echo $form['url']->renderError() ?>
-</div>
+<?php if ((!isset($options['editLink'])) || ($options['editLink'] !== false)): ?>
+  <div class="a-form-row link">
+        <?php echo $form['url']->renderLabel('Link') ?>
+        <div class="a-form-field">
+                <?php echo $form['url']->render() ?>
+        </div>
+        <?php echo $form['url']->renderError() ?>
+  </div>
+<?php endif ?>
 
 <?php if ($options['description']): ?>

plugins/apostrophePlugin/branches/1.5/web/js/a.js

@@ -931 +931 @@
                 }
         };
-
+        
         this.afterAddingSlot = function(name)
         {
@@ -2288 +2288 @@
       if ($('.a-slot.a-editing').length)
       {
-        return "You are still editing content. Any edits you have made will be lost if you do not save them first before leaving the page.";
+        // Don't stop the user if all of the open slot edit forms have .a-no-unload-warning
+        var stop = false;
+        $('.a-slot.a-editing').each(function() {
+          if (!$(this).hasClass('a-no-unload-warning'))
+          {
+            stop = true;
+          }
+        });
+        if (stop)
+        {
+          return "You are still editing content. Any edits you have made will be lost if you do not save them first before leaving the page.";
+        }
       }
     });