merge of '0fa24565c84321c5064c87b27eb578ddbaeaf59d'

and '3f598c633ab122b365c011b250b6c6ab17e0d5ad'

LICENSE.txt

@@ -49,3 +49,5 @@ See https://creativecommons.org/licenses/by-sa/4.0/
      - Guernsey and Isle of Man flags from the Open Clip Art Library, released into the public domain
      - Curaçao, courtesy of David Benbennick, released into the public domain
      - All other flag icons: public domain, courtesy mjames@gmail.com http://www.famfamfam.com/
+   OS icons (i2p2www/static/images/download/):
+     - Courtesy dakirby309 http://dakirby309.deviantart.com/art/Metro-UI-Icon-Set-725-Icons-280724102

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' -%}

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') }}

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>

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

i2p2www/static/styles/duck/default.css

@@ -468,22 +468,20 @@ pre.literal-block {
 
 #global-footer {
     width: auto;
-    border-top: 3px solid #883333;
-    background: #552222;
+    border-top: 2px solid #abcc71;
+    background: transparent;
     font-size: 0.75rem;
     padding: 1em 10%;
-    background: -moz-linear-gradient(#883333, #772222);
 }
 
 #global-footer .aside {
     display: inline-block;
+    text-align: center;
     vertical-align: top;
 }
 
 #global-footer .aside h1 {
-    color: #ffdd88;
     font-size: 1.2em;
-    text-shadow: -1px -1px 1px rgba(0,0,0,.2);
     border-bottom: 1px solid #ccaa66;
     margin: 1em 0;
     line-height: 1.3em;