5 files changed, 35 insertions, 18 deletions
diff --git a/category.php b/category.php
index 4e763359c..a292a7c84 100644
--- a/category.php
+++ b/category.php
@@ -50,9 +50,25 @@ if ( isset( $page['cat'] ) and is_numeric( $page['cat'] ) )
 if ( !isset( $_GET['start'] )
      or !is_numeric( $_GET['start'] )
      or ( is_numeric( $_GET['start'] ) and $_GET['start'] < 0 ) )
+{
   $page['start'] = 0;
+}
 else
+{
   $page['start'] = $_GET['start'];
+}
+
+// Sometimes, a "num" is provided in the URL. It is the number
+// of the picture to show. This picture must be in the thumbnails page.
+// We have to find the right $page['start'] that show the num picture
+// in this category
+if ( isset( $_GET['num'] )
+     and is_numeric( $_GET['num'] )
+     and $_GET['num'] >= 0 )
+{
+  $page['start'] = floor( $_GET['num'] / $user['nb_image_page'] );
+  $page['start']*= $user['nb_image_page'];
+}
 
 initialize_category();
 
@@ -75,17 +91,6 @@ if ( $user['expand'] )
   $page['tab_expand'] = array();
 }
 
-// Sometimes, a "num" is provided in the URL. It is the number
-// of the picture to show. This picture must be in the thumbnails page.
-// We have to find the right $page['start'] that show the num picture
-// in this category
-if ( isset( $_GET['num'] )
-     and is_numeric( $_GET['num'] )
-     and $_GET['num'] >= 0 )
-{
-  $page['start'] = floor( $_GET['num'] / $user['nb_image_page'] );
-  $page['start']*= $user['nb_image_page'];
-}
 // creating the structure of the categories (useful for displaying the menu)
 // creating the plain structure : array of all the available categories and
 // their relative informations, see the definition of the function
diff --git a/include/category_calendar.inc.php b/include/category_calendar.inc.php
index 2d559ace7..f41f5bb97 100644
--- a/include/category_calendar.inc.php
+++ b/include/category_calendar.inc.php
@@ -61,7 +61,7 @@ foreach ($calendar_years as $calendar_year => $nb_picture_year)
   if (isset($page['calendar_year'])
       and $calendar_year == $page['calendar_year'])
   {
-    $years_nav_bar.= ' <span class="selected">'.$calendar_year.'</span>';
+    $years_nav_bar.= ' <span class="dateSelected">'.$calendar_year.'</span>';
   }
   else
   {
@@ -114,7 +114,7 @@ SELECT DISTINCT(MONTH('.$conf['calendar_datefield'].')) AS month
     if (isset($page['calendar_month'])
         and $calendar_month == $page['calendar_month'])
     {
-      $months_nav_bar.= ' <span class="selected">';
+      $months_nav_bar.= ' <span class="dateSelected">';
       $months_nav_bar.= $lang['month'][(int)$calendar_month];
       $months_nav_bar.= '</span>';
     }
diff --git a/include/config.inc.php b/include/config.inc.php
index f33e53ba3..ec0930608 100644
--- a/include/config.inc.php
+++ b/include/config.inc.php
@@ -89,6 +89,6 @@ $conf['show_exif_fields'] = array('Make',
 // for PHP version newer than 4.1.2 :
 // $conf['show_exif_fields'] = array('CameraMake','CameraModel','DateTime');
 
-$conf['calendar_datefield'] = 'date_creation';
+$conf['calendar_datefield'] = 'date_available';
 $conf['rate'] = true;
 ?>
diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index 5d91aa7aa..4b456ca7b 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -86,7 +86,7 @@ function create_navigation_bar( $url, $nb_element, $start,
       $temp_start = ( $i - 1 ) * $nb_element_page;
       if ( $temp_start == $start )
       {
-        $navigation_bar.= ' <span style="font-weight:bold;">'.$i.'</span> ';
+        $navigation_bar.= ' <span class="pageNumberSelected">'.$i.'</span> ';
       }
       else
       {
diff --git a/template/default/default.css b/template/default/default.css
index 81d4bfaca..0b52142b2 100644
--- a/template/default/default.css
+++ b/template/default/default.css
@@ -304,8 +304,20 @@ div.information {
   padding:5px;
 }
 
-span.selected {
-  font-weight:bold;
+span.dateSelected, span.pageNumberSelected {
+  text-decoration:underline;
+}
+
+/**
+ * in calendar category, year or month currently focused
+ */
+span.dateSelected {
+}
+
+/**
+ * in navigation bar, page number currently focused
+ */
+span.pageNumberSelected {
 }
 
 span.thumb_picture {
@@ -365,4 +377,4 @@ td.confLineField {
   padding:5px 0px 5px 0px;
   height:20px;
   background-color:#505050;
-}
-\ No newline at end of file
+}