[Scipy-svn] r4906 - in scipy-docs/trunk/frontpage: . _static _templates

scipy-svn@scip... scipy-svn@scip...
Sat Nov 1 17:32:32 CDT 2008


Author: ptvirtan
Date: 2008-11-01 17:32:06 -0500 (Sat, 01 Nov 2008)
New Revision: 4906

Added:
   scipy-docs/trunk/frontpage/_static/scipy_thumb.png
Removed:
   scipy-docs/trunk/frontpage/_templates/download.html
Modified:
   scipy-docs/trunk/frontpage/
   scipy-docs/trunk/frontpage/_static/scipy.css
   scipy-docs/trunk/frontpage/_templates/indexcontent.html
   scipy-docs/trunk/frontpage/_templates/indexsidebar.html
   scipy-docs/trunk/frontpage/_templates/layout.html
   scipy-docs/trunk/frontpage/conf.py
Log:
scipy-docs/frontpage: update docs.scipy.org frontpage as per Joe's suggestions


Property changes on: scipy-docs/trunk/frontpage
___________________________________________________________________
Name: svn:ignore
   + build


Modified: scipy-docs/trunk/frontpage/_static/scipy.css
===================================================================
--- scipy-docs/trunk/frontpage/_static/scipy.css	2008-11-01 22:30:46 UTC (rev 4905)
+++ scipy-docs/trunk/frontpage/_static/scipy.css	2008-11-01 22:32:06 UTC (rev 4906)
@@ -80,11 +80,14 @@
   background-color: rgb(230,230,230);
 }
 
