[Pypi-checkins] r761 - in trunk/pypi: . templates
tarek.ziade
python-checkins at python.org
Wed Apr 28 19:12:17 CEST 2010
Author: tarek.ziade
Date: Wed Apr 28 19:12:17 2010
New Revision: 761
Modified:
trunk/pypi/config.ini
trunk/pypi/pypi.css
trunk/pypi/templates/standard_template.pt
Log:
fixed the bad merge that was introduced with the PEP 345 merge:. The user box is scrolling again properly
Modified: trunk/pypi/config.ini
==============================================================================
--- trunk/pypi/config.ini (original)
+++ trunk/pypi/config.ini Wed Apr 28 19:12:17 2010
@@ -1,18 +1,19 @@
[database]
name = packages
user = pypi
-files_dir = /tmp/files
-docs_dir = /tmp/docs
+files_dir = /MacDev/svn.python.org/pypi-pep345/files
+docs_dir = /MacDev/svn.python.org/pypi-pep345/docs
[webui]
mailhost = mail.commonground.com.au
adminemail = richard at commonground.com.au
replyto = richard at commonground.com.au
-url = http://localhost/cgi-bin/pypi.cgi
+url = http://localhost:8000
pydotorg = http://www.python.org/
+
simple_script = /simple
files_url = http://localhost/pypi_files
-rss_file = /tmp/pypi_rss.xml
+rss_file = /MacDev/svn.python.org/pypi-pep345/pypi_rss.xml
debug_mode = yes
cheesecake_password = secret
privkey = privkey
Modified: trunk/pypi/pypi.css
==============================================================================
--- trunk/pypi/pypi.css (original)
+++ trunk/pypi/pypi.css Wed Apr 28 19:12:17 2010
@@ -184,4 +184,99 @@
list-style-type: none;
}
-</style>
+
+
+.floating-box {
+float: right;
+}
+
+.homepage-box h4, #document-project-url h4, .externallinks h4
+{
+font-family: Verdana, Geneva, "Bitstream Vera Sans", Helvetica, sans-serif;
+font-size: 88%;
+font-weight: bold;
+padding: 3px 0 4px 12px;
+margin-bottom:8px;
+border-bottom:3px solid #d5ad42;
+background-color: #F4F4F4;
+text-align: left;
+z-index: 0;
+-moz-border-radius-topleft: 16px;
+}
+
+#document-project-url h4, .homepage-box h4, .externallinks h4 {
+-moz-border-radius-topleft:11px;
+background-color:#376A94;
+color:#FFFFFF;
+font-family:Arial,Verdana,Geneva,"Bitstream Vera Sans",Helvetica,sans-serif;
+font-size:94%;
+font-weight:bold;
+margin:0;
+padding:3px 0 4px 12px;
+text-align:left;
+z-index:0;
+}
+
+#document-project-url
+{
+font-family: Verdana, Geneva, "Bitstream Vera Sans", Helvetica, sans-serif;
+font-size: 98%;
+text-align: left;
+color: #3C4B6B;
+background-color: #F7F6F0;
+width: 15em;
+border: 1px solid #B7BECC;
+z-index: 999;
+float:right;
+margin: 0 12px 12px 12px;
+padding-bottom: 10px;
+list-style:none;
+-moz-border-radius-topleft: 12px;
+-moz-border-radius-bottomright: 12px;
+}
+
+#document-project-url ul
+{
+list-style: none;
+display: block;
+border:0;
+padding: 0;
+margin: 0 3em 0 1.1em;
+color: #3C4B6B;
+background: none;
+width: auto;
+font-size: 103%;
+font-family: Verdana, Geneva, "Bitstream Vera Sans", Helvetica, sans-serif;
+}
+
+#document-project-url a:link, #document-project-url a:visited
+{
+color:#3C4B6B;
+text-decoration: none;
+}
+
+#document-project-url a:hover
+{
+color: #000000;
+text-decoration: underline;
+}
+
+#document-project-url h4 a:link, #document-project-url h4 a:visited
+{
+color: #FFFFFF;
+}
+
+
+#document-project-url h4 a:hover
+{
+color: #FFFFFF;
+
+}
+#document-project-url form {
+margin:12px;
+}
+#document-project-url input {
+margin-top:3px;
+}
+
+
Modified: trunk/pypi/templates/standard_template.pt
==============================================================================
--- trunk/pypi/templates/standard_template.pt (original)
+++ trunk/pypi/templates/standard_template.pt Wed Apr 28 19:12:17 2010
@@ -12,7 +12,6 @@
<meta tal:attributes="content data/keywords" />
<meta tal:attributes="content data/description" />
<link rel="stylesheet" tal:attributes="href string:${app/config/pydotorg}css/pypi.css" type="text/css"/>
-
<link rel="alternate" type="application/rss+xml" title="RSS: 30 latest updates" href="http://www.python.org/pypi?:action=rss"/>
<link media="screen" tal:attributes="href string:${app/config/pydotorg}styles/screen-switcher-default.css" type="text/css" id="screen-switcher-stylesheet" rel="stylesheet" />
<link media="screen" tal:attributes="href string:${app/config/pydotorg}styles/netscape4.css" type="text/css" rel="stylesheet" />
@@ -24,100 +23,6 @@
<metal:slot define-slot="head" />
<style type="text/css" rel="stylesheet">
- #document-floating {
- width: 15em;
- }
- .floating-box {
- float: right;
- }
- .homepage-box h4, #document-project-url h4, .externallinks h4
- {
- font-family: Verdana, Geneva, "Bitstream Vera Sans", Helvetica, sans-serif;
- font-size: 88%;
- font-weight: bold;
- padding: 3px 0 4px 12px;
- margin-bottom:8px;
- border-bottom:3px solid #d5ad42;
- background-color: #F4F4F4;
- text-align: left;
- z-index: 0;
- -moz-border-radius-topleft: 16px;
- }
-
- #document-project-url h4, .homepage-box h4, .externallinks h4 {
- -moz-border-radius-topleft:11px;
- background-color:#376A94;
- color:#FFFFFF;
- font-family:Arial,Verdana,Geneva,"Bitstream Vera Sans",Helvetica,sans-serif;
- font-size:94%;
- font-weight:bold;
- margin:0;
- padding:3px 0 4px 12px;
- text-align:left;
- z-index:0;
- }
-
- #document-project-url
- {
- font-family: Verdana, Geneva, "Bitstream Vera Sans", Helvetica, sans-serif;
- font-size: 98%;
- text-align: left;
- color: #3C4B6B;
- background-color: #F7F6F0;
- width: 15em;
- border: 1px solid #B7BECC;
- z-index: 999;
- float:right;
- margin: 0 12px 12px 12px;
- padding-bottom: 10px;
- list-style:none;
- -moz-border-radius-topleft: 12px;
- -moz-border-radius-bottomright: 12px;
- }
-
- #document-project-url ul
- {
- list-style: none;
- display: block;
- border:0;
- padding: 0;
- margin: 0 3em 0 1.1em;
- color: #3C4B6B;
- background: none;
- width: auto;
- font-size: 103%;
- font-family: Verdana, Geneva, "Bitstream Vera Sans", Helvetica, sans-serif;
- }
-
- #document-project-url a:link, #document-project-url a:visited
- {
- color:#3C4B6B;
- text-decoration: none;
- }
-
- #document-project-url a:hover
- {
- color: #000000;
- text-decoration: underline;
- }
-
- #document-project-url h4 a:link, #document-project-url h4 a:visited
- {
- color: #FFFFFF;
- }
-
-
- #document-project-url h4 a:hover
- {
- color: #FFFFFF;
-
- }
- #document-project-url form {
- margin:12px;
- }
- #document-project-url input {
- margin-top:3px;
- }
</style>
</head>
<body>
@@ -203,9 +108,9 @@
</div>
- <div id="document-floating" class="floating-box">
+ <div id="document-floating">
- <div id="document-navigation" class="floating-box">
+ <div id="document-navigation" style="overflow-y: auto; max-height: 15em; overflow-x: hidden;">
<tal:if-not-user condition="not: app/loggedin">
<h4>Not Logged In</h4>
@@ -254,8 +159,10 @@
</tal:if-user>
</div>
+ </div>
+ <tal:block condition="data/project_url | nothing">
+ <div style="clear:both"></div>
- <tal:block condition="data/project_url | nothing">
<div id="document-project-url" class="floating-box">
<h4>Project Links</h4>
<ul>
@@ -268,7 +175,6 @@
</div>
</tal:block>
- </div>
<div class="section">
More information about the Pypi-checkins
mailing list