stevenn     2003/09/19 08:30:40

  Modified:    src/documentation/content/xdocs/news index.xml
               site/news index.html
               site     index.html
               src/documentation/content/xdocs index.xml
  Log:
  adding Apachecon logo to the main page
  
  Revision  Changes    Path
  1.11      +11 -9     
cocoon-site/src/documentation/content/xdocs/news/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: 
/home/cvs/cocoon-site/src/documentation/content/xdocs/news/index.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- index.xml 19 Sep 2003 05:32:28 -0000      1.10
  +++ index.xml 19 Sep 2003 15:30:40 -0000      1.11
  @@ -18,15 +18,17 @@
         <section>
           <title>ApacheCon US 2003</title>
         <p>
  -<link href="http://apachecon.com/2003/US/index.html";>
  -<img src="http://jakarta.apache.org/images/logos/ac2003-150.gif"; 
alt="apachecon 2003 logo" width="150" height="86"/>
  -</link>
  -<link href="http://apachecon.com/2003/US/index.html";>ApacheCon US 2003</link>
  -    (16-19 November 2003)
  -    is now open for registration. ApacheCon is the conference for all things
  -    Apache. Come along and learn about a range of new technologies, meet some
  -    Apache folks and share the knowledge. There are many Cocoon sessions 
listed.
  -</p>
  +        <link href="http://apachecon.com/2003/US/index.html";>
  +          <img src="http://jakarta.apache.org/images/logos/ac2003-150.gif"; 
alt="apachecon 2003 logo" width="150" height="86"/>
  +        </link>
  +      </p>
  +      <p>
  +        <link href="http://apachecon.com/2003/US/index.html";>ApacheCon US 
2003</link>
  +                 (16-19 November 2003)
  +                 is now open for registration. ApacheCon is the conference 
for all things
  +                 Apache. Come along and learn about a range of new 
technologies, meet some
  +                 Apache folks and share the knowledge. There are many Cocoon 
sessions listed.
  +      </p>
         </section>
       </section>
   
  
  
  
  1.9       +26 -29    cocoon-site/site/news/index.html
  
  Index: index.html
  ===================================================================
  RCS file: /home/cvs/cocoon-site/site/news/index.html,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- index.html        19 Sep 2003 05:32:33 -0000      1.8
  +++ index.html        19 Sep 2003 15:30:40 -0000      1.9
  @@ -25,19 +25,15 @@
   <!--================= start Project Logo ==================--><td 
width="100%" align="center" bgcolor="#294563"><a 
href="http://cocoon.apache.org/";><img border="0" class="logoImage" alt="Apache 
Cocoon" src="../images/cocoon-logo.gif"></a></td>
   <!--================= end Project Logo ==================-->
   <!--================= start Search ==================--><td valign="top" 
rowspan="2" bgcolor="#294563">
  -<form target="_blank" action="http://www.google.com/search"; method="get">
  +<form action="../search.cmd" method="get">
   <table summary="search" border="0" cellspacing="0" cellpadding="0" 
bgcolor="#4C6C8F">
   <tr>
   <td colspan="3"><img height="10" width="1" alt="" 
src="../skin/images/spacer.gif" class="spacer"></td>
   </tr>
   <tr>
  -<td><img height="1" width="1" alt="" src="../skin/images/spacer.gif" 
class="spacer"></td><td nowrap="nowrap"><input value="cocoon.apache.org" 
name="sitesearch" type="hidden"><input size="15" name="q" id="query" 
type="text"><img height="1" width="5" alt="" src="../skin/images/spacer.gif" 
class="spacer"><input name="Search" value="Search" type="submit">
  +<td><img height="1" width="1" alt="" src="../skin/images/spacer.gif" 
class="spacer"></td><td nowrap="nowrap"><input size="15" name="query" 
id="query" type="text"><img height="1" width="5" alt="" 
src="../skin/images/spacer.gif" class="spacer"><input name="Search" 
value="Search" type="submit">
   <br>
  -<font face="Arial, Helvetica, Sans-serif" size="2" color="white">
  -                      the Apache Cocoon site
  -                      
  -                      
  -                    </font></td><td><img height="1" width="1" alt="" 
