Changeset 632

Timestamp:

04/07/06 17:58:19 (3 years ago)

Author:

pacopablo

Message:

TracBlogPlugin:

• Finally satisfied with the calendar. Days that have posts are indicated by the red links. Days with out posts, gray links. If you hover over a link, it will tell you how many posts were on that day.
  

Files:

• tracblogplugin/0.10/blog/htdocs/css/blog.css (modified) (2 diffs)
• tracblogplugin/0.10/blog/templates/blog_calendar.cs (modified) (1 diff)
• tracblogplugin/0.10/blog/web_ui.py (modified) (5 diffs)

tracblogplugin/0.10/blog/htdocs/css/blog.css

@@ -65 +65 @@
-
-div.blog-calendar table {
+/*
- border-collapse: collapse;
+*/
-}
-
-div.blog-calendar td {
-1px
+.25em
-}
-
@@ -78 +80 @@
-td.blog-calendar-current a {
- color: #000000;
+ font-weight: bold;
-}
+
+a.blog-calendar-title {
+ font-size: 130%;
+ color: black;
+}
+
+caption.blog-calendar-caption {
+ padding-bottom: 4px;
+}

tracblogplugin/0.10/blog/templates/blog_calendar.cs

@@ -3 +3 @@
-<?cs def:day_link(year, month, day) ?><?cs var:blog.path_info ?>?year=<?cs var:year ?>&month=<?cs var:month ?>&day=<?cs var:day ?><?cs /def ?>
-<?cs def:mon_link(year, month) ?><?cs var:blog.path_info ?>?year=<?cs var:year ?>&month=<?cs var:month ?><?cs /def ?>
+<?cs def:year_link(year) ?><?cs var:blog.path_info ?>?year=<?cs var:year ?><?cs /def ?>
-<div class="blog-calendar">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            <?cs /each ?>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        <?cs /each ?>
-    </table>

tracblogplugin/0.10/blog/web_ui.py

@@ -177 +177 @@
-        hidecal = self._choose_value('hidecal', req, kwargs)
-        if not hidecal:
-
+, tallies
-        req.hdf['blog.hidecal'] = hidecal
-        pass
-
-
+, tallies
-        """Generate data necessary for the calendar
-
@@ -197 +197 @@
-        calendar.setfirstweekday(first_day)
-        cal = calendar.monthcalendar(year, month)
+        statcal = {}
+        for week_num, week in enumerate(cal):
+            statcal[week_num] = {
+                                'num' : week_num,
+                                'days' : []
+                               }
+            for day_num in week:
+                d = { 'num' : day_num,
+                      'count' : 0, }
+                if day_num:
+                    d['count'] = self._get_tally(tallies, year, month, day_num)
+                statcal[week_num]['days'].append(d)
+                continue
+            continue
-        week = [week for week in xrange(0,len(cal)-1) if day in cal[week]][0]
-        monthname = format_datetime(time.mktime(baseday.timetuple()), 
@@ -217 +231 @@
-        hdfdate = {
-                    'year' : year,
+                    'yearcount' : self._get_tally(tallies, year),
-                    'month' : month, 
+                    'monthcount' : self._get_tally(tallies, year, month),
-                    'day' : day,
-                    'lastyear' : lastyear,
@@ -229 +245 @@
-                                    'month' : nextmonth,
-                                  },
-1
+2
-                    'week' : week,
-                    'monthname' : monthname,
-                  }
-        req.hdf['blog.date'] = hdfdate
-
+stat
-        req.hdf['blog.path_info'] = self.env.href(req.path_info)
-        pass
-
+    def _get_tally(self, tallies, year, month=None, day=None):
+        """Return the tally for the given date
+
+        Returns 0 if no tally is present
+
+        """
+        if day and month:
+            try:    
+                tally = tallies[year][month][day]['total']
+            except KeyError:
+                tally = 0
+        elif month:
+            try:    
+                tally = tallies[year][month]['total']
+            except KeyError:
+                tally = 0
+        else:
+            try:    
+                tally = tallies[year]['total']
+            except KeyError:
+                tally = 0
+        return tally
+
-    def _add_to_tallies(self, tallies,  post_time, page_name):
-        """Create a running tally of blog page data
-
-        """
+        def _gen_blank_year_total(year):
+            blank_year = {}
+            for month in xrange(1, 13):
+                mrange = calendar.monthrange(year, month)[1] 
+                blank_year[month] = { 'pages' : [],
+                                      'total' : 0, }
+                for day in xrange(1, mrange + 1):
+                    blank_year[month][day] = { 'total' : 0,
+                                               'pages' : [], }
+                    continue
+                continue
+            return blank_year
-        d = datetime.datetime.fromtimestamp(post_time)
-        try:
@@ -251 +302 @@
-            tallies[d.year]['pages'].append(page_name)
-        except (KeyError, AttributeError):
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        pass
-