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 2015/09/07 20:32:59 UTC
svn commit: r1701662 - in /jspwiki/trunk: ./
jspwiki-war/src/main/java/org/apache/wiki/
jspwiki-war/src/main/scripts/wiki-edit/
jspwiki-war/src/main/scripts/wiki-wysiwyg/Assets/MooEditable/
jspwiki-war/src/main/styles/haddock/default/ jspwiki-war/src/m...
Author: brushed
Date: Mon Sep 7 18:32:58 2015
New Revision: 1701662
URL: http://svn.apache.org/r1701662
Log:
2.10.2-svn-38 [JSPWIKI-903] Fixed a page redirect after attachment delete.
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Snipe.Commands.js
jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-wysiwyg/Assets/MooEditable/MooEditable.Extras.css
jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Attach.less
jspwiki/trunk/jspwiki-war/src/main/webapp/Delete.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ConflictContent.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageTab.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/SearchBox.jsp
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1701662&r1=1701661&r2=1701662&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Mon Sep 7 18:32:58 2015
@@ -1,3 +1,9 @@
+2015-09-07 Dirk Frederickx (brushed AT apache DOT org)
+
+ * 2.10.2-svn-38
+
+ * [JSPWIKI-903] Fixed a page redirect after attachment delete.
+
2015-09-06 Dirk Frederickx (brushed AT apache DOT org)
* 2.10.2-svn-37 Few Attachment tweaks in the HADDOCK template
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1701662&r1=1701661&r2=1701662&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Mon Sep 7 18:32:58 2015
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "37";
+ public static final String BUILD = "38";
/**
* This is the generic version string you should use when printing out the version. It is of
Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Snipe.Commands.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Snipe.Commands.js?rev=1701662&r1=1701661&r2=1701662&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Snipe.Commands.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Snipe.Commands.js Mon Sep 7 18:32:58 2015
@@ -25,7 +25,7 @@ Class: SnipEditor.Commands
It will make sure that only one dialog is open at the same time.
It intializes and caches the dialogs, handles the show/hide/toggle
- of dialogs, and passes action events back to the SnipEditor.
+ of dialogs, and passes action events back to the Snipe Editor.
Dialogs can be opened by means of
- external command triggers: exec
@@ -45,10 +45,11 @@ Class: SnipEditor.Commands
Options:
container: DOM element => contains commands([data-cmd])
dialogs - predefined set of dialog definitions
+ relativeTo - relative position of the dialog (default is document.body)
// **event handlers**
- onOpen - invoked after opening any DIALOG
- onClose - invoked after closing any DIALOG
- onAction - action call-back action(cmd,arguments)
+ onOpen - fired after opening any DIALOG
+ onClose - fired after closing any DIALOG
+ onAction - action call-back action(cmd, arguments)
Properties
- buttons : collection of DOM-elements with click handlers to either
@@ -72,7 +73,7 @@ Snipe.Commands = new Class({
//dialogs:{ cmd1:dialog1, cmd2:dialog2, ...}
},
dlgs: {}, //all cmd:instantiated dialogs (lazy activation)
- btns: {}, //all buttons
+ btns: {}, //all button DOM elements
dialogs: {}, //all cmd:dialogs definitions
initialize: function( container, options ){
@@ -149,7 +150,7 @@ Snipe.Commands = new Class({
/*
Function: attach
- Attach event-handlers to a dialogs
+ Attach event-handlers to a dialog
*/
attach: function(dialog, command){
Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-wysiwyg/Assets/MooEditable/MooEditable.Extras.css
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-wysiwyg/Assets/MooEditable/MooEditable.Extras.css?rev=1701662&r1=1701661&r2=1701662&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-wysiwyg/Assets/MooEditable/MooEditable.Extras.css (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-wysiwyg/Assets/MooEditable/MooEditable.Extras.css Mon Sep 7 18:32:58 2015
@@ -10,5 +10,5 @@
.mooeditable-ui-toolbar .justifyleft-item .button-icon{ background-position: 0 -32px; }
.mooeditable-ui-toolbar .justifyright-item .button-icon{ background-position: 0 -48px; }
-.mooeditable-ui-toolbar .removeformat-item .button-icon { background: transparent url(Other/removeformat.png) no-repeat center center; }
-.mooeditable-ui-toolbar .insertHorizontalRule-item .button-icon { background: transparent url(Other/hr.png) no-repeat center center; }
+.mooeditable-ui-toolbar .removeformat-item .button-icon { background: transparent url(images/removeformat.png) no-repeat center center; }
+.mooeditable-ui-toolbar .insertHorizontalRule-item .button-icon { background: transparent url(images/hr.png) no-repeat center center; }
Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Attach.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Attach.less?rev=1701662&r1=1701661&r2=1701662&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Attach.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Attach.less Mon Sep 7 18:32:58 2015
@@ -51,7 +51,7 @@ form#uploadform
margin-bottom:0;
vertical-align:top;
- //hide the input[type=file] elements, they will be invoke to Form.Upload.js
+ //hide the input[type=file] elements
li input[type=file] {
position:absolute;
top:0;
@@ -77,8 +77,8 @@ form#uploadform
}
}
a.delete { position:relative; z-index:2; } //should be on top of the input block
- li > label { display:inline; font-weight:normal; }
- .badge { font-size:80%; font-weight:normal;}
+ li label { display:inline; font-weight:normal; }
+ li label .badge { font-size:80%; font-weight:normal;}
}
form.legacy .canDragAndDrop { .hide; }
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/Delete.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/Delete.jsp?rev=1701662&r1=1701661&r2=1701662&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Delete.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Delete.jsp Mon Sep 7 18:32:58 2015
@@ -14,7 +14,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.
--%>
<%@ page import="org.apache.log4j.*" %>
@@ -23,13 +23,13 @@
<%@ page import="org.apache.wiki.tags.BreadcrumbsTag" %>
<%@ page import="org.apache.wiki.tags.BreadcrumbsTag.FixedQueue" %>
<%@ page import="java.util.*" %>
+<%@ page import="org.apache.wiki.util.TextUtil" %>
<%@ page import="org.apache.wiki.attachment.Attachment" %>
<%@ page import="org.apache.wiki.preferences.Preferences" %>
-<%@ page import="org.apache.wiki.util.TextUtil" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%!
+<%!
Logger log = Logger.getLogger("JSPWiki");
%>
@@ -76,24 +76,32 @@
else if( delete != null )
{
log.info("Deleting a range of pages from "+pagereq);
-
+
for( Enumeration params = request.getParameterNames(); params.hasMoreElements(); )
{
String paramName = (String)params.nextElement();
-
+
if( paramName.startsWith("delver") )
{
int version = Integer.parseInt( paramName.substring(7) );
-
+
WikiPage p = wiki.getPage( pagereq, version );
-
+
log.debug("Deleting version "+version);
wiki.deleteVersion( p );
}
}
-
- response.sendRedirect( TextUtil.replaceString( wiki.getURL( WikiContext.VIEW, redirTo, "tab="+request.getParameter("tab"), false ),"&","&" ));
- return;
+
+ response.sendRedirect(
+ TextUtil.replaceString(
+ wiki.getURL(
+ WikiContext.VIEW, redirTo, "tab="+request.getParameter("tab"), false
+ ),"&","&"
+ )
+ );
+
+
+ return;
}
// Set the content type and include the response content
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ConflictContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ConflictContent.jsp?rev=1701662&r1=1701661&r2=1701662&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ConflictContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ConflictContent.jsp Mon Sep 7 18:32:58 2015
@@ -14,7 +14,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://jspwiki.apache.org/tags" prefix="wiki" %>
@@ -31,11 +31,13 @@
<fmt:message key="conflict.goedit" >
<fmt:param><wiki:EditLink><wiki:PageName /></wiki:EditLink></fmt:param>
</fmt:message>
-
+
<h4><%=LocaleSupport.getLocalizedMessage(pageContext, "conflict.modified")%></h4>
- <tt><%=pageContext.getAttribute("conflicttext",PageContext.REQUEST_SCOPE)%></tt>
-
+
+ <pre><%=pageContext.getAttribute("conflicttext",PageContext.REQUEST_SCOPE)%></pre>
+
<h4><%=LocaleSupport.getLocalizedMessage(pageContext, "conflict.yourtext")%></h4>
- <tt><%=pageContext.getAttribute("usertext",PageContext.REQUEST_SCOPE)%></tt>
+
+ <pre><%=pageContext.getAttribute("usertext",PageContext.REQUEST_SCOPE)%></pre>
</div>
\ No newline at end of file
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp?rev=1701662&r1=1701661&r2=1701662&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp Mon Sep 7 18:32:58 2015
@@ -79,18 +79,6 @@
/* startitem drives the pagination logic */
/* startitem=-1:show all; startitem=0:show block 1-20; startitem=20:block 21-40 ... */
%>
-<%--
-FIXME
-When deleting an Attachment, the Delete.jsp still redirects to InfoContent.jsp, iso Upload.jsp !
-As we currently do not want to touch the top-level JSP's and keep them compatible with the
-defaul template, let's fix this here
---%>
-<c:choose>
-<c:when test="${param.tab == 'attach'}">
- <wiki:Include page="AttachmentTab.jsp"/>
-</c:when>
-<c:otherwise>
-
<div class="page-content">
<wiki:PageExists>
@@ -169,7 +157,10 @@ defaul template, let's fix this here
<wiki:SetPagination start="<%=startitem%>" total="<%=itemcount%>" pagesize="<%=pagesize%>" maxlinks="9"
fmtkey="info.pagination"
- href='<%=c.getURL(WikiContext.INFO, c.getPage().getName(), "start=%s")%>' />
+ href='<%=c.getURL(WikiContext.INFO, wikiPage.getName(), "start=%s")%>' />
+
+ <c:set var="first" value="<%= startitem %>"/>
+ <c:set var="last" value="<%= startitem + pagesize %>"/>
<div class="table-filter-sort-condensed-striped">
<table class="table" >
@@ -183,8 +174,6 @@ defaul template, let's fix this here
</tr>
<wiki:HistoryIterator id="currentPage">
- <c:set var="first" value="<%= startitem %>"/>
- <c:set var="last" value="<%= startitem + pagesize %>"/>
<c:if test="${ first == -1 || ((currentPage.version > first ) && (currentPage.version <= last )) }">
<tr>
<td>
@@ -197,9 +186,10 @@ defaul template, let's fix this here
<fmt:formatDate value="${currentPage.lastModified}" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />
</td>
- <td class="nowrap">
- <c:set var="ff"><wiki:PageSize /></c:set>
- <fmt:formatNumber value='${ff/1000}' maxFractionDigits='3' minFractionDigits='1'/> <fmt:message key="info.kilobytes"/>
+ <c:set var="pageSize"><wiki:PageSize /></c:set>
+ <td class="nowrap" title="${pageSize} bytes">
+ <%--<fmt:formatNumber value='${pageSize/1000}' maxFractionDigits='3' minFractionDigits='1'/> <fmt:message key="info.kilobytes"/>--%>
+ <%= org.apache.commons.io.FileUtils.byteCountToDisplaySize( currentPage.getSize() ) %>
</td>
<td><wiki:Author /></td>
@@ -358,8 +348,9 @@ defaul template, let's fix this here
<td class="attach-name">${att.fileName}</td>
- <td class="nowrap">
- <fmt:formatNumber value='${att.size/1000.0}' maxFractionDigits='1' minFractionDigits='1'/> <fmt:message key="info.kilobytes"/>
+ <td class="nowrap" title="${att.size} bytes">
+ <%-- <fmt:formatNumber value='${att.size/1024.0}' maxFractionDigits='1' minFractionDigits='1'/> <fmt:message key="info.kilobytes"/> --%>
+ <%= org.apache.commons.io.FileUtils.byteCountToDisplaySize( att.getSize() ) %>
</td>
<td class="nowrap" jspwiki:sortvalue="${att.lastModified.time}">
@@ -400,6 +391,3 @@ defaul template, let's fix this here
</wiki:NoSuchPage>
</div>
-
-</c:otherwise>
-</c:choose>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageTab.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageTab.jsp?rev=1701662&r1=1701661&r2=1701662&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageTab.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageTab.jsp Mon Sep 7 18:32:58 2015
@@ -40,6 +40,11 @@
mainblogpage = pagename.substring(0, pagename.indexOf("_blogentry_"));
}
%>
+<c:choose>
+<c:when test="${param.tab == 'attach'}">
+ <wiki:Include page="AttachmentTab.jsp"/>
+</c:when>
+<c:otherwise>
<%-- If the page is an older version, then offer a note and a possibility
to restore this version as the latest one. --%>
@@ -117,4 +122,7 @@
<fmt:param><a class="createpage" href="<wiki:EditLink format='url'/>"><fmt:message key="common.createit"/></a></fmt:param>
</fmt:message>
</div>
-</wiki:NoSuchPage>
\ No newline at end of file
+</wiki:NoSuchPage>
+
+</c:otherwise>
+</c:choose>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/SearchBox.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/SearchBox.jsp?rev=1701662&r1=1701661&r2=1701662&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/SearchBox.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/SearchBox.jsp Mon Sep 7 18:32:58 2015
@@ -28,12 +28,6 @@
id="searchForm"
accept-charset="<wiki:ContentEncoding />">
-<%--
- <input type="text" size="20"
- class="form-control" name="query" id="query"
- accesskey="f"
- placeholder="<fmt:message key='sbox.search.submit'/>" />
---%>
<div class="btn"><span class="icon-search"></span><span class="caret"></span></div>
<ul class="dropdown-menu" data-hover-parent=".searchbox">