Merge branch 'develop'
diff --git a/weinre.build/build.properties b/weinre.build/build.properties
index caf374a..14f8f76 100644
--- a/weinre.build/build.properties
+++ b/weinre.build/build.properties
@@ -29,6 +29,5 @@
PROJECT_BUILD: ${PROJECT_PREFIX}.build
PROJECT_DOC: ${PROJECT_PREFIX}.doc
PROJECT_SERVER: ${PROJECT_PREFIX}.server
-PROJECT_SERVER_ANDROID: ${PROJECT_PREFIX}.server.android
PROJECT_WEB: ${PROJECT_PREFIX}.web
diff --git a/weinre.build/build.xml b/weinre.build/build.xml
index 01274ee..b6893b3 100644
--- a/weinre.build/build.xml
+++ b/weinre.build/build.xml
@@ -256,8 +256,10 @@
<build-html name="TestDrive" oDir="${WEB}/doc" iDir="../${PROJECT_DOC}"/>
<build-html name="ChangeLog" oDir="${WEB}/doc" iDir="../${PROJECT_DOC}"/>
- <move file="${WEB}/doc/Home.html" tofile="${WEB}/doc/index.html"/>
+ <copy file="${WEB}/doc/Home.html" tofile="${WEB}/doc/index.html"/>
+ <copy todir="${WEB}/doc/images" file="../${PROJECT_WEB}/images/weinre-icon-64x64.png"/>
+
<copy todir="${WEB}/doc/css"> <fileset dir="../${PROJECT_DOC}/css"/> </copy>
<copy todir="${WEB}/doc/images"> <fileset dir="../${PROJECT_DOC}/images"/> </copy>
<copy todir="${WEB}/doc/scripts"> <fileset dir="../${PROJECT_DOC}/scripts"/> </copy>
@@ -394,10 +396,6 @@
<zipfileset dir="${WEB}" prefix="web"/>
</jar>
- <delete dir="../${PROJECT_SERVER_ANDROID}/lib"/>
- <mkdir dir="../${PROJECT_SERVER_ANDROID}/lib"/>
- <copy file="${OUT}/weinre.jar" todir="../${PROJECT_SERVER_ANDROID}/lib"/>
-
</target>
<!-- ============================================================
diff --git a/weinre.doc/ChangeLog.body.html b/weinre.doc/ChangeLog.body.html
index 9acd72a..9429aba 100644
--- a/weinre.doc/ChangeLog.body.html
+++ b/weinre.doc/ChangeLog.body.html
@@ -6,7 +6,7 @@
-->
<!-- ======================================================================= -->
-<h2>2011/04/09 - version 1.4.0</h2>
+<h2>2011/05/09 - version 1.4.0</h2>
<ul>
<li> better calculation of object's class name. closes <a href="https://github.com/pmuellr/weinre/issues/41">issue 41</a>.
<li> initial set of changes in for extensions. closes <a href="https://github.com/pmuellr/weinre/issues/8">issue 8</a>.
diff --git a/weinre.doc/Home.body.html b/weinre.doc/Home.body.html
index 73e4219..0fa4ea6 100644
--- a/weinre.doc/Home.body.html
+++ b/weinre.doc/Home.body.html
@@ -97,6 +97,15 @@
how to use it, visit the <a href="TestDrive.html">Test Drive</a>.
<!-- ======================================================== -->
+<h2>Places</h2>
+
+<ul>
+<li>GitHub: <a href="https://github.com/pmuellr/weinre">https://github.com/pmuellr/weinre</a>
+<li>Documentation: <a href="http://pmuellr.github.com/weinre">http://pmuellr.github.com/weinre</a>
+<li>Google Group: <a href="http://groups.google.com/group/weinre">http://groups.google.com/group/weinre</a>
+</ul>
+
+<!-- ======================================================== -->
<h2>Supported Libraries and Platforms</h2>
<p>Generally version numbers listed here are the earliest
diff --git a/weinre.doc/boilerplate-header.html.txt b/weinre.doc/boilerplate-header.html.txt
index ed36aff..eff65b5 100644
--- a/weinre.doc/boilerplate-header.html.txt
+++ b/weinre.doc/boilerplate-header.html.txt
@@ -11,6 +11,7 @@
<head>
<title>weinre - @PAGE_NAME@</title>
<link rel="stylesheet" href="css/main.css" type="text/css">
+<link rel="shortcut icon" href="images/weinre-icon-64x64.png" />
<script src="scripts/main.js"></script>
<script type="text/javascript">
@@ -29,13 +30,13 @@
<body>
-<a href="https://github.com/pmuellr/weinre"><img style="position: absolute; top: 0; left: 0; border: 0;" src="https://assets0.github.com/img/5d21241b64dc708fcbb701f68f72f41e9f1fadd6?repo=&url=http%3A%2F%2Fs3.amazonaws.com%2Fgithub%2Fribbons%2Fforkme_left_red_aa0000.png&path=" alt="Fork me on GitHub"></a>
+<a class="no-decoration" href="https://github.com/pmuellr/weinre"><div class="ribbon">Fork weinre on GitHub</div></a>
<!-- ======================================================================= -->
<h1 class="page-title">weinre - @PAGE_NAME@</h1>
<div class="toc">
- <a href="index.html">Home</a>
+ <a href="Home.html">Home</a>
- <a href="TestDrive.html">Test Drive</a>
- <a href="Installing.html">Installing</a>
- <a href="Running.html">Running</a>
diff --git a/weinre.doc/boilerplate-trailer.html.txt b/weinre.doc/boilerplate-trailer.html.txt
index b16be62..7c782f5 100644
--- a/weinre.doc/boilerplate-trailer.html.txt
+++ b/weinre.doc/boilerplate-trailer.html.txt
@@ -10,7 +10,7 @@
<div class="toc">
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
<p>
- <a href="index.html">Home</a>
+ <a href="Home.html">Home</a>
- <a href="TestDrive.html">Test Drive</a>
- <a href="Installing.html">Installing</a>
- <a href="Running.html">Running</a>
diff --git a/weinre.doc/css/main.css b/weinre.doc/css/main.css
index d3fd04c..850bd78 100644
--- a/weinre.doc/css/main.css
+++ b/weinre.doc/css/main.css
@@ -11,6 +11,28 @@
}
/*-----------------------------------------------------------------*/
+.ribbon {
+ position: absolute;
+ top: 0;
+ left: 0;
+ border-right: thin solid #000;
+ border-bottom: thin solid #000;
+ -moz-border-radius-bottomright: 0.5em;
+ -webkit-border-bottom-right-radius: 0.5em;
+ padding: 0.25em 0.5em;
+ background-color: #FF0;
+ font-style: italic;
+ -webkit-box-shadow: 5px 5px 15px #888;
+ -moz-box-shadow: 5px 5px 15px #888;
+ box-shadow: 5px 5px 15px #888;
+}
+
+/*-----------------------------------------------------------------*/
+.no-decoration {
+ text-decoration: none;
+}
+
+/*-----------------------------------------------------------------*/
.weinre {
color: #088;
font-style: italic;
