merge of '2781f0cef5745d1d7555bc7ab10eff4261e37b6e'

and 'c87c0b8666845e12e0ca635c30add55d966009fb'

i2p2www/static/debian-repo.pub

@@ -0,0 +1,36 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.15 (GNU/Linux)
+
+mQINBFJXM+IBEAC4d7PbH0ZZjOld1DBu0rFAjZYITMa0yFCqOEbRGd3gdMeMx21h
+TJ8B2gICRL6UJL/GFN9HieSzQGAd9ABf924/UQyZJ+zMwt3x0bYAfC8SMWg5XgHM
+rR4M9v+aUZ5fsqwXEoKVI0AC3z3e6IutRota6/mpsuFaHwjzsv/0elFa6aapK6D+
+ZYHCQLXEk72RokmYcIxYaNZilgNjKf0IYS5wwEg9NZqiUyaJr9dvQb8uYQMNt0MK
+7Lklm5aepFOS+KmThnFTZb5l3UYr/rNvpMmHmS8XpNBvtoga0YNXMYjrPf9QdvjP
+1V0dMdOF6rSPkq7sTKDyF713ovSLxgtnibqhp9LgQcjyA43591Fg7cmwNu42ccd2
+Frdt+BxpYjzYu49d+pxQJXoSwPSQFuAE5V0AkuQeng/IxpW3zi6ybJJWOwvxeq2Z
+RdNjzpwu0vUYsLELdsCW88etc141n7O9P5L3s4o7PYHE/y3N47PwDgb43cErvTcF
+bIP2aEmJnyIbOWwiCftnxaKlfAbv0g7TNho5HX66OreR4Fb5vUkoIfzte/fxZKOL
+R/hhNTH1fZNEaIaxHwvitfQe8xPsLgR/O3PoXd74UOJuwOwcf0LROgNaN5O+0rmD
+5eAbVn7CYd7ZQPIRRKlHrFsQDg4u5jEt7GVd+jYsEF9A6fK7npNhCkNAnwARAQAB
+tDZJMlAgRGViaWFuIFBhY2thZ2UgUmVwb3NpdG9yeSA8a2lsbHlvdXJ0dkBpMnBt
+YWlsLm9yZz6JAj0EEwEKACcFAlJXM+ICGwMFCQHhM4AFCwkIBwMFFQoJCAsFFgID
+AQACHgECF4AACgkQZ+zlYFvPE0ajKBAAr64De1vMJb+SzqW20fCFyOmG/QbFgGK9
+FeJzDaZ8lcGDFiMtMvm7IkL0jAKQl5bInsAA26SQq4j1gEU3DIx2mJT4i+ZztDLO
+Tv3XxO6DuVdPMtNEH3AKiRufwGH/HtudtAyUy7gwIYg2qhRVR3hz7iHs9WbgkkXy
+6Qp/WCYJGuH74hXIQtW+Cyyded50vjm8uPqYuRUfze6jetZkWUSkAmqbzZhfHPv1
+ju5GptHWH+9Z4q9fvr1LZ09eHy+XfnxE/NpP4nfXJ42F9/QpNDEPgT8DTp3NknpS
+N95EDhKduHGX1rBAjc4ZQE6L+gTS2DJq5ozgAM/sFfH9uL+kULx7lzbXTpwL1Zd8
+fVwrmGM81duOZ7erFlpRqYKn6aVdLbQFxcLz6Q4WUBuHd4XBE5WilYvTyOPB/mYf
+TmWBaTS4glYz3cFKi9J8LSaW6b8/ik9gVS6Z7wPckWHuWWIRdcKk3zJZoXeOzrTZ
+KX+z2uATkX7Tfpd07o4wwSRmWevFGniGL1ml+abanpIGHt8h79/gscEQ8aQdD+i0
+dNjqgpLTS1TL0aQ0sJ/UD5EexbMuWKIGatABVguuofrK77GmGTcz1LL3mGJV0HIR
+vXjFOx3tEV5HYdDJK9gq1W0JKxYmE+paw8PFaM5+vnXP0xoTz75KKlL3N1Ra6/mG
+whIPAIaMfhiJARwEEAEKAAYFAlJYlBAACgkQq+DDGd8KChoHcgf8DegR4gl6F4uy
+YnHXKSubJYHSfWGHaKe7msoCjAna13BtKkZXj2DWDLUmMCwI/qHvQT1V9mNwsBgW
+nAagKATeB+bhumg9/xbBAKndaowHTuGI0wZ9uXbXaxxlpXbODFScBoR86CCeJa4F
+3N5RwWZryv3MwlLc109aEaCriL9nNb/K2OZ98I9i+K2SdT5mITk3FeAgzD+UrVqL
+oYNQ677BpsJQfvTvOP6PiFpXbVVzRouhQX6a7Dzkd2rzjLRNeAc2gp0+n4U1j8N0
+HTRvBAX6RRv6BZNLWtS21bqwPtcrTJ9qr8aLbWyjWbBTFqRR4lAUn0vDQBfA5B2Z
+z+b2yx4iqA==
+=ZkNG
+-----END PGP PUBLIC KEY BLOCK-----

