jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brus...@apache.org
Subject svn commit: r645036 [2/2] - in /incubator/jspwiki/trunk: ./ etc/ etc/i18n/ etc/i18n/templates/ etc/ini/ src/com/ecyrd/jspwiki/ src/com/ecyrd/jspwiki/plugin/ src/com/ecyrd/jspwiki/preferences/ src/com/ecyrd/jspwiki/tags/ src/com/ecyrd/jspwiki/ui/ src/we...
Date Sat, 05 Apr 2008 07:24:55 GMT
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp Sat Apr  5 00:24:43 2008
@@ -2,6 +2,7 @@
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ 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 c = WikiContext.findContext( pageContext );

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp Sat Apr  5 00:24:43 2008
@@ -1,6 +1,7 @@
 <%@ 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.*" %>
+<fmt:setLocale value="${prefs['Language']}" />
 <fmt:setBundle basename="templates.default"/>
 <wiki:TabbedSection >
 

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/DiffContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/DiffContent.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/DiffContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/DiffContent.jsp Sat Apr  5 00:24:43 2008
@@ -1,4 +1,2 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<fmt:setBundle basename="templates.default"/>
 <wiki:Include page="InfoContent.jsp"/>

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/DiffTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/DiffTab.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/DiffTab.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/DiffTab.jsp Sat Apr  5 00:24:43 2008
@@ -5,7 +5,9 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<fmt:setLocale value="${prefs['Language']}" />
 <fmt:setBundle basename="templates.default"/>
+
 <% 
   WikiContext c = WikiContext.findContext( pageContext );  
   List history = c.getEngine().getVersionHistory(c.getPage().getName());

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp Sat Apr  5 00:24:43 2008
@@ -3,6 +3,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setLocale value="${prefs['Language']}" />
 <fmt:setBundle basename="templates.default"/>
 <%
   WikiContext c = WikiContext.findContext( pageContext );

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp Sat Apr  5 00:24:43 2008
@@ -1,6 +1,5 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<fmt:setBundle basename="templates.default"/>
 <%@ page import="java.security.Principal" %>
 <%@ page import="java.util.Arrays" %>
 <%@ page import="com.ecyrd.jspwiki.auth.PrincipalComparator" %>
@@ -9,6 +8,8 @@
 <%@ page import="org.apache.log4j.*" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <%@ page errorPage="/Error.jsp" %>
+<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setBundle basename="templates.default"/>
 <%!
     Logger log = Logger.getLogger("JSPWiki");
 %>

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/EditTemplate.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/EditTemplate.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/EditTemplate.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/EditTemplate.jsp Sat Apr  5 00:24:43 2008
@@ -1,5 +1,6 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<fmt:setLocale value="${prefs['Language']}" />
 <fmt:setBundle basename="templates.default"/>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/Favorites.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/Favorites.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/Favorites.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/Favorites.jsp Sat Apr  5 00:24:43 2008
@@ -1,6 +1,7 @@
 <%@ 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.*" %>
+<fmt:setLocale value="${prefs['Language']}" />
 <fmt:setBundle basename="templates.default"/>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 
@@ -8,6 +9,67 @@
 
   <wiki:Include page="UserBox.jsp" />
   
+  <div id="hiddenmorepopup">
+  <ul id="morepopup">
+     <wiki:CheckRequestContext context='view|info|diff|upload'>
+     <wiki:PageExists>  	
+     <wiki:Permission permission="comment">
+       <wiki:PageType type="page">
+         <li><a class="action comment" 
+                 href="<wiki:CommentLink format='url' />" 
+                title="<fmt:message key='actions.comment.title' />"><fmt:message key="actions.comment" />
+		 </a></li>
+       </wiki:PageType>
+       <wiki:PageType type="attachment">
+         <li><a class="action comment" 
+                 href="<wiki:BaseURL/>Comment.jsp?page=<wiki:ParentPageName />"
+                title="<fmt:message key='actions.comment.title' />"><fmt:message key="actions.comment" />
+	     </a></li>
+       </wiki:PageType>
+     </wiki:Permission>
+     </wiki:PageExists>  
+     </wiki:CheckRequestContext>
+    
+     <wiki:PageExists>  
+     <wiki:CheckRequestContext context='view|info|diff|upload|edit|comment|preview' >
+       <li>
+       <wiki:CheckVersion mode="latest">
+       <a class="action rawpage wikipage" 
+               href="<wiki:Link format='url'><wiki:Param name='skin' value='raw'/></wiki:Link>"
+              title="<fmt:message key='actions.rawpage.title' />"><fmt:message key='actions.rawpage' />
+       </a>
+       </wiki:CheckVersion>
+       <wiki:CheckVersion mode="notlatest">
+       <a class="action rawpage wikipage" 
+               href="<wiki:Link format='url' version='${param.version}'><wiki:Param name='skin' value='raw'/></wiki:Link>"
+              title="<fmt:message key='actions.rawpage.title' />"><fmt:message key='actions.rawpage' />
+       </a>
+       </wiki:CheckVersion>
+       </li>
+      </wiki:CheckRequestContext>
+      </wiki:PageExists>  
+  
+      <wiki:CheckRequestContext context='!workflow'>
+      <wiki:UserCheck status="authenticated">
+        <li><a class="action workflow" 
+                href="<wiki:Link jsp='Workflow.jsp' format='url' />" 
+               title="<fmt:message key='actions.workflow.title' />"><fmt:message key='actions.workflow' />
+        </a></li>
+      </wiki:UserCheck>
+      </wiki:CheckRequestContext>
+
+      <wiki:Permission permission="createGroups">
+        <li><a class="action creategroup" 
+                href="<wiki:Link jsp='NewGroup.jsp' format='url' />" 
+               title="<fmt:message key='actions.creategroup.title' />"><fmt:message key='actions.creategroup' />
+        </a></li>
+      </wiki:Permission>
+	  <li class='separator'>
+        <div id="moremenu" ><wiki:InsertPage page="MoreMenu" /></div>
+      </li>
+  </ul>
+  </div>
+  
   <wiki:CheckRequestContext context='!login'>
 
   <wiki:UserCheck status="known">
