added LP 2017 banner to top of base gmg template

diff --git a/mediagoblin_libreplanet/__init__.py b/mediagoblin_libreplanet/__init__.py
index 7f047ca1380628e2ed4ea5d322953c72540ca50a..1914caa406a8d4370427c42c62a7eecc79ef33f7 100644 (file)
--- a/mediagoblin_libreplanet/__init__.py
+++ b/mediagoblin_libreplanet/__init__.py
@@ -111,6 +111,7 @@ hooks = {
 }
 
 register_template_hooks(
-    {'header_extra': "libreplanet/join.html"}
+    {'header_left':  "libreplanet/banner.html",
+     'header_extra': "libreplanet/join.html"}
 )
 

diff --git a/mediagoblin_libreplanet/templates/libreplanet/banner.html b/mediagoblin_libreplanet/templates/libreplanet/banner.html
new file mode 100644 (file)
index 0000000..46bbe24
--- /dev/null
+++ b/mediagoblin_libreplanet/templates/libreplanet/banner.html
@@ -0,0 +1,29 @@
+{#
+# MediaGoblin for LibrePlanet
+# Copyright (C) 2017 Andrew Engelbrecht <andrew@fsf.org>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+
+<div style="position: absolute; margin-left: -30px; width: 1000px;">
+    <iframe src="//static.fsf.org/nosvn/banners/libreplanet/libreplanet-banner.html" width="100%" height="64px" frameborder="0" scrolling="no"></iframe>
+</div>
+
+{# for spacing below the banner
+    also update the join.html template file when adding/removing/changing
+    the spacing of this div.
+    -- sudoman 2017-03-09
+#}
+<div style="margin-top: 64px;"></div>
+

diff --git a/mediagoblin_libreplanet/templates/libreplanet/join.html b/mediagoblin_libreplanet/templates/libreplanet/join.html
index 6d6d4cffd779fc1a7aa36a8591c5821ed03880fd..61a9ee1c593973d9f9e8cf32cc82fed3f2f65cf3 100644 (file)
--- a/mediagoblin_libreplanet/templates/libreplanet/join.html
+++ b/mediagoblin_libreplanet/templates/libreplanet/join.html
@@ -16,6 +16,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
+{# for spacing below the banner; see banner.html template. -- sudoman 2017-03-09 #}
+<div style="margin-top: 64px;"></div>
+
 <a href="http://fsf.org/jfb">
     <img id="join-button" src="//static.fsf.org/nosvn/join.en.png" alt="Join now" style="margin-right: 40px" />
 </a>