i2p2www/static/hosts.txt

@@ -344,3 +344,9 @@ irc.killyourtv.i2p=CnG0yQheyd67rl1nHuYZp1sVZxzXHe05UPrmT0B3Vxtd51K-Cq5E6v5~UTrU5
 www.syndie.i2p=DvyDrcY8se2M~qqp4qfZn-6UTFfS2Ieaye5QIhKoFQGktMbCK2MzhAMYvNm7n1k9O0hG86-nXPCP8rlFurPrCAKta~baUlCgbV4ft5zzu0Y4DFuhC6p-3V-03S5WF8JA5Pt4KEcKKEYiOkHzGVSKuWIjH11syZ434c0qarOFfynS1ZI2Ixlv2OXCEzs-r5NeMRy3tfwbLyPF46END1CyoWCNx-FUdOt5ueXVokYeJ00Pzqvhqb6ByqRh76N3Fz3GGIUjjSmSljDSN8B0K9943jKXCoH75YnC47cw~RwSD53pbLXiLWHqtIiqx8Zvq5LgIac9UVpIA9Ka27TWa5OhVhBKwuynPnfVaLv2xOR8dEDmVNnO8sNp4kP~MMTvJAUJfhAbPFbAs9i4Wx0IlLKN5gLnft-7Xd1pMivKZZaNWFicwr69VMub-ddl~vbhtueIvmkEdoLIw4xBb6nHmKy0gHi6TWjEmLXb8SsgDOkri7Nu9qRV8t6VF60wpjHPG33eAAAA
 syndie-project.i2p=2~qacMy9FwwWCFm3JYRKSLIe8u6wEuinZPre0WoZC-M3IUSg8VhUp1QSPuaeFJdym69hjew6AOE-wnZ30mtzriXyvaYh7UNshTc9ZdEBWwhdn5cghMjf48HdBw3pKAiiw1gwv8WwsskbAxbSTkcQUmqGsterPyUqspSqddwUkcDxZHC7dUJsyyd4gcul40KljlIu9mMWXZLWQ7Zu8od~NcFNHVBE-UnTvDmHErpx7AWcN9VrD4j-OuVqsLYq1T9uhdLH-~H~9eE5RKekz6ehhGJRLlGB~2~MYVt4xrqbo4z18nFxdp9PorOO1wt5xiFSw4GEX5HAO2~pt97DVkcwogOEVCJbRbLiIJJDmehn5PB-56K4tjuUNFtzLAq7QQZEAAHGCUEaVPUObKS20vU~JN6GrAOAXKM2M-16frR0ddpJ4f55iuc~tVL3OFPAtha5aHP9xihP7i80rB5LsG0aT77Ey~mCWHrV2sQwhua40vP9TgpCi6Lg21DnVrR97S5tAAAA
 lists.i2p2.i2p=iKMDu6cP~nt4vubwZOuXWDQS4zdhF9x2YjhcilOrRIHR7lkP6ErNgUHZb~ggwnRaPkj81JpmbwDJ1GR~LLS7DcN5ktSZ1WhjVfrm92AQ4-yDX5HEcPpCnTPBp11zsrh2WEDXSjWMqyBPbkYMzrJ33ZGxVMxccXLlV~W9ecPrpl7EmrIF1gPmbinG1oDA0wFLaJyXPZrCRhdX6xMDgvb0slHE0pxAM00TeAQK~aL~LZ5iwfA7WllYd9jaDdQ-kjaa6qEKSSQHf~bNycR~OFsxKurh1CIbrglo8vIHss-tjIfKzG2mgO8w8AE01uhlsRTxjq7TYhxTWKn4kTFyaljJCE-SL1XTYwfyEEZ90bH8Puk1zDnKIARXMPA1YM26StySLLoFyQu2SbNfJcgCqYFcGStvaG54QFCLVnHOxTKi-Z3D-PBMc9aRKSHJilN1kzExGKNZSW09wX7btyEUCHXJjbep6oFauwrtGmP9SjjZf-o3BHzvQlaLSzVFKuPJ-5tQAAAA
