use url instead of url_for

This commit is contained in:
Jan Dittberner 2010-05-03 20:26:07 +02:00
parent f5f5e366ea
commit f5363a360c
5 changed files with 8 additions and 8 deletions

View file

@ -30,4 +30,4 @@ from webhelpers.html.tags import stylesheet_link, javascript_link, image, \
form, text, radio, submit, end_form, link_to form, text, radio, submit, end_form, link_to
from webhelpers.text import truncate from webhelpers.text import truncate
from webhelpers.textile import textile from webhelpers.textile import textile
from routes import url_for from pylons import url

View file

@ -24,12 +24,12 @@ License along with this program. If not, see
<html> <html>
<head> <head>
<title>${_('Debian Developer Portfolio Service')}${self.titleaddon()}</title> <title>${_('Debian Developer Portfolio Service')}${self.titleaddon()}</title>
${h.stylesheet_link(h.url_for('/stylesheets/style.css'))} ${h.stylesheet_link(h.url('/stylesheets/style.css'))}
${self.extrahead()} ${self.extrahead()}
</head> </head>
<body> <body>
<div id="header"> <div id="header">
${h.image(h.url_for('/images/openlogo-100.jpg'), _('Debian Logo'), 100, 100, ${h.image(h.url('/images/openlogo-100.jpg'), _('Debian Logo'), 100, 100,
id='debianlogo')} id='debianlogo')}
<h1>${_('Debian Developer Portfolio Service')}</h1> <h1>${_('Debian Developer Portfolio Service')}</h1>
<p>${h.literal(_('''This service has been inspired by Stefano Zacchiroli's <a href="http://wiki.debian.org/DDPortfolio">DDPortfolio page in the Debian Wiki</a>. You can create a set of customized links leading to a Debian Developer's or package maintainer's information regarding Debian.'''))}</p> <p>${h.literal(_('''This service has been inspired by Stefano Zacchiroli's <a href="http://wiki.debian.org/DDPortfolio">DDPortfolio page in the Debian Wiki</a>. You can create a set of customized links leading to a Debian Developer's or package maintainer's information regarding Debian.'''))}</p>
@ -38,7 +38,7 @@ License along with this program. If not, see
${self.body()} ${self.body()}
</div> </div>
<div id="footer"> <div id="footer">
${h.image(h.url_for('/images/agplv3-88x31.png'), _('AGPL - Free Software'), 88, 31, ${h.image(h.url('/images/agplv3-88x31.png'), _('AGPL - Free Software'), 88, 31,
id='agpllogo')} id='agpllogo')}
<p>${h.literal(_('''The service is available under the terms of the <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public License</a> as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. You can <a href="%s">download the source code</a> using <a href="http://git-scm.com/">git</a>.''') % ('http://ddportfolio.debian.net/gitweb?p?ddportfolioservice.git;a=summary'))}</p> <p>${h.literal(_('''The service is available under the terms of the <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public License</a> as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. You can <a href="%s">download the source code</a> using <a href="http://git-scm.com/">git</a>.''') % ('http://ddportfolio.debian.net/gitweb?p?ddportfolioservice.git;a=summary'))}</p>
<p>${_(u'''Copyright © 2009, 2010 Jan Dittberner''')}</p> <p>${_(u'''Copyright © 2009, 2010 Jan Dittberner''')}</p>

View file

@ -24,8 +24,8 @@ License along with this program. If not, see
- ${_('Enter your personal information')} - ${_('Enter your personal information')}
</%def> </%def>
<%def name="extrahead()">${h.javascript_link('/javascript/jquery/jquery.js', <%def name="extrahead()">${h.javascript_link('/javascript/jquery/jquery.js',
h.url_for(controller='showformscripts', action='index'))}</%def> h.url(controller='showformscripts', action='index'))}</%def>
${h.form(h.url_for(action='urllist', controller='ddportfolio'), method='get')} ${h.form(h.url(action='urllist', controller='ddportfolio'), method='get')}
<fieldset id="ddportfolio"> <fieldset id="ddportfolio">
<legend>${_('Debian Developer Portfolio')}</legend> <legend>${_('Debian Developer Portfolio')}</legend>
<div id="emailfield" \ <div id="emailfield" \

View file

@ -53,7 +53,7 @@ function updateFields(data, textStatus) {
function onBlurEmail() { function onBlurEmail() {
$.ajax({ $.ajax({
'url' : '${h.url_for(controller="showformscripts", action="fetchdddata")}', 'url' : '${h.url(controller="showformscripts", action="fetchdddata")}',
'data' : {'email' : $('#email').attr('value')}, 'data' : {'email' : $('#email').attr('value')},
'dataType' : 'json', 'dataType' : 'json',
'success' : updateFields, 'success' : updateFields,

View file

@ -59,4 +59,4 @@ License along with this program. If not, see
</table> </table>
</fieldset> </fieldset>
% endif % endif
<p>${h.link_to(_('Restart'), h.url_for(controller='ddportfolio', action='index'))}</p> <p>${h.link_to(_('Restart'), h.url(controller='ddportfolio', action='index'))}</p>