diff --git a/ddportfolioservice/templates/base.mako b/ddportfolioservice/templates/base.mako index 3b23a73..1e2dd8b 100644 --- a/ddportfolioservice/templates/base.mako +++ b/ddportfolioservice/templates/base.mako @@ -3,23 +3,22 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <%doc> Base template for XHTML templates. -Copyright © 2009, 2010 Jan Dittberner +Copyright © 2009-2014 Jan Dittberner -This file is part of DDPortfolio service. +This file is part of the Debian Member Portfolio service. -DDPortfolio service is free software: you can redistribute it and/or -modify it under the terms of the GNU Affero General Public License as -published by the Free Software Foundation, either version 3 of the -License, or (at your option) any later version. +Debian Member Portfolio service is free software: you can redistribute it +and/or modify it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -DDPortfolio service is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Affero General Public License for more details. +Debian Member Portfolio service is distributed in the hope that it will be +useful, but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero +General Public License for more details. -You should have received a copy of the GNU Affero General Public -License along with this program. If not, see -. +You should have received a copy of the GNU Affero General Public License along +with this program. If not, see . @@ -42,10 +41,10 @@ License along with this program. If not, see ${h.image(h.url('/images/agplv3-88x31.png'), _('AGPL - Free Software'), 88, 31, id='agpllogo')}

${h.literal(_('''The service is available under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. You can browse the source code or clone it from %(cloneurl)s using git. If you want to translate this service to your language you can contribute at Transifex.''') % dict((('browseurl', 'http://debianstuff.dittberner.info/gitweb.cgi?p=ddportfolioservice.git;a=summary'), ('cloneurl', 'http://debianstuff.dittberner.info/git/ddportfolioservice.git'), ('transifexurl', 'https://www.transifex.com/projects/p/debportfolioservice/'))))}

-

${_(u'''Copyright © 2009, 2010, 2011, 2012 Jan Dittberner''')}

+

${_(u'''Copyright © 2009-2014 Jan Dittberner''')}

diff --git a/ddportfolioservice/templates/showform.mako b/ddportfolioservice/templates/showform.mako index 6ee353a..6485e49 100644 --- a/ddportfolioservice/templates/showform.mako +++ b/ddportfolioservice/templates/showform.mako @@ -2,23 +2,23 @@ <%inherit file="base.mako" /> <%doc> Template for the data input form. -Copyright © 2009, 2010 Jan Dittberner -This file is part of DDPortfolio service. +Copyright © 2009-2014 Jan Dittberner -DDPortfolio service is free software: you can redistribute it and/or -modify it under the terms of the GNU Affero General Public License as -published by the Free Software Foundation, either version 3 of the -License, or (at your option) any later version. +This file is part of the Debian Member Portfolio service. -DDPortfolio service is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Affero General Public License for more details. +Debian Member Portfolio service is free software: you can redistribute it +and/or modify it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -You should have received a copy of the GNU Affero General Public -License along with this program. If not, see -. +Debian Member Portfolio service is distributed in the hope that it will be +useful, but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero +General Public License for more details. + +You should have received a copy of the GNU Affero General Public License along +with this program. If not, see . <%def name="titleaddon()"> - ${_('Enter your personal information')} @@ -40,7 +40,7 @@ ${h.form(h.url(action='urllist', controller='ddportfolio'), method='get')} % endif
${h.text('email', - h.escape(request.params.get('email', None), True), id='email')}
+ h.escape(request.params.get('email', None)), id='email')}