From python-checkins at python.org  Wed Mar  2 22:54:37 2011
From: python-checkins at python.org (martin.von.loewis)
Date: Wed,  2 Mar 2011 22:54:37 +0100 (CET)
Subject: [Pypi-checkins] r893 - trunk/pypi/templates
Message-ID: <20110302215437.03C73EE988@mail.python.org>

Author: martin.von.loewis
Date: Wed Mar  2 22:54:36 2011
New Revision: 893

Modified:
   trunk/pypi/templates/standard_template.pt
Log:
Follow python.org in pollenation link.


Modified: trunk/pypi/templates/standard_template.pt
==============================================================================
--- trunk/pypi/templates/standard_template.pt	(original)
+++ trunk/pypi/templates/standard_template.pt	Wed Mar  2 22:54:36 2011
@@ -199,7 +199,7 @@
           <div id="footer"><div id="credits">
             <a href="http://www.python.org/about/website">Website maintained by the Python community</a><br />
             <a href="http://www.xs4all.com/" title="Web and email hosting provided by xs4all, Netherlands">hosting by xs4all</a> /
-            <a href="http://www.pollenation.net/" title="Design and content management system by Pollenation Internet, Yorkshire">design by pollenation</a>
+            <a href="http://www.timparkin.co.uk/" title="Design by Tim Parkin, Yorkshire man, photographer and developer">design by Tim Parkin</a>
           </div>
           Copyright ? 1990-2011, <a href="http://www.python.org/psf">Python Software Foundation</a><br />
           <a href="http://www.python.org/about/legal">Legal Statements</a>

From python-checkins at python.org  Mon Mar  7 23:13:05 2011
From: python-checkins at python.org (martin.von.loewis)
Date: Mon,  7 Mar 2011 23:13:05 +0100 (CET)
Subject: [Pypi-checkins] r894 - trunk/pypi/templates
Message-ID: <20110307221305.70D17EE985@mail.python.org>

Author: martin.von.loewis
Date: Mon Mar  7 23:13:05 2011
New Revision: 894

Modified:
   trunk/pypi/templates/standard_template.pt
Log:
Make python-3.png link relative to support https better.


Modified: trunk/pypi/templates/standard_template.pt
==============================================================================
--- trunk/pypi/templates/standard_template.pt	(original)
+++ trunk/pypi/templates/standard_template.pt	Mon Mar  7 23:13:05 2011
@@ -30,7 +30,7 @@
       <h1 id="logoheader">
        <a accesskey="1" href="http://www.python.org" id="logolink">
         <tal:x condition="python:data.get('is_py3k')">
-          <img src="http://pypi.python.org/python-3.png" alt="homepage" border="0" id="logo" />
+          <img src="/python-3.png" alt="homepage" border="0" id="logo" />
         </tal:x>
         <tal:x condition="python:not data.get('is_py3k')">
           <img tal:attributes="src string:${app/config/pydotorg}images/python-logo.gif" alt="homepage" border="0" id="logo" />

From python-checkins at python.org  Fri Mar 11 10:03:46 2011
From: python-checkins at python.org (martin.von.loewis)
Date: Fri, 11 Mar 2011 10:03:46 +0100 (CET)
Subject: [Pypi-checkins] r895 - trunk/pypi/templates
Message-ID: <20110311090346.D4524D8A3@mail.python.org>

Author: martin.von.loewis
Date: Fri Mar 11 10:03:44 2011
New Revision: 895

Modified:
   trunk/pypi/templates/display.pt
Log:
Add documentation link into the top of the page.


Modified: trunk/pypi/templates/display.pt
==============================================================================
--- trunk/pypi/templates/display.pt	(original)
+++ trunk/pypi/templates/display.pt	Fri Mar 11 10:03:44 2011
@@ -21,8 +21,13 @@
 <metal:fill fill-slot="body">
 <p style="font-style: italic" tal:content="data/release/summary | nothing" />
 
-<p tal:condition="python:len(data['release'].get('description', ''))>500 and data['files']">
-    <a href="#downloads">Downloads &darr;</a>
+<p tal:define="
+  cond1 python:len(data['release'].get('description',''))>500 and data['files'];
+  cond2 data/docs | nothing"
+  tal:condition="python:cond1 or cond2">
+ <a tal:condition="cond1" href="#downloads">Downloads &darr;</a>
+   <tal:block tal:condition="python:cond1 and cond2"> | </tal:block>
+   <a tal:condition="cond2" tal:attributes="href data/docs">Package Documentation</a>
 </p>
 
 <p tal:condition="not:data/usinglatest">

