Changeset 1818

Timestamp:

07/21/10 16:35:10 (19 months ago)

Author:

johnnyoffline

Message:

merged the latest changes in the trunk into my branch including any new CSS since revision 1717. The new CSS introduced was moved to the new locations in the split files. I am keeping this feature branch alive ladies and gents :)

Location:

plugins/apostrophePlugin/branches/features/css

Files:

• . (modified) (1 prop)
• lib/action/BaseaFeedSlotComponents.class.php (modified) (1 diff)
• lib/filter/aGroupAdminFilter.class.php (copied) (copied from plugins/apostrophePlugin/trunk/lib/filter/aGroupAdminFilter.class.php)
• lib/filter/aUserAdminFilter.class.php (copied) (copied from plugins/apostrophePlugin/trunk/lib/filter/aUserAdminFilter.class.php)
• lib/filter/base (copied) (copied from plugins/apostrophePlugin/trunk/lib/filter/base)
• lib/filter/base/BaseaGroupAdminFilter.class.php (copied) (copied from plugins/apostrophePlugin/trunk/lib/filter/base/BaseaGroupAdminFilter.class.php)
• lib/filter/base/BaseaUserAdminFilter.class.php (copied) (copied from plugins/apostrophePlugin/trunk/lib/filter/base/BaseaUserAdminFilter.class.php)
• lib/model/doctrine/PluginaPage.class.php (modified) (4 diffs)
• lib/model/doctrine/PluginaPageTable.class.php (modified) (1 diff)
• lib/navigation/aNavigation.class.php (modified) (3 diffs)
• lib/navigation/aNavigationAccordion.class.php (modified) (3 diffs)
• lib/toolkit/aArray.class.php (modified) (1 diff)
• lib/toolkit/aDate.class.php (modified) (1 diff)
• lib/toolkit/aHtml.class.php (modified) (2 diffs)
• lib/toolkit/aString.class.php (modified) (1 diff)
• modules/a/templates/_search.php (modified) (1 diff)
• modules/a/templates/_signinForm.php (modified) (2 diffs)
• modules/aButtonSlot/templates/_normalView.php (modified) (1 diff)
• modules/aFeedSlot/templates/_aFeedItem.php (modified) (1 diff)
• modules/aGroupAdmin/config/generator.yml (modified) (1 diff)
• modules/aImageSlot/templates/_normalView.php (modified) (1 diff)
• modules/aNavigation/templates/_breadcrumb.php (modified) (1 diff)
• modules/aPDFSlot/templates/_normalView.php (modified) (2 diffs)
• modules/aUserAdmin/config/generator.yml (modified) (1 diff)
• modules/aVideoSlot/templates/_normalView.php (modified) (1 diff)
• web/css/a-buttons.css (modified) (2 diffs)
• web/css/a-engines.css (modified) (1 diff)
• web/css/a-forms.css (modified) (1 diff)
• web/css/a-utility.css (modified) (1 diff)
• web/css/a.css (modified) (1 prop)
• web/images (modified) (1 prop)
• web/js/aControls.js (modified) (1 diff)
• web/js/fckeditor/fckconfig.js (modified) (1 diff)

plugins/apostrophePlugin/branches/features/css/lib/action/BaseaFeedSlotComponents.class.php

@@ -35 +35 @@
       $this->links = $this->getOption('links', true);
       $this->markup = $this->getOption('markup', '<strong><em><p><br><ul><li>');
+                        $this->attributes = $this->getOption('attributes', false);
+                        $this->styles = $this->getOption('styles',false);
       $this->dateFormat = $this->getOption('dateFormat', false);
                         $this->itemTemplate = $this->getOption('itemTemplate','aFeedItem');

plugins/apostrophePlugin/branches/features/css/lib/model/doctrine/PluginaPage.class.php

@@ -400 +400 @@
 
   // Careful, the cache must hold the entire path including the item itself, we lop off the last element
