jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brus...@apache.org
Subject svn commit: r1568367 [12/13] - in /jspwiki/trunk: ./ jspwiki-war/ jspwiki-war/src/main/config/wro/ jspwiki-war/src/main/java/org/apache/wiki/ jspwiki-war/src/main/scripts/dynamic-styles/ jspwiki-war/src/main/scripts/lib/ jspwiki-war/src/main/scripts/mo...
Date Fri, 14 Feb 2014 17:24:35 GMT
Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesContent.jsp?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesContent.jsp (added)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesContent.jsp Fri Feb 14 17:24:32 2014
@@ -0,0 +1,59 @@
+<%--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+--%>
+
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.ui.*" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setLocale value="${prefs.Language}" />
+<fmt:setBundle basename="templates.default"/>
+<%
+  WikiContext context = WikiContext.findContext( pageContext );
+  TemplateManager.addResourceRequest( context, TemplateManager.RESOURCE_SCRIPT, "scripts/haddock-prefs.js" );
+  //TemplateManager.addResourceRequest( context, TemplateManager.RESOURCE_SCRIPT, "scripts-dev/src/main/scripts/wiki/Prefs.js" );
+%>
+
+<div class="page-content">
+<div class="rightAccordion">
+
+  <wiki:Include page="PreferencesTab.jsp" />
+
+  <wiki:UserCheck status="authenticated">
+  <wiki:Permission permission="editProfile">
+     <wiki:Include page="ProfileTab.jsp" />
+  <%--
+  <li><a>
+  <%=LocaleSupport.getLocalizedMessage(pageContext, "prefs.tab.profile")%>
+  </a></li>
+  --%>
+  </wiki:Permission>
+  </wiki:UserCheck>
+
+  <wiki:Permission permission="createGroups"> <%-- FIXME check right permissions --%>
+    <wiki:Include page="GroupTab.jsp" />
+  <%--
+  <li><a>
+  <%=LocaleSupport.getLocalizedMessage(pageContext, "group.tab")%>
+  </a></li>
+     --%>
+  </wiki:Permission>
+
+</div>
+</div>
\ No newline at end of file

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesTab.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesTab.jsp?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesTab.jsp (added)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesTab.jsp Fri Feb 14 17:24:32 2014
@@ -0,0 +1,198 @@
+<%--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+--%>
+
+<%@ page errorPage="/Error.jsp" %>
+<%@ page import="java.util.*" %>
+<%@ page import="java.lang.*" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="java.io.*" %>
+<%@ page import="java.util.jar.*" %>
+
+<%@ page import="org.apache.wiki.ui.*" %>
+<%@ page import="org.apache.wiki.preferences.*" %>
+
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%@ 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://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+
+<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setLocale value="${prefs.Language}" />
+<fmt:setBundle basename="templates.default"/>
+<%
+  //FIXME: this should better move to UserPreferences.jsp but that doesn't seem to work. Ugh ?
+  WikiContext c = WikiContext.findContext( pageContext );
+  TemplateManager t = c.getEngine().getTemplateManager();
+  pageContext.setAttribute( "skins", t.listSkins(pageContext, c.getTemplate() ) );
+  pageContext.setAttribute( "languages", t.listLanguages(pageContext) );
+  pageContext.setAttribute( "timeformats", t.listTimeFormats(pageContext) );
+  pageContext.setAttribute( "timezones", t.listTimeZones(pageContext) );
+  pageContext.setAttribute( "hasMultipleEditors", c.getEngine().getEditorManager().getEditorList().length > 1 );
+
+%>
+
+<h3><fmt:message key="prefs.heading" /></h3>
+
+<c:if test="${param.tab eq 'prefs'}" >
+  <div class="formhelp">
+    <wiki:Messages div="error" topic="prefs" prefix='<%=LocaleSupport.getLocalizedMessage(pageContext,"prefs.errorprefix.prefs")%>'/>
+  </div>
+</c:if>
+
+<form action="<wiki:Link jsp='UserPreferences.jsp' format='url'><wiki:Param name='tab' value='prefs'/></wiki:Link>"
+       class=""
+          id="setCookie"
+      method="post" accept-charset="<wiki:ContentEncoding />" >
+
+
+  <div class="form-group">
+  <label class="control-label form-col-20" for="assertedName"><fmt:message key="prefs.assertedname"/></label>
+  <input class="form-control form-col-50" type="text" id="assertedName" name="assertedName" size="20" 
+          autofocus="autofocus"
+         value="<wiki:UserProfile property='wikiname' />" />
+  <%-- CHECK THIS
+  <input type="text" id="assertedName" name="assertedName" size="20" value="<wiki:UserProfile property='loginname'/>" />
+  --%>  
+  </div>
+
+  <wiki:UserCheck status="anonymous">
+  <div class="help-block form-col-offset-20">
+    <fmt:message key="prefs.assertedname.description">
+      <fmt:param><wiki:Variable var="applicationname" /></fmt:param>
+      <fmt:param>
+        <a href="<wiki:Link jsp='Login.jsp' format='url'><wiki:Param name='tab' value='register'/></wiki:Link>">
+          <fmt:message key="prefs.assertedname.create"/>
+        </a>
+      </fmt:param>
+    </fmt:message>
+  </div>  
+  </wiki:UserCheck>
+
+  <c:if test='${hasMultipleEditors}'>
+  <div class="form-group">
+  <label class="control-label form-col-20" for="editor"><fmt:message key="edit.chooseeditor"/></label>
+  
+    <select class="" id="editor" name="editor" data-pref="editor">
+      <wiki:EditorIterator id="edt">
+        <option <%=edt.isSelected()%> value="<%=edt.getName()%>"><%=edt.getName()%></option>
+      </wiki:EditorIterator>
+  </select>
+  
+  </div>
+  </c:if>
+
+  <div class="form-group">
+  <label class="btn btn-default form-col-offset-20" for="prefSectionEditing">
+    <input class="" id="prefSectionEditing" name="prefSectionEditing"  data-pref="SectionEditing"
+         type="checkbox" <c:if test='${"on" == prefs.SectionEditing}'>checked="checked"</c:if> >
+      <fmt:message key="prefs.user.sectionediting"/>
+  </label>
+  <fmt:message key="prefs.user.sectionediting.text"/>
+  
+  </div>
+
+  <c:if test='${not empty skins}'>
+  <div class="form-group">
+  <label class="control-label form-col-20" for="prefSkin"><fmt:message key="prefs.user.skin"/></label>
+  
+  <select class="" id="prefSkin" name="prefSkin" data-pref="SkinName">
+    <c:forEach items="${skins}" var="i">
+      <option value='<c:out value='${i}'/>' <c:if test='${i == prefs.SkinName}'>selected="selected"</c:if> ><c:out value="${i}"/></option>
+    </c:forEach>
+  </select>
+  
+  </div>
+  </c:if>
+
+
+  <c:if test='${not empty languages}'>
+  <c:set var="prefLanguage" ><c:out value="${prefs.Language}" default="<%=request.getLocale().toString()%>" /></c:set>
+  <div class="form-group">
+  <label class="control-label form-col-20" for="prefLanguage"><fmt:message key="prefs.user.language"/></label>
+  
+  <select class="" id="prefLanguage" name="prefLanguage" data-pref="Language">
+    <c:forEach items='${languages}' var='lg'>
+      <option value="<c:out value='${lg.key}'/>" <c:if test='${fn:startsWith(prefLanguage,lg.key)}'>selected="selected"</c:if> ><c:out value="${lg.value}"/></option>
+    </c:forEach>
+  </select>
+  
+  </div>
+  </c:if>
+
+  <div class="form-group">
+  <label class="control-label form-col-20" for="prefOrientation"><fmt:message key="prefs.user.orientation"/></label>
+  
+  <select class="" id="prefOrientation" name="prefOrientation" onclick="Wiki.changeOrientation();"  data-pref="Orientation">
+      <option value='fav-left' <c:if test='${"fav-left" == prefs.Orientation}'>selected="selected"</c:if> ><fmt:message key="prefs.user.orientation.left"/></option>
+      <option value='fav-right' <c:if test='${"fav-right" == prefs.Orientation}'>selected="selected"</c:if> ><fmt:message key="prefs.user.orientation.right"/></option>
+  </select>
+  
+  </div>
+
+
+  <div class="form-group">
+  <label class="control-label form-col-20" for="prefTimeFormat"><fmt:message key="prefs.user.timeformat"/></label>
+  
+  <select class="" id="prefTimeFormat" name="prefTimeFormat"  data-pref="DateFormat">
+    <c:forEach items='${timeformats}' var='tf' >
+      <option value='<c:out value="${tf.key}"/>' <c:if test='${tf.key == prefs.DateFormat}'>selected="selected"</c:if> ><c:out value="${tf.value}"/></option>
+    </c:forEach>
+  </select>
+  
+  </div>
+
+  <div class="form-group">
+  <label class="control-label form-col-20" for="prefTimeZone"><fmt:message key="prefs.user.timezone"/></label>
+  
+  <select class="" id='prefTimeZone' name='prefTimeZone'  data-pref="TimeZone">
+    <c:forEach items='${timezones}' var='tz'>
+      <option value='<c:out value="${tz.key}"/>' <c:if test='${tz.key == prefs.TimeZone}'>selected="selected"</c:if> ><c:out value="${tz.value}"/></option>
+    </c:forEach>
+  </select>
+  
+  </div>
+
+
+  <div class="form-group">
+  
+    <input class="btn btn-primary form-col-offset-20" type="submit" name="ok" value="<fmt:message key='prefs.save.prefs.submit'/>"
+      accesskey="s" />
+    <input type="hidden" name="redirect" value="<wiki:Variable var='redirect' default='' />" />
+    <input type="hidden" name="action" value="setAssertedName" />
+    <p class="help-block form-col-offset-20"><fmt:message key='prefs.cookies'/></p>
+  
+  </div>
+
+</form>
+
+<%-- Clearing the 'asserted name' and other prefs in the cookie --%>
+<%--wiki:UserCheck status="asserted"--%>
+<%--
+<h3><fmt:message key='prefs.clear.heading'/></h3>
+--%>
+<form action="<wiki:Link jsp='UserPreferences.jsp' format='url'><wiki:Param name='tab' value='prefs'/></wiki:Link>"
+       class=""
+          id="clearCookie"
+      method="post" accept-charset="<wiki:ContentEncoding />" >
+  <input class="btn btn-danger form-col-offset-20" type="submit" name="ok" value="<fmt:message key='prefs.clear.submit'/>" />
+  <input type="hidden" name="action" value="clearAssertedName" />
+  <p class="help-block form-col-offset-20"><fmt:message key="prefs.clear.description" /></p>
+
+</form>
+<%--/wiki:UserCheck--%>

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreviewContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreviewContent.jsp?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreviewContent.jsp (added)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreviewContent.jsp Fri Feb 14 17:24:32 2014
@@ -0,0 +1,43 @@
+<%--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.  
+--%>
+
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%@ page import="org.apache.wiki.ui.EditorManager" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setLocale value="${prefs.Language}" />
+<fmt:setBundle basename="templates.default"/>
+
+<%-- Inserts page content for preview. --%>
+<div class="page-content preview-content">
+
+  <div class="information">
+    <wiki:Editor/>
+    <p class="help-block"><fmt:message key="preview.info"/></p>
+  </div>
+
+  <div class="preview-body">
+    <wiki:Translate><%=EditorManager.getEditedText(pageContext)%></wiki:Translate>
+  </div>
+
+  <div class="information">
+    <fmt:message key="preview.info"/>
+  </div>
+
+</div>
\ No newline at end of file

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ProfileTab.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ProfileTab.jsp?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ProfileTab.jsp (added)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ProfileTab.jsp Fri Feb 14 17:24:32 2014
@@ -0,0 +1,166 @@
+<%--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.  
+--%>
+
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.auth.*" %>
+<%@ page import="org.apache.wiki.auth.user.*" %>
+<%@ page errorPage="/Error.jsp" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setLocale value="${prefs.Language}" />
+<fmt:setBundle basename="templates.default"/>
+<%
+  /* dateformatting not yet supported by wiki:UserProfile tag - diy */
+  WikiContext wikiContext = WikiContext.findContext(pageContext);
+  UserManager manager = wikiContext.getEngine().getUserManager();
+  UserProfile profile = manager.getUserProfile( wikiContext.getWikiSession() );
+%>
+      <h3>
+      <wiki:UserProfile property="exists"><fmt:message key="prefs.oldprofile"/></wiki:UserProfile>
+      <wiki:UserProfile property="new"><fmt:message key="prefs.newprofile"/></wiki:UserProfile>
+      </h3>
+
+<form action="<wiki:CheckRequestContext 
+     context='login'><wiki:Link jsp='Login.jsp' format='url'><wiki:Param name='tab'
+       value='profile'/></wiki:Link></wiki:CheckRequestContext><wiki:CheckRequestContext 
+     context='prefs'><wiki:Link jsp='UserPreferences.jsp' format='url'><wiki:Param name='tab'
+       value='profile'/></wiki:Link></wiki:CheckRequestContext>" 
+          id="editProfile" 
+       class=""
+      method="post" accept-charset="UTF-8">
+
+
+      <c:if test="${param.tab eq 'profile'}" >
+        <div class="help-block">
+        <wiki:Messages div="error" topic="profile" prefix='<%=LocaleSupport.getLocalizedMessage(pageContext,"prefs.errorprefix.profile")%>'/>
+        </div>
+      </c:if>
+
+
+     <!-- Login name -->
+     <div class="form-group">
+       <label class="control-label form-col-20" for="loginname"><fmt:message key="prefs.loginname"/></label>
+
+       <wiki:UserProfile property="canChangeLoginName">
+           <input class="form-control form-col-50" type="text" name="loginname" id="loginname"
+                  size="20" value="<wiki:UserProfile property='loginname' />" />
+       </wiki:UserProfile>
+       <wiki:UserProfile property="!canChangeLoginName">
+           <!-- If user can't change their login name, it's because the container manages the login -->
+           <wiki:UserProfile property="new">
+             <div class="warning"><fmt:message key="prefs.loginname.cannotset.new"/></div>
+           </wiki:UserProfile>
+           <wiki:UserProfile property="exists">
+             <span class="form-control-static"><wiki:UserProfile property="loginname"/></span>
+             <div class="warning"><fmt:message key="prefs.loginname.cannotset.exists"/></div>
+           </wiki:UserProfile>
+         </wiki:UserProfile>
+     </div>
+
+     <!-- Password; not displayed if container auth used -->
+     <wiki:UserProfile property="canChangePassword">
+     <div class="form-group">
+         <label class="control-label form-col-20" for="password"><fmt:message key="prefs.password"/></label>
+         
+            <%--FIXME Enter Old PW to validate change flow, not yet treated by JSPWiki
+            <label class="control-label form-col-20" for="password0">Old</label>&nbsp;
+            <input type="password" name="password0" id="password0" size="20" value="" />
+            &nbsp;&nbsp;--%>
+            <input class="form-control form-col-50" type="password" name="password" id="password" size="20" value="" />
+    
+      </div>
+      <div class="form-group">
+        <label class="control-label form-col-20" for="password2"><fmt:message key="prefs.password2"/></label>
+          
+        <input class="form-control form-col-50" type="password" name="password2" id="password2" size="20" value="" />
+        <%-- extra validation ? min size, allowed chars? password-strength js routing --%>
+         
+     </div>
+     </wiki:UserProfile>
+
+     <!-- Full name -->
+     <div class="form-group">
+       <label class="control-label form-col-20" for="fullname"><fmt:message key="prefs.fullname"/></label>
+       
+         <input class="form-control form-col-50" type="text" name="fullname" id="fullname"
+                size="20" value="<wiki:UserProfile property='fullname'/>" />
+         <p class="help-block form-col-offset-20"><fmt:message key="prefs.fullname.description"/></p>
+       
+     </div>
+
+     <!-- E-mail -->
+     <div class="form-group">
+       <label class="control-label form-col-20" for="email"><fmt:message key="prefs.email"/></label>
+         <input class="form-control form-col-50" type="text" name="email" id="email"
+                size="20" value="<wiki:UserProfile property='email' />" />
+         <p class="help-block form-col-offset-20"><fmt:message key="prefs.email.description"/></p>
+     </div>
+
+     <wiki:UserProfile property="exists">
+     <div class="information">
+     <div class="xform-group"> <%--class="additinfo"--%>
+       <label class="control-label form-col-20"><fmt:message key="prefs.roles"/></label>
+       <div class="form-control-static  form-col-50"><wiki:UserProfile property="roles" /></div>
+     </div>
+     <div class="xform-group"> <%--class="additinfo"--%>
+       <label class="control-label form-col-20"><fmt:message key="prefs.groups"/></label>
+       
+         <%-- TODO this should become clickable group links so you can immediately go and look at them if you want --%>
+         <div class="form-control-static  form-col-50"><wiki:UserProfile property="groups" /></div>
+         <p class="help-block form-col-offset-20"><fmt:message key="prefs.acl.info" /></p>
+       
+     </div>
+
+     <div class="xform-group"> <%--class="additinfo"--%>
+       <label class="control-label form-col-20"><fmt:message key="prefs.creationdate"/></label>
+       <div class="form-control-static form-col-50">
+         <%--<wiki:UserProfile property="created"/>--%>
+ 	     <fmt:formatDate value="<%= profile.getCreated() %>" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />
+       </div>
+     </div>
+     <div class="xform-group"> <%--class="additinfo"--%>
+       <label class="control-label form-col-20"><fmt:message key="prefs.profile.lastmodified"/></label>
+       <div class="form-control-static form-col-50">
+         <%--<wiki:UserProfile property="modified"/>--%>
+ 	     <fmt:formatDate value="<%= profile.getLastModified() %>" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />
+       </div> 
+     </div>
+     </div>
+     </wiki:UserProfile>
+
+     <div class="form-group"> 
+       <wiki:UserProfile property="exists">
+        <input class="btn btn-primary form-col-offset-20" type="submit" name="ok" value="<fmt:message key='prefs.oldprofile'/>" />
+        <%--input class="btn btn-primary form-col-offset-20" type="submit" name="ok" value="<fmt:message key='prefs.save.submit' />" /--%>
+       </wiki:UserProfile>
+       <wiki:UserProfile property="new">
+         <input class="btn btn-primary form-col-offset-20" type="submit" name="ok" value="<fmt:message key='prefs.newprofile' />" />
+         <%--input class="btn btn-primary form-col-offset-20" type="submit" name="ok" value="<fmt:message key='prefs.save.submit' />" /--%>
+       </wiki:UserProfile>
+       <input type="hidden" name="redirect" value="<wiki:Variable var='redirect' default='' />" />
+       <input type="hidden" name="action" value="saveProfile" />
+
+       <wiki:UserCheck status="assertionsAllowed">
+          <div class="help-block form-col-offset-20"><fmt:message key="prefs.cookie.info"/></div>
+        </wiki:UserCheck>
+     </div>
+
+</form>

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/SearchBox.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/SearchBox.jsp?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/SearchBox.jsp (added)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/SearchBox.jsp Fri Feb 14 17:24:32 2014
@@ -0,0 +1,64 @@
+<%--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.  
+--%>
+
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<fmt:setLocale value="${prefs.Language}" />
+<fmt:setBundle basename="templates.default"/>
+<%-- 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="searchbox col6 offset6 pull-right form-inline" 
+  id="searchForm" 
+  accept-charset="<wiki:ContentEncoding />">
+
+  <wiki:Include page="UserBox.jsp" />
+
+  <span>
+  <input type="text" size="20" 
+    class="form-control" name="query" id="query" 
+    autofocus="autofocus" 
+    accesskey="f"
+    placeholder="<fmt:message key='sbox.search.submit'/>" />
+  <button type="submit" 
+    class="btn" name="searchSubmit" id="searchSubmit" 
+  	value="<fmt:message key='find.submit.go'/>"
+  	title="<fmt:message key='find.submit.go'/>"></button>
+
+  <ul class="dropdown-menu pull-right" data-hover-parent="span">
+   <li class="dropdown-header">Quick Search results (type ahead)</li>
+    <%-- see wiki/Searchbox.js
+        <li class="findpages"><a class="createpage" href="/wiki/B" >[Create] B</a></li>
+        <li class="findpages"><a class="createpage" href="/wiki/B&clone=Main" >[Create & clone this page] B</a></li>
+        <li class="findpages"><a href="/wiki/Brushed" >Brushed (99)</a></li>
+        <li class="findpages"><a href="/wiki/BrushedTemplate">BrushedTemplate (49)</a></li>
+        <li class="findpages"><a href="/wiki/BrushedSkins">BrushedSkins (29)</a></li>
+    --%>
+    <li class="divider"></li>
+    <li class="dropdown-header"><fmt:message key="sbox.recentsearches"/></li>
+    <%-- see wiki/Recents.js
+        <li class="recents"><a>Recent-1</a></li>
+        <li class="recents"><a>Recent-2</a></li>
+        <li class="recents clear"><a>[Clear recent searches]</a></li>
+    --%>
+  </ul>
+  </span>
+  
+</form>

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Sidebar.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Sidebar.jsp?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Sidebar.jsp (added)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Sidebar.jsp Fri Feb 14 17:24:32 2014
@@ -0,0 +1,72 @@
+<%--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.  
+--%>
+
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setLocale value="${prefs.Language}" />
+<fmt:setBundle basename="templates.default"/>
+<%@ page import="org.apache.wiki.*" %>
+
+<div class="sidebar">
+  <button class="close" type="button">&times;</button>
+
+  <%-- move this to the LeftMenu
+  <wiki:UserCheck status="known">
+  <wiki:Translate>[{If page='{$username}Favorites' exists='true'
+
+%%accordion
+! [My Favorites|{$username}Favorites]
+[{InsertPage page='{$username}Favorites' }]
+%% }]
+  </wiki:Translate>
+  </wiki:UserCheck>
+--%>
+  <wiki:Permission permission="view">
+
+  <%-- 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:Permission>
+
+  <div class="wikiversion"><%=Release.APPNAME%> v<%=Release.getVersionString()%>
+    <wiki:RSSImageLink title='<%=LocaleSupport.getLocalizedMessage(pageContext,"fav.aggregatewiki.title")%>' />
+  </div>  
+  
+</div>
\ No newline at end of file

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/UploadTemplate.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/UploadTemplate.jsp?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/UploadTemplate.jsp (added)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/UploadTemplate.jsp Fri Feb 14 17:24:32 2014
@@ -0,0 +1,56 @@
+<%--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.  
+--%>
+
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setLocale value="${prefs.Language}" />
+<fmt:setBundle basename="templates.default"/>
+<!doctype html>
+<html lang="en">
+  <head>
+
+  <title><fmt:message key="upload.title"><fmt:param><wiki:Variable var="applicationname"/></fmt:param></fmt:message></title>
+  <wiki:Include page="commonheader.jsp"/>
+  <meta name="robots" content="noindex,nofollow" />
+</head>
+
+<body class="context-<wiki:Variable var='requestcontext' />">
+
+<div class="container ${prefs.Orientation}">
+
+  <wiki:Include page="Header.jsp" />
+  <wiki:Include page="Nav.jsp" />
+  <div class="content active" data-toggle="li#menu,.sidebar>.close" >
+    <div class="page">
+      <wiki:PageExists>
+        <wiki:Include page="AttachmentTab.jsp"/>
+      </wiki:PageExists>
+
+      <wiki:Include page="PageInfo.jsp"/>
+    </div>
+    <wiki:Include page="Sidebar.jsp"/>
+  </div>
+  <wiki:Include page="Footer.jsp" />     
+
+</div>
+</body>
+
+</html>
\ No newline at end of file

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/UserBox.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/UserBox.jsp?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/UserBox.jsp (added)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/UserBox.jsp Fri Feb 14 17:24:32 2014
@@ -0,0 +1,77 @@
+<%--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.  
+--%>
+
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page import="org.apache.wiki.*" %>
+<fmt:setLocale value="${prefs.Language}" />
+<fmt:setBundle basename="templates.default"/>
+<%
+  WikiContext c = WikiContext.findContext(pageContext);
+%>
+<wiki:UserCheck status="anonymous">
+  <label class="username anonymous"><fmt:message key="fav.greet.anonymous" /></label>
+</wiki:UserCheck>
+<wiki:UserCheck status="asserted">
+  <label class="username asserted">
+    <fmt:message key="fav.greet.asserted">
+      <fmt:param><wiki:Translate>[<wiki:UserName />]</wiki:Translate></fmt:param>
+    </fmt:message>
+  </label>
+</wiki:UserCheck>
+<wiki:UserCheck status="authenticated">
+  <label class="username authenticated">
+    <fmt:message key="fav.greet.authenticated">
+      <fmt:param><wiki:Translate>[<wiki:UserName />]</wiki:Translate></fmt:param>
+    </fmt:message>
+  </label>
+</wiki:UserCheck>
+
+<%-- login button --%>
+<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='<%=c.getEngine().encodeName(c.getName())%>'/></wiki:Link>" 
+         class="btn btn-default login"
+         title="<fmt:message key='actions.login.title'/>"><fmt:message key="actions.login"/></a>
+    </wiki:Permission>
+  </wiki:CheckRequestContext>
+</wiki:UserCheck>
+
+<%-- logout button --%>
+<wiki:UserCheck status="authenticated">
+   <a href="<wiki:Link jsp='Logout.jsp' format='url' />" 
+      class="btn btn-default 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>
+
+<%-- user preferences button --%>
+<wiki:CheckRequestContext context='!prefs'>
+  <wiki:CheckRequestContext context='!preview'>
+    <a href="<wiki:Link jsp='UserPreferences.jsp' format='url' ><wiki:Param name='redirect'
+      value='<%=c.getEngine().encodeName(c.getName())%>'/></wiki:Link>"
+      class="btn btn-default login prefs" 
+      accesskey="p"
+      title="<fmt:message key='actions.prefs.title'/>"><fmt:message key="actions.prefs" />
+    </a>
+  </wiki:CheckRequestContext>
+</wiki:CheckRequestContext>

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ViewTemplate.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ViewTemplate.jsp?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ViewTemplate.jsp (added)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ViewTemplate.jsp Fri Feb 14 17:24:32 2014
@@ -0,0 +1,64 @@
+<%--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.  
+--%>
+
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ page import="org.apache.wiki.*" %>
+<fmt:setBundle basename="templates.default"/>
+<!doctype html>
+<html lang="en">
+  <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="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="context-<wiki:Variable var='requestcontext' />">
+
+<div class="container ${prefs.Orientation}">
+ 
+  <wiki:Include page="Header.jsp" />
+  <wiki:Include page="Nav.jsp" />
+  <div class="content active" data-toggle="li#menu,.sidebar>.close" >
+    <div class="page">
+      <wiki:Content/>
+      <wiki:Include page="PageInfo.jsp"/>
+    </div>
+    <wiki:Include page="Sidebar.jsp"/>
+  </div>
+  <wiki:Include page="Footer.jsp" />
+
+</div>
+
+</body>
+</html>
\ No newline at end of file

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/WorkflowContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/WorkflowContent.jsp?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/WorkflowContent.jsp (added)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/WorkflowContent.jsp Fri Feb 14 17:24:32 2014
@@ -0,0 +1,185 @@
+<%--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.  
+--%>
+
+<%@ page errorPage="/Error.jsp" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setLocale value="${prefs.Language}" />
+<fmt:setBundle basename="templates.default"/>
+<script language="JavaScript">
+  function SubmitOutcomeIfSelected(selectId) 
+  {
+    if ( selectId.selectedIndex > 0 )
+    {
+      // alert(selectId.selectedIndex);
+      selectId.form.submit();
+    }
+  }
+</script>
+<%
+  int i = 0;
+  String evenOdd;
+%>
+<div class="page-content">
+<h3><fmt:message key="workflow.heading" /></h3>
+<p><fmt:message key="workflow.instructions"/></p>
+
+<!-- Pending Decisions -->
+<h4><fmt:message key="workflow.decisions.heading" /></h4>
+
+<c:if test="${empty decisions}">
+  <div class="information">
+    <fmt:message key="workflow.noinstructions"/>
+  </div>
+</c:if>
+
+<c:if test="${!empty decisions}">
+  <div class="help-block">
+    <fmt:message key="workflow.actor.instructions"/>
+  </div>
+  <table class="">
+    <thead>
+      <th width="5%"  align="center"><fmt:message key="workflow.id"/></th>
+      <th width="45%" align="left"><fmt:message key="workflow.item"/></th>
+      <th width="15%" align="left"><fmt:message key="workflow.actions"/></th>
+      <th width="15%" align="left"><fmt:message key="workflow.requester"/></th>
+      <th width="20%" align="left"><fmt:message key="workflow.startTime"/></th>
+    </thead>
+    <tbody>
+      <% i = 1; %>
+      <c:forEach var="decision" items="${decisions}">
+        <% evenOdd = (i % 2 == 0) ? "even" : "odd"; %>
+        <tr class="<%=evenOdd%>">
+          <!-- Workflow ID -->
+          <td align="center"><c:out value="${decision.workflow.id}"/></td>
+          <!-- Name of item -->
+          <td align="left">
+            <fmt:message key="${decision.messageKey}">
+              <c:forEach var="messageArg" items="${decision.messageArguments}">
+                <fmt:param><c:out value="${messageArg}"/></fmt:param>
+              </c:forEach>
+            </fmt:message>
+          </td>
+          <!-- Possible actions (outcomes) -->
+          <td align="left">
+            <form id="<c:out value='decision.${decision.id}'/>" 
+              action="<wiki:Link jsp='Workflow.jsp' format='url'/>" method="POST" accept-charset="UTF-8">
+              <input type="hidden" name="action" value="decide" />
+              <input type="hidden" name="id" value="<c:out value='${decision.id}' />" />
+              <select name="outcome" onchange="SubmitOutcomeIfSelected(this)">
+                <option value="-"><fmt:message key="select.one"/></option>
+                <c:forEach var="outcome" items="${decision.availableOutcomes}"><option value="${outcome.messageKey}"><fmt:message key="${outcome.messageKey}"/></option>
+                </c:forEach>
+              </select>
+            </form>
+          </td>
+          <!-- Requester -->
+          <td align="left"><c:out value="${decision.owner.name}"/></td>
+          <!-- When did the actor start this step? -->
+          <td align="left">
+            <fmt:formatDate value="${decision.startTime}" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />
+		  </td>
+        </tr>
+        <!-- Hidden row with Decision details, if there are any -->
+        <c:if test="${!empty decision.facts}">
+          <tr class="<%=evenOdd%>" class="hideDiv">
+            <td>&nbsp;</td>
+            <td colspan="4" class="split">
+              <a href="#" 
+                title="<fmt:message key='workflow.details.title' />"
+              onclick="$('decision.<c:out value="${decision.workflow.id}"/>').toggle();" >
+                <fmt:message key="workflow.details" />
+              </a>
+              <div class="hideDiv" id="<c:out value='decision.${decision.workflow.id}'/>">
+                <c:forEach var="fact" items="${decision.facts}">
+                  <h5><fmt:message key="${fact.messageKey}" /></h5>
+                  <p><c:out escapeXml="false" value="${fact.value}"/></p>
+                </c:forEach>
+              </div>
+            </td>
+          </tr>
+        </c:if>
+        
+        <% i++; %>
+      </c:forEach>
+    </tbody>
+  </table>
+</c:if>
+
+<!-- Running workflows for which current user is the owner -->
+<h4><fmt:message key="workflow.workflows.heading" /></h4>
+
+<c:if test="${empty workflows}">
+  <div class="information">
+    <fmt:message key="workflow.noinstructions"/>
+  </div>
+</c:if>
+
+<c:if test="${!empty workflows}">
+  <div class="help-block">
+    <fmt:message key="workflow.owner.instructions"/>
+  </div>
+  <table class="">
+    <thead>
+      <th width="5%"  align="center"><fmt:message key="workflow.id"/></th>
+      <th width="45%" align="left"><fmt:message key="workflow.item"/></th>
+      <th width="15%" align="left"><fmt:message key="workflow.actions"/></th>
+      <th width="15%" align="left"><fmt:message key="workflow.actor"/></th>
+      <th width="20%" align="left"><fmt:message key="workflow.startTime"/></th>
+    </thead>
+    <% i = 1; %>
+    <tbody>
+      <c:forEach var="workflow" items="${workflows}">
+        <% evenOdd = (i % 2 == 0) ? "even" : "odd"; %>
+        <tr class="<%=evenOdd%>">
+          <!-- Workflow ID -->
+          <td  align="center"><c:out value="${workflow.id}"/></td>
+          <!-- Name of item -->
+          <td align="left">
+            <fmt:message key="${workflow.messageKey}">
+              <c:forEach var="messageArg" items="${workflow.messageArguments}">
+                <fmt:param><c:out value="${messageArg}"/></fmt:param>
+              </c:forEach>
+            </fmt:message>
+          </td >
+          <!-- Actions -->
+          <td align="left">
+            <form id="<c:out value='workflow.${workflow.id}'/>" action="<wiki:Link jsp='Workflow.jsp' format='url'/>" method="POST" accept-charset="UTF-8">
+              <input type="submit" name="submit" value="<fmt:message key="outcome.step.abort" />" />
+              <input type="hidden" name="action" value="abort" />
+              <input type="hidden" name="id" value="<c:out value="${workflow.id}" />" />
+            </form>
+          </td>
+          <!-- Current actor -->
+          <td align="left"><c:out value="${workflow.currentActor.name}"/></td>
+          <!-- When did the actor start this step? -->
+          <td align="left">
+            <fmt:formatDate value="${workflow.currentStep.startTime}" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />
+          </td>
+        </tr>
+        <% i++; %>
+      </c:forEach>
+    </tbody>
+  </table>
+</c:if>
+
+</div>
\ No newline at end of file

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/admin/AdminTemplate.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/admin/AdminTemplate.jsp?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/admin/AdminTemplate.jsp (added)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/admin/AdminTemplate.jsp Fri Feb 14 17:24:32 2014
@@ -0,0 +1,115 @@
+<%--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.  
+--%>
+
+<%@ page import="java.util.*" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.api.engine.AdminBeanManager" %>
+<%@ page import="org.apache.wiki.ui.*" %>
+<%@ page import="org.apache.wiki.ui.admin.*" %>
+<%@ page errorPage="/Error.jsp" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<html>
+<head>
+<title>JSPWiki administration</title>
+  <wiki:Include page="commonheader.jsp"/>
+  <link rel="stylesheet" media="screen, projection, print" type="text/css" 
+        href="<wiki:Link format='url' templatefile='admin/admin.css'/>"/>
+</head>
+<body class="container context-view">
+<div id="wikibody">
+<div id="page" >
+<h1>JSPWiki Administration</h1>
+<div class="information">Not all things can be configured here.  Some things need to be configured
+in your <tt>jspwiki.properties</tt> file.</div>
+
+<%
+    WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
+    WikiContext ctx = WikiContext.findContext(pageContext);
+    AdminBeanManager mgr = wiki.getAdminBeanManager();
+ %>
+
+<wiki:TabbedSection defaultTab="${param['tab-admin']}">
+
+<wiki:Tab id="core" title="Core">
+<p>Contains core setup options.</p>
+   <wiki:TabbedSection defaultTab="${param['tab-core']}">
+
+     <wiki:AdminBeanIterator type="core" id="ab">
+      <wiki:Tab id="${ab.id}" title="${ab.title}">
+      
+      <div class="formcontainer">
+      <form action="Admin.jsp" method="post" accept-charset="UTF-8">
+        <input type="hidden" name="tab-admin" value="core"/>
+        <input type="hidden" name="tab-core" value="${ab.title}" />
+        <input type="hidden" name="bean" value="${ab.id}" />
+        <%
+         out.write( ab.doGet(ctx) );
+         %>
+       </form>
+       </div>
+      </wiki:Tab>
+     </wiki:AdminBeanIterator>
+   </wiki:TabbedSection>
+</wiki:Tab>
+
+<wiki:Tab id="users" title="Users">
+   <wiki:Include page="admin/UserManagement.jsp"/>
+</wiki:Tab>
+
+<wiki:Tab id="groups" title="Groups">
+   <div>
+   <p>This is a list of all groups in this wiki.  If you click on the group name,
+   you will be taken to the administration page of that particular group.</p>
+   <p>
+   <wiki:Plugin plugin="Groups"/>
+   </p>
+   </div>
+</wiki:Tab>
+
+
+<wiki:Tab id="editors" title="Editors">
+   
+   <wiki:TabbedSection defaultTab="${param['tab-editors']}">
+     <wiki:AdminBeanIterator type="editors" id="ab">
+      <wiki:Tab id="${ab.id}" title="${ab.title}">
+      
+      <div class="formcontainer"> 
+      <form action="Admin.jsp" method="post" accept-charset="UTF-8">
+         <input type="hidden" name="tab-admin" value="editors"/>
+         <input type="hidden" name="tab-editors" value="${ab.title}" />
+         <%
+         out.write( ab.doGet(ctx) );
+         %>
+       </form>
+       </div>
+      </wiki:Tab>
+     </wiki:AdminBeanIterator>
+   </wiki:TabbedSection>
+
+</wiki:Tab>
+
+<wiki:Tab id="filters" title="Filters">
+<p>There will be more filter stuff here</p>
+</wiki:Tab>
+
+</wiki:TabbedSection>
+</div>
+
+</div>
+</body>
\ No newline at end of file

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/admin/UserManagement.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/admin/UserManagement.jsp?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/admin/UserManagement.jsp (added)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/admin/UserManagement.jsp Fri Feb 14 17:24:32 2014
@@ -0,0 +1,146 @@
+<%--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.  
+--%>
+
+<%@ page import="java.util.*" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.rpc.json.*" %>
+<%@ page import="org.apache.wiki.ui.admin.*" %>
+<%@ page errorPage="/Error.jsp" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<fmt:setLocale value="${prefs.Language}" />
+<fmt:setBundle basename="templates.default"/>
+<script>
+function constructdate(date)
+{
+  var d = new Date();
+  d.setTime(date.time);
+  return d;
+}
+
+function refreshUserInfo()
+{
+   var userid = $('userid').getValue();
+
+   if( userid == '--New--' ) return;
+
+   Wiki.jsonrpc("users.getUserInfo", [userid], function(userprofile){
+      $('loginname').value = userprofile.loginName;
+      $('loginid').value = userprofile.loginName;
+      $('fullname').value = userprofile.fullname;
+      $('email').value = userprofile.email;
+      $('lastmodified').setHTML(constructdate(userprofile.lastModified));
+      $('creationdate').setHTML(constructdate(userprofile.created));
+   });
+}
+
+function addNew()
+{
+  $('loginid').value = "--New--";
+  $('loginname').value = "--New--";
+  $('fullname').value = "Undefined";
+  $('email').value = "";
+  $('lastmodified').innerHTML = "";
+  $('creationdate').innerHTML = "";
+ 
+  var idlist=$('userid');
+  var len = idlist.options.length;
+  idlist.options[len] = new Option('--New--','--New--');
+  idlist.selectedIndex = len;
+}
+</script>
+<div>
+   <p>
+   This is a list of user accounts that exist in this system.
+   </p>
+   <p><wiki:Messages/></p>
+   <div id="userlist">
+      <select name="userid" id="userid" size="16" onchange="javascript:refreshUserInfo()">
+         <c:forEach var="user" items="${engine.userManager.userDatabase.wikiNames}">
+            <option value="${user.name}"><c:out value="${user.name}" escapeXml="true"/></option>
+         </c:forEach>
+      </select>
+   </div>
+   <div id="useredit">
+   <form action="<wiki:Link jsp='admin/Admin.jsp' format='url'><wiki:Param name='tab-admin' value='users'/></wiki:Link>" 
+       class="wikiform"
+          id="adminuserform" 
+    onsubmit="return Wiki.submitOnce(this);"
+      method="post" accept-charset="<wiki:ContentEncoding/>"
+     enctype="application/x-www-form-urlencoded" >
+     <input type="hidden" name='bean' value='org.apache.wiki.ui.admin.beans.UserBean'/>
+     <input type="hidden" id="loginid" name="loginid" value="" />
+     <table>
+     <tr>
+       <td><label for="loginname">Login name</label></td>
+       <td>
+           <input type="text" name="loginname" id="loginname"
+                  size="20" value="" />
+       </td>
+     </tr>
+     <tr>
+       <td><label for="password">Password </label></td>
+       <td>
+          <input type="password" name="password" id="password" size="20" value="" />
+       </td>
+     </tr>
+     <tr>
+       <td><label for="password2">Confirm password</label></td>
+       <td>
+         <input type="password" name="password2" id="password2" size="20" value="" />
+       </td>
+     </tr>
+     <tr>
+       <td><label for="fullname">Full name</label></td>
+       <td>
+         <input type="text" name="fullname" id="fullname"
+                size="20" value="" />
+       </td>
+     </tr>
+     <tr>
+       <td><label for="email">Email</label></td>
+       <td>
+         <input type="text" name="email" id="email"
+                size="20" value="" />
+       </td>
+     </tr>
+
+     <tr class="additinfo">
+       <td><label>Creation date</label></td>
+       <td class="formvalue" id="creationdate">
+       </td>
+     </tr>
+     <tr class="additinfo">
+       <td><label>Last modified</label></td>
+       <td class="formvalue" id="lastmodified">
+       </td>
+     </tr>
+
+     <tr>
+        <td><input type="submit" name="action" value="Save"/></td>
+     </tr>
+
+     </table>
+   <div id="useractions">
+     <input type="submit" name="action" value="Remove" onclick="return( confirm('Are you sure you wish to remove this user?') && Wiki.submitOnce(this) );"/>      <input type="button" value="Add" onclick="javascript:addNew()"/>
+   </div>
+   </form>
+   </div>
+</div>
\ No newline at end of file

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/admin/admin.css
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/admin/admin.css?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/admin/admin.css (added)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/admin/admin.css Fri Feb 14 17:24:32 2014
@@ -0,0 +1,24 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+
+#userlist { float:left; width: 30%; }
+#useredit { float:right; width: 65%; }
+#useractions { clear: both; }
\ No newline at end of file

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/commonheader.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/commonheader.jsp?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/commonheader.jsp (added)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/commonheader.jsp Fri Feb 14 17:24:32 2014
@@ -0,0 +1,146 @@
+<%--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+--%>
+
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.ui.*" %>
+<%@ page import="org.apache.wiki.util.*" %>
+<%@ page import="org.apache.wiki.preferences.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" %>
+<fmt:setLocale value="${prefs.Language}" />
+<fmt:setBundle basename="templates.default"/>
+<%--
+   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" type="text/css" media="screen, projection, print"
+     href="<wiki:Link format='url' templatefile='haddock.css'/>" />
+
+<wiki:IncludeResources type="stylesheet"/>
+<wiki:IncludeResources type="inlinecss" />
+
+<%-- JAVASCRIPT --%>
+
+<script type="text/javascript">//<![CDATA[
+/* Localized javascript strings: LocalizedStrings[] */
+<wiki:IncludeResources type="jslocalizedstrings"/>
+String.I18N = LocalizedStrings;
+String.I18N.PREFIX = "javascript.";
+
+//TODO: Load JS resources parallel with other resources.
+
+
+
+//]]></script>
+
+<script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/haddock.js'/>"></script>
+
+
+<wiki:IncludeResources type="script"/>
+
+<%--TODO:
+<!--[if lte IE 8]><script src="js/libs/selectivizr.js"></script><![endif]-->
+--%>
+
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+<%-- COOKIE read client preferences --%>
+<%
+   Preferences.setupPreferences(pageContext);
+ %>
+
+<meta name="wikiContext" content='<wiki:Variable var="requestcontext" />' />
+<wiki:Permission permission="edit"><meta name="wikiEditPermission" content="true"/></wiki:Permission>
+<meta name="wikiBaseUrl" content='<wiki:BaseURL />' />
+<meta name="wikiPageUrl" content='<wiki:Link format="url"  page="#$%"/>' />
+<meta name="wikiEditUrl" content='<wiki:EditLink format="url" page="#$%"/>' />
+<meta name="wikiCloneUrl" content='<wiki:EditLink format="url" page="#$%"/>&clone=<wiki:Variable var="pagename" />' />
+<meta name="wikiJsonUrl" content='<%=  WikiContext.findContext(pageContext).getURL( WikiContext.NONE, "JSON-RPC" ) %>' /><%--unusual pagename--%>
+<meta name="wikiPageName" content='<wiki:Variable var="pagename" />' /><%--pagename without blanks--%>
+<meta name="wikiUserName" content='<wiki:UserName />' />
+<meta name="wikiTemplateUrl" content='<wiki:Link format="url" templatefile="" />' />
+<%--CHECKME
+    <wiki:link> seems not to lookup the right jsp from the right template directory
+    EG when a templatefile is not present, the generated link should point to the default template.
+    Solution for now: manually force the relevant links back to the default template
+--%>
+<meta name="wikiXHRSearch" content='<wiki:Link format="url" templatefile="../default/AJAXSearch.jsp" />' />
+<meta name="wikiXHRPreview" content='<wiki:Link format="url" templatefile="../default/AJAXPreview.jsp" />' />
+<meta name="wikiXHRCategories" content='<wiki:Link format="url" templatefile="../default/AJAXCategories.jsp" />' />
+<meta name="wikiApplicationName" content='<wiki:Variable var="ApplicationName" />' />
+
+
+<script type="text/javascript">//<![CDATA[
+<wiki:IncludeResources type="jsfunction"/>
+//]]></script>
+
+<meta charset="<wiki:ContentEncoding />">
+<meta http-equiv="Content-Type" content="text/html; charset=<wiki:ContentEncoding />" />
+<link rel="search" href="<wiki:LinkTo format='url' page='Search'/>"
+    title='Search <wiki:Variable var="ApplicationName" />' />
+<link rel="help"   href="<wiki:LinkTo format='url' page='TextFormattingRules'/>"
+    title="Help" />
+<%
+  WikiContext c = WikiContext.findContext( pageContext );
+  String frontpage = c.getEngine().getFrontPage();
+%>
+<link rel="start"  href="<wiki:LinkTo format='url' page='<%=frontpage%>' />" title="Front page" />
+
+<link rel="alternate stylesheet" type="text/css" href="<wiki:Link format='url' templatefile='haddock.css'/>"
+    title="Standard" />
+<link rel="shortcut icon" type="image/x-icon" href="<wiki:Link format='url' jsp='images/favicon.ico'/>" />
+<%-- ie6 needs next line --%>
+<link rel="icon" type="image/x-icon" href="<wiki:Link format='url' jsp='images/favicon.ico'/>" />
+
+<%-- Support for the universal edit button (www.universaleditbutton.org) --%>
+<wiki:CheckRequestContext context='view|info|diff|upload'>
+  <wiki:Permission permission="edit">
+    <wiki:PageType type="page">
+    <link rel="alternate" type="application/x-wiki"
+          href="<wiki:EditLink format='url' />"
+          title="<fmt:message key='actions.edit.title'/>" />
+    </wiki:PageType>
+  </wiki:Permission>
+</wiki:CheckRequestContext>
+
+<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="localheader.jsp"/>
\ No newline at end of file

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/plain.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/plain.jsp?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/plain.jsp (added)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/plain.jsp Fri Feb 14 17:24:32 2014
@@ -0,0 +1,247 @@
+<%--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+--%>
+
+<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.auth.*" %>
+<%@ page import="org.apache.wiki.auth.permissions.*" %>
+<%@ page import="org.apache.wiki.tags.*" %>
+<%@ page import="org.apache.wiki.filters.SpamFilter" %>
+<%@ page import="org.apache.wiki.ui.*" %>
+<%@ page import="org.apache.wiki.util.TextUtil" %>
+<%@ page import="org.apache.wiki.rpc.*" %>
+<%@ page import="org.apache.wiki.rpc.json.*" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<fmt:setLocale value="${prefs.Language}" />
+<fmt:setBundle basename="templates.default"/>
+<%--
+        This is a plain editor for JSPWiki.
+--%>
+<%
+   WikiContext context = WikiContext.findContext( pageContext );
+   WikiEngine engine = context.getEngine();
+
+   TemplateManager.addResourceRequest( context, TemplateManager.RESOURCE_SCRIPT,
+   		context.getURL( WikiContext.NONE, "scripts/jspwiki-edit.js" ) );
+   /*merged by wro4j into one jspwiki-edit.js
+   TemplateManager.addResourceRequest( context, TemplateManager.RESOURCE_SCRIPT,
+   		context.getURL( WikiContext.NONE, "scripts/posteditor.js" ) );
+   */
+   String usertext = EditorManager.getEditedText( pageContext );
+%>
+<wiki:CheckRequestContext context="edit">
+<wiki:NoSuchPage> <%-- this is a new page, check if we're cloning --%>
+<%
+  String clone = request.getParameter( "clone" );
+  if( clone != null )
+  {
+    WikiPage p = engine.getPage( clone );
+    if( p != null )
+    {
+        AuthorizationManager mgr = engine.getAuthorizationManager();
+        PagePermission pp = new PagePermission( p, PagePermission.VIEW_ACTION );
+
+        try
+        {
+          if( mgr.checkPermission( context.getWikiSession(), pp ) )
+          {
+            usertext = engine.getPureText( p );
+          }
+        }
+        catch( Exception e ) {  /*log.error( "Accessing clone page "+clone, e );*/ }
+    }
+  }
+%>
+</wiki:NoSuchPage>
+<%
+  if( usertext == null )
+  {
+    usertext = engine.getPureText( context.getPage() );
+  }
+%>
+</wiki:CheckRequestContext>
+<% if( usertext == null ) usertext = "";  %>
+
+<div style="width:100%"> <%-- Required for IE6 on Windows --%>
+
+<form action="<wiki:CheckRequestContext
+     context='edit'><wiki:EditLink format='url'/></wiki:CheckRequestContext><wiki:CheckRequestContext
+     context='comment'><wiki:CommentLink format='url'/></wiki:CheckRequestContext>"
+       class=""
+          id="editform"
+    onsubmit="return Wiki.submitOnce(this);"
+      method="post" accept-charset="<wiki:ContentEncoding/>"
+     enctype="application/x-www-form-urlencoded" >
+
+  <%-- Edit.jsp relies on these being found.  So be careful, if you make changes. --%>
+  <div class="form-group form-inline">
+  <input type="hidden" name="page" value="<wiki:Variable var='pagename' />" />
+  <input type="hidden" name="action" value="save" />
+  <%=SpamFilter.insertInputFields( pageContext )%>
+  <input type="hidden" name="<%=SpamFilter.getHashFieldName(request)%>" value="<c:out value='${lastchange}' />" />
+  
+  <input class="btn btn-primary" type="submit" name="ok" value="<fmt:message key='editor.plain.save.submit'/>"
+    accesskey="s"
+        title="<fmt:message key='editor.plain.save.title'/>" />
+  <input class="btn btn-primary" type="submit" name="preview" value="<fmt:message key='editor.plain.preview.submit'/>"
+    accesskey="v"
+        title="<fmt:message key='editor.plain.preview.title'/>" />
+  <input class="btn btn-danger pull-right" type="submit" name="cancel" value="<fmt:message key='editor.plain.cancel.submit'/>"
+    accesskey="q"
+        title="<fmt:message key='editor.plain.cancel.title'/>" />
+
+  <%-- This following field is only for the SpamFilter to catch bots which are just randomly filling all fields and submitting.
+       Normal user should never see this field, nor type anything in it. --%>
+  <input class="hidden" type="text" name="<%=SpamFilter.getBotFieldName()%>" id="<%=SpamFilter.getBotFieldName()%>" value="" />
+  <%--TODO
+    <wiki:Permission permission="rename">
+    <tr>
+    <td><label for="renameto"><fmt:message key='editor.renameto'/></label></td>
+    <td><input type="text" name="renameto" value="<wiki:Variable var='pagename' />" size="40" />
+    &nbsp;&nbsp;
+    <input type="checkbox" name="references" checked="checked" />
+    <fmt:message key="info.updatereferrers"/>
+    FIXME</td>
+    </tr>
+    </wiki:Permission>
+  --%>
+
+  <wiki:CheckRequestContext context="edit">
+  <input type="text" size="80" maxlength="80" 
+      class="form-control form-col-50"
+      name="changenote" id="changenote" 
+      placeholder="<fmt:message key='editor.plain.changenote'/>"
+      value="${changenote}"/>
+  </wiki:CheckRequestContext>
+
+  <wiki:CheckRequestContext context="comment">
+	<label><fmt:message key="editor.commentsignature"/></label>
+
+    <input class="form-control form-col-20" type="text" name="author" id="authorname" 
+        placeholder="<fmt:message key='editor.plain.name'/>"
+        value="${author}" />
+        
+    <label for="rememberme">
+        <input type="checkbox" name="remember" id="rememberme" <%=TextUtil.isPositive((String)session.getAttribute("remember")) ? "checked='checked'" : ""%> />
+        <fmt:message key="editor.plain.remember"/>
+    </label>
+
+    <input class="form-control form-col-20" type="text" name="link" id="link" size="24" 
+        placeholder="<fmt:message key='editor.plain.email'/>"
+        value="${link}" />
+
+  </wiki:CheckRequestContext>
+
+  </div>  
+  
+
+  <div id="tools" class="warning">
+      <%--<h4><fmt:message key='editor.plain.toolbar'/></h4>--%>
+      <div id="toolbuttons" class="form-group">
+      <span>
+	  <a href="#" class="tool" rel="" id="tbLink" title="<fmt:message key='editor.plain.tbLink.title'/>">link</a>
+	  <a href="#" class="tool" rel="break" id="tbH1" title="<fmt:message key='editor.plain.tbH1.title'/>">h1</a>
+	  <a href="#" class="tool" rel="break" id="tbH2" title="<fmt:message key='editor.plain.tbH2.title'/>">h2</a>
+	  <a href="#" class="tool" rel="break" id="tbH3" title="<fmt:message key='editor.plain.tbH3.title'/>">h3</a>
+      </span>
+      <span>
+	  <a href="#" class="tool" rel="" id="tbB" title="<fmt:message key='editor.plain.tbB.title'/>">bold</a>
+	  <a href="#" class="tool" rel="" id="tbI" title="<fmt:message key='editor.plain.tbI.title'/>">italic</a>
+	  <a href="#" class="tool" rel="" id="tbMONO" title="<fmt:message key='editor.plain.tbMONO.title'/>">mono</a>
+	  <a href="#" class="tool" rel="" id="tbSUP" title="<fmt:message key='editor.plain.tbSUP.title'/>">sup</a>
+	  <a href="#" class="tool" rel="" id="tbSUB" title="<fmt:message key='editor.plain.tbSUB.title'/>">sub</a>
+	  <a href="#" class="tool" rel="" id="tbSTRIKE" title="<fmt:message key='editor.plain.tbSTRIKE.title'/>">strike</a>
+      </span>
+      <span>
+	  <a href="#" class="tool" rel="" id="tbBR" title="<fmt:message key='editor.plain.tbBR.title'/>">br</a>
+	  <a href="#" class="tool" rel="break" id="tbHR" title="<fmt:message key='editor.plain.tbHR.title'/>">hr</a>
+	  <a href="#" class="tool" rel="break" id="tbPRE" title="<fmt:message key='editor.plain.tbPRE.title'/>">pre</a>
+	  <a href="#" class="tool" rel="break" id="tbCODE" title="<fmt:message key='editor.plain.tbCODE.title'/>">code</a>
+	  <a href="#" class="tool" rel="break" id="tbDL" title="<fmt:message key='editor.plain.tbDL.title'/>">dl</a>
+      </span>
+      <span>
+	  <a href="#" class="tool" rel="break" id="tbTOC" title="<fmt:message key='editor.plain.tbTOC.title'/>">toc</a>
+	  <a href="#" class="tool" rel="break" id="tbTAB" title="<fmt:message key='editor.plain.tbTAB.title'/>">tab</a>
+	  <a href="#" class="tool" rel="break" id="tbTABLE" title="<fmt:message key='editor.plain.tbTABLE.title'/>">table</a>
+	  <a href="#" class="tool" rel="" id="tbIMG" title="<fmt:message key='editor.plain.tbIMG.title'/>">img</a>
+	  <a href="#" class="tool" rel="break" id="tbQUOTE" title="<fmt:message key='editor.plain.tbQUOTE.title'/>">quote</a>
+	  <a href="#" class="tool" rel="break" id="tbSIGN" title="<fmt:message key='editor.plain.tbSIGN.title'/>">sign</a>
+      </span>
+      <span>
+      <a href="#" class="tool" rel="break" id="tbUNDO" title="<fmt:message key='editor.plain.undo.title'/>"><fmt:message key='editor.plain.undo.submit'/></a>
+      </span>
+      <span>
+	  <a href="#" class="tool" rel="break" id="tbREDO" title="<fmt:message key='editor.plain.redo.title'/>"><fmt:message key='editor.plain.redo.submit'/></a>
+      </span>
+	  </div>
+
+	  <div id="toolextra" class="form-group hidden" >
+      <span>
+      <input type="checkbox" name="tabcompletion" id="tabcompletion" <%=TextUtil.isPositive((String)session.getAttribute("tabcompletion")) ? "checked='checked'" : ""%>/>
+      <label for="tabcompletion" title="<fmt:message key='editor.plain.tabcompletion.title'/>"><fmt:message key="editor.plain.tabcompletion"/></label>
+      </span>
+      <span>
+      <input type="checkbox" name="smartpairs" id="smartpairs" <%=TextUtil.isPositive((String)session.getAttribute("smartpairs")) ? "checked='checked'" : ""%>/>
+      <label for="smartpairs" title="<fmt:message key='editor.plain.smartpairs.title'/>"><fmt:message key="editor.plain.smartpairs"/></label>
+      </span>
+	  </div>
+
+	  <div class="form-inline form-group" style="margin-bottom:0;" id="searchbar">
+  		
+        <%--<label for="tbFIND" ><fmt:message key="editor.plain.find"/></label>--%>
+  		<input class="form-control form-col-25" type="text"   name="tbFIND" id="tbFIND" size="16" placeholder="<fmt:message key='editor.plain.find'/>"/>
+		<%--<label for="tbREPLACE" ><fmt:message key="editor.plain.replace"/></label>--%>
+		<input class="form-control form-col-25" type="text"   name="tbREPLACE" id="tbREPLACE" size="16" placeholder="<fmt:message key='editor.plain.replace'/>"/>
+        <input class="btn btn-primary" type="button" name="doreplace" id="doreplace" value="<fmt:message key='editor.plain.find.submit' />" />
+        
+        <div class="btn-group">
+  		<label class="btn btn-default btn-xs" for="tbMatchCASE">
+  		  <input type="checkbox" name="tbMatchCASE" id="tbMatchCASE" />
+  		  <fmt:message key="editor.plain.matchcase"/>
+  		</label>
+  		<label class="btn btn-default btn-xs" for="tbREGEXP" >
+  		  <input type="checkbox" name="tbREGEXP" id="tbREGEXP" />
+  		  <fmt:message key="editor.plain.regexp"/>
+  		</label>
+  		<label  class="btn btn-default btn-xs" for="tbGLOBAL">
+  		  <input type="checkbox" name="tbGLOBAL" id="tbGLOBAL" checked="checked" />
+  		  <fmt:message key="editor.plain.global"/>
+  		</label>
+  		</div>
+	  </div>
+	  
+  </div>
+
+  <textarea class="editor form-group form-control" id="editorarea" name="<%=EditorManager.REQ_EDITEDTEXT%>"         
+            autofocus="autofocus"
+            rows="20" cols="80"><%=TextUtil.replaceEntities(usertext)%></textarea>
+
+</form>
+
+<div class="form-control btn btn-primary" id="sneakpreviewheader">
+  <input type="checkbox" name="autopreview" id="autopreview" <%=TextUtil.isPositive((String)session.getAttribute("autopreview")) ? "checked='checked'" : ""%> />
+  <label for="autopreview" title="<fmt:message key='editor.plain.sneakpreview.title'/>"><fmt:message key="editor.plain.sneakpreview"/></label>
+  <span id="previewSpin" class="spin" style="position:absolute;display:none;"></span>
+</div>
+
+<div id="sneakpreview" class="preview-content"></div>
+
+</div>
\ No newline at end of file

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/preview.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/preview.jsp?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/preview.jsp (added)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/preview.jsp Fri Feb 14 17:24:32 2014
@@ -0,0 +1,76 @@
+<%--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+--%>
+
+<%@ page language="java" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.ui.*" %>
+<%@ page import="org.apache.wiki.util.TextUtil" %>
+<%@ page import="org.apache.wiki.filters.*" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<fmt:setLocale value="${prefs.Language}" />
+<fmt:setBundle basename="templates.default"/>
+<%--
+        This is a special editor component for JSPWiki preview storage.
+--%>
+<%
+   WikiContext context = WikiContext.findContext( pageContext );
+   String usertext = (String)pageContext.getAttribute( EditorManager.ATTR_EDITEDTEXT, PageContext.REQUEST_SCOPE );
+   if( usertext == null ) usertext = "";
+
+   String action = "comment".equals(request.getParameter("action")) ?
+                   context.getURL(WikiContext.COMMENT,context.getName()) :
+                   context.getURL(WikiContext.EDIT,context.getName());
+ %>
+<form action="<%=action%>"
+      method="post" accept-charset="<wiki:ContentEncoding/>"
+       class=""
+          id="editform"
+     enctype="application/x-www-form-urlencoded">
+
+  
+    <%-- Edit.jsp & Comment.jsp rely on these being found.  So be careful, if you make changes. --%>
+    <input type="hidden" name="author" value="${author}" />
+    <input type="hidden" name="link" value="${link}" />
+    <input type="hidden" name="remember" value="${remember}" />
+    <input type="hidden" name="changenote" value="${changenote}" />
+
+    <input type="hidden" name="page" value="<wiki:Variable var='pagename' />" />
+    <input type="hidden" name="action" value="save" />
+    <input type="hidden" name="<%=SpamFilter.getHashFieldName(request)%>"value="${lastchange}" />
+  
+  <textarea class="hidden" readonly="readonly"
+              id="editorarea" name="<%=EditorManager.REQ_EDITEDTEXT%>"
+            rows="4"
+            cols="80"><%=TextUtil.replaceEntities(usertext)%></textarea>
+
+  <div class="form-group">
+    <input class="btn btn-primary" type="submit" name="edit" value="<fmt:message key='editor.preview.edit.submit'/>"
+      accesskey="e"
+          title="<fmt:message key='editor.preview.edit.title'/>" />
+    <input class="btn btn-primary" type="submit" name="ok" value="<fmt:message key='editor.preview.save.submit'/>"
+      accesskey="s"
+          title="<fmt:message key='editor.preview.save.title'/>" />
+    <input class="btn btn-danger pull-right" type="submit" name="cancel" value="<fmt:message key='editor.preview.cancel.submit'/>"
+      accesskey="q"
+          title="<fmt:message key='editor.preview.cancel.title'/>" />
+  </div>
+
+</form>
\ No newline at end of file

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/images/attach-strip.png
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/images/attach-strip.png?rev=1568367&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/images/attach-strip.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/images/form-select-arrow.png
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/images/form-select-arrow.png?rev=1568367&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/images/form-select-arrow.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/images/icon-filter.gif
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/images/icon-filter.gif?rev=1568367&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/images/icon-filter.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/images/icon-search.png
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/images/icon-search.png?rev=1568367&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/images/icon-search.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/images/jspwiki-strip.gif
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/images/jspwiki-strip.gif?rev=1568367&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/images/jspwiki-strip.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp (added)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp Fri Feb 14 17:24:32 2014
@@ -0,0 +1,69 @@
+<%--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.  
+--%>
+
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ page import="org.apache.wiki.*" %>
+<fmt:setBundle basename="templates.default"/>
+<!doctype html>
+<html lang="en">
+  <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="commonheader.jsp"/>--%>
+<script type="text/javascript">//<![CDATA[
+/* Localized javascript strings: LocalizedStrings[] */
+<wiki:IncludeResources type="jslocalizedstrings"/>
+String.I18N = LocalizedStrings;
+String.I18N.PREFIX = "javascript.";
+//]]></script>
+
+  <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>
+
+<%-- FIXME: for now, reuse haddock's stylesheet --%>
+<link rel="stylesheet" media="screen, projection, print" type="text/css"
+     href="<wiki:Link format='url' templatefile='../../templates/haddock/haddock.css'/>"/>
+
+</head>
+
+<body class="context-<wiki:Variable var='requestcontext' />">
+
+<div class="container ${prefs.Orientation}">
+
+  <div class="pagename"><wiki:PageName /></div>
+  <div class="page"><wiki:Include page="PageTab.jsp"/></div>
+  
+</div>
+
+<script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/haddock.js'/>"></script>
+</body>
+</html>
\ No newline at end of file



Mime
View raw message