You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by ro...@apache.org on 2005/06/05 01:51:14 UTC

svn commit: r180033 - in /incubator/ibatis/trunk/site: ./ pages/ template/

Author: roberto
Date: Sat Jun  4 16:51:12 2005
New Revision: 180033

URL: http://svn.apache.org/viewcvs?rev=180033&view=rev
Log:
~Updated site based on feedback.  First attempt!
Still need to change links for documentation to online HTML for Java and .NET (where to upload those HTML files?  wait till TLP web site is ready?)
Also need to create more example pages or intro text and code.

Added:
    incubator/ibatis/trunk/site/pages/help.vm
    incubator/ibatis/trunk/site/pages/issuetracker.vm
    incubator/ibatis/trunk/site/pages/mailinglists.vm
    incubator/ibatis/trunk/site/pages/newsbyte.vm
    incubator/ibatis/trunk/site/template/ibatis.jpg   (with props)
    incubator/ibatis/trunk/site/template/logo.jpg   (with props)
Modified:
    incubator/ibatis/trunk/site/   (props changed)
    incubator/ibatis/trunk/site/pages/archive.vm
    incubator/ibatis/trunk/site/pages/dao.vm
    incubator/ibatis/trunk/site/pages/datamapper.vm
    incubator/ibatis/trunk/site/pages/events.vm
    incubator/ibatis/trunk/site/pages/index.vm
    incubator/ibatis/trunk/site/pages/petstore.vm
    incubator/ibatis/trunk/site/template/default.css
    incubator/ibatis/trunk/site/template/default.vm
    incubator/ibatis/trunk/site/template/menu.vm

Propchange: incubator/ibatis/trunk/site/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jun  4 16:51:12 2005
@@ -0,0 +1 @@
+deploy

Modified: incubator/ibatis/trunk/site/pages/archive.vm
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/site/pages/archive.vm?rev=180033&r1=180032&r2=180033&view=diff
==============================================================================
--- incubator/ibatis/trunk/site/pages/archive.vm (original)
+++ incubator/ibatis/trunk/site/pages/archive.vm Sat Jun  4 16:51:12 2005
@@ -18,19 +18,19 @@
 
 	<h3>Apache Incubator Status - Complete!</h3>
                   <ol>
-                    <li><strong><font color="#0000FF">DONE &gt;&gt;</font> 
+                    <li><strong><font color="#006600">DONE &gt;&gt;</font>
                       Move Discussions to Apache Mailing Lists:</strong> The old 
                       SourceForge forums are now closed. We all use the Apache 
                       Mailing Lists now for support and development discussions. 
                       So far, I think we're happy with the results. See the support 
                       page for resource info.</li>
-                    <li ><strong><font color="#0000FF">DONE &gt;&gt;</font> 
+                    <li ><strong><font color="#006600">DONE &gt;&gt;</font>
                       Move Bug tracking to JIRA:</strong> The SourceForge bug 
                       tracker has been closed. We've moved to JIRA and so far 
                       the results are good. JIRA is a bit slower, but arguably 
                       does a much better job of organizing and tracking bugs and 
                       their lifecycle.</li>
-                    <li ><strong><font color="#0000FF">DONE &gt;&gt;</font> 
+                    <li ><strong><font color="#006600">DONE &gt;&gt;</font>
                       Apache Wiki:</strong> We've set up a Wiki to help us keep 
                       up with the fast pace of iBATIS, including new features 
                       and issues that would normally take months to get into the 
@@ -38,16 +38,16 @@
                       you'll hopefully find it on the Wiki <em>(FAQs, undocumented 
                       items, environment specific solutions and 3rd party contributions 
                       and tools)</em>.</li>
-                    <li ><strong><font color="#0000FF">DONE &gt;&gt;</font> 
+                    <li ><strong><font color="#006600">DONE &gt;&gt;</font>
                       Move Feature Requests to JIRA:</strong> Turns out all of 
                       the RFEs were invalid, fixed or otherwise unecessary to 
                       move. If you disagree, please feel free to reopen one of 
                       them at Apache JIRA.</li>