-        // before returning in those cases where it is not wanted.
-  public function getAncestorsInfo($includeSelf = false)
-  {
+        // before returning in those cases where it is not wanted. Note that $livingOnly does NOT change the 'level'
+        // field for each returned ancestor
+  public function getAncestorsInfo($includeSelf = false, $livingOnly = false)
+  {
+    // We cache the results of one simple query that gets the whole lineage, and permute that a little
+    // for the includeSelf and livingOnly cases
     if (!isset($this->ancestorsInfo))
     {
@@ -415 +418 @@
                         $ancestorsInfo = $this->ancestorsInfo;
                         array_pop($ancestorsInfo);
+                }
+                if ($livingOnly)
+                {
+                  $newAncestorsInfo = array();
+                  foreach ($ancestorsInfo as $ancestor)
+                  {
+                    if (!$ancestor['archived'])
+                    {
+                      $newAncestorsInfo[] = $ancestor;
+                    }
+                  }
+                  $ancestorsInfo = $newAncestorsInfo;
                 }
                 return $ancestorsInfo;
@@ -572 +587 @@
     // an accordion contro. in the first place
     $ancestors = $this->getAncestorsInfo();
-    
     // Dump ancestors we don't care about
     $found = false;
@@ -592 +606 @@
     foreach ($ancestors as $ancestor)
     {
+      if ($livingOnly && ($ancestor['archived']))
+      {
+        continue;
+      }
       $lineage[] = $ancestor['id'];
       if ($ancestor['level'] == 0)

plugins/apostrophePlugin/branches/features/css/lib/model/doctrine/PluginaPageTable.class.php

@@ -530 +530 @@
         // The explicit case
     
+        // Explicit privileges on virtual pages are not permitted. We don't let admins set them anyway,
+        // you should be implementing them yourself with the 'edit' flag to a_area or a_slot, and if we
+        // use the DQL below to look at a page where 'lft' is NULL Doctrine drops that entire clause
+        // and the query matches everything, granting everybody with any editing privileges 
+        // the right to edit global slots
+        
+        // Sigh, I had this backwards
+        
+        if (!$pageOrInfo['lft'])
+        {
+          continue;
+        }
+        
         $user_id = $user->getGuardUser()->getId();
         

plugins/apostrophePlugin/branches/features/css/lib/navigation/aNavigation.class.php

@@ -3 +3 @@
 abstract class aNavigation
 {
-  
+
   public static $tree = null;
   public static $hash = null;
-  
+
   // Functional testing reuses the same PHP session, we must
   // accurately simulate a new one. This method is called by
@@ -15 +15 @@
     if (sfConfig::get('app_a_many_pages', false))
     {
-      
+
     }
   }
-  
+
   protected abstract function buildNavigation();
-  
+
   public function __construct(aPage $root, aPage $active, $options = array())
   {
     $this->user = sfContext::getInstance()->getUser();
     $this->livingOnly = !(aTools::isPotentialEditor() &&  sfContext::getInstance()->getUser()->getAttribute('show-archived', true, 'apostrophe'));
-    
+
     $this->root = $root;
     $this->active = $active;
@@ -51 +51 @@
         }
       }
-
-      if($node['archived'] == true)
-      {
-        if($this->livingOnly)
-          unset($tree[$pos]);
-      }
     }
   }
-  
+
 }

plugins/apostrophePlugin/branches/features/css/lib/navigation/aNavigationAccordion.class.php

@@ -3 +3 @@
 class aNavigationAccordion extends aNavigation
 {
-  protected $cssClass = 'a-nav-item'; 
+  protected $cssClass = 'a-nav-item';
 
   public function buildNavigation()
@@ -10 +10 @@
     if($this->active['slug'] != $this->root['slug'])
     {
-      $this->rootInfo = $this->active->getAccordionInfo(false, null, $this->root['slug']);
+      $this->rootInfo = $this->active->getAccordionInfo($this->livingOnly, null, $this->root['slug']);
     }else
     {
-      $this->rootInfo = $this->root->getTreeInfo(false, 1);
+      $this->rootInfo = $this->root->getTreeInfo($this->livingOnly, 1);
     }
     // This rootInfo is already an array of kids
@@ -23 +23 @@
     $this->traverse($this->nav);
   }
