11 files changed, 52 insertions, 25 deletions
diff --git a/admin/element_set_global.php b/admin/element_set_global.php
index 2ad3ab164..4f223b2cc 100644
--- a/admin/element_set_global.php
+++ b/admin/element_set_global.php
@@ -467,7 +467,7 @@ if (count($page['cat_elements_id']) > 0)
     $page['start'],
     $page['nb_images']
     );
-  $template->assign('NAV_BAR', $nav_bar);
+  $template->assign('navbar', $nav_bar);
 
   $query = '
 SELECT id,path,tn_ext,file,filesize,level
diff --git a/admin/element_set_unit.php b/admin/element_set_unit.php
index cf6ef7781..67f5a62e6 100644
--- a/admin/element_set_unit.php
+++ b/admin/element_set_unit.php
@@ -184,7 +184,7 @@ if (count($page['cat_elements_id']) > 0)
     $page['start'],
     $page['nb_images']
     );
-  $template->assign(array('NAV_BAR' => $nav_bar));
+  $template->assign(array('navbar' => $nav_bar));
 
   // tags
   $all_tags = get_all_tags();
diff --git a/admin/history.php b/admin/history.php
index 04d60fcde..c357a498f 100644
--- a/admin/history.php
+++ b/admin/history.php
@@ -569,7 +569,7 @@ if (isset($page['search_id']))
     $conf['nb_logs_page']
     );
 
-  $template->assign('NAV_BAR', $navbar);
+  $template->assign('navbar', $navbar);
 }
 
 // +-----------------------------------------------------------------------+
