Index: galleria.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/galleria/Attic/galleria.admin.inc,v
retrieving revision 1.1.2.9
diff -u -p -r1.1.2.9 galleria.admin.inc
--- galleria.admin.inc	14 May 2009 08:46:14 -0000	1.1.2.9
+++ galleria.admin.inc	14 May 2009 21:07:44 -0000
@@ -35,16 +35,6 @@ function galleria_admin_settings() {
     '#description' => t('Value from 0 .. 1'),
   );
 
-  $form['galleria_admin']['galleria_thumb_location'] = array(
-    '#type' => 'select',
-    '#title' => t('Location of thumbnails'),
-    '#options' => array(
-      'above' => t('Above main image'),
-      'below' => t('Below main image'),
-    ),
-    '#default_value' => variable_get('galleria_thumb_location', 'below'),
-  );
-
   $form['galleria_admin']['galleria_show_page_warning'] = array(
     '#type' => 'checkbox',
     '#title' => t('Galleria warnings'),
Index: galleria.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/galleria/Attic/galleria.install,v
retrieving revision 1.1.2.7
diff -u -p -r1.1.2.7 galleria.install
--- galleria.install	14 May 2009 08:46:14 -0000	1.1.2.7
+++ galleria.install	14 May 2009 21:07:52 -0000
@@ -14,7 +14,6 @@ function galleria_uninstall() {
   variable_del('galleria_show_page_warning');
   variable_del('galleria_imagecache_preset');
   variable_del('galleria_thumb_imagecache_preset');
-  variable_del('galleria_thumb_location');
   variable_del('galleria_jcarousel');
   variable_del('galleria_jcarousel_vertical');
   variable_del('galleria_jcarousel_visible');
Index: galleria.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/galleria/galleria.module,v
retrieving revision 1.1.2.24
diff -u -p -r1.1.2.24 galleria.module
--- galleria.module	14 May 2009 08:46:14 -0000	1.1.2.24
+++ galleria.module	14 May 2009 21:07:53 -0000
@@ -329,14 +329,10 @@ function template_preprocess_galleria(&$
     'class' => 'gallery clear-block',
   );
 
-  if (variable_get('galleria_thumb_location', 'below') == 'above') {
-    $vars['gallery'] = theme('item_list', $image_list, NULL, 'ul', $attribs) . '<div id="main-image"></div>';
-  }
-  else {
-    $vars['gallery'] = '<div id="main-image"></div>' . theme('item_list', $image_list, NULL, 'ul', $attribs);
-  }
-
-  $vars['next_prev_links'] = ($i > 1) ? '<a onclick="$.galleria.prev(); return false;" href="#"><< ' . t('previous') . '</a> | <a onclick="$.galleria.next(); return false;" href="#">' . t('next') . '>></a>' : '';
+  $vars['thumbnails'] = theme('item_list', $image_list, NULL, 'ul', $attribs);
+  $vars['image_count'] = $i;
+  $vars['prev'] = t('previous');
+  $vars['next'] = t('next');
 
   // jCarousel integration setup
   if (module_exists('jcarousel') && variable_get('galleria_jcarousel', 'enabled') == 'enabled' && $i > 1) {
Index: galleria.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/galleria/galleria.tpl.php,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 galleria.tpl.php
--- galleria.tpl.php	27 Apr 2009 15:46:59 -0000	1.1.2.2
+++ galleria.tpl.php	14 May 2009 21:11:31 -0000
@@ -7,13 +7,19 @@
  */
 ?>
 <div id="galleria-content">
-  <?php print $gallery; ?>
-    <script type="text/javascript">
-      <!--//--><![CDATA[//><!--
-      $('ul.gallery img').css('display', 'none');
-      //--><!]]>
-    </script>
-  <div class="galleria-nav">
-    <?php print $next_prev_links; ?>
-  </div>
+  <div id="main-image"></div>
+  <?php print $thumbnails; ?>
+  <script type="text/javascript">
+    <!--//--><![CDATA[//><!--
+    //Hide images while Galleria is loading
+    $('ul.gallery img').css('display', 'none');
+    //--><!]]>
+  </script>
+
+  <?php if ($image_count > 1): ?>
+    <div class="galleria-nav">
+      <a onclick="$.galleria.prev(); return false;" href="#"><< <?php print $prev; ?></a> |
+      <a onclick="$.galleria.next(); return false;" href="#"><?php print $next; ?> >></a>
+    </div>
+  <?php endif; ?>
 </div>
cvs diff: Diffing inc
Index: inc/galleria.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/galleria/inc/galleria.js,v
retrieving revision 1.1.2.8
diff -u -p -r1.1.2.8 galleria.js
--- inc/galleria.js	14 May 2009 08:46:14 -0000	1.1.2.8
+++ inc/galleria.js	14 May 2009 21:07:58 -0000
@@ -16,7 +16,7 @@ Drupal.galleria.options = {
       // surround the displayed image with a Lightbox link
       image.wrap('<a href="' + thumb.siblings('a').attr('href') + '" rel="lightbox[galleria]" title="' + caption.text() + '"></a>');
       // keep Galleria from adding a click event to the image
-      $.galleria.clickNext = false; 
+      $.galleria.clickNext = false;
       image.attr('title','View full-size');
     }
 
@@ -129,4 +129,3 @@ Drupal.behaviors.initGalleria = function
     }
   });
 };
-