Changeset 869

Timestamp:

12/20/07 22:00:53 (4 years ago)

Author:

bogdanpasoi@…

Message:

Calendar macro.

Location:

trunk

Files:

• smf/SSI.php (modified) (2 diffs)
• smf/ia_calendar.php (added)
• www/macros/macro_calendar.php (added)
• www/static/css/screen.css (modified) (1 diff)
• www/static/images/date.png (added)

trunk/smf/SSI.php

@@ -1716 +1716 @@
                         LEFT JOIN {$db_prefix}boards AS b ON (b.ID_BOARD = cal.ID_BOARD)
                         LEFT JOIN {$db_prefix}topics AS t ON (t.ID_TOPIC = cal.ID_TOPIC)
-                WHERE cal.startDate <= '" . strftime('%Y-%m-%d', forum_time(false)) . "'
-                        AND cal.endDate >= '" . strftime('%Y-%m-%d', forum_time(false)) . "'
+                WHERE cal.endDate >= '" . strftime('%Y-%m-%d', forum_time(false)) . "'
                         AND (cal.ID_BOARD = 0 OR $user_info[query_see_board])
-                ORDER BY cal.startDate DESC
+                ORDER BY cal.startDate
                 LIMIT $max_events", __FILE__, __LINE__);
         $return = array();
@@ -1761 +1760 @@
 
         // Well the output method is echo.
-        echo '
-                        <span style="color: #' . $modSettings['cal_eventcolor'] . ';">' . $txt['calendar4'] . '</span> ';
+    echo '<div class="calendar">';
+    echo '<div class="header">';
+    echo '<a href="'.IA_URL.'/forum?action=calendar">In curand..</a></div>';
         foreach ($return as $mday => $array)
+    {
+        echo '<div class="date">'.strftime("%A, %d %B", strtotime($mday)).'</div>';
                 foreach ($array as $event)
                 {
-                        if ($event['can_edit'])
-                                echo '
-                                <a href="' . $event['modify_href'] . '" style="color: #FF0000;">*</a> ';
-
-                        echo '
-                                ' . $event['link'] . (!$event['is_last'] ? ', ' : '');
+            echo '<div class="event">';
+                        if ($event['can_edit']) {
+                                echo '<a href="' . $event['modify_href'] . '" style="color: #FF0000;">&raquo;</a> ';
+            } else {
+                echo '&raquo';
+            }
+                        echo '' . $event['link'] . (!$event['is_last'] ? ', ' : '');
+            echo '</div>';
                 }
+    }
+    echo '</div>';
 }
 

trunk/www/static/css/screen.css

@@ -1236 +1236 @@
 }
 
+/* calendar */
+
+.calendar {
+    border: 1px solid #cccccc;
+    background: url(../images/date.png) no-repeat top left;
+    width: 170px;
+    padding-left: 0.5ex;
+    padding-right: 0.5ex;
+    margin: 0pt auto;
+    line-height: 1.2em;
+    -moz-border-radius: 7px;
+}
+
+.calendar .date {
+    font-size: 8pt;
+    font-weight: bold;
+    margin-top: 4pt;
+}
+.calendar .header {
+    text-align: center;
+    font-weight: bold;
+    padding-top: 2pt;
+    padding-bottom: 3pt;
+    border-bottom: 1px solid #cccccc;
+}
+
+.calendar a {
+    color: #6a6a6b;
+}
+
+.calendar .header img {
+    vertical-align: middle;
+}
+
+.calendar .event {
+    font-size: 8pt;
+}
+
 /* quote */
 .quote {