You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ju...@apache.org on 2010/10/31 22:49:59 UTC

svn commit: r1029500 [9/9] - in /tika/site: ./ publish/ publish/0.5/ publish/0.6/ publish/0.7/ publish/css/ src/site/ src/site/resources/ src/site/resources/css/

Modified: tika/site/src/site/site.vm
URL: http://svn.apache.org/viewvc/tika/site/src/site/site.vm?rev=1029500&r1=1029499&r2=1029500&view=diff
==============================================================================
--- tika/site/src/site/site.vm (original)
+++ tika/site/src/site/site.vm Sun Oct 31 21:49:59 2010
@@ -176,112 +176,93 @@
     </style>
     <link rel="icon" type="image/png" href="$relativePath/tikaNoText16.png" />
     <script type="text/javascript">
-      function getBlank(form, stdValue) {
-        if (form.value == stdValue) {
-          form.value = '';
+      function selectProvider(form) {
+        provider = form.elements['searchProvider'].value;
+        if (provider == "any") {
+          if (Math.random() > 0.5) {
+            provider = "lucid";
+          } else {
+            provider = "sl";
+          }
+        }
+        if (provider == "lucid") {
+          form.action = "http://search.lucidimagination.com/p:tika";
+        } else if (provider == "sl") {
+          form.action = "http://search-lucene.com/tika";
         }
-        return true;
+        days = 90;
+        date = new Date();
+        date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+        expires = "; expires=" + date.toGMTString();
+        document.cookie = "searchProvider=" + provider + expires + "; path=/";
       }
-      function getPrompt(form, stdValue) {
-        if (form.value == '') {
-          form.value = stdValue;
+      function initProvider() {
+        if (document.cookie.length>0) {
+          cStart=document.cookie.indexOf("searchProvider=");
+          if (cStart!=-1) {
+            cStart=cStart + "searchProvider=".length;
+            cEnd=document.cookie.indexOf(";", cStart);
+            if (cEnd==-1) {
+              cEnd=document.cookie.length;
+            }
+            provider = unescape(document.cookie.substring(cStart,cEnd));
+            document.forms['searchform'].elements['searchProvider'].value = provider;
+          }
         }
-        return true;
       }
     </script>
   </head>
-  <body class="composite">
-    <div id="banner">
-      #banner( $decoration.bannerLeft "bannerLeft" )
-      #banner( $decoration.bannerRight "bannerRight" )
-      <div class="clear">
-        <hr/>
+  <body onLoad="initProvider();">
+    <div id="body">
+      <div id="banner">
+        #banner( $decoration.bannerLeft "bannerLeft" )
+        #banner( $decoration.bannerRight "bannerRight" )
       </div>
-    </div>
-    <div id="search">
-      <script type="text/javascript">
-        function selectProvider(form) {
-          provider = form.elements['searchProvider'].value;
-          if (provider == "any") {
-            if (Math.random() > 0.5) {
-              provider = "lucid";
-            } else {
-              provider = "sl";
-            }
-          }
+      <div id="content">
+        $bodyContent
+      </div>
+      <div id="sidebar">
+        <div id="navigation">
+          #mainMenu( $decoration.body.menus )
 
-          if (provider == "lucid") {
-            form.action = "http://search.lucidimagination.com/p:tika";
-          } else if (provider == "sl") {
-            form.action = "http://search-lucene.com/tika";
-          }
+          <div id="search">
+            <h5>Search with Apache Solr</h5>
+            <form action="http://search.lucidimagination.com/p:tika"
+                  method="get" id="searchform">
+              <input type="text" id="query" name="q"/>
+              <select name="searchProvider" id="searchProvider">
+                <option value="any">provider</option>
+                <option value="lucid">Lucid Find</option>
+                <option value="sl">Search-Lucene</option>
+              </select>
+              <input type="submit" id="submit" value="Search" name="Search"
+                     onclick="selectProvider(this.form)"/>
+            </form>
+          </div>
 
-          days = 90;
-          date = new Date();
-          date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
-          expires = "; expires=" + date.toGMTString();
-          document.cookie = "searchProvider=" + provider + expires + "; path=/";
-        }
-      </script>
-      <form action="http://search.lucidimagination.com/p:tika" method="get" id="searchform">
-        <input type="text" id="query" name="q" size="30" onFocus="getBlank (this, 'Search with Apache Solr');" value="Search with Apache Solr"></input>
-        <input type="submit" value="Search" name="Search" onclick="selectProvider(this.form)"/>
-        @
-        <select name="searchProvider" id="searchProvider">
-          <option value="any">select provider</option>
-          <option value="lucid">Lucid Find</option>
-          <option value="sl">Search-Lucene</option>
-        </select>
-        <script type="text/javascript">
-          if (document.cookie.length>0) {
-            cStart=document.cookie.indexOf("searchProvider=");
-            if (cStart!=-1) {
-              cStart=cStart + "searchProvider=".length;
-              cEnd=document.cookie.indexOf(";", cStart);
-              if (cEnd==-1) {
-                cEnd=document.cookie.length;
-              }
-              provider = unescape(document.cookie.substring(cStart,cEnd));
-              document.forms['searchform'].elements['searchProvider'].value = provider;
-            }
-          }
-        </script>
-      </form>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-       #mainMenu( $decoration.body.menus )
-      </div>
-      <div id="bookpromo">  
-        <a href="http://manning.com/mattmann/" title="Tika in Action"
-           ><img src="$relativePath/mattmann_cover150.jpg"
-                 border="0" width="150" height="186"/></a>
+          <div id="bookpromo">
+            <h5>Books about Tika</h5>
+            <p>
+              <a href="http://manning.com/mattmann/" title="Tika in Action"
+                ><img src="$relativePath/mattmann_cover150.jpg"
+                      width="150" height="186"/></a>
+            </p>
+          </div>
+        </div>
       </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
-        $bodyContent
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <p>
+      <div id="footer">
+        <p>
 #set ( $currentYear = ${currentDate.year} + 1900 )
-        Copyright $currentYear
-        <a href="http://www.apache.org/">The Apache Software Foundation</a>.
-        Site powered by <a href="http://maven.apache.org/">Apache Maven</a>. 
-        Search powered by <a href="http://www.lucidimagination.com">Lucid Imagination</a> & <a href="http://sematext.com">Sematext</a>.
-        <br/>
-        Apache Tika, Tika, Apache, the Apache feather logo, and the Apache
-        Tika project logo are trademarks of The Apache Software Foundation.
-      </p>
-      <div class="clear">
-        <hr/>
+          Copyright &#169; $currentYear
+          <a href="http://www.apache.org/">The Apache Software Foundation</a>.
+          Site powered by <a href="http://maven.apache.org/">Apache Maven</a>. 
+          Search powered by
+          <a href="http://www.lucidimagination.com">Lucid Imagination</a>
+          and <a href="http://sematext.com">Sematext</a>.
+          <br/>
+          Apache Tika, Tika, Apache, the Apache feather logo, and the Apache
+          Tika project logo are trademarks of The Apache Software Foundation.
+        </p>
       </div>
     </div>
   </body>

Modified: tika/site/src/site/site.xml
URL: http://svn.apache.org/viewvc/tika/site/src/site/site.xml?rev=1029500&r1=1029499&r2=1029500&view=diff
==============================================================================
--- tika/site/src/site/site.xml (original)
+++ tika/site/src/site/site.xml Sun Oct 31 21:49:59 2010
@@ -21,20 +21,16 @@
   <bannerLeft>
     <alt>Apache Tika</alt>
     <src>http://tika.apache.org/tika.png</src>
-    <href>http://tika.apache.org</href>
+    <href>http://tika.apache.org/</href>
   </bannerLeft>
   <bannerRight>
-    <alt>Apache</alt>
-    <src>http://www.apache.org/images/feather-small.gif</src>
-    <href>www.apache.org</href>
+    <alt>The Apache Software Foundation</alt>
+    <src>http://tika.apache.org/asf-logo.gif</src>
+    <href>http://www.apache.org/</href>
   </bannerRight>
   <body>
     <head>
     </head>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Lucene" href="http://lucene.apache.org/"/>
-    </links>
     <menu name="Apache Tika">
       <item name="Introduction" href="index.html"/>
       <item name="Download" href="download.html"/>
@@ -43,7 +39,7 @@
       <item name="Issue Tracker" href="https://issues.apache.org/jira/browse/TIKA"/>
     </menu>
     <menu name="Documentation">
-      <item name="Tika 0.7" href="0.7/index.html">
+      <item name="Apache Tika 0.7" href="0.7/index.html" collapse="true">
         <item name="Getting Started" href="0.7/gettingstarted.html"/>
         <item name="Supported Formats" href="0.7/formats.html"/>
         <item name="Parser API" href="0.7/parser.html"/>
@@ -51,13 +47,13 @@
         <item name="Content and Language Detection" href="0.7/detection.html"/>
         <item name="API Documentation" href="0.7/api/"/>
       </item>
-      <item name="Tika 0.6" href="0.6/index.html" collapse="true">
+      <item name="Apache Tika 0.6" href="0.6/index.html" collapse="true">
         <item name="Getting Started" href="0.6/gettingstarted.html"/>
         <item name="Supported Formats" href="0.6/formats.html"/>
         <item name="Parser API" href="0.6/parser.html"/>
         <item name="API Documentation" href="0.6/api/"/>
       </item>
-      <item name="Tika 0.5" href="0.5/index.html" collapse="true">
+      <item name="Apache Tika 0.5" href="0.5/index.html" collapse="true">
         <item name="Getting Started" href="0.5/gettingstarted.html"/>
         <item name="Documentation" href="0.5/documentation.html"/>
         <item name="Supported Formats" href="0.5/formats.html"/>