@@ -19,7 +81,7 @@
 %% }]
   </wiki:Translate>
   </wiki:UserCheck>
-  
+
   <%-- LeftMenu is automatically generated from a Wiki page called "LeftMenu" --%>
   <div class="leftmenu">
     <wiki:InsertPage page="LeftMenu" />

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp Sat Apr  5 00:24:43 2008
@@ -7,7 +7,9 @@
 <%@ 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"/>
+
 <wiki:TabbedSection>
 <wiki:Tab id="findcontent" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "find.tab")%>' accesskey="s">
 

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp Sat Apr  5 00:24:43 2008
@@ -2,6 +2,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setLocale value="${prefs['Language']}" />
 <fmt:setBundle basename="templates.default"/>
 <%
   WikiContext c = WikiContext.findContext(pageContext);

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp Sat Apr  5 00:24:43 2008
@@ -9,6 +9,7 @@
 <%@ page import="org.apache.log4j.*" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setLocale value="${prefs['Language']}" />
 <fmt:setBundle basename="templates.default"/>
 <%!
   Logger log = Logger.getLogger("JSPWiki");

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp Sat Apr  5 00:24:43 2008
@@ -11,6 +11,7 @@
 <%@ page errorPage="/Error.jsp" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<fmt:setLocale value="${prefs['Language']}" />
 <fmt:setBundle basename="templates.default"/>
 <%!
   String printWikiGroupPutGroup( Group group, String name, boolean cursor, PageContext pageContext)
@@ -135,8 +136,7 @@
   String groupname = request.getParameter( "group" );
 %>
  
-<script type="text/javascript">
-//<![CDATA[
+<script type="text/javascript">//<![CDATA[
 <%
   WikiContext c = WikiContext.findContext( pageContext );
   Principal[] roles = c.getWikiSession().getRoles();
@@ -152,8 +152,7 @@
     }
   }
 %>
-//]]>
-</script>
+//]]></script>
 
 <%--
 WikiGroup.putGroup( "Group1qsdf qsdf qsdf qsdf qsdffsdfq en nog een beetje langer he", "Member1\nMember2\nMember3\nMember4\nMember5\nMember6", "createdon", "createdby", "changedon", "changedby" );

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp Sat Apr  5 00:24:43 2008
@@ -1,6 +1,7 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
+<fmt:setLocale value="${prefs['Language']}" />
 <fmt:setBundle basename="templates.default"/>
 <%
   WikiContext c = WikiContext.findContext(pageContext);

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp Sat Apr  5 00:24:43 2008
@@ -7,6 +7,7 @@
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <%@ 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"/>
 <%
   WikiContext c = WikiContext.findContext(pageContext);
@@ -75,11 +76,10 @@
              <wiki:Param name='page' value='<%=wikiPage.getName()%>'/>
              <wiki:Param name='mode' value='wiki'/>
            </wiki:Link>"
+    class="feed"
     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>
+           </fmt:message>" >&nbsp;</a>
   </p>
 
   <wiki:CheckVersion mode="notfirst">

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp Sat Apr  5 00:24:43 2008
@@ -6,6 +6,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setLocale value="${prefs['Language']}" />
 <fmt:setBundle basename="templates.default"/>
 <%
     String postURL = "";

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp Sat Apr  5 00:24:43 2008
@@ -9,6 +9,7 @@
 <%@ page errorPage="/Error.jsp" %>
 <%@ 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"/>
 <%
   // Extract the group name and members

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp Sat Apr  5 00:24:43 2008
@@ -2,6 +2,7 @@
 <%@ 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" %>
+<fmt:setLocale value="${prefs['Language']}" />
 <fmt:setBundle basename="templates.default"/>
 <%
   WikiContext c = WikiContext.findContext(pageContext);
