roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ghu...@apache.org
Subject svn commit: r1619327 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/struts2/editor/ resources/ webapp/WEB-INF/jsps/editor/ webapp/roller-ui/styles/
Date Thu, 21 Aug 2014 09:39:05 GMT
Author: ghuber
Date: Thu Aug 21 09:39:05 2014
New Revision: 1619327

URL: http://svn.apache.org/r1619327
Log:
Minor changes for release.

Modified:
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
    roller/trunk/app/src/main/resources/struts.xml
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp
    roller/trunk/app/src/main/webapp/roller-ui/styles/roller.css

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java?rev=1619327&r1=1619326&r2=1619327&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
Thu Aug 21 09:39:05 2014
@@ -73,7 +73,9 @@ public class Bookmarks extends UIAction 
                 setFolder(bmgr.getFolder(getFolderId()));
             } else {
                 setFolder(bmgr.getDefaultFolder(getActionWeblog()));
-                setFolderId(getFolder().getId());
+                if (getFolder() != null) {
+                    setFolderId(getFolder().getId());
+                }
             }
         } catch (WebloggerException ex) {
             log.error("Error looking up folder", ex);

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;
+    }
 
     public MediaFileBean getBean() {
         return bean;

Modified: roller/trunk/app/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/struts.xml?rev=1619327&r1=1619326&r2=1619327&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/struts.xml (original)
+++ roller/trunk/app/src/main/resources/struts.xml Thu Aug 21 09:39:05 2014
@@ -252,6 +252,10 @@
             <result name="input" type="tiles">.MediaFileAdd</result>
             <result name="success" type="tiles">.MediaFileAddSuccess</result>
             <result name="error" type="tiles">.MediaFileAdd</result>
+             <result name="cancel" type="redirectAction">
+                <param name="actionName">mediaFileView</param>
+                <param name="weblog">${weblog}</param>
+            </result>
         </action>
 
         <action name="mediaFileEdit!*" method="{1}"

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>

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp?rev=1619327&r1=1619326&r2=1619327&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp Thu Aug 21 09:39:05
2014
@@ -178,8 +178,9 @@
 
     <br />
     <div class="control">
-       <input type="submit" value='<s:text name="mediaFileAdd.upload" />' name="upload"
/>
-       <s:submit value="%{getText('generic.cancel')}" action="mediaFileView" />
+       <%-- <input type="submit" value='<s:text name="mediaFileAdd.upload" />'
name="upload" /> --%>
+       <s:submit value="%{getText('mediaFileAdd.upload')}" action="mediaFileAdd!save"
/>
+       <s:submit value="%{getText('generic.cancel')}" action="mediaFileAdd!cancel" />
     </div>
 
 </s:form>

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp?rev=1619327&r1=1619326&r2=1619327&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp Thu Aug 21 09:39:05
2014
@@ -378,10 +378,10 @@
     <div style="clear:left;"></div>
 
     <s:if test="(!pager && childFiles.size() > 0) || (pager && pager.items.size()
> 0) || (currentDirectory.name != 'default' && !pager)">
-        <div class="control">
+        <div class="control group" style="margin-top: 15px">
 
-            <span style="padding-left:7px">
-                <s:if test="(!pager && childFiles.size() > 0) || (pager &&
pager.items.size() > 0)">
+            <s:if test="(!pager && childFiles.size() > 0) || (pager &&
pager.items.size() > 0)">
+                <span style="padding-left:7px;margin-top: 20px">
                     <input id="toggleButton" type="button"
                        value='<s:text name="generic.toggle" />' onclick="onToggle()"
/>
 
@@ -392,12 +392,12 @@
                        value='<s:text name="mediaFileView.moveSelected" />' onclick="onMoveSelected()"
/>
 
                     <s:select id="moveTargetMenu" name="selectedDirectory" list="allDirectories"
listKey="id" listValue="name" />
-                </s:if>
-            </span>
+                </span>
+            </s:if>
 
             <s:if test="currentDirectory.name != 'default' && !pager">
-                <!-- need a clearfix to use this float -->
-                <span style="float:right">
+                <!-- need a group (above) clearfix to use this float correctly -->
+                <span style="float:right;">
                     <s:submit value="%{getText('mediaFileView.deleteFolder')}" action="mediaFileView!deleteFolder"
onclick="onDeleteFolder();return false;"/>
                 </span>
             </s:if>

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp?rev=1619327&r1=1619326&r2=1619327&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp Thu Aug 21 09:39:05
2014
@@ -26,7 +26,6 @@
 <s:form action="weblogConfig!save">
 	<s:hidden name="salt" />
     <s:hidden name="weblog" value="%{actionWeblog.handle}" />
-    <s:hidden name="bean.pageModels" />
 
 <table class="formtableNoDesc">
 

Modified: roller/trunk/app/src/main/webapp/roller-ui/styles/roller.css
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/styles/roller.css?rev=1619327&r1=1619326&r2=1619327&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/roller-ui/styles/roller.css (original)
+++ roller/trunk/app/src/main/webapp/roller-ui/styles/roller.css Thu Aug 21 09:39:05 2014
@@ -862,3 +862,10 @@ div.autocomplete ul li {
 
 #ewecontextmenu .yuimenuitem-selected{background-color:#36404C;}
 #ewecontextmenu .yuimenuitem-selected a {color:#ffffff;}
+
+/*** Right control floats aka clearfix ***/
+.group:after {
+  content: "";
+  display: table;
+  clear: both;
+}



Mime
View raw message