add readme to phar file

diff --git a/.gitignore b/.gitignore
index 9e22a9e4dfa41b5511a79e546e16b1da223dce1d..71d8b887ac85e71783cd78650996e321859934b5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /lib/
 /dist/
 /www/*.phar
+/www/README.html

diff --git a/build.xml b/build.xml
index e855ae93a40f3292c667251220a4f8bdcf40adb9..8d18b1c6f824c50d4e3544dc7eddfbe25f58e011 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -13,6 +13,7 @@
   <include name="www/**"/>
 
   <include name="README.rst"/>
+  <include name="www/README.html"/>
 
   <exclude name="data/phancap.config.php"/>
   <exclude name="www/imgcache/"/>
@@ -22,7 +23,7 @@
 
  <typedef name="pearPackageFileSet" classname="phing.types.PearPackageFileSet" />
 
- <target name="phar" depends="collectdeps"
+ <target name="phar" depends="collectdeps,docs"
          description="Create zip file for release"
  >
   <mkdir dir="${phing.dir}/dist/"/>
@@ -63,7 +64,7 @@
 
 
  <target name="docs" description="render documentation">
-  <rst file="README.rst"/>
+  <rst file="README.rst" destination="www/README.html"/>
  </target>
 
 </project>

diff --git a/www/index.php b/www/index.php
index bc43e227cd4c781c9fe7f1a1c24ea6f854370a00..27deb635fd99f12b41ff3402d21636c94b80ce0e 100644 (file)
--- a/www/index.php
+++ b/www/index.php
@@ -33,25 +33,45 @@ header('HTTP/1.0 200 OK');
      <div class="page-header">
       <h1>phancap</h1>
      </div>
-     <p>
-      Web service to create website screenshots.
-     </p>
 
-     <div class="panel panel-default">
-      <div class="panel-heading">Create website screenshot</div>
-      <div class="panel-body">
-       <form method="get" action="./get.php" class="form-inline" role="form">
-        <div class="form-group">
-         <label for="url">URL:</label>
-         <input type="text" name="url" id="url" size="30" class="form-control"
-                placeholder="http://example.org/" />
+     <div class="row">
+      <div class="col-md-6">
+       <p>
+        Web service to create website screenshots.
+       </p>
+
+      </div>
+      <div class="col-md-6">
+
+       <div class="panel panel-default">
+        <div class="panel-heading">Create screenshot</div>
+        <div class="panel-body">
+         <form method="get" action="./get.php" class="form-inline" role="form">
+          <div class="form-group">
+           <label for="url">URL:</label>
+           <input type="text" name="url" id="url" size="30" class="form-control"
+                  placeholder="http://example.org/" />
+          </div>
+          <button type="submit" class="btn btn-default">Go</button>
+         </form>
         </div>
-        <button type="submit" class="btn btn-default">Go</button>
-       </form>
+       </div>
+
       </div>
      </div>
 
 
+     <h2 id="tools">Tools</h2>
+     <ul class="list-group">
+      <li class="list-group-item">
+       <a href="setup.php">Setup check</a> to test if everything is ok
+      </li>
+      <li class="list-group-item">
+       <a href="README.html">README</a>
+      </li>
+     </ul>
+
+
      <h2 id="api">API</h2>
      <p>
       The API is accessible at <a href="get.php">get.php</a>.
@@ -105,13 +125,6 @@ foreach ($options->options as $name => $option) {
       <dt><tt>PT4H</tt></dt><dd>4 hours</dd>
      </dl>
 
-     <h2 id="tools">Tools</h2>
-     <ul class="list-group">
-      <li class="list-group-item">
-       <a href="setup.php">Setup check</a> to test if everything is ok
-      </li>
-     </ul>
-
     </div>
    </div>
   </div>