This is an automated email from the ASF dual-hosted git repository. snoopdave pushed a commit to branch media-library in repository https://gitbox.apache.org/repos/asf/roller.git
commit e55c6acdbad441b54b3fd34da41ecd7593955512 Author: David M. Johnson <[email protected]> AuthorDate: Sun Oct 25 21:02:14 2026 -0400 Media library: keep the toolbar on one line; space out the upload form Sort order and layout move up beside the file count, so the selection count no longer wraps the toolbar and pushes the files down. The upload form's spacing rule targeted a fieldset that the simple theme does not render. --- .../webapp/WEB-INF/jsps/editor/MediaFileView.jsp | 46 ++++++++++++---------- app/src/main/webapp/roller-ui/styles/roller.css | 18 +++++++-- 2 files changed, 39 insertions(+), 25 deletions(-) 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 37c0cc428..9e12e57f3 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp @@ -122,8 +122,9 @@ </div> </s:form> -<%-- What is shown: criteria, scope and count --%> +<%-- What is shown: criteria, scope and count, then sort order and layout --%> +<div class="media-results-bar"> <div class="media-result-summary" role="status"> <s:if test="search"> <s:text name="mediaFileView.matchCount"><s:param value="pager.totalCount"/></s:text> @@ -152,6 +153,29 @@ <s:text name="mediaFileView.fileCount"><s:param value="pager.totalCount"/></s:text> </s:elseif> </div> +<s:if test="pager.items.size() > 0"> + <div class="media-toolbar-group media-view-options"> + <label for="sortByMenu"><s:text name="mediaFileView.sortBy"/></label> + <%-- belongs to the GET search form, so sorting keeps the criteria --%> + <select id="sortByMenu" name="bean.sortBy" form="mediaFileSearchForm" class="form-select form-select-sm"> + <s:iterator var="option" value="sortOptions"> + <option value="<s:property value='#option.key'/>" + <s:if test="#option.key == bean.sortBy">selected</s:if>><s:property value="#option.value"/></option> + </s:iterator> + </select> + <div class="btn-group btn-group-sm" role="group" aria-label="<s:text name='mediaFileView.layout'/>"> + <button type="button" class="btn btn-outline-secondary" data-media-view="grid" aria-pressed="true" + title="<s:text name='mediaFileView.gridView'/>"> + <span class="bi bi-grid-3x3-gap" aria-hidden="true"></span> + <span class="visually-hidden"><s:text name="mediaFileView.gridView"/></span></button> + <button type="button" class="btn btn-outline-secondary" data-media-view="list" aria-pressed="false" + title="<s:text name='mediaFileView.listView'/>"> + <span class="bi bi-list-ul" aria-hidden="true"></span> + <span class="visually-hidden"><s:text name="mediaFileView.listView"/></span></button> + </div> + </div> +</s:if> +</div> <%-- Files, with the selection toolbar above them --%> @@ -188,26 +212,6 @@ <span class="bi bi-trash" aria-hidden="true"></span> <s:text name="generic.delete"/></button> </div> - <div class="media-toolbar-group ms-auto"> - <label for="sortByMenu"><s:text name="mediaFileView.sortBy"/></label> - <%-- belongs to the GET search form, so sorting keeps the criteria --%> - <select id="sortByMenu" name="bean.sortBy" form="mediaFileSearchForm" class="form-select form-select-sm"> - <s:iterator var="option" value="sortOptions"> - <option value="<s:property value='#option.key'/>" - <s:if test="#option.key == bean.sortBy">selected</s:if>><s:property value="#option.value"/></option> - </s:iterator> - </select> - <div class="btn-group btn-group-sm" role="group" aria-label="<s:text name='mediaFileView.layout'/>"> - <button type="button" class="btn btn-outline-secondary" data-media-view="grid" aria-pressed="true" - title="<s:text name='mediaFileView.gridView'/>"> - <span class="bi bi-grid-3x3-gap" aria-hidden="true"></span> - <span class="visually-hidden"><s:text name="mediaFileView.gridView"/></span></button> - <button type="button" class="btn btn-outline-secondary" data-media-view="list" aria-pressed="false" - title="<s:text name='mediaFileView.listView'/>"> - <span class="bi bi-list-ul" aria-hidden="true"></span> - <span class="visually-hidden"><s:text name="mediaFileView.listView"/></span></button> - </div> - </div> </div> <s:include value="/WEB-INF/jsps/editor/Pager.jsp"/> diff --git a/app/src/main/webapp/roller-ui/styles/roller.css b/app/src/main/webapp/roller-ui/styles/roller.css index fe2e2963c..3405b0a75 100644 --- a/app/src/main/webapp/roller-ui/styles/roller.css +++ b/app/src/main/webapp/roller-ui/styles/roller.css @@ -427,7 +427,16 @@ body { gap: 0.5rem; } -.media-toolbar .form-select { +.media-results-bar { + display: flex; + flex-wrap: wrap; + align-items: center; + justify-content: space-between; + gap: 0.5rem 1rem; +} + +.media-toolbar .form-select, +.media-view-options .form-select { width: auto; max-width: 12rem; } @@ -580,7 +589,7 @@ body { overflow-wrap: anywhere; } -.media-toolbar .btn-group { +.media-view-options .btn-group { margin-left: 0.5rem; } @@ -778,7 +787,7 @@ body { /* media upload (MediaFileAdd.jsp) */ -.media-upload > fieldset > * + * { +.media-upload > * + * { margin-top: 1rem; } @@ -889,7 +898,8 @@ body { font-weight: 600; } -.media-upload-shared .form-label { +.media-upload-shared .form-label, +.media-upload-shared .form-check { margin-top: 0.75rem; }
