roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ghu...@apache.org
Subject svn commit: r1602817 - /roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
Date Mon, 16 Jun 2014 07:47:28 GMT
Author: ghuber
Date: Mon Jun 16 07:47:28 2014
New Revision: 1602817

URL: http://svn.apache.org/r1602817
Log:
Float right does not seem to work correctly, an ugly clear fix solution works but.....

Modified:
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp

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=1602817&r1=1602816&r2=1602817&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 Mon Jun 16 07:47:28
2014
@@ -467,31 +467,32 @@
 
     <div style="clear:left;"></div>
 
-        <s:if test="(!pager && childFiles.size() > 0) || (pager &&
pager.items.size() > 0) || (currentDirectory.name != 'default' && !pager)">
-            <div class="control">
+    <s:if test="(!pager && childFiles.size() > 0) || (pager && pager.items.size()
> 0) || (currentDirectory.name != 'default' && !pager)">
+        <div class="control">
 
-                <span style="padding-left:7px">
-                    <s:if test="(!pager && childFiles.size() > 0) || (pager
&& pager.items.size() > 0)">
-                        <input id="toggleButton" type="button"
-                           value='<s:text name="mediaFileView.toggleSelected" />' onclick="onToggle()"
/>
-
-                        <input id="deleteButton" type="button"
-                           value='<s:text name="mediaFileView.deleteSelected" />' onclick="onDeleteSelected()"
/>
-
-                        <input id="moveButton" type="button"
-                           value='<s:text name="mediaFileView.moveSelected" />' onclick="onMoveSelected()"
/>
-
-                        <s:select id="moveTargetMenu" name="selectedDirectory" list="allDirectories"
listKey="id" listValue="name" />
-                    </s:if>
-                </span>
-
-                <s:if test="currentDirectory.name != 'default' && !pager">
-                    <span style="float:right">
-                            <s:submit value="%{getText('mediaFileView.deleteFolder')}"
action="mediaFileView!deleteFolder" onclick="onDeleteFolder();return false;"/>
-                    </span>
+            <span style="padding-left:7px">
+                <s:if test="(!pager && childFiles.size() > 0) || (pager &&
pager.items.size() > 0)">
+                    <input id="toggleButton" type="button"
+                       value='<s:text name="mediaFileView.toggleSelected" />' onclick="onToggle()"
/>
+
+                    <input id="deleteButton" type="button"
+                       value='<s:text name="mediaFileView.deleteSelected" />' onclick="onDeleteSelected()"
/>
+
+                    <input id="moveButton" type="button"
+                       value='<s:text name="mediaFileView.moveSelected" />' onclick="onMoveSelected()"
/>
+
+                    <s:select id="moveTargetMenu" name="selectedDirectory" list="allDirectories"
listKey="id" listValue="name" />
                 </s:if>
-            </div>
-        </s:if>
+            </span>
+
+            <s:if test="currentDirectory.name != 'default' && !pager">
+                <!-- need a clearfix to use this float -->
+                <!-- <span style="float:right"> -->
+                    <s:submit value="%{getText('mediaFileView.deleteFolder')}" action="mediaFileView!deleteFolder"
onclick="onDeleteFolder();return false;"/>
+                <!-- </span> -->
+            </s:if>
+        </div>
+    </s:if>
 
 </s:form>
 



Mime
View raw message