@@ -34,11 +35,10 @@
                <wiki:Param name='page' value='<%=wikipage.getName()%>'/>
                <wiki:Param name='mode' value='wiki'/>
              </wiki:Link>"
+      class="feed"
       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>
+             </fmt:message>" >&nbsp;</a>
   
   </wiki:PageExists>
 

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp Sat Apr  5 00:24:43 2008
@@ -2,17 +2,12 @@
 <%@ 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" %>
+<fmt:setLocale value="${prefs['Language']}" />
 <fmt:setBundle basename="templates.default"/>
-<%
-  //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:CheckRequestContext context='view|info|diff|upload'>
     <wiki:Permission permission="edit">
 	<li>
         <wiki:PageType type="page">
@@ -25,66 +20,19 @@
         </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 context='edit|comment'>
+    <%-- converted to popup menu by jspwiki-edit.js--%>
+    <li id="sectiontoc">
+      <a href="#" class="action sectiontoc"><fmt:message key="edit.sections"/></a>
+    </li>
     </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>
+    <%-- converted to popup menu by jspwiki-common.js--%>
+    <li id="morebutton">
+      <a href="<wiki:Link format='url' page='MoreMenu' />" class="action more"><fmt:message key="actions.more"/></a>
+    </li>
 
-  </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>

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp Sat Apr  5 00:24:43 2008
@@ -3,6 +3,7 @@
 <%@ page import="com.ecyrd.jspwiki.attachment.*" %>
 <%@ 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 c = WikiContext.findContext( pageContext );

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/PageTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PageTab.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PageTab.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PageTab.jsp Sat Apr  5 00:24:43 2008
@@ -2,6 +2,7 @@
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %><%--CHECK why is this needed --%>
+<fmt:setLocale value="${prefs['Language']}" />
 <fmt:setBundle basename="templates.default"/>
 <%
 	WikiContext c = WikiContext.findContext( pageContext );

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp Sat Apr  5 00:24:43 2008
@@ -3,9 +3,10 @@
 <%@ page import="com.ecyrd.jspwiki.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 ); 
+  WikiContext context = WikiContext.findContext( pageContext ); 
   TemplateManager.addResourceRequest( context, "script", "scripts/jspwiki-prefs.js" );
 %>
 

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp Sat Apr  5 00:24:43 2008
@@ -1,22 +1,29 @@
 <%@ page errorPage="/Error.jsp" %>
 <%@ page import="java.util.*" %>
+<%@ page import="java.lang.*" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
+<%@ page import="java.io.*" %>
+<%@ page import="java.util.jar.*" %>
+
 <%@ page import="com.ecyrd.jspwiki.ui.*" %>
 <%@ page import="com.ecyrd.jspwiki.preferences.*" %>
 <%@ taglib uri="/WEB-INF/jspwiki.tld" 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"/>
 <%
-  /* see commonheader.jsp */
-  String prefDateFormat = Preferences.getPreference(pageContext,"DateFormat");
-  String prefTimeZone   = Preferences.getPreference(pageContext,"TimeZone");
-
+  //FIXME: this should better move to UserPreferences.jsp but that doesn't seem to work. Ugh ?
   WikiContext c = WikiContext.findContext( pageContext );
-  pageContext.setAttribute( "skins", c.getEngine().getTemplateManager().listSkins(pageContext, c.getTemplate() ) );
+  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) );
 %>
-
 <h3><fmt:message key="prefs.heading"><fmt:param><wiki:Variable var="applicationname"/></fmt:param></fmt:message></h3>
 
 <c:if test="${param.tab eq 'prefs'}" >
@@ -69,6 +76,7 @@
   </select>
   </td>
   </tr>
+
   
   <tr>
   <td><label for="prefSkin"><fmt:message key="prefs.user.skin"/></label></td>
@@ -81,149 +89,59 @@
   </td>
   </tr>
 
+
+  <c:if test='${not empty languages}'>
+  <c:set var="prefLanguage" ><c:out value="${prefs.Language}" default="<%=request.getLocale().toString()%>" /></c:set>
   <tr>
-  <td><label for="prefOrientation"><fmt:message key="prefs.user.orientation"/></label></td>
+  <td><label for="prefLanguage"><fmt:message key="prefs.user.language"/></label></td>
   <td>
-  <select id="prefOrientation" name="prefOrientation" onchange="Wiki.changeOrientation();">
-      <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>
-      <%--
-      <option value='fav-hidden' <c:if test='${"fav-hidden" == prefs["orientation"]}'>selected="selected"</c:if> ><fmt:message key="prefs.user.fav-hide"/></option>
-      --%>
+  <select id="prefLanguage" name="prefLanguage">
+    <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>
   </td>
   </tr>
+  </c:if>
 
   <tr>
-  <td><label for="prefTimeFormat"><fmt:message key="prefs.user.timeformat"/></label></td>
+  <td><label for="prefOrientation"><fmt:message key="prefs.user.orientation"/></label></td>
   <td>
