jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ajaqu...@apache.org
Subject svn commit: r627272 - in /incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes: ./ WEB-INF/ WEB-INF/jsp/ WEB-INF/jsp/templates/ WEB-INF/jsp/templates/default/
Date Wed, 13 Feb 2008 06:25:00 GMT
Author: ajaquith
Date: Tue Feb 12 22:24:59 2008
New Revision: 627272

URL: http://svn.apache.org/viewvc?rev=627272&view=rev
Log:
Initial commit.

Added:
    incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/
    incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/EditGroup.jsp
    incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/Group.jsp
    incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/Test.jsp
    incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/UserPreferences.jsp
    incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/
    incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/
    incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/
    incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/
    incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/AttachmentTab.jsp
    incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/Favorites.jsp
    incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/Footer.jsp
    incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/Header.jsp
    incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/PageActionsBottom.jsp
    incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/PageActionsTop.jsp
    incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/PageContent.jsp
    incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/PageTab.jsp
    incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/SearchBox.jsp
    incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/UserBox.jsp
    incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/ViewTemplate.jsp
    incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/commonheader.jsp
    incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/localheader.jsp
    incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/Wiki.jsp

Added: incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/EditGroup.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/EditGroup.jsp?rev=627272&view=auto
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/EditGroup.jsp (added)
+++ incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/EditGroup.jsp Tue Feb 12 22:24:59 2008
@@ -0,0 +1,25 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.*" %>
+<%@ page import="com.ecyrd.jspwiki.auth.WikiSecurityException" %>
+<%@ page import="com.ecyrd.jspwiki.auth.authorize.Group" %>
+<%@ page import="com.ecyrd.jspwiki.auth.authorize.GroupManager" %>
+<%@ page errorPage="/Error.jsp" %>
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%! 
+    Logger log = Logger.getLogger("JSPWiki"); 
+%>
+
+<%
+    WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
+    // Create wiki context and check for authorization
+    WikiContext wikiContext = wiki.createContext( request, WikiContext.EDIT_GROUP );
+    
+    // Set the content type and include the response content
+    response.setContentType("text/html; charset="+wiki.getContentEncoding() );
+    String contentPage = wiki.getTemplateManager().findJSP( pageContext,
+                                                            wikiContext.getTemplate(),
+                                                            "EditTemplate.jsp" );
+
+%><wiki:Include page="<%=contentPage%>" />
+

Added: incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/Group.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/Group.jsp?rev=627272&view=auto
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/Group.jsp (added)
+++ incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/Group.jsp Tue Feb 12 22:24:59 2008
@@ -0,0 +1,79 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<fmt:setBundle basename="templates.DefaultResources"/>
+
+<stripes:useActionBean binding="/ViewGroup.action"/>
+
+<stripes:layout-render name="/WEB-INF/jsp/templates/default/ViewTemplate.jsp">
+  <stripes:layout-component name="contents">
+
+    <script language="javascript" type="text/javascript">
+    function confirmDelete()
+    {
+      var reallydelete = confirm("<fmt:message key="group.areyousure"><fmt:param>${actionBean.group.name}</fmt:param></fmt:message>");
+    
+      return reallydelete;
+    }
+    </script>
+    
+    <h3>Group ${actionBean.group.name}</h3>
+    
+    <c:choose>
+      <c:when test="${empty actionBean.group.created}">
+        <!-- Group doesn't exist; offer user opportunity to create one if allowed. -->
+        <fmt:message key="group.doesnotexist"/>
+        <wiki:Permission permission="createGroups">
+          <fmt:message key="group.createsuggestion">
+            <fmt:param>
+              <wiki:Link jsp="NewGroup.jsp">
+                <wiki:Param name="group"><%=request.getParameter("group")%></wiki:Param>
+                <fmt:message key="group.createit"/>
+              </wiki:Link>
+            </fmt:param>
+          </fmt:message>
+        </wiki:Permission>
+      </c:when>
+      
+      <c:otherwise>
+        <!-- Group exists; print details. -->
+        <div class="formcontainer">
+        
+          <!-- Group name and instructions -->
+          <div class="instructions">
+            <fmt:message key="group.groupintro">
+              <fmt:param><em>${actionBean.group.name}</em></fmt:param>
+            </fmt:message>
+          </div>
+        
+          <!-- Members -->
+          <div class="block">
+            <label><fmt:message key="group.members"/><label>
+            <stripes:label for="group.members" />
+            <c:forEach items="${actionBean.group.members}" var="member" varStatus="loop">
+              <br>${member.name}</br>
+            </c:forEach>
+          </div>
+          
+          <!-- Created/modified info -->
+          <div class="instructions">
+            <fmt:message key="group.modifier">
+               <fmt:param>${actionBean.group.modifier}</fmt:param>
+               <fmt:param>${actionBean.group.modified}</fmt:param>
+            </fmt:message>
+            <br />
+            <fmt:message key="group.creator">
+               <fmt:param>${actionBean.group.creator}</fmt:param>
+               <fmt:param>${actionBean.group.created}</fmt:param>
+            </fmt:message> 
+          </div>
+          
+        </div>
+      </c:otherwise>
+      
+    </c:choose>
+
+  </stripes:layout-component>
+</stripes:layout-render>

Added: incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/Test.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/Test.jsp?rev=627272&view=auto
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/Test.jsp (added)
+++ incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/Test.jsp Tue Feb 12 22:24:59 2008
@@ -0,0 +1,74 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.ViewActionBean" var="context"/>
+
+<table>
+  <thead>
+    <th align="left">Tag or expression</th>
+    <th align="left">Value</th>
+  </thead>
+  <tr>
+    <td>
+      ${'${'}wikiPage.name}
+    </td>
+    <td>
+      '${wikiPage.name}'
+    </td>
+  </tr>
+  <tr>
+    <td>
+      ${'${'}wikiSession.userPrincipal}
+    </td>
+    <td>
+      '${wikiSession.userPrincipal}'
+    </td>
+  </tr>
+  <tr>
+    <td>
+      ${'${'}wikiEngine.frontPage}
+    </td>
+    <td>
+      '${wikiEngine.frontPage}'
+    </td>
+  </tr>
+  <tr>
+    <td>
+      ${'${'}wikiActionBean.currentUser}
+    </td>
+    <td>
+      '${wikiActionBean.currentUser}'
+    </td>
+  </tr>
+  <tr>
+    <td>
+      &lt;wiki:BaseURL /&gt;
+    </td>
+    <td>
+      '<wiki:BaseURL/>'
+    </td>
+  </tr>
+  <tr>
+    <td>
+      &lt;wiki:Link format='url' templatefile='jspwiki_print.css'/&gt;
+    </td>
+    <td>
+      '<wiki:Link format='url' templatefile='jspwiki_print.css'>Test</wiki:Link>'
+    </td>
+  </tr>
+  <tr>
+    <td>
+      &lt;wiki:Link format='url' jsp='images/favicon.png'/&gt;
+    </td>
+    <td>
+      '<wiki:Link format='url' jsp='images/favicon.png'/>'
+    </td>
+  </tr>
+  <tr>
+    <td>
+      &lt;wiki:EditLink/&gt;
+    </td>
+    <td>
+      '<wiki:EditLink>Link to edit page</wiki:EditLink>'
+    </td>
+  </tr>
+</table>

