Removing the logos, moving artwork into images

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271853 13f79535-47bb-0310-9956-ffa450edef68

build.xml

@@ -699,7 +699,6 @@
     <copy todir="${dist.docs}">
       <fileset dir="${docs.dir}">
         <exclude name="**/images/**"/>
-        <exclude name="artwork/**"/>
       </fileset>
       <filterset refid="ant.filters"/>
     </copy>
@@ -707,7 +706,6 @@
     <copy todir="${dist.docs}" filtering="false">
       <fileset dir="${docs.dir}">
         <include name="**/images/**"/>
-        <include name="artwork/**"/>
       </fileset>
     </copy>
 

docs/antnews.html

@@ -28,7 +28,7 @@
     <a href="http://www.javaworld.com"><img src="images/jw_ec_logo_finalist2002.gif" border="0"/></a>
     </td>
     <td align="right">
-              <a href="http://jakarta.apache.org/ant/"><img src="./artwork/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
+              <a href="http://jakarta.apache.org/ant/"><img src="./images/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
         </td>
           </tr>
       </table>
@@ -116,16 +116,12 @@
         <table border="0" cellspacing="0" cellpadding="2" width="100%">
     <tr><td bgcolor="#525D76">
       <font color="#ffffff" face="arial,helvetica,sanserif">
-        <a name="Vote for a Logo"><strong>Vote for a Logo</strong></a>
+        <a name="See our new logo!"><strong>See our new logo!</strong></a>
       </font>
     </td></tr>
     <tr><td>
       <blockquote>
-                        <h3>Polls have closed</h3>
-                                <p>
-      Thanks for voting!
-    </p>
-                                <p>*drum roll* - <a href="logocontest.html">and the winners are....</a></p>
+                        <h3>Have a look at our new cool logo!</h3>
                     </blockquote>
     </td></tr>
   </table>

docs/external.html

@@ -26,7 +26,7 @@
     <a href="http://www.javaworld.com"><img src="images/jw_ec_logo_finalist2002.gif" border="0"/></a>
     </td>
     <td align="right">
-              <a href="http://jakarta.apache.org/ant/"><img src="./artwork/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
+              <a href="http://jakarta.apache.org/ant/"><img src="./images/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
         </td>
           </tr>
       </table>

docs/faq.html

@@ -26,7 +26,7 @@
     <a href="http://www.javaworld.com"><img src="images/jw_ec_logo_finalist2002.gif" border="0"/></a>
     </td>
     <td align="right">
-              <a href="http://jakarta.apache.org/ant/"><img src="./artwork/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
+              <a href="http://jakarta.apache.org/ant/"><img src="./images/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
         </td>
           </tr>
       </table>

docs/index.html

@@ -28,7 +28,7 @@
     <a href="http://www.javaworld.com"><img src="images/jw_ec_logo_finalist2002.gif" border="0"/></a>
     </td>
     <td align="right">
-              <a href="http://jakarta.apache.org/ant/"><img src="./artwork/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
+              <a href="http://jakarta.apache.org/ant/"><img src="./images/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
         </td>
           </tr>
       </table>
@@ -97,13 +97,12 @@
         <table border="0" cellspacing="0" cellpadding="2" width="100%">
     <tr><td bgcolor="#525D76">
       <font color="#ffffff" face="arial,helvetica,sanserif">
-        <a name="Logo Contest"><strong>Logo Contest</strong></a>
+        <a name="New Logo"><strong>New Logo</strong></a>
       </font>
     </td></tr>
     <tr><td>
       <blockquote>
-                        <h3>Polls have closed</h3>
-                                <p>*drum roll* - <a href="logocontest.html">and the winners are....</a></p>
+                        <p>By online vote, Ant has selected a new logo!</p>
                     </blockquote>
     </td></tr>
   </table>

docs/logocontest.html

@@ -26,7 +26,7 @@
     <a href="http://www.javaworld.com"><img src="images/jw_ec_logo_finalist2002.gif" border="0"/></a>
     </td>
     <td align="right">
-              <a href="http://jakarta.apache.org/ant/"><img src="./artwork/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
+              <a href="http://jakarta.apache.org/ant/"><img src="./images/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
         </td>
           </tr>
       </table>

docs/logovote.html