-                    <li ><strong><font color="#0000FF">DONE &gt;&gt;</font> 
+                    <li ><strong><font color="#006600">DONE &gt;&gt;</font>
                       Move Source Control to Apache SVN: </strong>We've migrated 
                       our SourceForge CVS repository to Subversion (SVN). It's 
                       now migrated fully to the Apache infrastructure. </li>
-                    <li ><strong><font color="#0000FF">DONE &gt;&gt;</font><font color="#993399"> 
+                    <li ><strong><font color="#006600">DONE &gt;&gt;</font><font color="#993399">
                       </font> New Apache Website (Forrest): </strong>Well, for 
                       now we have two websites. The forrest one at Apache is being 
                       maintained regularly and is accessible to all of our developers 

Modified: incubator/ibatis/trunk/site/pages/dao.vm
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/site/pages/dao.vm?rev=180033&r1=180032&r2=180033&view=diff
==============================================================================
--- incubator/ibatis/trunk/site/pages/dao.vm (original)
+++ incubator/ibatis/trunk/site/pages/dao.vm Sat Jun  4 16:51:12 2005
@@ -7,7 +7,7 @@
 
 <img src="dao.gif" align="left"/><h2>iBATIS Data Access Objects</h2>
 
-<p>iBATIS DAO is an abstraction layer that hides the details of your persistence solution and provides a common API to the 
+<p>iBATIS Data Access Objects is an abstraction layer that hides the details of your persistence solution and provides a common API to the
 rest of your application.</p>
 
 <p>When developing robust Java and .NET applications, it is often a good idea to isolate the specifics of your persistence implementation 
@@ -16,8 +16,10 @@
 be dynamically configured to use different persistence mechanisms. If you have a complex application with a number of different 
 databases and persistence approaches involved, DAOs can help you create a consistent API for the rest of your application.</p>
 
-<p>The DAO Framework is bundled as part of the iBATIS Database Layer, which includes the SQL Maps Framework. Although packaged 
-together, the DAO Framework is completely independent and can be used without SQL Maps. </p>
+<p>For Java users, the Data Access Objects framework is bundled as part of the iBATIS Database Layer, which includes the SQL Maps Framework. Although packaged
+ together, the DAO Framework is completely independent and can be used without SQL Maps. </p>
+
+<p>.NET users can download the DataAccess framework seperately from the DataMapper framework.</p>
 
 </body>
 

Modified: incubator/ibatis/trunk/site/pages/datamapper.vm
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/site/pages/datamapper.vm?rev=180033&r1=180032&r2=180033&view=diff
==============================================================================
--- incubator/ibatis/trunk/site/pages/datamapper.vm (original)
+++ incubator/ibatis/trunk/site/pages/datamapper.vm Sat Jun  4 16:51:12 2005
@@ -8,12 +8,12 @@
 <img src="sqlmaps.gif" align="left"/><h2>iBATIS Data Mapper</h2>
 
 <p>The iBATIS Data Mapper provides a very simple and flexible means of moving data between your Java and .NET objects and a relational
-database. Use the full power of real SQL without a single line of JDBC code!</p>
+database. Use the full power of real SQL without a single line of JDBC or ADO.NET code!</p>
 
 <p>The Data Mapper framework (a.k.a. SQL Maps) will help to significantly reduce the amount of Java and .NET code that is normally needed
 to access a relational database. This framework maps classes to SQL statements using a very simple XML descriptor. Simplicity 
 is the biggest advantage of iBATIS over other frameworks and object relational mapping tools. To use iBATIS you need only be 
-familiar with JavaBeans, XML and SQL. There is very little else to learn. There is no complex scheme required to join tables or 
+familiar with your own application domain objects (basic JavaBeans or .NET classes), XML, and SQL. There is very little else to learn. There is no complex scheme required to join tables or 
 execute complex queries. Using iBATIS you have the full power of real SQL at your fingertips. The iBATIS Data Mapper framework can map 
 nearly any database to any object model and is very tolerant of legacy designs, or even bad designs. This is all achieved 
 without special database tables, peer objects or code generation.</p>

