kallithea Changeset - fac1f62a1d71

Changeset - fac1f62a1d71

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Marcin Kuzminski - 16 years ago 2010-02-28 02:24:44

Wrapped into mako templates,
changed templates info. Added session and cache middleware.

5 files changed with 30 insertions and 11 deletions:

pylons_app/config/middleware.py

pylons_app/controllers/hg.py

pylons_app/templates/monoblue_custom/changelog.tmpl

pylons_app/templates/monoblue_custom/index.tmpl

pylons_app/templates/monoblue_custom/shortlog.tmpl

0 comments (0 inline, 0 general)

pylons_app/config/middleware.py

➞

Show inline comments

@@ @@ -32,24 +32,26 @@ def make_app(global_conf, full_stack = T @@
     """
     # Configure the Pylons environment
     load_environment(global_conf, app_conf)
     # The Pylons WSGI app
     app = PylonsApp()
     # CUSTOM MIDDLEWARE HERE (filtered by error handling middlewares)
     # Routing/Session/Cache Middleware
     app = RoutesMiddleware(app, config['routes.map'])
     app = SessionMiddleware(app, config)
     app = CacheMiddleware(app, config)
     if asbool(full_stack):
         # Handle Python exceptions
         app = ErrorHandler(app, global_conf, **config['pylons.errorware'])
         # Display error documents for 401, 403, 404 status codes (and
         # 500 when debug is disabled)
         if asbool(config['debug']):
             #don't handle 404, since mercurial does it for us.
             app = StatusCodeRedirect(app, [400, 401, 403, 500])
         else:
             app = StatusCodeRedirect(app, [400, 401, 403, 500])

pylons_app/controllers/hg.py

➞

Show inline comments

@@ @@ -4,29 +4,41 @@ import logging @@
 from pylons_app.lib.base import BaseController, render
 from pylons import c, g, session, h, request
 from mako.template import Template
 from pprint import pprint
 import os
 from mercurial import ui, hg
 from mercurial.error import RepoError
 from ConfigParser import ConfigParser
 log = logging.getLogger(__name__)
 class HgController(BaseController):
     def index(self):
         return g.hgapp(request.environ, self.start_response)
     def __before__(self):
         c.repos_prefix = 'etelko'
     def view(self, *args, **kwargs):
         return g.hgapp(request.environ, self.start_response)
         response = g.hgapp(request.environ, self.start_response)
         #for mercurial protocols we can't wrap into mako
         if request.environ['HTTP_ACCEPT'].find("mercurial") >= 0:
                     return response
         #wrap the murcurial response in a mako template.
         template = Template("".join(response),
                             lookup = request.environ['pylons.pylons']\
                             .config['pylons.g'].mako_lookup)
         return template.render(g = g, c = c, session = session, h = h)
     def add_repo(self, new_repo):
         c.staticurl = g.statics
         #extra check it can be add since it's the command
         if new_repo == 'add':
             c.msg = 'you basstard ! this repo is a command'
             c.new_repo = ''
             return render('add.html')
         new_repo = new_repo.replace(" ", "_")
         new_repo = new_repo.replace("-", "_")

pylons_app/templates/monoblue_custom/changelog.tmpl

➞

Show inline comments

@@ @@ -15,26 +15,29 @@ @@
                 <dt><label>Search: </label></dt>
                 <dd><input type="text" name="rev" /></dd>
             </dl>
         </form>
         <ul class="page-nav">
             <li><a href="{url}summary{sessionvars%urlparameter}">summary</a></li>
             <li><a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a></li>
             <li class="current">changelog</li>
             <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
             <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
             <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}</li>
         </ul>
             <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
     </div>
     <ul class="submenu">
         {archives%archiveentry}
     </ul>
     <h2 class="no-link no-border">changelog</h2>
     <div>
     {entries%changelogentry}
     </div>
     <div class="page-path">
 {changenav%naventry}
     </div>
 {footer}

pylons_app/templates/monoblue_custom/index.tmpl

➞

Show inline comments

 {header}
     <title>{repo|escape}: Mercurial repositories index</title>
 </head>
 <body>
 <div id="container">
     <div class="page-header">
         <h1> Mercurial Repositories</h1>
+        <h1>${c.repos_prefix} Mercurial Repositories</h1>
         <ul class="page-nav">
         </ul>
     </div>
     <table cellspacing="0">
         <tr>
             <td><a href="?sort={sort_name}">Name</a></td>
             <td><a href="?sort={sort_description}">Description</a></td>
             <td><a href="?sort={sort_contact}">Contact</a></td>
             <td><a href="?sort={sort_lastchange}">Last change</a></td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>

pylons_app/templates/monoblue_custom/shortlog.tmpl

➞

Show inline comments

@@ @@ -15,27 +15,29 @@ @@
                 <dt><label>Search: </label></dt>
                 <dd><input type="text" name="rev" /></dd>
             </dl>
         </form>
         <ul class="page-nav">
             <li><a href="{url}summary{sessionvars%urlparameter}">summary</a></li>
             <li class="current">shortlog</li>
             <li><a href="{url}log{sessionvars%urlparameter}">changelog</a></li>
             <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
             <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
             <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
-            <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}</li>
             <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
         </ul>
     </div>
     <ul class="submenu">
         {archives%archiveentry}
     </ul>
     <h2 class="no-link no-border">shortlog</h2>
     <table>
 {entries%shortlogentry}
+        {entries%shortlogentry}
     </table>
     <div class="page-path">
 {changenav%navshortentry}
+        {changenav%navshortentry}
     </div>
 {footer}

0 comments (0 inline, 0 general)