Added: incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/UserPreferences.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/UserPreferences.jsp?rev=627272&view=auto
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/UserPreferences.jsp (added)
+++ incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/UserPreferences.jsp Tue Feb 12 22:24:59 2008
@@ -0,0 +1,189 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<fmt:setBundle basename="templates.DefaultResources"/>
+
+<stripes:layout-render name="/WEB-INF/jsp/templates/default/ViewTemplate.jsp">
+  <stripes:layout-component name="contents">
+
+    <h3><fmt:message key="prefs.heading.yourprofile"><fmt:param><wiki:Variable var="applicationname"/></fmt:param></fmt:message></h3>
+    
+    <wiki:TabbedSection defaultTab='<%=request.getParameter("tab")%>'>
+      <!-- Tab 1: user preferences -->
+      <wiki:Tab id="prefs" title="prefs.tab.prefs">
+        <div class="formcontainer">
+          <div class="instructions">
+            <fmt:message key="prefs.instructions"/>
+          </div>
+        </div>
+        <wiki:Permission permission="editPreferences">
+          <wiki:UserCheck status="anonymous">
+            <div class="formcontainer">
+              <div class="instructions">
+                <wiki:Messages div="error" topic="prefs" prefix="Could not save prefs: "/>
+              </div>
+              <stripes:form id="createAssertedName" action="/UserPreferences.action" method="POST" acceptcharset="UTF-8">
+                <stripes:errors/>
+                <div class="block">
+                  <stripes:label for="assertedName" />
+                  <stripes:text name="assertedName" size="30"><wiki:UserProfile property="asserted"/></stripes:text>
+                  <div class="description">
+                    <fmt:message key="prefs.wikiname.description">
+                      <fmt:param><wiki:Variable var="applicationname" /></fmt:param>
+                    </fmt:message>
+                  </div>
+                  <div class="description">
+                    <fmt:message key="prefs.wikiname.description2">
+                      <fmt:param><a onclick="TabbedSection.onclick('profile')" ><fmt:message key="prefs.wikiname.create"/></a></fmt:param>
+                    </fmt:message>
+                  </div>
+                  <stripes:hidden name="tab" value="prefs" />
+                  <stripes:submit name="createAssertedName"/>
+                </div>
+              </stripes:form>
+            </div>
+          </wiki:UserCheck>
+          
+          <!-- Clearing the 'asserted name' cookie -->
+          <wiki:UserCheck status="asserted">
+            <div class="formcontainer">
+              <stripes:form id="clearAssertedName" action="/UserPreferences.action" method="POST" acceptcharset="UTF-8">
+                <div class="block">
+                  <div class="description">
+                    <fmt:message key="prefs.clear.description"/>
+                  </div>
+                  <stripes:hidden name="tab" value="prefs" />
+                  <stripes:submit name="clearAssertedName"/>
+                </div>
+              </stripes:form>
+              <stripes:form id="editFavorites" action="/UserPreferences.action" method="GET">
+                 <div class="block">
+                  <div class="description">
+                     <fmt:message key="prefs.favs.description"/>
+                  </div>
+                  <stripes:hidden name="tab" value="prefs" />
+                  <stripes:submit name="editFavorites"/>
+                 </div>
+              </stripes:form>
+            </div>
+          </wiki:UserCheck>
+        </wiki:Permission>
+      </wiki:Tab>
+      
+      <!-- Tab 2: If user can register, allow edits to profile -->
+      <wiki:Tab id="profile" title="prefs.tab.profile">
+        <wiki:Permission permission="editProfile">
+          <div class="formcontainer">
+            <div class="instructions">
+              <wiki:UserProfile property="new">
+                <fmt:message key="prefs.newprofile"/>
+              </wiki:UserProfile>
+              <wiki:UserProfile property="exists">
+                <fmt:message key="prefs.oldprofile"/>
+              </wiki:UserProfile>
+            </div>
+            <stripes:form id="saveProfile" action="/UserProfile.action" method="POST" acceptcharset="UTF-8">
+                  
+              <!-- Any errors? -->
+              <stripes:errors/>
+        
+              <!-- Login name -->
+              <div class="block">
+                <stripes:label for="loginName"/>
+                <wiki:UserProfile property="new">
+                  <stripes:text name="loginName" size="30" value="${this.loginName}"/>
+                  <div class="description">
+                    <fmt:message key="prefs.loginname.description"/>
+                  </div>
+                </wiki:UserProfile>
+                <wiki:UserProfile property="exists">
+                  <p><wiki:UserProfile property="loginname"/></p>
+                  <div class="description">
+                    <fmt:message key="prefs.loginname.exists"/>
+                  </div>
+                </wiki:UserProfile>
+              </div>
+              
+              <!-- Password; not displayed if container auth used -->
+              <wiki:UserCheck status="setPassword">
+                <div class="block">
+                  <stripes:label for="password"/>
+                  <stripes:password name="password" size="30" value="" />
+                  <div class="description">
+                    <fmt:message key="prefs.password.description"/>
+                  </div>
+                </div>
+          
+                <div class="block">
+                  <stripes:label for="passwordAgain"/>
+                  <stripes:password name="passwordAgain" size="30" value="" />
+                  <div class="description">
+                    <fmt:message key="prefs.password2.description"/>
+                  </div>
+                </div>
+              </wiki:UserCheck>
+              
+              <!-- Full name -->
+              <div class="block">
+                <stripes:label for="fullName"/>
+                <wiki:UserProfile property="new">
+                  <stripes:text name="fullName" size="30" value="${this.fullName}" />
+                  <div class="description">
+                    <fmt:message key="prefs.fullname.description"/>
+                  </div>
+                </wiki:UserProfile>
+                <wiki:UserProfile property="exists">
+                  <p><wiki:UserProfile property="fullname"/></p>
+                  <div class="description">
+                    <fmt:message key="prefs.fullname.exists"/>
+                  </div>
+                </wiki:UserProfile>
+              </div>
+               
+              <!-- E-mail -->
+              <div class="block">
+                <stripes:label for="email"/>
+                <stripes:text name="email" size="30" value="${this.email}" />
+                <div class="description">
+                  <fmt:message key="prefs.email.description"/>
+                </div>
+              </div>
+              
+              <div class="block">
+                <wiki:UserCheck status="assertionsAllowed">
+                  <div class="instructions">
+                    <fmt:message key="prefs.cookie.info"/>
+                  </div>
+                </wiki:UserCheck>
+                <wiki:UserProfile property="exists">
+                  <div class="instructions">
+                    <fmt:message key="prefs.acl.info">
+                      <fmt:param><strong><wiki:UserProfile property="wikiname"/></strong></fmt:param>
+                      <fmt:param><strong><wiki:UserProfile property="fullname"/></strong></fmt:param>
+                      <fmt:param><strong><wiki:UserProfile property="roles" /></strong></fmt:param>
+                      <fmt:param><strong><wiki:UserProfile property="groups" /></strong></fmt:param>
+                    </fmt:message>
+                  </div>
+                </wiki:UserProfile>
+                <div class="instructions">
+                  <wiki:UserProfile property="exists">
+                    <fmt:message key="prefs.lastmodified">
+                      <fmt:param><wiki:UserProfile property="created"/></fmt:param>
+                      <fmt:param><wiki:UserProfile property="modified"/></fmt:param>
+                    </fmt:message>
+                  </wiki:UserProfile>
+                  <fmt:message key="prefs.save.description"/>
+                </div>
+                <stripes:hidden name="tab" value="profile" />
+                <stripes:submit name="ok" />
+              </div>
+            </stripes:form>
+          </div>
+        </wiki:Permission> 
+      </wiki:Tab>
+    </wiki:TabbedSection>
+
+  </stripes:layout-component>
+</stripes:layout-render>