-  <select id="prefTimeFormat" name="prefTimeFormat" >
-    <%
-      Properties props = c.getEngine().getWikiProperties();
-      ArrayList tfArr = new ArrayList(40);
-
-     /* filter timeformat props */
-      for( Enumeration e = props.propertyNames(); e.hasMoreElements(); )
-      {
-          String name = (String) e.nextElement();
-          if( name.startsWith( "jspwiki.defaultprefs.timeformat." ) )
-          {
-			 tfArr.add(name);
-          }
-      }
-
-      /* fetch actual formats */
-      if( tfArr.size() == 0 )
-      {
-          tfArr.add( "dd-MMM-yy" );
-          tfArr.add( "d-MMM-yyyy" );
-          tfArr.add( "EEE, dd-MMM-yyyy, zzzz" );
-      } else {
-          Collections.sort( tfArr );
-          for( int i=0; i < tfArr.size(); i++ )
-          {
-            tfArr.set(i, props.getProperty( (String)tfArr.get(i) ) );
-          }
-      }
-
-      Date d = new Date() ;  // Now.
-
-      for( int i=0; i < tfArr.size(); i++ )
-      {
-        String f = (String)tfArr.get(i);
-        String selected = ( prefDateFormat.equals( f ) ? " selected='selected'" : "" ) ;
-        try
-        {
-          java.text.SimpleDateFormat fmt = new java.text.SimpleDateFormat( f );
-          java.util.TimeZone tz = java.util.TimeZone.getDefault();
-          try 
-          {
-            tz.setRawOffset( Integer.parseInt( prefTimeZone ) );
-          }
-          catch( Exception e) { /* dont care */ } ;
-          fmt.setTimeZone( tz );
-    %>
-          <option value="<%= f %>" <%= selected%> ><%= fmt.format(d) %></option>
-   <%
-        }
-        catch( IllegalArgumentException e ) { } // skip parameter
-      }
-    %>
+  <select id="prefOrientation" name="prefOrientation" onclick="Wiki.changeOrientation();">
+      <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>
   </td>
   </tr>
 
   <tr>
-  <td><label for="prefTimeZone"><fmt:message key="prefs.user.timezone"/></label></td>
+  <td><label for="prefTimeFormat"><fmt:message key="prefs.user.timeformat"/></label></td>
   <td>
-  <select id='prefTimeZone' name='prefTimeZone' class='select'>
-    <% 
-       String[][] tzs = 
-       { { "-43200000" , "(UTC-12) Enitwetok, Kwajalien" }
-       , { "-39600000" , "(UTC-11) Nome, Midway Island, Samoa" }
-       , { "-36000000" , "(UTC-10) Hawaii" }
-       , { "-32400000" , "(UTC-9) Alaska" }
-       , { "-28800000" , "(UTC-8) Pacific Time" }
-       , { "-25200000" , "(UTC-7) Mountain Time" }
-       , { "-21600000" , "(UTC-6) Central Time, Mexico City" }
-       , { "-18000000" , "(UTC-5) Eastern Time, Bogota, Lima, Quito" }
-       , { "-14400000" , "(UTC-4) Atlantic Time, Caracas, La Paz" }
-       , { "-12600000" , "(UTC-3:30) Newfoundland" }
-       , { "-10800000" , "(UTC-3) Brazil, Buenos Aires, Georgetown, Falkland Is." }
-       , {  "-7200000" , "(UTC-2) Mid-Atlantic, Ascention Is., St Helena" }
-       , {  "-3600000" , "(UTC-1) Azores, Cape Verde Islands" }
-       , {         "0" , "(UTC) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia" }
-       , {   "3600000" , "(UTC+1) Berlin, Brussels, Copenhagen, Madrid, Paris, Rome" }
-       , {   "7200000" , "(UTC+2) Helsinki, Athens, Kaliningrad, South Africa, Warsaw" }
-       , {  "10800000" , "(UTC+3) Baghdad, Riyadh, Moscow, Nairobi" }
-       , {  "12600000" , "(UTC+3.30) Tehran" }
-       , {  "14400000" , "(UTC+4) Adu Dhabi, Baku, Muscat, Tbilisi" }
-       , {  "16200000" , "(UTC+4:30) Kabul" }
-       , {  "18000000" , "(UTC+5) Islamabad, Karachi, Tashkent" }
-       , {  "19800000" , "(UTC+5:30) Bombay, Calcutta, Madras, New Delhi" }
-       , {  "21600000" , "(UTC+6) Almaty, Colomba, Dhakra" }
-       , {  "25200000" , "(UTC+7) Bangkok, Hanoi, Jakarta" }
-       , {  "28800000" , "(UTC+8) Beijing, Hong Kong, Perth, Singapore, Taipei" }
-       , {  "32400000" , "(UTC+9) Osaka, Sapporo, Seoul, Tokyo, Yakutsk" }
-       , {  "34200000" , "(UTC+9:30) Adelaide, Darwin" }
-       , {  "36000000" , "(UTC+10) Melbourne, Papua New Guinea, Sydney, Vladivostok" }
-       , {  "39600000" , "(UTC+11) Magadan, New Caledonia, Solomon Islands" }
-       , {  "43200000" , "(UTC+12) Auckland, Wellington, Fiji, Marshall Island" }
-       };
-       String servertz = Integer.toString( java.util.TimeZone.getDefault().getRawOffset() ) ;
-       String selectedtz = servertz;
-       for( int i=0; i < tzs.length; i++ )
-       {
-         if( prefTimeZone.equals( tzs[i][0] ) ) selectedtz = prefTimeZone;
-       }
-       for( int i=0; i < tzs.length; i++ )
-       {
-         String selected = ( selectedtz.equals( tzs[i][0] ) ? " selected='selected'" : "" ) ;
-         String server = ( servertz.equals( tzs[i][0] ) ? " [SERVER]" : "" ) ;
-    %>
-        <option value="<%= tzs[i][0] %>" <%= selected%> ><%= tzs[i][1]+server %></option>
-   <%
-       }
-    %>    
+  <select id="prefTimeFormat" name="prefTimeFormat" >
+    <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>
   </td>
   </tr>
 
