Repository: roller Updated Branches: refs/heads/bootstrap-ui b335e53b9 -> 3586dd75d
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/3586dd75 Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/3586dd75 Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/3586dd75 Branch: refs/heads/bootstrap-ui Commit: 3586dd75dff9d58bfc2ec6bcc784defcaf1ea299 Parents: b335e53 Author: Dave Johnson <[email protected]> Authored: Sun Mar 26 10:00:09 2017 -0400 Committer: Dave Johnson <[email protected]> Committed: Sun Mar 26 10:00:09 2017 -0400 ---------------------------------------------------------------------- .../WEB-INF/jsps/editor/MediaFileSidebar.jsp | 17 +++--- .../WEB-INF/jsps/editor/MediaFileView.jsp | 54 +++++++++++--------- app/src/main/webapp/roller-ui/styles/roller.css | 24 +++++++++ 3 files changed, 63 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/3586dd75/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp ---------------------------------------------------------------------- diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp index 6375d81..fd9420a 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp @@ -27,13 +27,13 @@ <br /> <br /> - <img src='<s:url value="/images/image_add.png"/>' border="0"alt="icon" /> + <span class="glyphicon glyphicon-folder-open"></span> <s:url var="mediaFileAddURL" action="mediaFileAdd"> <s:param name="weblog" value="%{actionWeblog.handle}" /> <s:param name="directoryName" value="%{directoryName}" /> </s:url> <a href='<s:property escape="false" value="%{mediaFileAddURL}" />' - <s:if test="actionName.equals('mediaFileAdd')">style='font-weight:bold;'</s:if> > + <s:if test="actionName.equals('mediaFileAdd')"> style='font-weight:bold;'</s:if> > <s:text name="mediaFileSidebar.add" /> </a> @@ -42,12 +42,12 @@ <%-- Only show Create New Directory control when NOT showing search results --%> <br /><br /> <div> - <img src='<s:url value="/images/folder_add.png"/>' border="0"alt="icon" /> + <span class="glyphicon glyphicon-picture"></span> <s:text name="mediaFileView.addDirectory" /><br /> <div style="padding-left:2em; padding-top:1em"> <s:text name="mediaFileView.directoryName" /> <input type="text" id="newDirectoryName" name="newDirectoryName" size="10" maxlength="25" /> - <input type="button" id="newDirectoryButton" + <input type="button" id="newDirectoryButton" class="btn" value='<s:text name="mediaFileView.create" />' onclick="onCreateDirectory()" /> </div> </div> @@ -62,7 +62,7 @@ <br /> <s:form id="mediaFileSearchForm" name="mediaFileSearchForm" - action="mediaFileView!search"> + action="mediaFileView!search" theme="bootstrap" cssClass="form-horizontal"> <s:hidden name="salt" /> <s:hidden name="weblog" /> @@ -114,12 +114,13 @@ <tr> <td> - <s:submit id="searchButton" value="%{getText('mediaFileView.search')}" cssStyle="margin:5px 0px;"/> + <s:submit id="searchButton" cssClass="btn" + value="%{getText('mediaFileView.search')}" cssStyle="margin:5px 0px;"/> </td> <td> <s:if test="pager"> - <input id="resetButton" style="margin:5px 0px;" type="button" - name="reset" value='<s:text name="mediaFileView.reset" />' /> + <input id="resetButton" style="margin:5px 0px;" type="button" cssClass="btn" + name="reset" value='<s:text name="mediaFileView.reset" />' /> </s:if> </td> http://git-wip-us.apache.org/repos/asf/roller/blob/3586dd75/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 4c784ea..f28de31 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp @@ -122,7 +122,6 @@ }); </script> - <s:form id="createPostForm" action='entryAddWithMediaFile'> <s:hidden name="salt" /> <input type="hidden" name="weblog" value='<s:property value="actionWeblog.handle" />' /> @@ -220,29 +219,34 @@ <s:if test="childFiles || (pager && pager.items.size() > 0)"> - <s:form id="mediaFileViewForm" name="mediaFileViewForm" action="mediaFileView"> + <s:form id="mediaFileViewForm" name="mediaFileViewForm" action="mediaFileView" theme="bootstrap" > <s:hidden name="salt" /> <s:hidden name="weblog" /> <s:hidden name="directoryId" /> <s:hidden name="newDirectoryName" /> <input type="hidden" name="mediaFileId" value="" /> - <div class="control"> - <span style="padding-left:7px"> - <s:text name="mediaFileView.sortBy" />: - <s:select id="sortByMenu" name="sortBy" list="sortOptions" listKey="key" - listValue="value" - onchange="document.mediaFileViewForm.submit();" /> - </span> - - <span style="float:right"> - <s:if test="!allDirectories.isEmpty"> - <%-- Folder to View combo-box --%> - <s:text name="mediaFileView.viewFolder" />: - <s:select name="viewDirectoryId" list="allDirectories" listKey="id" listValue="name" onchange="onView()" /> - </s:if> - </span> - </div> + <table width="100%"> + <tr> + <td> + <div width="40%"> + <s:text name="mediaFileView.sortBy"/>: + <s:select id="sortByMenu" name="sortBy" list="sortOptions" listKey="key" listValue="value" + onchange="document.mediaFileViewForm.submit();"/> + </div> + </td> + <td> + <div style="float:right" width="40%"> + <s:if test="!allDirectories.isEmpty"> + <%-- Folder to View combo-box --%> + <s:text name="mediaFileView.viewFolder"/>: + <s:select id="viewDirectoryMenu" name="viewDirectoryId" + list="allDirectories" listKey="id" listValue="name" onchange="onView()"/> + </s:if> + </div> + </td> + </tr> + </table> <%-- ***************************************************************** --%> @@ -258,7 +262,7 @@ } </script> - <div width="720px" height="500px"> + <div width="720px" height="500px" style="clear:right"> <ul id = "myMenu"> <s:if test="!pager"> @@ -382,22 +386,24 @@ <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" + <input id="toggleButton" type="button" class="btn" value='<s:text name="generic.toggle" />' onclick="onToggle()" /> - <input id="deleteButton" type="button" + <input id="deleteButton" type="button" class="btn" value='<s:text name="mediaFileView.deleteSelected" />' onclick="onDeleteSelected()" /> - <input id="moveButton" type="button" + <input id="moveButton" type="button" class="btn" value='<s:text name="mediaFileView.moveSelected" />' onclick="onMoveSelected()" /> - <s:select id="moveTargetMenu" name="selectedDirectory" list="allDirectories" listKey="id" listValue="name" /> + <s:select id="moveTargetMenu" name="selectedDirectory" + list="allDirectories" listKey="id" listValue="name" /> </span> </s:if> <s:if test="currentDirectory.name != 'default' && !pager"> <span style="float:right;"> - <s:submit value="%{getText('mediaFileView.deleteFolder')}" action="mediaFileView!deleteFolder" onclick="onDeleteFolder();return false;"/> + <s:submit value="%{getText('mediaFileView.deleteFolder')}" + action="mediaFileView!deleteFolder" onclick="onDeleteFolder();return false;"/> </span> </s:if> </div> http://git-wip-us.apache.org/repos/asf/roller/blob/3586dd75/app/src/main/webapp/roller-ui/styles/roller.css ---------------------------------------------------------------------- diff --git a/app/src/main/webapp/roller-ui/styles/roller.css b/app/src/main/webapp/roller-ui/styles/roller.css index a828574..d1ff652 100644 --- a/app/src/main/webapp/roller-ui/styles/roller.css +++ b/app/src/main/webapp/roller-ui/styles/roller.css @@ -228,3 +228,27 @@ body { padding: 1.5em; text-align: center; } + +/* media files */ + +.align-images { + display:inline; + float:left; + margin:5px; + list-style-type:none; + width:140px; + height:140px; + border: 1px solid #ccc; +} + +#sortByMenu { + width: 15em; +} + +#viewDirectoryMenu { + width: 15em; +} + +#moveTargetMenu { + width: 15em; +} \ No newline at end of file
