-|
-
-
-
{% trans email="press@i2p2.de"|safe,
bibtex = get_url('papers_bibtex', tag=bib.tag) if bib.tag else get_url('papers_bibtex'),
citeseer = 'http://citeseer.ist.psu.edu/online-nature01/' -%}
diff --git a/i2p2www/pages/site/docs/applications/supported.html b/i2p2www/pages/site/docs/applications/supported.html
index 96bf6ceb..34ad75a4 100644
--- a/i2p2www/pages/site/docs/applications/supported.html
+++ b/i2p2www/pages/site/docs/applications/supported.html
@@ -1,10 +1,6 @@
{% extends "global/layout.html" %}
{% block title %}{% trans %}Supported Applications{% endtrans %}{% endblock %}
-{% block content %}
-
- {% trans %}Supported Applications{% endtrans %}
-
-
+{% block content_nav %}
- {% trans trac='https://trac.i2p2.de/report/1' -%}
This is intended to be a comprehensive listing of applications used with
I2P. If you know of something that's missing please submit a ticket on
diff --git a/i2p2www/pages/site/docs/how/tech-intro.html b/i2p2www/pages/site/docs/how/tech-intro.html
index 230bfa78..f5eab1c5 100644
--- a/i2p2www/pages/site/docs/how/tech-intro.html
+++ b/i2p2www/pages/site/docs/how/tech-intro.html
@@ -1,26 +1,22 @@
{% extends "global/layout.html" %}
-{% block title %}{% trans %}Introducing I2P{% endtrans %}{% endblock %}
+{% block title %}{% trans %}I2P: A scalable framework for anonymous communication{% endtrans %}{% endblock %}
+{% block content_nav %}
+
+{% endblock %}
+
{% block content %}
-
-{% trans %}I2P: A scalable framework for anonymous communication{% endtrans %}
-
- {% trans %}Table of Contents{% endtrans %}
-
-
{% trans %}Introduction{% endtrans %}
{% trans -%}
I2P is a scalable, self organizing, resilient packet switched anonymous
diff --git a/i2p2www/pages/site/docs/how/threat-model.html b/i2p2www/pages/site/docs/how/threat-model.html
index e1e2db5f..c2bed944 100644
--- a/i2p2www/pages/site/docs/how/threat-model.html
+++ b/i2p2www/pages/site/docs/how/threat-model.html
@@ -41,6 +41,30 @@
{% endmacro %}
+{% block content_nav %}
+ {% trans %}Index of Attacks{% endtrans %}
+
+{% endblock %}
+
{% block content %}
{% trans %}What do we mean by "anonymous"?{% endtrans %}
@@ -179,28 +203,6 @@ and priority scores are calculated using the equations outlined
#}
-{% trans %}Index of Attacks{% endtrans %}
-
-
{% trans %}Brute force attacks{% endtrans %}
{# DREAD_score(2, 1, 1, 1, 3) #}
diff --git a/i2p2www/pages/site/docs/spec/common-structures.html b/i2p2www/pages/site/docs/spec/common-structures.html
index 4d52efac..02711eb5 100644
--- a/i2p2www/pages/site/docs/spec/common-structures.html
+++ b/i2p2www/pages/site/docs/spec/common-structures.html
@@ -2,16 +2,7 @@
{% block title %}{% trans %}Common structures Specification{% endtrans %}{% endblock %}
{% block lastupdated %}{% trans %}April 2015{% endtrans %}{% endblock %}
{% block accuratefor %}0.9.19{% endblock %}
-{% block content %}
-{% trans i2np=site_url('docs/protocol/i2np'),
-i2cp=site_url('docs/protocol/i2cp'),
-ssu=site_url('docs/transport/ssu') -%}
-This document describes some data types common to all I2P protocols, like
-I2NP, I2CP,
-SSU, etc.
-{%- endtrans %}
-
-Index
+{% block content_nav %}
| {% trans %}Type{% endtrans %} |
|---|
| Boolean |
@@ -37,6 +28,16 @@ This document describes some data types common to all I2P protocols, like
| String |
| TunnelId |
+{% endblock %}
+
+{% block content %}
+{% trans i2np=site_url('docs/protocol/i2np'),
+i2cp=site_url('docs/protocol/i2cp'),
+ssu=site_url('docs/transport/ssu') -%}
+This document describes some data types common to all I2P protocols, like
+I2NP, I2CP,
+SSU, etc.
+{%- endtrans %}
Integer
{% trans %}Description{% endtrans %}
diff --git a/i2p2www/pages/site/faq.html b/i2p2www/pages/site/faq.html
index dcb0324b..3b12e6fa 100644
--- a/i2p2www/pages/site/faq.html
+++ b/i2p2www/pages/site/faq.html
@@ -1,7 +1,6 @@
{% extends "global/layout.html" %}
{% block title %}{{ _('Frequently Asked Questions') }}{% endblock %}
-{% block content %}
-{{ _('Index') }}
+{% block content_nav %}
-
{{ _('General') }}
@@ -47,7 +46,9 @@
- {% trans %}I'm using FreeBSD and when I start I2P I receive an error about
libm.so.4!{% endtrans %}
- {% trans %}In
wrapper.log I see an error stating Protocol family unavailable when I2P is loading{% endtrans %}
+{% endblock %}
+{% block content %}
{% trans %}What systems will I2P run on?{% endtrans %}
({{ _('link') }})
{% trans chart='https://trac.i2p2.de/wiki/java' -%}
diff --git a/i2p2www/pages/site/get-involved/develop/applications.html b/i2p2www/pages/site/get-involved/develop/applications.html
index d23578d4..c1d977a7 100644
--- a/i2p2www/pages/site/get-involved/develop/applications.html
+++ b/i2p2www/pages/site/get-involved/develop/applications.html
@@ -2,17 +2,16 @@
{% block title %}{{ _('Application Development') }}{% endblock %}
{% block lastupdated %}{% trans %}May 2013{% endtrans %}{% endblock %}
{% block accuratefor %}0.9.6{% endblock %}
-{% block content %}
- {{ _('Application Development Guide') }}
-
-{{ _('Contents') }}
+{% block content_nav %}
+{% endblock %}
+{% block content %}
{{ _('Why write I2P-specific code?') }}
{% trans i2ptunnel=site_url('docs/api/i2ptunnel') -%}
diff --git a/i2p2www/pages/site/get-involved/guides/monotone.html b/i2p2www/pages/site/get-involved/guides/monotone.html
index e51a5c6a..9c8114dd 100644
--- a/i2p2www/pages/site/get-involved/guides/monotone.html
+++ b/i2p2www/pages/site/get-involved/guides/monotone.html
@@ -1,7 +1,6 @@
{% extends "global/layout.html" %}
{% block title %}{% trans %}Monotone Guide{% endtrans %}{% endblock %}
-{% block content %}
-
+{% endblock %}
+{% block content %}
{% trans transitionguide=site_url('misc/transition-guide'), newdevs=site_url('get-involved/guides/new-developers') -%}
This is a revised version of Complication's original
diff --git a/i2p2www/pages/site/get-involved/guides/new-developers.html b/i2p2www/pages/site/get-involved/guides/new-developers.html
index 910a350f..fdb8bc3b 100644
--- a/i2p2www/pages/site/get-involved/guides/new-developers.html
+++ b/i2p2www/pages/site/get-involved/guides/new-developers.html
@@ -1,17 +1,6 @@
{% extends "global/layout.html" %}
{% block title %}{% trans %}New Developer's Guide{% endtrans %}{% endblock %}
-{% block content %}
-{% trans %}
-So you want to start work on I2P? Great!
-Here's a quick guide to getting started
-on contributing to the website or the software, doing development or creating translations.
-{%- endtrans %}
-{% trans volunteer=site_url('get-involved') %}
-Not quite ready for coding?
-Try getting involved first.
-{%- endtrans %}
-
-
+{% endblock %}
+
+{% block content %}
+{% trans %}
+So you want to start work on I2P? Great!
+Here's a quick guide to getting started
+on contributing to the website or the software, doing development or creating translations.
+{%- endtrans %}
+{% trans volunteer=site_url('get-involved') %}
+Not quite ready for coding?
+Try getting involved first.
+{%- endtrans %}
{% trans %}Basic study{% endtrans %}
diff --git a/i2p2www/pages/site/get-involved/todo.html b/i2p2www/pages/site/get-involved/todo.html
index ce70e590..684fbab9 100644
--- a/i2p2www/pages/site/get-involved/todo.html
+++ b/i2p2www/pages/site/get-involved/todo.html
@@ -1,24 +1,14 @@
{% extends "global/layout.html" %}
{% block title %}{{ _('I2P Project Targets') }}{% endblock %}
-{% block content %}
-{% trans roadmap=site_url('get-involved/roadmap'), volunteer=site_url('get-involved') -%}
-Below is a more detailed (yet still incomplete) discussion of the major areas
-of future development on the core I2P network, spanning the plausibly planned
-releases. This does not include stego transports, porting to wireless devices,
-or tools to secure the local machine, nor does it include client applications
-that will be essential in I2P's success. There are probably other things that
-will come up, especially as I2P gets more peer review, but these are the main
-'big things'. See also the roadmap. Want to help?
-Get involved!
-{%- endtrans %}
-
-
+{% block content_nav %}
+
+{{ _('Security / anonymity') }}
-
+
+{{ _('Performance') }}
+
+{% endblock %}
+
+{% block content %}
+{% trans roadmap=site_url('get-involved/roadmap'), volunteer=site_url('get-involved') -%}
+Below is a more detailed (yet still incomplete) discussion of the major areas
+of future development on the core I2P network, spanning the plausibly planned
+releases. This does not include stego transports, porting to wireless devices,
+or tools to secure the local machine, nor does it include client applications
+that will be essential in I2P's success. There are probably other things that
+will come up, especially as I2P gets more peer review, but these are the main
+'big things'. See also the roadmap. Want to help?
+Get involved!
+{%- endtrans %}
{{ _('Core functionality') }}
diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index 64b6288e..0986d2d1 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -2,7 +2,6 @@
body {
font-family: Droid Sans, Helvetica, sans-serif;
- font-size: 10px;
background-color: #ffffdd;
min-height: 800px;
width: 100%;
@@ -23,10 +22,20 @@ div.hide {
display: none
}
+div#topbar .title, div#content > .title {
+ font-family: "URW Gothic L", "Century Gothic", sans-serif;
+ text-transform: uppercase;
+ font-size: 2.1875rem;
+ font-weight: bold;
+ text-shadow: 1px 1px 1px rgba(0,0,0,.2);
+ color: #333333;
+ line-height:41px;
+ vertical-align:middle;
+}
+
div#topbar {
width: 80%;
- /*margin: 1em auto;*/
- margin: 1em auto;
+ margin: 0.625em auto;
position: relative;
}
@@ -60,7 +69,6 @@ div#content .main {
position: relative;
margin: 0 auto;
text-shadow: 1px 1px 1px rgba(255,255,255,.5);
- font-size: 1.6em;
line-height: 1.5em;
border: 2px solid #abcc71;
border-left: none;
@@ -71,6 +79,7 @@ div#content .main {
div#content .main h1 {
font-family: "URW Gothic L", "Century Gothic", sans-serif;
font-size: 2.5em;
+ line-height: 1em;
text-shadow: 1px 1px 2px rgba(0,0,0,.3);
color: white;
margin-bottom: .5em;
@@ -96,14 +105,14 @@ div#content .main h1 {
div#content .aside-wrap {
width: 80%;
- margin: 2em auto;
+ margin: 1.25em auto;
}
div#content .aside {
position: relative;
display: inline-block;
vertical-align: top;
- font-size: 1.2em;
+ font-size: 0.75rem;
}
div#content .aside a {
@@ -129,7 +138,7 @@ div#content .aside ul {
div#content .aside ul li {
list-style-type: none;
margin: 1em 0;
- line-height: 1.3em;
+ line-height: 1.5em;
}
div#content .feed-icon {
@@ -142,53 +151,83 @@ div#content .feed-icon {
width: 28px;
}
-div#content .lastupdated {
- background-color: #ffffdd;
- border-radius: 0 0 5px 5px;
- padding: 2px 4px;
- position: relative;
- left: 8%;
- text-align: right;
- width: 80%;
-}
-
/**
* The .inner class is for the content wrapper on inner pages (as opposed to the home page)
*/
div#content .inner {
- width: auto;
- margin: 0 5%;
- padding: 0 5% 0.1em;
- position: relative;
- background: rgba(171, 204, 113, 0.6);
+ background: rgba(0, 0, 0, 0.05);
border-top: 2px solid #abcc71;
- border-left: 2px solid #abcc71;
- border-right: 2px solid #abcc71;
- border-radius: 5px 5px 0 0;
color: black;
- font-size: 1.2em;
- line-height: 1.4em;
+ line-height: 1.5em;
+ position: relative;
+ width: auto;
+}
+
+div#content .inner:before {
+ box-shadow: 0 6px 12px -12px inset;
+ content: " ";
+ height: 12px;
+ left: 0;
+ position: absolute;
+ top: 0;
+ width: 100%;
+}
+
+div#content .inner .fluid {
+ background-color: white;
+}
+
+div#content .sidebar {
+ background: white;
+ border-bottom: 1px solid #abcc71;
+ font-size: 0.875rem;
+}
+
+div#content .sidebar .top {
+ border-bottom: 2px solid #abcc71;
+}
+
+div#content .sidebar nav {
+ background: rgba(171, 204, 113, 0.6);
+ padding: 1em;
+}
+
+div#content .sidebar nav ol {
+ margin: 0;
+ padding-left: 1em;
+}
+
+div#content .sidebar nav ul {
+ margin: 0;
+ padding-left: 0.5em;
+}
+
+div#content .inner .meta,
+div#content .inner .box {
+ background-color: #ffffdd;
+ border: 1px dashed;
+ padding: 0.5em 1em;
+ position: relative;
+}
+
+div#content .inner .meta {
+ text-align: center;
+}
+
+div#content .content-inner {
+ padding: 1em 2em;
}
div#content .inner h1,
div#content .inner h2,
div#content .inner h3,
div#content .inner h4 {
- color: white;
- text-shadow: 1px 1px 1px rgba(0,0,0,.3);
margin: 1em 0 .5em;
padding-bottom: .2em;
- clear: both;
line-height: 110%;
}
-div#content .inner h2,
-div#content .inner h3,
-div#content .inner h4 {
- border-bottom: 1px solid white
-}
-
div#content .inner h1 {
font-size: 2.2em;
margin: 1em 0 0.5em;
@@ -197,7 +236,8 @@ div#content .inner h1 {
}
div#content .inner h2 {
- font-size: 1.6em
+ font-size: 1.6em;
+ border-bottom: 1px solid black
}
div#content .inner h3 {
@@ -235,6 +275,11 @@ div#content .inner td.blue {
color: blue;
}
+div#content .inner .box img {
+ height: auto;
+ max-width: 100%;
+}
+
/*
* Download page
*/
@@ -248,13 +293,17 @@ div#content .inner td.blue {
.os {
color: white;
- font-size: 1.6em;
font-weight: bold;
text-align: center;
text-decoration: underline;
text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
}
+.os img {
+ height: auto;
+ max-width: 100%;
+}
+
.file {
margin-bottom: 10px
}
@@ -274,8 +323,8 @@ div#content .inner td.blue {
padding: 10px;
}
-.file .default .name {
- font-size: 1.6em
+.file .default .mirror {
+ font-size: 0.75em;
}
.file .mirrors,
@@ -284,6 +333,8 @@ div#content .inner td.blue {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
display: inline-block;
+ font-size: 0.75em;
+ line-height: 1em;
width: 50%;
}
@@ -297,7 +348,8 @@ div#content .inner td.blue {
}
.details .hash:before {
- content: 'SHA256: '
+ content: 'SHA256: ';
+ font-size: 0.8125em;
}
.warning {
@@ -379,6 +431,19 @@ div#content .inner ul.DREAD {
text-align: left !important;
}
+pre.literal-block {
+ overflow: auto;
+}
+
+/*
+ * Papers
+ */
+
+.biblinks {
+ border-bottom: 1px solid;
+}
+
+
/*
* Footer
*/
@@ -388,6 +453,7 @@ div#content .inner ul.DREAD {
border-top: 3px solid #883333;
background: #552222;
box-shadow: 0px -4px 8px rgba(0,0,0,.3);
+ font-size: 0.75rem;
padding: 1em 10%;
background: -moz-linear-gradient(#883333, #772222);
}
diff --git a/i2p2www/static/styles/duck/default.rtl.css b/i2p2www/static/styles/duck/default.rtl.css
index dc80ef1c..d10f5d1b 100644
--- a/i2p2www/static/styles/duck/default.rtl.css
+++ b/i2p2www/static/styles/duck/default.rtl.css
@@ -8,4 +8,16 @@ div#topbar #logo {
div#content .feed-icon {
float: left
-}
\ No newline at end of file
+}
+
+/** Content **/
+
+div#content .sidebar nav ol {
+ padding-left: 0;
+ padding-right: 1em;
+}
+
+div#content .sidebar nav ul {
+ padding-left: 0;
+ padding-right: 0.5em;
+}
diff --git a/i2p2www/static/styles/duck/desktop.css b/i2p2www/static/styles/duck/desktop.css
index c4de8bb1..77dab1c4 100644
--- a/i2p2www/static/styles/duck/desktop.css
+++ b/i2p2www/static/styles/duck/desktop.css
@@ -1,9 +1,9 @@
body {
- padding-top: 1em;
+ padding-top: 0.625em;
}
div#topbar {
- margin: 1em auto 0;
+ margin: 0.625em auto 0;
}
div#topbar #logo img:hover {
@@ -13,12 +13,6 @@ div#topbar #logo img:hover {
}
div#topbar .title {
- font-family: "URW Gothic L", "Century Gothic", sans-serif;
- text-transform: uppercase;
- font-size: 3.5em;
- font-weight: bold;
- text-shadow: 1px 1px 1px rgba(0,0,0,.2);
- color: #333333;
/*position: absolute;*/
top:0;
right:0;
@@ -84,7 +78,7 @@ menu ul,
color: #d00e0e;
display: inline-block;
font-family: "URW Gothic L", "Century Gothic", sans-serif;
- font-size: 2em;
+ font-size: 1.25em;
font-weight: bold;
text-shadow: 1px 1px 1px rgba(100,20,20,.2);
line-height: 40px;
@@ -234,31 +228,37 @@ div#content .main {
div#content .aside {
width: 30.9%;
margin-left: 3%;
- font-size: 1.3em;
+ font-size: 0.875rem;
}
div#content .aside:first-child {
margin-left: 0%
}
-div#content .lastupdated {
- left: auto;
- position: absolute;
- right: 10%;
- top: 0;
- width: 200px;
-}
-
/**
* The .inner class is for the content wrapper on inner pages (as opposed to the home page)
*/
-div#content .inner {
- padding: 4em 5% 2em;
- font-size: 1.3em;
+div#content .inner .fluid {
+ background-image: url('images/bg-sidebar.png');
+ background-repeat: repeat-y;
+ border-left: 1px solid #abcc71;
+ margin-left: 0.625rem;
}
-div#content .inner > .title {
+div#content .inner .sidebar {
+ border-radius: 0 0 10px 0;
+ border-right: 1px solid #abcc71;
+ float: left;
+ width: 250px;
+}
+
+div#content .content-inner {
+ margin-left: 252px;
+ padding-right: 4em;
+}
+
+div#content > .title {
display: none
}
@@ -304,13 +304,6 @@ div#content .inner > .title {
/* End of downloads list CSS */
-.biblinks {
- left: auto;
- position: absolute;
- right: 10%;
- top: 0;
-}
-
#global-footer .aside {
width: 15%;
margin-left: 1%;
diff --git a/i2p2www/static/styles/duck/desktop.rtl.css b/i2p2www/static/styles/duck/desktop.rtl.css
index 757ede8e..5f78aa73 100644
--- a/i2p2www/static/styles/duck/desktop.rtl.css
+++ b/i2p2www/static/styles/duck/desktop.rtl.css
@@ -57,6 +57,28 @@ div#content .main {
-o-transform: rotate(5deg);
}
+/** Content **/
+
+div#content .inner .fluid {
+ border-left: none;
+ border-right: 2px solid #abcc71;
+ margin-left: 0;
+ margin-right: 0.625rem;
+}
+
+div#content .inner .sidebar {
+ border-radius: 0 0 0 10px;
+ border-left: 2px solid #abcc71;
+ border-right: none;
+ float: right;
+}
+
+div#content .content-inner {
+ margin-left: 0;
+ margin-right: 252px;
+}
+
+
/** Downloads list **/
.package .os {
@@ -73,4 +95,4 @@ div#content .main {
.details .hash {
float: left
-}
\ No newline at end of file
+}
diff --git a/i2p2www/static/styles/duck/images/bg-sidebar.png b/i2p2www/static/styles/duck/images/bg-sidebar.png
new file mode 100644
index 00000000..d241abe5
Binary files /dev/null and b/i2p2www/static/styles/duck/images/bg-sidebar.png differ
diff --git a/i2p2www/static/styles/duck/mobile.css b/i2p2www/static/styles/duck/mobile.css
index a59b12c2..83f12b98 100644
--- a/i2p2www/static/styles/duck/mobile.css
+++ b/i2p2www/static/styles/duck/mobile.css
@@ -117,11 +117,12 @@ div#content .aside {
width: 100%
}
-div#content .inner {
- margin-top: 1em
+div#content > .title {
+ margin-top: 0.5em;
+ text-align: center;
}
-div#content .inner .title {
+div#content .inner {
margin-top: 1em
}
@@ -138,4 +139,4 @@ div#content .inner .title {
#global-footer .aside.third,
#global-footer .aside.fifth {
margin-left: 0
-}
\ No newline at end of file
+}
diff --git a/i2p2www/static/styles/duck/widescreen.css b/i2p2www/static/styles/duck/widescreen.css
new file mode 100644
index 00000000..725c7fd8
--- /dev/null
+++ b/i2p2www/static/styles/duck/widescreen.css
@@ -0,0 +1,12 @@
+div#content .inner .fluid {
+ border-right: 1px solid #abcc71;
+ margin-right: 30%;
+}
+
+div#content .inner .meta {
+ position: absolute;
+ left: 72%;
+ margin: 1em 0;
+ right: 2%;
+ text-align: left;
+}
diff --git a/i2p2www/static/styles/duck/widescreen.rtl.css b/i2p2www/static/styles/duck/widescreen.rtl.css
new file mode 100644
index 00000000..d7883d45
--- /dev/null
+++ b/i2p2www/static/styles/duck/widescreen.rtl.css
@@ -0,0 +1,11 @@
+div#content .inner .fluid {
+ border-left: 2px solid #abcc71;
+ margin-left: 30%;
+}
+
+div#content .inner .meta {
+ position: absolute;
+ left: 2%;
+ right: 72%;
+ text-align: right;
+}
|