-  <%-- user browser language only ;  why not allow to choose from all installed server languages on jspwiki ??   
   <tr>
-  <td><label for="prefLanguage">Select Language</label></td>
+  <td><label for="prefTimeZone"><fmt:message key="prefs.user.timezone"/></label></td>
   <td>
-  <select id="prefLanguage" name="prefLanguage" >
-    <option value="">English</option>
+  <select id='prefTimeZone' name='prefTimeZone'>
+    <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>
   </td>
   </tr>
-  
+
+  <%--
   <tr>
   <td><label for="prefShowQuickLinks">Show Quick Links</label></td>
   <td>
   <input class='checkbox' type='checkbox' id='prefShowQuickLinks' name='prefShowQuickLinks' 
-         <%= (prefShowQuickLinks.equals("yes") ? "checked='checked'" : "") %> />
+         <c:if test='${"on" == prefs["SectionEdit"]}'>selected="selected"</c:if> />
          <span class="quicklinks"><span 
                class='quick2Top'><a href='#wikibody' title='Go to Top' >&laquo;</a></span><span 
                class='quick2Prev'><a href='#' title='Go to Previous Section'>&lsaquo;</a></span><span 

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp Sat Apr  5 00:24:43 2008
@@ -2,7 +2,9 @@
 <%@ page import="com.ecyrd.jspwiki.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. --%>
 <wiki:TabbedSection>
 <wiki:Tab id="previewcontent" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "preview.tab")%>'>

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/ProfileTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/ProfileTab.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/ProfileTab.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/ProfileTab.jsp Sat Apr  5 00:24:43 2008
@@ -6,6 +6,7 @@
 <%@ 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 */

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/SearchBox.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/SearchBox.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/SearchBox.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/SearchBox.jsp Sat Apr  5 00:24:43 2008
@@ -1,5 +1,6 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" 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 --%>
@@ -14,7 +15,7 @@
            type="text" value="<fmt:message key='sbox.search.submit'/>"
            name="query" id="query"
            size="20" 
-      accesskey="f"></input>
+      accesskey="f" />
   <button type="submit"
   		 name="searchSubmit" id="searchSubmit"
   		value="<fmt:message key='find.submit.go'/>"

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp Sat Apr  5 00:24:43 2008
@@ -2,6 +2,7 @@
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ 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 c = WikiContext.findContext( pageContext );

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp Sat Apr  5 00:24:43 2008
@@ -1,8 +1,9 @@
 <%@ 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.*" %>
-<fmt:setBundle basename="templates.default"/>
 <%@ page import="com.ecyrd.jspwiki.*" %>
+<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setBundle basename="templates.default"/>
 <%
   WikiContext c = WikiContext.findContext(pageContext);
 %>

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/ViewTemplate.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/ViewTemplate.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/ViewTemplate.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/ViewTemplate.jsp Sat Apr  5 00:24:43 2008
@@ -1,5 +1,6 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ page import="com.ecyrd.jspwiki.*" %>
 <fmt:setBundle basename="templates.default"/>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
@@ -26,8 +27,8 @@
 
 <body class="view">
 
-<div id="wikibody" class="${prefs['orientation']}">
-
+<div id="wikibody" class="${prefs.Orientation}">
+ 
   <wiki:Include page="Header.jsp" />
 
   <div id="content">

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp Sat Apr  5 00:24:43 2008
@@ -4,6 +4,7 @@
 <%@ 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) 

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/admin/UserManagement.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/admin/UserManagement.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/admin/UserManagement.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/admin/UserManagement.jsp Sat Apr  5 00:24:43 2008
@@ -6,6 +6,7 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" 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)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp Sat Apr  5 00:24:43 2008
@@ -6,6 +6,7 @@
 <%@ 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.
@@ -21,10 +22,18 @@
 <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'/>" />
+<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" />
 