src="../skin/images/spacer.gif" class="spacer"></td>
  +<font face="Arial, Helvetica, Sans-serif" size="2" color="white">Powered by 
Apache Lucene</font></td><td><img height="1" width="1" alt="" 
src="../skin/images/spacer.gif" class="spacer"></td>
   </tr>
   <tr>
   <td><img alt="" border="0" height="10" width="9" 
src="../skin/images/search-left.gif"></td><td><img height="1" width="1" alt="" 
src="../skin/images/spacer.gif" class="spacer"></td><td><img alt="" border="0" 
height="10" width="9" src="../skin/images/search-right.gif"></td>
  @@ -56,7 +52,7 @@
   <td width="6"><img alt="" height="8" width="6" 
src="../skin/images/spacer.gif"></td><td valign="bottom">
   <table summary="selected tab" style="height: 1.8em" border="0" 
cellpadding="0" cellspacing="0">
   <tr>
  -<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" 
alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" 
bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, 
Sans-serif"><b><a href="../index.html"><font 
color="#000000">Home</font></a></b></font></td><td valign="top" width="5" 
bgcolor="#4C6C8F"><img height="5" width="5" alt="" 
src="../skin/images/tabSel-right.gif"></td>
  +<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" 
alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" 
bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, 
Sans-serif"><b><a class="base-selected" 
href="../index.html">Home</a></b></font></td><td valign="top" width="5" 
bgcolor="#4C6C8F"><img height="5" width="5" alt="" 
src="../skin/images/tabSel-right.gif"></td>
   </tr>
   </table>
   </td>
  @@ -98,25 +94,20 @@
   <li>
   <font color="#CFDCED">Navigation</font>
   <ul>
  -    
   <li>
   <a href="../index.html">Main</a>
   </li>
  -  
   </ul>
   </li>
   <li>
   <font color="#CFDCED">News</font>
   <ul>
  -    
   <li>
   <span class="sel"><font color="#ffcc00">Latest</font></span>
   </li>
  -    
   <li>
   <a href="archives.html">Archives</a>
   </li>
  -  
   </ul>
   </li>
   </ul>
  @@ -153,7 +144,7 @@
   <!--================= start Content==================-->
   <tr>
   <td align="left" width="10"><img width="10" height="1" alt="" 
src="../skin/images/spacer.gif" class="spacer"></td><td align="left" 
width="100%">
  -<div class="content">
  +<div xmlns:xhtml="http://www.w3.org/1999/xhtml"; class="content">
   <table class="title" summary="">
   <tr>
   <td valign="middle">
  @@ -196,31 +187,36 @@
   <a name="N1000C"></a><a name="Upcoming"></a>
   <h3>Upcoming</h3>
   <div style="margin-left: 0 ; border: 2px">
  -<a name="Cocoon+GetTogether+2003"></a>
  +<a name="N10012"></a><a name="Cocoon+GetTogether+2003"></a>
   <h4>Cocoon GetTogether 2003</h4>
   <div style="margin-left: 0 ; border: 2px">
   <p>Mark your calendars: the 2003 Cocoon GetTogether is planned for
         October, 7th, in Ghent (Belgium). More information is available on the
         event's website at <a 
href="http://www.orixo.com/events/gt2003/";>http://www.orixo.com/events/gt2003/</a>.</p>
   </div>
  -</a><a name="ApacheCon+US+2003"></a>
  +<a name="N10020"></a><a name="ApacheCon+US+2003"></a>
   <h4>ApacheCon US 2003</h4>
   <div style="margin-left: 0 ; border: 2px">
   <p>
  -
  +        
   <a href="http://apachecon.com/2003/US/index.html";>
  -<img alt="apachecon 2003 logo" height="86" 
src="http://jakarta.apache.org/images/logos/ac2003-150.gif"; width="150">
  -</a>
  -<a href="http://apachecon.com/2003/US/index.html";>ApacheCon US 2003</a>
  -    is now open for registration. ApacheCon is the conference for all things
  -    Apache. Come along and learn about a range of new technologies, meet some
  -    Apache folks and share the knowledge. There are many Cocoon sessions 
listed.
  +          <img alt="apachecon 2003 logo" height="86" 
src="http://jakarta.apache.org/images/logos/ac2003-150.gif"; width="150">
  +        </a>
  +      
   </p>
  +<p>
  +        
  +<a href="http://apachecon.com/2003/US/index.html";>ApacheCon US 2003</a>
  +                 (16-19 November 2003)
  +                 is now open for registration. ApacheCon is the conference 
for all things
  +                 Apache. Come along and learn about a range of new 
technologies, meet some
  +                 Apache folks and share the knowledge. There are many Cocoon 
sessions listed.
  +      </p>
   </div>
   </div>
   
       
  -<a name="N1001A"></a><a name="August+2003"></a>
  +<a name="N1003C"></a><a name="August+2003"></a>
   <h3>August 2003</h3>
   <div style="margin-left: 0 ; border: 2px">
   <p>The release of the long-awaited 2.1 version of Cocoon on August 13th
  @@ -229,7 +225,7 @@
   </div>
   
       
  -<a name="N10024"></a><a name="July+2003"></a>
  +<a name="N10046"></a><a name="July+2003"></a>
   <h3>July 2003</h3>
   <div style="margin-left: 0 ; border: 2px">
   <ul>
  @@ -258,7 +254,7 @@
   </div>
   
       
  -<a name="N10052"></a><a name="June+2003"></a>
  +<a name="N10074"></a><a name="June+2003"></a>
   <h3>June 2003</h3>
   <div style="margin-left: 0 ; border: 2px">
   <ul>
  @@ -269,7 +265,7 @@
   </div>
   
       
  -<a name="N1005F"></a><a name="Release+Early%2C+Release+Often"></a>
  +<a name="N10081"></a><a name="Release+Early%2C+Release+Often"></a>
   <h3>Release Early, Release Often</h3>
   <div style="margin-left: 0 ; border: 2px">
   <p>We are back on track: with the Milestone 2 Release of 2.1 we follow
  @@ -277,7 +273,7 @@
   </div>
   
       
  -<a name="N10069"></a><a name="Milestone+Release"></a>
  +<a name="N1008B"></a><a name="Milestone+Release"></a>
   <h3>Milestone Release</h3>
   <div style="margin-left: 0 ; border: 2px">
   <p>We are proud to announce the release of Cocoon 2.1 Milestone 1. As
  @@ -287,13 +283,14 @@
   </div>
   
       
  -<a name="N10073"></a><a name="Wiki+Moving"></a>
  +<a name="N10095"></a><a name="Wiki+Moving"></a>
   <h3>Wiki Moving</h3>
   <div style="margin-left: 0 ; border: 2px">
   <p>The popular Cocoon Wiki has moved: <a 
href="http://wiki.cocoondev.org/";>http://wiki.cocoondev.org/</a> is
         the new place to be.</p>
   </div>
     
  +<div class="attribution"></div>
   </div>
   </td><td width="10"><img width="10" height="1" alt="" 
src="../skin/images/spacer.gif" class="spacer"></td>
   </tr>
  
  
  
  1.9       +31 -14    cocoon-site/site/index.html
  
  Index: index.html
  ===================================================================
  RCS file: /home/cvs/cocoon-site/site/index.html,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- index.html        12 Aug 2003 22:26:08 -0000      1.8
  +++ index.html        19 Sep 2003 15:30:40 -0000      1.9
  @@ -25,19 +25,15 @@
   <!--================= start Project Logo ==================--><td 
width="100%" align="center" bgcolor="#294563"><a 
href="http://cocoon.apache.org/";><img border="0" class="logoImage" alt="Apache 
Cocoon" src="images/cocoon-logo.gif"></a></td>
   <!--================= end Project Logo ==================-->
   <!--================= start Search ==================--><td valign="top" 