+outproxy-tor.meeh.i2p=BcY6Gwk8927GdVB4hS5Gbb7CyYGp6o2do0L4pxLttbBh11tDuS~ExJnao99fl2e4lp596Ueje3z-xlEWKdo~6a7iDDE-x7XlkgkXs-~FJntgQV2c028a5W74U8SZZMdwOMcCsJoi3xYFMhcntRFW28nPMGFcZwYgww6AjPK7iREtBuiboB8Rm7ba~dcyA1Fouu03Y8UY0Dyy1ajApJNmJmHY5wDq2GisGB9OA2GHu-rrOp9iSczYaQJ5-BzhhostBRbHpp6Q-JeUlml1dUGZb1p-0teuqY9WvZEMv5Q9S3lxrN7jmXre5QaQOI9sn8tGJqKc8Dun62j7i6gtZA8IWonN9IacCA64x9sf9DmP1~PCKVXxnKygL818OvP-4CwJgQyUgJEiem~RguxWveZcBsTdedt1xk52cCBa1Yw87qOzO9rOHDWEHrp2qf~yZBEoKVnk4ElM8~G809QL0VJG6MKI2e0kmo5HYWIhZP7qK94M66Nn3tK7pEMpbo0SGazgAAAA
+meeh.i2p=FA~-QarjN29hh0OzqmdwQV8HldxrjoOQUjKr6c4KQ3XZOjwiAbl7KqQgV1zGXMzWRzyZiKpM8fN0McGZnCK1C7yRguxjBcueGtxR8qT60RO7jTWaSvV5d9ocX0KFqd67U3uhHN95UphcWHm4G75l4om3GCQebNg9xJwbvjUQF~k0Trm5wrVl~XbND-~aIvVGRFappGKx4pfKSNxVJIjMACGG1UUszT4RTFDc6wN49Wujt9WRbFfC9UTTUsWO2waYRyZXaeRyfIRAkYq1jIhqL2Nq~2Gs1NaztwKp8olYv7jX5hxw~prFEKTNX93ZLaezU7YsEuEj-ez~gvoumJGMvyTZjSNQMTbTyCsGbqeEENgyhZkYdlQNqt9OAkp1-ZoFq0YhRGF9bt4EygoHL3DdeSCgummytv3w86M0To-g0S39i7twVPtLsxyoS076uiRADbFVgPfYHH6MBfjiBhxtjhL5eOEbcbgrSDBd6waqEuPdIPUndeEa8Qz-Rovept~kAAAA
+update.dg.i2p=VF24ZkA7BpNnX5pjhhcqdQoopDX5JPLWRPidbAWXut8OMA4BGoCfGZo6hkT-WhHHOGi0OR89XqpZt6Pvf~KY-SahxNg8LD8FsWdLhaq~PXPi2H8ZGfEW7moEFm2sIlGbwQSWkFwQHmqRRvOs-YkuFFPeSRVMGzBkZGhT7~yJ9TjfpESJo~K4UEYZFp6l9BNj-kLeqEzXd4cCR8kYhubqvRGcdStNWyTPgIjZA~TffAQhR6RvLJovQbIaio8TXECFA1WE4rlX7FXlZt2DLGUhmZMEOisTS3-bH5axZID0461X8nEs~z-DuPl6CO7KFnxspWmA1gNk7Hdwcn4Jzy9bRg-2W4B2Dhh-k7wIi1lI-Tebbvpnx~cwoGjalpW95DomqcxQThQ7ffHtCIZw0GwM9ZJD-diB5zR~jDLCEr8VfiNpHuKzFb3z45QowTo4woXBU1wY0FV0cXYXrVjWz10v96bN3~v99Fp8yFJTbCNwsCf9sOl6ymqJj7l4j~xyxAouAAAA
+open4you.i2p=kvx2~4uxYZRqvfzfgT5i5JdXpk~d9HFc7l-pH4aH5yFdlSgolgW2Nekt6tVLqlpkIzzNCz90JXwTMEttqzpI~slMNCGUQLhAemW8nNIn7QUy-~dfs4myHUhopXpeTQ6~sY8hLXqIwCvSgPBGwsTl460PEfwY-pYSddBaOX4zKOSNEDPIUTbDjuIXUR-MQtILdY4O9zB8cyM9en~hcMHkEIPbKD6JKY3f2daQ4-IrowPk4-I7OKXC3Uns1oZkojjYwejHleHjozESP5lkNThWnIty0YCQp6zIJqtI-i1Yn1602d~DJoS9uUQOZJrGS89pVHX0tkHLB6LKmgKHoi--Hh6UJj47y1RMlaZwWUvY8NgTgynhBnXtMccdedRO8JklXpWiLNrOo-e4oImtLWmHYUODUia3KrnS69yLOJSSCDstLDEz0xb~J8H2cJ-U5-YyEjWiFkENbEFBzrTgvp0qHVGUYVmGZ3oPs-1l3p9C~6xG1Mx3tj-YXMloY3gH5sTiAAAA
+salt.i2p=6V5XXGZN69jV~QhveTsA4by1Ct8Q9qljltW825zuxHAsjwZWV7vngzbucllm1mDjJmE~zPq5YMho9klEgK~Ep8LIWBZ6owbB~bj5NETD2GZgGKyqN0TkwymzUFTfmqGqRxkMdTrK0poCajdTTCq5ukrmpXFz2-~twJFlQoMufaZBPcG-NqKs10c2aehUl7UbOmzr5zYHfjjtwOgf3acXnF8PRmA8tFHLD6DHA4k9YJCBVi1w6Eskeasb-sW~7DYoJc~je7xocpxJO~GziLz2fQO~2cdI5BOFmhPfOQaMhR1WFE3MRSbLEt2zNXhNlZWTCrS-Oj4c2p6qtRNRsDQvxzBZwOzRzvucB2K3WMFreY7qfS-WS5LWJxl95~DsHGwf~sqqAQF8q02gBw2Ap6kel-tijjAMXxrJw09XIQy0LbV7g1qYHG-quZRdWpEMe-LTstSmwN0C1v39QwOQhwgqYFz~OJ1HikINdf9H4Syz2HnaNDT-AOYztdUdB6z7Lwt6AAAA
+no.i2p=8jISadUQuR~kZ9YzZxfQwSQRdhY~gkTSgy4l33jKOAraoqSmb~IcoeN5xOXyhtX8gxKEb03-48zPZnso83TwcTFg66~Cu38a59fG0h~vy~WIY5x5CwfkoCFqYmo4OzdnTY-2TcQ2ZN44VA6Sx48UXjEsSdrvn0SfaeMAW5It-N6MAV23Qgc5NgRTVJ6YS74FnRZCy6uGU-RPz1HQQIH~byW-NHBmXAW2Bmv2Kq3bHVHY9tb4d8yfrhlnaf3bfhLeELUbtBnXhLd3Zs2kX6Afz7ofDkpmaygYO6XA8QNIVcM2ub6-jSdsly~EXBtRDzF0WSbT9v8rvpop5TxjwXAnTjbS09Qq8x2Bl8wfkkPz45beN0Je7wrxp0SBk5DHhhvVbbyFUS7bDn1~aTvE7Ujq8ael3myR56jb8NlYiXaiJYgwPXpXx5gSDf8rBaDIdJsSSHWv~DqOfJ1BkhADCEfGZ3QMFY7uWrXGuj0J3OYEvonV-deMoh6pYKtgcFiewJgjAAAA