+<%-- display the more-menu inside the leftmenu, when javascript is not avail --%>
+<noscript>
+<style type="text/css">
+#hiddenmorepopup { display:block; }
+</style>
+</noscript>
+
 <%-- 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>
@@ -36,26 +45,18 @@
    Preferences.setupPreferences(pageContext);
  %>
 
-<script type="text/javascript">
-//<![CDATA[
+<meta name="wikiBaseUrl" content='<wiki:BaseURL />' />
+<meta name="wikiPageUrl" content='<wiki:Link format="url" absolute="true" page="#$%"/>' />
+<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=""/>' />
 
+<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' : '<%=  WikiContext.findContext(pageContext).getURL( WikiContext.NONE, "JSON-RPC" ) %>'
-	});
 <wiki:IncludeResources type="jsfunction"/>
-
-//]]>
-</script>
+//]]></script>
 
 <meta http-equiv="Content-Type" content="text/html; charset=<wiki:ContentEncoding />" />
 <link rel="search" href="<wiki:LinkTo format='url' page='FindPage'/>"
@@ -72,7 +73,7 @@
     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'/>" />
+<link rel="shortcut icon" type="image/x-icon" href="<wiki:Link format='url' jsp='images/favicon.ico'/>" />
 
 <wiki:FeedDiscovery />
 

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp Sat Apr  5 00:24:43 2008
@@ -9,6 +9,7 @@
 <%@ page import="org.apache.commons.lang.*" %>
 <%@ 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 provides the FCK editor for JSPWiki.

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/editors/WikiWizard.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/editors/WikiWizard.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/editors/WikiWizard.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/editors/WikiWizard.jsp Sat Apr  5 00:24:43 2008
@@ -10,6 +10,7 @@
 <%@ page import="org.apache.commons.lang.*" %>
 <%@ 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 provides the WikiWizard editor for JSPWiki.

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp Sat Apr  5 00:24:43 2008
@@ -8,6 +8,7 @@
 <%@ page import="com.ecyrd.jspwiki.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.
@@ -15,12 +16,11 @@
 <% 
    WikiContext context = WikiContext.findContext( pageContext ); 
    WikiEngine engine = context.getEngine();
-   JSONRPCManager.requestJSON( context );  //FIXME: to be replace by standard mootools lib
    
    String contextPath = request.getContextPath();
 
-  TemplateManager.addResourceRequest( context, "script",  contextPath + "/scripts/jspwiki-edit.js" );
-  TemplateManager.addResourceRequest( context, "script",  contextPath + "/scripts/posteditor.js" );
+   TemplateManager.addResourceRequest( context, "script",  contextPath + "/scripts/jspwiki-edit.js" );
+   TemplateManager.addResourceRequest( context, "script",  contextPath + "/scripts/posteditor.js" );
    String usertext = EditorManager.getEditedText( pageContext );
 %>
 <wiki:CheckRequestContext context="edit">
@@ -82,9 +82,6 @@
   <div>
   <textarea id="editorarea" name="<%=EditorManager.REQ_EDITEDTEXT%>" 
          class="editor" 
-       onkeyup="getSuggestions(this.id)"
-       onclick="setCursorPos(this.id)" 
-      onchange="setCursorPos(this.id)"
           rows="20" cols="80"><%=TextUtil.replaceEntities(usertext)%></textarea>
   </div>
   <%-- This following field is only for the SpamFilter to catch bots which are just randomly filling all fields and submitting.

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp Sat Apr  5 00:24:43 2008
@@ -5,6 +5,7 @@
 <%@ page import="com.ecyrd.jspwiki.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.

Added: incubator/jspwiki/trunk/src/webdocs/templates/default/images/arrleft.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/images/arrleft.gif?rev=645036&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/images/arrleft.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/jspwiki/trunk/src/webdocs/templates/default/images/arrright.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/images/arrright.gif?rev=645036&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/images/arrright.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css Sat Apr  5 00:24:43 2008
@@ -53,7 +53,7 @@
 }
 #favorites {
 	float:left;
-	margin-top:2em;
+	margin-top:1.75em;
 	width:18%;
 }
 #favorites .userbox {
@@ -68,19 +68,19 @@
 #footer .copyright { 
 }
 #content { 
-	margin-top:1em;
+	margin:1em 0;
 }
-#wikibody.fav-left #page, #wikibody.fav-right #favorites {
+/*#wikibody.fav-left*/ #page, #wikibody.fav-right #favorites {
 	float:right;
 }
-#wikibody.fav-right #page, #wikibody.fav-left #favorites {
+#wikibody.fav-right #page, /*#wikibody.fav-left*/ #favorites {
 	float:left;
 }
 /*ie6 hack*/
-* html #wikibody.fav-left #page, * html #wikibody.fav-right #favorites {
+* html /*#wikibody.fav-left*/ #page, * html #wikibody.fav-right #favorites {
 	margin-left:-3px; /*Three Pixel Text Jog*/
 }