Added: incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/AttachmentTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/AttachmentTab.jsp?rev=627272&view=auto
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/AttachmentTab.jsp (added)
+++ incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/AttachmentTab.jsp Tue Feb 12 22:24:59 2008
@@ -0,0 +1,135 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ page import="com.ecyrd.jspwiki.*" %>
+<%@ page import="com.ecyrd.jspwiki.action.*" %>
+<%@ page import="com.ecyrd.jspwiki.auth.*" %>
+<%@ page import="com.ecyrd.jspwiki.auth.permissions.*" %>
+<%@ page import="com.ecyrd.jspwiki.ui.*" %>
+<%@ page import="com.ecyrd.jspwiki.ui.progress.*" %>
+<%@ page import="java.security.Permission" %>
+
+<%
+  int MAXATTACHNAMELENGTH = 30;
+  WikiContext c = (WikiContext)WikiActionBeanFactory.findActionBean( pageContext );
+  String progressId = c.getEngine().getProgressManager().getNewProgressIdentifier();
+%>
+
+<div id="addattachment">
+<h3><fmt:message key="attach.add"/></h3>
+<wiki:Permission permission="upload">
+  <wiki:Permission permission="upload">
+  <form action="<wiki:Link jsp='attach' format='url' absolute='true'><wiki:Param name='progressid' value='<%=progressId%>'/></wiki:Link>"
+         class="wikiform"
+            id="uploadform"
+        method="post"
+       enctype="multipart/form-data" accept-charset="<wiki:ContentEncoding/>"
+      onsubmit="return Wiki.submitUpload(this, '<%=progressId%>');" >
+    <table>
+    <tr>
+      <td colspan="2"><div class="formhelp"><fmt:message key="attach.add.info" /></div></td>
+    </tr>
+    <tr>
+      <td><label for="attachfilename"><fmt:message key="attach.add.selectfile"/></label></td>
+      <td><input type="file" name="content" id="attachfilename" size="60"/></td>
+    </tr>
+    <tr>
+      <td><label for="attachnote"><fmt:message key="attach.add.changenote"/></label></td>
+      <td><input type="text" name="changenote" id="attachnote" maxlength="80" size="60" />
+    <input type="hidden" name="nextpage" value="<wiki:UploadLink format="url"/>" /></td>
+    </tr>
+
+   <tr>
+      <td></td>
+      <td>
+        <input type="hidden" name="page" value="<wiki:Variable var="pagename"/>" />
+        <input type="submit" name="upload" id="upload" value="<fmt:message key='attach.add.submit'/>" />
+        <input type="hidden" name="action" value="upload" />
+        <div id="progressbar"><div class="ajaxprogress"></div></div>
+      </td>
+    </tr>
+    </wiki:Permission>
+
+    </table>
+  </form>
+  <wiki:Messages div="error" />
+</wiki:Permission>
+<wiki:Permission permission="!upload">
+<div class="formhelp"><fmt:message key="attach.add.permission"/></div>
+</wiki:Permission>
+</div>
+
+<wiki:HasAttachments>
+
+<h3><fmt:message key="attach.list"/></h3>
+
+  <%--<small><fmt:message key="attach.listsubtitle"/></small>--%>
+
+  <wiki:Permission permission="delete">
+    <%-- hidden delete form --%>
+    <form action="tbd"
+           class="wikiform"
+              id="deleteForm" style="display:none;"
+          method="post" accept-charset="<wiki:ContentEncoding />"
+        onsubmit="return(confirm('<fmt:message key="attach.deleteconfirm"/>') && Wiki.submitOnce(this) );" >
+
+      <input id="delete-all" name="delete-all" type="submit" value="Delete" />
+
+    </form>
+  </wiki:Permission>
+
+  <div class="zebra-table"><div class="slimbox-img sortable">
+  <table class="wikitable">
+    <tr>
+      <th><fmt:message key="info.attachment.type"/></th>
+      <th><fmt:message key="info.attachment.name"/></th>
+      <th><fmt:message key="info.size"/></th>
+      <th><fmt:message key="info.version"/></th>
+      <th><fmt:message key="info.date"/></th>
+      <th><fmt:message key="info.author"/></th>
+      <wiki:Permission permission="delete"><th><fmt:message key="info.actions"/></th></wiki:Permission>
+      <th class="changenote"><fmt:message key="info.changenote"/></th>
+    </tr>
+
+    <wiki:AttachmentsIterator id="att">
+    <%
+      String name = att.getFileName();
+      int dot = name.lastIndexOf(".");
+      String attachtype = ( dot != -1 ) ? name.substring(dot+1) : "";
+
+      String sname = name;
+      if( sname.length() > MAXATTACHNAMELENGTH ) sname = sname.substring(0,MAXATTACHNAMELENGTH) + "...";
+    %>
+    <tr>
+      <td><div id="attach-<%= attachtype %>" class="attachtype"><%= attachtype %></div></td>
+      <td><wiki:LinkTo title="<%= name %>" ><%= sname %></wiki:LinkTo></td>
+      <td style="white-space:nowrap;text-align:right;">
+        <fmt:formatNumber value='<%=Double.toString(att.getSize()/1000.0)%>' groupingUsed='false' maxFractionDigits='1' minFractionDigits='1'/>&nbsp;<fmt:message key="info.kilobytes"/>
+      </td>
+      <td style="text-align:center;">
+        <a href="<wiki:PageInfoLink format='url' />" title="<fmt:message key='attach.moreinfo.title'/>"><wiki:PageVersion /></a>
+      </td>
+	  <td style="white-space:nowrap;"><fmt:formatDate value="<%= att.getLastModified() %>" pattern="${prefs['DateFormat']}" /></td>
+      <td><wiki:Author /></td>
+      <wiki:Permission permission="delete">
+      <td>
+          <input type="button"
+                value="<fmt:message key='attach.delete'/>"
+                  src="<wiki:Link format='url' context='<%=WikiContext.DELETE%>' />"
+              onclick="$('deleteForm').setProperty('action',this.src); $('delete-all').click();" />
+      </td>
+      </wiki:Permission>
+      <td class="changenote">
+      <%
+         String changeNote = (String)att.getAttribute(WikiPage.CHANGENOTE);
+         if( changeNote != null ) {
+         %><%=changeNote%><%
+         }
+      %>
+      </td>
+    </tr>
+    </wiki:AttachmentsIterator>
+
+  </table>
+  </div></div>
+
+</wiki:HasAttachments>

