From df4544620cee2d99e5e2751fcef8f7c5e2ea23c9 Mon Sep 17 00:00:00 2001 From: saxmatt Date: Tue, 4 Nov 2003 15:12:43 +0000 Subject: [PATCH] Tweaks to calendar and CSS per Alex's and Dunstan's suggestions. git-svn-id: http://svn.automattic.com/wordpress/trunk@523 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- b2-include/b2template.functions.php | 65 +++++++++++++---------------- wp-layout.css | 14 ++++--- 2 files changed, 39 insertions(+), 40 deletions(-) diff --git a/b2-include/b2template.functions.php b/b2-include/b2template.functions.php index 35a08a846..feae8799b 100644 --- a/b2-include/b2template.functions.php +++ b/b2-include/b2template.functions.php @@ -231,8 +231,6 @@ function get_archives($type='', $limit='', $format='html', $before = "", $after function get_calendar($daylength = 1) { global $wpdb, $HTTP_GET_VARS, $m, $monthnum, $year, $timedifference, $month, $weekday, $tableposts, $posts; - $ak_use_tooltip_titles = 1; // set this to 1 to have the day's post titles as tooltips to the calendar date. - // Quick check. If we have no posts at all, abort! if (!$posts) { $gotsome = $wpdb->get_var("SELECT ID from $tableposts WHERE post_status = 'publish' AND post_category > 0 ORDER BY post_date DESC LIMIT 1"); @@ -302,17 +300,17 @@ function get_calendar($daylength = 1) { get_month_link($previous->year, $previous->month) . '" title="View posts for ' . $month[zeroise($previous->month, 2)] . ' ' . date('Y', mktime(0, 0 , 0, $previous->month, 1, $previous->year)) . '">« ' . substr($month[zeroise($previous->month, 2)], 0, 3) . ''; } else { - echo "\n\t\t".'«'; + echo "\n\t\t".' '; } - echo "\n\t\t".' '; + echo "\n\t\t".' '; if ($next) { echo "\n\t\t".'' . substr($month[zeroise($next->month, 2)], 0, 3) . ' »'; } else { - echo "\n\t\t".'»'; + echo "\n\t\t".' '; } echo ' @@ -338,36 +336,36 @@ function get_calendar($daylength = 1) { } - if ($ak_use_tooltip_titles == 1) { - if (strstr($_SERVER["HTTP_USER_AGENT"], "MSIE") || - strstr(strtolower($_SERVER["HTTP_USER_AGENT"]), "camino")) { - $ak_title_separator = "\n"; - } else { - $ak_title_separator = ", "; - } - $ak_titles_for_day = array(); - $ak_post_titles = $wpdb->get_results("SELECT post_title, DAYOFMONTH(post_date) as dom " - ."FROM $tableposts " - ."WHERE YEAR(post_date) = '$thisyear' " - ."AND MONTH(post_date) = '$thismonth' " - ."AND post_date < '".date("Y-m-d H:i:s", (time() + ($time_difference * 3600)))."' " - ."AND post_status = 'publish'" - ); - if ($ak_post_titles) { - foreach ($ak_post_titles as $ak_post_title) { - if (empty($ak_titles_for_day["$ak_post_title->dom"])) { // first one - $ak_titles_for_day["$ak_post_title->dom"] .= htmlspecialchars(stripslashes($ak_post_title->post_title)); - } else { - $ak_titles_for_day["$ak_post_title->dom"] .= $ak_title_separator . htmlspecialchars(stripslashes($ak_post_title->post_title)); - } + if (strstr($_SERVER["HTTP_USER_AGENT"], "MSIE") || + strstr(strtolower($_SERVER["HTTP_USER_AGENT"]), "camino")) { + $ak_title_separator = "\n"; + } else { + $ak_title_separator = ", "; + } + + $ak_titles_for_day = array(); + $ak_post_titles = $wpdb->get_results("SELECT post_title, DAYOFMONTH(post_date) as dom " + ."FROM $tableposts " + ."WHERE YEAR(post_date) = '$thisyear' " + ."AND MONTH(post_date) = '$thismonth' " + ."AND post_date < '".date("Y-m-d H:i:s", (time() + ($time_difference * 3600)))."' " + ."AND post_status = 'publish'" + ); + if ($ak_post_titles) { + foreach ($ak_post_titles as $ak_post_title) { + if (empty($ak_titles_for_day["$ak_post_title->dom"])) { // first one + $ak_titles_for_day["$ak_post_title->dom"] .= htmlspecialchars(stripslashes($ak_post_title->post_title)); + } else { + $ak_titles_for_day["$ak_post_title->dom"] .= $ak_title_separator . htmlspecialchars(stripslashes($ak_post_title->post_title)); } } } + // See how much we should pad in the beginning $pad = intval(date('w', $unixmonth)); - if (0 != $pad) echo "\n\t\t "; + if (0 != $pad) echo "\n\t\t "; $daysinmonth = intval(date('t', $unixmonth)); for ($day = 1; $day <= $daysinmonth; ++$day) { @@ -381,22 +379,19 @@ function get_calendar($daylength = 1) { echo ""; if (in_array($day, $daywithpost)) { // any posts today? - if ($ak_use_tooltip_titles == 1) { // check to see if we want to show the tooltip titles - echo '$day"; - } else { - echo '$day"; - } + echo '$day"; } else { echo $day; } - echo ''; + if (6 == date('w', mktime(0, 0 , 0, $thismonth, $day, $thisyear))) $newrow = true; } + $pad = 7 - date('w', mktime(0, 0 , 0, $thismonth, $day, $thisyear)); if (0 != $pad) - echo "\n\t\t "; + echo "\n\t\t "; echo "\n\t\n\t\n\t"; } diff --git a/wp-layout.css b/wp-layout.css index 31a51060f..558c81905 100644 --- a/wp-layout.css +++ b/wp-layout.css @@ -73,7 +73,6 @@ p, li, .feedback { letter-spacing: -1px; } - .credit { background: #90a090; border-top: double 3px #aba; @@ -105,8 +104,8 @@ p, li, .feedback { } #commentform input, #commentform textarea { + background: #fff; border: 1px solid #333; - background-color: #fff; } #commentform textarea { @@ -190,6 +189,7 @@ p, li, .feedback { #menu ul ul li { border: 0; font: normal normal 70%/115% 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif; + height: 14px; letter-spacing: 0; margin-top: 0; padding: 0; @@ -198,7 +198,7 @@ p, li, .feedback { #menu ul ul li a { color: #000; - height: 13px; + display: block; text-decoration: none; } @@ -242,9 +242,13 @@ p, li, .feedback { #wp-calendar td { color: #ccc; font: normal 12px 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif; - text-align: center; - padding: 2px 0; letter-spacing: normal; + padding: 2px 0; + text-align: center; +} + +#wp-calendar td.pad:hover { + background: #fff; } #wp-calendar td:hover, #wp-calendar #today {