Changeset 510

Timestamp:

11/03/2003 05:22:01 PM (22 years ago)

Author:

saxmatt

Message:

New calendar code.

Location:

trunk

Files:

• b2-include/b2template.functions.php (modified) (4 diffs)
• b2calendar.php (deleted)
• index.php (modified) (1 diff)
• wp-layout.css (modified) (3 diffs)

trunk/b2-include/b2template.functions.php

@@ -229 +229 @@
 }
 
-function get_calendar() {
-    global $wpdb, $HTTP_GET_VARS, $m, $monthnum, $year, $timedifference, $month, $tableposts;
+function get_calendar($daylength = 1) {
+    global $wpdb, $HTTP_GET_VARS, $m, $monthnum, $year, $timedifference, $month, $weekday, $tableposts;
 // Quick check. If we have no posts at all, abort!
 if (!$posts) {
@@ -269 +269 @@
                             FROM $tableposts
                             WHERE post_date < '$thisyear-$thismonth-01'
+                            AND post_status = 'publish'
                             ORDER BY post_date DESC
                             LIMIT 1");
 $next = $wpdb->get_row("SELECT  DISTINCT MONTH( post_date ) AS month, YEAR( post_date ) AS year
                             FROM $tableposts
-                            WHERE post_date >  '$thisyear-$thismonth-01' AND MONTH( post_date )  != MONTH( '$thisyear-$thismonth-01' ) 
+                            WHERE post_date >  '$thisyear-$thismonth-01' 
+                            AND MONTH( post_date ) != MONTH( '$thisyear-$thismonth-01' ) 
+                            AND post_status = 'publish'
                             ORDER  BY post_date ASC 
-                            LIMIT 1 ");
+                            LIMIT 1");
 
 echo '<table id="wp-calendar">
     <caption>' . $month[zeroise($thismonth, 2)] . ' ' . date('Y', $unixmonth) . '</caption>
 <thead>
-  <tr>
-    <th abbr="Sunday" scope="col" title="Sunday">Sun</th>
-    <th abbr="Monday" scope="col" title="Monday">Mon</th>
-    <th abbr="Tuesday" scope="col" title="Tuesday">Tue</th>
-    <th abbr="Wednesday" scope="col" title="Wednesday">Wed</th>
-    <th abbr="Thursday" scope="col" title="Thursday">Thu</th>
-    <th abbr="Friday" scope="col" title="Friday">Fri</th>
-    <th abbr="Saturday" scope="col" title="Saturday">Sat</th>
-  </tr>
+  <tr>';
+ foreach ($weekday as $wd) {
+    echo "\n\t<th abbr='$wd' scope='col' title='$wd'>" . substr($wd, 0, $daylength) . '</th>';
+ }
+
+echo '  </tr>
 </thead>
 
@@ -295 +295 @@
 
 if ($previous) {
-    echo '<th abbr="' . $month[zeroise($previous->month, 2)] . '" colspan="3" id="prev"><a href="' . 
+    echo "\n\t".'<td abbr="' . $month[zeroise($previous->month, 2)] . '" colspan="3" id="prev"><a href="' . 
     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)) . '">&laquo; ' . substr($month[zeroise($previous->month, 2)], 0, 3) . '</a>';
+    date('Y', mktime(0, 0 , 0, $previous->month, 1, $previous->year)) . '">&laquo; ' . substr($month[zeroise($previous->month, 2)], 0, 3) . '</a></td>';
 } else {
-    echo '<th colspan="3" id="prev">&laquo;</th>';
-}
-
-echo '<th>&nbsp;</th>';
+    echo "\n\t".'<td colspan="3" id="prev">&laquo;</td>';
+}
+
+echo "\n\t".'<td>&nbsp;</td>';
 
 if ($next) {
-    echo '<th abbr="' . $month[zeroise($next->month, 2)] . '" colspan="3" id="next"><a href="' . 
+    echo "\n\t".'<td abbr="' . $month[zeroise($next->month, 2)] . '" colspan="3" id="next"><a href="' . 
     get_month_link($previous->year, $next->month) . '" title="View posts for ' . $month[zeroise($next->month, 2)] . ' ' . 
-    date('Y', mktime(0, 0 , 0, $next->month, 1, $next->year)) . '">' . substr($month[zeroise($next->month, 2)], 0, 3) . ' &raquo;</a>';
+    date('Y', mktime(0, 0 , 0, $next->month, 1, $next->year)) . '">' . substr($month[zeroise($next->month, 2)], 0, 3) . ' &raquo;</a></td>';
 } else {
-    echo '<th colspan="3" id="next">&raquo;</th>';
-}
-
-echo '  </tr>
+    echo "\n\t".'<td colspan="3" id="next">&raquo;</td>';
+}
+
+echo '
+  </tr>
 </tfoot>
 