i2p2www/static/news/news.xml

@@ -1,68 +1,19 @@
 <!--
-<i2p.news date="$Date: 2013-05-28 00:00:00 $">
-<i2p.release version="0.9.6" date="2013/05/28" minVersion="0.6" su2Torrent="magnet:?xt=urn:btih:04db7bbdb2d294ae356a3ae7dadf7b8fda73de3a&dn=i2pupdate-0.9.6.su2&tr=http://tracker2.postman.i2p/announce.php" sudTorrent="magnet:?xt=urn:btih:9318bcfcf1f2242f219d9e1c0bdb73c415190de4&dn=i2pupdate-0.9.6.sud&tr=http://tracker2.postman.i2p/announce.php" />
+<i2p.news date="$Date: 2013-12-07 00:00:00 $">
+<i2p.release version="0.9.9" date="2013/12/07" minVersion="0.6.1.10" minJavaVersion="1.5" su2Torrent="magnet:?xt=urn:btih:1b7c65123b9edb8fce7fda3fd90aa87bf77805ca&dn=i2pupdate-0.9.9.su2&tr=http://tracker2.postman.i2p/announce.php" su3Torrent="magnet:?xt=urn:btih:8dd078d9cc284e899943e9bfaffb046cdbe24a05&dn=i2pupdate-0.9.9.su3&tr=http://tracker2.postman.i2p/announce.php" />
 -->
 <div lang="en">