Added: incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/Favorites.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/Favorites.jsp?rev=627272&view=auto
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/Favorites.jsp (added)
+++ incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/Favorites.jsp Tue Feb 12 22:24:59 2008
@@ -0,0 +1,53 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page import="com.ecyrd.jspwiki.*" %>
+
+<div id="favorites">
+
+  <wiki:Include page="/WEB-INF/jsp/templates/default/UserBox.jsp" />
+  
+  <wiki:CheckRequestContext context='!login'>
+
+  <wiki:UserCheck status="known">
+  <wiki:Translate>[{If page='{$username}Favorites' exists='true'
+
+%%collapsebox-closed
+! [My Favorites|{$username}Favorites]
+[{InsertPage page='{$username}Favorites' }]
+%% }]
+  </wiki:Translate>
+  </wiki:UserCheck>
+  
+  <%-- LeftMenu is automatically generated from a Wiki page called "LeftMenu" --%>
+  <div class="leftmenu">
+    <wiki:InsertPage page="LeftMenu" />
+    <wiki:NoSuchPage page="LeftMenu">
+      <div class="error">
+        <wiki:EditLink page="LeftMenu">
+          <fmt:message key="fav.nomenu"><fmt:param>LeftMenu</fmt:param></fmt:message>
+        </wiki:EditLink>
+      </div>
+    </wiki:NoSuchPage>
+  </div>
+  
+  <div class="leftmenufooter">
+    <wiki:InsertPage page="LeftMenuFooter" />
+    <wiki:NoSuchPage page="LeftMenuFooter">
+      <div class="error">
+        <wiki:EditLink page="LeftMenuFooter">
+          <fmt:message key="fav.nomenu"><fmt:param>LeftMenuFooter</fmt:param></fmt:message>
+        </wiki:EditLink>
+      </div>
+    </wiki:NoSuchPage>
+  </div>
+
+  </wiki:CheckRequestContext>
+  
+  <div class="wikiversion"><%=Release.APPNAME%> v<%=Release.getVersionString()%>
+  <span class="rssfeed">
+    <wiki:RSSImageLink title='<%=LocaleSupport.getLocalizedMessage(pageContext,"fav.aggregatewiki.title")%>' />
+  </span>
+  </div>  
+  
+</div>
\ No newline at end of file

Added: incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/Footer.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/Footer.jsp?rev=627272&view=auto
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/Footer.jsp (added)
+++ incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/Footer.jsp Tue Feb 12 22:24:59 2008
@@ -0,0 +1,25 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ page import="com.ecyrd.jspwiki.*" %>
+<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+
+<div id="footer">
+
+  <div class="applicationlogo" > 
+    <a href="<wiki:LinkTo page='${wikiEngine.frontPage}' format='url' />"
+       title="<fmt:message key='actions.home.title' ><fmt:param>${wikiEngine.frontPage}</fmt:param></fmt:message> "><fmt:message key='actions.home' /></a>
+  </div>
+
+  <div class="companylogo"></div>
+
+  <div class="copyright"><wiki:InsertPage page="CopyrightNotice"/></div>
+
+  <div class="wikiversion">
+    <%=Release.APPNAME%> v<%=Release.getVersionString()%>
+  </div>
+
+  <div class="rssfeed">
+    <wiki:RSSImageLink title="Aggregate the RSS feed" />
+  </div>
+
+</div>
\ No newline at end of file

Added: incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/Header.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/Header.jsp?rev=627272&view=auto
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/Header.jsp (added)
+++ incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/Header.jsp Tue Feb 12 22:24:59 2008
@@ -0,0 +1,24 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ page import="com.ecyrd.jspwiki.*" %>
+
+<div id="header">
+
+  <div class="titlebox"><wiki:InsertPage page="TitleBox"/></div>
+
+  <div class="applicationlogo" > 
+    <a href="<wiki:LinkTo page='${wikiEngine.frontPage}' format='url' />"
+       title="<fmt:message key='actions.home.title' ><fmt:param>${wikiEngine.frontPage}</fmt:param></fmt:message> "><fmt:message key='actions.home' /></a>
+  </div>
+
+  <div class="companylogo"></div>
+
+  <wiki:Include page="/WEB-INF/jsp/templates/default/UserBox.jsp" />
+
+  <div class="pagename"><wiki:PageName /></div>
+
+  <div class="searchbox"><wiki:Include page="/WEB-INF/jsp/templates/default/SearchBox.jsp" /></div>
+
+  <div class="breadcrumbs"><fmt:message key="header.yourtrail"/><wiki:Breadcrumbs /></div>
+
+</div>
\ No newline at end of file

