Merge branch 'master' of ssh://alioth.debian.org/git/pkg-exppsy/neurodebian

* 'master' of ssh://alioth.debian.org/git/pkg-exppsy/neurodebian:
  Added relbar link to comments on every page
  Added publications.
  More cross-refs and condense frontpage header.
  New quote.

diff --git a/sphinx/_templates/layout.html b/sphinx/_templates/layout.html
index 2c758c94080124056ae6ab6f1b9068e4c725746d..98406af6902966acec550a9ae342929b429a4269 100644 (file)
--- a/sphinx/_templates/layout.html
+++ b/sphinx/_templates/layout.html
@@ -13,6 +13,10 @@
   <li><a href="{{ pathto('testimonials') }}">Testimonials</a> &nbsp;</li>
 {% endblock %}
 
+{% block relbaritems %}
+<li class="right"><a href="#disqus_thread">Comments</a>&nbsp;|</li>
+{% endblock %}
+
 {% block sidebar1 %}{% endblock %}
 
 {% block sidebar2 %}

diff --git a/sphinx/_templates/page.html b/sphinx/_templates/page.html
index 9add6e2828e3d95b36abfc16e5d940a1165ff3c6..967a0a2f13ffdc1f647933ce7f43d95cc4a34259 100644 (file)
--- a/sphinx/_templates/page.html
+++ b/sphinx/_templates/page.html
@@ -19,4 +19,13 @@
 </script>
 <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript=neurodebian">comments powered by Disqus.</a></noscript>
 <a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
+
+<script type="text/javascript">
+var disqus_shortname = 'neurodebian';
+(function () {
+  var s = document.createElement('script'); s.async = true;
+  s.src = 'http://disqus.com/forums/neurodebian/count.js';
+  (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+}());
+</script>
 {% endblock %}

diff --git a/sphinx/index.rst b/sphinx/index.rst
index 9c1b564e5767ecdc64a6623ef1fd3a398b57a47b..a86de236290e37313d8e910d052e6ae9d76b3cf6 100644 (file)
--- a/sphinx/index.rst
+++ b/sphinx/index.rst
@@ -12,13 +12,15 @@ Debian_ systems (or Debian-derivatives like Ubuntu_). It contains both unofficia
 or prospective packages which are not (yet) available from the main Debian_
 archive, as well as backported or simply rebuilt packages also available
 elsewhere. Please see the :ref:`faq` for more information about the goals of
-this project.
+this project, and :ref:`read what people say about it <testimonials>`.
+If you appreciate this service, please |spread|.
 
-This service is provided "as is". There is no guarantee that a package
-works as expected, so use them at your own risk. If you encounter problems,
-please `report <#contacts>`_ them.
+.. note::
+
+  This service is provided "as is". There is no guarantee that a package
+  works as expected, so use them at your own risk. If you encounter problems,
+  please `report <#contacts>`_ them.
 
-Please |spread|, if you like it.
 
 .. raw:: html
 
@@ -219,6 +221,28 @@ We are grateful to Jim Haxby for his continued support and :ref:`endless supply
 Italian espresso <coffeeart>`.
 
 
+Publications
+============
+
+Halchenko, Y. O., Hanke, M., Haxby, J. V., Pollmann, S. & Raizada, R. D.
+(2010). Having trouble getting your Nature paper? Maybe you are not using the
+right tools? *Poster to be presented at the anual meeting of the Society for
+Neuroscience*, San Diego, USA.
+
+Hanke, M., Halchenko, Y. O. (2010). `Debian: The ultimate platform for
+neuroimaging research <_files/HankeHalchenko_NeuroDebianDebConf10.pdf>`_.
+*Talk given at* DebConf10_, New York City, USA. [video:
+`low resolution <http://meetings-archive.debian.net/pub/debian-meetings/2010/debconf10/low/1310_1310_Debian_The_ultimate_platform_for_neuroimaging_research.ogv>`_,
+`high resolution <http://meetings-archive.debian.net/pub/debian-meetings/2010/debconf10/high/1310_1310_Debian_The_ultimate_platform_for_neuroimaging_research.ogv>`_]
+
+Hanke, M., Halchenko, Y. O., Haxby, J. V. & Pollmann, S. (2010). `Improving
+efficiency in cognitive neuroscience research with NeuroDebian
+<_files/NeuroDebian_CNS2010.pdf>`_. *Poster presented at the annual
+meeting of the Cognitive Neuroscience Society*, Montréal, Canada.
+
+.. _DebConf10: http://debconf10.debconf.org/
+
+
 .. toctree::
    :hidden:
 

diff --git a/sphinx/testimonials.rst b/sphinx/testimonials.rst
index df70ba2b17e299c9adf70109786bca764e3620aa..ba6fc32eb916e2b9f2050fb7187cd1919e3b2b50 100644 (file)
--- a/sphinx/testimonials.rst
+++ b/sphinx/testimonials.rst
@@ -1,3 +1,5 @@
+.. _testimonials:
+
 Testimonials
 ============
 
@@ -33,3 +35,12 @@ Individual Laboratories and Researchers
 .. quotes::
    :group: Individual laboratories and researchers
 
+
+.. quote::
+   :author: Prof. Petr Hlustik
+   :affiliation: Departments of Neurology and Radiology, Palacky University School of Medicine and University Hospital, Olomouc, Czech Republic
+   :date: 2010-10-11
+   :tags: breadth
+
+   [...] those wonderful tools in Debian Neuro [...] make my life as a
+   researcher who also maintains a bunch of Debian boxes so much easier.