-<h3>2013-05-28: <b>0.9.6 <a href="http://www.i2p2.i2p/release-0.9.6.html">Released</a></b></h3>
-
-<p>0.9.6 includes bug fixes and an update from Jetty 6.1.26 (2010-11-10) to Jetty 7.6.10 (2013-03-12).
- See below for important information on the Jetty update. The Jetty 7 series is actively maintained and
- we plan to stay current with it in future I2P releases.</p>
-
-<p>Most users will update via HTTP. Those running development builds will attempt to update via the
- experimental in-network bittorrent with i2psnark. We've fixed some bugs that will enable more users
- to update via torrent in the 0.9.7 update cycle.</p>
-
-<p><strong>Important fix for Windows Eepsites, first install 0.9.5 only</strong></p>
-
-<p>If you first installed I2P with version 0.9.5, on Windows only, we recommend that you follow the
- following instructions to fix your eepsite location <strong>before</strong> you update to 0.9.6.
- Only original installations of 0.9.5-0 on Windows are affected by this issue. If your router version
- is 0.9.5-0-win1, you already have the fix and need not take any action.
-<br />See <a href="http://www.i2p2.i2p/ticket919">www.i2p2.i2p/ticket919</a>
- or <a href="http://www.i2p2.de/ticket919">www.i2p2.de/ticket919</a> for instructions.</p>
-
-<p><strong>Jetty 7 Migration Details</strong></p>
-
-<p><strong> For most people, the update should just work. If you have multiple Jetty eepsites,
- OR have made changes to jetty.xml or other Jetty configuration files, including changing the port
- from 7658, you MUST take manual action AFTER updating.</strong></p>
-
-<p>* After update, the router will migrate your jetty.xml files to the new Jetty 7 format.</p>
-
-<p>* The migration resets the port to 7658. If you have more than one Jetty eepsite, OR your eepsite
- is NOT on port 7658, OR you have made other modifications to jetty.xml (for example changing the
- listen address from 127.0.0.1 to 0.0.0.0), you MUST edit the jetty.xml file for each eepsite to fix them up
- after updating, and restart again.</p>
-
-<p><strong>The following files will be backed up with a &quot;.jetty6&quot; suffix and then migrated.</strong>
- If you have made local changes, you may have to edit them manually and restart.
- See <a href="http://wiki.eclipse.org/Jetty">http://wiki.eclipse.org/Jetty</a> for assistance
- in configuring Jetty 7.</p>
-
-<p>* ~/.i2p/clients.config
-<br />* ~/.i2p/eepsite/jetty.xml
-<br />* ~/.i2p/eepsite/jetty-rewrite.xml
-<br />* ~/.i2p/eepsite/jetty-ssl.xml
-<br />* ~/.i2p/eepsite/contexts/base-context.xml
-<br />* ~/.i2p/eepsite/contexts/cgi-context.xml
-<br />* ~/.i2p/eepsite/etc/webdefault.xml</p>
-
-<p><strong>Plugins</strong></p>
-
-<p>Most plugins should work fine with Jetty 7.
- The I2PControl and zzzot plugins must be updated. Your router should download and install
- the new versions shortly after starting 0.9.6.
- If a plugin does not work, please contact the maintainer for that plugin.
-
-</p><p>
-Say hello to the volunteers on the <a href="irc://127.0.0.1:6668/i2p-help">#i2p-help IRC channel</a>.
-<a href="http://www.i2p2.i2p/getinvolved.html">Get involved</a>,
-spread the word,
-and <a href="http://www.i2p2.i2p/donate.html">donate</a>!
-If you find a bug, please enter a report on <a href="http://trac.i2p2.i2p/report/1">trac</a>.
-To help on translations,
-volunteer on <a href="irc://127.0.0.1:6668/i2p">IRC #i2p-dev</a>
-or sign up on <a href="https://www.transifex.net/projects/p/I2P/">Transifex</a>.
+<h3>2013-12-07: <b>0.9.9 <a href="http://www.i2p2.i2p/release-0.9.9.html">Released</a></b></h3>
+<p>0.9.9 fixes a number of bugs in the netdb, streaming, and i2ptunnel,
+and starts work on a year-long plan to increase the strength
+of the cryptographic signing algorithms used in the router, and support multiple algorithms
+and key lengths simultaneously. Automatic update files will now be signed with 4096-bit keys.
+We now support SSL between your router and your servers for security.
+See <a href="http://zzz.i2p/topics/1495">http://zzz.i2p/topics/1495</a> for more information.</p>
+<p>
+Several of us will be at <a href="https://events.ccc.de/congress/2013/wiki/Main_Page">30C3</a> this year.
+Look for us under the I2P banner or at the
+<a href="https://events.ccc.de/congress/2013/wiki/Assembly:Youbroketheinternet">YBTI Assembly</a>.
+Come say hi and ask for stickers!
 </p>
 </div>