@@ -324 +325 @@
                 AND post_status = 'publish' 
                 AND post_date < '" . date("Y-m-d H:i:s", (time() + ($time_difference * 3600)))."'", ARRAY_N);
-foreach ($dayswithposts as $daywith) {
-    $daywithpost[] = $daywith[0];
+
+if ($dayswithposts) {
+    foreach ($dayswithposts as $daywith) {
+        $daywithpost[] = $daywith[0];
+    }
+} else {
+    $daywithpost = array();
 }
 
 // See how much we should pad in the beginning
 $pad = intval(date('w', $unixmonth));
-if (0 != $pad) echo "\n\t<td class='empty' colspan='$pad'>&nbsp;</td>";
+if (0 != $pad) echo "\n\t<td colspan='$pad'>&nbsp;</td>";
 
 $daysinmonth = intval(date('t', $unixmonth));
 for ($day = 1; $day <= $daysinmonth; ++$day) {
-    if ($newrow) echo "\n</tr>\n  <tr>";
+    if ($newrow) echo "\n  </tr>\n  <tr>\n\t";
     $newrow = false;
-    echo "\n\t<td>";
+
+    if ($day == date('j', (time() + ($time_difference * 3600)))) echo '<td id="today">';
+    else echo "<td>";
 
     if (in_array($day, $daywithpost)) {

trunk/index.php

@@ -90 +90 @@
  </li>
  <li>Calendar:
-   <ul>
-     <li>
-        <?php include_once('b2calendar.php')?>
-     </li>
-   </ul>
+    <?php get_calendar(); ?>
  </li>
  <li>Other:

trunk/wp-layout.css

@@ -1 +1 @@
 /* Default WordPress by Dave Shea || http://mezzoblue.com
-    Tweaked by Matthew Mullenweg || http://photomatt.net
+    Modifications by Matthew Mullenweg || http://photomatt.net
     This is just a basic layout, with only the bare minimum defined.
     Please tweak this and make it your own. :)
@@ -74 +74 @@
 }
 
-.b2calendarcell {
-    color: #000;
-}
-
-.b2calendaremptycell {
-}
-
-.b2calendarheadercell {
-    background: #808080;
-    color: #ccc;
-}
-
-.b2calendarlinkpost {
-    color: #f00;
-    text-decoration: none;
-}
-
-.b2calendarmonth {
-    color: #aaa;
-}
-
-.b2calendarrow {
-    color: #0f0;
-}
-
-.b2calendartable {
-    background: #fff;
-    border: 1px solid #000;
-}
-
-.b2calendartoday {
-    color: #00f;
-}
 
 .credit {
@@ -239 +206 @@
     border-bottom: 1px solid #809080;
 }
+
+#wp-calendar {
+    border: 1px solid #ddd;
+    empty-cells: show;
+    font-size: 14px;
+    margin: 0;
+    width: 90%;
+}
+
+#wp-calendar #next a {
+    padding-right: 10px;
+    text-align: right;
+}
+
+#wp-calendar #prev a {
+    padding-left: 10px;
+    text-align: left;
+}
+
+#wp-calendar a {
+    display: block;
+    text-decoration: none;
+}
+
+#wp-calendar a:hover {
+    background: #e0e6e0;
+    color: #333;
+}
+
+#wp-calendar caption {
+    color: #999;
+    font-size: 16px;
+}
+
+#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;
+}
+
+#wp-calendar td:hover, #wp-calendar #today {
+    background: #eee;
+    color: #bbb;
+}
+
+#wp-calendar th {
+    font-style: normal;
+    text-transform: capitalize;
+}