Changeset 1047

Timestamp:

Feb 20, 2006, 5:39:37 AM (18 years ago)

Author:

rvelices

Message:

calendar redesign: step 1

Location:

trunk

Files:

• category.php (modified) (6 diffs)
• include/category_default.inc.php (modified) (2 diffs)
• include/functions_calendar.inc.php (added)
• include/section_init.inc.php (modified) (2 diffs)
• template/yoga/category.tpl (modified) (2 diffs)

trunk/category.php

@@ -78 +78 @@
 }
 
-if (isset($page['cat'])
+if ( isset($page['cat_nb_images'])
     and $page['cat_nb_images'] > $user['nb_image_page'])
 {
   // $nav_url is used to create the navigation bar
-  $nav_url = PHPWG_ROOT_PATH.'category.php?cat='.$page['cat'];
+  $nav_url = PHPWG_ROOT_PATH.'category.php?';
+  if ( isset($page['cat']) )
+  {
+    $nav_url .= 'cat='.$page['cat'].'&';
+  }
 
   switch ($page['cat'])
@@ -88 +92 @@
     case 'search':
     {
-      $nav_url.= '&search='.$_GET['search'];
+      $nav_url.= 'search='.$_GET['search'].'&';
       break;
     }
     case 'list':
     {
-      $nav_url.= '&list='.$_GET['list'];
+      $nav_url.= 'list='.$_GET['list'].'&';
       break;
     }
+  }
+  if ( isset($_GET['calendar']) )
+  {
+    $nav_url.= 'calendar='.$_GET['calendar'];
+  }
+  else
+  {
+    $nav_url = preg_replace('/&$/', '', $nav_url);
   }
   
@@ -144 +156 @@
 
 $icon_recent = get_icon(date('Y-m-d'));
+
+$calendar_view_link = PHPWG_ROOT_PATH.'category.php'
+                        .get_query_string_diff(array('start','calendar'));
+if ( ! isset($_GET['calendar']) )
+{
+  $calendar_view_link .= (empty($_GET)? '?':'&' ) . 'calendar=';
+}
 
 $template->assign_vars(
@@ -181 +200 @@
   'U_LOGOUT' => PHPWG_ROOT_PATH.'category.php?act=logout',
   'U_ADMIN'=> PHPWG_ROOT_PATH.'admin.php',
-  'U_PROFILE'=> PHPWG_ROOT_PATH.'profile.php'
+  'U_PROFILE'=> PHPWG_ROOT_PATH.'profile.php',
+  'U_CALENDAR' => $calendar_view_link
   )
 );
@@ -353 +373 @@
 
 //------------------------------------------------------ main part : thumbnails
-include(PHPWG_ROOT_PATH.$page['thumbnails_include']);
+if ( isset($page['thumbnails_include']) )
+{
+  include(PHPWG_ROOT_PATH.$page['thumbnails_include']);
+}
 //------------------------------------------------------- category informations
+if ( $page['navigation_bar'] != ''
+     or ( isset( $page['comment'] ) and $page['comment'] != '' ) )
+{
+  $template->assign_block_vars('cat_infos',array());
+}
+// navigation bar
+if ( $page['navigation_bar'] != '' )
+{ 
+  $template->assign_block_vars(
+    'cat_infos.navigation',
+    array('NAV_BAR' => $page['navigation_bar'])
+    );
+}
 if ( isset ( $page['cat'] ) )
 {
@@ -367 +403 @@
       'upload',
       array('U_UPLOAD'=> $url )
-      );
-  }
-
-  if ( $page['navigation_bar'] != ''
-       or ( isset( $page['comment'] ) and $page['comment'] != '' ) )
-  {
-    $template->assign_block_vars('cat_infos',array());
-  }
-  
-  // navigation bar
-  if ( $page['navigation_bar'] != '' )
-  { 
-    $template->assign_block_vars(
-      'cat_infos.navigation',
-      array('NAV_BAR' => $page['navigation_bar'])
       );
   }

trunk/include/category_default.inc.php

@@ -81 +81 @@
   }
   // url link on picture.php page
-  $url_link = PHPWG_ROOT_PATH.'picture.php?cat='.$page['cat'];
-  $url_link.= '&image_id='.$row['id'];
+  $url_link = PHPWG_ROOT_PATH.'picture.php?';
+  if ( isset($page['cat']) )
+  {
+    $url_link .= 'cat='.$page['cat'].'&';
+  }
+  $url_link.= 'image_id='.$row['id'];
   if ($page['cat'] == 'search')
   {
@@ -90 +94 @@
   {
     $url_link.= '&list='.$_GET['list'];
+  }
+  if ( isset($_GET['calendar']) )
+  {
+    $url_link.= '&calendar='.$_GET['calendar'];
   }
     

trunk/include/section_init.inc.php

@@ -94 +94 @@
 }
 
+// $page['nb_image_page'] is the number of picture to display on this page
+// By default, it is the same as the $user['nb_image_page']
+$page['nb_image_page'] = $user['nb_image_page'];
 
 if (isset($page['cat']))
 {
-  // $page['nb_image_page'] is the number of picture to display on this page
-  // By default, it is the same as the $user['nb_image_page']
-  $page['nb_image_page'] = $user['nb_image_page'];
-
   if ($page['cat'] != 'most_visited' and $page['cat'] != 'best_rated')
   {
@@ -398 +397 @@
   $page['thumbnails_include'] = 'include/category_subcats.inc.php';
 }
+
+if ( isset($_GET['calendar']) )
+{
+  include_once( PHPWG_ROOT_PATH.'include/functions_calendar.inc.php' );
+  initialize_calendar();
+}
+
 ?>

trunk/template/yoga/category.tpl

@@ -131 +131 @@
       </li>
       <!-- END preferred_image_order -->
+      <a href="{U_CALENDAR}">Toggle calendar</a>
     </ul>
     
@@ -140 +141 @@
 <div class="navigationBar">{calendar.YEARS_NAV_BAR}</div>
 <div class="navigationBar">{calendar.MONTHS_NAV_BAR}</div>
+<!-- END calendar -->
+
+<!-- BEGIN calendar -->
+<!-- BEGIN navbar -->
+<div class="navigationBar">{calendar.navbar.BAR}</div>
+<!-- END navbar -->
 <!-- END calendar -->