Modified: incubator/ibatis/trunk/site/pages/events.vm
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/site/pages/events.vm?rev=180033&r1=180032&r2=180033&view=diff
==============================================================================
--- incubator/ibatis/trunk/site/pages/events.vm (original)
+++ incubator/ibatis/trunk/site/pages/events.vm Sat Jun  4 16:51:12 2005
@@ -10,7 +10,8 @@
 <strong>SUN Microsystems Java Conference</strong>
 <p>
 Fabrizio Gianneschi will present iBATIS. The full description of the event is available here:<br/>
-http://it.sun.com/eventi/jc05/programma.html#parallela6_23
+<a title="Fabrizio Gianneschi iBATIS Presentation" href="http://it.sun.com/eventi/jc05/programma.html#parallela6_23">
+ http://it.sun.com/eventi/jc05/programma.html#parallela6_23</a>
 </p>
 
 <h3>October 30, 2004 - Italy</h3>
@@ -27,7 +28,7 @@
 <p>Object Relational Mapping (ORM) is often perceived as a "silver bullet" of software development. It can save us time, code and even improve performance. Indeed, fantastic tools like Hibernate and TopLink can do the job very well. However, like any other tool or framework there are limitations. Sometimes an ORM just won't work, or is simply not the best solution. SQL Mapping offers a different approach to solving the challenges we face when integrating Relational Data with Objects. SQL Mapping can offer an elegant solution even when dealing with especially difficult data models or object models that are beyond our control. An SQL Mapping framework can also provide much of the same benefits offered by ORM tools, such as improved performance, cleaner APIs and reduced code.
 
 <h3>December 10th & 11th, 2002 - Sun Developer Days</h3>
-Come hear the real story behind the Pet Store comparisons at Developer Days in Edmonton (Dec 10th) and Calgary (Dec 11th). Clinton will take the marketing out of the Pet Store implementations and show why Java is right choice for serious enterprise development. Online registration is now available at Sun's web site.
+<p>Come hear the real story behind the Pet Store comparisons at Developer Days in Edmonton (Dec 10th) and Calgary (Dec 11th). Clinton will take the marketing out of the Pet Store implementations and show why Java is right choice for serious enterprise development. Online registration is now available at Sun's web site.</p>
 
 
 

Added: incubator/ibatis/trunk/site/pages/help.vm
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/site/pages/help.vm?rev=180033&view=auto
==============================================================================
--- incubator/ibatis/trunk/site/pages/help.vm (added)
+++ incubator/ibatis/trunk/site/pages/help.vm Sat Jun  4 16:51:12 2005
@@ -0,0 +1,40 @@
+<html>
+<head>    
+    <title>iBATIS Help</title>
+</head>
+
+<body>
+
+      <h2>How To Get Help</h2>
+
+      <h3>Support Requests and Questions</h3>
+        <p>Check the
+        <a title="iBATIS Wiki" href="http://opensource.atlassian.com/confluence/oss/display/IBATIS/Home">Wiki</a> and
+        the
+        <a title="iBATIS FAQ" href="http://opensource.atlassian.com/confluence/oss/display/IBATIS/Frequently+Asked+Questions">FAQ</a>.
+        If your question isn't answered there, subscribe to the
+        <a title="iBATIS Java User Mailing List" href="mailinglists.html">Java User mailing list</a> or
+        <a title="iBATIS .NET User Mailing List" href="mailinglists.html">.NET User mailing list</a>
+        and send an email.</p>
+
+      <h3>Bugs</h3>
+        <p>Check the <a href="http://issues.apache.org/jira/browse/IBATIS">Java</a>
+        or <a href="http://issues.apache.org/jira/browse/IBATISNET">.NET</a> JIRA issue tracker for an
+        existing ticket. If there is an existing JIRA issue, feel free to add a comment. If there is no
+        existing JIRA issue for the bug,
+        <a href="http://issues.apache.org/jira/secure/Signup!default.jspa">create a JIRA account</a>
+        and add a new ticket. JIRA will automatically send an email to the Developers mailing list to
+        notify list subscribers of the issue.</p>
+
+      <h3>Feature Requests and Improvements</h3>
+        <p>Check the
+        <a href="http://issues.apache.org/jira/browse/IBATIS">Java</a> or
+        <a href="http://issues.apache.org/jira/browse/IBATISNET">.NET</a> JIRA issue tracker for
+        an existing request for a new feature or improvement.  If there is an existing request, feel free
+        to add a comment or vote for the request.  If there is no existing request, you can to subscribe
+        to the <a title="iBATIS Developers Mailing List" href="mailinglists.html">Developers mailing list</a> 
+        and send an email describing the feature request.</p>
+
+</body>
+
+</html>
\ No newline at end of file