i2p2www/static/styles/duck/default.css

@@ -30,12 +30,20 @@ div#topbar {
     position:relative;
 }
 
+div#topbar #logo {
+    float: left;
+}
+
 div#topbar #logo img:hover {
     filter:alpha(opacity=60);
     -moz-opacity: 0.6;
     opacity: 0.6;
 }
 
+nav {
+    clear: both;
+}
+
 div#content {
     display:block;
 }
@@ -70,7 +78,6 @@ div#content .main h1 {
 .main .get-i2p {
     display:block;
     top:50%;
-    height:1em;
     padding:.5em;
     line-height:1em;
     font-size:2em;
@@ -166,13 +173,18 @@ div#content .inner h1, div#content .inner h2, div#content .inner h3, div#content
     color:white;
     text-shadow:1px 1px 1px rgba(0,0,0,.3);
     margin:1em 0 .5em;
-    border-bottom:1px solid white;
     padding-bottom:.2em;
+    clear:both;
+}
+
+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:0em 0 1em;
+    text-align: center;
     width:auto;
 }
 
@@ -240,6 +252,18 @@ div#content .inner td.blue {
     padding: 5px;
 }
 
+/*
+ * Threat model
+ */
+
+div#content .inner ul.DREAD {
+    border: 2px solid red;
+    float: left;
+    list-style: none;
+    margin: 1em 1.5em 1em 0;
+    padding: 0.5em;
+}
+
 /*
  * Additions to syntax.css
  */