-  
+
   public function getNav()
   {
     return $this->nav;
   }
-  
+
 }

plugins/apostrophePlugin/branches/features/css/lib/toolkit/aArray.class.php

@@ -387 +387 @@
     return ($s1 < $s2) ? -1 : 1;
   }
-
+  
+  // Is this a numerically indexed array without gaps?
+  public static function isFlat($array)
+  {
+    $n = 0;
+    foreach ($array as $key => $val)
+    {
+      if ($key !== $n)
+      {
+        return false;
+      }
+      $n++;
+    }
+    return true;
+  }
 }
 

plugins/apostrophePlugin/branches/features/css/lib/toolkit/aDate.class.php

@@ -196 +196 @@
     return floor(($date1 - $date2) / 86400 + 0.5);
   }
+  
+  static public function mysql($when = null)
+  {
+    if (is_null($when))
+    {
+      $when = time();
+    }
+    $when = self::normalize($when);
+    return date('Y-m-d H:i:s', $when);
+  }
 }

plugins/apostrophePlugin/branches/features/css/lib/toolkit/aHtml.class.php

@@ -428 +428 @@
   );
 
-        public static function limitWords($string, $word_limit)
+        public static function limitWords($string, $word_limit, $options = array())
         {
-    # TBB: tag-aware, doesn't split in the middle of tags 
-    # (we will probably use fancier tags with attributes later,
-    # so this is important). Tags must be valid XHTML unless
-    # all allowed tags 
+          # TBB: tag-aware, doesn't split in the middle of tags 
+          # (we will probably use fancier tags with attributes later,
+          # so this is important). Tags must be valid XHTML unless
+          # all allowed tags 
           $words = preg_split("/(\<.*?\>|\s+)/", $string, -1, 
-      PREG_SPLIT_DELIM_CAPTURE);
-    $wordCount = 0;
-    # Balance tags that need balancing. We don't have strict XHTML
-    # coming from OpenOffice (oh, if only) so we'll have to keep a
-    # list of the tags that are containers.
-    $open = array();
-    $result = "";
-    $count = 0;
-    foreach ($words as $word) {
-      if ($count >= $word_limit) {
-        break;
-      } elseif (preg_match("/\<.*?\/\>/", $word)) {
-        # XHTML non-container tag, we don't have to guess
-        $result .= $word;
-        continue;
-      } elseif (preg_match("/\<(\w+)/s", $word, $matches)) {
-        $tag = $matches[1];
-        $result .= $word;
-        if (isset(aHtml::$nonContainerTags[$tag])) {
-          continue;
-        }
-        $open[] = $tag;
-      } elseif (preg_match("/\<\/(\w+)/s", $word, $matches)) {
-        $tag = $matches[1];
-        if (!count($open)) {
-          # Groan, extra close tag, ignore
-          continue;
-        }
-        $last = array_pop($open);    
-        if ($last !== $tag) {
-          # They closed the wrong tag. Again, ignore for now, but 
-          # we might want to work on a better solution
-          continue;
-        }
-        $result .= $word;
-      } elseif (preg_match("/^\s+$/s", $word)) {
-        $result .= $word;
-      } else {
-        if (strlen($word)) {
-          $count++;
-          $result .= $word;
-        }
-      }
-    }
-    for ($i = count($open) - 1; ($i >= 0); $i--) {
-      $result .= "</" . $open[$i] . ">";
-    }
-    return $result;
-  }
+            PREG_SPLIT_DELIM_CAPTURE);
+          $wordCount = 0;
+          # Balance tags that need balancing. We don't have strict XHTML
+          # coming from OpenOffice (oh, if only) so we'll have to keep a
+          # list of the tags that are containers.
+          $open = array();
+          $result = "";
+          $count = 0;
+                $num_words = count($words);
+          foreach ($words as $word) {
+            if ($count >= $word_limit) {
+              break;
+            } elseif (preg_match("/\<.*?\/\>/", $word)) {
+              # XHTML non-container tag, we don't have to guess
+              $result .= $word;
+              continue;
+            } elseif (preg_match("/\<(\w+)/s", $word, $matches)) {
+              $tag = $matches[1];
+              $result .= $word;
+              if (isset(aHtml::$nonContainerTags[$tag])) {
+                continue;
+              }
+              $open[] = $tag;
+            } elseif (preg_match("/\<\/(\w+)/s", $word, $matches)) {
+              $tag = $matches[1];
+              if (!count($open)) {
+                # Groan, extra close tag, ignore
+                continue;
+              }
+              $last = array_pop($open);    
+              if ($last !== $tag) {
+                # They closed the wrong tag. Again, ignore for now, but 
+                # we might want to work on a better solution
+                continue;
+              }
+              $result .= $word;
+            } elseif (preg_match("/^\s+$/s", $word)) {
+              $result .= $word;
+            } else {
+              if (strlen($word)) {
+                $count++;
+                $result .= $word;
+              }
+            }
+          }
+
+                $append_ellipsis = false;
+                if (isset($options['append_ellipsis']))
+                {
+                        $append_ellipsis = $options['append_ellipsis'];
+                }
+                if ($append_ellipsis == true && $num_words > $word_limit)
+                {
+                        $result .= '&hellip;';
+                }
+
+          for ($i = count($open) - 1; ($i >= 0); $i--) {
+            $result .= "</" . $open[$i] . ">";
+          }
+          return $result;
+        }
 
   public static function toText($html)