@@ -1,105 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- Content Stylesheet for Site -->
-<!-- start the processing -->
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<meta name="author" value="Erik Hatcher" />
-<meta name="email" value="ehatcher@apache.org" />
-<title>The Jakarta Site - Apache Ant Logo Vote</title>
-</head>
-
-<body bgcolor="#ffffff" text="#000000" link="#525D76">
-
-<table border="0" width="100%" cellspacing="0">
-  <!-- TOP IMAGE -->
-  <tr>
-    <td colspan="2"><a href="http://jakarta.apache.org">
-    <img src="http://jakarta.apache.org/images/jakarta-logo.gif" align="left" border="0" /></a>
-    </td>
-  </tr>
-</table>
-<table border="0" cellspacing="4" style="border-collapse: collapse" bordercolor="#111111" cellpadding="0">
-  <tr>
-    <td colspan="2" width="896"><hr noshade size="1" /></td>
-    </tr>
-    <tr>
-      <!-- LEFT SIDE NAVIGATION -->
-      <td valign="top" nowrap>
-      <p><strong>Apache Ant</strong></p>
-      <ul>
-        <li><a href="./index.html">Front Page</a> </li>
-        <li><a href="./antnews.html">News</a> </li>
-        <li><a href="./manual/index.html">Documentation</a> </li>
-        <li><a href="./projects.html">Related Projects</a> </li>
-        <li><a href="./external.html">External Tools and Tasks</a> </li>
-        <li><a href="./resources.html">Resources</a> </li>
-        <li><a href="./faq.html">Ant FAQ</a> </li>
-        <li><a href="./problems.html">Having Problems?</a> </li>
-      </ul>
-      <p><strong>Download</strong></p>
-      <ul>
-        <li><a href="http://jakarta.apache.org/site/binindex.html">Binaries</a>
-        </li>
-        <li><a href="http://jakarta.apache.org/site/sourceindex.html">Source Code</a>
-        </li>
-      </ul>
-      <p><strong>Jakarta</strong></p>
-      <ul>
-        <li><a href="http://jakarta.apache.org/site/news.html">News &amp; Status</a>
-        </li>
-        <li><a href="http://jakarta.apache.org/site/mission.html">Mission</a>
-        </li>
-        <li><a href="http://jakarta.apache.org/site/guidelines.html">Guidelines 
-        Notes</a> </li>
-        <li><a href="http://jakarta.apache.org/site/faqs.html">FAQs</a> </li>
-      </ul>
-      <p><strong>Get Involved</strong></p>
-      <ul>
-        <li><a href="http://jakarta.apache.org/site/getinvolved.html">Overview</a>
-        </li>
-        <li><a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
-        </li>
-        <li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
-        </li>
-        <li><a href="http://jakarta.apache.org/site/library.html">Reference Library</a>
-        </li>
-        <li>
-        <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant">Bug 
-        Database</a> </li>
-        <li>
-        <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant&bug_severity=Enhancement">
-        Enhancement Requests</a> </li>
-      </ul>
-      </td>
-      <td align="left" valign="top" width="437">
-      <table border="0" cellspacing="0" cellpadding="2" width="100%">
-        <tr>
-          <td bgcolor="#525D76">
-          <font color="#ffffff" face="arial,helvetica,sanserif"><a name="vote">
-          <strong>Vote</strong></a> </font></td>
-        </tr>
-        </table>
-        Polls have closed.  <a href="http://vote.sparklit.com/poll.spark/593305">View results</a>
-      </td>
-    </tr>
-    <!-- FOOTER -->
-    <tr>
-      <td colspan="2" width="896"><hr noshade size="1" /></td>
-      </tr>
-      <tr>
-        <td colspan="2" width="896">
-        <div align="center">
-          <font color="#525D76" size="-1"><em>Copyright © 2000-2002, Apache Software 
-          Foundation </em></font>
-        </div>
-        </td>
-      </tr>
-  </table>
-  <p>&nbsp;</p>
-
-</body>
-
-</html>
-<!-- end the processing -->

docs/problems.html

@@ -26,7 +26,7 @@
     <a href="http://www.javaworld.com"><img src="images/jw_ec_logo_finalist2002.gif" border="0"/></a>
     </td>
     <td align="right">
-              <a href="http://jakarta.apache.org/ant/"><img src="./artwork/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
+              <a href="http://jakarta.apache.org/ant/"><img src="./images/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
         </td>
           </tr>
       </table>

docs/projects.html

@@ -26,7 +26,7 @@
     <a href="http://www.javaworld.com"><img src="images/jw_ec_logo_finalist2002.gif" border="0"/></a>
     </td>
     <td align="right">
-              <a href="http://jakarta.apache.org/ant/"><img src="./artwork/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
+              <a href="http://jakarta.apache.org/ant/"><img src="./images/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
         </td>
           </tr>
       </table>

docs/resources.html

@@ -26,7 +26,7 @@
     <a href="http://www.javaworld.com"><img src="images/jw_ec_logo_finalist2002.gif" border="0"/></a>
     </td>
     <td align="right">
-              <a href="http://jakarta.apache.org/ant/"><img src="./artwork/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
+              <a href="http://jakarta.apache.org/ant/"><img src="./images/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
         </td>
           </tr>
       </table>