Index: galleria.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/galleria/Attic/galleria.admin.inc,v
retrieving revision 1.1.2.8
diff -u -p -r1.1.2.8 galleria.admin.inc
--- galleria.admin.inc	8 May 2009 12:27:09 -0000	1.1.2.8
+++ galleria.admin.inc	9 May 2009 20:07:27 -0000
@@ -27,14 +27,20 @@ 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_prev_link'] = array(
+    '#type' => 'textfield',
+    '#title' => t('"Previous link" text'),
+    '#size' => 15,
+    '#default_value' => variable_get('galleria_prev_link', '<< ' . t('previous')),
+    '#description' => t('May contain HTML.'),
+  );
+
+  $form['galleria_admin']['galleria_next_link'] = array(
+    '#type' => 'textfield',
+    '#title' => t('"Next link" text'),
+    '#size' => 15,
+    '#default_value' => variable_get('galleria_next_link', t('next') . ' >>'),
+    '#description' => t('May contain HTML.'),
   );
 
   $form['galleria_admin']['galleria_show_page_warning'] = array(
Index: galleria.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/galleria/Attic/galleria.install,v
retrieving revision 1.1.2.6
diff -u -p -r1.1.2.6 galleria.install
--- galleria.install	5 May 2009 10:47:37 -0000	1.1.2.6
+++ galleria.install	9 May 2009 20:09:06 -0000
@@ -14,7 +14,8 @@ 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_prev_link');
+  variable_del('galleria_next_link');
   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.23
diff -u -p -r1.1.2.23 galleria.module
--- galleria.module	8 May 2009 12:33:45 -0000	1.1.2.23
+++ galleria.module	9 May 2009 21:07:58 -0000
@@ -326,14 +326,12 @@ 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['thumbnails'] = theme('item_list', $image_list, NULL, 'ul', $attribs);
+
+  $vars['prev_link'] = '<a class="galleria-previous" onclick="$.galleria.prev(); return false;" href="#">' . variable_get('galleria_prev_link', '<< ' . t('previous')) . '</a>';
+  $vars['next_link'] = '<a class="galleria-next" onclick="$.galleria.next(); return false;" href="#">' . variable_get('galleria_next_link', t('next') . ' >>') . '</a>';
 
-  $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['image_count'] = $i;
 
   // 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	9 May 2009 21:15:01 -0000
@@ -7,13 +7,17 @@
  */
 ?>
 <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">
+      <?php print $prev_link ?> | <?php print $next_link; ?>
+    </div>
+  <?php } ?>
 </div>