You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2005/09/14 03:52:00 UTC

svn commit: r280737 [1/2] - in /incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates: ./ roller2/ roller2/images/ roller2/tan/

Author: snoopdave
Date: Tue Sep 13 18:51:50 2005
New Revision: 280737

URL: http://svn.apache.org/viewcvs?rev=280737&view=rev
Log:
Cleaning up

Added:
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/CommentContent.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/ConflictContent.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/DiffContent.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/DisplayMessage.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/EditContent.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/EditTemplate.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/FindContent.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/InfoContent.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/LeftMenu.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/LeftMenuFooter.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/LoginBox.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/PageContent.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/PreferencesContent.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/PreviewContent.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/SearchBox.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/UploadTemplate.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/ViewTemplate.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/calendar.css
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/commonheader.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/cssinclude.js
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/images/
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/images/header-grey.png   (with props)
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/images/leftbar-blue.png   (with props)
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/images/menutab-tl.gif   (with props)
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/images/menutab-tr.gif   (with props)
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/jspwiki.css
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/jspwiki_ie.css
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/jspwiki_mac.css
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/jspwiki_ns.css
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/jspwiki_print.css
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/layout.css
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/menu.css
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/roller.css
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/search_highlight.js
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/colors.css
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/logo.gif   (with props)
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/menutab-sel.gif   (with props)
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/menutab-unsel.gif   (with props)
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/two-banner.gif   (with props)
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/two-bigbadge.gif   (with props)
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/two-sidebarfade.gif   (with props)
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/two-togglegrey.gif   (with props)

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/CommentContent.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/CommentContent.jsp?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/CommentContent.jsp (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/CommentContent.jsp Tue Sep 13 18:51:50 2005
@@ -0,0 +1,61 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+
+      <table width="100%" cellspacing="0" cellpadding="0" border="0">
+         <tr>
+            <td align="left">
+                <h1 class="pagename">Adding comment to <wiki:PageName/></h1></td>
+            <td align="right">
+                <%@ include file="SearchBox.jsp" %>
+            </td>
+         </tr>
+      </table>
+
+      <p><hr></p>
+
+      <wiki:InsertPage/>
+
+      <p>
+      <h3>Please enter your comments below:</h3>
+      </p>
+
+      <form action="<wiki:CommentLink format="url" />" method="POST" 
+            accept-charset="<wiki:ContentEncoding />">
+
+      <p>
+      <%-- These are required parts of this form.  If you do not include these,
+           horrible things will happen.  Do not modify them either. --%>
+
+      <%-- FIXME: This is not required, is it? --%>
+      <input type="hidden" name="page"     value="<wiki:PageName/>" />
+      <input type="hidden" name="action"   value="save" />
+      <input type="hidden" name="edittime" value="<%=pageContext.getAttribute("lastchange", PageContext.REQUEST_SCOPE )%>" />
+
+      <%-- End of required area --%>
+
+      <textarea class="editor" wrap="virtual" name="text" rows="15" cols="60"></textarea>
+
+      <p>
+      <label for="authorname">Your name</label>
+      <input type="text" name="author" id="authorname" value="<wiki:UserName/>" />
+      <label for="rememberme">Remember me?</label>
+      <input type="checkbox" name="remember" id="rememberme" />
+      </p>
+
+      <p>      
+      <input type="submit" name="ok" value="Save" />
+      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      <input type="submit" name="preview" value="Preview" />
+      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      <input type="submit" name="cancel" value="Cancel" />
+      </p>
+      </form>
+
+      <p>
+      <wiki:NoSuchPage page="EditPageHelp">
+         Ho hum, it seems that the EditPageHelp<wiki:EditLink page="EditPageHelp">?</wiki:EditLink>
+         page is missing.  Someone must've done something to the installation...
+      </wiki:NoSuchPage>
+      </p>
+
+      <wiki:InsertPage page="EditPageHelp" />
+

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/ConflictContent.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/ConflictContent.jsp?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/ConflictContent.jsp (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/ConflictContent.jsp Tue Sep 13 18:51:50 2005
@@ -0,0 +1,38 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+
+   <div class="conflictnote">
+      <p><b>Oops!  Someone modified the page while you were editing it!</b></p>
+
+      <p>Since I am stupid and can't figure out what the difference
+      between those pages is, you will need to do that for me.  I've
+      printed here the text (in Wiki) of the new page, and the
+      modifications you made.  You'll now need to copy the text onto a
+      scratch pad (Notepad or emacs will do just fine), and then edit
+      the page again.</p>
+
+      <p>Note that when you go back into the editing mode, someone might have
+      changed the page again.  So be quick.</p>
+
+   </div>
+
+      <p><font color="#0000FF">Here is the modified text (by someone else):</font></p>
+
+      <p><hr /></p>
+
+      <tt>
+        <%=pageContext.getAttribute("conflicttext",PageContext.REQUEST_SCOPE)%>
+      </tt>      
+
+      <p><hr /></p>
+
+      <p><font color="#0000FF">And here's your text:</font></p>
+
+      <tt>
+        <%=pageContext.getAttribute("usertext",PageContext.REQUEST_SCOPE)%>
+      </tt>
+
+      <p><hr /></p>
+
+      <p>
+       <i>Go edit <wiki:EditLink><wiki:PageName /></wiki:EditLink>.</i>
+      </p>

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/DiffContent.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/DiffContent.jsp?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/DiffContent.jsp (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/DiffContent.jsp Tue Sep 13 18:51:50 2005
@@ -0,0 +1,31 @@
+<%@ page import="com.ecyrd.jspwiki.tags.InsertDiffTag" %>
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%!
+    String getVersionText( Integer ver )
+    {
+        return ver.intValue() > 0 ? ("version "+ver) : "current version";
+    }
+%>
+
+      <wiki:PageExists>
+          Difference between 
+          <%=getVersionText((Integer)pageContext.getAttribute(InsertDiffTag.ATTR_OLDVERSION, PageContext.REQUEST_SCOPE))%> 
+          and 
+          <%=getVersionText((Integer)pageContext.getAttribute(InsertDiffTag.ATTR_NEWVERSION, PageContext.REQUEST_SCOPE))%>:
+          <div>
+          <wiki:InsertDiff>
+              <i>No difference detected.</i>
+          </wiki:InsertDiff>
+          </div>
+
+      </wiki:PageExists>
+
+      <wiki:NoSuchPage>
+             This page does not exist.  Why don't you go and
+             <wiki:EditLink>create it</wiki:EditLink>?
+      </wiki:NoSuchPage>
+
+      <p>
+      Back to <wiki:LinkTo><wiki:PageName/></wiki:LinkTo>,
+       or to the <wiki:PageInfoLink>Page History</wiki:PageInfoLink>.
+       </p>

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/DisplayMessage.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/DisplayMessage.jsp?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/DisplayMessage.jsp (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/DisplayMessage.jsp Tue Sep 13 18:51:50 2005
@@ -0,0 +1,9 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+
+<%-- Inserts a string message. --%>
+
+   <div class="messagecontent">
+      <%=pageContext.getAttribute("message",PageContext.REQUEST_SCOPE)%>
+   </div>
+
+   <br clear="all" />

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/EditContent.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/EditContent.jsp?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/EditContent.jsp (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/EditContent.jsp Tue Sep 13 18:51:50 2005
@@ -0,0 +1,65 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+
+      <table width="100%" cellspacing="0" cellpadding="0" border="0">
+         <tr>
+            <td align="left">
+                <h1 class="pagename">Edit <wiki:PageName/></h1></td>
+            <td align="right">
+                <%@ include file="SearchBox.jsp" %>
+            </td>
+         </tr>
+      </table>
+
+      <p><hr></p>
+
+      <wiki:CheckVersion mode="notlatest">
+         <p class="versionnote">You are about to restore version <wiki:PageVersion/>.
+         Click on "Save" to restore.  You may also edit the page before restoring it.
+         </p>
+      </wiki:CheckVersion>
+
+      <wiki:CheckLock mode="locked" id="lock">
+         <p class="locknote">User '<%=lock.getLocker()%>' has started to edit this page, but has not yet
+         saved.  I won't stop you from editing this page anyway, BUT be aware that
+         the other person might be quite annoyed.  It would be courteous to wait for his lock
+         to expire or until he stops editing the page.  The lock expires in 
+         <%=lock.getTimeLeft()%> minutes.
+         </p>
+      </wiki:CheckLock>
+
+      <form action="<wiki:EditLink format="url" />" method="POST" 
+            accept-charset="<wiki:ContentEncoding />">
+
+      <p>
+      <%-- These are required parts of this form.  If you do not include these,
+           horrible things will happen.  Do not modify them either. --%>
+
+      <%-- FIXME: This is not required, is it? --%>
+      <input type="hidden" name="page"     value="<wiki:PageName/>" />
+      <input type="hidden" name="action"   value="save" />
+      <input type="hidden" name="edittime" value="<%=pageContext.getAttribute("lastchange", PageContext.REQUEST_SCOPE )%>" />
+      <wiki:CheckRequestContext context="comment">
+         <input type="hidden" name="comment" value="true" />
+      </wiki:CheckRequestContext>
+
+      <%-- End of required area --%>
+
+      <textarea class="editor" wrap="virtual" name="text" rows="50" cols="80" style="width:100%;"><wiki:CheckRequestContext context="edit"><wiki:InsertPage mode="plain" /></wiki:CheckRequestContext></textarea>
+
+      <p>      
+      <input type="submit" name="ok" value="Save" />
+      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      <input type="submit" name="preview" value="Preview" />
+      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      <input type="submit" name="cancel" value="Cancel" />
+      </p>
+      </form>
+
+      <p>
+      <wiki:NoSuchPage page="EditPageHelp">
+         Ho hum, it seems that the EditPageHelp<wiki:EditLink page="EditPageHelp">?</wiki:EditLink>
+         page is missing.  Someone must've done something to the installation...
+      </wiki:NoSuchPage>
+      </p>
+
+      <wiki:InsertPage page="EditPageHelp" />

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/EditTemplate.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/EditTemplate.jsp?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/EditTemplate.jsp (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/EditTemplate.jsp Tue Sep 13 18:51:50 2005
@@ -0,0 +1,44 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+
+<head>
+  <title><wiki:Variable var="ApplicationName" /> Edit: <wiki:PageName /></title>
+  <meta name="ROBOTS" content="NOINDEX">
+  <%@ include file="cssinclude.js" %>
+</head>
+
+<wiki:CheckRequestContext context="edit">
+  <body class="edit" bgcolor="#D9E8FF" onLoad="document.forms[1].text.focus()">
+</wiki:CheckRequestContext>
+
+<wiki:CheckRequestContext context="comment">
+  <body class="comment" bgcolor="#EEEEEE" onLoad="document.forms[1].text.focus()">
+</wiki:CheckRequestContext>
+
+<div id="header">
+</div>
+
+<div id="left">
+       <%@ include file="LeftMenu.jsp" %>
+       <p>
+       <wiki:LinkTo page="TextFormattingRules">Help on editing</wiki:LinkTo>
+       </p>
+       <%@ include file="LeftMenuFooter.jsp" %>
+</div>
+
+<div id="content">
+      <wiki:CheckRequestContext context="comment">
+         <wiki:Include page="CommentContent.jsp" />
+      </wiki:CheckRequestContext>
+
+      <wiki:CheckRequestContext context="edit">
+         <wiki:Include page="EditContent.jsp" />
+      </wiki:CheckRequestContext>
+</div>
+
+</body>
+
+</html>

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/FindContent.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/FindContent.jsp?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/FindContent.jsp (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/FindContent.jsp Tue Sep 13 18:51:50 2005
@@ -0,0 +1,78 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ page import="com.ecyrd.jspwiki.*" %>
+<%@ page import="java.util.Collection" %>
+
+<%-- FIXME: Get rid of the scriptlets. --%>
+<%
+    Collection list = (Collection)pageContext.getAttribute( "searchresults",
+                                                             PageContext.REQUEST_SCOPE );
+
+    String query = (String)pageContext.getAttribute( "query",
+                                                     PageContext.REQUEST_SCOPE );
+    if( query == null ) query = "";
+%>
+
+      <h2>Find pages</h2>
+
+      <% if( list != null ) 
+      {
+      %>
+          <h4>Search results for '<%=query%>'</h4>
+
+          <p>
+          <i>Found <%=list.size()%> hits, here are the top 20.</i>
+          </p>
+
+          <table border="0" cellpadding="4">
+
+          <tr>
+             <th width="30%" align="left">Page</th>
+             <th align="left">Score</th>
+          </tr>          
+          <% if( list.size() > 0 ) { %>
+              <wiki:SearchResultIterator list="<%=list%>" id="searchref" maxItems="20">
+                  <tr>
+                      <td width="30%"><wiki:LinkTo><wiki:PageName/></wiki:LinkTo></td>
+                      <td><%=searchref.getScore()%></td>
+                  </tr>
+              </wiki:SearchResultIterator>
+          <% } else { %>
+              <tr>
+                  <td width="30%"><b>No results</b></td>
+              </tr>
+          <% } %>
+
+          </table>
+          <p>
+          <a href="http://www.google.com/search?q=<%=query%>" target="_blank">Try this same search on Google!</a>
+          </p>
+          <p><hr /></p>
+      <%
+      }
+      %>
+
+      <form action="<wiki:Variable var="baseURL"/>Search.jsp"
+            accept-charset="ISO-8859-1,UTF-8">
+
+      <p>
+      Enter your query here:<br />
+      <input type="text" name="query" size="40" value="<%=query%>" /></p>
+
+      <p>
+      <input type="submit" name="ok" value="Find!" /></p>
+      </form>
+
+      <p>
+      Use '+' to require a word, '-' to forbid a word.  For example:
+
+      <pre>
+          +java -emacs jsp
+      </pre>
+
+      finds pages that MUST include the word "java", and MAY NOT include
+      the word "emacs".  Also, pages that contain the word "jsp" are
+      ranked before the pages that don't.</p>
+      <p>
+      All searches are case insensitive.  If a page contains both
+      forbidden and required keywords, it is not shown.</p>
+

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/InfoContent.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/InfoContent.jsp?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/InfoContent.jsp (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/InfoContent.jsp Tue Sep 13 18:51:50 2005
@@ -0,0 +1,134 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+
+<wiki:PageExists>
+
+   <form action="<wiki:Variable var="baseurl"/>Delete.jsp" method="POST" 
+                 accept-charset="<wiki:ContentEncoding />">
+
+   <table cellspacing="4">
+       <tr>
+           <td><b>Page name</b></td>
+           <td><wiki:LinkTo><wiki:PageName /></wiki:LinkTo></td>
+       </tr>
+
+       <wiki:PageType type="attachment">
+           <tr>
+              <td><b>Parent page</b></td>
+              <td><wiki:LinkToParent><wiki:ParentPageName /></wiki:LinkToParent></td>
+           </tr>
+       </wiki:PageType>
+
+       <tr>
+           <td><b>Page last modified</b></td>
+           <td><wiki:PageDate /></td>
+       </tr>
+
+       <tr>
+           <td><b>Current page version</b></td>
+           <td><wiki:PageVersion>No versions.</wiki:PageVersion></td>
+       </tr>
+
+       <tr>
+           <td valign="top"><b>Page revision history</b></td>
+           <td>
+               <table border="1" cellpadding="4">
+                   <tr>
+                        <th>Version</th>                        
+                        <th>Date <wiki:PageType type="page">(and differences to current)</wiki:PageType></th>
+                        <th>Author</th>
+                        <th>Size</th>
+                        <wiki:PageType type="page">                        
+                            <th>Changes from previous</th>
+                        </wiki:PageType>
+                        <wiki:Permission permission="delete">
+                            <th>Delete</th>
+                        </wiki:Permission>
+                   </tr>
+                   <wiki:HistoryIterator id="currentPage">
+                     <tr>
+                         <td>
+                             <wiki:LinkTo version="<%=Integer.toString(currentPage.getVersion())%>">
+                                  <wiki:PageVersion/>
+                             </wiki:LinkTo>
+                         </td>
+
+                         <td>
+                             <wiki:PageType type="page">
+                             <wiki:DiffLink version="latest" 
+                                            newVersion="<%=Integer.toString(currentPage.getVersion())%>">
+                                 <wiki:PageDate/>
+                             </wiki:DiffLink>
+                             </wiki:PageType>
+
+                             <wiki:PageType type="attachment">
+                                 <wiki:PageDate/>
+                             </wiki:PageType>
+                         </td>
+
+                         <td><wiki:Author /></td>
+                         <td><wiki:PageSize /></td>
+
+                         <wiki:PageType type="page">
+                           <td>
+                              <% if( currentPage.getVersion() > 1 ) { %>
+                                   <wiki:DiffLink version="<%=Integer.toString(currentPage.getVersion())%>" 
+                                                  newVersion="<%=Integer.toString(currentPage.getVersion()-1)%>">
+                                       from version <%=currentPage.getVersion()-1%> to <%=currentPage.getVersion()%>
+                                   </wiki:DiffLink>
+                               <% } %>
+                           </td>
+                         </wiki:PageType>
+
+                         <wiki:Permission permission="delete">
+                             <td>
+                                 <input type="checkbox" name="delete-<%=currentPage.getVersion()%>" />
+                             </td>
+                         </wiki:Permission>
+                     </tr>
+                   </wiki:HistoryIterator>
+               </table>
+           </td>
+      </tr>
+</table>
+
+    <wiki:Permission permission="delete">
+       <input type="submit" name="delete" value="Delete marked versions"/>
+    </wiki:Permission>
+
+    </form>
+             
+    <br />
+    <wiki:PageType type="page">
+       <wiki:LinkTo>Back to <wiki:PageName/></wiki:LinkTo>
+    </wiki:PageType>
+    <wiki:PageType type="attachment">
+
+       <form action="<wiki:Variable var="baseurl"/>attach" method="POST" enctype="multipart/form-data">
+
+           <%-- Do NOT change the order of wikiname and content, otherwise the 
+                servlet won't find its parts. --%>
+
+           <input type="hidden" name="page" value="<wiki:Variable var="pagename"/>" />
+
+           In order to update this attachment with a newer version, find the
+           file using "Browse", then click on "Update".
+
+           <p>
+           <input type="file" name="content" />
+           <input type="submit" name="upload" value="Update" />
+           <input type="hidden" name="action" value="upload" />
+           <input type="hidden" name="nextpage" value="<wiki:PageInfoLink format="url"/>" />
+           </p>
+           </form>
+
+
+    </wiki:PageType>
+
+</wiki:PageExists>
+
+
+<wiki:NoSuchPage>
+    This page does not exist.  Why don't you go and
+    <wiki:EditLink>create it</wiki:EditLink>?
+</wiki:NoSuchPage>
+

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/LeftMenu.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/LeftMenu.jsp?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/LeftMenu.jsp (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/LeftMenu.jsp Tue Sep 13 18:51:50 2005
@@ -0,0 +1,26 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ page import="com.ecyrd.jspwiki.Release" %>
+
+<p>
+    <wiki:InsertPage page="LeftMenu" />
+</p>
+
+<hr />
+
+<p>
+    <wiki:UserCheck status="known">
+        <b>Hello </b><br />
+        <wiki:Translate>[<wiki:UserName />]</wiki:Translate>
+    </wiki:UserCheck>
+
+    <wiki:UserCheck status="unknown">
+        <tt>
+        Set your name in<br />
+        <wiki:LinkTo page="UserPreferences">UserPreferences</wiki:LinkTo>
+        </tt>    
+    </wiki:UserCheck>
+    <wiki:Include page="LoginBox.jsp" />
+</p>
+
+<!-- End of automatically generated page -->
+

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/LeftMenuFooter.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/LeftMenuFooter.jsp?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/LeftMenuFooter.jsp (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/LeftMenuFooter.jsp Tue Sep 13 18:51:50 2005
@@ -0,0 +1,17 @@
+<%@ page import="com.ecyrd.jspwiki.Release" %>
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<!-- LeftMenuFooter is automatically generated from a Wiki page called "LeftMenuFooter" -->
+
+<wiki:InsertPage page="LeftMenuFooter" />
+<wiki:NoSuchPage page="LeftMenuFooter">
+   <hr />
+   <p align="center">
+   <i>No LeftMenuFooter!</i><br />
+   <wiki:EditLink page="LeftMenuFooter">Please make one.</wiki:EditLink><br />
+   </p>
+   <hr />
+</wiki:NoSuchPage>
+
+<!-- End of automatically generated page -->
+
+

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/LoginBox.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/LoginBox.jsp?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/LoginBox.jsp (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/LoginBox.jsp Tue Sep 13 18:51:50 2005
@@ -0,0 +1,32 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+
+<%-- Provides a small login/logout form to include in a side bar. 
+
+<div class="loginbox" align="center">
+  <p>
+  <hr />
+  <wiki:UserCheck status="unvalidated">
+    <form action="<wiki:Variable var="baseURL"/>Login.jsp" accept-charset="UTF-8" method="POST" >
+    <p>
+      <input type="hidden" name="page" value="<wiki:Variable var="pagename"/>" />
+      <input type="text" name="uid" size="8" />
+      <br />
+      <input type="password" name="passwd" size="8" />
+      <br />
+      <input type="submit" name="action" value="login" />
+    </p>
+    </form>
+  </wiki:UserCheck>
+  <wiki:UserCheck status="validated">
+    <form action="<wiki:Variable var="baseURL"/>Login.jsp" accept-charset="UTF-8">
+    <p>
+      <input type="hidden" name="page" value="<wiki:Variable var="pagename"/>" />
+      <input type="submit" name="action" value="logout" />
+    </p>
+    </form>
+  </wiki:UserCheck>
+  </p>
+
+</div>
+--%>
+

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/PageContent.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/PageContent.jsp?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/PageContent.jsp (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/PageContent.jsp Tue Sep 13 18:51:50 2005
@@ -0,0 +1,79 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+
+<%-- Inserts page content. --%>
+
+      <%-- If the page is an older version, then offer a note and a possibility
+           to restore this version as the latest one. --%>
+
+      <wiki:CheckVersion mode="notlatest">
+         <font color="red">
+            <p class="versionnote">This is version <wiki:PageVersion/>.  
+            It is not the current version, and thus it cannot be edited.<br />
+            <wiki:LinkTo>[Back to current version]</wiki:LinkTo>&nbsp;&nbsp;
+            <wiki:EditLink version="this">[Restore this version]</wiki:EditLink></p>
+         </font>
+         <hr />
+      </wiki:CheckVersion>
+
+      <%-- Inserts no text if there is no page. --%>
+
+      <wiki:InsertPage />
+
+      <wiki:NoSuchPage>
+           <!-- FIXME: Should also note when a wrong version has been fetched. -->
+           This page does not exist.  Why don't you go and
+           <wiki:EditLink>create it</wiki:EditLink>?
+      </wiki:NoSuchPage>
+
+      <br clear="all" />
+
+      <wiki:HasAttachments>
+         <b>Attachments:</b>
+
+         <div class="attachments" align="center">
+         <table width="90%">
+         <wiki:AttachmentsIterator id="att">
+             <tr>
+             <td><wiki:LinkTo><%=att.getFileName()%></wiki:LinkTo></td>
+             <td><wiki:PageInfoLink><img src="images/attachment_big.png" border="0" alt="Info on <%=att.getFileName()%>" /></wiki:PageInfoLink></td>
+             <td><%=att.getSize()%> bytes</td>
+             </tr>
+         </wiki:AttachmentsIterator>
+         </table>
+         </div>
+      </wiki:HasAttachments>
+
+      <p><hr />
+      <table border="0" width="100%" class="pageactions">
+        <tr>
+          <td align="left">
+             <a href="#Top">Go to top</a>&nbsp;&nbsp;
+             <wiki:Permission permission="edit">
+                 <wiki:EditLink>Edit this page</wiki:EditLink>&nbsp;&nbsp;
+             </wiki:Permission>
+             <wiki:PageInfoLink>More info...</wiki:PageInfoLink>&nbsp;&nbsp;
+             <a href="javascript:window.open('<wiki:UploadLink format="url" />','Upload','width=640,height=480,toolbar=1,menubar=1,scrollbars=1,resizable=1,').focus()">Attach file...</a>
+             <br />
+          </td>
+        </tr>
+        <tr>
+          <td align="left">
+             <font size="-1">
+             
+             <wiki:CheckVersion mode="latest">
+                 <i>This page last changed on <wiki:DiffLink version="latest" newVersion="previous"><wiki:PageDate/></wiki:DiffLink> by <wiki:Author />.</i>
+             </wiki:CheckVersion>
+
+             <wiki:CheckVersion mode="notlatest">
+                 <i>This particular version was published on <wiki:PageDate/> by <wiki:Author /></i>.
+             </wiki:CheckVersion>
+ 
+             <wiki:NoSuchPage>
+                 <i>Page not created yet.</i>
+             </wiki:NoSuchPage>
+
+             </font>
+          </td>
+        </tr>
+      </table>
+      </p>

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/PreferencesContent.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/PreferencesContent.jsp?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/PreferencesContent.jsp (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/PreferencesContent.jsp Tue Sep 13 18:51:50 2005
@@ -0,0 +1,33 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+
+      <p>
+      This is a page which allows you to set up all sorts of interesting things.
+      You need to have cookies enabled for this to work, though.
+      </p>
+
+      <form action="<wiki:Variable var="baseURL"/>UserPreferences.jsp" 
+            method="POST"
+            accept-charset="UTF-8">
+
+         <b>User name:</b> <input type="text" name="username" size="30" value="<wiki:UserName/>" />
+         <i>This must be a proper WikiName, no punctuation.</i>
+         <br /><br />
+         <input type="submit" name="ok" value="Set my preferences!" />
+         <input type="hidden" name="action" value="save" />
+      </form>
+
+      <hr />
+
+      <h3>Removing your preferences</h3>
+
+      <p>In some cases, you may need to remove the above preferences from the computer.
+      Click the button below to do that.  Note that it will remove all preferences
+      you've set up, permanently.  You will need to enter them again.</p>
+
+      <div align="center">
+      <form action="<wiki:Variable var="baseURL"/>UserPreferences.jsp"
+            method="POST"
+            accept-charset="UTF-8">
+      <input type="submit" name="clear" value="Remove preferences from this computer" />
+      </form>
+      </div>

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/PreviewContent.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/PreviewContent.jsp?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/PreviewContent.jsp (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/PreviewContent.jsp Tue Sep 13 18:51:50 2005
@@ -0,0 +1,48 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+
+<%-- Inserts page content for preview. --%>
+
+   <div class="previewnote">
+      <b>This is a PREVIEW!  Hit "back" on your browser to go back to the editor,
+      or hit "Save" if you're happy with what you see.</b>
+   </div>
+
+   <p><hr /></p>
+
+   <div class="previewcontent">
+      <wiki:Translate><%=pageContext.getAttribute("usertext",PageContext.REQUEST_SCOPE)%></wiki:Translate>
+   </div>
+
+   <br clear="all" />
+
+   <p><hr /></p>
+
+   <div class="previewnote">
+      <b>This is a PREVIEW!  Hit "back" on your browser to go back to the editor,
+      or hit "Save" if you're happy with what you see.</b>
+   </div>
+
+   <p><hr /></p>
+
+   <form action="<wiki:EditLink format="url" />" method="POST" 
+         ACCEPT-CHARSET="<wiki:ContentEncoding />">
+   <p>
+
+   <%-- These are required parts of this form.  If you do not include these,
+        horrible things will happen.  Do not modify them either. --%>
+
+   <input type="hidden" name="page"     value="<wiki:PageName/>" />
+   <input type="hidden" name="action"   value="save" />
+   <input type="hidden" name="edittime" value="<%=pageContext.getAttribute("lastchange", PageContext.REQUEST_SCOPE )%>" />
+   <textarea rows="4" cols="20" readonly="true" style="display:none" name="text"><%=pageContext.getAttribute("usertext", PageContext.REQUEST_SCOPE) %></textarea>
+
+   <div id="previewsavebutton" align="center">
+      <input type="button" name="edit" value="Keep editing" onClick="javascript:back(-1);"/>
+      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      <input type="submit" name="ok" value="Save" />
+      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      <input type="submit" name="cancel" value="Cancel" />
+   </div>
+
+   </p>
+   </form>

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/SearchBox.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/SearchBox.jsp?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/SearchBox.jsp (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/SearchBox.jsp Tue Sep 13 18:51:50 2005
@@ -0,0 +1,13 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%-- Provides a simple searchbox that can be easily included anywhere
+     on the page --%>
+
+<div class="searchbox">
+  <form action="<wiki:Variable var="baseURL"/>Search.jsp"
+      accept-charset="<wiki:ContentEncoding />">
+    <wiki:LinkTo page="FindPage">Search Wiki:</wiki:LinkTo>
+    <input type="text" name="query" size="15" />
+    <input type="submit" name="ok" value="Find!" />
+  </form>
+</div>
+

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/UploadTemplate.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/UploadTemplate.jsp?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/UploadTemplate.jsp (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/UploadTemplate.jsp Tue Sep 13 18:51:50 2005
@@ -0,0 +1,65 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+
+<head>
+  <title><wiki:Variable var="applicationname"/>: Add Attachment</title>
+  <%@ include file="cssinclude.js" %>
+  <META NAME="ROBOTS" CONTENT="NOINDEX">
+</head>
+
+<body class="upload" bgcolor="#FFFFFF">
+
+      <h1 class="pagename">Upload new attachment to <wiki:PageName /></h1>
+      <hr /><p>
+
+      <wiki:HasAttachments>
+         <B>Currently existing attachments:</B>
+
+         <div class="attachments" align="center">
+         <table width="90%">
+         <wiki:AttachmentsIterator id="att">
+             <tr>
+             <td><wiki:LinkTo><%=att.getFileName()%></wiki:LinkTo></td>
+             <td><wiki:PageInfoLink><img src="images/attachment_big.png" border="0" alt="Info on <%=att.getFileName()%>"></wiki:PageInfoLink></td>
+             <td><%=att.getSize()%> bytes</td>
+             </tr>
+         </wiki:AttachmentsIterator>
+         </table>
+         </div>
+         <hr />
+
+      </wiki:HasAttachments>
+
+      <table border="0" width="100%">
+      <tr>
+        <td>
+           <form action="attach" method="POST" enctype="multipart/form-data" accept-charset="UTF-8">
+
+           <%-- Do NOT change the order of wikiname and content, otherwise the 
+                servlet won't find its parts. --%>
+
+           <input type="hidden" name="page" value="<wiki:Variable var="pagename"/>">
+
+           In order to upload a new attachment to this page, please use the following
+           box to find the file, then click on "Upload".
+
+           <P>
+           <input type="file" name="content">
+           <input type="submit" name="upload" value="Upload">
+           <input type="hidden" name="action" value="upload">
+           <input type="hidden" name="nextpage" value="<wiki:UploadLink format="url"/>">
+           </form>
+
+        </td>
+
+      </table>
+
+
+</body>
+
+</html>

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/ViewTemplate.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/ViewTemplate.jsp?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/ViewTemplate.jsp (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/ViewTemplate.jsp Tue Sep 13 18:51:50 2005
@@ -0,0 +1,90 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+
+<head>
+  <title><wiki:Variable var="applicationname" />: <wiki:PageName /></title>
+  <wiki:Include page="commonheader.jsp"/>
+  <wiki:CheckVersion mode="notlatest">
+        <meta name="robots" content="noindex,nofollow" />
+  </wiki:CheckVersion>
+</head>
+
+<body class="view" bgcolor="#FFFFFF">
+
+<div id="wrapper">
+   
+    <div id="banner">
+        <div class="bannerBox">
+           <img class="bannerlogo" src='<wiki:BaseURL/>/templates/roller/tan/logo.gif' />
+        </div>
+        <div class="bannerStatusBox">
+           <div class="bannerLeft">
+              Your trail: <wiki:Breadcrumbs maxpages="5"  />
+           </div>
+           <div class="bannerRight">
+              <a href="/main.do">Roller</a> 
+              ||<a href="/planet.do">Planet</a> 
+              | <a href="/wiki">Wiki</a>
+           </div>
+        </div>
+    </div>
+    
+    <div id="leftcontent"> 
+    </div>
+    
+    <div id="centercontent"> 
+       <h1 class="pagename"><a name="Top"><wiki:PageName/></a></h1>
+       <wiki:Content/>
+    </div>
+    
+    <div id="rightcontent">
+
+       <div class="sidebarfade">
+          <div class="menu-tr">
+             <div class="menu-tl">
+                <div class="sidebarBody">
+                   <h3>Search</h3>
+                   <br />
+                   <wiki:Include page="SearchBox.jsp"/>
+                   <br />
+                </div>
+             </div>
+          </div>
+       </div>
+
+       <div class="sidebarfade">
+          <div class="menu-tr">
+             <div class="menu-tl">
+                <div class="sidebarBody">
+                   <h3>Quick Links</h3>
+                   <br />
+                   <wiki:Include page="LeftMenu.jsp"/>
+                   <wiki:Include page="LeftMenuFooter.jsp"/>
+                   <wiki:CheckRequestContext context="view">
+                       <wiki:Permission permission="edit">
+                           <wiki:EditLink>Edit this page</wiki:EditLink>
+                       </wiki:Permission>
+                   </wiki:CheckRequestContext>
+                   <br />
+                   <br />
+                   <wiki:RSSImageLink title="Aggregate the RSS feed" />
+                   <br />
+                   <br />
+                </div>
+             </div>
+          </div>
+       </div>
+
+    </div>  
+ 
+</div>
+
+</body>
+
+</html>
+

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/calendar.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/calendar.css?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/calendar.css (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/calendar.css Tue Sep 13 18:51:50 2005
@@ -0,0 +1,40 @@
+/* This class is related to the popup javascript calendar for date selection */
+
+div.calDiv {
+    background-color: #ffffff;
+    color: #000000;
+    color: #000000;
+    padding: 0px;
+    position: absolute;
+    visibility: hidden;
+    z-index: 11000;
+}
+
+div.calDiv a {
+    background-color: transparent;
+    color: #000000;
+    font-weight: normal;
+    text-decoration: none;
+}
+
+div.calDiv a.cpOtherMonthDate {
+    background: transparent;
+    color: #808080;
+}
+
+div.calDiv a:visited {
+    background-color: transparent;
+    color: #000000;
+    text-decoration: none;
+}
+
+div.calDiv a:hover {
+    background: transparent;
+    color: #0000ff;
+    text-decoration: underline overline;
+}
+
+img.calIcon {
+    margin-top: 2px;
+    vertical-align: top !important;
+}

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/commonheader.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/commonheader.jsp?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/commonheader.jsp (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/commonheader.jsp Tue Sep 13 18:51:50 2005
@@ -0,0 +1,20 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+  <link rel="stylesheet" type="text/css" href="<wiki:BaseURL/>templates/<wiki:TemplateDir/>/jspwiki.css" />
+  <%@ include file="/scripts/cssinclude.js" %>
+  <script src="<wiki:BaseURL/>scripts/search_highlight.js" type="text/javascript"></script>
+  <script src="<wiki:BaseURL/>scripts/jspwiki-common.js" type="text/javascript"></script>
+  <meta http-equiv="Content-Type" content="text/html; charset=<wiki:ContentEncoding />" />
+  <link rel="search" href="<wiki:LinkTo format="url" page="FindPage"/>"            title="Search <wiki:Variable var="ApplicationName" />" />
+  <link rel="help"   href="<wiki:LinkTo format="url" page="TextFormattingRules"/>" title="Help" />
+  <link rel="start"  href="<wiki:LinkTo format="url" page="Main"/>"                title="Front page" />
+  <link rel="stylesheet" type="text/css" media="print" href="<wiki:BaseURL/>templates/<wiki:TemplateDir/>/jspwiki_print.css" />
+  <link rel="alternate stylesheet" type="text/css" href="<wiki:BaseURL/>templates/<wiki:TemplateDir/>/jspwiki_print.css" title="Print friendly" />
+  <link rel="alternate stylesheet" type="text/css" href="<wiki:BaseURL/>templates/<wiki:TemplateDir/>/jspwiki.css" title="Standard" />
+  <link rel="icon" type="image/png" href="<wiki:BaseURL/>images/favicon.png" />
+  <link rel="stylesheet" type="text/css" href="<wiki:BaseURL/>templates/<wiki:TemplateDir/>/layout.css" />
+  <link rel="stylesheet" type="text/css" href="<wiki:BaseURL/>templates/<wiki:TemplateDir/>/roller.css" />
+  <link rel="stylesheet" type="text/css" href="<wiki:BaseURL/>templates/<wiki:TemplateDir/>/layout.css" />
+  <link rel="stylesheet" type="text/css" href="<wiki:BaseURL/>templates/<wiki:TemplateDir/>/menu.css" />
+  <link rel="stylesheet" type="text/css" href="<wiki:BaseURL/>templates/<wiki:TemplateDir/>/tan/colors.css" />
+  <wiki:FeedDiscovery />
+

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/cssinclude.js
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/cssinclude.js?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/cssinclude.js (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/cssinclude.js Tue Sep 13 18:51:50 2005
@@ -0,0 +1,40 @@
+<link rel="stylesheet" href="templates/<wiki:TemplateDir/>/jspwiki.css" />
+
+<script type="text/javascript">
+<!-- Hide script contents from old browsers
+
+    var IE4 = (document.all && !document.getElementById) ? true : false;
+    var NS4 = (document.layers) ? true : false;
+    var IE5 = (document.all && document.getElementById) ? true : false;
+    var NS6 = (document.getElementById && !document.all) ? true : false;
+    var IE  = IE4 || IE5;
+    var NS  = NS4 || NS6;
+    var Mac = (navigator.platform.indexOf("Mac") == -1) ? false : true;
+
+    var sheet;
+
+    if( NS4 )
+    {
+        sheet = "jspwiki_ns.css";
+    }
+    else if( Mac )
+    {
+        sheet = "jspwiki_mac.css";
+    }
+    else
+    {
+        // Let's assume all the rest of the browsers are sane
+        // and standard's compliant.
+        sheet = "jspwiki_ie.css";
+    }
+
+    document.write("<link rel=\"stylesheet\" href=\"templates/<wiki:TemplateDir />/"+sheet+"\" />");
+
+// end hiding contents from old browsers -->
+</script>
+
+<meta http-equiv="Content-Type" content="text/html; charset=<wiki:ContentEncoding />" />
+<link rel="search" href="<wiki:LinkTo format="url" page="FindPage"/>"            title="Search <wiki:Variable var="ApplicationName" />" />
+<link rel="help"   href="<wiki:LinkTo format="url" page="TextFormattingRules"/>" title="Help" />
+<link rel="start"  href="<wiki:LinkTo format="url" page="Main"/>"                title="Front page" />
+

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/images/header-grey.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/images/header-grey.png?rev=280737&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/images/header-grey.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/images/header-grey.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/images/leftbar-blue.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/images/leftbar-blue.png?rev=280737&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/images/leftbar-blue.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/images/leftbar-blue.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/images/menutab-tl.gif
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/images/menutab-tl.gif?rev=280737&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/images/menutab-tl.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/images/menutab-tr.gif
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/images/menutab-tr.gif?rev=280737&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/images/menutab-tr.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/jspwiki.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/jspwiki.css?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/jspwiki.css (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/jspwiki.css Tue Sep 13 18:51:50 2005
@@ -0,0 +1,277 @@
+/* Put all generic definitions here. */
+H1,H2,H3,H4 { font-family: Arial, Helvetica, sans-serif }
+
+h2 { border-bottom: 2px grey solid }
+h3 { border-bottom: 1px grey solid }
+
+DIV.small   { font-size: 70%; }
+H1.pagename { margin-top: 0; }
+IMG.inline  {}
+
+A.footnoteref { vertical-align: super; 
+                font-size: 70%; }
+A.footnote    { color: #0044AA; }
+P.versionnote { color: blue;
+                font-size: 130%;
+                text-align: center; 
+                background: #EAEAEA;
+                padding: 12px 12px 12px 12px;
+                }
+
+/* Added in v1.5.1 */
+
+H3.leftmenuheading { margin-top: 0; }
+BODY.edit   { background-color: #D9E8FF; } /* Edit.jsp BODY element */
+.leftmenu { font-family: arial, helvetica, sans-serif;
+                  font-size: 90%; }  /* Left menu */
+.page     { }                            /* Page data area */
+A.wikipage  { }                            /* Normal, internal wiki reference */
+A.editpage  { 
+	color: #FF0000;
+ 	text-decoration: none;
+ 	border-bottom: 1px dashed red;
+ 	}
+A.external  { }                            /* External reference */
+A.interwiki { }                            /* Interwiki reference */
+
+/* Added in 1.6.3 */
+TD.diffadd  { background: #99FF99; 
+              font-family: monospace; }
+TD.diffrem  { background: #FF9933; 
+              font-family: monospace; }
+TD.diff     { background: #FFFFFF; 
+              font-family: monospace; }
+
+/* Added in 1.6.9 */
+
+TABLE.wikitable { }
+TABLE.wikitable * TD { text-align: left; }
+TABLE.wikitable * TH { }
+
+/* This is the Edit.jsp editor style */
+TEXTAREA.editor {}
+
+pre { 
+      white-space: pre;
+      margin:      1em 2em 1em 2em; 
+      background:  #f0f0f0;
+      border:      1px dotted #3c78b5;
+      overflow: auto;
+     }
+
+/* The text how the "This is a preview" comment should be shown. */
+.previewnote {
+               text-align: center;
+               font-size: 100%;
+               background:  #fff0f0;
+               padding: 1em;
+               }
+
+/* How the preview content should be shown */
+.previewcontent {
+                  background: #E0E0E0;
+                  padding: 1em;
+                  } 
+
+/* How the system messages should be shown (DisplayMessage.jsp) */
+.messagecontent { background: #E0E0E0; }
+
+/* How the "This page has been modified..." -comment should be shown. */
+
+.conflictnote { }
+
+/* For the weblog plugin */
+
+.weblog { margin-left: 20px; }
+
+.weblogentry { }
+
+.weblogentryheading { background: #E0E0E0;
+                      font-size: 120%;
+                      font-family: sans-serif; 
+                      margin-top: 2ex; }
+
+.weblogentrybody { font-family: sans-serif; 
+                   font-size: 85%; 
+                   margin-left: 10px; }
+
+.weblogentryfooter { font-size: 9px; 
+                     margin-left: 10px;
+                     clear: both; }
+
+P.locknote { color: red;
+             font-size: 130%;
+             text-align: center; 
+             background: #EAEAEA;
+             padding: 12px 12px 12px 12px;
+             }
+
+/* For the CalendarTag */
+TABLE.calendar  { font-size: 80%; }
+TABLE.calendar TD { text-align: center; }
+
+TABLE.calendar TD.othermonth { color: #707070; }
+
+TABLE.calendar TD.link { background: #E0E0E0; }
+
+TABLE.calendar TR.month { font-size: 120%;
+                          font-family: sans-serif; }
+TABLE.calendar TR.weekdays { color: #FF0000; }
+
+/* For the BreadcrumbsTag */
+.breadcrumbs { font-size: 60%; }
+
+/* For the image plugin tag. */
+.imageplugin { margin: 5px 5px 5px 5px; }
+.imageplugin img { border: 0; }
+.imageplugin caption { font-size: 80%; }
+
+/* For the search_highlight.js.  This style defines the how the words that have
+   been found look like.  If you look for "thingy", you will get these following
+   in the results.
+
+   <span class="searchword">thingy</span>
+ */
+.searchword { background-color: #FFFF00; }
+
+/* For the weblogarchive plugin. */
+
+.weblogarchive { }
+
+.weblogarchive ul { margin-top: 0px;
+                    padding: 0px; }
+
+.weblogarchive li { display: block;
+                    list-style-type: none;
+                    margin-left: 1em; }
+
+.archiveyear { font-weight: bold;
+               text-decoration: none;
+               margin-left: 0px !important; }
+.archiveyear:after { content: " AD" }
+
+/*  Error handling  (2.2+) */
+
+.error { color: #ff2222; 
+         font-weight: bold; }
+
+/*  Index plugin */
+
+div.index {}
+div.index .header { padding: 4px; background: #f0f0f0; }
+div.index .body {}
+div.index .section { color:red; }
+
+/*  Table of contents plugin */
+
+.toc {
+     background: #e0e0ff;
+     border: 1px;
+     padding: 8px;
+}
+
+.toc h4 {
+}
+
+.toc ul {
+     list-style: none;
+     margin-left: 0;
+     padding-left: 0;
+}
+
+.toc li {
+     margin-left: 1em;
+     padding-left: 0;
+     display: block;
+}
+
+
+/*  Here's a nice style you can use to put comment boxes on pages.  It's used
+    on some pages. */
+
+div.commentbox {
+   float:right;
+   width: 20%;
+   border-style: inset;
+   background: #f0f0f0;
+   font-size: 80%;
+   padding: 4px;
+   margin-left: 4px;
+}
+
+.commentbox ul, .commentbox ol {
+   padding-left: 1em;
+   margin-left: 4px;
+}
+
+/*  To make centering easier */
+
+.center { 
+    text-align: center;
+}
+
+.center table { 
+    margin-left: auto;
+    margin-right: auto;
+    text-align: left;
+}
+
+/* The CSS Styles for the Contextual diff provider */
+
+.diff-wikitext 
+    { margin: 10px; 
+      padding: 5px; 
+      border-width: thin; border-style:inset; 
+      font-family: courier new , monospace;  }
+
+
+.diff-insertion 
+    { background: #ddffdd; text-decoration:  none; color: #8000ff; } 
+
+.diff-deletion 
+    { background: #ffdddd; text-decoration: line-through; color: red; } 
+
+.diff-nextprev 
+    { font-size: 60%; vertical-align: super; text-decoration: none; }
+
+
+.zebra-table TH
+    { background:  #e0e0e0;
+    }
+    
+.zebra-table TR.odd TD
+    { background:  #f0f0f0;
+    }
+
+.versionhistory
+    { font-size: 80%;
+      font-family: arial, helvetica, sans-serif;
+    }
+
+.attachments
+    { font-family: arial, helvetica, sans-serif;
+      font-size: 90%;
+    }
+
+.attachments h3
+    { margin-bottom: 0px;
+      padding-bottom: 0px; }
+
+ .versionhistory
+    { font-size: 85%;
+       font-family: arial, helvetica, sans-serif;
+    }
+
+div#left {
+    position: absolute;
+    left: 0px;
+    width: 125px;
+    padding: 5px;
+    font-size: small;
+}
+div#content {
+    margin: 0 0 0 136px;
+    padding: 10px;
+}
+
+

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/jspwiki_ie.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/jspwiki_ie.css?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/jspwiki_ie.css (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/jspwiki_ie.css Tue Sep 13 18:51:50 2005
@@ -0,0 +1 @@
+/* Put any IE (or other relatively standards-compliant browser definitions here */

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/jspwiki_mac.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/jspwiki_mac.css?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/jspwiki_mac.css (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/jspwiki_mac.css Tue Sep 13 18:51:50 2005
@@ -0,0 +1 @@
+/* Put any MacOS -specific definitions here. */

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/jspwiki_ns.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/jspwiki_ns.css?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/jspwiki_ns.css (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/jspwiki_ns.css Tue Sep 13 18:51:50 2005
@@ -0,0 +1,36 @@
+/* Put any Netscape 4 -specific definitions here. */
+H1,H2,H3,H4 { font-family: Arial, Helvetica, sans-serif }
+H1 { font-size: 36px }
+H2 { font-size: 24px }
+H3 { font-size: 20px }
+H4 { font-size: 16px }
+P,UL,OL,BODY,TD { font-size: 16px }
+FORM { font-size: 14px }
+PRE { font-size: 14px }
+H1.pagename {}
+
+
+/* For the CalendarTag */
+
+ TABLE.calendar  { font-size: 60%;
+                   text-align: center; }
+
+ TD.month        { font-size: 70%;
+                   text-align: center;
+                   font-weight: bold;
+                   font-family: sans-serif; }
+
+ TD.weekdays     { color: #FF0000;        /* days heading */
+                   font-size: 60%; }
+
+ TD.days         { font-size: 60%; 
+                   text-align: center;}
+										 
+ TD.link         { color: #FF2222; background: #E0E0E0;
+                   font-size: 60%;
+                   text-align: center; }
+
+ TD.othermonth   { color: #707070; 
+                   font-size: 60%; 
+                   text-align: center}
+

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/jspwiki_print.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/jspwiki_print.css?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/jspwiki_print.css (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/jspwiki_print.css Tue Sep 13 18:51:50 2005
@@ -0,0 +1,29 @@
+/*
+ * CSS intended specificly for print media
+ * e.g: <link rel=stylesheet type="text/css" media="print" href="templates/default/jspwiki_print.css">
+ * This stylesheet mainly hides all the webspecific stuff.
+ * Shows content in a print friendly way.
+ * Author PhilipVanBogaert
+ */
+
+/* Webpage stuff */
+.leftmenu,.searchbox,.breadcrumbs,.pageactions {
+    display:none;
+}
+
+/* Wild guess */
+body {
+    font-size:10pt;
+}
+
+/* Show links as normal text (maybe show urls at the bottom of the page) */
+
+a {
+    text-decoration:none;
+}
+
+/* Give the content what it deserves. */
+.page {
+    width:100%;
+}
+/* More to come. */

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/layout.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/layout.css?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/layout.css (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/layout.css Tue Sep 13 18:51:50 2005
@@ -0,0 +1,35 @@
+/* ======================================================================
+layout.css: Base CSS layout for Roller's web UI (position and sizing only)
+====================================================================== */
+
+#wrapper {
+    width: 100%;
+}
+#banner {
+    height: 105px; 
+    margin: 0px;
+    padding: 0px 0px 0px 0px;
+}
+#menu {
+    padding: 0px 15px 0px 15px;
+}
+#centercontent {
+    margin: 15px 260px 0px 15px;
+}
+#rightcontent {
+    position: absolute;
+    top:   110px;
+    right:  15px;
+    width: 230px;
+}
+.prop {
+    height: 300px;
+    float: right;
+    width: 1px;
+}
+.clear {
+    clear: both;
+    height: 1px;
+    overflow: hidden;
+}
+

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/menu.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/menu.css?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/menu.css (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/menu.css Tue Sep 13 18:51:50 2005
@@ -0,0 +1,75 @@
+/* ======================================================================
+menu.css: CSS layout and styles for Roller tabbed menu
+====================================================================== */
+
+/* rounded corners */
+
+div.menu-tl {
+    margin: 0px; 
+    height: 100%;
+    background: url("images/menutab-tl.gif") no-repeat left top;    
+    background-repeat: no-repeat;
+}
+div.menu-tr {
+    margin: 0px; 
+    height: 100%;
+    background: url("images/menutab-tr.gif") no-repeat right top;    
+    background-repeat: no-repeat;
+}
+
+td.menuTabSelected a, td.menuTabUnselected a {
+    vertical-align: middle;
+    text-align: middle;
+}
+
+/* ----------------------------------------------------------------------
+Menu tab table (the tabs)
+---------------------------------------------------------------------- */
+
+.menuTabTable {
+    height: 21px;
+}
+td.menuTabSeparator {
+    width: 4px;
+}  
+td.menuTabSelected {
+    padding-right: 0px;
+    padding-left: 0px;
+    padding-bottom: 0px;
+    margin: 0px;
+    padding-TOP: 0px;
+    font-weight: bold;
+}
+td.menuTabUnselected {
+    padding: 0px 0px 0px 0px; 
+    margin: 0px 0px 0px 0px;
+}
+
+/* ----------------------------------------------------------------------
+Menu item table (the bar below the tabs)
+---------------------------------------------------------------------- */
+
+.menuItemTable {
+    padding-right: 0px;
+    padding-bottom: 0px;
+    width: 100%;
+    padding-top: 0px;
+    height: 25px;
+}
+.menuItemSelected {
+    padding-right: 1px;
+    padding-left: 1px;
+    padding-bottom: 0px;
+    padding-top: 0px;
+    font-weight: bold;
+}
+.menuItemUnselected {
+    padding: 0px 1px 0px 1px; /* TRBL */
+}
+
+
+
+
+
+
+

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/roller.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/roller.css?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/roller.css (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/roller.css Tue Sep 13 18:51:50 2005
@@ -0,0 +1,522 @@
+/* ======================================================================
+roller.css: Base CSS styles for Roller web UI
+
+CUSTOMIZABLE color and background image setttings have been separated out
+and placed in separate colors.css files for different color schemes.
+====================================================================== */
+
+
+body {
+    background: white;
+    margin: 0px;
+    padding: 0px;
+    font: small Verdana,Arial,Sans-serif;
+    font: small/1.5em Verdana, Arial, Helvetica, sans-serif;
+}
+p {
+    margin: 0px 0px 10px 0px;
+    font-size: 1em;
+    background: transparent;
+    color: black; 
+}
+p.subtitle {
+    margin: 5px 0px 15px;
+    font-size: 1em;
+    font-weight: bold;
+}
+p.pagetip {
+    margin: 0px 0px 15px 0px;
+}
+h1 {
+    background: transparent;
+    font-size: 19px;
+    font-weight: bold;
+    margin: 10px 0px;
+}
+h2 {
+    background: transparent;
+    font-size: large;
+    font-weight: bold;
+}
+h3 {
+    font-size: .9em;
+    background: transparent;
+    font-weight: bold;
+    background: url(none);
+    padding: 5px 0px 0px 0px;    
+    margin: 0px 0px 0px 0px;
+}
+img {
+    border: 0px;
+    overflow: auto;
+}
+img.w3c {
+    border: 0px;
+    height: 31px;
+    width: 88px;
+    margin-right: 5px;
+}
+a {
+    text-decoration: none;
+}
+a:link {
+    text-decoration: none;
+}
+a:visited {
+    text-decoration: none;
+}
+a:hover {
+    text-decoration: underline;
+}
+a:active {
+    text-decoration: underline;
+}
+
+/* ----------------------------------------------------------------------
+Page element styles: boxes and borders, etc.
+---------------------------------------------------------------------- */
+
+.bannerBox {
+    height: 78px; 
+    width: 100%;
+}
+.bannerStatusBox {
+    height: 25px; 
+    width: 100%;
+}
+.bannerLeft {
+    float: left; 
+    padding: 4px 15px 4px 15px;
+}
+.bannerRight {
+    float: right; 
+    padding: 4px 15px 4px 15px;
+}
+#footer {
+    margin: 10px 0px 0px 0px;
+    border-top: 1px grey solid;
+}
+.sidebarfade, .sidebarfade_hotblogs, .sidebarfade_search, {
+    padding: 0px; 
+    width: 100%;
+}
+.sidebarBody {
+    margin: 10px;
+}
+div.entryTitleBox {
+   padding: 4px;
+   margin: 4px 0px 4px 0px;
+   font-size: medium;
+}
+div.entryBox {
+   padding: 4px;
+   margin: 4px 0px 4px 0px;
+   /* line-height: 1.2em; */
+}
+div.entryBoxPinned {
+   padding: 4px;
+   margin: 4px 0px 4px 0px;
+}
+a.entryTitle, a:active.entryTitle, a:visited.entryTitle {
+   font-size: small;
+   font-weight: bold;
+}
+span.hotBlogs, a.hotBlogs, a:active.hotBlogs, a:visited.hotBlogs, ul.hotBlogs {
+   font-size: small;
+   padding-left: 0px;
+   list-style-type: none
+}
+span.entryDetails, a.entryDetails, a:active.entryDetails, a:visited.entryDetails {
+   font-size: small;
+   color: grey;
+}
+
+/* ----------------------------------------------------------------------
+form layout styles
+---------------------------------------------------------------------- */
+
+input, select, option {
+    font: small Verdana,Arial,Sans-serif;
+    color: black;
+    font: small/1.5em Verdana, Arial, Helvetica, sans-serif;
+    font-size: 100%;
+}
+textarea {
+   margin: 3px 0px 0px 0px;
+}
+div.buttonBox {
+   width: 98%; 
+   border: 1px solid black;
+   background-color: #f3f3f3;
+   padding: 3px;
+   margin-top: 5em;
+   clear: both;
+}
+.left {
+   font-size: small;
+   width: 136px;
+}
+.leftTitle {
+   font-size: small;
+   font-weight: bold;
+}
+
+.formtable, .formtableNoDesc { 
+    width: 100%; 
+    border-collapse: collapse; 
+} 
+.formtable td.label, .formtable td.field, .formtable td.description,
+.formtableNoDesc td.label, .formtableNoDesc td.field, .formtableNoDesc  {
+    vertical-align: top;
+    border-style: solid;
+    border-width: 0px 0px 1px 0px;
+    border-color: #e5e5e5;
+    padding: 4px 10px 4px 10px;
+}
+.formtable td.label { 
+    text-align: right;
+    width: 20%; 
+}
+.formtable td.field { 
+    width: 30%; 
+}
+.formtable td.description { 
+    width: 50%; 
+}
+.formtableNoDesc td.label { 
+    text-align: right;
+    width: 40%; 
+}
+.formtableNoDesc td.field { 
+    width: 40%; 
+}
+.formtableNoDesc td.description { 
+    width: 0%; 
+}
+
+div.row { 
+   padding: 2px; 
+}
+div.formrow {
+   float: left:
+   width: 80%;
+}
+label.formrow {
+   float: left;
+   text-align: right;
+   width: 20%;
+   padding-right: 1em;
+}
+div.sideformrow {
+   float: left:
+   width: 100%;
+}
+label.sideformrow {
+   float: left;
+   text-align: left;
+   width: 30%;
+   padding-right: 1em;
+}
+
+
+/* ----------------------------------------------------------------------
+Table styles 
+---------------------------------------------------------------------- */
+
+table.rollertable {
+    border-collapse: collapse; 
+    width: 100%;
+}
+table.rollertable th, table.rollertable th {
+    border: 1px solid #ccc;
+}
+table.rollertable th {
+    color: white;
+}
+table.rollertable td, table.rollertable tbody td {
+    vertical-align: top;
+}
+table.rollertable tbody td {
+    padding: 3px;
+}
+table.rollertable td.center {
+    text-align: center;
+}
+.rollertable_even td {
+    border: 1px solid #ccc;
+    background: #EEEEEE;
+    color: black;
+    vertical-align: top;
+}
+.rollertable_odd td{
+    border: 1px solid #ccc;
+    background: inherit;
+    vertical-align: top;
+    color: black;
+}
+td.rollertable_entry, div.rollertable_entry {
+    border: 1px solid #ccc;
+    background: inherit;
+    padding: 5px;
+    vertical-align: top;
+}
+td.propname {
+    padding: 0px 0px 0px 3em;
+    vertical-align: top;
+}
+table.edit th {
+    text-align: right;
+    padding-right: 5px;
+}
+
+/* ----------------------------------------------------------------------
+Calendar styles
+---------------------------------------------------------------------- */
+
+div.archiveCalendar {
+    position: absolute; 
+    top: 80px; 
+    right: 20px;
+    font-size: 11px;
+}
+.hCalendarDay {
+	border-width: thin;
+	font-size: .9em;
+	text-align: center;
+}
+.hCalendarDayCurrent {
+	border-style: dotted;
+	border-width: thin;
+	font-size: .9em;
+	font-weight: bolder;
+	text-align: center;
+}
+.hCalendarDayLinked {
+	border-width: thin;
+	font-size: .9em;
+	font-weight: bolder;
+	text-align: center;
+}
+.hCalendarDayNameRow {
+	font-size: .9em;
+	background-color: #eee;
+    border-bottom: 1px solid #ccc;
+	text-align: center;
+}
+.hCalendarDayNotInMonth {
+	background: transparent;
+	color: #AAAAAA;
+	font-size: .9em;
+	text-align: center;
+}
+.hCalendarNextPrev {
+	text-align: center;
+}
+.hCalendarMonthYearRow {
+	font-weight: bold;
+	text-align: center;
+}
+
+/* ----------------------------------------------------------------------
+Error and status message styles
+---------------------------------------------------------------------- */
+
+.statusMsg {
+    background: #CCFFCC;
+    border: 1px solid #008000;
+    color: #000000;
+    display: block;
+    font-size: .9em;
+    margin: 0px 0px 10px 0px;
+    padding: 3px;
+    width: 98%;
+}
+.error {
+    background: transparent;
+    color: #FF0000;
+}
+.warning {
+    background: transparent;
+    color: #FF0000;
+    font-size: 120%;
+    font-weight: bold;
+}
+.errors, .messages, .warnings {
+    padding: 5px;
+    margin: 10px 0px 10px 0px;
+}
+.errors {
+   background-color: #fcc;
+   border: 1px solid red;
+}
+.messages {
+   background-color: #cfc;
+   border: 1px solid green;
+}
+.warnings {
+   background-color:#FFFFAA;
+   border: 1px solid yellow;
+}
+div.error {
+    background-color: #ffcccc;
+    border: 1px solid #000000;
+    color: #aa0000;
+    font-size: 0.9em;
+    font-weight: normal;
+    margin: 5px 10px 5px 0px;
+    padding: 3px;
+    text-align: left;
+    vertical-align: bottom;
+}
+div.output {
+    background-color: #e0e0e0;
+    border: 1px solid #CCCC99;
+    color: #000000;
+    font-size: 0.9em;
+    font-weight: normal;
+    margin: 5px 10px 5px 0px;
+    padding: 3px;
+    text-align: left;
+    vertical-align: bottom;
+}
+
+/* ----------------------------------------------------------------------
+weblog editor styles 
+---------------------------------------------------------------------- */
+
+div.previewEntry {
+   border: 1px solid gray;
+   clear: both;
+   height: 22em;
+   width: 98%;
+   padding: 10px;
+   overflow: auto;
+}
+div.centerTitle {
+    border: 1px solid #ccc;
+    color: black;
+    font-weight: bolder;
+    font-size: large;
+    text-align: center;
+}
+div.control {
+    width: 100%; 
+}
+div.controlToggle {
+    width: 100%; 
+    height: 20px;
+}
+.control input { 
+    margin: 5px; 
+}
+a.controlToggle {
+    margin: 5px; 
+    padding: 5px;
+    color: black;
+    background: transparent;
+    text-decoration: none;
+}
+a.controlToggle:link { 
+    margin: 5px; 
+    padding: 5px;
+    color: black;
+    background: transparent;
+    text-decoration: none;
+}
+a.controlToggle:visited {
+    margin: 5px; 
+    padding: 5px;
+    color: black;
+    background: transparent;
+    text-decoration: none;
+}
+a.controlToggle:hover {
+    margin: 5px; 
+    padding: 5px;
+    color: black;
+    background: transparent;
+    text-decoration: underline;
+    font-weight: bold;
+}
+
+/* ----------------------------------------------------------------------
+Misc styles 
+---------------------------------------------------------------------- */
+
+div.NN4 {
+    display: none;
+}
+div.rNavigationBar {
+    margin-bottom: 20px;
+    margin-right: 10px;
+}
+.entryDate {
+    background: transparent;
+    color: #989898;
+    font-style: italic;
+}
+.commentTitle {
+    background: #FFFFDD;
+    border: 1px solid #000;
+    padding: 3px;
+    margin: 0px 5px 10px 0px;
+    color: #000000;
+    font-size: .9em;
+    width: 98%;
+}
+.version {
+    font-size: x-small;
+    color: #808080;
+}
+.page {
+    visibility: hidden;
+    position: absolute;
+    float: left;
+    background-color: white;
+    border: 1px gray solid;
+    padding: 10px;
+    width: 80%;
+    height: 40em;
+}
+.tab {
+    background-color: white;
+    border-top: 1px gray solid;
+    border-left: 1px gray solid;
+    border-right: 1px gray solid;
+    font-family: verdana;
+    font-style: bold;
+    padding: 5px;
+    margin: 2px;
+}
+
+p.websiteDescription {
+   text-style: italics;
+}
+.yourWeblogBox {
+   width: 80%;
+   padding: 4px;
+   margin: 4px 0px 4px 0px;
+}
+.version {
+   font-size: small;
+   color: grey;
+   text-align: center;
+}
+.details {
+   font-size: small;
+   color: grey;
+}
+div.helptext {
+   background: #f0f0f0;
+   border: 1px #c0c0c0 solid;
+   padding: 2px;
+   margin: 30px 10px 10px 0px;
+   width: 75%; 
+}
+.padleft {
+    padding-left: 8px;
+}
+
+
+
+        

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/search_highlight.js
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/search_highlight.js?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/search_highlight.js (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/search_highlight.js Tue Sep 13 18:51:50 2005
@@ -0,0 +1,75 @@
+/* http://www.kryogenix.org/code/browser/searchhi/ */
+/* Modified 20021006 to fix query string parsing and add case insensitivity */
+/* Modified 20030227 by sgala@hisitech.com to skip words with "-" and cut %2B (+) preceding pages */
+
+function highlightWord(node,word) 
+{
+    // Iterate into this nodes childNodes
+    if (node.hasChildNodes) 
+    {
+        var hi_cn;
+        for (hi_cn=0;hi_cn<node.childNodes.length;hi_cn++) 
+        {
+            highlightWord(node.childNodes[hi_cn],word);
+        }
+    }
+	
+    // And do this node itself
+    if (node.nodeType == 3) 
+    { // text node
+        tempNodeVal = node.nodeValue.toLowerCase();
+        tempWordVal = word.toLowerCase();
+        if (tempNodeVal.indexOf(tempWordVal) != -1) 
+        {
+            pn = node.parentNode;
+            if (pn.className != "searchword") 
+            {
+                // word has not already been highlighted!
+                nv = node.nodeValue;
+                ni = tempNodeVal.indexOf(tempWordVal);
+                // Create a load of replacement nodes
+                before = document.createTextNode(nv.substr(0,ni));
+                docWordVal = nv.substr(ni,word.length);
+                // alert( "Found: " + docWordVal );
+                after = document.createTextNode(nv.substr(ni+word.length));
+                hiwordtext = document.createTextNode(docWordVal);
+                hiword = document.createElement("span");
+                hiword.className = "searchword";
+                hiword.appendChild(hiwordtext);
+                pn.insertBefore(before,node);
+                pn.insertBefore(hiword,node);
+                pn.insertBefore(after,node);
+                pn.removeChild(node);
+            }
+        }
+    }
+}
+
+function googleSearchHighlight() 
+{
+    if (!document.createElement) return;
+    ref = document.referrer; //or URL for highlighting in place
+    if (ref.indexOf('?') == -1) return;
+    qs = ref.substr(ref.indexOf('?')+1);
+    qsa = qs.split('&');
+    for (i=0;i<qsa.length;i++) 
+    {
+        qsip = qsa[i].split('=');
+        if (qsip.length == 1) continue;
+
+        // q= for Google, p= for Yahoo
+        // query= for JSPWiki
+
+        if (qsip[0] == 'query' || qsip[0] == 'q') 
+        {
+            words = qsip[1].replace(/%2B/g,'');
+            words = words.replace(/-\S+\s/g,'');
+            words = unescape(words.replace(/\+/g,' ')).split(/\s+/);
+            for (w=0;w<words.length;w++) {
+                highlightWord(document.getElementsByTagName("body")[0],words[w]);
+            }
+        }
+    }
+}
+
+window.onload = googleSearchHighlight;

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/colors.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/colors.css?rev=280737&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/colors.css (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/colors.css Tue Sep 13 18:51:50 2005
@@ -0,0 +1,118 @@
+
+/* TAN : Customizable colors and images */
+
+/* ------------------------------------------------------------------------ */
+/* add colors and images to roller.css */
+
+.bannerlogo {
+    /* margin: 15px 0px 0px 15px; */
+    margin: 0px;
+}
+
+.bannerBox {
+    background: url("two-banner.gif") repeat-x top;
+}
+.sidebarfade {
+    background: url("two-sidebarfade.gif") repeat-x bottom;
+}
+.sidebarfade_hotblogs {
+    background: url("two-sidebarfade.gif") repeat-x bottom;
+}
+.sidebarfade_search {
+    background: url("two-sidebarfade.gif") repeat-x bottom;
+}
+.bannerStatusBox {
+    background: #ad3431;
+    color: white;
+}
+.bannerStatusBox a {
+    color: white;
+}
+.bannerStatusBox a:link {
+    color: white;
+}
+.bannerStatusBox a:visited {
+    color: white;
+}
+h1 {
+    color: #ad3537;
+}
+h2 {
+    color: #ad3537;
+}
+h3 {
+    background: transparent;
+    color: #ad3537;
+    font-weight: bold;
+}
+a:link {
+    color: #ad3537;
+}
+a:visited {
+    color: #ad3537;
+}
+table.rollertable th, table.rollertable th {
+    background: #c6ab74;
+}
+table.rollertable td, table.rollertable tbody td {
+    border: 1px solid #c6ab74;
+}
+a.entryTitle, a:active.entryTitle, a:visited.entryTitle {
+   color: #ad3537;
+}
+div.centerTitle {
+    background: #c6ab74;
+}
+div.control {
+    background: #c6ab74; 
+}
+div.controlToggle {
+    background: url("two-togglegrey.gif") repeat-x top; 
+}
+div.entryTitleBox {
+   background: #c6ab74; 
+   color: white; 
+}
+div.entryBox {
+   border: 1px #c6ab74 solid;
+}
+div.entryBoxPinned {
+   background: #e5e5e5; 
+   border: 1px #c0c0c0 solid;
+}
+a.entryTitle, a:active.entryTitle, a:visited.entryTitle {
+   color: #ad3537; 
+   font-size: medium;
+   font-weight: bold;
+}
+div.yourWeblogBox {
+   border-top: 1px #c6ab74 solid;
+}
+
+/* ------------------------------------------------------------------------ */
+/* add colors and iamges to menu.css */
+
+td.menuTabSelected {
+    background: url("menutab-sel.gif") repeat-x;
+}
+td.menuTabUnselected {
+    background: url("menutab-unsel.gif") repeat-x;
+}
+.menuItemTable {
+    background-color: #c6ab74;
+    color: black;
+}
+td.menuTabSelected a:link, td.menuTabSelected a:visited, td.menuTabSelected a:hover, td.menuTabSelected a:active {
+    color: black;
+}
+td.menuTabUnselected a:link, td.menuTabUnselected a:visited, td.menuTabUnselected a:hover, td.menuTabUnselected a:active {
+    color: black;
+}
+a.menuItemSelected:link, a.menuItemSelected:visited, a.menuItemSelected:hover, a.menuItemSelected:active {
+    color: black;
+}
+a.menuItemUnselected:link, a.menuItemUnselected:visited, a.menuItemUnselected:hover, a.menuItemUnselected:active {
+    color: black;
+}
+
+

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/logo.gif
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/logo.gif?rev=280737&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/logo.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/menutab-sel.gif
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/menutab-sel.gif?rev=280737&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/menutab-sel.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/menutab-unsel.gif
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/menutab-unsel.gif?rev=280737&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/menutab-unsel.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/two-banner.gif
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/two-banner.gif?rev=280737&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/two-banner.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/two-bigbadge.gif
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/two-bigbadge.gif?rev=280737&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/tan/two-bigbadge.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream