merge of '84100e0c01981232c1d09a73e53dd4df1ff45c2c'

and 'aeeda83aa00bcad92bb29ec81d31a461298976d6'
This commit is contained in:
meeh
2014-03-07 00:55:25 +00:00
212 changed files with 2545 additions and 20532 deletions

View File

@@ -1,6 +1,6 @@
{%- from "global/macros" import change_lang with context -%}
<!DOCTYPE html>
<html lang="en">
<html lang="{{ g.lang }}"{% if is_rtl() %} dir="rtl"{% endif %}>
<head>
<meta charset="UTF-8">
<title>{% block title_outer %}{% block title %}{% endblock %} - I2P{% endblock %}</title>
@@ -19,6 +19,10 @@
<!--[if lt IE 9]>
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/desktop.css') }}" title="{{ g.theme }}" media="all" />
<![endif]-->
{% if is_rtl() -%}
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/default.rtl.css') }}" media="screen, handheld, print, projection" />
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/desktop.rtl.css') }}" title="{{ g.theme }}" media="screen and (min-device-width:768px) and (min-width:768px), print, projection" />
{%- endif %}
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/syntax.css') }}" media="screen, handheld, print, projection" />
{%- endif %}
<link rel="shortcut icon" type="image/x-icon" href="{{ url_for('static', filename='favicon.ico') }}" />

View File

@@ -214,4 +214,5 @@
month = Aug,
www_pdf_url = {/_static/pdf/i2p_philosophy.pdf},
www_section = comm,
www_tags = {tech-report},
}

View File

@@ -142,21 +142,21 @@ INITIAL_STRINGS = {
OMIT_ENTRIES = ("proceedings", "journal")
# List of all recognized values for www_tags.
ALL_TAGS = ("selected", )
ALL_TAGS = ("tech-report", )
# Titles of page, by tag.
TAG_TITLES = { "": "I2P Bibliography",
"selected": "Selected I2P Papers"
"tech-report": "I2P Technical Papers"
}
# As TAG_TITLES, but shorter.
TAG_SHORT_TITLES = { "": "I2P Bibliography",
"selected": "Selected I2P Papers",
"tech-report": "I2P Tech Papers",
}
# Directories where tag pages get generated.
TAG_DIRECTORIES = { '': "full",
"selected": "" }
"tech-report": "techrpt" }
# Make cached stuff group-writable. Make sure that your cache directories
# are sticky!

View File

@@ -1,12 +1,12 @@
{% extends "global/layout.html" %}
{% block title %}{{ _('Hall Of Fame') }}{% endblock %}
{% block content %}
<!-- file version 2014.02.15.01 -->
<b>{% trans date='2014-02-15' -%}
<!-- file version 2014.03.04.01 -->
<b>{% trans date='2014-03-04' -%}
Current balance: as of {{ date }}
{%- endtrans %}</b><br />
<b>{{ _('General fund') }}:
{% trans euroval='47794,12', btcval='493,72336753' %}{{ euroval }} &euro; and {{ btcval }} BTC{% endtrans %}</b><br />
{% trans euroval='39752,57', btcval='468,72336753' %}{{ euroval }} &euro; and {{ btcval }} BTC{% endtrans %}</b><br />
<b><a href="{{ site_url('get-involved/bounties/datastore') }}">{{ _('Datastorage bounty') }}</a>:
{% trans euroval='145.0', btcval='2' %}{{ euroval }} &euro; and {{ btcval }} BTC{% endtrans %}</b><br />
<b><a href="{{ site_url('get-involved/bounties/i2phex') }}">{{ _('I2PHex bounty') }}</a>:
@@ -72,10 +72,20 @@ with your name or nick (and optionally homepage) so we can list you here.
<tr><td>Jan, 2014</td><td>anonymous</td><td>0.02 BTC</td><td></td><td>General fund</td></tr>
<tr><td>Jan, 2014</td><td>anonymous</td><td>0.0061 BTC</td><td></td><td>General fund</td></tr>
<tr><td>Feb, 2014</td><td>JULLIAN David</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
<tr><td>Feb, 2014</td><td>I2P stickers</td><td></td><td>92.65 &euro;</td><td>General fund</td></tr>
<tr><td>Feb, 2014</td><td>domains i2p/syndie</td><td></td><td>59,90 &euro;</td><td>General fund</td></tr>
<tr><td>Feb, 2014</td><td>anonymous</td><td>0.00193241 BTC</td><td></td><td>General fund</td></tr>
<tr><td>Feb, 2014</td><td>anonymous</td><td>0.001 BTC</td><td></td><td>General fund</td></tr>
<tr><td>Feb, 2014</td><td>anonymous</td><td>0.008 BTC</td><td></td><td>General fund</td></tr>
<tr><td>Feb, 2014</td><td>anonymous</td><td>0.005 BTC</td><td></td><td>General fund</td></tr>
<tr><td>Feb, 2014</td><td>anonymous</td><td>0.01662 BTC</td><td></td><td>General fund</td></tr>
<tr><td>Feb, 2014</td><td>anonymous</td><td>0.005 BTC</td><td></td><td>General fund</td></tr>
<tr><td>Mar, 2014</td><td>Loss due to MtGox gone away</td><td></td><td>7899 &euro;</td><td>General fund</td></tr>
<tr><td>Mar, 2014</td><td>Loss due to MtGox gone away</td><td></td><td>25 BTC</td><td>General fund</td></tr>
</table>
<br />
<br />