rowspan="2" bgcolor="#294563">
  -<form target="_blank" action="http://www.google.com/search"; method="get">
  +<form action="search.cmd" method="get">
   <table summary="search" border="0" cellspacing="0" cellpadding="0" 
bgcolor="#4C6C8F">
   <tr>
   <td colspan="3"><img height="10" width="1" alt="" 
src="skin/images/spacer.gif" class="spacer"></td>
   </tr>
   <tr>
  -<td><img height="1" width="1" alt="" src="skin/images/spacer.gif" 
class="spacer"></td><td nowrap="nowrap"><input value="cocoon.apache.org" 
name="sitesearch" type="hidden"><input size="15" name="q" id="query" 
type="text"><img height="1" width="5" alt="" src="skin/images/spacer.gif" 
class="spacer"><input name="Search" value="Search" type="submit">
  +<td><img height="1" width="1" alt="" src="skin/images/spacer.gif" 
class="spacer"></td><td nowrap="nowrap"><input size="15" name="query" 
id="query" type="text"><img height="1" width="5" alt="" 
src="skin/images/spacer.gif" class="spacer"><input name="Search" value="Search" 
type="submit">
   <br>
  -<font face="Arial, Helvetica, Sans-serif" size="2" color="white">
  -                      the Apache Cocoon site
  -                      
  -                      
  -                    </font></td><td><img height="1" width="1" alt="" 
src="skin/images/spacer.gif" class="spacer"></td>
  +<font face="Arial, Helvetica, Sans-serif" size="2" color="white">Powered by 
Apache Lucene</font></td><td><img height="1" width="1" alt="" 
src="skin/images/spacer.gif" class="spacer"></td>
   </tr>
   <tr>
   <td><img alt="" border="0" height="10" width="9" 
src="skin/images/search-left.gif"></td><td><img height="1" width="1" alt="" 
src="skin/images/spacer.gif" class="spacer"></td><td><img alt="" border="0" 
height="10" width="9" src="skin/images/search-right.gif"></td>
  @@ -56,7 +52,7 @@
   <td width="6"><img alt="" height="8" width="6" 
src="skin/images/spacer.gif"></td><td valign="bottom">
   <table summary="selected tab" style="height: 1.8em" border="0" 
cellpadding="0" cellspacing="0">
   <tr>
  -<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" 
alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" 
bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, 
Sans-serif"><b><a href="index.html"><font 
color="#000000">Home</font></a></b></font></td><td valign="top" width="5" 
bgcolor="#4C6C8F"><img height="5" width="5" alt="" 
src="skin/images/tabSel-right.gif"></td>
  +<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" 
alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" 
bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, 
Sans-serif"><b><a class="base-selected" 
href="index.html">Home</a></b></font></td><td valign="top" width="5" 
bgcolor="#4C6C8F"><img height="5" width="5" alt="" 
src="skin/images/tabSel-right.gif"></td>
   </tr>
   </table>
   </td>
  @@ -253,7 +249,7 @@
   <!--================= start Content==================-->
   <tr>
   <td align="left" width="10"><img width="10" height="1" alt="" 
src="skin/images/spacer.gif" class="spacer"></td><td align="left" width="100%">
  -<div class="content">
  +<div xmlns:xhtml="http://www.w3.org/1999/xhtml"; class="content">
   <table class="title" summary="">
   <tr>
   <td valign="middle">
  @@ -261,11 +257,11 @@
   </td>
   </tr>
   </table>
  -<p>
  -<font size="-2">by&nbsp;Cocoon Developers</font>
  -</p>
   <ul class="minitoc">
   <li>
  +<a href="#Announcement">Announcement</a>
  +</li>
  +<li>
   <a href="#Apache+Cocoon">Apache Cocoon</a>
   </li>
   <li>
  @@ -273,7 +269,27 @@
   </li>
   </ul>
       
  -<a name="N10013"></a><a name="Apache+Cocoon"></a>
  +<a name="N10013"></a><a name="Announcement"></a>
  +<h3>Announcement</h3>
  +<div style="margin-left: 0 ; border: 2px">
  +<p>
  +        
  +<a href="http://apachecon.com/2003/US/index.html";>
  +          <img alt="apachecon 2003 logo" height="86" 