@@ -514 +526 @@
     # a span or div, which will not lose its class, id, etc. TBB
 
-    return preg_replace("/\<a[^\>]*?href=\"mailto\:(.*?)\@(.*?)\".*?\>(.*?)\<\/a\>/ise", 
-      "aHtml::obfuscateMailtoInstance(\"$1\", \"$2\", \"$3\")",
+    return preg_replace_callback("/\<a[^\>]*?href=\"mailto\:(.*?)\@(.*?)\".*?\>(.*?)\<\/a\>/is", 
+      array('aHtml', 'obfuscateMailtoInstance'),
       $html);
   }
   
-  public static function obfuscateMailtoInstance($user, $domain, $label)
-  {
-      // We get some weird escaping problems without the trims
-      $user = trim($user);
-      $domain = trim($domain);
-      $guid = aGuid::generate();
-      $href = self::jsEscape("mailto:$user@$domain");
-      $label = self::jsEscape(trim($label));
-      // ACHTUNG: this is carefully crafted to avoid introducing extra whitespace
-      return "<a href='#' id='$guid'></a><script type='text/javascript' charset='utf-8'>
-          var e = document.getElementById('$guid');
-        e.setAttribute('href', '$href');
-        e.innerHTML = '$label';
-        </script>";
+  public static function obfuscateMailtoInstance($args)
+  {
+    list($user, $domain, $label) = array_slice($args, 1);
+    // We get some weird escaping problems without the trims
+    $user = trim($user);
+    $domain = trim($domain);
+    $guid = aGuid::generate();
+    $href = self::jsEscape("mailto:$user@$domain");
+    $label = self::jsEscape(trim($label));
+    // ACHTUNG: this is carefully crafted to avoid introducing extra whitespace
+    return "<a href='#' id='$guid'></a><script type='text/javascript' charset='utf-8'>
+          var e = document.getElementById('$guid');
+      e.setAttribute('href', '$href');
+      e.innerHTML = '$label';
+      </script>";
   }
 

plugins/apostrophePlugin/branches/features/css/lib/toolkit/aString.class.php

@@ -43 +43 @@
                 if ($append_ellipsis == true && $num_words > $word_limit)
                 {
-                        $string .= '&hellip';
+                        $string .= '…';
                 }
                 

plugins/apostrophePlugin/branches/features/css/modules/a/templates/_search.php

@@ -2 +2 @@
 <div id="a-search">
   <form id="a-search-global" action="<?php echo url_for('a/search') ?>" method="get" class="a-search-form">
-    <div><input type="text" name="q" value="<?php echo htmlspecialchars($sf_params->get('q')) ?>" class="a-search-field" id="a-search-cms-field" /></div>
-    <div><input type="image" src="/apostrophePlugin/images/a-special-blank.gif" class="submit" value="Search Pages" /></div>
+    <div><label for="a-search-cms-field" style="display:none;">Search</label><input type="text" name="q" value="<?php echo htmlspecialchars($sf_params->get('q')) ?>" class="a-search-field" id="a-search-cms-field"/></div>
+    <div><input type="image" src="/apostrophePlugin/images/a-special-blank.gif" class="submit" value="Search Pages" alt="Search" title="Search"/></div>
   </form>
 </div>

plugins/apostrophePlugin/branches/features/css/modules/a/templates/_signinForm.php

@@ -3 +3 @@
 <div id="a-signin">
   <form action="<?php echo url_for('@sf_guard_signin') ?>" method="post" id="a-signin-form" <?php echo ($form->hasErrors())? 'class="has-errors"':''; ?>>
-        <?php echo $form->renderHiddenFields() ?>
+
+                <div class="a-form-row a-hidden">
+                <?php echo $form->renderHiddenFields() ?>
+                </div>
 
                 <div class="a-form-row">
@@ -17 +20 @@
                 </div>
 
+                <?php if (0): ?>
+                <?php // When this thing starts working, it can get displayed. ?>
                 <div class="a-form-row">
-        <?php echo $form['remember']->renderRow() ?>
+        <?php echo $form['remember']->renderLabel() ?>
+                        <?php echo $form['remember']->render() ?>
+                        <?php echo $form['remember']->renderError() ?>
                 </div>
+                <?php endif ?>
                 
                 <ul class="a-form-row submit">

plugins/apostrophePlugin/branches/features/css/modules/aButtonSlot/templates/_normalView.php

@@ -48 +48 @@
     <?php echo $embed ?>
     </li>
-    <?php if (isset($img_title)): ?>
+    <?php if (isset($img_title) && $img_title != ''): ?>
       <li class="a-button-title"><a class="a-button-link" href="<?php echo $link ?>"><?php echo $img_title ?></a></li>
     <?php endif ?>
-    <?php if ($description): ?>
+    <?php if (isset($description)): ?>
       <li class="a-button-description"><?php echo $item->description ?></li>
     <?php endif ?>

plugins/apostrophePlugin/branches/features/css/modules/aFeedSlot/templates/_aFeedItem.php

@@ -1 +1 @@
 <li class="a-feed-item">
   <ul>
-    <li class="title"><?php echo link_to_if($feedItem->getLink() && $links, $feedItem->getTitle(), $feedItem->getLink()) ?></li>
+    <li class="title">
+                        <?php if (isset($links) && $feedItem->getLink()): ?>
+                                <a href="<?php echo $feedItem->getLink() ?>"><?php echo $feedItem->getTitle() ?></a>
+                        <?php else: ?>
+                                <?php echo $feedItem->getTitle() ?>
+                        <?php endif ?>
+                </li>
     <?php $date = $feedItem->getPubDate() ?>
     <li class="date"><?php echo $dateFormat ? date($dateFormat, $date) : aDate::pretty($date) . ' ' . aDate::time($date) ?></li>
-    <li class="description"><?php echo aHtml::simplify($feedItem->getDescription(), $markup) ?></li>
+    <li class="description"><?php echo aHtml::simplify($feedItem->getDescription(), $markup, false, (isset($attributes)? $attributes:false), (isset($styles)? $styles:false)) ?></li>
   </ul>
 </li>

plugins/apostrophePlugin/branches/features/css/modules/aGroupAdmin/config/generator.yml

@@ -19 +19 @@
         class: aGroupAdminForm
         display: [name, description, users_list, permissions_list]
+      filter:
+        class: aGroupAdminFilter
       edit:
         title: Editing Group "%%name%%"

plugins/apostrophePlugin/branches/features/css/modules/aImageSlot/templates/_normalView.php

@@ -57 +57 @@
     </li>
     <?php if ($title): ?>
-      <li class="a-image-title"><?php echo $item->title ?></li>
+      <li class="a-media-meta a-image-title"><?php echo $item->title ?></li>
     <?php endif ?>
     <?php if ($description): ?>
-      <li class="a-image-description"><?php echo $item->description ?></li>
+      <li class="a-media-meta a-image-description"><?php echo $item->description ?></li>
     <?php endif ?>
   </ul>

plugins/apostrophePlugin/branches/features/css/modules/aNavigation/templates/_breadcrumb.php

@@ -1 +1 @@
 <ul id="a-breadcrumb-<?php echo ($name)? $name:'component' ?>" class="a-nav a-nav-breadcrumb breadcrumb">
         <?php foreach($nav as $pos => $item): ?>
-                <li class="<?php echo $class;
-        if($item['slug'] == $active) echo ' a-current-page'; ?>"><?php echo link_to($item['title'], aTools::urlForPage($item['slug'])) ?><?php if($pos+1 < count($nav)) echo '<span class="a-breadcrumb-separator">'.$separator.'</span>' ?></li>
+                <?php if (!$item['archived'] || $draggable): ?>
+                        <li class="<?php echo $class;
+                                if($item['slug'] == $active) echo ' a-current-page'; ?>"><?php echo link_to($item['title'], aTools::urlForPage($item['slug'])) ?><?php if($pos+1 < count($nav)) echo '<span class="a-breadcrumb-separator">'.$separator.'</span>' ?>
+                        </li>
+                <?php endif ?>          
         <?php endforeach ?>
 </ul>

plugins/apostrophePlugin/branches/features/css/modules/aPDFSlot/templates/_normalView.php

@@ -60 +60 @@
                         </li>
     <?php endif ?>
-                        <p class="a-pdf-download">
+                        <li class="a-pdf-download">
               <?php echo link_to(__("Download PDF", null, 'apostrophe'), "aMediaBackend/original?" .
                                                                 http_build_query(
@@ -67 +67 @@
                       "format" => $item->getFormat()
                                                                 ))) ?>
