Repository: roller Updated Branches: refs/heads/bootstrap-ui 3586dd75d -> 73528e025
Some progress on Bootstrap version of MediaFileView page. Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/73528e02 Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/73528e02 Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/73528e02 Branch: refs/heads/bootstrap-ui Commit: 73528e0256d24456997ec1ae7453e0f6283fa8ed Parents: 3586dd7 Author: Dave Johnson <[email protected]> Authored: Tue Mar 28 08:32:00 2017 -0400 Committer: Dave Johnson <[email protected]> Committed: Tue Mar 28 08:32:00 2017 -0400 ---------------------------------------------------------------------- .../WEB-INF/jsps/editor/MediaFileView.jsp | 36 ++++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/73528e02/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp ---------------------------------------------------------------------- diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp index f28de31..a8e793b 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp @@ -381,33 +381,39 @@ <div style="clear:left;"></div> - <s:if test="(!pager && childFiles.size() > 0) || (pager && pager.items.size() > 0) || (currentDirectory.name != 'default' && !pager)"> - <div class="control clearfix" style="margin-top: 15px"> + <s:if test="(!pager && childFiles.size() > 0) || (pager && pager.items.size() > 0) || (currentDirectory.name != 'default' && !pager)"> - <s:if test="(!pager && childFiles.size() > 0) || (pager && pager.items.size() > 0)"> - <span style="padding-left:7px;margin-top: 20px"> + <table width="100%"> + <tr> + <td> + + <s:if test="(!pager && childFiles.size() > 0) || (pager && pager.items.size() > 0)"> <input id="toggleButton" type="button" class="btn" - value='<s:text name="generic.toggle" />' onclick="onToggle()" /> + value='<s:text name="generic.toggle" />' onclick="onToggle()" /> <input id="deleteButton" type="button" class="btn" - value='<s:text name="mediaFileView.deleteSelected" />' onclick="onDeleteSelected()" /> + value='<s:text name="mediaFileView.deleteSelected" />' onclick="onDeleteSelected()" /> <input id="moveButton" type="button" class="btn" - value='<s:text name="mediaFileView.moveSelected" />' onclick="onMoveSelected()" /> + value='<s:text name="mediaFileView.moveSelected" />' onclick="onMoveSelected()" /> - <s:select id="moveTargetMenu" name="selectedDirectory" - list="allDirectories" listKey="id" listValue="name" /> - </span> - </s:if> + </s:if> + + <s:select id="moveTargetMenu" name="selectedDirectory" + list="allDirectories" listKey="id" listValue="name" /> - <s:if test="currentDirectory.name != 'default' && !pager"> + <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> - </s:if> - </div> - </s:if> + </s:if> + + </td> + </tr> + </table> + + </s:if> </s:form>