From python-checkins at python.org  Wed Mar 16 13:22:26 2011
From: python-checkins at python.org (martin.von.loewis)
Date: Wed, 16 Mar 2011 13:22:26 +0100 (CET)
Subject: [Pypi-checkins] r896 - trunk/pypi
Message-ID: <20110316122226.54BE1EE984@mail.python.org>

Author: martin.von.loewis
Date: Wed Mar 16 13:22:26 2011
New Revision: 896

Modified:
   trunk/pypi/standalone.py
Log:
Ignore authorization headers if we have a ssh user.


Modified: trunk/pypi/standalone.py
==============================================================================
--- trunk/pypi/standalone.py	(original)
+++ trunk/pypi/standalone.py	Wed Mar 16 13:22:26 2011
@@ -42,15 +42,18 @@
         if host != self.client_address[0]:
             env['REMOTE_HOST'] = host
         env['REMOTE_ADDR'] = self.client_address[0]
-        authorization = self.headers.getheader("authorization")
+        if self.ssh_user:
+            # ignore authorization headers if this is a SSH client
+            authorization = None
+            env['SSH_USER'] = self.ssh_user
+        else:
+            authorization = self.headers.getheader("authorization")
         if authorization:
             env['HTTP_CGI_AUTHORIZATION'] = authorization
             authorization = authorization.split()
             if len(authorization) == 2:
                 import base64, binascii
                 env['AUTH_TYPE'] = authorization[0]
-        if self.ssh_user:
-            env['SSH_USER'] = self.ssh_user
         if self.headers.typeheader is None:
             env['CONTENT_TYPE'] = self.headers.type
         else:

From python-checkins at python.org  Sun Mar 27 20:36:05 2011
From: python-checkins at python.org (martin.von.loewis)
Date: Sun, 27 Mar 2011 20:36:05 +0200 (CEST)
Subject: [Pypi-checkins] r897 - trunk/pypi/templates
Message-ID: <3PyRs11sq7z7LlV@mail.python.org>

Author: martin.von.loewis
Date: Sun Mar 27 20:36:04 2011
New Revision: 897

Modified:
   trunk/pypi/templates/mirrors.pt
   trunk/pypi/templates/register.pt
   trunk/pypi/templates/standard_template.pt
Log:
Patches from anatoly techtonik: fix typos and markup glitches.


Modified: trunk/pypi/templates/mirrors.pt
==============================================================================
--- trunk/pypi/templates/mirrors.pt	(original)
+++ trunk/pypi/templates/mirrors.pt	Sun Mar 27 20:36:04 2011
@@ -5,9 +5,9 @@
       metal:use-macro="standard_template/macros/page">
       <metal:fill fill-slot="body">
 
- <p>The PyPI repository provides alternative locations that stores the packages.
+ <p>The PyPI repository provides alternative locations that store the packages.
  This service is primarily intended to be used by automated download tools
- (such as setuptools or pip); ask your tool vendor to make use of this infratructure.
+ (such as setuptools or pip); ask your tool vendor to make use of this infrastructure.
  </p>
  <p>You can also manually point these tools to mirrors, or use them in the
  web browser, by using one of these host names instead of pypi.python.org:</p>

Modified: trunk/pypi/templates/register.pt
==============================================================================
--- trunk/pypi/templates/register.pt	(original)
+++ trunk/pypi/templates/register.pt	Sun Mar 27 20:36:04 2011
@@ -93,7 +93,7 @@
     <p tal:condition="not:data/new_user">Claim OpenID, either from one of these providers:
      <tal:block tal:repeat="prov data/providers">
       <a tal:attributes="href prov/claim">
-       <img tal:attributes="src prov/favicon; title prov/title"/>
+       <img tal:attributes="src prov/favicon; title prov/title; alt prov/title"/>
       </a>
      </tal:block>
     or enter your ID explicitly:

Modified: trunk/pypi/templates/standard_template.pt
==============================================================================
--- trunk/pypi/templates/standard_template.pt	(original)
+++ trunk/pypi/templates/standard_template.pt	Sun Mar 27 20:36:04 2011
@@ -22,7 +22,7 @@
 
        <metal:slot define-slot="head" />
 
-       <style type="text/css" rel="stylesheet">
+       <style type="text/css">
        </style>
     </head>
     <body>
@@ -129,7 +129,7 @@
 		    <li>Use <a tal:attributes="href string:${app/url_path}?:action=openid">OpenID</a>
                       <tal:block tal:repeat="prov data/providers">
 			<a tal:attributes="href prov/login">
-                       <img tal:attributes="src prov/favicon; title prov/title"/>
+                       <img tal:attributes="src prov/favicon; title prov/title; alt prov/title"/>
 			</a>
                       </tal:block>
                     </li>