Modified: incubator/ibatis/trunk/site/pages/index.vm
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/site/pages/index.vm?rev=180033&r1=180032&r2=180033&view=diff
==============================================================================
--- incubator/ibatis/trunk/site/pages/index.vm (original)
+++ incubator/ibatis/trunk/site/pages/index.vm Sat Jun  4 16:51:12 2005
@@ -1,23 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <html>
   <head>
     <title>iBATIS News</title>
   </head>
 
   <body>
+    <div id="Block">
     <h2>What is iBATIS?</h2>
 
-    <p>The iBATIS framework makes it easier to use a database with Java and
-    .NET applications. iBATIS couples objects with stored procedures or SQL
-    statements using a XML descriptor. Simplicity is the biggest advantage of
-    the iBATIS Data Mapper over object relational mapping tools. To use iBATIS
-    Data Mapper you rely on your own objects, XML, and SQL. There is little to
-    learn that you don't already know. With iBATIS Data Mapper you have the
-    full power of both SQL and stored procedures at your fingertips.</p>
+    <p>The <a title="iBATIS DataMapper framework" href="datamapper.html">
+    iBATIS Data Mapper framework</a> makes it easier to use a database with Java and
+    .NET applications. iBATIS couples objects with stored procedures or SQL statements
+    using a XML descriptor. Simplicity is the biggest advantage of the iBATIS Data
+    Mapper over object relational mapping tools. To use iBATIS Data Mapper you rely on
+    your own objects, XML, and SQL. There is little to learn that you don't already
+    know. With the iBATIS Data Mapper, you have the full power of both SQL and stored
+    procedures at your fingertips.</p>
+
+    <p>Interested but want to know what others have said? Well, first see the various
+    <a title="iBATIS Articles and Other Coverage" href="http://opensource.atlassian.com/confluence/oss/display/IBATIS/Articles+and+other+coverage+of+iBATIS">articles and books</a>
+    that have covered iBATIS and read some of our
+    <a title="iBATIS Feedback" href="http://opensource.atlassian.com/confluence/oss/display/IBATIS/Feedback+and+Experiences">user feedback</a>.
+    Then, learn how to simple it is to use the iBATIS Data Mapper by reading our
+    <a title="SQL Maps for Java Tutorial" href="http://prdownloads.sourceforge.net/ibatisdb/iBATIS-SqlMaps-2-Tutorial.pdf?download">Java Tutorial</a> or <a title="iBATIS.NET DataMapper Quick Start Guide" href="http://opensource.atlassian.com/confluence/oss/display/IBATIS/Quick+Start+Guide">.NET Quick Start Guide</a>!</p>
 
     <p>iBATIS is in the process of migrating to the Apache Software
     Foundation. Once we have passed through the Apache Incubator, iBATIS will
     become a top-level Apache project.</p>
+    </div>
 
     <h2>News</h2>
 