i2p2www/static/styles/duck/desktop.css

@@ -19,8 +19,8 @@ div#topbar {width:80%; /*margin:1em auto;*/ margin: 1em auto 0; position:relativ
     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; line-height:41px; vertical-align:middle;
-        max-width: 70%; text-align: right;
+        /*position:absolute;*/ top:0; right:0; line-height:41px; vertical-align:middle;
+        /*max-width: 70%;*/ text-align: right;
     }
     div#topbar .languages {
         display: none;
@@ -227,15 +227,17 @@ div#content .main {
     text-shadow:1px 1px 2px rgba(0,0,0,.3); color:white; margin-bottom:.5em;}
     .main .get-i2p {
         position:absolute; display:block; top:50%; right: 10%;
-        margin-top:-1em; height:1em; padding:.5em; line-height:1em;
+        margin-top:-1em; max-width:20%; padding:.5em; line-height:1em;
         font-size:2em; color:white; font-family:Arial, Helvetica, sans-serif; font-weight:bold; 
         text-transform:uppercase; text-decoration:none; text-align:center; 
         background:green; border-radius:.3em; -moz-transform:rotate(-5deg); 
+        transform:rotate(-5deg); -webkit-transform:rotate(-5deg);
+        -ms-transform:rotate(-5deg); -o-transform:rotate(-5deg);
         text-shadow:1px 1px 1px rgba(0,0,0,.2);
         box-shadow:2px 2px 4px rgba(0, 0, 0, 0.3), 1em 3em 2em 0.5em rgba(255, 255, 255, 0.3) inset, inset -.2em -.5em 1em -0em rgba(0,0,0,.3)}
     .main .get-i2p:hover {box-shadow:2px 2px 2px rgba(0, 0, 0, 0.3), inset 0 -2.2em 2.2em rgba(255, 255, 255, 0.3), inset .2em .5em 1em 0em rgba(0,0,0,.3);}
     div#content .aside-wrap {width:80%; margin:2em auto;}
-    div#content .aside {position:relative; width:30.9%; margin-left:3%;    display:inline-block; vertical-align:top; font-size:1.2em}
+    div#content .aside {position:relative; width:30.9%; margin-left:3%;    display:inline-block; vertical-align:top; font-size:1.3em}
         div#content .aside:first-child {margin-left:0%;}
         div#content .aside a {font-weight:bold;}
         div#content .aside h1 {padding:1em 0; border-bottom:1px solid rgba(171, 204, 113, 0.6); font-size:1.4em; color:#222200; text-shadow:1px 1px 1px rgba(0,0,0,.3)}
@@ -269,12 +271,8 @@ div#content .main {
         width:auto; margin: 0 5%; padding: 4em 5% 2em; position:relative;
         background: rgba(171, 204, 113, 0.6); 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;
+        color:black; font-size:1.3em; line-height:1.4em;
     }
-    div#content .inner h1, div#content .inner h2, div#content .inner h3 {color:white; text-shadow:1px 1px 1px rgba(0,0,0,.3); margin:1em 0 .5em; border-bottom:1px solid white; padding-bottom:.2em;}
-    div#content .inner h1 {font-size:2.2em; margin:0em 0 1em;  width:auto;}
-    div#content .inner h2 {font-size:1.6em;}
-    div#content .inner h3 {font-size:1.4em;}
     div#content .inner ol {margin:1.5em;}
     div#content .inner ul {margin:1.5em; 1em;}
     div#content .inner p {margin:1em 0;}

i2p2www/static/styles/pubs.css

@@ -0,0 +1,140 @@
+SPAN.title {
+  font-family: lucida, "Lucida Sans Unicode", Geneva, sans-serif;
+  font-weight: bold;
+}
+
+SPAN.author {
+  font-family: lucida, "Lucida Sans Unicode", Geneva, sans-serif;
+  font-weight: normal;
+}
+
+SPAN.availability {
+  font-family: lucidatypewriter, "Lucida Typewriter", Monaco, "Lucida Sans Unicode", monospace;
+  font-weight: normal;
+}
+
+SPAN.author A {
+  font-family: lucida, "Lucida Sans Unicode", Geneva, sans-serif;
+  font-weight: normal;
+}
+
+SPAN.biblio {
+  font-family: lucida, "Lucida Sans Unicode", Geneva, sans-serif;
+  font-style: italic;
+}
+
+SPAN.biblio A {
+  font-family: lucida, "Lucida Sans Unicode", Geneva, sans-serif;
+  font-weight: normal;
+  text-decoration: underline;
+}
+
+SPAN.bad {
+  text-decoration: underline;
+  color: #000;
+  background-color: #FDF;
+}
+
+P.remarks {
+  font-family: serif;
+  margin-top: 0.3em;
+  margin-bottom: 0;
+  margin-left: 5em;
+  padding-left: 0.5em;
+  border-width: 0 0 0 5px;
+  border-color: black;
+  border-style: solid;
+}
+
+P.remarks A {
+  text-decoration: underline;
+}
+
+P.l1 {
+  margin-left: 0.5em;
+}
+
+P.l2 {
+  margin-left: 1em;
+  margin-top: 0.3em;
+  margin-bottom: 0.3em;
+}
+
+P.entry {
+  margin-top: 0.7em;
+  margin-bottom: 0;
+}
+
+DIV.impEntry {
+  border-width: 1px;
+  border-color: black;
+  border-style: solid;
+  background-color: #FFE;
+  padding: 0.3em;
+  margin-top: 0.7em;
+  margin-bottom: 0;
+}  
+
+P.impEntry {
+  background-color: #FFE;
+  padding: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+DIV.draftEntry {
+ /*
+  border-width: 1px;
+  border-color: black;
+  border-style: solid;
+  padding: 0.3em;
+  margin-top: 0.7em;
+  margin-bottom: 0;
+*/
+}  
+
+P.draftEntry {
+ color: #555;
+  padding: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+TABLE.sidebar {
+  border-width: 2px;
+  border-color: black;
+  border-style: solid;
+  background-color: #CFF;
+}
+
+TD {
+  border: none !important;
+  vertical-align: top;
+}
+
+TD.bibtex {
+  font-family: lucidatypewriter, "Lucida Typewriter", Monaco, "Lucida Sans Unicode", monospace;  
+  border-width: 2px;
+  font-weight: normal; 
+  border-color: black;
+  border-style: solid;
+  background-color: #DFF;
+}
+
+PRE.bibtex {
+  font-family: lucidatypewriter, "Lucida Typewriter", Monaco, "Lucida Sans Unicode", monospace; 
+  font-size: smaller;
+}
+
+UL {
+  list-style: outside;
+}
+
+UL.expand {
+  margin-bottom: 1em;
+}
+
+UL.sections {
+  list-style: none;
+  vertical-align: top;
+}