Added: incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/PageActionsBottom.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/PageActionsBottom.jsp?rev=627272&view=auto
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/PageActionsBottom.jsp (added)
+++ incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/PageActionsBottom.jsp Tue Feb 12 22:24:59 2008
@@ -0,0 +1,43 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ page import="com.ecyrd.jspwiki.*" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+
+<wiki:CheckRequestContext context='view|diff|edit|upload|info'>
+<div id='actionsBottom' class="pageactions"> 
+  <wiki:PageExists>  
+
+    <a href="#top" 
+      class="action quick2top" 
+      title="<fmt:message key='actions.gototop'/>" >&laquo;</a>
+
+    <wiki:CheckVersion mode="latest">
+       <fmt:message key="info.lastmodified">
+          <fmt:param><wiki:PageVersion /></fmt:param>
+          <fmt:param><wiki:DiffLink version="latest" newVersion="previous"><wiki:PageDate format='${prefs["DateFormat"]}'/></wiki:DiffLink></fmt:param>
+          <fmt:param><wiki:Author /></fmt:param>
+       </fmt:message>
+    </wiki:CheckVersion>
+
+    <wiki:CheckVersion mode="notlatest">
+      <fmt:message key="actions.publishedon">
+         <fmt:param><wiki:PageDate format='${prefs["DateFormat"]}'/></fmt:param>
+         <fmt:param><wiki:Author /></fmt:param>
+      </fmt:message>
+    </wiki:CheckVersion>
+
+    <a href="<wiki:Link format='url' jsp='rss.jsp'>
+               <wiki:Param name='page' value='${wikiPage.name}'/>
+               <wiki:Param name='mode' value='wiki'/>
+             </wiki:Link>"
+      title="<fmt:message key='info.rsspagefeed.title'>
+               <fmt:param><wiki:PageName /></fmt:param>
+             </fmt:message>" >
+      <img src="<wiki:Link jsp='images/xml.png' format='url'/>" alt="[RSS]"/>
+    </a>
+  
+  </wiki:PageExists>
+
+  <wiki:NoSuchPage><fmt:message key="actions.notcreated"/></wiki:NoSuchPage> 
+</div>
+</wiki:CheckRequestContext>
\ No newline at end of file

Added: incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/PageActionsTop.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/PageActionsTop.jsp?rev=627272&view=auto
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/PageActionsTop.jsp (added)
+++ incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/PageActionsTop.jsp Tue Feb 12 22:24:59 2008
@@ -0,0 +1,90 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ page import="com.ecyrd.jspwiki.*" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+
+<%
+  //WikiContext c = WikiContext.findContext(pageContext);
+  //String frontpage = c.getEngine().getFrontPage(); 
+%>
+
+<div id="actionsTop" class="pageactions"> 
+  <form class="wikiform" method="get" action="" >
+  <ul>
+
+  <wiki:CheckRequestContext context='view|info|diff|upload'>
+    <wiki:Permission permission="edit">
+	<li>
+        <wiki:PageType type="page">
+          <a href="<wiki:EditLink format='url' />" accesskey="e"  class="action edit"
+            title="<fmt:message key='actions.edit.title'/>" ><fmt:message key='actions.edit'/></a>
+        </wiki:PageType>
+        <wiki:PageType type="attachment">
+          <a href="<wiki:BaseURL/>Edit.jsp?page=<wiki:ParentPageName />" accesskey="e" class="action edit"
+            title="<fmt:message key='actions.editparent.title'/>" ><fmt:message key='actions.editparent'/></a>
+        </wiki:PageType>
+    </li>
+    </wiki:Permission>
+  </wiki:CheckRequestContext>
+
+  <%-- more actions dropdown -- converted to popup by javascript 
+       so all basic actions are accessible even if js is not avail --%>
+  <li>
+  <select name="actionsMore" id="actionsMore"
+      onchange="if ((this.selectedIndex != 0) &amp;&amp; (!this.options[this.selectedIndex].disabled)) location.href=this.form.action=this.options[this.selectedIndex].value; this.selectedIndex = 0;">
+    <option class="actionsMore" value="" selected='selected'><fmt:message key="actions.more"/></option>
+
+    <wiki:CheckRequestContext context='view|info|diff|upload'>
+    <wiki:PageExists>  
+    <wiki:Permission permission="comment">
+      <wiki:PageType type="page">
+        <option class="action comment" value="<wiki:CommentLink format='url' />" 
+          title="<fmt:message key='actions.comment.title' />"><fmt:message key="actions.comment" />
+		</option>
+      </wiki:PageType>
+      <wiki:PageType type="attachment">
+         <option class="action comment" value="<wiki:BaseURL/>Comment.jsp?page=<wiki:ParentPageName />"
+           title="<fmt:message key='actions.comment.title' />"><fmt:message key="actions.comment" />
+		</option>
+      </wiki:PageType>
+    </wiki:Permission>
+    </wiki:PageExists>  
+    </wiki:CheckRequestContext>
+    
+    <wiki:CheckRequestContext context='view|info|diff|upload|edit|comment|preview' >
+    <option class="action rawpage" value="<wiki:Link format='url' ><wiki:Param name='skin' value='raw'/></wiki:Link>"
+       title="<fmt:message key='actions.rawpage.title' />"><fmt:message key='actions.rawpage' />
+    </option>
+    </wiki:CheckRequestContext>
+  
+    <wiki:CheckRequestContext context='!workflow'>
+    <wiki:UserCheck status="authenticated">
+      <option class="action workflow" value="<wiki:Link jsp='Workflow.jsp' format='url' />" 
+        title="<fmt:message key='actions.workflow.title' />"><fmt:message key='actions.workflow' />
+      </option>
+    </wiki:UserCheck>
+    </wiki:CheckRequestContext>
+
+    <wiki:Permission permission="createGroups">
+      <option class="action creategroup" value="<wiki:Link jsp='NewGroup.jsp' format='url' />" 
+        title="<fmt:message key='actions.creategroup.title' />"><fmt:message key='actions.creategroup' />
+      </option>
+    </wiki:Permission>
+
+  </select>
+  </li>
+  <li id="morebutton" style="display:none">
+    <a href="#" class="action more"><fmt:message key="actions.more"/></a>
+    <div id="moremenu" >
+      <wiki:InsertPage page="MoreMenu" />
+    </div>
+  </li>
+<%--
+  <li>
+    <a class="action quick2bottom" href="#footer" title="<fmt:message key='actions.gotobottom' />" >&raquo;</a>
+  </li>
+--%>
+  </ul>
+
+  </form>
+</div>