Added: incubator/ibatis/trunk/site/pages/issuetracker.vm
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/site/pages/issuetracker.vm?rev=180033&view=auto
==============================================================================
--- incubator/ibatis/trunk/site/pages/issuetracker.vm (added)
+++ incubator/ibatis/trunk/site/pages/issuetracker.vm Sat Jun  4 16:51:12 2005
@@ -0,0 +1,38 @@
+<html>
+<head>    
+    <title>iBATIS Issue Tracker</title>
+</head>
+
+<body>
+
+      <h2>Issue Tracker</h2>
+
+      <p>iBATIS uses JIRA for tracking bugs, feature requests, tasks, and improvements. This is graciously provided
+      for our use by Atlassian and the Apache Software Foundation.</p>
+
+      <p><strong>NOTE: The issue tracker is NOT for general support questions!  If you need help, please see our
+      <a title="How To Get Help" href="help.html">How To Get Help</a> page.</strong></p>
+
+      <h2>iBATIS for Java</h2>
+      <table width="100%">
+        <tr > 
+          <td width="40%">Bugs and Feature Requests</td>
+          <td width="20%"><a title="iBATIS for Java Issue Tracker" href="http://issues.apache.org/jira/browse/IBATIS">JIRA Issue Tracker</a></td>
+          <td width="20%"><a title="iBATIS Issue Tracker Sign Up Page" href="http://issues.apache.org/jira/secure/Signup!default.jspa">JIRA Sign Up Page</a></td>
+          <td width="20%">&nbsp;</td>
+        </tr>
+      </table>
+
+      <h2>iBATIS for .NET</h2>
+      <table width="100%">
+        <tr > 
+          <td width="40%">Bugs and Feature Requests</td>
+          <td width="20%"><a title="iBATIS for .NET Issue Tracker" href="http://issues.apache.org/jira/browse/IBATISNET">JIRA Issue Tracker</a></td>
+          <td width="20%"><a title="iBATIS Issue Tracker Sign Up Page" href="http://issues.apache.org/jira/secure/Signup!default.jspa">JIRA Sign Up Page</a></td>
+          <td width="20%">&nbsp;</td>
+        </tr>
+      </table>
+
+</body>
+
+</html>
\ No newline at end of file

Added: incubator/ibatis/trunk/site/pages/mailinglists.vm
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/site/pages/mailinglists.vm?rev=180033&view=auto
==============================================================================
--- incubator/ibatis/trunk/site/pages/mailinglists.vm (added)
+++ incubator/ibatis/trunk/site/pages/mailinglists.vm Sat Jun  4 16:51:12 2005
@@ -0,0 +1,67 @@
+<html>
+<head>    
+    <title>iBATIS Mailing Lists</title>
+</head>
+
+<body>
+
+      <h2>Mailing Lists</h2>
+
+      <p>We have different mailing lists for iBATIS for Java and iBATIS for .NET users. If you have questions,
+      there are many users on the lists who are more than willing to help every day of the week!  Our
+      user lists are archived and searchable.</p>
+
+      <p>The iBATIS Developer mailing list is where we discuss the future of the Data Mapper and
+      Data Access frameworks.  Every once in a while, we talk about bug fixes too.  ;-)</p>
+
+      <h2>iBATIS for Java</h2>
+      <table width="100%">
+        <tr >
+          <td width="40%">Java User Mailing List &nbsp;</td>
+          <td width="20%"><a href="mailto:ibatis-user-java@incubator.apache.org">New Message</a></td>
+          <td width="20%"><a href="http://www.mail-archive.com/ibatis-user-java@incubator.apache.org/">Archives/Search</a></td>
+          <td width="20%"><a href="mailto:ibatis-user-java-subscribe@incubator.apache.org">Subscribe</a></td>
+        </tr>
+        <tr >
+          <td width="40%">Java DIGEST User Mailing List &nbsp;</td>
+          <td width="20%">&nbsp;</td>
+          <td width="20%">&nbsp;</td>
+          <td width="20%"><a href="mailto:ibatis-user-java-digest-subscribe@incubator.apache.org">Subscribe</a></td>
+        </tr>
+      </table>
+
+      <h2>iBATIS for .NET</h2>
+      <table width="100%">
+        <tr >
+          <td width="40%">.NET User Mailing List</td>
+          <td width="20%"><a href="mailto:ibatis-user-cs@incubator.apache.org">New Message</a></td>
+          <td width="20%"><a href="http://www.mail-archive.com/ibatis-user-cs@incubator.apache.org/">Archives/Search</a></td>
+          <td width="20%"><a href="mailto:ibatis-user-cs-subscribe@incubator.apache.org">Subscribe</a></td>
+        </tr>
+        <tr >
+          <td width="40%">.NET DIGEST User Mailing List &nbsp;</td>
+          <td width="20%">&nbsp;</td>
+          <td width="20%">&nbsp;</td>
+          <td width="20%"><a href="mailto:ibatis-user-cs-digest-subscribe@incubator.apache.org">Subscribe</a></td>
+        </tr>
+      </table>
+
+      <h2>iBATIS Development</h2>
+      <table width="100%">
+        <tr >
+          <td width="40%">Developer Mailing List</td>
+          <td width="20%"><a href="mailto:ibatis-dev@incubator.apache.org">New Message</a></td>
+          <td width="20%"><a href="http://www.mail-archive.com/ibatis-dev@incubator.apache.org/">Archives/Search</a></td>
+          <td width="20%"><a href="mailto:ibatis-dev-subscribe@incubator.apache.org">Subscribe</a></td>
+        </tr>
+        <tr >
+          <td width="40%">Subversion Commits List</td>
+          <td width="20%">&nbsp;</td>
+          <td width="20%"><a href="http://mail-archives.apache.org/mod_mbox/incubator-ibatis-commits/">Archive</a></td>
+          <td width="20%"><a href="mailto:ibatis-commits-subscribe@incubator.apache.org">Subscribe</a></td>
+        </tr>
+      </table>
+
+</body>
+
+</html>
\ No newline at end of file

