From 5e498e0bd6f9f8c6f6a877cbf41ea3f5eedc5531 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 21 Jul 2009 15:46:47 +0000 Subject: [PATCH] * Console: Drop top-level css, unused now * Eepsite: Add default robots.txt (thanks v1v4) --- build.xml | 4 +- history.txt | 8 + installer/resources/robots.txt | 78 ++++++++ .../resources/themes/console/console.css | 118 ------------ .../resources/themes/console/default.css | 182 ------------------ .../resources/themes/console/i2ptunnel.css | 178 ----------------- .../src/net/i2p/router/RouterVersion.java | 2 +- 7 files changed, 89 insertions(+), 481 deletions(-) create mode 100644 installer/resources/robots.txt delete mode 100644 installer/resources/themes/console/console.css delete mode 100644 installer/resources/themes/console/default.css delete mode 100644 installer/resources/themes/console/i2ptunnel.css diff --git a/build.xml b/build.xml index 4170f6453..f3832ced9 100644 --- a/build.xml +++ b/build.xml @@ -305,6 +305,7 @@ + @@ -319,8 +320,7 @@ - - + diff --git a/history.txt b/history.txt index 895fa73de..e0fc519c2 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,11 @@ +2009-07-21 zzz + * configclients.jsp: Close anchor + * Console: Drop top-level css, unused now + * Eepsite: Add default robots.txt (thanks v1v4) + * GeoIP: Add license info + * HTTP Proxy: Additional proxy.i2p restrictions + * ServiceManager: Drop, unused + 2009-07-20 zzz * BuildHandler: Increase threshold for dropping instead of rejecting to 81% (was 75%) diff --git a/installer/resources/robots.txt b/installer/resources/robots.txt new file mode 100644 index 000000000..2bc97ddb1 --- /dev/null +++ b/installer/resources/robots.txt @@ -0,0 +1,78 @@ +# +# robots.txt for your eepsite +# +# You can use this file to control how web crawling robots (for example search +# engine robots like the Googlebot) index your site. Only well-behaving robots +# will abide the rules you set in this file, thankfully those are a majority. + +# Robots that do not abide the robots.txt rules will be able to index anything +# they find. So be aware that this file does not allow you to actually lock +# anyone out. It is voluntary. + +# Keep this file in the root of your site, ie: myeepsite.i2p/robots.txt + +# Remove the # in front of lines you want to use (uncomment). By default robots +# are allowed to index your whole site. + +##### Syntax: + +# User-agent: Botname +# Disallow: /directory/to/disallow/ + +# You can use a * in the User-agent field to select all robots: +# User-agent: * + +# You can not use * as a wildcard in the Disallow string. + +# To allow indexing your whole site you leave the Disallow field empty: +# Disallow: + +##### Examples: + +# At the time of writing there are only two active search engines in the +# I2P network: http://eepsites.i2p and http://yacysearch.i2p +# Because eepsites.i2p does abide robots.txt but not the User-agent string, the +# Yacybot is used in these examples. + +# To control the eepsites.i2p robot you can use the HTML tag instead. +# Example: +# If the robot sees above line it will neither index that url not will it +# follow links on it to further pages. +# Options for the content attribut are: INDEX or NOINDEX and FOLLOW or NOFOLLOW. +# You can also use to disable caching. + +# To allow Yacy to access anything but disallow all other robots: +# User-agent: yacybot +# Disallow: +# User-agent: * +# Disallow: / + +# To disallow Yacy from accessing anything: +# User-agent: yacybot +# Disallow: / + +# To disallow Yacy from accessing the /stuff/ directory, eg me.i2p/stuff/ : +# User-agent: yacybot +# Disallow: /stuff/ + +# If Google was crawling I2P and you would not want them to index your site +# User-agent: Googlebot +# Disallow: / + +# To disallow any well-behaving robots from accessing your /secret/ and +# /private/ directories: +# Keep in mind that this is NOT blocking anyone else. Use proper authentication +# if you want your private and secret things to stay private and secret. Also +# everyone can read the robots.txt file and see what things you want to hide. +# User-agent: * +# Disallow: /secret/ +# Disallow: /private/ + +# Disallow robots to index a specific file: +# User-agent: * +# Disallow: /not/thisfile.html + +# Allow everyone to access everything. This rule is active by default. +# Comment it with # at the start of the line to disable it. +User-agent: * +Disallow: \ No newline at end of file diff --git a/installer/resources/themes/console/console.css b/installer/resources/themes/console/console.css deleted file mode 100644 index 70fdff24c..000000000 --- a/installer/resources/themes/console/console.css +++ /dev/null @@ -1,118 +0,0 @@ -body { - font-family: Verdana, Tahoma, Helvetica, sans-serif; - margin: 1em 0em; - padding: 0em; - text-align: center; - background-color: white; - color: black; - font-size: 100%; -} - -.hide { - display: none; -} - -img { - border: none; -} - -pre { - width: 100%; - overflow-x: scroll; -} - -div.logo { - float: left; - width: 200px; - left: 1em; - top: 1em; - margin: 0em; - padding: .5em; - text-align: center; - display: none !important; -} - -div.toolbar { - margin: 0em 0em 2em 0em; - font-weight: bold; - display: none !important; -} - -div.routersummaryouter { - float: left; - width: 200px; - margin: 0; - padding: 0; - border: 0; - clear: left; /* fixes a bug in Opera */ - overflow: auto; -} - -div.routersummary { - background-color: #fafaff; - width: 175px; - color: inherit; - margin: 0em; - padding: 5px; - text-align: left; - border: medium solid #efefff; - font-size: 0.82em; -} - -div.warning { - margin: 0em 1em 1em 224px; - padding: .5em 1em; - background-color: #ffefef; - border: medium solid #ffafaf; - text-align: left; - color: inherit; -} - -div.main { - margin: 0em 1em 1em 224px; - padding: .5em 1em; - background-color: #ffffef; - border: medium solid #ffffd0; - text-align: left; - color: inherit; -} - -div.main textarea { - width: 100% !important; -} - -div.news { - margin: 0em 1em 1em 224px; - padding: .5em 1em; - background-color: #ffffc0; - border: medium solid #ffffa0; - text-align: left; - color: inherit; -} - -div.confignav { - padding: 1em; - background-color: #efefff; -} - -div.configure { - padding: 1em; - background-color: #ffffc0; -} - -div.messages { - padding: 1em; - background-color: #fafaff; -} - -div.messages span.error { - color: #d00000; -} - -div.messages span.notice { - font-style: italic; -} - -h1 { -font-size: 16pt; -} \ No newline at end of file diff --git a/installer/resources/themes/console/default.css b/installer/resources/themes/console/default.css deleted file mode 100644 index 88aa40d7f..000000000 --- a/installer/resources/themes/console/default.css +++ /dev/null @@ -1,182 +0,0 @@ -body { - margin : 0px; - padding : 0px; - text-align : center; - font-family : Arial, Helvetica, sans-serif; - background-color : #ffffff; - color : #000000; - font-size : 100%; - - /* we've avoided Tantek Hacks so far, - ** but we can't avoid using the non-w3c method of - ** box rendering. (and therefore one of mozilla's - ** proprietry -moz properties (which hopefully they'll - ** drop soon). - */ - -moz-box-sizing : border-box; - box-sizing : border-box; -} - -div { - -moz-box-sizing : border-box; - box-sizing : border-box; -} - -h4, label { - margin : 0px; - padding : 2px; - float : left; - width : 150px; - height : 24px; - font-weight : bold; - text-align : right; - font-size : 1.0em; - -moz-box-sizing: border-box; - box-sizing : border-box; -} - -h4 { - font-size : 1.2em; - text-align : center; - width : 750px; -} - -a { - text-decoration : none; -} - -form { - margin : 0px; -} - -textarea, input, select, button, a { - font-family : Arial, Helvetica, sans-serif; - -moz-box-sizing : border-box; - box-sizing : border-box; - font-size : 1.0em; - float : left; -} - -button { - float : none; -} - -textarea { - border : 1px solid #ddddc0; -} - -br { - clear : left; -} - -div.statusNotRunning { - float : left; - width : 82px; - height : 24px; - color : #dd0000; -} -div.statusRunning { - float : left; - width : 82px; - height : 24px; - color : #00dd00; -} -div.statusStarting { - float : left; - width : 82px; - height : 24px; - color : #339933; -} - -hr { - display : none; -} - -.separator, .subdivider { - clear : both; - height : 1px; - margin : 3px 0px 3px 0px; - border-bottom : 1px solid #ddddc0; -} - -.subdivider { - border-bottom : 1px dashed #ddddc0; -} - -.freetext { - width : 150px; - height : 22px; - border : 1px solid #aaaac0; -} - -.control { - margin : 0 4px 0 0; - padding : 0 0 4px 0; - overflow : hidden; - height : 20px; - width : 60px; - font-weight : normal; - background-color : #dddddd; - color : black; - border : 1px outset #ddddc0; - text-align : center; - white-space : nowrap; -} - -.control:hover { - background-color : #ffffed; -} - -.control:active { - border : 2px inset; -} - -.panel { - width : 760px; - margin : 16px auto 16px auto; - overflow : hidden; - text-align : left; - font-size : 0.8em; - background-color : #ffffef; - border : 4px solid #ffffd0; -} - -.panel .footer { - float : right; - padding : 4px; -} - -.toolbox { - float : right; -} - -.rowItem { - width : 750px; - float : left; - margin : 0px; -} - -.comment { - font-style : italic; -} - -.text { - height : 24px; - width : 150px; - padding : 2px 0 0 2px; - float : left; - margin : 0; -} - -.accessKey { - text-decoration : underline; -} - -#globalOperationsPanel { - background-color : #ffefef; - border : 4px solid #ffd0d0; -} - -#globalOperationsPanel .control { - width : 100px; -} diff --git a/installer/resources/themes/console/i2ptunnel.css b/installer/resources/themes/console/i2ptunnel.css deleted file mode 100644 index 814cab892..000000000 --- a/installer/resources/themes/console/i2ptunnel.css +++ /dev/null @@ -1,178 +0,0 @@ -/* I2P Tunnel Edit Page -*/ - -#tunnelEditPage input { - width : 458px; -} - -#tunnelEditPage select { - width : 308px; -} - -#tunnelEditPage option[selected] { - color: green; -} - -#tunnelEditPage #targetField, -#tunnelEditPage #accessField, -#tunnelEditPage #optionsField { - height : 48px; - width : 150px; -} -#tunnelEditPage #tunnelOptionsField { - height : 96px; - width : 150px; -} - -#tunnelEditPage #targetField label, -#tunnelEditPage #accessField label, -#tunnelEditPage #tunnelOptionsField label, -#tunnelEditPage #optionsField label{ - height : 48px; - width : 150px; -} - -#tunnelEditPage #reachField, -#tunnelEditPage #hostField, -#tunnelEditPage #depthField, -#tunnelEditPage #countField, -#tunnelEditPage #optionsHostField { - width : 304px; - margin-right: 4px; -} - -#tunnelEditPage #portField, -#tunnelEditPage #optionsPortField, -#tunnelEditPage #backupField, -#tunnelEditPage #varianceField { - width : 150px; - -} - -#tunnelEditPage #reachField label, -#tunnelEditPage #hostField label, -#tunnelEditPage #portField label, -#tunnelEditPage #optionsHostField label, -#tunnelEditPage #optionsPortField label, -#tunnelEditPage #depthField label, -#tunnelEditPage #countField label, -#tunnelEditPage #backupField label, -#tunnelEditPage #varianceField label { - text-align : left; - -} - -#tunnelEditPage #otherField label { - width : 300px; -} - -#tunnelEditPage #reachableByOther, -#tunnelEditPage #tunnelDepth, -#tunnelEditPage #tunnelQuantity, -#tunnelEditPage #targetHost, -#tunnelEditPage #clientHost { - width : 306px; -} - -#tunnelEditPage #port { - width : 80px; -} - -#tunnelEditPage #targetPort, -#tunnelEditPage #clientPort, -#tunnelEditPage #tunnelBackupQuantity, -#tunnelEditPage #tunnelVariance { - width : 150px; -} - -#tunnelEditPage #shared, -#tunnelEditPage #connectDelay, -#tunnelEditPage #startOnLoad { - width : 16px; -} - -#tunnelEditPage label { - width : 150px; - font-weight : bold; - text-align : right; - float : left; -} - -/* I2P Tunnel List Page -*/ - -#tunnelListPage .rowItem { - width : 150px; -} - -#tunnelListPage select { - width : 150px; -} - -#tunnelListPage textarea { - width : 750px; - height : 100px; - padding : 0 0 0 4px; -} - -#tunnelListPage .footer .control { - margin-left: 2px; -} - -#tunnelListPage .footer label { - text-align : right; - height : 24px; - width : 360px; - float : left; - -} - -/* Use Leary and Langridge content replacement methods (LIR) -** to embed accessibility information into the document. -** Should allow the lists to be rendered nicely by -** screen readers. (and lynx!) -*/ - -#tunnelListPage label { - height : 0; - width : 0; - overflow : hidden; -} - -#tunnelListPage .nameHeaderField label, -#tunnelListPage .portHeaderField label, -#tunnelListPage .typeHeaderField label, -#tunnelListPage .interfaceHeaderField label, -#tunnelListPage .targetHeaderField label, -#tunnelListPage .previewHeaderField label, -#tunnelListPage .statusHeaderField label { - text-align : left; - width : 150px; - height : 24px; - float : left; -} - -#tunnelListPage .targetField, -#tunnelListPage .targetField .text, -#tunnelListPage .targetHeaderField, -#tunnelListPage .targetHeaderField label { - width : 300px; -} - -#tunnelListPage .descriptionField, -#tunnelListPage .destinationField { - width : 750px; -} - -#tunnelListPage .descriptionField .text, -#tunnelListPage .destinationField input { - width : 450px; -} - -#tunnelListPage .descriptionField label, -#tunnelListPage .destinationField label { - text-align : right; - width : 150px; - height : 24px; - float : left; -} diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index ac1036698..32a2083be 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 16; + public final static long BUILD = 17; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;