-div.sphinxsidebar {
-  background-color: rgb(230,230,230);
-  overflow: hidden;
+div.sphinxsidebar ul span.linkdescr {
+  color: black;
 }
 
+div.sphinxsidebar ul li { 
+  margin-bottom: 1em;
+}
+
 div.related {
   background-color: rgb(100,135,220);
 }
@@ -154,3 +157,12 @@
 table.footnote td, table.footnote th {
   border: none;
 }
+
+/**
+ * Logo in the related bar
+ */
+img.related-logo { 
+  border: 0;
+  vertical-align: -18%;
+  margin-right: 0.25em;
+}

Added: scipy-docs/trunk/frontpage/_static/scipy_thumb.png
===================================================================
(Binary files differ)


Property changes on: scipy-docs/trunk/frontpage/_static/scipy_thumb.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Deleted: scipy-docs/trunk/frontpage/_templates/download.html
===================================================================
--- scipy-docs/trunk/frontpage/_templates/download.html	2008-11-01 22:30:46 UTC (rev 4905)
+++ scipy-docs/trunk/frontpage/_templates/download.html	2008-11-01 22:32:06 UTC (rev 4906)
@@ -1,52 +0,0 @@
-{% extends "layout.html" %}
-{% set title = 'Download' %}
-{% block body %}
-
-<h1>Download Scipy and Numpy Documentation</h1>
-
-<p>This documentation on this site is available for download in
-  the following formats:</p>
-
-<table>
-  <tr>
-    <td><a href="numpy/numpy-html.zip">HTML (zip)</a></td>
-    <td>ca. 3 MB</td>
-    <td>Numpy HTML documentation, packaged.</td>
-  </tr>
-  <tr>
-    <td><a href="numpy/numpy-ref.pdf">PDF (Numpy reference)</a></td>
-    <td>ca. 2 MB</td>
-    <td>Numpy reference guide, as PDF.</td>
-  </tr>
-  <tr>
-    <td><a href="numpy/numpy-user.pdf">PDF (Numpy user guide)</a></td>
-    <td>ca. 0.5 MB</td>
-    <td>Numpy's User Guide (work-in-progress) part, as PDF.</td>
-  </tr>
-  <tr>
-    <td><a href="scipy/scipy-html.zip">HTML (zip)</a></td>
-    <td>ca. 3 MB</td>
-    <td>Scipy HTML documentation, packaged.</td>
-  </tr>
-  <tr>
-    <td><a href="scipy/scipy-ref.pdf">PDF (Scipy reference)</a></td>
-    <td>ca. 2 MB</td>
-    <td>Scipy reference guide (work-in-progress), as PDF.</td>
-  </tr>
-</table>
-
-<p>Additionally, you may be interested in</p>
-
-<table>
-  <tr>
-    <td><a href="http://www.tramy.us/">Guide to Numpy</a></td>
-    <td>The original Numpy reference book, by Travis Oliphant.</td>
-  </tr>
-  <tr>
-    <td><a href="http://scipy.org/Documentation">Scipy.org website</a></td>
-    <td>Additional community-contributed documentation, tutorials,
-      examples, etc.</td>
-  </tr>
-</table>
-
-{% endblock %}

Modified: scipy-docs/trunk/frontpage/_templates/indexcontent.html
===================================================================
--- scipy-docs/trunk/frontpage/_templates/indexcontent.html	2008-11-01 22:30:46 UTC (rev 4905)
+++ scipy-docs/trunk/frontpage/_templates/indexcontent.html	2008-11-01 22:32:06 UTC (rev 4906)
@@ -1,42 +1,37 @@
 {% extends "defindex.html" %}
 {% block tables %}
-  <p><strong>Parts of the documentation:</strong></p>
+  <p><strong>Documentation editor:</strong></p>
   <table class="contentstable" align="center"><tr>
     <td width="50%">
-      <p class="biglink"><a class="biglink" href="numpy/reference/">Numpy Reference</a><br/>
-         <span class="linkdescr">reference documentation for Numpy</span></p>
-      <p class="biglink"><a class="biglink" href="http://www.tramy.us/numpybook.pdf">Guide to Numpy</a><br/>
-         <span class="linkdescr">book describing Numpy, by Travis Oliphant</span></p>
-    </td><td width="50%">
-      <p class="biglink"><a class="biglink" href="http://www.scipy.org/Documentation">SciPy.org</a><br/>
-         <span class="linkdescr">more documentation on the scipy.org website</span></p>
+      <p class="biglink"><a class="biglink" href="/numpy/">Write, review and proof the documentation</a><br/>
+        <span class="linkdescr">participate in improving this documentation</span>
+      </p>
     </td></tr>
   </table>
-
-  <p><strong>Work in progress:</strong></p>
+  <p><strong>Mature documentation:</strong></p>
   <table class="contentstable" align="center"><tr>
     <td width="50%">
-      <p class="biglink"><a class="biglink" href="numpy/user/">Numpy User Guide</a><br/>
-         <span class="linkdescr">user guide for Numpy</span></p>
-    </td><td width="50%">
-      <p class="biglink"><a class="biglink" href="scipy/reference/">Scipy Reference Guide</a><br/>
-         <span class="linkdescr">reference documentation for Scipy</span></p>
+      <p class="biglink"><a class="biglink" href="http://www.tramy.us/numpybook.pdf">Guide to Numpy</a><br/>
+         <span class="linkdescr">PDF book by Travis Oliphant</span></p>
     </td></tr>
   </table>
-
-  <p><strong>Participate:</strong></p>
+  <p><strong>Snapshots of work in progress:</strong></p>
   <table class="contentstable" align="center"><tr>
     <td width="50%">
-      <p class="biglink"><a class="biglink" href="http://www.scipy.org/BugReport">Reporting bugs</a><br/>
-         <span class="linkdescr">reporting defects in Numpy and Scipy</span></p>
-      <p class="biglink"><a class="biglink" href="http://www.scipy.org/Developer_Zone">Developer Zone</a><br/>
-         <span class="linkdescr">information about Numpy and Scipy development</span></p>
-    </td><td width="50%">
-      <p class="biglink"><a class="biglink" href="http://docs.scipy.org/numpy/">Numpy Documentation Marathon</a><br/>
-         <span class="linkdescr">improve this documentation</span></p>
+      <p class="biglink"><a class="biglink" href="numpy/reference/">Numpy Reference</a><br/>
+        <span class="linkdescr">reference documentation for Numpy</span>
+	<span><a href="numpy/numpy-html.zip">[HTML+zip]</a>, <a href="numpy/numpy-ref.pdf">[PDF]</a></span>
+      </p>
+      <p class="biglink"><a class="biglink" href="numpy/user/">Numpy User Guide</a><br/>
+        <span class="linkdescr">user guide for Numpy</span>
+	<span><a href="numpy/numpy-user.pdf">[PDF]</a></span>
+      </p>
+      <p class="biglink"><a class="biglink" href="scipy/reference/">Scipy Reference Guide</a><br/>
+        <span class="linkdescr">reference documentation for Scipy</span>
+	<span><a href="scipy/scipy-html.zip">[HTML+zip]</a>, <a href="numpy/scipy-ref.pdf">[PDF]</a></span>
+      </p>
     </td></tr>
   </table>
-
 {% endblock %}
 
 {% block sidebarsearch %}

Modified: scipy-docs/trunk/frontpage/_templates/indexsidebar.html
===================================================================
--- scipy-docs/trunk/frontpage/_templates/indexsidebar.html	2008-11-01 22:30:46 UTC (rev 4905)
+++ scipy-docs/trunk/frontpage/_templates/indexsidebar.html	2008-11-01 22:32:06 UTC (rev 4906)
@@ -1,12 +1,13 @@
-            <h3>Download</h3>
-            <ul>
-              <li><a href="{{ pathto('download') }}">Download these documents</a></li>
-            </ul>
-
-            <h3>Resources</h3>
-            <ul>
-              <li><a href="http://scipy.org/">Scipy.org website</a></li>
-              <li>&nbsp;</li>
-              <li><a href="numpy/glossary.html">Glossary</a></li>
-              <li>&nbsp;</li>
-            </ul>
+  <h3>See also:</h3>
+  <ul>
+    <li><a class="biglink" href="http://www.scipy.org/">SciPy.org</a><br/>
+      <span class="linkdescr">all things NumPy/SciPy (bug reports, downloads, conferences, etc.)</span>
+    </li>
+    <li><a class="biglink" href="http://www.scipy.org/Documentation">Additional documentation</a><br/>
+      <span class="linkdescr">documentation not yet integrated with this site</span>
+    </li>
+    <li><a class="biglink" href="http://www.scipy.org/Cookbook">Cookbook</a><br/>
+      <span class="linkdescr">user-contributed examples and recipes for common tasks</span>
+    </li>
+  </ul>
+  

Modified: scipy-docs/trunk/frontpage/_templates/layout.html
===================================================================
--- scipy-docs/trunk/frontpage/_templates/layout.html	2008-11-01 22:30:46 UTC (rev 4905)
+++ scipy-docs/trunk/frontpage/_templates/layout.html	2008-11-01 22:32:06 UTC (rev 4906)
@@ -1,4 +1,14 @@
 {% extends "!layout.html" %}
+
 {% block rootrellink %}
+<li><a href="http://www.scipy.org"><img class="related-logo" src="_static/scipy_thumb.png"/>SciPy.org</a>{{ reldelim1 }}</li>
 <li><a href="{{ pathto('index') }}">{{ shorttitle }}</a>{{ reldelim1 }}</li>
 {% endblock %}
+
+{%- block sidebarlogo %}
+{%- if logo %}
+<p class="logo"><a href="/">
+    <img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/>
+</a></p>
+{%- endif %}
+{%- endblock %}

Modified: scipy-docs/trunk/frontpage/conf.py
===================================================================
--- scipy-docs/trunk/frontpage/conf.py	2008-11-01 22:30:46 UTC (rev 4905)
+++ scipy-docs/trunk/frontpage/conf.py	2008-11-01 22:32:06 UTC (rev 4906)
@@ -65,7 +65,7 @@
 
 # List of directories, relative to source directory, that shouldn't be searched
 # for source files.
-exclude_trees = ['_build']
+exclude_trees = ['build']
 
 # The reST default role (used for this markup: `text`) to use for all documents.
 #default_role = None
@@ -131,7 +131,6 @@
 # template names.
 html_additional_pages = {
     'index': 'indexcontent.html',
-    'download': 'download.html',
 }
 
 # If false, no module index is generated.



More information about the Scipy-svn mailing list