You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by br...@apache.org on 2009/09/26 15:25:24 UTC
svn commit: r819136 - in /incubator/jspwiki/trunk: ./
src/WebContent/templates/default/ src/WebContent/templates/default/editors/
src/java/org/apache/wiki/ src/java/org/apache/wiki/preferences/
src/java/org/apache/wiki/ui/
Author: brushed
Date: Sat Sep 26 13:25:23 2009
New Revision: 819136
URL: http://svn.apache.org/viewvc?rev=819136&view=rev
Log:
v3.0.0-svn-158 - upgrade mootools library :
* JSPWIKI-600: javascript error on getCoordinates()
* Added unit test on Javascript, based on Jasmine
* The print css stylesheet is now included in the standard jspwiki.css
* Several tweaks on AttachementInfoTab.jsp and AttachmentTab.jsp.
* Few small tweaks on Preferences and EditorManager related to UserPreferences.
Removed:
incubator/jspwiki/trunk/src/WebContent/templates/default/jspwiki_print.css
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/WebContent/templates/default/AttachmentInfoTab.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/AttachmentTab.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/DefaultLayout.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/PageInfoTab.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/PreferencesTab.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/jspwiki.css
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/preferences/Preferences.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/EditorManager.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=819136&r1=819135&r2=819136&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sat Sep 26 13:25:23 2009
@@ -1,3 +1,38 @@
+2009-09-26 Dirk Frederickx <br...@apache.org>
+
+ * 3.0.0-svn-158 - upgrade mootools library
+
+ * Upgraded the mootools library to the latest stable version v1.2.3.
+ JSPWiki now includes the mootools-core.js and a selection of the
+ mootools-more.js.
+ All js routines were updated. But expect some stuff still to be broken.
+
+ * JSPWIKI-600: javascript error on getCoordinates()
+ Now OK with mootools v1.2.3
+
+ * Added unit test on Javascript.
+ The JSSPec unit tests were ported to the Jasmine
+ testing framework (http://github.com/pivotal/jasmine)
+ with a *compatible* MIT license.
+ Simply open /tests/javascript/jasmine-runner.html to execute the tests.
+
+ * The print css stylesheet is now included in the standard jspwiki.css
+ (@media print) to reduce download time.
+
+ * All javascript handlers are removed from the JSP's. (unobtrusive js)
+ All submit/click handlers are not installed from the javascript
+ at the time of the page-load.
+
+ * Aligned the javascript names of the UserPreferences cookies with
+ the new names used by the org.apache.wiki.preferences class.
+ Cookie handling seems not yet 100% ok.
+
+ * Several tweaks on AttachementInfoTab.jsp and AttachmentTab.jsp.
+
+ * Few small tweaks on Preferences and EditorManager on the handling of the
+ UserPreferences. However, still several bugs to be fixed.
+
+
2009-09-16 Harry Metske <me...@apache.org>
* 3.0.0-svn-157
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/AttachmentInfoTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/AttachmentInfoTab.jsp?rev=819136&r1=819135&r2=819136&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/AttachmentInfoTab.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/AttachmentInfoTab.jsp Sat Sep 26 13:25:23 2009
@@ -1,4 +1,4 @@
-<%--
+<%--
JSPWiki - a JSP-based WikiWiki clone.
Licensed to the Apache Software Foundation (ASF) under one
@@ -16,7 +16,7 @@
"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.
+ under the License.
--%>
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
<%@ page import="org.apache.wiki.*" %>
@@ -29,8 +29,8 @@
<%@ page import="org.apache.wiki.action.WikiContextFactory" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
<%@ page import="org.apache.wiki.api.WikiPage" %>
-<%@ page import="java.text.SimpleDateFormat" %>
<%@ page import="org.apache.wiki.content.jcr.JCRWikiPage" %>
+<%@ page import="java.text.SimpleDateFormat" %>
<%
WikiContext c = WikiContextFactory.findContext( pageContext );
WikiPage wikiPage = c.getPage();
@@ -82,9 +82,9 @@
<wiki:TabbedSection defaultTab="info">
<wiki:Tab id="pagecontent" titleKey="view.tab" accesskey="v" url="Wiki.jsp?page=${wikiActionBean.page.name}"/>
-
+
<wiki:Tab id="attach" title="<%= attTitle %>" accesskey="a" url="Attachments.jsp?page=${wikiActionBean.page.name}" />
-
+
<wiki:Tab id="info" titleKey="info.tab" accesskey="i">
<h3><fmt:message key="info.uploadnew" /></h3>
<wiki:Permission permission="upload">
@@ -94,10 +94,10 @@
onsubmit="return Wiki.submitUpload(this, '<%=progressId%>');"
method="post" accept-charset="<wiki:ContentEncoding/>"
enctype="multipart/form-data" >
-
+
<%-- Do NOT change the order of wikiname and content, otherwise the
servlet won't find its parts. --%>
-
+
<table>
<tr>
<td colspan="2"><div class="formhelp"><fmt:message key="info.uploadnew.help" /></div></td>
@@ -124,11 +124,11 @@
</table>
</form>
</wiki:Permission>
-
+
<wiki:Permission permission="!upload">
<div class="formhelp"><fmt:message key="attach.add.permission" /></div>
</wiki:Permission>
-
+
<wiki:Permission permission="delete">
<h3><fmt:message key="info.deleteattachment"/></h3>
<s:form beanclass="org.apache.wiki.action.ViewActionBean" class="wikiform" id="deleteForm" method="post" acceptcharset="UTF-8">
@@ -137,7 +137,7 @@
</div>
</s:form>
</wiki:Permission>
-
+
<%-- FIXME why not add pagination here - no need for large amounts of attach versions on one page --%>
<h3><fmt:message key='info.attachment.history' /></h3>
<div class="zebra-table">
@@ -152,38 +152,46 @@
<th><fmt:message key="info.author" /></th>
<th class='changenote'><fmt:message key="info.changenote" /></th>
</tr>
-
+
<wiki:HistoryIterator id="att"><%-- <wiki:AttachmentsIterator id="att"> --%>
<%
String name = att.getName(); //att.getFileName();
- int dot = name.lastIndexOf(".");
- String attachtype = ( dot != -1 ) ? name.substring(dot+1) : " ";
-
String sname = name;
if( sname.length() > MAXATTACHNAMELENGTH ) sname = sname.substring(0,MAXATTACHNAMELENGTH) + "...";
+
+ String mimetype = att.getContentType().replace('/','-');
+
+ java.util.Date modified = new SimpleDateFormat(JCRWikiPage.DATEFORMAT_ISO8601_2000).parse(att.getAttribute(JCRWikiPage.ATTR_CREATED).toString());
+
%>
<tr>
- <td>
- <div id="attach-<%= attachtype %>" class="attachtype"><%= attachtype %></div>
- </td>
+ <%-- The 'title' attribute is used to sort empty cells --%>
+ <td title="<%= att.getContentType() %>"><div class="mime <%= mimetype %>" /></td>
<td>
<a href="<wiki:Link version='<%=Integer.toString(att.getVersion())%>' format='url' />" title="<%= name %>" class="attachment"><wiki:PageVersion /></a>
</td>
<td style="white-space:nowrap;text-align:right;">
- <fmt:formatNumber value="<%=Double.toString(att.getSize()/1000.0) %>" groupingUsed="false" maxFractionDigits="1" minFractionDigits="1" /> <fmt:message key="info.kilobytes" />
+ <fmt:formatNumber value='<%=Double.toString(att.getSize()/1000.0)%>' maxFractionDigits='1' minFractionDigits='1' /> <fmt:message key="info.kilobytes" />
+ </td>
+ <td style="xwhite-space:nowrap;" jspwiki:sortvalue="<%= modified.getTime() %>">
+ <fmt:formatDate value="<%= modified %>" pattern="${prefs.TimeFormat}" timeZone="${prefs.TimeZone}" />
</td>
- <td style="white-space:nowrap;">
- <fmt:formatDate value="<%= new SimpleDateFormat(JCRWikiPage.DATEFORMAT_ISO8601_2000).parse(att.getAttribute(JCRWikiPage.ATTR_CREATED).toString()) %>" pattern="${prefs.TimeFormat}" timeZone="${prefs.TimeZone}" />
- </td>
- <td><wiki:Author/></td>
- <td class='changenote'>
- <%
- String changeNote = (String)att.getAttribute(WikiPage.CHANGENOTE);
- if( changeNote != null ) {
- changeNote = TextUtil.replaceEntities(changeNote);
- %><%=changeNote%><%
- }
- %>
+ <td style="white-space:nowrap;" ><wiki:Author/></td>
+ <%--
+ <wiki:Permission permission="delete">
+ <td>
+ <input type="button" value="<fmt:message key='attach.delete' />" src="<wiki:Link format='url' context='<%=WikiContext.DELETE%>' />" onclick="$('deleteForm').setProperty('action',this.src); $('delete-all').click();" />
+ </td>
+ </wiki:Permission>
+ --%>
+ <td class="changenote">
+<%
+ //FIXME: should probably also become a JCRWikiPage attriute.
+ String changeNote = TextUtil.replaceEntities((String)att.getAttribute(WikiPage.CHANGENOTE));
+ if( changeNote != null ) {
+ %><%=changeNote%><%
+ }
+%>
</td>
</tr>
</wiki:HistoryIterator>
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/AttachmentTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/AttachmentTab.jsp?rev=819136&r1=819135&r2=819136&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/AttachmentTab.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/AttachmentTab.jsp Sat Sep 26 13:25:23 2009
@@ -1,4 +1,4 @@
-<%--
+<%--
JSPWiki - a JSP-based WikiWiki clone.
Licensed to the Apache Software Foundation (ASF) under one
@@ -16,7 +16,7 @@
"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.
+ under the License.
--%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
@@ -41,7 +41,7 @@
<wiki:TabbedSection defaultTab="attach">
<wiki:Tab id="pagecontent" titleKey="view.tab" accesskey="v" url="Wiki.jsp?page=${wikiActionBean.page.name}"/>
-
+
<wiki:Tab id="attach" title="<%= attTitle %>" accesskey="a">
<div id="addattachment">
<h3><fmt:message key="attach.add" /></h3>
@@ -66,7 +66,7 @@
<td><s:label for="attachnote" name="attach.add.changenote" /></td>
<td><s:text name="changenote" id="attachnote" maxlength="80" size="60" /></td>
</tr>
-
+
<tr>
<td></td>
<td>
@@ -74,7 +74,7 @@
<div id="progressbar"><div class="ajaxprogress"></div></div>
</td>
</tr>
-
+
</table>
</s:form>
</wiki:Permission>
@@ -82,23 +82,23 @@
<div class="formhelp"><fmt:message key="attach.add.permission" /></div>
</wiki:Permission>
</div>
-
+
<wiki:HasAttachments>
-
+
<h3><fmt:message key="attach.list" /></h3>
-
+
<%--<small><fmt:message key="attach.listsubtitle"/></small>--%>
-
+
<wiki:Permission permission="delete">
<%-- hidden delete form --%>
</wiki:Permission>
-
+
<div class="zebra-table">
<div class="slimbox-img sortable">
<table class="wikitable">
<tr>
- <th><fmt:message key="info.attachment.name" /></th>
<th><fmt:message key="info.attachment.type" /></th>
+ <th><fmt:message key="info.attachment.name" /></th>
<th><fmt:message key="info.size" /></th>
<th><fmt:message key="info.version" /></th>
<th><fmt:message key="info.date" /></th>
@@ -106,47 +106,55 @@
<wiki:Permission permission="delete"><th><fmt:message key="info.actions" /></th></wiki:Permission>
<th class="changenote"><fmt:message key="info.changenote" /></th>
</tr>
-
+
<wiki:AttachmentsIterator id="att">
<%
String name = att.getFileName();
String sname = name;
if( sname.length() > MAXATTACHNAMELENGTH ) sname = sname.substring(0,MAXATTACHNAMELENGTH) + "...";
+
+ String mimetype = att.getContentType().replace('/','-');
+
+ java.util.Date modified = new SimpleDateFormat(JCRWikiPage.DATEFORMAT_ISO8601_2000).parse(att.getAttribute(JCRWikiPage.ATTR_CREATED).toString());
%>
<tr>
+ <%-- The 'title' attribute is used to sort empty cells --%>
+ <td title="<%= att.getContentType() %>"><div class="mime <%= mimetype %>" /></td>
<td><wiki:LinkTo title="<%= name %>"><%= sname %></wiki:LinkTo></td>
- <td><div class="attachtype"><%= att.getContentType() %></div></td>
<td style="white-space:nowrap;text-align:right;">
<fmt:formatNumber value='<%=Double.toString(att.getSize()/1000.0)%>' maxFractionDigits='1' minFractionDigits='1' /> <fmt:message key="info.kilobytes" />
</td>
<td style="text-align:center;">
<a href="<wiki:PageInfoLink format='url' />" title="<fmt:message key='attach.moreinfo.title' />"><wiki:PageVersion/></a>
</td>
- <td style="white-space:nowrap;"><fmt:formatDate value="<%= new SimpleDateFormat(JCRWikiPage.DATEFORMAT_ISO8601_2000).parse(att.getAttribute(JCRWikiPage.ATTR_CREATED).toString()) %>" pattern="${prefs.TimeFormat}" timeZone="${prefs.TimeZone}" /></td>
- <td><wiki:Author/></td>
+ <td jspwiki:sortvalue="<%= modified.getTime() %>">
+ <fmt:formatDate value="<%= modified %>" pattern="${prefs.TimeFormat}" timeZone="${prefs.TimeZone}" />
+ </td>
+ <td style="white-space:nowrap;" ><wiki:Author/></td>
<wiki:Permission permission="delete">
<td>
<input type="button" value="<fmt:message key='attach.delete' />" src="<wiki:Link format='url' context='<%=WikiContext.DELETE%>' />" onclick="$('deleteForm').setProperty('action',this.src); $('delete-all').click();" />
</td>
</wiki:Permission>
<td class="changenote">
- <%
+<%
+ //FIXME: should probably also become a JCRWikiPage attriute.
String changeNote = TextUtil.replaceEntities((String)att.getAttribute(WikiPage.CHANGENOTE));
if( changeNote != null ) {
%><%=changeNote%><%
}
- %>
+%>
</td>
</tr>
</wiki:AttachmentsIterator>
-
+
</table>
</div>
</div>
-
+
</wiki:HasAttachments>
</wiki:Tab>
-
+
<wiki:Tab id="info" titleKey="info.tab" url="PageInfo.jsp?page=${wikiActionBean.page.name}" accesskey="i" />
</wiki:TabbedSection>
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/DefaultLayout.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/DefaultLayout.jsp?rev=819136&r1=819135&r2=819136&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/DefaultLayout.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/DefaultLayout.jsp Sat Sep 26 13:25:23 2009
@@ -1,4 +1,4 @@
-<%--
+<%--
JSPWiki - a JSP-based WikiWiki clone.
Licensed to the Apache Software Foundation (ASF) under one
@@ -16,7 +16,7 @@
"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.
+ under the License.
--%>
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
@@ -28,11 +28,11 @@
This file contains the default layout used by all JSPWiki 3 pages.
The default layout contains the HTML doctype declaration, header,
and page layout. It can be customized in the following ways:
-
+
1) Top-level JSPs can define default components, as defined by
Stripes <s:layout-component name="foo"> elements. Named components
that can be overridden include:
-
+
headTitle : The HTML page title, which will be rendered
in the <title> element. Default=wiki: pagename
stylesheet : Link tags to external stylesheets. Default=blank
@@ -43,10 +43,10 @@
jsfunction : JavaScript functions. Default=blank
headMetaRobots : Search engine options. Default=noindex,nofollow
content : The page contents. Default=blank
-
+
2) DefaultLayout injects additional JSPs that are meant to be
customized. These include:
-
+
commonheader.jsp : A "local header" that can contain company logos
or other markup. Default=blank
@@ -73,7 +73,9 @@
--%>
<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 --%>
+ <%-- FIXME : @media print is included in jspwiki.css
<link rel="stylesheet" type="text/css" media="print" href="<wiki:Link format='url' templatefile='jspwiki_print.css' />" />
+ --%>
<link rel="alternate stylesheet" type="text/css" href="<wiki:Link format='url' templatefile='jspwiki_print.css' />" title="Print friendly" />
<link rel="alternate stylesheet" type="text/css" href="<wiki:Link format='url' templatefile='jspwiki.css' />" title="Standard" />
<s:layout-component name="stylesheet" />
@@ -111,8 +113,13 @@
<%--
JavaScript
+
+ <script src="http://ajax.googleapis.com/ajax/libs/mootools/1.2.3/mootools.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/mootools/1.2.3/mootools-yui-compressed.js"></script>
--%>
- <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/mootools-core.js' />"></script>
+ <script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/mootools-more.js' />"></script>
+
<script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/prettify.js' />"></script>
<script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/jspwiki-common.js' />"></script>
<script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/jspwiki-commonstyles.js' />"></script>
@@ -137,7 +144,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="wikiContext" content='${wikiContext.requestContext}' />
<meta name="wikiBaseUrl" content='<wiki:BaseURL/>' />
- <meta name="wikiPageUrl" content='<wiki:Link format="url" page="${wikiContext.page.name}" />' />
+ <meta name="wikiPageUrl" content='<wiki:Link format="url" page="#$%"/>' />
<meta name="wikiEditUrl" content='<wiki:EditLink format="url" />' />
<meta name="wikiJsonUrl" content='<%= WikiContextFactory.findContext(pageContext).getURL( WikiContext.NONE, "JSON-RPC" ) %>' /><%--unusual pagename--%>
<meta name="wikiPageName" content='<wiki:Variable var="pagename" />' /><%--pagename without blanks--%>
@@ -159,15 +166,15 @@
<wiki:Include page="localheader.jsp" />
-
+
</head>
<body class="${wikiContext.requestContext}">
<div id="wikibody" class="${prefs.Orientation}">
-
+
<wiki:Include page="Header.jsp" />
-
+
<div id="content">
<div id="page">
<wiki:Include page="PageActionsTop.jsp" />
@@ -177,9 +184,9 @@
<wiki:Include page="Favorites.jsp" />
<div class="clearbox"></div>
</div>
-
+
<wiki:Include page="Footer.jsp" />
-
+
</div>
</body>
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/PageInfoTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/PageInfoTab.jsp?rev=819136&r1=819135&r2=819136&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/PageInfoTab.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/PageInfoTab.jsp Sat Sep 26 13:25:23 2009
@@ -1,4 +1,4 @@
-<%--
+<%--
JSPWiki - a JSP-based WikiWiki clone.
Licensed to the Apache Software Foundation (ASF) under one
@@ -16,7 +16,7 @@
"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.
+ under the License.
--%>
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
<%@ page import="org.apache.wiki.*" %>
@@ -76,9 +76,9 @@
<wiki:TabbedSection defaultTab="info">
<wiki:Tab id="pagecontent" titleKey="view.tab" accesskey="v" url="Wiki.jsp?page=${wikiActionBean.page.name}"/>
-
+
<wiki:Tab id="attach" title="<%= attTitle %>" accesskey="a" url="Attachments.jsp?page=${wikiActionBean.page.name}" />
-
+
<wiki:Tab id="info" titleKey="info.tab" accesskey="i">
<p>
<fmt:message key='info.lastmodified'>
@@ -92,7 +92,7 @@
</fmt:message>
<wiki:RSSImageLink mode="wiki" />
</p>
-
+
<wiki:CheckVersion mode="notfirst">
<p>
<fmt:message key='info.createdon'>
@@ -105,12 +105,12 @@
</fmt:message>
</p>
</wiki:CheckVersion>
-
+
<wiki:Permission permission="rename">
<div class="formhelp">
<wiki:Messages div="error" topic="rename" prefix='<%=LocaleSupport.getLocalizedMessage(pageContext,"prefs.errorprefix.rename")%>' />
</div>
-
+
<s:form beanclass="org.apache.wiki.action.RenameActionBean" class="wikiform" id="renameform" method="post" acceptcharset="UTF-8" >
<p>
<s:hidden name="page" />
@@ -125,7 +125,7 @@
<wiki:Permission permission="!rename">
<p><fmt:message key="info.rename.permission" /></p>
</wiki:Permission>
-
+
<wiki:Permission permission="delete">
<s:form beanclass="org.apache.wiki.action.DeleteActionBean" class="wikiform" id="deleteForm" method="post" acceptcharset="UTF-8">
<p><s:submit name="delete" id="delete-all" /></p>
@@ -134,33 +134,33 @@
<wiki:Permission permission="!delete">
<p><fmt:message key="info.delete.permission" /></p>
</wiki:Permission>
-
- <div class="collapsebox-closed" id="incomingLinks">
- <h4><fmt:message key="info.tab.incoming" /></h4>
- <wiki:LinkTo><wiki:PageName/></wiki:LinkTo>
- <wiki:Plugin plugin="ReferringPagesPlugin" args="before='*' after='\n' " />
- </div>
-
- <div class="collapsebox-closed" id="outgoingLinks">
- <h4><fmt:message key="info.tab.outgoing" /></h4>
- <wiki:Plugin plugin="ReferredPagesPlugin" args="depth='1' type='local'" />
+
+ <div class='line'>
+ <div class="collapsebox-closed unit size1of2" id="incomingLinks">
+ <h4><fmt:message key="info.tab.incoming" /></h4>
+ <wiki:LinkTo><wiki:PageName/></wiki:LinkTo>
+ <wiki:Plugin plugin="ReferringPagesPlugin" args="before='*' after='\n' " />
+ </div>
+
+ <div class="collapsebox-closed lastUnit size1of2 " id="outgoingLinks">
+ <h4><fmt:message key="info.tab.outgoing" /></h4>
+ <wiki:Plugin plugin="ReferredPagesPlugin" args="depth='1' type='local'" />
+ </div>
</div>
-
- <div class="clearbox"></div>
-
+
<%-- DIFF section --%>
<wiki:CheckRequestContext context='diff'>
<wiki:Include page="DiffTab.jsp" />
</wiki:CheckRequestContext>
<%-- DIFF section --%>
-
-
+
+
<wiki:CheckVersion mode="first"><fmt:message key="info.noversions" /></wiki:CheckVersion>
<wiki:CheckVersion mode="notfirst">
<%-- if( itemcount > 1 ) { --%>
-
+
<wiki:SetPagination start="<%=startitem%>" total="<%=itemcount%>" pagesize="<%=pagesize%>" maxlinks="9" fmtkey="info.pagination" href='<%=c.getURL(WikiContext.INFO, c.getPage().getName(), "start=%s")%>' />
-
+
<div class="zebra-table sortable table-filter">
<table class="wikitable">
<tr>
@@ -171,7 +171,7 @@
<th><fmt:message key="info.changes" /></th>
<th class='changenote'><fmt:message key="info.changenote" /></th>
</tr>
-
+
<wiki:HistoryIterator id="currentPage">
<% if( ( startitem == -1 ) ||
( ( currentPage.getVersion() > startitem )
@@ -184,14 +184,15 @@
<wiki:PageVersion/>
</wiki:LinkTo>
</td>
-
+
<td><fmt:formatDate value="<%= currentPage.getLastModified() %>" pattern="${prefs.TimeFormat}" timeZone="${prefs.TimeZone}" /></td>
<td style="white-space:nowrap;text-align:right;">
<c:set var="ff"><wiki:PageSize/></c:set>
<fmt:formatNumber value='${ff/1000}' maxFractionDigits='3' minFractionDigits='1' /> <fmt:message key="info.kilobytes" />
</td>
+
<td><wiki:Author/></td>
-
+
<td>
<wiki:CheckVersion mode="notfirst">
<wiki:DiffLink version="current" newVersion="previous"><fmt:message key="info.difftoprev" /></wiki:DiffLink>
@@ -201,7 +202,7 @@
<wiki:DiffLink version="latest" newVersion="current"><fmt:message key="info.difftolast" /></wiki:DiffLink>
</wiki:CheckVersion>
</td>
-
+
<td class="changenote">
<%
String changeNote = (String)currentPage.getAttribute( WikiPage.CHANGENOTE );
@@ -209,11 +210,11 @@
%>
<%= changeNote %>
</td>
-
+
</tr>
<% } %>
</wiki:HistoryIterator>
-
+
</table>
</div>
${pagination}
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/PreferencesTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/PreferencesTab.jsp?rev=819136&r1=819135&r2=819136&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/PreferencesTab.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/PreferencesTab.jsp Sat Sep 26 13:25:23 2009
@@ -1,4 +1,4 @@
-<%--
+<%--
JSPWiki - a JSP-based WikiWiki clone.
Licensed to the Apache Software Foundation (ASF) under one
@@ -16,13 +16,13 @@
"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.
+ under the License.
--%>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://jakarta.apache.org/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" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
@@ -34,11 +34,15 @@
</div>
</c:if>
-<s:form beanclass="org.apache.wiki.action.UserPreferencesActionBean" class="wikiform" id="setCookie" method="post" acceptcharset="UTF-8">
+<s:form beanclass="org.apache.wiki.action.UserPreferencesActionBean"
+ class="wikiform"
+ id="setCookie"
+ method="post"
+ acceptcharset="UTF-8">
<table>
<tr>
<td><s:label for="assertedName" /></td>
- <td>
+ <td>
<s:text id="assertedName" name="assertedName" size="20"><wiki:UserProfile property='wikiname' /></s:text>
<s:errors field="assertedName" />
</td>
@@ -66,22 +70,22 @@
<td>
<select id="editor" name="editor">
<wiki:EditorIterator id="edt">
- <option <%=edt.isSelected()%>value="<%=edt.getName()%>"><%=edt.getName()%></option>
+ <option <%=edt.isSelected()%> value="<%=edt.getName()%>"><%=edt.getName()%></option>
</wiki:EditorIterator>
</select>
<s:errors field="editor" />
</td>
</tr>
-
+
<tr>
<td><s:label for="sectionEditing" /></td>
<td>
- <s:checkbox id="sectionEditing" name="sectionEditing" checked="true" />
+ <s:checkbox id="sectionEditing" name="sectionEditing" />
<s:errors field="sectionEditing" />
<fmt:message key="prefs.user.sectionediting.text" />
</td>
</tr>
-
+
<tr>
<td><s:label for="skin" /></td>
<td>
@@ -136,19 +140,6 @@
<%--
<tr>
- <td><label for="showQuickLinks">Show Quick Links</label></td>
- <td>
- <s:checkbox id="showQuickLinks" name="showQuickLinks" checked="true" />
- <span class="quicklinks"><span
- class='quick2Top'><a href='#wikibody' title='Go to Top' >«</a></span><span
- class='quick2Prev'><a href='#' title='Go to Previous Section'>‹</a></span><span
- class='quick2Edit'><a href='#' title='Edit this section'>•</a></span><span
- class='quick2Next'><a href='#' title='Go to Next Section'>›</a></span><span
- class='quick2Bottom'><a href='#footer' title='Go to Bottom' >»</a></span></span>
- </td>
- </tr>
-
- <tr>
<td><label for="showCalendar">Show Calendar</label></td>
<td>
<s:checkbox id="showCalendar" name="showCalendar" checked="true" />
@@ -166,13 +157,16 @@
</table>
</s:form>
-
+
<!-- Clearing the 'asserted name' and other prefs in the cookie -->
<%--wiki:UserCheck status="asserted"--%>
<h3><fmt:message key='prefs.clear.heading' /></h3>
-<s:form beanclass="org.apache.wiki.action.UserPreferencesActionBean" id="clearCookie" method="post" acceptcharset="UTF-8">
+<s:form beanclass="org.apache.wiki.action.UserPreferencesActionBean"
+ id="clearCookie"
+ method="post"
+ acceptcharset="UTF-8">
<div>
<s:submit name="clearAssertedName" />
</div>
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp?rev=819136&r1=819135&r2=819136&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp Sat Sep 26 13:25:23 2009
@@ -1,4 +1,4 @@
-<%--
+<%--
JSPWiki - a JSP-based WikiWiki clone.
Licensed to the Apache Software Foundation (ASF) under one
@@ -16,7 +16,7 @@
"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.
+ under the License.
--%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
@@ -27,14 +27,17 @@
This is a plain editor for JSPWiki.
--%>
<div style="width:100%"> <%-- Required for IE6 on Windows --%>
-
+
<%-- Print any validation errors --%>
<s:errors />
-
- <s:form beanclass="org.apache.wiki.action.EditActionBean" class="wikiform"
- id="editform" method="post" acceptcharset="UTF-8" enctype="application/x-www-form-urlencoded"
- onsubmit="window.onbeforeunload = null;">
-
+
+ <s:form beanclass="org.apache.wiki.action.EditActionBean"
+ class="wikiform"
+ id="editform"
+ method="post"
+ acceptcharset="UTF-8"
+ enctype="application/x-www-form-urlencoded">
+
<%-- If any conflicts, print the conflicting text here --%>
<c:if test="${not empty wikiActionBean.conflictText}">
<p>
@@ -42,7 +45,7 @@
<s:textarea name="conflictText" readonly="true" />
</p>
</c:if>
-
+
<%-- EditActionBean relies on these being found. So be careful, if you make changes. --%>
<p id="submitbuttons">
<s:hidden name="page" />
@@ -52,12 +55,12 @@
<s:submit name="save" accesskey="s" title="${saveTitle}" />
</wiki:CheckRequestContext>
<wiki:CheckRequestContext context='comment'>
- <s:submit name="comment" accesskey="s" title="${saveTitle}" />
+ <s:submit name="comment" accesskey="s" title="${saveTitle}" />
</wiki:CheckRequestContext>
-
+
<c:set var="previewTitle" scope="page"><fmt:message key="editor.plain.preview.title" /></c:set>
<s:submit name="preview" accesskey="v" title="${previewTitle}" />
-
+
<c:set var="cancelTitle" scope="page"><fmt:message key="editor.plain.cancel.title" /></c:set>
<s:submit name="cancel" accesskey="q" title="${cancelTitle}" />
</p>
@@ -72,7 +75,7 @@
<s:text name="changenote" id="changenote" size="50" maxlength="80" />
</td>
</tr>
-
+
<wiki:CheckRequestContext context="comment">
<tr>
<td><s:label for="author" accesskey="n" name="author" /></td>
@@ -86,9 +89,9 @@
<td><s:text id="link" name="link" size="24" /></td>
</tr>
</wiki:CheckRequestContext>
-
+
</table>
-
+
<%-- Toolbar --%>
<div id="toolbar" class="line">
@@ -97,7 +100,7 @@
<input type="checkbox" name="tabcompletion" id="tabcompletion" /><fmt:message key="editor.plain.tabcompletion"/></label>
<br />
<label for="smartpairs" title="<fmt:message key='editor.plain.smartpairs.title'/>">
- <input type="checkbox" name="smartpairs" id="smartpairs" /><fmt:message key="editor.plain.smartpairs"/></label>
+ <input type="checkbox" name="smartpairs" id="smartpairs" /><fmt:message key="editor.plain.smartpairs"/></label>
</div>
<fieldset class="unit">
@@ -141,8 +144,8 @@
<a href="#" class="tool tIMG" title="<fmt:message key='editor.plain.tbIMG.title'/>">img</a>
<a href="#" class="tool tTABLE" title="<fmt:message key='editor.plain.tbTABLE.title'/>">table</a>
<a href="#" class="tool tPLUGIN" title="<fmt:message key='editor.plain.tbPLUGIN.title'/>">plugin</a>
- <%--
- <a href="#" class="tool tTOC" title="<fmt:message key='editor.plain.tbTOC.title'/>">toc</a>
+ <%--
+ <a href="#" class="tool tTOC" title="<fmt:message key='editor.plain.tbTOC.title'/>">toc</a>
--%>
<a href="#" class="tool tDL" title="<fmt:message key='editor.plain.tbDL.title'/>">dl</a>
<a href="#" class="tool tCODE" title="<fmt:message key='editor.plain.tbCODE.title'/>">code</a>
@@ -161,23 +164,21 @@
</fieldset>
- <div class="clearbox">
- <p id="findDialog" style="display:none;">
- <%--<label for="tbFIND" ><fmt:message key="editor.plain.find"/>--%>
- <input type="text" name="tbFIND" id="tbFIND" size="16" value="find"/>
- <%--</label>--%>
- <label for="tbMatchCASE"><input type="checkbox" name="tbMatchCASE" id="tbMatchCASE" />
- <fmt:message key="editor.plain.matchcase"/></label>
- <label for="tbREGEXP" ><input type="checkbox" name="tbREGEXP" id="tbREGEXP" />
- <fmt:message key="editor.plain.regexp"/></label>
-
- <%--<label for="tbREPLACE" ><fmt:message key="editor.plain.replace"/>--%>
- <input type="text" name="tbREPLACE" id="tbREPLACE" size="16" />
- <%--</label>--%>
- <a class="btn" id="doreplace"><span><span><fmt:message key='editor.plain.find.submit' /></span></span></a>
- <label for="tbGLOBAL"><input type="checkbox" name="tbGLOBAL" id="tbGLOBAL" checked="checked" />
- <fmt:message key="editor.plain.global"/></label>
- </p>
+ <div id="findDialog" style="display:none;clear:both;">
+ <%--<label for="tbFIND" ><fmt:message key="editor.plain.find"/>--%>
+ <input type="text" name="tbFIND" id="tbFIND" size="16" value="find"/>
+ <%--</label>--%>
+ <label for="tbMatchCASE"><input type="checkbox" name="tbMatchCASE" id="tbMatchCASE" />
+ <fmt:message key="editor.plain.matchcase"/></label>
+ <label for="tbREGEXP" ><input type="checkbox" name="tbREGEXP" id="tbREGEXP" />
+ <fmt:message key="editor.plain.regexp"/></label>
+
+ <%--<label for="tbREPLACE" ><fmt:message key="editor.plain.replace"/>--%>
+ <input type="text" name="tbREPLACE" id="tbREPLACE" size="16" />
+ <%--</label>--%>
+ <a class="btn" id="doreplace"><span><span><fmt:message key='editor.plain.find.submit' /></span></span></a>
+ <label for="tbGLOBAL"><input type="checkbox" name="tbGLOBAL" id="tbGLOBAL" checked="checked" />
+ <fmt:message key="editor.plain.global"/></label>
</div>
</div><%-- end of the toolbar --%>
@@ -185,13 +186,13 @@
<%-- You knew this would be here somewhere. Yes, it's the textarea where the user
actually edits stuff. --%>
<div id="editor-content" class="line" style="clear:both;">
-
+
<div class="unit size1of2">
<div class="editor-container">
<%-- js-insert: <div id="snipetoc"><ul>...</ul></div> --%>
<s:textarea id="editorarea" name="text" class="editor" rows="20" cols="80" />
- <%-- js insert: <div class="resize-bar"></div> --%>
- </div>
+ <%-- js insert: <div class="resize-bar"></div> --%>
+ </div>
</div>
<div class="unit size1of2 lastUnit">
@@ -204,5 +205,5 @@
<%-- Spam detection fields --%>
<wiki:SpamProtect />
</s:form>
-
+
</div>
\ No newline at end of file
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/jspwiki.css
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/jspwiki.css?rev=819136&r1=819135&r2=819136&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/jspwiki.css (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/jspwiki.css Sat Sep 26 13:25:23 2009
@@ -219,8 +219,8 @@
/*font: 12px/1.5 "Lucida Grande", Arial, Helvetica, Sans-Serif;*/
/*font:13px/1.231 arial,helvetica,clean,sans-serif;*/
font:76%/140% Verdana,Arial,Helvetica,sans-serif;
- *font-size:small;
- *font:x-small;
+ _font-size:small;
+ _font:x-small;
}
table {
border-collapse:collapse;
@@ -284,7 +284,7 @@
h2, h3, h4 {
clear:left;
margin:1em 0 0.5em 0;
- padding:0.25em;
+ padding:0.25em 0;
line-height:1.2;
}
h2 { font-size: 150%; }
@@ -385,6 +385,62 @@
}
/*
+Style: formcontainer
+ Support table-less forms.
+ Elements can simply be laid out as {{<label><input|select>}}
+ and they will be placed into a pseudo-2-column layout without
+ the need for using tables. If a "description" for the form element
+ is needed, a div with class="description" can be added immediately
+ after the input or select tags.
+
+TODO: refactor other wiki-forms to become table-less.
+*/
+div.formcontainer {
+ width:100%;
+ margin:1em;
+}
+div.formcontainer div {
+ padding:0.2em 0;
+ vertical-align:top;
+}
+div.formcontainer label {
+ font-weight:bold;
+ width:13em;
+ float:left;
+ margin:0em 0.25em 0 0.25em;
+}
+div.formcontainer input,
+dir.formcontainer select {
+ margin: 0.25em 0 0.25em 14em;
+}
+/* FIXME: does not work in ie ? */
+div.formcontainer label+input,
+div.formcontainer label+select {
+ margin:0;
+}
+div.formcontainer * div.description {
+ margin-left:14em;
+}
+/* fixme : better reuse the warning css class */
+div.formcontainer * div.description.warning{
+ background:#ffff80;
+}
+/* FIXME: does not work in ie ? */
+div.formcontainer input[type='submit']{
+ margin:0;
+}
+label.error{
+ background:none;
+ color:#c00;
+}
+input.error{
+ background:#ffe0e0;
+}
+
+
+
+
+/*
PRE and xflow:
Pre-formatted text and code blocks.
@@ -543,6 +599,13 @@
padding-left:1em;
display:block;
}
+.page-break {
+ display:block;
+ height:2px;
+ /*background:url(page-break.jpg) 0 center repeat-x; */
+ border-top:2px dashed #bbb/*#BORDER#*/;
+ margin:1em 0;
+}
.ltr {
direction:ltr;
}
@@ -556,7 +619,7 @@
.additinfo {
background-color:#e0e0ff/*#INFO#*/;
}
-div.diffnote, div.information, div.warning, div.error {
+.diffnote, .information, .warning, .error {
display:block;
clear:both;
margin:1em 0;
@@ -573,7 +636,7 @@
.warning {
background:#ffff80/*#WARNING*/ url(images/exclamation.gif) 8px 1em no-repeat;
}
-div.error {
+.error {
background:#ffe0e0/*#ERROR#*/ url(images/error.gif) 8px 1em no-repeat;
color:#c00;
}
@@ -642,33 +705,32 @@
Add attachment icons per type of attachement.
DOM structure
-> <div class="att-img gif> ... </div>
+> <div class="mime image-gif"> ... </div>
*/
-.att-img {
+.mime {
height:16px;
- padding-left:20px;
+ padding-left:18px;
background:url(images/attach-strip.png) no-repeat;
}
-.att-img.gif { background-position:0 -112px; }
-.att-img.png { background-position:0 -112px; }
-.att-img.bmp { background-position:0 -112px; }
-.att-img.jpg { background-position:0 -112px; }
-.att-img.jpeg { background-position:0 -112px; }
-.att-img.text { background-position:0 -16px; }
-.att-img.txt { background-position:0 -16px; }
-.att-img.zip { background-position:0 -128px; }
-.att-img.jar { background-position:0 -128px; }
-.att-img.tar { background-position:0 -128px; }
-.att-img.pdf { background-position:0 -80px; }
-.att-img.doc { background-position:0 -32px; }
-.att-img.xls { background-position:0 -48px; }
-.att-img.ppt { background-position:0 -64px; }
-.att-img.swf { background-position:0 -96px; }
-.att-img.mov { background-position:0 -160px; }
-.att-img.mp3 { background-position:0 -144px; }
-.att-img.wav { background-position:0 -144px; }
-
+.image-gif { background-position:0 -112px; }
+.image-png { background-position:0 -112px; }
+.image-bmp { background-position:0 -112px; }
+.image-jpg { background-position:0 -112px; }
+.image-jpeg { background-position:0 -112px; }
+.text-plain { background-position:0 -16px; }
+.text-html { background-position:0 -16px; }
+.application-zip { background-position:0 -128px; }
+/*.att-img.jar { background-position:0 -128px; }*/
+.application-x-tar { background-position:0 -128px; }
+.application-pdf { background-position:0 -80px; }
+.application-msword { background-position:0 -32px; }
+.application-vnd.ms-excel { background-position:0 -48px; }
+.application-vnd.ms-powerpoint { background-position:0 -64px; }
+.application-x-shockwave-flash { background-position:0 -96px; }
+.audio-mpeg { background-position:0 -144px; }
+.video.quicktime { background-position:0 -160px; }
+.video-x-ms-wmv { background-position:0 -144px; }
/*
Experimental:
@@ -789,6 +851,7 @@
> body.edit
> body.comment
> #edithelp
+> #editcontent
*/
/*
@@ -1230,7 +1293,7 @@
</div>
(end)
-> #infocontent
+> #info
> #incomingLinks
> #outgoingLinks
*/
@@ -2136,47 +2199,43 @@
> %%tip-TipCaption ... /%
DOM structure:
+(start code)
+<span class="tip anchor">Tip Caption</span>
+<div style="...show/hide...">
+ <div class="tip-top">
+ <div class="tip">
+ <div class="tip-title"> Tip Caption </div>
+ <div class="tip-text"> ...tip-body... </div>
+ </div>
+ <div class="tip-bottom">
+</div>
+(end)
*/
.tip-anchor {
border-bottom:2px solid #545454;
cursor:pointer;
}
-.tip-tip {
- color:white;
- width:auto; /*240px;*/
+.tip {
+ width:auto;
+ _width:240px;
+ padding:0.5em 1em;
z-index:100;
font-size:90%;
+ color:white;
background-color:rgba(0,0,0,0.7);
-moz-border-radius:10px;
- -webkit-border-radius:5px;
+ -webkit-border-radius:10px;
-webkit-box-shadow:0 0 5px rgba(0, 0, 0, 0.5);
}
.tip-title {
font-weight:bold;
- padding:8px 8px 4px;
-}
-* html .tip-title {
- background:url(images/tip.png) top left;
+ _background:url(images/tip.png) top left;
}
-/*ie7 hack */
-*:first-child+html .tip-title {
- background:url(images/tip.png) top left;
-}
-.tip-text {
- padding:4px 8px 8px;
-}
-.tip-text th {
- background:grey !important;
-}
-* html .tip-text {
- background:url(images/tip.png) bottom right;
-}
-/*ie7 hack */
-*:first-child+html .tip-text {
- background:url(images/tip.png) bottom right;
+.tip .wikitable th {
+ background:none;
}
-.tip-tip a {
+.tip a {
color: white !important;
}
@@ -2193,23 +2252,21 @@
div.collapse li {
list-style-type:none;
}
-.collapse .collapsebody, .collapsebox .collapse .collapsebody {
+.collapse .collapsebody, .collapsebox .collapsebody {
padding-left:1.5em;
- *float:left; /* ie6, ie7 hack */
- *padding-left:0.5em; /* ie6, ie7 hack */
+ _float:left; /* ie6, ie7 hack */
+ _padding-left:0.5em; /* ie6, ie7 hack */
}
-/* ie7 hack ./
-*:first-child+html .collapse .collapsebody,
-*:first-child+html .collapsebox .collapse .collapsebody {
- float:left;
- padding-left:0.5em;
+/*
+Make sure to print collapsed items as it they were not collapsed.
+This requires some smart 'specific' css selector rules, in order to
+overwrite the style set by the mootools animation routines.
+*/
+@media print {
+.collapse .collapsebody ul, .collapsebox div.collapsebody {
+ height:auto !important;
}
-/* ie6 hack ./
-* html .collapse .collapsebody, * html .collapsebox .collapse .collapsebody {
- float:left;
- padding-left:0.5em;
}
-*/
/* collapse icons */
.collapseBullet, .collapseOpen, .collapseClose {
@@ -2678,21 +2735,104 @@
left:-1px;
}
+
+/*
+Section: Print-media
+ CSS rule to improve page rendering during printing.
+ Printing is focused on the page-content; surrounding blocks
+ like the favorites side-bar, login-sections, search box,
+ menu dropdowns etc. are hidden.
+
+ Tabbed sections are all printed sequentially.
+
+*/
+@media print {
+
+.applicationlogo, .companylogo, .titlebox, .userbox,
+.searchbox, .breadcrumbs, .pageactions, .quicklinks,
+#actionsTop, #actionsBottom, #favorites,
+#addattachment, #findhelp,
+a.editsection, a.hashlink,
+.collapsebox .collapseOpen, .collapsebox .collapseClose,
+.table-filter .filterrow,
+.tabmenu {
+ display:none;
+}
+#attachments, #addcomment,
+/*#pagelinks,*/
+#pagecontent, #editcontent, #previewcontent, #diffcontent, #infocontent,
+#findquery, #userPrefs,
+#pagecontent .tabmenu {
+ display:block;
+ visibility:visible;
+}
+tt,pre {
+ overflow:visible;
+}
+
+/* Show links as normal text (maybe show urls at the bottom of the page) */
+a {
+ text-decoration:none;
+}
+/*print href of each link
+a:after { content:attr(href); color:grey;
+ font-family:"Courier New", Courier, mono; font-size:8pt; }
+*/
+
+/* Give the content what it deserves. */
+html>body #previewcontent, html>body #info, html>body #pagecontent, html>body #attach, html>body #findcontent {
+ overflow:visible;
+}
+/* ie to check */
+* html #previewcontent, * html #info, * html #pagecontent, * html #attach, * html #findcontent {
+ overflow-x:visible;
+}
+/* use !important to overwrite css style on following specified blocks */
+.pagename, #header, #footer, #page {
+ width:100% !important;
+ margin:0 !important;
+ padding:0 !important;
+ float:none !important;
+ clear:both !important;
+ position:static !important;
+ overflow:visible !important;
+}
+.pagename {
+ font-size:250%;
+ margin-bottom:1.5em;
+ padding-bottom:0.5em;
+ border-bottom:3px solid #555;
+ color:#555;
+}
+/* hidden tabs are made visible during print
+ * e.g. when printing a page, also the attachment list gets printed
+ */
+.hidetab {
+ display:block;
+ margin:1em 0;
+}
+.tabs {
+ border:none;
+}
+/* todo : open all accordion sections */
+a.slimbox {
+ display:none;
+}
+/* ff bug : avoid floats during printing */
+.commentbox {
+ float:none;
+}
/*
-Style: formcontainer -- for table-less forms. Elements can simply be
- laid out as <label><input|select> and they will be
- placed into a pseudo-2-column layout without
- the need for using tables. If a "description"
- for the form element is needed, a div with
- class="description" can be added immediately
- after the input or select tags.
-*/
-div.formcontainer {width:100%; margin:1em;}
-div.formcontainer div {padding:0.2em 0px; vertical-align:top;}
-div.formcontainer label {font-weight:bold; width:13em; float:left; margin:0em 0.25em 0 0.25em;}
-div.formcontainer input,select {margin: 0.25em 0 0.25em 14em;}
-div.formcontainer label+input,label+select {margin:0 0 0 0;}
-div.formcontainer * div.description {margin-left:14em;}
-div.formcontainer input[type='submit']{margin:0;}
-label.error{background:none; color:#c00;}
-input.error{background:#ffe0e0;}
+Style: Page-break
+ Force a new page with ths explicit %%page-break style.
+ FIXME
+*/
+.page-break {
+ height:0;
+ page-break-before:always;
+ margin:0;
+ xborder-top:none;
+}
+
+
+} /* end of @media print */
\ No newline at end of file
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=819136&r1=819135&r2=819136&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Sat Sep 26 13:25:23 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "157";
+ public static final String BUILD = "158";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/preferences/Preferences.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/preferences/Preferences.java?rev=819136&r1=819135&r2=819136&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/preferences/Preferences.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/preferences/Preferences.java Sat Sep 26 13:25:23 2009
@@ -548,7 +548,7 @@
}
}
- String prefTimeZone = Preferences.getPreference( context.getHttpRequest().getSession(), "TimeZone" );
+ String prefTimeZone = Preferences.getPreference( context.getHttpRequest().getSession(), PREFS_TIME_ZONE );
TimeZone timeZone = TimeZone.getTimeZone( prefTimeZone );
Date d = new Date(); // current date
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/EditorManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/EditorManager.java?rev=819136&r1=819135&r2=819136&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/EditorManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/EditorManager.java Sat Sep 26 13:25:23 2009
@@ -195,7 +195,7 @@
String editor = null;
// User has set an editor in preferences
- editor = Preferences.getPreference( context, PARA_EDITOR );
+ editor = Preferences.getPreference( context, Preferences.PREFS_EDITOR );
/* FIXME: actual default 'editor' property is read by the Preferences class */
if (editor == null)