Added: incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/PageContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/PageContent.jsp?rev=627272&view=auto
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/PageContent.jsp (added)
+++ incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/PageContent.jsp Tue Feb 12 22:24:59 2008
@@ -0,0 +1,37 @@
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+
+<wiki:TabbedSection defaultTab='${param.tab}' >
+
+  <wiki:Tab id="pagecontent" title='<fmt:message key="view.tab"/>' accesskey="v">
+    <wiki:Include page="/WEB-INF/jsp/templates/default/PageTab.jsp"/>
+    <wiki:PageType type="attachment">
+      <div class="information">
+	    <fmt:message key="info.backtoparentpage" >
+	      <fmt:param><wiki:LinkToParent><wiki:ParentPageName/></wiki:LinkToParent></fmt:param>
+        </fmt:message>
+      </div>
+      <div style="overflow:hidden;">
+        <wiki:Translate>[${wikiPage.name}]</wiki:Translate>
+      </div>
+    </wiki:PageType>
+  </wiki:Tab>
+
+  <wiki:PageExists>
+
+  <wiki:PageType type="page">
+  <wiki:Tab id="attach" title="<fmt:message key='attach.tab'/><c:if test='${wikiPage.attachments > 0}'> (${wikiPage.attachments.size})</c:if>" accesskey="a">
+    <wiki:Include page="/WEB-INF/jsp/templates/default/AttachmentTab.jsp"/>
+  </wiki:Tab>
+  </wiki:PageType>
+
+  <wiki:Tab id="info" title="<fmt:message key='info.tab'/>"
+           url="<wiki:Link format='url' jsp='PageInfo.jsp'><wiki:Param name='page' value='${wikiPage.name}'/></wiki:Link>"
+           accesskey="i" >
+  </wiki:Tab>
+
+  </wiki:PageExists>
+
+</wiki:TabbedSection>

