[Scipy-svn] r6198 - in scipy.org/conference: . _theme/scipy

[scipy-svn at scipy.org]

Author: jarrod.millman
Date: 2010-01-14 22:41:04 -0600 (Thu, 14 Jan 2010)
New Revision: 6198

Modified:
   scipy.org/conference/_theme/scipy/layout.html
   scipy.org/conference/_theme/scipy/sitenav.html
   scipy.org/conference/index.rst
Log:
finish prototype for main conference site


Modified: scipy.org/conference/_theme/scipy/layout.html
===================================================================
--- scipy.org/conference/_theme/scipy/layout.html	2010-01-14 09:30:10 UTC (rev 6197)
+++ scipy.org/conference/_theme/scipy/layout.html	2010-01-15 04:41:04 UTC (rev 6198)
@@ -9,23 +9,11 @@
 <div class="top-logo-header">
 <a href="{{ pathto('index') }}"><img src="{{ pathto("_static/logo.gif", 1) }}" border="0" alt="SciPy Website"/></a>
 </div>
-{{ super() }}
 {% endblock %}
+{% block relbar2 %}{% endblock %}
 
 {# put the sidebar before the body #}
 {% block sidebar1 %}{{ sidebar() }}{% endblock %}
 {% block sidebar2 %}{% endblock %}
 
-
-{%- block sidebarsearch %}
-<div id="searchbox" style="display: none">
-    <h3>{{ _('Search') }}</h3>
-<form class="search" action="http://www.google.com/search" method="get">
-    <!-- we'll use google at least until we get everything in sphinx -->
-    <input type="text" name="q" size="18" />
-    <input type="submit" value="{{ _('Go') }}" />
-    <input type="hidden" name="as_sitesearch" value="scipy.org">
-  </form>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
-{%- endblock %}
+{% block sidebarsearch %}{% endblock %}

Modified: scipy.org/conference/_theme/scipy/sitenav.html
===================================================================
--- scipy.org/conference/_theme/scipy/sitenav.html	2010-01-14 09:30:10 UTC (rev 6197)
+++ scipy.org/conference/_theme/scipy/sitenav.html	2010-01-15 04:41:04 UTC (rev 6198)
@@ -2,16 +2,8 @@
 <h3>Site Navigation</h3>
 
 <ul>
-<li><a href="http://scipynews.blogspot.com">News</a></li>
-<li><a href="http://planet.scipy.org">Blogs</a></li>
-<li><a href="http://conference.scipy.org">Conference</a></li>
-<li><a href="{{ pathto('download') }}">Download</a></li>
-<li><a href="http://www.scipy.org/Cookbook">Cookbook</a></li>
-<li><a href="http://docs.scipy.org">Documentation</a></li>
-<li><a href="{{ pathto('mailing-lists') }}">Mailing Lists</a></li>
-<li><a href="http://www.scipy.org/Topical_Software">Topical Software</a></li>
-<li><a href="{{ pathto('dev-zone') }}">Developer Zone</a></li>
+<li><a href={{ pathto('past') }}>Past Conferences</a></li>
+<li><a href={{ pathto('proceedings') }}>Proceedings</a></li>
 </ul>
 
 {% endblock %}
-

Modified: scipy.org/conference/index.rst
===================================================================
--- scipy.org/conference/index.rst	2010-01-14 09:30:10 UTC (rev 6197)
+++ scipy.org/conference/index.rst	2010-01-15 04:41:04 UTC (rev 6198)
@@ -1,20 +1,21 @@
-.. Conference Site documentation master file, created by
-   sphinx-quickstart on Wed Jan 13 20:27:11 2010.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
+Upcoming SciPy Conferences!
+===========================
 
-Welcome to Conference Site's documentation!
-===========================================
 
-Contents:
+`SciPy 2010 <http://conference.scipy.org/scipy2010>`_
 
-.. toctree::
-   :maxdepth: 2
+9th annual Python in Science conference
 
-Indices and tables
-==================
+Austin, TX, June XX - July 3 2010
 
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
 
+`EuroScipy 2010 <http://www.euroscipy.org/>`_
+
+3rd European meeting on Python in Science
+
+Paris, Ecole Normale Supérieure, July 8-11 2010
+
+
+`SciPy.in 2010 <http://scipy.in>`_
+
+To be announced