From 7cb0b383a3faafc04ad67028bb087e383b3e8705 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sat, 17 Apr 2010 12:48:31 +0200 Subject: [PATCH] upgrade mako templates, add explicit webhelpers --- ddportfolioservice/controllers/__init__.py | 2 +- ddportfolioservice/controllers/ddportfolio.py | 10 ++++++---- ddportfolioservice/controllers/showformscripts.py | 6 +++--- ddportfolioservice/controllers/template.py | 4 ++-- ddportfolioservice/lib/helpers.py | 5 ++++- ddportfolioservice/model/ddportfolio.ini | 2 +- ddportfolioservice/templates/base.mako | 9 +++++---- ddportfolioservice/templates/showform.mako | 8 ++++---- 8 files changed, 26 insertions(+), 20 deletions(-) diff --git a/ddportfolioservice/controllers/__init__.py b/ddportfolioservice/controllers/__init__.py index 6074769..09444ed 100644 --- a/ddportfolioservice/controllers/__init__.py +++ b/ddportfolioservice/controllers/__init__.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # # DDPortfolio service controllers package -# Copyright (c) 2009 Jan Dittberner +# Copyright © 2009, 2010 Jan Dittberner # # This file is part of DDPortfolio service. # diff --git a/ddportfolioservice/controllers/ddportfolio.py b/ddportfolioservice/controllers/ddportfolio.py index 4844a1a..7dbb258 100644 --- a/ddportfolioservice/controllers/ddportfolio.py +++ b/ddportfolioservice/controllers/ddportfolio.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # # DDPortfolio service DdportfolioController -# Copyright (c) 2009 Jan Dittberner +# Copyright © 2009, 2010 Jan Dittberner # # This file is part of DDPortfolio service. # @@ -23,9 +23,11 @@ import logging import simplejson -from ddportfolioservice.lib.base import * -from ddportfolioservice.model.form import * -from ddportfolioservice.model.urlbuilder import * +from pylons.i18n import N_ + +from ddportfolioservice.lib.base import BaseController, render +from ddportfolioservice.model.form import DDDataRequest, DeveloperData +from ddportfolioservice.model.urlbuilder import build_urls from ddportfolioservice.model import dddatabuilder log = logging.getLogger(__name__) diff --git a/ddportfolioservice/controllers/showformscripts.py b/ddportfolioservice/controllers/showformscripts.py index 22f80e9..33343b4 100644 --- a/ddportfolioservice/controllers/showformscripts.py +++ b/ddportfolioservice/controllers/showformscripts.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # # DDPortfolio service ShowformscriptController. -# Copyright (c) 2009 Jan Dittberner +# Copyright © 2009, 2010 Jan Dittberner # # This file is part of DDPortfolio service. # @@ -23,8 +23,8 @@ import logging import simplejson -from ddportfolioservice.lib.base import * -from ddportfolioservice.model.form import * +from ddportfolioservice.lib.base import BaseController +from ddportfolioservice.model.form import DDDataRequest from ddportfolioservice.model import dddatabuilder log = logging.getLogger(__name__) diff --git a/ddportfolioservice/controllers/template.py b/ddportfolioservice/controllers/template.py index 817a4c4..0cc70b2 100644 --- a/ddportfolioservice/controllers/template.py +++ b/ddportfolioservice/controllers/template.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # # DDPortfolio service TemplateController -# Copyright (c) 2009 Jan Dittberner +# Copyright © 2009, 2010 Jan Dittberner # # This file is part of DDPortfolio service. # @@ -20,7 +20,7 @@ # License along with this program. If not, see # . # -from ddportfolioservice.lib.base import * +from ddportfolioservice.lib.base import BaseController class TemplateController(BaseController): diff --git a/ddportfolioservice/lib/helpers.py b/ddportfolioservice/lib/helpers.py index 24170e9..8c174df 100644 --- a/ddportfolioservice/lib/helpers.py +++ b/ddportfolioservice/lib/helpers.py @@ -25,4 +25,7 @@ Consists of functions to typically be used within templates, but also available to Controllers. This module is available to templates as 'h'. """ -from webhelpers.html.builder import escape +from webhelpers.html.builder import escape, literal +from webhelpers.html.tags import stylesheet_link, javascript_link, image, \ + form, text, radio, submit, end_form +from routes import url_for diff --git a/ddportfolioservice/model/ddportfolio.ini b/ddportfolioservice/model/ddportfolio.ini index 72120d6..0be9f75 100644 --- a/ddportfolioservice/model/ddportfolio.ini +++ b/ddportfolioservice/model/ddportfolio.ini @@ -19,7 +19,7 @@ # . # [DEFAULT] -keyring.dir=/home/www/usr01/debian/keyring.debian.org/keyrings +keyring.dir=${HOME}/debian/keyring.debian.org/keyrings urlbuilder.sections=overview,bugs,build,qa,upload,lists,files,membership, miscellaneous diff --git a/ddportfolioservice/templates/base.mako b/ddportfolioservice/templates/base.mako index 6c48112..1b8e815 100644 --- a/ddportfolioservice/templates/base.mako +++ b/ddportfolioservice/templates/base.mako @@ -1,8 +1,9 @@ +## -- coding: utf-8 -- <%doc> Base template for XHTML templates. -Copyright (c) 2009 Jan Dittberner +Copyright © 2009, 2010 Jan Dittberner This file is part of DDPortfolio service. @@ -31,7 +32,7 @@ License along with this program. If not, see ${h.image(h.url_for('/images/openlogo-100.jpg'), _('Debian Logo'), 100, 100, id='debianlogo')}

${_('Debian Developer Portfolio Service')}

-

${_('''This service has been inspired by Stefano Zacchiroli's DDPortfolio page in the Debian Wiki. You can create a set of customized links leading to a Debian Developer's or package maintainer's information regarding Debian.''')}

+

${h.literal(_('''This service has been inspired by Stefano Zacchiroli's DDPortfolio page in the Debian Wiki. You can create a set of customized links leading to a Debian Developer's or package maintainer's information regarding Debian.'''))}

${self.body()} @@ -39,8 +40,8 @@ License along with this program. If not, see diff --git a/ddportfolioservice/templates/showform.mako b/ddportfolioservice/templates/showform.mako index 0458394..e124987 100644 --- a/ddportfolioservice/templates/showform.mako +++ b/ddportfolioservice/templates/showform.mako @@ -1,7 +1,8 @@ <%inherit file="base.mako" /> +## -- coding: utf-8 -- <%doc> Template for the data input form. -Copyright (c) 2009 Jan Dittberner +Copyright © 2009, 2010 Jan Dittberner This file is part of DDPortfolio service. @@ -23,9 +24,8 @@ License along with this program. If not, see - ${_('Enter your personal information')} <%def name="extrahead()">${h.javascript_link('/javascript/jquery/jquery.js', -h.url_for(controller='showformscripts', -action='index'))} -${h.form(h.url_for(action='urllist'), method='get')} +h.url_for(controller='showformscripts', action='index'))} +${h.form(h.url_for(action='urllist', controller='ddportfolio'), method='get')}
${_('Debian Developer Portfolio')}