Index: /extensions/ExtendedDescription/language/en_UK/help.html
===================================================================
--- /extensions/ExtendedDescription/language/en_UK/help.html	(revision 17009)
+++ /extensions/ExtendedDescription/language/en_UK/help.html	(revision 17010)
@@ -76,5 +76,21 @@
   <li><b>[random album=yy size=M html=yes link=yes]</b></li>
 </ul>
-<p>Same thin as above, except that the photo is choosed randomly into <code>album</code></p>
+<p>Same thing as above, except that the photo is choosed randomly into <code>album</code></p>
+
+<ul>
+  <li><b>[slider album=xx nb_images=10 random=no list=aa,bb,cc size=M speed=3 title=no effect=fade arrows=yes control=yes elastic=no]</b></li>
+</ul>
+<p>This tag allows to insert a slideshow (NivoSlider), with (you must set <code>album</code> OR <code>list</code>):<br><br>
+- <code>album</code> (optional) source album<br>
+- <code>nb_images</code> (optional) max number of photos to display in the slideshow<br>
+- <code>random</code> (optional) choose photos randomly in the album<br>
+- <code>list</code> (optional) a list of photos ids separated by a comma<br>
+- <code>size</code> (optional) the size of the photos, among <i>{SQ, TH, XXS, S, M, L, XL, XXL}</i><br>
+- <code>speed</code> (optional) the slideshow speed (in seconds)<br>
+- <code>title</code> (optional) display photo title<br>
+- <code>effect</code> (optional) transition effect (see <a href="http://nivo.dev7studios.com/support/jquery-plugin-usage/">NivoSlider doc</a>)<br>
+- <code>arrows</code> (optional) display navigation arrows<br>
+- <code>control</code> (optional) display navigation controls<br>
+- <code>elastic</code> (optional) adapt slideshow size to each photo</p>
 
 
Index: /extensions/ExtendedDescription/language/fr_FR/help.html
===================================================================
--- /extensions/ExtendedDescription/language/fr_FR/help.html	(revision 17009)
+++ /extensions/ExtendedDescription/language/fr_FR/help.html	(revision 17010)
@@ -72,10 +72,10 @@
   <li><b>[photo id=xx album=yy size=M html=yes link=yes]</b></li>
 </ul>
-<p>Cetet balise permet d'insérer une photo de n'importe quelle taille, avec:<br><br>
+<p>Cette balise permet d'insérer une photo de n'importe quelle taille, avec:<br><br>
 - <code>id</code> le numéro de la photo<br>
-- <code>album</code> (optional) le numéro de l'album parent<br>
-- <code>size</code> (optional) la taille de la photo, parmi <i>{SQ, TH, XXS, S, M, L, XL, XXL}</i><br>
-- <code>html</code> (optional) si <i>no</i>, la balise ne retourne que l'URL de la photo, sans HTML<br>
-- <code>link</code> (optional) si <i>yes</i>, la photo est cliquable, vers sa page</p>
+- <code>album</code> (facultatif) le numéro de l'album parent<br>
+- <code>size</code> (facultatif) la taille de la photo, parmi <i>{SQ, TH, XXS, S, M, L, XL, XXL}</i><br>
+- <code>html</code> (facultatif) si <i>no</i>, la balise ne retourne que l'URL de la photo, sans HTML<br>
+- <code>link</code> (facultatif) si <i>yes</i>, la photo est cliquable, vers sa page</p>
 
 <ul>
@@ -83,4 +83,21 @@
 </ul>
 <p>Même chose, sauf que la photo est prise aléatoirement dans <code>album</code></p>
+
+<ul>
+  <li><b>[slider album=xx nb_images=10 random=no list=aa,bb,cc size=M speed=3 title=no effect=fade arrows=yes control=yes elastic=no]</b></li>
+</ul>
+<p>Permet d'insérer un diaporama (NivoSlider), avec (vous devez renseigner <code>album</code> OU <code>list</code>):<br><br>
+- <code>album</code> (facultatif) album source<br>
+- <code>nb_images</code> (facultatif) nombre maximal de photos dans le diaporama<br>
+- <code>random</code> (facultatif) choisir les photos aléatoirement dans l'album<br>
+- <code>list</code> (facultatif) une liste de photos séparées par une virgule<br>
+- <code>size</code> (facultatif) la taille des photos, parmi <i>{SQ, TH, XXS, S, M, L, XL, XXL}</i><br>
+- <code>speed</code> (facultatif) la vitesse du diaporama (en secondes)<br>
+- <code>title</code> (facultatif) afficher le nom de la photo<br>
+- <code>effect</code> (facultatif) effet de transition (voir <a href="http://nivo.dev7studios.com/support/jquery-plugin-usage/">la doc de NivoSlider</a>)<br>
+- <code>arrows</code> (facultatif) afficher les flèches de navigations<br>
+- <code>control</code> (facultatif) afficher la barre de navigation<br>
+- <code>elastic</code> (facultatif) adapter la taille du diaporama à chaque photo</p>
+
 
 <h3>Masquer un album</h3>
Index: /extensions/ExtendedDescription/main.inc.php
===================================================================
--- /extensions/ExtendedDescription/main.inc.php	(revision 17009)
+++ /extensions/ExtendedDescription/main.inc.php	(revision 17010)
@@ -122,14 +122,21 @@
   // Balises [img=xx.yy,xx.yy,xx.yy;left|right|;name|titleName|]
   //$patterns[] = '#\[img=(\d*)\.?(\d*|);?(left|right|);?(name|titleName|)\]#ie';
-  $patterns[] = '#\[img=([\d\s\.]*);?(left|right|);?(name|titleName|)\]#ie';
+  $patterns[] = '#\[img=([\d\s\.,]*);?(left|right|);?(name|titleName|)\]#ie';
   $replacements[] = ($param == 'subcatify_category_description') ? '' : 'get_img_thumb("$1", "$2", "$3")';
   
   // Balises [photo id=xx album=yy size=SQ|TH|XXS|XS|S|M|L|XL|XXL html=yes|no link=yes|no]
-  $patterns[] = '#\[photo\s+id=(\d+)(?:\s+album=(\d+))?(?:\s+size=(SQ|TH|XXS|XS|S|M|L|XL|XXL))?(?:\s+html=(yes|no))?(?:\s+link=(yes|no))?\]#ie';
-  $replacements[] = ($param == 'subcatify_category_description') ? '' : 'get_photo_sized("$1", "$2", "$3", "$4", "$5")';
+  // $patterns[] = '#\[photo(?:(?:\s+(id)=(\d+))|(?:\s+(album)=(\d+))|(?:\s+(size)=(SQ|TH|XXS|XS|S|M|L|XL|XXL))|(?:\s+(html)=(yes|no))|(?:\s+(link)=(yes|no))){1,5}\s*\]#ie'; //10
+  $patterns[] = '#\[photo ([^\]]+)\]#ie';
+  $replacements[] = ($param == 'subcatify_category_description') ? '' : 'get_photo_sized("$1")';
 
   // Balises [random album=xx size=SQ|TH|XXS|XS|S|M|L|XL|XXL html=yes|no link=yes|no]
