Merge branch 'release/0.2.14'

ddportfolioservice/templates/base.mako

@@ -33,11 +33,7 @@ License along with this program.  If not, see
       id='debianlogo')}
       <h1>${_('Debian Member 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 Member's or package maintainer's information regarding Debian.'''))}</p>
-      <p><script type="text/javascript">
+      <p><a class="FlattrButton" style="display:none" title="Debian Member Portfolio Service" href="${request.scheme}://portfolio.debian.net/">Debian Member Portfolio Service</a></p>
-	var flattr_url = '${request.scheme}://portfolio.debian.net/';
-	var flattr_btn='compact';
-</script>
-<script src="${request.scheme}://api.flattr.com/button/load.js" type="text/javascript"></script></p>
     </div>
     <div id="content">
       ${self.body()}
@@ -48,6 +44,10 @@ License along with this program.  If not, see
       <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="%(browseurl)s" title="Gitweb repository browser URL">browse the source code</a> or clone it from <a href="%(cloneurl)s" title="git clone URL">%(cloneurl)s</a> using <a href="http://git-scm.com/">git</a>. If you want to translate this service to your language you can contribute at <a href="%(transifexurl)s" title="Debian Member Portfolio Service at Transifex">Transifex</a>.''') % 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/'))))}</p>
       <p>${_(u'''Copyright © 2009, 2010, 2011, 2012 Jan Dittberner''')}</p>
     </div>
+    <script type="text/javascript">
+	  var flattr_url = '${request.scheme}://portfolio.debian.net/';
+    </script>
+    <script src="${request.scheme}://api.flattr.com/js/0.6/load.js?mode=auto&amp;button=compact" type="text/javascript"></script>
   </body>
 </html>
 <%def name="extrahead()"></%def>

setup.py

@@ -29,7 +29,7 @@ except ImportError:
 
 setup(
     name='ddportfolioservice',
-    version='0.2.13',
+    version='0.2.14',
     description='service to create DDPortfolio URLs',
     long_description="""This is a service implementation that
 returns a set of personalized URLs as outlined in