Added: incubator/ibatis/trunk/site/pages/newsbyte.vm
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/site/pages/newsbyte.vm?rev=180033&view=auto
==============================================================================
--- incubator/ibatis/trunk/site/pages/newsbyte.vm (added)
+++ incubator/ibatis/trunk/site/pages/newsbyte.vm Sat Jun  4 16:51:12 2005
@@ -0,0 +1,3 @@
+<div id="NewsByte" valign="top" align="right">
+<p><a title="iBATIS Events" href="events.html">Upcoming iBATIS Event: June 23, 2005<br/>SUN Microsystems Java Conference (Milan, Italy)</a></p>
+</div>

Modified: incubator/ibatis/trunk/site/pages/petstore.vm
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/site/pages/petstore.vm?rev=180033&r1=180032&r2=180033&view=diff
==============================================================================
--- incubator/ibatis/trunk/site/pages/petstore.vm (original)
+++ incubator/ibatis/trunk/site/pages/petstore.vm Sat Jun  4 16:51:12 2005
@@ -1,6 +1,6 @@
 <html>
 <head>    
-    <title>iBATIS Data Mapper</title>
+    <title>iBATIS PetStore and NPetshop</title>
 </head>
 
 <body>

Modified: incubator/ibatis/trunk/site/template/default.css
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/site/template/default.css?rev=180033&r1=180032&r2=180033&view=diff
==============================================================================
--- incubator/ibatis/trunk/site/template/default.css (original)
+++ incubator/ibatis/trunk/site/template/default.css Sat Jun  4 16:51:12 2005
@@ -1,7 +1,7 @@
 body {
         margin:0px;
         padding:0px;
-        font-family:verdana, arial, helvetica, sans-serif;
+        font-family:helvetica, tahoma, arial, verdana, sans-serif;
         color:#333;
         background-color:white;
         }
@@ -19,7 +19,7 @@
         font-size:28px;
         line-height:28px;
         font-weight:900;
-        color:#999;
+        color:#CF3300;
         }
 h2 {
         margin:15px 0px 10px 0px;
@@ -27,25 +27,25 @@
         font-size:20px;
         line-height:20px;
         font-weight:700;
-        color:#777;
+        color:#AF3300;
         }
 h3 {
         margin:15px 0px 10px 0px;
         padding:0px;
         font-size:16px;
         line-height:16px;
-        font-weight:500;
-        color:#888;
+        font-weight:700;
+        color:#9F0000;
         }
 p {
-        font:11px/20px verdana, arial, helvetica, sans-serif;
+        font:12px/20px helvetica, tahoma, arial, verdana, sans-serif;
         margin:0px 0px 0px 0px;
         padding:5px;
         }
 #Content>p {margin:0px;}
 
 li {
-        font:11px/20px verdana, arial, helvetica, sans-serif;
+        font:12px/20px helvetica, tahoma, arial, verdana, sans-serif;
         margin:0px 0px 0px 0px;
         padding:0px;
         }