-* html #wikibody.fav-right #page, * html #wikibody.fav-left #favorites {
+* html #wikibody.fav-right #page, * html /*#wikibody.fav-left*/ #favorites {
 	margin-right:-3px;/*Three Pixel Text Jog*/
 }
 #wikibody.fav-right #header, #wikibody.fav-right #footer {
@@ -93,6 +93,10 @@
 #page { 
 	width:80%;
 }
+#wikibody.fav-slide #page {
+	width:100%;
+}
+
 #actionsTop	{ 
 	float:right;
 	z-index:10;
@@ -168,9 +172,30 @@
 }
 h2, h3, h4 {
 	clear:both;
-	margin:1em 0;
+	margin:1em 0 0.5em 0;
+	padding:0.25em 0;
 	line-height:1.2;
 }
+h2 { font-size: 150%; }
+h2 .editsection { font-size: 67%; }
+h3 { font-size: 132%; }
+h3 .editsection { font-size: 76%; }
+h4 { font-size: 116%; }
+h4 .editsection { font-size: 86%; }
+.editsection {
+	padding-left:1em;
+	font-weight:normal;
+	line-height:1.2;
+}
+.editsection a {
+	padding:0.25em;
+	text-decoration:none;
+	color:grey;
+}
+.editsection a:hover {
+	background:#eee;
+	color:blue;
+}
 b, i {
 	color:inherit;
 }
@@ -276,10 +301,13 @@
 a.interwiki {
 }
 a.feed {
-	background-image:url(images/xml.png);
+	background-image:url(../../images/jspwiki-icons.png);
 	background-repeat:no-repeat;
-	background-position:left;
-	padding:4px 0 0 20px;
+	background-position:0 0;
+	padding-left:14px;
+	font-size:14px;
+	text-decoration:none;
+	overflow:hidden;
 }
 
 
@@ -579,11 +607,21 @@
 	float:right;
 	margin:0 0 0 0.5em;
 }
-#editorarea {
+
+.editor {
 	font:110% Monaco, "Courier New", Courier, monospace;
 	padding:4px;
 	width:100%;
 }
+.edittoc {
+	background:yellow;
+	overflow:auto;
+	width:18%;
+	height:100%;
+	float:right;
+	margin-top:2.5em;
+}
+
 /* ie6 hack ensure moremenu remains properly alighned */
 * html #editorarea {
 	padding:4px 0;
@@ -606,8 +644,8 @@
 	background:white;
 	border:2px solid #ddd;
 	z-index:10;
-	opacity:0.85;
 	font-size:85%;
+	overflow:hidden;
 }
 #findSuggestionMenu ul {
 	list-style:none;
@@ -616,9 +654,73 @@
 }
 #findSuggestionMenu li { 
 	padding:0.25em;
+	cursor:pointer;
+}
+#findSuggestionMenu li:hover {
+	background:#eee;
 }
 
 /* +++ 440 Favorites +++ */
+#collapseFavs {
+	position:absolute; 
+	margin-left:-1px; /* compensate border of .tabs */
+	left:-0.5em; 
+	top:-1px; /* compensate border of .tabs */
+	width:0.5em;
+	height:100%;
+	background:#f9f9f9;
+	border-top:1px solid #f9f9f9;
+	border-bottom:1px solid #f9f9f9;
+	cursor:pointer;
+}
+#wikibody.fav-right #collapseFavs {
+	left:auto;
+	right:-0.5em;
+	margin-left:0;
+	margin-right:-1px;
+}
+#collapseFavs.hover {
+	background:#eee;
+	border-color:#eee;
+}
+#collapseFavsWrapper {
+	position:absolute;
+	padding-right:1em;
+	left:0.5em;
+	top:-2em;
+	cursor:auto;
+	overflow:hidden;
+}
+#wikibody.fav-right #collapseFavsWrapper {
+	left:auto;
+	right:0.5em;
+	padding-right:0;
+	padding-left:1em;
+}
+#collapseFavsWrapper #favorites {
+	background:white;
+	border:0.5em solid #eee;
+	border-left:none;
+}
+#wikibody.fav-right #collapseFavsWrapper #favorites {
+	border-right:none;
+	border-left:0.5em solid #eee;
+}
+#collapseFavsPointer {
+	position:absolute;
+	width:4px;
+	height:12px;
+	background:url(images/arrleft.gif) top left no-repeat;
+	margin-left:-15px;
+	z-index:5;
+}
+#wikibody.fav-right #collapseFavsPointer{
+	margin-left:15px;
+}
+.fav-slide #collapseFavsPointer {
+	background-image:url(images/arrright.gif);
+}
+
 .userbox {
 	overflow:hidden;
 	padding:0.5em 0;
@@ -684,8 +786,7 @@
 
 /* +++ 455 Footer +++ */
 .copyright {
-	margin:1em 0;
-	padding:0.25em;
+	padding:1em 0.25em;
 	font-size:90%;
 	text-align:center;
 	color:#555;
@@ -763,7 +864,6 @@
 .pageactions li ul li.separator { 
 	border-top:2px solid #ddd;
 }
-
 /* undo settings for nested information! */
 .pageactions li ul li ul {
 	position:static;
@@ -773,41 +873,44 @@
 .pageactions li ul li ul li {
 /* nothing to undo ?? */
 }
-#moremenu {
-	line-height:1.5;
-	padding:0.25em 0.5em;
+#hiddenmorepopup {
+	display:none;
+	border:1px solid #ddd;
 }
-#morebutton ul a.action {
+#hiddenmorepopup ul {
+	list-style:none;
+	margin:0;
+	padding:0;
+
+}
+#sectiontoc ul a,
+#morebutton ul a {
 	padding:0.25em 0.5em;
 	text-decoration:none;
+	cursor:pointer;
+}
+#sectiontoc .cursor {
 }
 .pageactions a.action {
 	display:block;
 }