Added: incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/PageTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/PageTab.jsp?rev=627272&view=auto
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/PageTab.jsp (added)
+++ incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/PageTab.jsp Tue Feb 12 22:24:59 2008
@@ -0,0 +1,87 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ page import="com.ecyrd.jspwiki.*" %>
+<%@ page import="com.ecyrd.jspwiki.action.*" %>
+
+<%
+	WikiContext c = (WikiContext)WikiActionBeanFactory.findActionBean( pageContext );
+   	WikiPage p = c.getPage();
+	String pagename = p.getName();
+
+	/* check possible permalink (blogentry) pages */
+	String blogcommentpage="";
+	String mainblogpage="";
+	if( pagename.indexOf("_blogentry_") != -1 )
+	{
+		blogcommentpage = TextUtil.replaceString( pagename, "blogentry", "comments" );
+		mainblogpage = pagename.substring(0, pagename.indexOf("_blogentry_"));
+	}
+%>
+
+<%-- 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">
+  <form action="<wiki:Link format='url' jsp='Wiki.jsp'/>" 
+        method="get"  accept-charset='UTF-8'>
+
+    <input type="hidden" name="page" value="<wiki:Variable var='pagename' />" />     
+    <div class="warning">
+      <fmt:message key="view.oldversion">
+        <fmt:param>
+          <%--<wiki:PageVersion/>--%>
+          <select id="version" name="version" onchange="this.form.submit();" >
+<% 
+   int latestVersion = c.getEngine().getPage( pagename, WikiProvider.LATEST_VERSION ).getVersion();
+   int thisVersion = p.getVersion();
+
+   if( thisVersion == WikiProvider.LATEST_VERSION ) thisVersion = latestVersion; //should not happen
+     for( int i = 1; i <= latestVersion; i++) 
+     {
+%> 
+          <option value="<%= i %>" <%= ((i==thisVersion) ? "selected='selected'" : "") %> ><%= i %></option>
+<%
+     }    
+%>
+          </select>
+        </fmt:param>
+      </fmt:message>  
+      <br />
+      <wiki:LinkTo><fmt:message key="view.backtocurrent"/></wiki:LinkTo>&nbsp;&nbsp;
+      <wiki:EditLink version="this"><fmt:message key="view.restore"/></wiki:EditLink>
+    </div>
+
+  </form>
+</wiki:CheckVersion>
+
+<%-- Inserts no text if there is no page. --%>
+<wiki:InsertPage />
+
+<%-- Inserts blogcomment if appropriate 
+<% if( !blogpage.equals("") ) { %>
+--%>
+
+<% if( ! mainblogpage.equals("") ) { %>
+<wiki:PageExists page="<%= mainblogpage%>">
+
+  <% if( ! blogcommentpage.equals("") ) { %>
+  <wiki:PageExists page="<%= blogcommentpage%>">
+	<div class="weblogcommentstitle"><fmt:message key="blog.commenttitle"/></div>
+    <div class="weblogcomments"><wiki:InsertPage page="<%= blogcommentpage%>" /></div>
+  </wiki:PageExists>
+  <% }; %>
+  <div class="information">	
+	<wiki:Link page="<%= mainblogpage %>"><fmt:message key="blog.backtomain"/></wiki:Link>&nbsp; &nbsp;
+	<wiki:Link context="comment" page="<%= blogcommentpage%>" ><fmt:message key="blog.addcomments"/></wiki:Link>
+  </div>
+
+</wiki:PageExists>
+<% }; %>
+
+<wiki:NoSuchPage>
+  <%-- FIXME: Should also note when a wrong version has been fetched. --%>
+  <div class="information" >
+  <fmt:message key="common.nopage">
+    <fmt:param><wiki:EditLink><fmt:message key="common.createit"/></wiki:EditLink></fmt:param>
+  </fmt:message>
+  </div>
+</wiki:NoSuchPage>
\ No newline at end of file

Added: incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/SearchBox.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/SearchBox.jsp?rev=627272&view=auto
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/SearchBox.jsp (added)
+++ incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/SearchBox.jsp Tue Feb 12 22:24:59 2008
@@ -0,0 +1,50 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+
+<%-- Provides a simple searchbox that can be easily included anywhere on the page --%>
+<%-- Powered by jswpwiki-common.js//SearchBox --%>
+
+<form action="<wiki:Link jsp='Search.jsp' format='url'/>"
+        class="wikiform"
+           id="searchForm" accept-charset="<wiki:ContentEncoding />">
+
+  <div style="position:relative">
+  <input onblur="if( this.value == '' ) { this.value = this.defaultValue }; return true; "
+        onfocus="if( this.value == this.defaultValue ) { this.value = ''}; return true; "
+           type="text" value="<fmt:message key='sbox.search.submit'/>"
+           name="query" id="query"
+           size="20" 
+      accesskey="f"></input>
+  <button type="submit"
+  		 name="searchSubmit" id="searchSubmit"
+  		value="<fmt:message key='find.submit.go'/>"
+  		title="<fmt:message key='find.submit.go'/>"></button>
+  </div>
+  <div id="searchboxMenu" style='visibility:hidden;'>
+    <div id="searchTools">
+      <a href="#" id='quickView' class='action'
+      onclick="SearchBox.navigate( '<wiki:Link format="url" page="__PAGEHERE__"/>','<fmt:message key="sbox.view.title"/>' );"
+        title="<fmt:message key="sbox.view.title"/>"><fmt:message key="sbox.view"/></a>
+      <a href="#" id='quickEdit' class='action'
+      onclick="SearchBox.navigate( '<wiki:Link format="url" context="edit" page="__PAGEHERE__"/>','<fmt:message key="sbox.edit.title"/>' );"
+        title="<fmt:message key="sbox.edit.title"/>"><fmt:message key="sbox.edit"/></a>
+      <a href="#" id='quickClone' class='action'	
+      onclick="return SearchBox.navigate( '<wiki:Link format="url" page="__PAGEHERE__" context="edit" />', '<fmt:message key="sbox.clone.title"/>', true );"
+        title="<fmt:message key="sbox.clone.title"/>"><fmt:message key="sbox.clone"/></a>
+      <a href="#" id="advancedSearch" class='action'
+      onclick="SearchBox.navigate( '<wiki:BaseURL />Search.jsp?query=__PAGEHERE__','<wiki:Variable var="pagename"/>' )"
+        title="<fmt:message key="sbox.find.title"/> [ f ]"><fmt:message key="sbox.find"/></a>
+    </div>
+    <div id="searchResult" >
+	  <fmt:message key='sbox.search.result'/>
+      <span id="searchTarget" ><fmt:message key='sbox.search.target'/></span>
+      <span id="searchSpin" class="spin" style="position:absolute;display:none;"></span>
+	  <div id="searchOutput" ></div>
+    </div>
+    <div id="recentSearches" style="display:none;">
+      <fmt:message key="sbox.recentsearches"/>
+      <span><a href="#" id="recentClear"><fmt:message key="sbox.clearrecent"/></a></span>
+    </div>
+  </div>
+
+</form>
\ No newline at end of file

Added: incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/UserBox.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/UserBox.jsp?rev=627272&view=auto
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/UserBox.jsp (added)
+++ incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/UserBox.jsp Tue Feb 12 22:24:59 2008
@@ -0,0 +1,60 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+
+<%@ page import="com.ecyrd.jspwiki.*" %>
+
+<div class="userbox">
+
+  <wiki:UserCheck status="anonymous">
+    <span class="username anonymous">
+      <fmt:message key="fav.greet.anonymous" />
+    </span>
+  </wiki:UserCheck>
+  <wiki:UserCheck status="asserted">
+    <span class="username asserted">
+      <fmt:message key="fav.greet.asserted">
+      <fmt:param><wiki:Translate>[<wiki:UserName />]</wiki:Translate></fmt:param>
+    </fmt:message>
+    </span>
+  </wiki:UserCheck>
+  <wiki:UserCheck status="authenticated">
+    <span class="username authenticated">
+      <fmt:message key="fav.greet.authenticated">
+        <fmt:param><wiki:Translate>[<wiki:UserName />]</wiki:Translate></fmt:param>
+      </fmt:message>
+    </span>
+  </wiki:UserCheck>
+
+  <%-- action buttons --%>
+  <wiki:UserCheck status="notAuthenticated">
+  <wiki:CheckRequestContext context='!login'>
+    <wiki:Permission permission="login">
+      <a href="<wiki:Link jsp='Login.jsp' format='url'><wiki:Param 
+         name='redirect' value='${wikiPage.name}'/></wiki:Link>" 
+        class="action login"
+        title="<fmt:message key='actions.login.title'/>"><fmt:message key="actions.login"/></a>
+    </wiki:Permission>
+  </wiki:CheckRequestContext>
+  </wiki:UserCheck>
+  
+  <wiki:UserCheck status="authenticated">
+   <a href="<wiki:Link jsp='Logout.jsp' format='url' />" 
+     class="action logout"
+     title="<fmt:message key='actions.logout.title'/>"><fmt:message key="actions.logout"/></a>
+   <%--onclick="return( confirm('<fmt:message key="actions.confirmlogout"/>') && (location=this.href) );"--%>
+  </wiki:UserCheck>
+
+  <wiki:CheckRequestContext context='!prefs'>
+  <wiki:CheckRequestContext context='!preview'>
+    <a href="<wiki:Link jsp='UserPreferences.jsp' format='url' ><wiki:Param name='redirect'
+      value='${wikiPage.name}'/></wiki:Link>"
+      class="action prefs" accesskey="p"
+      title="<fmt:message key='actions.prefs.title'/>"><fmt:message key="actions.prefs" />
+    </a>
+  </wiki:CheckRequestContext>
+  </wiki:CheckRequestContext>
+
+  <div class="clearbox"></div>
+
+</div>
\ No newline at end of file

Added: incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/ViewTemplate.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/ViewTemplate.jsp?rev=627272&view=auto
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/ViewTemplate.jsp (added)
+++ incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/ViewTemplate.jsp Tue Feb 12 22:24:59 2008
@@ -0,0 +1,57 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<stripes:layout-definition>
+
+<html id="top" xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+  <title>
+    <fmt:message key="view.title.view">
+      <fmt:param><wiki:Variable var="ApplicationName" /></fmt:param>
+      <fmt:param><wiki:PageName /></fmt:param>
+    </fmt:message>
+  </title>
+  <wiki:Include page="/WEB-INF/jsp/templates/default/commonheader.jsp" />
+  <wiki:CheckVersion mode="notlatest">
+    <meta name="robots" content="noindex,nofollow" />
+  </wiki:CheckVersion>
+  <wiki:CheckRequestContext context="diff|info">
+    <meta name="robots" content="noindex,nofollow" />
+  </wiki:CheckRequestContext>
+  <wiki:CheckRequestContext context="!view">
+    <meta name="robots" content="noindex,follow" />
+  </wiki:CheckRequestContext>
+</head>
+
+<body class="view">
+
+<div id="wikibody" class="${prefs['orientation']}">
+
+  <wiki:Include page="/WEB-INF/jsp/templates/default/Header.jsp" />
+
+  <div id="content">
+
+    <div id="page">
+      <wiki:Include page="/WEB-INF/jsp/templates/default/PageActionsTop.jsp"/>
+
+      <stripes:layout-component name="contents"/>
+
+      <wiki:Include page="/WEB-INF/jsp/templates/default/PageActionsBottom.jsp"/>
+    </div>
+
+    <wiki:Include page="/WEB-INF/jsp/templates/default/Favorites.jsp"/>
+
+    <div class="clearbox"></div>
+  </div>
+
+  <wiki:Include page="/WEB-INF/jsp/templates/default/Footer.jsp" />
+
+</div>
+
+</body>
+</html>
+
+</stripes:layout-definition>
\ No newline at end of file

Added: incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/commonheader.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/commonheader.jsp?rev=627272&view=auto
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/commonheader.jsp (added)
+++ incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/commonheader.jsp Tue Feb 12 22:24:59 2008
@@ -0,0 +1,88 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ page import="com.ecyrd.jspwiki.*" %>
+<%@ page import="com.ecyrd.jspwiki.ui.*" %>
+<%@ page import="com.ecyrd.jspwiki.util.*" %>
+<%@ page import="com.ecyrd.jspwiki.preferences.*" %>
+<%@ page import="java.util.*" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+
+<%--
+   This file provides a common header which includes the important JSPWiki scripts and other files.
+   You need to include this in your template, within <head> and </head>.  It is recommended that
+   you don't change this file in your own template, as it is likely to change quite a lot between
+   revisions.
+
+   Any new functionality, scripts, etc, should be included using the TemplateManager resource
+   include scheme (look below at the <wiki:IncludeResources> tags to see what kind of things
+   can be included).
+--%>
+<%-- CSS stylesheet --%>
+<link rel="stylesheet" media="screen, projection, print" type="text/css"
+     href="<wiki:Link format='url' templatefile='jspwiki.css'/>"/>
+<%-- put this at the top, to avoid double load when not yet cached --%>
+<link rel="stylesheet" type="text/css" media="print" href="<wiki:Link format='url' templatefile='jspwiki_print.css'/>" />
+<wiki:IncludeResources type="stylesheet"/>
+<wiki:IncludeResources type="inlinecss" />
+
+<%-- JAVASCRIPT --%>
+<script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/mootools.js'/>"></script>
+<script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/prettify.js'/>"></script>
+<script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/jspwiki-common.js'/>"></script>
+<wiki:IncludeResources type="script"/>
+
+<%-- COOKIE read client preferences --%>
+<%
+   Preferences.setupPreferences(pageContext);
+ %>
+
+<script type="text/javascript">
+//<![CDATA[
+
+/* Localized javascript strings: LocalizedStrings[] */
+<wiki:IncludeResources type="jslocalizedstrings"/>
+
+/* Initialise glboal Wiki js object with server and page dependent variables */
+/* FIXME : better is to add this to the window.onload handler */
+Wiki.init({
+	'BaseUrl': '<wiki:BaseURL />',
+	'PageUrl': '<wiki:Link format="url" absolute="true" page="#$%"/>', /* unusual pagename */
+	'TemplateDir': '<wiki:Link format="url" templatefile=""/>',
+	'PageName': '<wiki:Variable var="pagename" />',/* pagename without blanks */
+	'UserName': '<wiki:UserName />', 
+	'JsonUrl' : 'JSON-RPC'
+	});
+<wiki:IncludeResources type="jsfunction"/>
+
+//]]>
+</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='${wikiEngine.frontPage}' />"
+    title="Front page" />
+<link rel="alternate stylesheet" type="text/css" href="<wiki:Link format='url' templatefile='jspwiki_print.css'/>"
+    title="Print friendly" />
+<link rel="alternate stylesheet" type="text/css" href="<wiki:Link format='url' templatefile='jspwiki.css'/>"
+    title="Standard" />
+<link rel="icon" type="image/png" href="<wiki:Link format='url' jsp='images/favicon.png'/>" />
+
+<wiki:FeedDiscovery />
+
+<%-- SKINS : extra stylesheets, extra javascript --%>
+<c:if test='${(!empty prefs["SkinName"]) && (prefs["SkinName"]!="PlainVanilla") }'>
+<link rel="stylesheet" type="text/css" media="screen, projection, print"
+     href="<wiki:Link format='url' templatefile='skins/' /><c:out value='${prefs["SkinName"]}/skin.css' />" />
+<%--
+<link rel="stylesheet" type="text/css" media="print"
+     href="<wiki:Link format='url' templatefile='skins/' /><c:out value='${prefs["SkinName"]}/print_skin.css' />" />
+--%>
+<script type="text/javascript"
+         src="<wiki:Link format='url' templatefile='skins/' /><c:out value='${prefs["SkinName"]}/skin.js' />" ></script>
+</c:if>
+
+<wiki:Include page="/WEB-INF/jsp/templates/default/localheader.jsp"/>
\ No newline at end of file

Added: incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/localheader.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/localheader.jsp?rev=627272&view=auto
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/localheader.jsp (added)
+++ incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/WEB-INF/jsp/templates/default/localheader.jsp Tue Feb 12 22:24:59 2008
@@ -0,0 +1,16 @@
+<%-- This is a local JSP header file, which you can override in your own template
+     if you want to put something in the head-section of the page.  This page is
+     included after the commonheader.jsp.
+
+     The JSPWiki default template and distribution will never have anything here
+     except this comment.  Therefore it's safe to override without accidentally
+     removing any functionality.
+
+     Some things which you might want to put here would e.g. be your site tracker
+     Javascript (like Google Analytics, or Sitemeter, or whatever).
+
+     The safest trick would be to create your own template (say "sitetemplate") directory,
+     and just put a new localheader.jsp in it.  JSPWiki will always use the
+     files in the "default" template, if it cannot locate an equivalent file in
+     your defined template directory.
+     --%>

Added: incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/Wiki.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/Wiki.jsp?rev=627272&view=auto
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/Wiki.jsp (added)
+++ incubator/jspwiki/branches/JSPWIKI_STRIPES_BRANCH/src/webdocs-stripes/Wiki.jsp Tue Feb 12 22:24:59 2008
@@ -0,0 +1,10 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.ViewActionBean" />
+<stripes:layout-render name="/WEB-INF/jsp/templates/default/ViewTemplate.jsp">
+<stripes:layout-component name="contents">
+  <wiki:Include page="/WEB-INF/jsp/templates/default/PageContent.jsp" />
+</stripes:layout-component>
+</stripes:layout-render>



Mime
View raw message