-  $patterns[] = '#\[random\s+(?:album|cat)=(\d+)(?:\s+size=(SQ|TH|XXS|XS|S|M|L|XL|XXL))?(?:\s+html=(yes|no))?(?:\s+link=(yes|no))?\]#ie';
-  $replacements[] = 'extdesc_get_random_photo("$1", "$2", "$3", "$4")';
+  // $patterns[] = '#\[random(?:(?:\s+(album|cat)=(\d+))|(?:\s+(size)=(SQ|TH|XXS|XS|S|M|L|XL|XXL))|(?:\s+(html)=(yes|no))|(?:\s+(link)=(yes|no))){1,4}\s*\]#ie'; //8
+  $patterns[] = '#\[random ([^\]]+)\]#ie';
+  $replacements[] = ($param == 'subcatify_category_description') ? '' : 'extdesc_get_random_photo("$1")';
+  
+  // Balises [slider album=xx nb_images=yy random=yes|no list=aa,bb,cc size=SQ|TH|XXS|XS|S|M|L|XL|XXL speed=z title=yes|no effect=... arrows=yes|no control=yes|no elastic=yes|no]
+  // $patterns[] = '#\[slider(?:(?:\s+(album)=(\d+))|(?:\s+(nb_images)=(\d+))|(?:\s+(random)=(yes|no))|(?:\s+(list)=([\d,]+))|(?:\s+(size)=(SQ|TH|XXS|XS|S|M|L|XL|XXL))|(?:\s+(speed)=(\d+))|(?:\s+(title)=(yes|no))|(?:\s+(effect)=([a-zA-Z]+))|(?:\s+(arrows)=(yes|no))|(?:\s+(control)=(yes|no))|(?:\s+(elastic)=(yes|no))){1,11}\s*\]#ie'; //22
+  $patterns[] = '#\[slider ([^\]]+)\]#ie';
+  $replacements[] = ($param == 'subcatify_category_description') ? '' : 'get_slider("$1")';
 
   // Balises <!--complete-->, <!--more--> et <!--up-down-->
@@ -371,9 +378,307 @@
 }
 
-// Return html code for a photo
-function get_photo_sized($image_id, $cat_id, $size, $html, $link)
+/**
+ * Return html code for a photo
+ *
+ * @int    id:    picture id
+ * @int    album: album to display picture in    (default: null)
+ * @string size:  picture size                   (default: M)
+ * @string html:  return complete html structure (default: yes)
+ * @string link:  add a link to the picture      (default: yes)
+ */
+function get_photo_sized($param)
 {
   global $template;
   
+  $default_params = array(
+    'id' =>    array('\d+', null),
+    'album' => array('\d+', null),
+    'size' =>  array('SQ|TH|XXS|XS|S|M|L|XL|XXL', 'M'),
+    'html' =>  array('yes|no', 'yes'),
+    'link' =>  array('yes|no', 'yes'),
+    );
+    
+  $params = parse_parameters($param, $default_params);
+  
+  // check picture id
+  if (empty($params['id'])) return 'missing picture id';
+  
+  // parameters
+  $params['link'] = $params['link']=='no' ? false : true;
+  $params['html'] = $params['html']=='no' ? false : true;
+  $deriv_type = get_deriv_type($params['size']);
+
+  // get picture
+  $query = 'SELECT * FROM ' . IMAGES_TABLE . ' WHERE id = '.$params['id'].';';
+  $result = pwg_query($query); 
+
+  if (pwg_db_num_rows($result))
+  {
+    $picture = pwg_db_fetch_assoc($result);
+    
+    // url
+    if ($params['link'])
+    {
+      if (!empty($params['album']))
+      {
+        $url = make_picture_url(array(
+          'image_id' => $picture['id'],
+          'category' => array(
+            'id' => $params['album'],
+            'name' => '',
+            'permalink' => '',
+            )));
+      }
+      else
+      {
+        $url = make_picture_url(array('image_id' => $picture['id']));
+      }
+    }
+    
+    // image
+    $src_image = new SrcImage($picture);
+    $derivatives = DerivativeImage::get_all($src_image);
+    $selected_derivative = $derivatives[$deriv_type];
+
+    $template->assign(array(
+      'current' => array(
+        'selected_derivative' => $selected_derivative,
+        ),
+      'ALT_IMG' => $picture['file'],
+      ));
+
+    // output
+    if ($params['html']) 
+    {
+      $template->set_filename('extended_description_content', dirname(__FILE__).'/template/picture_content.tpl');
+      $content = $template->parse('extended_description_content', true);
+      if ($params['link']) return '<a href="'.$url.'">'.$content.'</a>';
+      else                 return $content;
+    }
+    else
+    {
+      return $selected_derivative->get_url();
+    }
+  }
+  
+  return 'invalid picture id';
+}
+
+/**
+ * Return html code for a random photo
+ *
+ * @int    album: select picture from this album
+ * @string size:  picture size                   (default: M)
+ * @string html:  return complete html structure (default: yes)
+ * @string link:  add a link to the picture      (default: no)
+ */
+function extdesc_get_random_photo($param)
+{
+  $default_params = array(
+    'album' => array('\d+', null),
+    'cat' =>   array('\d+', null), // historical
+    'size' =>  array('SQ|TH|XXS|XS|S|M|L|XL|XXL', 'M'),
+    'html' =>  array('yes|no', 'yes'),
+    'link' =>  array('yes|no', 'no'),
+    );
+    
+  $params = parse_parameters($param, $default_params);
+  
+  // check album id
+  if (empty($params['album']))
+  {
+    if (empty($params['cat'])) return 'missing album id';
+    $params['album'] = $params['cat'];
+  }
+  
+  // get picture id
+  $query = '
+SELECT id
+  FROM '.IMAGES_TABLE.'
+    JOIN '.IMAGE_CATEGORY_TABLE.' ON image_id = id
+  WHERE category_id = '.$params['album'].'
+  ORDER BY '.DB_RANDOM_FUNCTION.'()
+  LIMIT 1
+;';
+  $result = pwg_query($query);
+  
+  if (pwg_db_num_rows($result))
+  {
+    list($img_id) = pwg_db_fetch_row($result);
+    return get_photo_sized('id='.$img_id.' album='.$params['album'].' size='.$params['size'].' html='.$params['html'].' link='.$params['link']);
+  }
+
+  return '';
+}
+
+/** 
+ * Return html code for a nivo slider (album or list is mandatory)
+ *
+ * @int    album:     select pictures from this album
+ * @int    nb_images: display only x pictures           (default: 10)
+ * @string random:    random sort order                 (default: no)
+ *
+ * @string list:      pictures id separated by a comma
+ *
+ * @string size:      picture size                      (default: M)
+ * @int    speed:     slideshow duration                (default: 3)
+ * @string title:     display picture name              (default: no)
+ * @string effect:    transition effect                 (default: fade)
+ * @string arrows:    display navigation arrows         (default: yes)
+ * @string control:   display navigation bar            (default: yes)
+ * @string elastic:   adapt slider size to each picture (default: no)
+ */
+function get_slider($param)
+{
+  global $template, $conf;
+  
+  $default_params = array(
+    'album' =>     array('\d+', null),
+    'nb_images' => array('\d+', 10),
+    'random' =>    array('yes|no', 'no'),
+    'list' =>      array('[\d,]+', null),
+    'size' =>      array('SQ|TH|XXS|XS|S|M|L|XL|XXL', 'M'),
+    'speed' =>     array('\d+', 3),
+    'title' =>     array('yes|no', 'no'),
+    'effect' =>    array('[a-zA-Z]+', 'fade'),
+    'arrows' =>    array('yes|no', 'yes'),
+    'control' =>   array('yes|no', 'yes'),
+    'elastic' =>   array('yes|no', 'no'),
+    );
+    
+  $params = parse_parameters($param, $default_params);
+  
+  // check size
+  $deriv_type = get_deriv_type($params['size']);
+  $enabled = ImageStdParams::get_defined_type_map();
+  if (empty($enabled[ $deriv_type ])) return 'size disabled';
+  
+  // parameters
+  $params['arrows'] = $params['arrows']==='no' ? 'false' : 'true';
+  $params['control'] = $params['control']==='no' ? 'false' : 'true';
+  $params['elastic'] = $params['elastic']==='yes' ? true : false;
+  $params['title'] = $params['title']==='yes' ? true : false;
+  
+  // pictures from album...
+  if (!empty($params['album']))
+  {
+    // parameters
+    $params['random'] = $params['random']==='yes' ? true : false;
+    
+    // get image order inside category
+    if ($params['random'])
+    {
+      $order_by = DB_RANDOM_FUNCTION.'()';
+    }
+    else
+    {
+      $query = '
+SELECT image_order
+  FROM '.CATEGORIES_TABLE.'
+  WHERE id = '.$params['album'].'
+;';
+      list($order_by) = pwg_db_fetch_row(pwg_query($query));
+      if (empty($order_by))
+      {
+        $order_by = str_replace('ORDER BY ', null, $conf['order_by_inside_category']);
+      }
+    }
+    
+    // get pictures ids
+    $query = '
+SELECT image_id
+  FROM '.IMAGE_CATEGORY_TABLE.' as ic
+    INNER JOIN '.IMAGES_TABLE.' as i
+    ON i.id = ic.image_id
+  WHERE category_id = '.$params['album'].'
+  ORDER BY '.$order_by.'
+  LIMIT '.$params['nb_images'].'
+;';
+    $params['list'] = implode(',', array_from_query($query, 'image_id'));
+  }
+  // ...or pictures list
+  if (empty($params['list']))
+  {
+    return 'missing album id or empty picture list';
+  }
+  
+  // get pictures
+  $query = '
+SELECT *
+  FROM '.IMAGES_TABLE.'
+  WHERE id IN ('.$params['list'].')
+;';
+  $pictures = hash_from_query($query, 'id');
+    
+  foreach ($pictures as $row)
+  {
+    // url
+    if (!empty($params['album']))
+    {
+      $url = make_picture_url(array(
+        'image_id' => $row['id'],
+        'category' => array(
+          'id' => $params['album'],
+          'name' => '',
+          'permalink' => '',
+          )));
+    }
+    else
+    {
+      $url = make_picture_url(array('image_id' => $row['id']));
+    }
+
+    $name = render_element_name($row);
+    
+    $tpl_vars[] = array_merge($row, array(
+      'TN_ALT' => htmlspecialchars(strip_tags($name)),
+      'NAME' => $name,
+      'URL' => $url,
+      'src_image' => new SrcImage($row),
+      ));
+  }
+  
+  list($img_size['w'], $img_size['h']) = $enabled[ $deriv_type ]->sizing->ideal_size;
+  
+  $template->assign(array(
+    'EXTENDED_DESC_PATH' => EXTENDED_DESC_PATH,
+    'slider_id' => crc32(uniqid($params['list'])), // need a unique id if we have multiple sliders
+    'slider_content' => $tpl_vars,
+    'derivative_params' => ImageStdParams::get_by_type( $deriv_type ),
+    'img_size' => $img_size,
+    'pauseTime' => $params['speed']*1000,
+    'controlNav' => $params['control'],
+    'effect' => $params['effect'],
+    'directionNav' => $params['arrows'],
+    'elastic_size' => $params['elastic'],
+    'show_title' => $params['title'],
+    ));
+  
+  $template->set_filename('extended_description_content', dirname(__FILE__).'/template/slider.tpl');
+  return $template->parse('extended_description_content', true);
+}
+
+
+function parse_parameters($param, $default_params)
+{
+  $params = array();
+  
+  foreach ($default_params as $name => $value)
+  {
+    if (preg_match('#'.$name.'=('.$value[0].')#', $param, $matches))
+    {
+      $params[$name] = $matches[1];
+    }
+    else
+    {
+      $params[$name] = $value[1];
+    }
+  }
+  
+  return $params;
+}
+
+function get_deriv_type($size)
+{
   $size_map = array(
     'SQ' => IMG_SQUARE,
@@ -389,94 +694,8 @@
     
   if (!array_key_exists($size, $size_map)) $size = 'M';
-  $link = $link=='no' ? false: true;
-  $html = $html=='no' ? false: true;
-    
-  $deriv_type = $size_map[ strtoupper($size) ];
-
-  $query = 'SELECT * FROM ' . IMAGES_TABLE . ' WHERE id = '.$image_id.';';
-  $result = pwg_query($query); 
-
-  if (pwg_db_num_rows($result))
-  {
-    $template->set_filename('extended_description_content', dirname(__FILE__).'/template/picture_content.tpl');
-    
-    $picture = pwg_db_fetch_assoc($result);
-    
-    // url
-    if (!empty($cat_id))
-    {
-      $url = make_picture_url(array(
-        'image_id' => $picture['id'],
-        'category' => array(
-          'id' => $cat_id,
-          'name' => '',
-          'permalink' => '')));
-    }
-    else
-    {
-      $url = make_picture_url(array('image_id' => $picture['id']));
-    }
-    
-    // image
-    $src_image = new SrcImage($picture);
-    $derivatives = DerivativeImage::get_all($src_image);
-    $selected_derivative = $derivatives[$deriv_type];
-
-    $template->assign(array(
-      'current' => array(
-        'selected_derivative' => $selected_derivative,
-        ),
-      'ALT_IMG' => $picture['file'],
-      ));
-    if (!empty($picture['comment']))
-    {
-      $template->assign('COMMENT_IMG', trigger_event('render_element_description', $picture['comment']));
-    }
-
-    
-    if ($html) 
-    {
-      $content = $template->parse('extended_description_content', true);
-      if ($link) return '<a href="'.$url.'">'.$content.'</a>';
-      else       return $content;
-    }
-    else
-    {
-      return $selected_derivative->get_url();
-    }
-  }
-  
-  return '';
-}
-
-
-
-function extdesc_get_random_photo($category_id, $size, $html, $link)
-{
-  if ('yes' != $link)
-  {
-    $link = 'no';
-  }
-
-  include_once(PHPWG_ROOT_PATH.'include/functions_picture.inc.php');
-  
-  $query = '
-SELECT id
-  FROM '.IMAGES_TABLE.'
-    JOIN '.IMAGE_CATEGORY_TABLE.' ON image_id = id
-  WHERE category_id = '.$category_id.'
-  ORDER BY '.DB_RANDOM_FUNCTION.'()
-  LIMIT 1
-;';
-  $result = pwg_query($query);
-  
-  if (pwg_db_num_rows($result))
-  {
-    list($img_id) = pwg_db_fetch_row($result);
-    return get_photo_sized($img_id, $category_id, $size, $html, $link);
-  }
-
-  return '';
-}
+  
+  return $size_map[ strtoupper($size) ];
+}
+
 
 if (script_basename() == 'admin' or script_basename() == 'popuphelp')
@@ -485,5 +704,5 @@
 }
 