-#moremenu a:hover, a.action:hover, 
+#morebutton a:hover, a.action:hover, #sectiontoc a:hover
 .userbox a.action:hover, a.action.quick2bottom:hover, a.action.quick2top:hover {
 	background-color:#eee !important;
 }
 
 a.action.view,
-a.action.edit,
 a.action.comment,
 a.action.prefs,
 a.action.attach,
 a.action.info,
-a.action.index,
-a.action.more,
-a.action.recentChanges,
-a.action.systeminfo,
 a.action.viewgroup,
-a.action.editgroup,
-a.action.deletegroup,
 a.action.creategroup,
 a.action.workflow,
 a.action.login,
 a.action.logout {
 }
-#searchTools a.action, .userbox a.action, a.action.edit, a.action.more {
+#searchTools a.action, .userbox a.action, a.action.edit, a.action.more, a.action.sectiontoc {
 	padding:0.25em 0.5em;
 	text-decoration:none;
 	line-height:normal;
@@ -815,11 +918,11 @@
 	background:#f9f9f9;
 	white-space:nowrap;
 }
-a.action.edit, a.action.more {
+a.action.edit, a.action.more, a.action.sectiontoc {
 	margin-left:4px;
 	border-bottom:none;
 }
-a.action.more {
+a.action.more, a.action.sectiontoc {
 	padding-right:1.5em;
 	background: #f9f9f9 url(images/arrdownsmall.gif) 95% center no-repeat;
 }
@@ -851,7 +954,6 @@
 	width:100%;
 	overflow-x:auto;
 }
- 
 
 /* +++ 475 PreviewContent - "This is a preview" comment +++ */
 #previewcontent {
@@ -1135,7 +1237,7 @@
 	clear:both;
 }
 
-/* IE only:add 2px to fit size of '.tabmenu a' */
+/* IE only */
 * html .tabmenu {
 	border:1px solid white;
 }
@@ -1255,6 +1357,9 @@
 	padding:4px 8px 8px;
 	background:url(images/tip.png) bottom right;
 }
+.tip-tip a {
+	color: white !important;
+}
 
 
 /* +++ 920 Collapsible lists +++ */
@@ -1299,7 +1404,6 @@
 .collapsebox {
     clear:right; /* avoid clash with intern floated bullet */
 	border:1px solid #ddd;
-	position:relative;
 	margin:0 0 0.5em 0;
 }  
 .collapsetitle {
@@ -1493,4 +1597,35 @@
   .tag {color: #006; font-weight: bold; }
   .atn {color: #404; }
   .atv {color: #060; }
+}
+
+
+
+div.coverflow {
+	background-color:#000;
+	color:#fff;
+	visibility:hidden;
+	position:relative;
+	overflow:hidden;
+}
+div.coverflow * {
+	margin:0;
+	padding:0;
+}
+div.coverflow .imgcontainer {
+	position:relative;
+}
+div.coverflow img {
+	position:absolute;
+	border:none;
+}
+div.coverflow .slider {
+	position:relative;
+	border:1px solid #bbb;
+	z-index:10001;
+}
+div.coverflow .knob {
+	background:#fff;
+	width:100px;
+	height:15px;
 }

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki_print.css
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki_print.css?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki_print.css (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki_print.css Sat Apr  5 00:24:43 2008
@@ -6,6 +6,7 @@
 .searchbox, .breadcrumbs, .pageactions, .quicklinks,
 #actionsTop, #actionsBottom, #favorites,
 #addattachment, #findhelp,
+.editsection,
 .collapsebox .collapseOpen, .collapsebox .collapseClose, 
 .table-filter .filterrow, 
 .tabmenu { 

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/skins/PlainVanilla 1024x768/skin.css
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/skins/PlainVanilla%201024x768/skin.css?rev=645036&r1=645035&r2=645036&view=diff
==============================================================================
Binary files - no diff available.

Added: incubator/jspwiki/trunk/tests/lib/yuicompressor-2.3.3.jar
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/lib/yuicompressor-2.3.3.jar?rev=645036&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/jspwiki/trunk/tests/lib/yuicompressor-2.3.3.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message