Changeset 4091 for sandbox

Show
Ignore:
Timestamp:
02/03/08 13:51:46 (10 months ago)
Author:
mramm
Message:

Nice URL's now supported by changing index to default

This should provide us with a way to explain how default works ;)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • sandbox/wiki/wiki20/controllers/root.py

    r4090 r4091  
     1import re 
    12 
    23from wiki20.lib.base import BaseController 
    …… 
    78from genshi import XML 
    89 
     10wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)") 
     11 
    912class RootController(BaseController): 
    1013 
    1114    @expose('wiki20.templates.page') 
    12     def index(self, pagename="FrontPage"): 
     15    def default(self, pagename="FrontPage"): 
    1316        page = DBSession.query(Page).filter_by(pagename=pagename).one() 
    14         return dict(page=page) 
     17        return dict(pagename=page.pagename, pagedata=page.data) 
    1518 
    1619    @expose(template="wiki20.templates.edit") 
    1720    def edit(self, pagename): 
     21        # use the in-memory database session object to pull a page into 
     22        # the working-set so we can display or manipulate it.   
     23        # the .one() method assures that there is only one returned result 
     24        # normally a .query call returns a list of matching objects 
    1825        page = DBSession.query(Page).filter_by(pagename=pagename).one() 
     26         
    1927        return dict(page=page) 
    2028 
    …… 
    3139        # havent done it.  
    3240         
    33         tg.flash("Changes saved!") 
    34         raise tg.redirect("/", pagename=pagename) 
    35          
     41        tg.redirect("/"+pagename) 
     42     
     43     

  • sandbox/wiki/wiki20/templates/page.html

    r4090 r4091  
    1010<head> 
    1111    <meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/> 
    12     <title>${page.pagename} - 20-Minute Wiki</title> 
     12    <title>${pagename} - 20-Minute Wiki</title> 
    1313</head> 
    1414 
    …… 
    1717<div class="main_content"> 
    1818<div style="float:right; width: 10em;"> Viewing 
    19 <span py:replace="page.pagename">Page Name Goes Here</span> <br/> 
     19<span py:replace="pagename">Page Name Goes Here</span> <br/> 
    2020You can return to the <a href="/">FrontPage</a>. 
    2121</div> 
    2222 
    23 <div py:replace="page.data">Page text goes here.</div> 
    24 <p><a href="${tg.url('/edit', pagename=page.pagename)}">Edit this page</a></p> 
     23<div py:replace="pagedata">Page text goes here.</div> 
     24<p><a href="${tg.url('/edit', pagename=pagename)}">Edit this page</a></p> 
    2525</div> 
    2626 
    27 </body> 
    28 </html> 
     27</body></html>