-add_event_handler ('render_page_banner', 'get_user_language_desc');
+add_event_handler ('render_page_banner', 'get_extended_desc');
 add_event_handler ('render_category_name', 'get_user_language_desc');
 add_event_handler ('render_category_description', 'get_extended_desc', EVENT_HANDLER_PRIORITY_NEUTRAL, 2);
Index: /extensions/ExtendedDescription/template/nivoslider/dark.css
===================================================================
--- /extensions/ExtendedDescription/template/nivoslider/dark.css	(revision 17010)
+++ /extensions/ExtendedDescription/template/nivoslider/dark.css	(revision 17010)
@@ -0,0 +1,86 @@
+/*
+Skin Name: Nivo Slider Default Theme
+Skin URI: http://nivo.dev7studios.com
+Skin Type: flexible
+Description: The default skin for the Nivo Slider.
+Version: 1.2
+Author: Gilbert Pellegrom
+Author URI: http://dev7studios.com
+*/
+
+.theme-default .nivoSlider {
+	position:relative;
+	background:#000 url(loading.gif) no-repeat 50% 50%;
+    -webkit-box-shadow: 0px 1px 5px 0px #000;
+    -moz-box-shadow: 0px 1px 5px 0px #000;
+    box-shadow: 0px 1px 5px 0px #000;
+}
+.theme-default .nivoSlider img {
+	position:absolute;
+	top:0px;
+	left:0px;
+	display:none;
+}
+.theme-default .nivoSlider a {
+	border:0;
+	display:block;
+}
+
+.theme-default .nivo-controlNav {
+	text-align: center;
+	padding: 10px 0;
+}
+.theme-default .nivo-controlNav a {
+	display:inline-block;
+	width:22px;
+	height:22px;
+	background:url(bullets.png) no-repeat;
+	text-indent:-9999px;
+	border:0;
+	margin: 0 2px;
+}
+.theme-default .nivo-controlNav a.active {
+	background-position:0 -22px;
+}
+
+.theme-default .nivo-directionNav a {
+	display:block;
+	width:30px;
+	height:30px;
+	background:url(arrows.png) no-repeat;
+	text-indent:-9999px;
+	border:0;
+}
+.theme-default a.nivo-nextNav {
+	background-position:-30px 0;
+	right:15px;
+}
+.theme-default a.nivo-prevNav {
+	left:15px;
+}
+
+.theme-default .nivo-caption {
+    font-family: Helvetica, Arial, sans-serif;
+}
+.theme-default .nivo-caption a {
+    color:#fff;
+    border-bottom:1px dotted #fff;
+}
+.theme-default .nivo-caption a:hover {
+    color:#fff;
+}
+
+.theme-default .nivo-controlNav.nivo-thumbs-enabled {
+	width: 100%;
+}
+.theme-default .nivo-controlNav.nivo-thumbs-enabled a {
+	width: auto;
+	height: auto;
+	background: none;
+	margin-bottom: 5px;
+}
+.theme-default .nivo-controlNav.nivo-thumbs-enabled img {
+	display: block;
+	width: 120px;
+	height: auto;
+}
Index: /extensions/ExtendedDescription/template/nivoslider/index.php
===================================================================
--- /extensions/ExtendedDescription/template/nivoslider/index.php	(revision 17010)
+++ /extensions/ExtendedDescription/template/nivoslider/index.php	(revision 17010)
@@ -0,0 +1,33 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery                           |
+// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | file          : $Id: index.php 1912 2007-03-16 06:30:07Z rub $
+// | last update   : $Date: 2007-03-16 07:30:07 +0100 (ven, 16 mar 2007) $
+// | last modifier : $Author: rub $
+// | revision      : $Revision: 1912 $
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
Index: /extensions/ExtendedDescription/template/nivoslider/jquery.nivo.slider.js
===================================================================
--- /extensions/ExtendedDescription/template/nivoslider/jquery.nivo.slider.js	(revision 17010)
+++ /extensions/ExtendedDescription/template/nivoslider/jquery.nivo.slider.js	(revision 17010)
@@ -0,0 +1,679 @@
+/*
+ * jQuery Nivo Slider v3.0.1
+ * http://nivo.dev7studios.com
+ *
+ * Copyright 2012, Dev7studios
+ * Free to use and abuse under the MIT license.
+ * http://www.opensource.org/licenses/mit-license.php
+ */
+ 
+/**
+ * July 25th 2012
+ * Damien (Mistic) Sorel
+ * ability to stop slideshow with beforeChange (line 318)
+ */
+
+(function($) {
+    var NivoSlider = function(element, options){
+        // Defaults are below
+        var settings = $.extend({}, $.fn.nivoSlider.defaults, options);
+
+        // Useful variables. Play carefully.
+        var vars = {
+            currentSlide: 0,
+            currentImage: '',
+            totalSlides: 0,
+            running: false,
+            paused: false,
+            stop: false,
+            controlNavEl: false
+        };
+
+        // Get this slider
+        var slider = $(element);
+        slider.data('nivo:vars', vars).addClass('nivoSlider');
+
+        // Find our slider children
+        var kids = slider.children();
+        kids.each(function() {
+            var child = $(this);
+            var link = '';
+            if(!child.is('img')){
+                if(child.is('a')){
+                    child.addClass('nivo-imageLink');
+                    link = child;
+                }
+                child = child.find('img:first');
+            }
+            // Get img width & height
+            var childWidth = (childWidth === 0) ? child.attr('width') : child.width(),
+                childHeight = (childHeight === 0) ? child.attr('height') : child.height();
+
+            if(link !== ''){
+                link.css('display','none');
+            }
+            child.css('display','none');
+            vars.totalSlides++;
+        });
+         
+        // If randomStart
+        if(settings.randomStart){
+            settings.startSlide = Math.floor(Math.random() * vars.totalSlides);
+        }
+        
+        // Set startSlide
+        if(settings.startSlide > 0){
+            if(settings.startSlide >= vars.totalSlides) { settings.startSlide = vars.totalSlides - 1; }
+            vars.currentSlide = settings.startSlide;
+        }
+        
+        // Get initial image
+        if($(kids[vars.currentSlide]).is('img')){
+            vars.currentImage = $(kids[vars.currentSlide]);
+        } else {
+            vars.currentImage = $(kids[vars.currentSlide]).find('img:first');
+        }
+        
+        // Show initial link
+        if($(kids[vars.currentSlide]).is('a')){
+            $(kids[vars.currentSlide]).css('display','block');
+        }
+        
+        // Set first background
+        var sliderImg = $('<img class="nivo-main-image" src="#" />');
+        sliderImg.attr('src', vars.currentImage.attr('src')).show();
+        slider.append(sliderImg);
+
+        // Detect Window Resize
+        $(window).resize(function() {
+            slider.children('img').width(slider.width());
+            sliderImg.attr('src', vars.currentImage.attr('src'));
+            sliderImg.stop().height('auto');
+            $('.nivo-slice').remove();
+            $('.nivo-box').remove();
+        });
+
+        //Create caption
+        slider.append($('<div class="nivo-caption"></div>'));
+        
+        // Process caption function
+        var processCaption = function(settings){
+            var nivoCaption = $('.nivo-caption', slider);
+            if(vars.currentImage.attr('title') != '' && vars.currentImage.attr('title') != undefined){
+                var title = vars.currentImage.attr('title');
+                if(title.substr(0,1) == '#') title = $(title).html();   
+
+                if(nivoCaption.css('display') == 'block'){
+                    setTimeout(function(){
+                        nivoCaption.html(title);
+                    }, settings.animSpeed);
+                } else {
+                    nivoCaption.html(title);
+                    nivoCaption.stop().fadeIn(settings.animSpeed);
+                }
+            } else {
+                nivoCaption.stop().fadeOut(settings.animSpeed);
+            }
+        }
+        
+        //Process initial  caption
+        processCaption(settings);
+        
+        // In the words of Super Mario "let's a go!"
+        var timer = 0;
+        if(!settings.manualAdvance && kids.length > 1){
+            timer = setInterval(function(){ nivoRun(slider, kids, settings, false); }, settings.pauseTime);
+        }
+        
+        // Add Direction nav
+        if(settings.directionNav){
+            slider.append('<div class="nivo-directionNav"><a class="nivo-prevNav">'+ settings.prevText +'</a><a class="nivo-nextNav">'+ settings.nextText +'</a></div>');
+            
+            // Hide Direction nav
+            if(settings.directionNavHide){
+                $('.nivo-directionNav', slider).hide();
+                slider.hover(function(){
+                    $('.nivo-directionNav', slider).show();
+                }, function(){
+                    $('.nivo-directionNav', slider).hide();
+                });
+            }
+            
+            $('a.nivo-prevNav', slider).live('click', function(){
+                if(vars.running) { return false; }
+                clearInterval(timer);
+                timer = '';
+                vars.currentSlide -= 2;
+                nivoRun(slider, kids, settings, 'prev');
+            });
+            
+            $('a.nivo-nextNav', slider).live('click', function(){
+                if(vars.running) { return false; }
+                clearInterval(timer);
+                timer = '';
+                nivoRun(slider, kids, settings, 'next');
+            });
+        }
+        
+        // Add Control nav
+        if(settings.controlNav){
+            vars.controlNavEl = $('<div class="nivo-controlNav"></div>');
+            slider.after(vars.controlNavEl);
+            for(var i = 0; i < kids.length; i++){
+                if(settings.controlNavThumbs){
+                    vars.controlNavEl.addClass('nivo-thumbs-enabled');
+                    var child = kids.eq(i);
+                    if(!child.is('img')){
+                        child = child.find('img:first');
+                    }
+                    if(child.attr('data-thumb')) vars.controlNavEl.append('<a class="nivo-control" rel="'+ i +'"><img src="'+ child.attr('data-thumb') +'" alt="" /></a>');
+                } else {
+                    vars.controlNavEl.append('<a class="nivo-control" rel="'+ i +'">'+ (i + 1) +'</a>');
+                }
+            }
+
+            //Set initial active link
+            $('a:eq('+ vars.currentSlide +')', vars.controlNavEl).addClass('active');
+            
+            $('a', vars.controlNavEl).bind('click', function(){
+                if(vars.running) return false;
+                if($(this).hasClass('active')) return false;
+                clearInterval(timer);
+                timer = '';
+                sliderImg.attr('src', vars.currentImage.attr('src'));
+                vars.currentSlide = $(this).attr('rel') - 1;
+                nivoRun(slider, kids, settings, 'control');
+            });
+        }
+        
+        //For pauseOnHover setting
+        if(settings.pauseOnHover){
+            slider.hover(function(){
+                vars.paused = true;
+                clearInterval(timer);
+                timer = '';
+            }, function(){
+                vars.paused = false;
+                // Restart the timer
+                if(timer === '' && !settings.manualAdvance){
+                    timer = setInterval(function(){ nivoRun(slider, kids, settings, false); }, settings.pauseTime);
+                }
+            });
+        }
+        
+        // Event when Animation finishes
+        slider.bind('nivo:animFinished', function(){
+            sliderImg.attr('src', vars.currentImage.attr('src'));
+            vars.running = false; 
+            // Hide child links
+            $(kids).each(function(){
+                if($(this).is('a')){
+                   $(this).css('display','none');
+                }
+            });
+            // Show current link
+            if($(kids[vars.currentSlide]).is('a')){
+                $(kids[vars.currentSlide]).css('display','block');
+            }
+            // Restart the timer
+            if(timer === '' && !vars.paused && !settings.manualAdvance){
+                timer = setInterval(function(){ nivoRun(slider, kids, settings, false); }, settings.pauseTime);
+            }
+            // Trigger the afterChange callback
+            settings.afterChange.call(this);
+        }); 
+        
+        // Add slices for slice animations
+        var createSlices = function(slider, settings, vars) {
+        	if($(vars.currentImage).parent().is('a')) $(vars.currentImage).parent().css('display','block');
+            $('img[src="'+ vars.currentImage.attr('src') +'"]', slider).not('.nivo-main-image,.nivo-control img').width(slider.width()).css('visibility', 'hidden').show();
+            var sliceHeight = ($('img[src="'+ vars.currentImage.attr('src') +'"]', slider).not('.nivo-main-image,.nivo-control img').parent().is('a')) ? $('img[src="'+ vars.currentImage.attr('src') +'"]', slider).not('.nivo-main-image,.nivo-control img').parent().height() : $('img[src="'+ vars.currentImage.attr('src') +'"]', slider).not('.nivo-main-image,.nivo-control img').height();
+
+            for(var i = 0; i < settings.slices; i++){
+                var sliceWidth = Math.round(slider.width()/settings.slices);
+                
+                if(i === settings.slices-1){
+                    slider.append(
+                        $('<div class="nivo-slice" name="'+i+'"><img src="'+ vars.currentImage.attr('src') +'" style="position:absolute; width:'+ slider.width() +'px; height:auto; display:block !important; top:0; left:-'+ ((sliceWidth + (i * sliceWidth)) - sliceWidth) +'px;" /></div>').css({ 
+                            left:(sliceWidth*i)+'px', 
+                            width:(slider.width()-(sliceWidth*i))+'px',
+                            height:sliceHeight+'px', 
+                            opacity:'0',
+                            overflow:'hidden'
+                        })
+                    );
+                } else {
+                    slider.append(
+                        $('<div class="nivo-slice" name="'+i+'"><img src="'+ vars.currentImage.attr('src') +'" style="position:absolute; width:'+ slider.width() +'px; height:auto; display:block !important; top:0; left:-'+ ((sliceWidth + (i * sliceWidth)) - sliceWidth) +'px;" /></div>').css({ 
+                            left:(sliceWidth*i)+'px', 
+                            width:sliceWidth+'px',
+                            height:sliceHeight+'px',
+                            opacity:'0',
+                            overflow:'hidden'
+                        })
+                    );
+                }
+            }
+            
+            $('.nivo-slice', slider).height(sliceHeight);
+            sliderImg.stop().animate({
+                height: $(vars.currentImage).height()
+            }, settings.animSpeed);
+        };
+        
+        // Add boxes for box animations
+        var createBoxes = function(slider, settings, vars){
+        	if($(vars.currentImage).parent().is('a')) $(vars.currentImage).parent().css('display','block');
+            $('img[src="'+ vars.currentImage.attr('src') +'"]', slider).not('.nivo-main-image,.nivo-control img').width(slider.width()).css('visibility', 'hidden').show();
+            var boxWidth = Math.round(slider.width()/settings.boxCols),
+                boxHeight = Math.round($('img[src="'+ vars.currentImage.attr('src') +'"]', slider).not('.nivo-main-image,.nivo-control img').height() / settings.boxRows);
+            
+                        
+            for(var rows = 0; rows < settings.boxRows; rows++){
+                for(var cols = 0; cols < settings.boxCols; cols++){
+                    if(cols === settings.boxCols-1){
+                        slider.append(
+                            $('<div class="nivo-box" name="'+ cols +'" rel="'+ rows +'"><img src="'+ vars.currentImage.attr('src') +'" style="position:absolute; width:'+ slider.width() +'px; height:auto; display:block; top:-'+ (boxHeight*rows) +'px; left:-'+ (boxWidth*cols) +'px;" /></div>').css({ 
+                                opacity:0,
+                                left:(boxWidth*cols)+'px', 
+                                top:(boxHeight*rows)+'px',
+                                width:(slider.width()-(boxWidth*cols))+'px'
+                                
+                            })
+                        );
+                        $('.nivo-box[name="'+ cols +'"]', slider).height($('.nivo-box[name="'+ cols +'"] img', slider).height()+'px');
+                    } else {
+                        slider.append(
+                            $('<div class="nivo-box" name="'+ cols +'" rel="'+ rows +'"><img src="'+ vars.currentImage.attr('src') +'" style="position:absolute; width:'+ slider.width() +'px; height:auto; display:block; top:-'+ (boxHeight*rows) +'px; left:-'+ (boxWidth*cols) +'px;" /></div>').css({ 
+                                opacity:0,
+                                left:(boxWidth*cols)+'px', 
+                                top:(boxHeight*rows)+'px',
+                                width:boxWidth+'px'
+                            })
+                        );
+                        $('.nivo-box[name="'+ cols +'"]', slider).height($('.nivo-box[name="'+ cols +'"] img', slider).height()+'px');
+                    }
+                }
+            }
+            
+            sliderImg.stop().animate({
+                height: $(vars.currentImage).height()
+            }, settings.animSpeed);
+        };
+
+        // Private run method
+        var nivoRun = function(slider, kids, settings, nudge){          
+            // Get our vars
+            var vars = slider.data('nivo:vars');
+            
+            // Trigger the lastSlide callback
+            if(vars && (vars.currentSlide === vars.totalSlides - 1)){ 
+                settings.lastSlide.call(this);
+            }
+            
+            // Stop
+            if((!vars || vars.stop) && !nudge) { return false; }
+            
+            // Trigger the beforeChange callback
+            if(settings.beforeChange.call(this) === false) { return false; }
+
+            // Set current background before change
+            if(!nudge){
+                sliderImg.attr('src', vars.currentImage.attr('src'));
+            } else {
+                if(nudge === 'prev'){
+                    sliderImg.attr('src', vars.currentImage.attr('src'));
+                }
+                if(nudge === 'next'){
+                    sliderImg.attr('src', vars.currentImage.attr('src'));
+                }
+            }
+            
+            vars.currentSlide++;
+            // Trigger the slideshowEnd callback
+            if(vars.currentSlide === vars.totalSlides){ 
+                vars.currentSlide = 0;
+                settings.slideshowEnd.call(this);
+            }
+            if(vars.currentSlide < 0) { vars.currentSlide = (vars.totalSlides - 1); }
+            // Set vars.currentImage
+            if($(kids[vars.currentSlide]).is('img')){
+                vars.currentImage = $(kids[vars.currentSlide]);
+            } else {
+                vars.currentImage = $(kids[vars.currentSlide]).find('img:first');
+            }
+            
+            // Set active links
+            if(settings.controlNav){
+                $('a', vars.controlNavEl).removeClass('active');
+                $('a:eq('+ vars.currentSlide +')', vars.controlNavEl).addClass('active');
+            }
+            
+            // Process caption
+            processCaption(settings);            
+            
+            // Remove any slices from last transition
+            $('.nivo-slice', slider).remove();
+            
+            // Remove any boxes from last transition
+            $('.nivo-box', slider).remove();
+            
+            var currentEffect = settings.effect,
+                anims = '';
+                
+            // Generate random effect
+            if(settings.effect === 'random'){
+                anims = new Array('sliceDownRight','sliceDownLeft','sliceUpRight','sliceUpLeft','sliceUpDown','sliceUpDownLeft','fold','fade',
+                'boxRandom','boxRain','boxRainReverse','boxRainGrow','boxRainGrowReverse');
+                currentEffect = anims[Math.floor(Math.random()*(anims.length + 1))];
+                if(currentEffect === undefined) { currentEffect = 'fade'; }
+            }
+            
+            // Run random effect from specified set (eg: effect:'fold,fade')
+            if(settings.effect.indexOf(',') !== -1){
+                anims = settings.effect.split(',');
+                currentEffect = anims[Math.floor(Math.random()*(anims.length))];
+                if(currentEffect === undefined) { currentEffect = 'fade'; }
+            }
+            
+            // Custom transition as defined by "data-transition" attribute
+            if(vars.currentImage.attr('data-transition')){
+                currentEffect = vars.currentImage.attr('data-transition');
+            }
+        
+            // Run effects
+            vars.running = true;
+            var timeBuff = 0,
+                i = 0,
+                slices = '',
+                firstSlice = '',
+                totalBoxes = '',
+                boxes = '';
+            
+            if(currentEffect === 'sliceDown' || currentEffect === 'sliceDownRight' || currentEffect === 'sliceDownLeft'){
+                createSlices(slider, settings, vars);
+                timeBuff = 0;
+                i = 0;
+                slices = $('.nivo-slice', slider);
+                if(currentEffect === 'sliceDownLeft') { slices = $('.nivo-slice', slider)._reverse(); }
+                
+                slices.each(function(){
+                    var slice = $(this);
+                    slice.css({ 'top': '0px' });
+                    if(i === settings.slices-1){
+                        setTimeout(function(){
+                            slice.animate({opacity:'1.0' }, settings.animSpeed, '', function(){ slider.trigger('nivo:animFinished'); });
+                        }, (100 + timeBuff));
+                    } else {
+                        setTimeout(function(){
+                            slice.animate({opacity:'1.0' }, settings.animSpeed);
+                        }, (100 + timeBuff));
+                    }
+                    timeBuff += 50;
+                    i++;
+                });
+            } else if(currentEffect === 'sliceUp' || currentEffect === 'sliceUpRight' || currentEffect === 'sliceUpLeft'){
+                createSlices(slider, settings, vars);
+                timeBuff = 0;
+                i = 0;
+                slices = $('.nivo-slice', slider);
+                if(currentEffect === 'sliceUpLeft') { slices = $('.nivo-slice', slider)._reverse(); }
+                
+                slices.each(function(){
+                    var slice = $(this);
+                    slice.css({ 'bottom': '0px' });
+                    if(i === settings.slices-1){
+                        setTimeout(function(){
+                            slice.animate({opacity:'1.0' }, settings.animSpeed, '', function(){ slider.trigger('nivo:animFinished'); });
+                        }, (100 + timeBuff));
+                    } else {
+                        setTimeout(function(){
+                            slice.animate({opacity:'1.0' }, settings.animSpeed);
+                        }, (100 + timeBuff));
+                    }
+                    timeBuff += 50;
+                    i++;
+                });
+            } else if(currentEffect === 'sliceUpDown' || currentEffect === 'sliceUpDownRight' || currentEffect === 'sliceUpDownLeft'){
+                createSlices(slider, settings, vars);
+                timeBuff = 0;
+                i = 0;
+                var v = 0;
+                slices = $('.nivo-slice', slider);
+                if(currentEffect === 'sliceUpDownLeft') { slices = $('.nivo-slice', slider)._reverse(); }
+                
+                slices.each(function(){
+                    var slice = $(this);
+                    if(i === 0){
+                        slice.css('top','0px');
+                        i++;
+                    } else {
+                        slice.css('bottom','0px');
+                        i = 0;
+                    }
+                    
+                    if(v === settings.slices-1){
+                        setTimeout(function(){
+                            slice.animate({opacity:'1.0' }, settings.animSpeed, '', function(){ slider.trigger('nivo:animFinished'); });
+                        }, (100 + timeBuff));
+                    } else {
+                        setTimeout(function(){
+                            slice.animate({opacity:'1.0' }, settings.animSpeed);
+                        }, (100 + timeBuff));
+                    }
+                    timeBuff += 50;
+                    v++;
+                });
+            } else if(currentEffect === 'fold'){
+                createSlices(slider, settings, vars);
+                timeBuff = 0;
+                i = 0;
+                
+                $('.nivo-slice', slider).each(function(){
+                    var slice = $(this);
+                    var origWidth = slice.width();
+                    slice.css({ top:'0px', width:'0px' });
+                    if(i === settings.slices-1){
+                        setTimeout(function(){
+                            slice.animate({ width:origWidth, opacity:'1.0' }, settings.animSpeed, '', function(){ slider.trigger('nivo:animFinished'); });
+                        }, (100 + timeBuff));
+                    } else {
+                        setTimeout(function(){
+                            slice.animate({ width:origWidth, opacity:'1.0' }, settings.animSpeed);
+                        }, (100 + timeBuff));
+                    }
+                    timeBuff += 50;
+                    i++;
+                });
+            } else if(currentEffect === 'fade'){
+                createSlices(slider, settings, vars);
+                
+                firstSlice = $('.nivo-slice:first', slider);
+                firstSlice.css({
+                    'width': slider.width() + 'px'
+                });
+    
+                firstSlice.animate({ opacity:'1.0' }, (settings.animSpeed*2), '', function(){ slider.trigger('nivo:animFinished'); });
+            } else if(currentEffect === 'slideInRight'){
+                createSlices(slider, settings, vars);
+                
+                firstSlice = $('.nivo-slice:first', slider);
+                firstSlice.css({
+                    'width': '0px',
+                    'opacity': '1'
+                });
+
+                firstSlice.animate({ width: slider.width() + 'px' }, (settings.animSpeed*2), '', function(){ slider.trigger('nivo:animFinished'); });
+            } else if(currentEffect === 'slideInLeft'){
+                createSlices(slider, settings, vars);
+                
+                firstSlice = $('.nivo-slice:first', slider);
+                firstSlice.css({
+                    'width': '0px',
+                    'opacity': '1',
+                    'left': '',
+                    'right': '0px'
+                });
+
+                firstSlice.animate({ width: slider.width() + 'px' }, (settings.animSpeed*2), '', function(){ 
+                    // Reset positioning
+                    firstSlice.css({
+                        'left': '0px',
+                        'right': ''
+                    });
+                    slider.trigger('nivo:animFinished'); 
+                });
+            } else if(currentEffect === 'boxRandom'){
+                createBoxes(slider, settings, vars);
+                
+                totalBoxes = settings.boxCols * settings.boxRows;
+                i = 0;
+                timeBuff = 0;
+
+                boxes = shuffle($('.nivo-box', slider));
+                boxes.each(function(){
+                    var box = $(this);
+                    if(i === totalBoxes-1){
+                        setTimeout(function(){
+                            box.animate({ opacity:'1' }, settings.animSpeed, '', function(){ slider.trigger('nivo:animFinished'); });
+                        }, (100 + timeBuff));
+                    } else {
+                        setTimeout(function(){
+                            box.animate({ opacity:'1' }, settings.animSpeed);
+                        }, (100 + timeBuff));
+                    }
+                    timeBuff += 20;
+                    i++;
+                });
+            } else if(currentEffect === 'boxRain' || currentEffect === 'boxRainReverse' || currentEffect === 'boxRainGrow' || currentEffect === 'boxRainGrowReverse'){
+                createBoxes(slider, settings, vars);
+                
+                totalBoxes = settings.boxCols * settings.boxRows;
+                i = 0;
+                timeBuff = 0;
+                
+                // Split boxes into 2D array
+                var rowIndex = 0;
+                var colIndex = 0;
+                var box2Darr = [];
+                box2Darr[rowIndex] = [];
+                boxes = $('.nivo-box', slider);
+                if(currentEffect === 'boxRainReverse' || currentEffect === 'boxRainGrowReverse'){
+                    boxes = $('.nivo-box', slider)._reverse();
+                }
+                boxes.each(function(){
+                    box2Darr[rowIndex][colIndex] = $(this);
+                    colIndex++;
+                    if(colIndex === settings.boxCols){
+                        rowIndex++;
+                        colIndex = 0;
+                        box2Darr[rowIndex] = [];
+                    }
+                });
+                
+                // Run animation
+                for(var cols = 0; cols < (settings.boxCols * 2); cols++){
+                    var prevCol = cols;
+                    for(var rows = 0; rows < settings.boxRows; rows++){
+                        if(prevCol >= 0 && prevCol < settings.boxCols){
+                            /* Due to some weird JS bug with loop vars 
+                            being used in setTimeout, this is wrapped
+                            with an anonymous function call */
+                            (function(row, col, time, i, totalBoxes) {
+                                var box = $(box2Darr[row][col]);
+                                var w = box.width();
+                                var h = box.height();
+                                if(currentEffect === 'boxRainGrow' || currentEffect === 'boxRainGrowReverse'){
+                                    box.width(0).height(0);
+                                }
+                                if(i === totalBoxes-1){
+                                    setTimeout(function(){
+                                        box.animate({ opacity:'1', width:w, height:h }, settings.animSpeed/1.3, '', function(){ slider.trigger('nivo:animFinished'); });
+                                    }, (100 + time));
+                                } else {
+                                    setTimeout(function(){
+                                        box.animate({ opacity:'1', width:w, height:h }, settings.animSpeed/1.3);
+                                    }, (100 + time));
+                                }
+                            })(rows, prevCol, timeBuff, i, totalBoxes);
+                            i++;
+                        }
+                        prevCol--;
+                    }
+                    timeBuff += 100;
+                }
+            }           
+        };
+        
+        // Shuffle an array
+        var shuffle = function(arr){
+            for(var j, x, i = arr.length; i; j = parseInt(Math.random() * i, 10), x = arr[--i], arr[i] = arr[j], arr[j] = x);
+            return arr;
+        };
+        
+        // For debugging
+        var trace = function(msg){
+            if(this.console && typeof console.log !== 'undefined') { console.log(msg); }
+        };
+        
+        // Start / Stop
+        this.stop = function(){
+            if(!$(element).data('nivo:vars').stop){
+                $(element).data('nivo:vars').stop = true;
+                trace('Stop Slider');
+            }
+        };
+        
+        this.start = function(){
+            if($(element).data('nivo:vars').stop){
+                $(element).data('nivo:vars').stop = false;
+                trace('Start Slider');
+            }
+        };
+        
+        // Trigger the afterLoad callback
+        settings.afterLoad.call(this);
+        
+        return this;
+    };
+        
+    $.fn.nivoSlider = function(options) {
+        return this.each(function(key, value){
+            var element = $(this);
+            // Return early if this element already has a plugin instance
+            if (element.data('nivoslider')) { return element.data('nivoslider'); }
+            // Pass options to plugin constructor
+            var nivoslider = new NivoSlider(this, options);
+            // Store plugin object in this element's data
+            element.data('nivoslider', nivoslider);
+        });
+    };
+    
+    //Default settings
+    $.fn.nivoSlider.defaults = {
+        effect: 'random',
+        slices: 15,
+        boxCols: 8,
+        boxRows: 4,
+        animSpeed: 500,
+        pauseTime: 3000,
+        startSlide: 0,
+        directionNav: true,
+        directionNavHide: true,
+        controlNav: true,
+        controlNavThumbs: false,
+        pauseOnHover: true,
+        manualAdvance: false,
+        prevText: 'Prev',
+        nextText: 'Next',
+        randomStart: false,
+        beforeChange: function(){},
+        afterChange: function(){},
+        slideshowEnd: function(){},
+        lastSlide: function(){},
+        afterLoad: function(){}
+    };
+
+    $.fn._reverse = [].reverse;
+    
+})(jQuery);
Index: /extensions/ExtendedDescription/template/nivoslider/nivo-slider.css
===================================================================
--- /extensions/ExtendedDescription/template/nivoslider/nivo-slider.css	(revision 17010)
+++ /extensions/ExtendedDescription/template/nivoslider/nivo-slider.css	(revision 17010)
@@ -0,0 +1,109 @@
+/*
+ * jQuery Nivo Slider v3.0.1
+ * http://nivo.dev7studios.com
+ *
+ * Copyright 2012, Dev7studios
+ * Free to use and abuse under the MIT license.
+ * http://www.opensource.org/licenses/mit-license.php
+ */
+ 
+/* The Nivo Slider styles */
+.nivoSlider {
+	position:relative;
+	width:100%;
+	height:auto;
+	overflow: hidden;
+}
+.nivoSlider img {
+	position:absolute;
+	top:0px;
+	left:0px;
+}
+.nivo-main-image {
+	display: block !important;
+	position: relative !important; 
+	width: 100% !important;
+}
+
+/* If an image is wrapped in a link */
+.nivoSlider a.nivo-imageLink {
+	position:absolute;
+	top:0px;
+	left:0px;
+	width:100%;
+	height:100%;
+	border:0;
+	padding:0;
+	margin:0;
+	z-index:6;
+	display:none;
+}
+/* The slices and boxes in the Slider */
+.nivo-slice {
+	display:block;
+	position:absolute;
+	z-index:5;
+	height:100%;
+	top:0;
+}
+.nivo-box {
+	display:block;
+	position:absolute;
+	z-index:5;
+	overflow:hidden;
+}
+.nivo-box img { display:block; }
+
+/* Caption styles */
+.nivo-caption {
+	position:absolute;
+	left:0px;
+	bottom:0px;
+	background:#000;
+	color:#fff;
+	width:100%;
+	z-index:8;
+	padding: 5px 10px;
+	opacity: 0.8;
+	overflow: hidden;
+	display: none;
+	-moz-opacity: 0.8;
+	filter:alpha(opacity=8);
+	-webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
+	-moz-box-sizing: border-box;    /* Firefox, other Gecko */
+	box-sizing: border-box;         /* Opera/IE 8+ */
+}
+.nivo-caption p {
+	padding:5px;
+	margin:0;
+}
+.nivo-caption a {
+	display:inline !important;
+}
+.nivo-html-caption {
+    display:none;
+}
+/* Direction nav styles (e.g. Next & Prev) */
+.nivo-directionNav a {
+	position:absolute;
+	top:45%;
+	z-index:9;
+	cursor:pointer;
+}
+.nivo-prevNav {
+	left:0px;
+}
+.nivo-nextNav {
+	right:0px;
+}
+/* Control nav styles (e.g. 1,2,3...) */
+.nivo-controlNav {
+	text-align:center;
+	padding: 15px 0;
+}
+.nivo-controlNav a {
+	cursor:pointer;
+}
+.nivo-controlNav a.active {
+	font-weight:bold;
+}
Index: /extensions/ExtendedDescription/template/slider.tpl
===================================================================
--- /extensions/ExtendedDescription/template/slider.tpl	(revision 17010)
+++ /extensions/ExtendedDescription/template/slider.tpl	(revision 17010)
@@ -0,0 +1,58 @@
+{combine_script id='jquery.nivo.slider' path=$EXTENDED_DESC_PATH|cat:'template/nivoslider/jquery.nivo.slider.js' require='jquery' load='footer'}
+{combine_css path=$EXTENDED_DESC_PATH|cat:'template/nivoslider/nivo-slider.css'}
+{combine_css path=$EXTENDED_DESC_PATH|cat:'template/nivoslider/dark.css'}
+
+{footer_script require='jquery.nivo.slider'}
+$("#slider{$slider_id}").nivoSlider({ldelim}
+  pauseTime: {$pauseTime},
+  animSpeed: {$pauseTime}/6,
+  effect: '{$effect}',
+  directionNav: {$directionNav},
+  controlNav: {$controlNav},
+  beforeChange: function() {ldelim}
+    if ($('#slider{$slider_id}').data('nivo:vars').currentImage.attr('src') == "")
+    {ldelim}
+      return false;
+    }
+    {if $elastic_size}
+    $("#slider{$slider_id}").css({ldelim}
+      height: 'auto',
+    });
+    {/if}
+  }
+});
+{/footer_script}
+
+{if not $elastic_size}
+{* assign var=slider_min_w value=$img_size.w *}
+{assign var=slider_min_h value=$img_size.h}
+{/if}
+
+<div class="slider-wrapper theme-default" style="width:{$img_size.w}px;{if $elastic_size}height:{math equation='x+y' x=$img_size.h y=40}px;{/if}margin:0 auto;">
+  <div id="slider{$slider_id}" class="nivoSlider" style="width:{$img_size.w}px;{if $elastic_size}height:{$img_size.h}px;{/if}">
+  {foreach from=$slider_content item=thumbnail}{strip}
+    {assign var=derivative value=$pwg->derivative($derivative_params, $thumbnail.src_image)}
+    {if !$derivative->is_cached()}
+    {combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'}
+    {combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'}
+    {/if}
+    
+    <img {if $derivative->is_cached()}src="{$derivative->get_url()}"{else}src="" data-src="{$derivative->get_url()}"{/if} alt="{$thumbnail.TN_ALT}" {if $show_title}title="<a href='{$thumbnail.URL}'>{$thumbnail.NAME|replace:'"':"'"}</a>"{/if}>
+    
+    {if not $elastic_size}
+    {assign var=derivative_size value=$derivative->get_size()}
+    {* math assign=slider_min_w equation="min(x,y)" x=$slider_min_w y=$derivative_size[0] *}
+    {math assign=slider_min_h equation="min(x,y)" x=$slider_min_h y=$derivative_size[1]}
+    {/if}
+  {/strip}{/foreach}
+  </div>
+</div>
+
+{if not $elastic_size}
+{footer_script}
+$("#slider{$slider_id}").css({ldelim}
+  {* width: {$slider_min_w}, *}
+  height: {$slider_min_h}
+});
+{/footer_script}
+{/if}
