Changeset 626

Show
Ignore:
Timestamp:
04/06/06 02:12:56 (3 years ago)
Author:
pacopablo
Message:

TracBlogPlugin:

  • Fixed blog macro on 0.9.4. Calendar is now supported
  • Added link to month name so that it's easy to get back to the month view after selecting a day.
  • When moving back or forward by a year or month, a month is shown, instead of a single day.
  • Added admin option to change the first day of the week
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • tracblogplugin/0.10/blog/admin.py

    r612 r626  
    6060                        'history_days' : 30, 
    6161                        'new_blog_link' : 'New Blog Post', 
     62                        'first_week_day' : 'SUNDAY', 
    6263                       } 
    6364        if req.method == 'POST': 
    …… 
    8889 '''New Blog Link''':: 
    8990   text to show for the new blog link 
     91 '''Calendar Week Start Day''':: 
     92   name of day that acts as the first day of the week.  Must be full day name. 
    9093 
    9194 '''strftime formatting''':: 

  • tracblogplugin/0.10/blog/templates/blog_admin.cs

    r602 r626  
    5353                </label> 
    5454            </div> 
     55            <div class="field"> 
     56                <label>Calendar Week Start Day:<br/> 
     57                    <input type="text" name="first_week_day"  
     58                    value="<?cs var:blogadmin.first_week_day ?>" /> 
     59                </label> 
     60            </div> 
    5561        <div class="buttons"> 
    5662            <input type="submit" value="Apply Changes" /> 

  • tracblogplugin/0.10/blog/templates/blog.cs

    r623 r626  
    2424 
    2525<!-- Calendar gratefully donate from coderanger --> 
    26 <?cs def:cal_link(year, month, day) ?><?cs var:blog.path_info ?>?year=<?cs var:year ?>&month=<?cs var:month ?>&day=<?cs var:day ?><?cs /def ?> 
     26<?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 ?> 
     27<?cs def:mon_link(year, month) ?><?cs var:blog.path_info ?>?year=<?cs var:year ?>&month=<?cs var:month ?><?cs /def ?> 
    2728<div class="blog-calendar"> 
    2829    <table> 
    2930        <tr> 
    30             <td><a href="<?cs call:cal_link(blog.date.lastyear,blog.date.month,blog.date.day) ?>">&lt;&lt;</a></td> 
    31             <td><a href="<?cs call:cal_link(blog.date.lastmonth.year,blog.date.lastmonth.month,blog.date.day) ?>">&lt;</a></td> 
    32             <td colspan="3" align="center"><?cs var:blog.date.monthname ?> <?cs var:string.slice(blog.date.year,2,4)?></td> 
    33             <td><a href="<?cs call:cal_link(blog.date.nextmonth.year,blog.date.nextmonth.month,blog.date.day)?>">&gt;</a></td> 
    34             <td><a href="<?cs call:cal_link(blog.date.nextyear,blog.date.month,blog.date.day) ?>">&gt;&gt;</a></td> 
     31            <td><a href="<?cs call:mon_link(blog.date.lastyear,blog.date.month) ?>">&lt;&lt;</a></td> 
     32            <td><a href="<?cs call:mon_link(blog.date.lastmonth.year,blog.date.lastmonth.month) ?>">&lt;</a></td> 
     33            <td colspan="3" align="center"><a href="<?cs call:mon_link(blog.date.year,blog.date.month) ?>"><?cs var:blog.date.monthname ?></a> <?cs var:string.slice(blog.date.year,2,4)?></td> 
     34            <td><a href="<?cs call:mon_link(blog.date.nextmonth.year,blog.date.nextmonth.month)?>">&gt;</a></td> 
     35            <td><a href="<?cs call:mon_link(blog.date.nextyear,blog.date.month) ?>">&gt;&gt;</a></td> 
    3536        </tr> 
    3637        <tr> 
    …… 
    4546            <td <?cs if:day==blog.date.day ?>class="blog-calendar-current"<?cs /if ?>> 
    4647            <?cs if:day ?> 
    47             <a href="<?cs call:cal_link(blog.date.year, blog.date.month, day) ?>"><?cs var:day ?></a> 
     48            <a href="<?cs call:day_link(blog.date.year, blog.date.month, day) ?>"><?cs var:day ?></a> 
    4849            <?cs else ?>&nbsp;<?cs /if ?> 
    4950            </td> 

  • tracblogplugin/0.10/blog/web_ui.py

    r622 r626  
    190190              now.day  
    191191        baseday = datetime.datetime(year, month, day) 
     192        week_day = self.env.config.get('blog', 'first_week_day', 'SUNDAY') 
     193        first_day = getattr(calendar, week_day.upper()) 
     194        calendar.setfirstweekday(first_day) 
    192195        cal = calendar.monthcalendar(year, month) 
    193196        week = [week for week in xrange(0,len(cal)-1) if day in cal[week]][0] 
    194         monthname = format_datetime(time.mktime(now.timetuple()), format="%b")  
     197        monthname = format_datetime(time.mktime(baseday.timetuple()),  
     198                                    format="%b")  
    195199        lastyear = abs(year - 1) 
    196200        nextyear = year + 1 
    …… 
    228232        req.hdf['blog.date'] = hdfdate 
    229233        req.hdf['blog.cal'] = cal 
    230         req.hdf['blog.path_info'] = req.href(req.path_info) 
     234        req.hdf['blog.path_info'] = self.env.href(req.path_info) 
    231235        pass 
    232236