From: Yaroslav Halchenko <debian@onerussian.com>
Date: Tue, 15 Oct 2013 19:57:47 +0000 (-0400)
Subject: Adding logos of CCN (no link) and Magdeburg (link to psychoinformatics lab of Michael... 
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=55e3c25c2e80684000caa82f2a1c74f6f07ccd51;p=neurodebian.git

Adding logos of CCN (no link) and Magdeburg (link to psychoinformatics lab of Michael) to the top right

logos are not downscaled before uploading... thought they are small enough in size
---

diff --git a/Makefile b/Makefile
index 33f54ba..256bdfc 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ pics:
 
 html: pics source
 	rsync -rvlhpt sphinx/ build/src
-	cd artwork;	cp button_w200.png logo_tuned/fmri_w200.png ../build/src/_static; cd ..
+	cd artwork;	cp button_w200.png logo_tuned/fmri_w200.png uni-md-logo.png ccn-logo.png ../build/src/_static; cd ..
 	cp 3rd/jquery.livetwitter/jquery.livetwitter.min.js build/src/_static
 	cp neurodebian.cfg build/src/_static
 	cd build/src && $(MAKE) html BUILDDIR=$(CURDIR)/build 2>&1
diff --git a/artwork/ccn-logo.png b/artwork/ccn-logo.png
new file mode 100644
index 0000000..9289bd0
Binary files /dev/null and b/artwork/ccn-logo.png differ
diff --git a/artwork/uni-md-logo.png b/artwork/uni-md-logo.png
new file mode 100644
index 0000000..b5f9058
Binary files /dev/null and b/artwork/uni-md-logo.png differ
diff --git a/sphinx/_static/neurodebian.css b/sphinx/_static/neurodebian.css
index b0c0ebc..c389434 100644
--- a/sphinx/_static/neurodebian.css
+++ b/sphinx/_static/neurodebian.css
@@ -831,11 +831,18 @@ div.buttonbar ul {
 
 div.buttonbar li {
     display: inline;
-    float: left;
     margin: 5px;
     text-align: center;
 }
 
+div.buttonbar.leftbar li {
+    float: left;
+}
+
+div.buttonbar.rightbar li {
+    float: right;
+}
+
 div#randomquote {
 }
 
diff --git a/sphinx/_templates/layout.html b/sphinx/_templates/layout.html
index df859a9..2b63bda 100644
--- a/sphinx/_templates/layout.html
+++ b/sphinx/_templates/layout.html
@@ -13,7 +13,7 @@
 {% endblock %}
 
 {% block header %}
-  <div class="buttonbar">
+  <div class="buttonbar leftbar">
   <ul>
   <li><a href="http://www.debian.org" target="_blank"><img border="0" src="/_static/debian.png" title="Visit debian.org" /><br />Debian</a></li>
  <li><a href="{{ pathto('index') }}"><img border="0" src="/_static/neurodebian.png" title="Go to the home page" /><br />Home</a></li>
@@ -26,7 +26,13 @@
  <li><a href="{{ pathto('faq') }}"><img border="0" src="/_static/faq.png" title="Frequently asked questions" /><br />FAQ</a></li>
   </ul>
   </div>
-  <div class="clearer"></div>
+
+  <div class="buttonbar rightbar">
+  <ul>
+  <li><a href="http://www.ipsy.ovgu.de/psychoinformatics.html" target="_blank"><img border="0" src="/_static/uni-md-logo.png" title="Psychoinformatics lab, University of Magdeburg, Germany" height="50" /></a></li>
+  <li><img border="0" src="/_static/ccn-logo.png" title="Center for Cognitive Neuroscience, Dartmouth College, USA" height="50" /></li>
+  </ul>
+  </div>
 {% endblock %}
 
 {% block rootrellink %}{% endblock %}