Changeset 1120

Timestamp:

Apr 4, 2006, 2:35:12 AM (18 years ago)

Author:

rvelices

Message:

fix: sql query erros when: no items for the selected tag, search returns
no result, caddie is empty

fix: tag cloud was showing least used tags

fix: strip html tags from head/title element on the page
(tag index page title contained <a>...)

improvement: added 5 tag levels in css for "ready to use" tags

fix: corrected png icon calendar_created.png for IE

fix: english language for nbm

Location:

trunk

Files:

• admin/element_set_global.php (modified) (2 diffs)
• include/config_default.inc.php (modified) (1 diff)
• include/page_header.php (modified) (1 diff)
• include/section_init.inc.php (modified) (6 diffs)
• index.php (modified) (5 diffs)
• language/en_UK.iso-8859-1/admin.lang.php (modified) (3 diffs)
• tags.php (modified) (2 diffs, 2 props)
• template/yoga/default-layout.css (modified) (1 diff)
• template/yoga/icon/calendar_created.png (modified) (previous)

trunk/admin/element_set_global.php

@@ -93 +93 @@
     pwg_query($query);
   }
-  
+
   if ($_POST['associate'] != 0 and count($collection) > 0)
   {
@@ -331 +331 @@
   );
 
-// remove tags
-$query = '
-SELECT tag_id, name, url_name, count(*) counter
-  FROM '.IMAGE_TAG_TABLE.'
-    INNER JOIN '.TAGS_TABLE.' ON tag_id = id
-  WHERE image_id IN ('.implode(',', $page['cat_elements_id']).')
-  GROUP BY tag_id
-  ORDER BY name ASC
-;';
-$result = pwg_query($query);
-
-$tags = array();
-while($row = mysql_fetch_array($result))
-{
-  array_push($tags, $row);
-}
-
-$template->assign_vars(
-  array(
-    'DEL_TAG_SELECTION' => get_html_tag_selection($tags, 'del_tags'),
-    )
-  );
-
+if (count($page['cat_elements_id']) > 0)
+{
+  // remove tags
+  $query = '
+  SELECT tag_id, name, url_name, count(*) counter
+    FROM '.IMAGE_TAG_TABLE.'
+      INNER JOIN '.TAGS_TABLE.' ON tag_id = id
+    WHERE image_id IN ('.implode(',', $page['cat_elements_id']).')
+    GROUP BY tag_id
+    ORDER BY name ASC
+  ;';
+  $result = pwg_query($query);
+
+  $tags = array();
+  while($row = mysql_fetch_array($result))
+  {
+    array_push($tags, $row);
+  }
+
+  $template->assign_vars(
+    array(
+      'DEL_TAG_SELECTION' => get_html_tag_selection($tags, 'del_tags'),
+      )
+    );
+}
 // creation date
 $day =

trunk/include/config_default.inc.php

@@ -449 +449 @@
 // tags_levels: number of levels to use for display. Each level is bind to a
 // CSS class tagLevelX.
-$conf['tags_levels'] = 10;
+$conf['tags_levels'] = 5;
 
 // +-----------------------------------------------------------------------+

trunk/include/page_header.php

@@ -49 +49 @@
 
     'CONTENT_ENCODING' => $lang_info['charset'],
-    'PAGE_TITLE' => $title,
+    'PAGE_TITLE' => strip_tags($title),
     'LANG'=>$lang_info['code'],
     'DIR'=>$lang_info['direction'],

trunk/include/section_init.inc.php

@@ -162 +162 @@
       }
     }
-    
+
     array_push(
       $page['tags'],
@@ -306 +306 @@
         'uppercats'        => $result['uppercats'],
 
-        'title' => get_cat_display_name($result['name'], null, false),
+        'title' => get_cat_display_name($result['name'], '', false),
         )
       );
@@ -361 +361 @@
     // reachable to the connected user, we need to check category
     // associations