@@ -64,7 +64,7 @@
     vertical-align: top;
     text-align: left;
     line-height: 1.3em;
-    font:11px/20px verdana, arial, helvetica, sans-serif;
+    font:12px/20px helvetica, tahoma, arial, verdana, sans-serif;
     border-top: 1px solid #aaa;
     border-bottom: 1px solid #aaa;
 	border-right: 1px solid #aaa;
@@ -81,24 +81,24 @@
 
 
 a {
-        color:#00f;
-        font-size:11px;
+        color:#c60;
+        font-size:12px;
         text-decoration:none;
         font-weight:600;
-        font-family:verdana, arial, helvetica, sans-serif;
+        font-family:helvetica, tahoma, arial, verdana, sans-serif;
         }
-a:link {color:#00f;}
-a:visited {color:#00a;}
-a:hover {background-color:#aaa;}
+a:link {color:#c60;}
+a:visited {color:#c60;}
+a:hover {background-color:#ffffaa;}
 
 #Header {
-        margin:5px 0px 10px 0px;
-        padding:5px 0px 0px 20px;
+        margin:0px 0px 0px 0px;
+        padding:5px 0px 2px 20px;
         /* For IE5/Win's benefit height = [correct height] + [top padding] + [top and bottom border widths] */
         height:23px; /* 14px + 17px + 2px = 33px */
         border-style:solid;
-        border-color:black;
-        border-width:1px 0px; /* top and bottom borders: 1px; left and right borders: 0px */
+        border-color:#ccc;
+        border-width:0px 0px 2px 0px;
         line-height:10px;
         background-color:#000;		
 		color:#fff;
@@ -119,11 +119,11 @@
 body>#Header {height:14px;}
 
 #Logo {
-        margin:10px 10px 10px 10px;
-        padding:0px 0px 0px 0px;
+        margin:0px 0px 0px 0px;
+        padding:10px 10px 5px 10px;
         /* For IE5/Win's benefit height = [correct height] + [top padding] + [top and bottom border widths] */
         height:65px; /* 14px + 17px + 2px = 33px */      
-        background-color:#fff;		
+        background-color:#fc0;
 		color:#fff;
         voice-family: "\"}\"";
         voice-family:inherit;
@@ -143,11 +143,11 @@
 
 #Menu {
         position:absolute;
-        top:125px;
+        top:117px;
         left:20px;
         width:172px;
         padding:10px;
-        background-color:#eee;
+        background-color:#ffeeaa;
         border:1px solid #999;
         line-height:17px;
 /* Again, the ugly brilliant hack. */
@@ -158,3 +158,21 @@
         }
 /* Again, "be nice to Opera 5". */
 body>#Menu {width:150px;}
+
+#Block {
+        margin:5px;
+        padding:5px;
+        background-color:#ffffee;
+        border-style:solid;
+        border-color:#999;
+        border-width:2px 0px 2px 0px;
+        line-height:15px;
+		color:#000
+        }
+
+#NewsByte {
+        padding:0px;
+        margin-right:75px;
+        line-height:11px;
+        color:#333;
+        }
\ No newline at end of file

Modified: incubator/ibatis/trunk/site/template/default.vm
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/site/template/default.vm?rev=180033&r1=180032&r2=180033&view=diff
==============================================================================
--- incubator/ibatis/trunk/site/template/default.vm (original)
+++ incubator/ibatis/trunk/site/template/default.vm Sat Jun  4 16:51:12 2005
@@ -8,12 +8,12 @@
 
 <body>
     <div id="Logo">
-    <img valign="top" align="right" src="logo.gif">
-      <img src="ibatis.gif">
-      
+    <img alt="iBATIS" valign="top" align="right" src="logo.jpg"/>
+    <img alt="iBATIS Logo" align="left" src="ibatis.jpg"/>
+    #parse("pages/newsbyte.vm")        
     </div>
     
-    <div id="Header"><script language="javascript">document.write(document.title);</script></div>
+    <div id="Header"><script type="text/javascript" language="javascript">document.write(document.title);</script></div>
 
     <div id="Content">
       #parse($innerTemplate)
@@ -21,9 +21,9 @@
 
     #parse("template/menu.vm")
 
-    <hr height="1" color="black" width="800">
-    <p align="center">
+    <hr align="right" height="1" color="black" width="800"/>
+    <p align="right">
     <i>This site is maintained by the iBATIS development community, but this site is not affiliated with the Apache Software Foundation.</i>
-    <br/><img src="asf.jpg"></p>
+    <br/><img alt="Apache Software Foundation" src="asf.jpg"/></p>
 </body>
 </html>

Added: incubator/ibatis/trunk/site/template/ibatis.jpg
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/site/template/ibatis.jpg?rev=180033&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ibatis/trunk/site/template/ibatis.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ibatis/trunk/site/template/logo.jpg
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/site/template/logo.jpg?rev=180033&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ibatis/trunk/site/template/logo.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/ibatis/trunk/site/template/menu.vm
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/site/template/menu.vm?rev=180033&r1=180032&r2=180033&view=diff
==============================================================================
--- incubator/ibatis/trunk/site/template/menu.vm (original)
+++ incubator/ibatis/trunk/site/template/menu.vm Sat Jun  4 16:51:12 2005
@@ -9,16 +9,21 @@
 	<a href="dao.html" title="Hide data acess implementation">Data Access Objects</a><br />
 	<a href="petstore.html" title="The official example applications">Example Apps</a><br />
 	<br/>
-	<b>Project</b><br/>
-	<a href="background.html" title="Where did iBATIS come from, what does 'iBATIS' mean?">Background</a><br />
-	<a href="license.html" title="The Apache Software Foundation License 2.0">License</a><br />
-	<a href="team.html" title="Who's responsible for iBATIS?">Team</a><br />
-	<a href="bylaws.html" title="How do we operate?">Bylaws</a><br />
-	<a href="status.html" title="Where are we at?">Status</a><br />
-	<br/>
-	<b>Resources</b><br/>
-	<a href="resources.html" title="Helpful resources">FAQ, Wiki, Mailing Lists, Issue Tracker, Source Code</a><br/>
-	<br/>
 	<b>Downloads</b><br/>
 	<a href="downloads.html" title="Everything you need to run iBATIS">Binaries, Documentation, Source</a><br />
+    <br/>
+    <b>Resources</b><br/>
+    <a href="help.html" title="iBATIS Wiki">How To Get Help</a><br/>
+    <a href="http://opensource.atlassian.com/confluence/oss/display/IBATIS/Home" title="iBATIS Wiki">Wiki</a><br/>
+    <a href="http://opensource.atlassian.com/confluence/oss/display/IBATIS/Frequently+Asked+Questions" title="iBATIS FAQ">FAQ</a><br/>
+    <a href="mailinglists.html" title="iBATIS Mailing Lists">Mailing Lists</a><br/>
+    <a href="issuetracker.html" title="iBATIS Issue Tracker">Issue Tracker</a><br/>
+    <a href="http://svn.apache.org/repos/asf/incubator/ibatis/trunk" title="Subversion Repository">SVN Repository</a><br/>
+    <br/>
+    <b>Project</b><br/>
+    <a href="background.html" title="Where did iBATIS come from, what does 'iBATIS' mean?">Background</a><br />
+    <a href="license.html" title="The Apache Software Foundation License 2.0">License</a><br />
+    <a href="team.html" title="Who's responsible for iBATIS?">Team</a><br />
+    <a href="bylaws.html" title="How do we operate?">Bylaws</a><br />
+    <a href="status.html" title="Where are we at?">Status</a><br />
 </div>