From 681e5b29986903ecced4c1a5710b9129fa3ebead Mon Sep 17 00:00:00 2001 From: saxmatt Date: Tue, 6 May 2003 08:06:57 +0000 Subject: [PATCH] Update to use real lists. git-svn-id: http://svn.automattic.com/wordpress/trunk@14 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- b2-include/b2template.functions.php | 16 +++++++++++----- b2archives.php | 28 +++++++++++----------------- index.php | 25 +++++++++++-------------- 3 files changed, 33 insertions(+), 36 deletions(-) diff --git a/b2-include/b2template.functions.php b/b2-include/b2template.functions.php index 66824acaa6..23f8137d8f 100644 --- a/b2-include/b2template.functions.php +++ b/b2-include/b2template.functions.php @@ -763,8 +763,8 @@ function dropdown_cats($optionall = 1, $all = 'All') { } // out of the b2 loop -function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_order = 'asc', $file = 'blah') { - global $tablecategories,$querycount; +function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_order = 'asc', $file = 'blah', $list=true) { + global $tablecategories, $querycount; global $pagenow; global $querystring_start, $querystring_equal, $querystring_separator; $file = ($file == 'blah') ? $pagenow : $file; @@ -774,13 +774,19 @@ function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_orde $querycount++; if (intval($optionall) == 1) { $all = apply_filters('list_cats', $all); - echo "\t'.$all."
\n"; + if ($list) echo "\n\t
  • '.$all."
    • "; + else echo "\t'.$all."
    \n"; } while($row = mysql_fetch_object($result)) { $cat_name = $row->cat_name; $cat_name = apply_filters('list_cats', $cat_name); - echo "\tcat_ID.'">'; - echo stripslashes($cat_name)."
    \n"; + if ($list) { + echo "\n\t
  • cat_ID.'">'; + echo stripslashes($cat_name)."
    • "; + } else { + echo "\tcat_ID.'">'; + echo stripslashes($cat_name)."
    \n"; + } } } diff --git a/b2archives.php b/b2archives.php index 563e2a90c7..4947b03f54 100644 --- a/b2archives.php +++ b/b2archives.php @@ -8,9 +8,8 @@ require_once($b2inc.'/b2functions.php'); dbconnect(); // this is what will separate your archive links -$archive_line_separator = '
    '; // this is what will separate dates on weekly archive links -$archive_week_separator = ' - '; +$archive_week_separator = '–'; // archive link url @@ -59,10 +58,9 @@ if ($archive_mode == 'monthly') { while($arc_row = mysql_fetch_array($arc_result)) { $arc_year = $arc_row['YEAR(post_date)']; $arc_month = $arc_row['MONTH(post_date)']; - echo "'; + echo "
  • '; echo $month[zeroise($arc_month,2)].' '.$arc_year; - echo ''; - echo $archive_line_separator."\n"; + echo "
    • \n"; } } elseif ($archive_mode == 'daily') { $arc_sql="SELECT DISTINCT YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) FROM $tableposts WHERE post_date < '$now' AND post_category > 0 ORDER BY post_date DESC"; @@ -72,11 +70,9 @@ if ($archive_mode == 'monthly') { $arc_year = $arc_row['YEAR(post_date)']; $arc_month = $arc_row['MONTH(post_date)']; $arc_dayofmonth = $arc_row['DAYOFMONTH(post_date)']; - echo "'; + echo "
  • '; echo mysql2date($archive_day_date_format, $arc_year.'-'.zeroise($arc_month,2).'-'.zeroise($arc_dayofmonth,2).' 00:00:00'); -# echo $month[zeroise($arc_month,2)]." $arc_year"; - echo ''; - echo $archive_line_separator."\n"; + echo "
    • \n"; } } elseif ($archive_mode == 'weekly') { if (!isset($start_of_week)) { @@ -95,10 +91,9 @@ if ($archive_mode == 'monthly') { $arc_week = get_weekstartend($arc_ymd, $start_of_week); $arc_week_start = date_i18n($archive_week_start_date_format, $arc_week['start']); $arc_week_end = date_i18n($archive_week_end_date_format, $arc_week['end']); - echo ""; + echo "
  • "; echo $arc_week_start.$archive_week_separator.$arc_week_end; - echo ''; - echo $archive_line_separator."\n"; + echo "
    • \n"; } } } elseif ($archive_mode == 'postbypost') { @@ -107,19 +102,18 @@ if ($archive_mode == 'monthly') { $resultarc = mysql_query($requestarc); while($row=mysql_fetch_object($resultarc)) { if ($row->post_date != '0000-00-00 00:00:00') { - echo "ID.'">'; + echo "
  • ID.'">'; $arc_title = stripslashes($row->post_title); if ($arc_title) { echo strip_tags($arc_title); } else { echo $row->ID; } - echo ''; - echo $archive_line_separator."\n"; + echo "
    • \n"; } } } -#echo $querycount."
    \n"; -#timer_stop(1,8); +# echo $querycount."
    \n"; +# timer_stop(1,8); ?> \ No newline at end of file diff --git a/index.php b/index.php index 759f68605f..b60300d3b6 100644 --- a/index.php +++ b/index.php @@ -1,13 +1,11 @@ - + + - <?php bloginfo('name') ?><?php single_post_title(' :: ') ?><?php single_cat_title(' :: ') ?><?php single_month_title(' :: ') ?> -