-    if (!empty($user['forbidden_categories']))
+    if (!empty($user['forbidden_categories']) and !empty($items) )
     {
       $query = '
@@ -382 +382 @@
     $result = pwg_query($query);
     $tag_infos = array();
-    
+
     while ($row = mysql_fetch_array($result))
     {
@@ -429 +429 @@
     include_once( PHPWG_ROOT_PATH .'include/functions_search.inc.php' );
 
-    $query = '
+    $search_items = get_search_items($page['search']);
+    if ( !empty($search_items) )
+    {
+      $query = '
 SELECT DISTINCT(id)
   FROM '.IMAGES_TABLE.'
     INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id
-  WHERE id IN ('.implode(',', get_search_items($page['search'])).')
+  WHERE id IN ('.implode(',', $search_items).')
     AND '.$forbidden.'
   '.$conf['order_by'].'
-;'; 
+;';
+      $page['items'] = array_from_query($query, 'id');
+    }
+    else
+    {
+      $page['items'] = array();
+    }
 
     $page = array_merge(
@@ -442 +451 @@
       array(
         'title' => $lang['search_result'],
-        'items' => array_from_query($query, 'id'),
         'thumbnails_include' => 'include/category_default.inc.php',
         )

trunk/index.php

@@ -111 +111 @@
 $template->set_filenames( array('index'=>'index.tpl') );
 //-------------------------------------------------------------- category title
-if (isset($page['category']))
-{
-  $template_title = get_cat_display_name( $page['cat_name'], '', false );
-}
-else
-{
-  $template_title = $page['title'];
-}
-
+$template_title = $page['title'];
 if (isset($page['cat_nb_images']) and $page['cat_nb_images'] > 0)
 {
@@ -226 +218 @@
 {
   $template->assign_block_vars('tags', array());
-  
+
   // display tags associated to currently tagged items, less current tags
-  $query = '
+  $tags = array();
+
+  if ( !empty($page['items']) )
+  {
+    $query = '
 SELECT tag_id, name, url_name, count(*) counter
   FROM '.IMAGE_TAG_TABLE.'
@@ -237 +233 @@
   ORDER BY name ASC
 ;';
-  $result = pwg_query($query);
-
-  $tags = array();
-  
-  while($row = mysql_fetch_array($result))
-  {
-    array_push($tags, $row);
+    $result = pwg_query($query);
+    while($row = mysql_fetch_array($result))
+    {
+      array_push($tags, $row);
+    }
   }
 
@@ -277 +271 @@
             )
           ),
-        
+
         'NAME' => $tag['name'],
-        
+
         'TITLE' => l10n('See pictures linked to this tag only'),
 
@@ -286 +280 @@
           $tag['counter']
           ),
-        
+
         'CLASS' => 'tagLevel'.$tag['level']
         )

trunk/language/en_UK.iso-8859-1/admin.lang.php

@@ -259 +259 @@
 $lang['nbm_content_new_elements'] = 'New elements were added on %s';
 $lang['nbm_content_new_elements_between'] = 'New elements were added between %s and %s';
-$lang['nbm_content_subscribe_by_admin'] = 'You are subcribed by webmaster for the notification by mail';
-$lang['nbm_content_subscribe_by_himself'] = 'You are subcribed for the notification by mail';
+$lang['nbm_content_subscribe_by_admin'] = 'The webmaster has subcribed you for receiving notifications by mail';
+$lang['nbm_content_subscribe_by_himself'] = 'You have subcribed to receiving notifications by mail';
 $lang['nbm_content_subscribe_link'] = 'To subscribe, click on %s .';
-$lang['nbm_content_subscribe_unsubscribe_contact'] = 'On problems or questions, send a message to %s.';
-$lang['nbm_content_unsubscribe_by_admin'] = 'You are unsubcribed by webmaster for the notification by mail';
-$lang['nbm_content_unsubscribe_by_himself'] = 'You are unsubcribed for the notification by mail';
+$lang['nbm_content_subscribe_unsubscribe_contact'] = 'If you encounter problems or have any question, please send a message to %s.';
+$lang['nbm_content_unsubscribe_by_admin'] = 'The webmaster has unsubcribed you from receiving notifications by mail';
+$lang['nbm_content_unsubscribe_by_himself'] = 'You have unsubcribed from receiving notifications by mail';
 $lang['nbm_content_unsubscribe_link'] = 'To unsubscribe, click on %s .';
 $lang['nbm_info_send_mail_as'] = 'With blank value, gallery title will be used';
@@ -275 +275 @@
 $lang['nbm_no_mail_to_send'] = 'No mail to send.';
 $lang['nbm_no_user_available_to_send_L1'] = 'No user are available in order to send mail.';
-$lang['nbm_no_user_available_to_send_L2'] = 'A user is available, if the are news elements to notify';
+$lang['nbm_no_user_available_to_send_L2'] = 'A user is available, if there are new elements to notify';
 $lang['nbm_no_user_to send_notifications_by_mail'] = 'No user to send notifications by mail.';
 $lang['nbm_object_news'] = 'New elements added';
-$lang['nbm_object_subcribe'] = 'Subcribe of notification by mail';
-$lang['nbm_object_unsubcribe'] = 'Unsubcribe of notification by mail';
+$lang['nbm_object_subcribe'] = 'Subcribe to notification by mail';
+$lang['nbm_object_unsubcribe'] = 'Unsubcribe from notification by mail';
 $lang['nbm_param_mode'] = 'Parameter';
 $lang['nbm_send_check_all'] = 'Check All';
@@ -293 +293 @@
 $lang['nbm_subscribe_mode'] = 'Subscribe';
 $lang['nbm_title_param'] = 'Parameters';
-$lang['nbm_title_send'] = 'Select sendings';
-$lang['nbm_title_subscribe'] = 'Subscribe/unscribe users';
+$lang['nbm_title_send'] = 'Select recipients';
+$lang['nbm_title_subscribe'] = 'Subscribe/unsubscribe users';
 $lang['nbm_unsubscribe_col'] = 'Unsubcribed';
 $lang['nbm_updated_param_count'] = '%d parameters are updated.';
 $lang['nbm_user_change_enabled_error_on_updated_data_count'] = '%d user(s) are not updated.';
-$lang['nbm_user_change_enabled_false'] = 'User %s [%s] removed of subscribe list.';
-$lang['nbm_user_change_enabled_true'] = 'User %s [%s] added to subscribe list.';
+$lang['nbm_user_change_enabled_false'] = 'User %s [%s] removed from the subscription list.';
+$lang['nbm_user_change_enabled_true'] = 'User %s [%s] added to the subscription list.';
 $lang['nbm_user_change_enabled_updated_data_count'] = '%d user(s) are updated.';
-$lang['nbm_user_not_change_enabled_false'] = 'User %s [%s] not removed of subscribe list.';
-$lang['nbm_user_not_change_enabled_true'] = 'User %s [%s] not added to subscribe list.';
+$lang['nbm_user_not_change_enabled_false'] = 'User %s [%s] not removed from the subscription list.';
+$lang['nbm_user_not_change_enabled_true'] = 'User %s [%s] not added to the subscription list.';
 $lang['nbm_user_x_added'] = 'User %s [%s] added.';
-$lang['nbm_warning_subscribe_unsubcribe'] = 'Warning, subscribe or unscribe send mails to users';
+$lang['nbm_warning_subscribe_unsubcribe'] = 'Warning: subscribing or unsubcribing will send mails to users';
 $lang['no_write_access'] = 'no write access';
 $lang['order_by'] = 'order by';

trunk/tags.php

@@ -37 +37 @@
   }
 
-  return ($a['counter'] < $b['counter']) ? -1 : 1;
+  return ($a['counter'] < $b['counter']) ? +1 : -1;
 }
 
@@ -103 +103 @@
           )
         ),
-      
+
       'NAME' => $tag['name'],
       'TITLE' => $tag['counter'],

trunk/template/yoga/default-layout.css

@@ -271 +271 @@
   white-space: nowrap;
 }
+
+#fullTagCloud { font-size: 140%; }
+
+#fullTagCloud LI { display: inline; }
+
+.tagLevel5 { font-size: 150%; }
+.tagLevel4 { font-size: 140%; }
+.tagLevel3 { font-size: 120%; }
+.tagLevel2 { font-size: 100%; }
+.tagLevel1 { font-size: 90%; }