diff --git a/admin/rating.php b/admin/rating.php
index 67cc14502..e2f614abe 100644
--- a/admin/rating.php
+++ b/admin/rating.php
@@ -115,7 +115,7 @@ $template->set_filename('rating', 'rating.tpl');
 
 $template->assign(
   array(
-    'NAVBAR' => create_navigation_bar(
+    'navbar' => create_navigation_bar(
       PHPWG_ROOT_PATH.'admin.php'.get_query_string_diff(array('start','del')),
       $nb_images,
       $start,
diff --git a/admin/template/goto/element_set_global.tpl b/admin/template/goto/element_set_global.tpl
index 0dfa11876..cd12410bc 100644
--- a/admin/template/goto/element_set_global.tpl
+++ b/admin/template/goto/element_set_global.tpl
@@ -37,7 +37,7 @@
 
     <legend>{'Elements'|@translate}</legend>
 
-    {if !empty($NAV_BAR)}<div class="navigationBar">{$NAV_BAR}</div>{/if}
+    {if !empty($navbar) }{include file='navigation_bar.tpl'}{/if}
 
   {if !empty($thumbnails)}
     <ul class="thumbnails">
diff --git a/admin/template/goto/element_set_unit.tpl b/admin/template/goto/element_set_unit.tpl
index 14d5a34a5..1c9d99ae2 100644
--- a/admin/template/goto/element_set_unit.tpl
+++ b/admin/template/goto/element_set_unit.tpl
@@ -24,9 +24,7 @@
 
 </fieldset>
 
-{if !empty($NAV_BAR) }
-<div class="navigationBar">{$NAV_BAR}</div>
-{/if}
+{if !empty($navbar) }{include file='navigation_bar.tpl'}{/if}
 
 {if !empty($elements) }
 <input type="hidden" name="element_ids" value="{$ELEMENT_IDS}" />
diff --git a/admin/template/goto/history.tpl b/admin/template/goto/history.tpl
index 3e4bcce6c..9291f4a36 100644
--- a/admin/template/goto/history.tpl
+++ b/admin/template/goto/history.tpl
@@ -102,13 +102,7 @@
 </fieldset>
 {/if}
 
-
-{if !empty($NAV_BAR)}
-<div class="navigationBar">
-  {$NAV_BAR}
-</div>
-{/if}
-
+{if !empty($navbar) }{include file='navigation_bar.tpl'}{/if}
 
 <table class="table2" id="detailedStats">
 <tr class="throw">
@@ -139,9 +133,4 @@
 {/if}
 </table>
 
-
-{if !empty($NAV_BAR)}
-<div class="navigationBar">
-  {$NAV_BAR}
-</div>
-{/if}
+{if !empty($navbar) }{include file='navigation_bar.tpl'}{/if}
diff --git a/admin/template/goto/navigation_bar.tpl b/admin/template/goto/navigation_bar.tpl
new file mode 100644
index 000000000..94c8ad05f
--- /dev/null
+++ b/admin/template/goto/navigation_bar.tpl
@@ -0,0 +1,39 @@
+{* $Id: navigation_bar.tpl 3145 2009-02-14 02:24:10Z patdenice $ *}
+<div class="navigationBar">
+
+{if isset($navbar.URL_FIRST)}
+<a href="{$navbar.URL_FIRST}" rel="first">{'first_page'|@translate}</a>
+{else}
+{'first_page'|@translate}
+{/if}
+|
+{if isset($navbar.URL_PREV)}
+<a href="{$navbar.URL_PREV}" rel="prev">{'previous_page'|@translate}</a>
+{else}
+{'previous_page'|@translate}
+{/if}
+|
+{assign var='prev_page' value=0}
+{foreach from=$navbar.pages key=page item=url}
+  {if $page > $prev_page+1} ... {/if}
+  {if $page == $navbar.CURRENT_PAGE}
+    <span class="pageNumberSelected">{$page}</span>
+  {else}
+    <a href="{$url}">{$page}</a>
+  {/if}
+{assign var='prev_page' value=$page}
+{/foreach}
+|
+{if isset($navbar.URL_NEXT)}
+<a href="{$navbar.URL_NEXT}" rel="next">{'next_page'|@translate}</a>
+{else}
+{'next_page'|@translate}
+{/if}
+|
+{if isset($navbar.URL_LAST)}
+<a href="{$navbar.URL_LAST}" rel="last">{'last_page'|@translate}</a>
+{else}
+{'last_page'|@translate}
+{/if}
+
+</div>
+\ No newline at end of file
diff --git a/admin/template/goto/rating.tpl b/admin/template/goto/rating.tpl
index c50a26602..0ff212bf5 100644
--- a/admin/template/goto/rating.tpl
+++ b/admin/template/goto/rating.tpl
@@ -32,7 +32,8 @@
   </fieldset>
 </form>
 
-<div class="navigationBar">{$NAVBAR}</div>
+{if !empty($navbar) }{include file='navigation_bar.tpl'}{/if}
+
 <table width="99%">
 <tr class="throw">
   <td>{'File'|@translate}</td>
@@ -64,4 +65,4 @@
 {/foreach} {*images*}
 </table>
 
-<div class="navigationBar">{$NAVBAR}</div>
+{if !empty($navbar) }{include file='navigation_bar.tpl'}{/if}
diff --git a/admin/template/goto/user_list.tpl b/admin/template/goto/user_list.tpl
index aa4e369dc..e6c4373ac 100644
--- a/admin/template/goto/user_list.tpl
+++ b/admin/template/goto/user_list.tpl
@@ -91,7 +91,7 @@
   {/foreach}
 </table>
 
-<div class="navigationBar">{$NAVBAR}</div>
+{if !empty($navbar) }{include file='navigation_bar.tpl'}{/if}
 
 {* delete the selected users ? *}
 <fieldset>
diff --git a/admin/user_list.php b/admin/user_list.php
index 5011a2aea..abfc94742 100644
--- a/admin/user_list.php
+++ b/admin/user_list.php
@@ -589,7 +589,7 @@ $navbar = create_navigation_bar(
   $conf['users_page']
   );
 
-$template->assign('NAVBAR', $navbar);
+$template->assign('navbar', $navbar);
 
 // +-----------------------------------------------------------------------+
 // |                               user list                               |