On 08/21/2014 05:39 AM, ghu...@apache.org wrote:
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
URL:http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java?rev=1619327&r1=1619326&r2=1619327&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
Thu Aug 21 09:39:05 2014
@@ -19,11 +19,11 @@ package org.apache.roller.weblogger.ui.s
import java.io.File;
import java.io.FileInputStream;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -248,6 +248,15 @@ public class MediaFileAdd extends MediaF
addError("error.upload.disabled");
}
}
+
+ /**
+ * Cancel.
+ *
+ * @return the string
+ */
+ public String cancel() {
+ return CANCEL;
+ }
Just FYI, not necessary, as cancel() is defined as above in UIAction,
for any action needing it.
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
URL:http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp?rev=1619327&r1=1619326&r2=1619327&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp Thu Aug
21 09:39:05 2014
@@ -153,7 +153,7 @@ function onMove()
</s:else>
</table>
- <div class="control">
+ <div class="control group">
<s:if test="folder.bookmarks.size > 0">
<%-- Delete-selected button --%>
<input type="button" value="<s:text name="bookmarksForm.delete"/>"
onclick="onDelete();return false;" />
@@ -168,6 +168,7 @@ function onMove()
</s:if>
<s:if test="folder.name != 'default'">
+ <!-- need a group (above) clearfix to use this float correctly -->
<span style="float:right">
<s:submit value="%{getText('bookmarksForm.deleteFolder')}"
action="bookmarks!deleteFolder" onclick="onDeleteFolder();return false;"/>
</span>
Boo Hiss. "group" is way too generic a name for a class, call it
"clearfix" or something. I'll fix it...
I never heard of the clearfix problem until googling it this morning,
the latest Firefox and Chrome browsers have no problem with it. Which
browsers are you using that require the clearfix hack?
Cheers,
Glen