-                    </p>
+                   </li>
   </ul>
 </div>

plugins/apostrophePlugin/branches/features/css/modules/aUserAdmin/config/generator.yml

@@ -21 +21 @@
         title:   User list
         display: [=username, created_at, updated_at, last_login]
+      filter:
+        class: aUserAdminFilter
       form:
         class: aUserAdminForm

plugins/apostrophePlugin/branches/features/css/modules/aVideoSlot/templates/_normalView.php

@@ -43 +43 @@
         </li>
   <?php if ($title): ?>
-    <li class="a-media-video-title"><?php echo $item->title ?></li>
+    <li class="a-media-meta a-media-video-title"><?php echo $item->title ?></li>
   <?php endif ?>
   <?php if ($description): ?>
-    <li class="a-media-video-description"><?php echo $item->description ?></li>
+    <li class="a-media-meta a-media-video-description"><?php echo $item->description ?></li>
   <?php endif ?>
   </ul>

plugins/apostrophePlugin/branches/features/css/web/css/a-buttons.css

@@ -262 +262 @@
 .icon.a-calendar { background-image: url(/apostrophePlugin/images/a-icon-event.png); }
 
-.icon.a-close {
+.icon.a-close,
+.icon.a-close-small
+{
 background: transparent url(/apostrophePlugin/images/a-icon-close.png) no-repeat scroll 0 0;
 float: left;
@@ -273 +275 @@
 }
 
-.icon.a-close:hover { background-position: left bottom; }
+.icon.a-close-small
+{
+        background-image: url(/apostrophePlugin/images/a-icon-close-small.png);
+}
+
+.icon.a-close:hover,
+.icon.a-close-small:hover
+{
+background-position: bottom;
+}
 
 .icon.a-drag {

plugins/apostrophePlugin/branches/features/css/web/css/a-engines.css

@@ -1058 +1058 @@
 overflow: hidden;
 }
+
+/* New Taggable Widget */
+
+.assigned-tags,
+.add-tags,
+.popular-tags
+{
+        float: left;
+        width: 100%;
+        clear: both;
+        margin:0 0 5px 0;
+}
+
+.assigned-tags h5,
+.popular-tags h5
+{
+        margin-bottom: 5px;
+}
+
+.assigned-tags ul
+{
+        display: block;
+        float: left;
+        width: 100%;
+        clear: both;
+        position: relative;
+}
+
+.assigned-tags li
+{
+        display: inline-block;
+        float: left;
+        position: relative;
+        margin: 0 5px 0 0;
+}
+
+.assigned-tags li span
+{
+        float: left;
+        display: block;
+        position: relative;
+        line-height: 20px;
+        padding-right: 20px;
+        white-space: nowrap;
+}
+
+.add-tags .a-submit
+{
+        margin-left: 2px;
+        float: right;
+}
+
+.add-tags-help
+{
+        float: left;
+        width: 100%;
+        clear: both;
+        margin: 5px 0;
+        color: #999;
+}

plugins/apostrophePlugin/branches/features/css/web/css/a-forms.css

@@ -109 +109 @@
 }
 
