From b3a35bfb80d1c24b942bef9c0ce6485166329834 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sun, 6 Mar 2016 21:28:44 +0000
Subject: [PATCH] Replace footer with download and donate images
---
i2p2www/pages/downloads/macros | 2 +-
i2p2www/pages/global/footer.html | 53 ++++++-------------
i2p2www/pages/global/nav.html | 2 +
.../site/get-involved/develop/licenses.html | 8 +++
i2p2www/static/styles/duck/default.css | 1 +
5 files changed, 28 insertions(+), 38 deletions(-)
diff --git a/i2p2www/pages/downloads/macros b/i2p2www/pages/downloads/macros
index 4c1560d73..e80c484b5 100644
--- a/i2p2www/pages/downloads/macros
+++ b/i2p2www/pages/downloads/macros
@@ -48,7 +48,7 @@
{%- set name = 'Mac OS X' -%}
{%- set icon = 'images/download/mac-osx.png' -%}
{%- elif type == 'unix' -%}
- {%- set name = 'GNU/Linux / BSD / Solaris' -%}
+ {%- set name = 'Linux / BSD / Solaris' -%}
{%- set icon = 'images/download/freebsd-tux.png' -%}
{%- endif -%}
{%- set filename = 'i2pinstall_%s.jar' -%}
diff --git a/i2p2www/pages/global/footer.html b/i2p2www/pages/global/footer.html
index b781efb44..cd6d268eb 100644
--- a/i2p2www/pages/global/footer.html
+++ b/i2p2www/pages/global/footer.html
@@ -1,38 +1,17 @@
- <div class='aside first'>
- <h1>{{ _('Mirrors') }}</h1>
- <ul>
- <li><a rel="nofollow" href="http://i2pproject.net/">http://i2pproject.net</a></li>
- <li><a rel="nofollow" href="http://i2p-projekt.de/">http://i2p-projekt.de</a></li>
- <li><a rel="nofollow" href="http://www.i2p2.de/">http://www.i2p2.de</a></li>
- </ul>
- </div>
- <div class='aside second'>
- <h1>{{ _('Secure') }}</h1>
- <ul>
- <li><a rel="nofollow" href="https://geti2p.net/">https://geti2p.net</a></li>
- <!--<li><a rel="nofollow" href="https://geti2p.com/">http://geti2p.com</a></li> -->
- </ul>
- </div>
- <div class='aside third'>
- <h1>{{ _('Misc.') }}</h1>
- <ul>
- <li><a href="http://syndie.i2p2.de/">Syndie</a></li>
- <li><a href="{{ site_url('links') }}">{{ _('Links') }}</a></li>
- <li><a href="{{ site_url('impressum') }}">{{ _('Impressum') }}</a></li>
- </ul>
- </div>
- <div class='aside fourth'>
- <h1>{{ _('T-Shirts!') }}</h1>
- <ul>
- <li><a href="https://www.getdigital.eu/I2P-Fanshirt.html">{{ _('Europe') }}</a></li>
- <li><a href="https://i2pshop.spreadshirt.com/">{{ _('USA') }}</a></li>
- </ul>
- </div>
- <div class='aside fifth'>
- <a class='button' href="{{ site_url('get-involved/donate') }}">{{ _('Donate') }}</a>
- </div>
- <div class='aside sixth'>
- <ul>
- <li><a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="{{ url_for('static', filename='images/cc-by-sa-4.0.png') }}" /></a><br />Except where otherwise noted, content on this site is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>.</li>
- </ul>
+{% macro footer_div(pos, url, name, icon) -%}
+ <div class='aside {{ pos }}'>
+ <a href="{{ url }}">
+ <img src="{{ url_for('static', filename=icon) }}" height="128px" alt="{{ name }}" title="{{ name }}" />
+ <h1>{{ name }}</h1>
+ </a>
</div>
+{%- endmacro %}
+{% macro footer_download(pos, type, name, icon) -%}
+{{ footer_div(pos, '%s#%s' % (get_url('downloads_list'), type), name, icon) }}
+{%- endmacro %}
+{{ footer_download('first', 'windows', 'Windows', 'images/download/windows.png') }}
+{{ footer_download('second', 'mac', 'Mac OS X', 'images/download/mac-osx.png') }}
+{{ footer_download('third', 'unix', 'Linux / BSD / Solaris', 'images/download/freebsd-tux.png') }}
+{{ footer_div('fourth', get_url('downloads_debian'), 'Debian / Ubuntu', 'images/download/debian-ubuntu.png') }}
+{{ footer_download('fifth', 'android', 'Android', 'images/download/android.png') }}
+{{ footer_div('sixth', site_url('get-involved/donate'), _('Donate'), 'images/itoopie.png') }}
diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html
index e50374ae9..f3a389344 100644
--- a/i2p2www/pages/global/nav.html
+++ b/i2p2www/pages/global/nav.html
@@ -96,6 +96,8 @@
<li><a href="{{ site_url('about/i2pcon') }}"><div class="menuitem"><span>I2PCon</span></div></a></li>
<li><a href="{{ site_url('about/media') }}"><div class="menuitem"><span>{{ _('Presentations, tutorials and articles') }}</span></div></a></li>
<li><a href="{{ site_url('contact') }}"><div class="menuitem"><span>{{ _('Contact us') }}</span></div></a></li>
+ <li><a href="{{ site_url('links') }}"><div class="menuitem"><span>{{ _('Links') }}</span></div></a></li>
+ <li><a href="{{ site_url('impressum') }}"><div class="menuitem"><span>{{ _('Impressum') }}</span></div></a></li>
</ul>
</li>
<li class="has-sub"><div class="menuitem"><span>{{ _('Help') }}</span></div>
diff --git a/i2p2www/pages/site/get-involved/develop/licenses.html b/i2p2www/pages/site/get-involved/develop/licenses.html
index a3b3fae09..90f1f9463 100644
--- a/i2p2www/pages/site/get-involved/develop/licenses.html
+++ b/i2p2www/pages/site/get-involved/develop/licenses.html
@@ -297,6 +297,14 @@ or source code in question for authoritative terms. Component source locations
resource packaging may be changed if the repository is reorganized.
{%- endtrans %}</p>
+<h2><a id="website">{{ _('Website content') }}</a></h2>
+<a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="{{ url_for('static', filename='images/cc-by-sa-4.0.png') }}" /></a>
+
+<p>
+Except where otherwise noted, content on this site is licensed under a
+<a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>.
+</p>
+
<h2><a id="commit">{{ _('Commit privileges') }}</a></h2>
<p>{% trans monotone=site_url('get-involved/guides/monotone') -%}
Developers may push changes to a distributed monotone repository if you
diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index 60129146f..525309a3e 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -477,6 +477,7 @@ pre.literal-block {
#global-footer .aside {
display: inline-block;
+ text-align: center;
vertical-align: top;
}
--
GitLab