src="http://jakarta.apache.org/images/logos/ac2003-150.gif"; width="150">
  +        </a>
  +      
  +</p>
  +<p>
  +        
  +<a href="http://apachecon.com/2003/US/index.html";>ApacheCon US 2003</a>
  +                 (16-19 November 2003)
  +                 is now open for registration. ApacheCon is the conference 
for all things
  +                 Apache. Come along and learn about a range of new 
technologies, meet some
  +                 Apache folks and share the knowledge. There are many Cocoon 
sessions listed.
  +      </p>
  +</div>
  +    
  +<a name="N1002E"></a><a name="Apache+Cocoon"></a>
   <h3>Apache Cocoon</h3>
   <div style="margin-left: 0 ; border: 2px">
   <p>Apache Cocoon is a web development framework built around the concepts of
  @@ -289,7 +305,7 @@
   </div>
     
       
  -<a name="N10022"></a><a name="The+Apache+Cocoon+Project"></a>
  +<a name="N1003E"></a><a name="The+Apache+Cocoon+Project"></a>
   <h3>The Apache Cocoon Project</h3>
   <div style="margin-left: 0 ; border: 2px">
   <p>The <em>Apache Cocoon Project</em> is the open source community project
  @@ -313,6 +329,7 @@
   </ul>
   </div>
     
  +<div class="attribution">by&nbsp;Cocoon Developers</div>
   </div>
   </td><td width="10"><img width="10" height="1" alt="" 
src="skin/images/spacer.gif" class="spacer"></td>
   </tr>
  
  
  
  1.10      +22 -5     cocoon-site/src/documentation/content/xdocs/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-site/src/documentation/content/xdocs/index.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- index.xml 12 Aug 2003 22:26:09 -0000      1.9
  +++ index.xml 19 Sep 2003 15:30:40 -0000      1.10
  @@ -1,5 +1,5 @@
   <?xml version="1.0" encoding="UTF-8"?>
  -<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.0//EN" 
"document-v10.dtd">
  +<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" 
"document-v12.dtd">
   <document>
     <header>
       <title>The Apache Cocoon Project</title>
  @@ -9,7 +9,23 @@
     </header>
   
     <body>
  -    <s1 title="Apache Cocoon">
  +    <section>
  +      <title>Announcement</title>
  +      <p>
  +        <link href="http://apachecon.com/2003/US/index.html";>
  +          <img src="http://jakarta.apache.org/images/logos/ac2003-150.gif"; 
alt="apachecon 2003 logo" width="150" height="86"/>
  +        </link>
  +      </p>
  +      <p>
  +        <link href="http://apachecon.com/2003/US/index.html";>ApacheCon US 
2003</link>
  +                 (16-19 November 2003)
  +                 is now open for registration. ApacheCon is the conference 
for all things
  +                 Apache. Come along and learn about a range of new 
technologies, meet some
  +                 Apache folks and share the knowledge. There are many Cocoon 
sessions listed.
  +      </p>
  +    </section>
  +    <section>
  +      <title>Apache Cocoon</title>
         <p>Apache Cocoon is a web development framework built around the 
concepts of
     separation of concerns and component-based web development.</p>
   
  @@ -22,9 +38,10 @@
     that keeps concerns separate and allows parallel evolution of all aspects 
of
     a web application, improving development pace and reducing the chance of
     conflicts.</p>
  -    </s1>
  +    </section>
     
  -    <s1 title="The Apache Cocoon Project">
  +    <section>
  +      <title>The Apache Cocoon Project</title>
         <p>The <em>Apache Cocoon Project</em> is the open source community 
project
     developing Apache Cocoon and Cocoon-based application frameworks. With 
strong
     foundations in XML-based server-side web application frameworks, the 
Apache Cocoon
  @@ -41,6 +58,6 @@
               <link href="incubation.html">incubating</link>
               website content management framework based on Cocoon.</li>
         </ul>
  -    </s1>
  +    </section>
     </body>
   </document>
  
  
  

Reply via email to