-a.a-multiple-select-remove
+.a-multiple-select-item
 {
 position: relative;     
+float: left;
+line-height: 20px;
+clear: both;
 }
 
-a.a-multiple-select-remove span
+.a-multiple-select-item span
 {
-position: absolute;
-display: inline;
 float: left;
-overflow: hidden;
-top: 0;
-left: 100%;
-width: 20px;
-height: 20px;
-text-indent: -9999px;
-background: url(/apostrophePlugin/images/a-icon-close-small.png) 0 0 no-repeat;
 }
+
+.a-multiple-select-item .a-close-small
+{
+float: left;
+}

plugins/apostrophePlugin/branches/features/css/web/css/a-utility.css

@@ -71 +71 @@
 }
 
+.a-hidden
+{
+display: none;
+}
+
 .a-accordion .content
 { /* Works with aAccordion() in aUI.js */

plugins/apostrophePlugin/branches/features/css/web/js/aControls.js

@@ -279 +279 @@
       function liHtml(label, options)
                         {
-                                return "<li style='display: none'><a href='#' title='Remove this item' class='a-multiple-select-remove'>" + 
-                                          label + 
-                                          options['remove'] + "</a></li>\n";    
+                                return "<li class='a-multiple-select-item' style='display: none;'><span>"+label+"</span><a href='#' title='Remove \""+label+"\"' class='a-btn icon a-close-small no-label nobg'>"+ options['remove'] + "</a></li>\n";   
                         }
                         // We need this because you can't have nasty characters in a selector 

plugins/apostrophePlugin/branches/features/css/web/js/fckeditor/fckconfig.js

@@ -129 +129 @@
 FCKConfig.ToolbarSets["Sidebar"] = [
         ['FontFormat', 'Bold','Italic', 'Blockquote'],
-        ['OrderedList','UnorderedList','-','Link','Unlink','Anchor','-','SpellCheck','Source']
+        ['OrderedList','UnorderedList','-','Link','Unlink','Anchor'],
+        ['SpellCheck','FitWindow','Source']
 ] ;