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 5eaf9cfee99eddf48391fbd7af5e31f7477d6ac9 Author: David M. Johnson <[email protected]> AuthorDate: Sun Oct 25 13:58:46 2026 -0400 Media pages keep the Powered-by card on wide screens The card hides on narrow screens, where the folder picker takes the sidebar's place, so the files stay near the top of the page. --- .../webapp/WEB-INF/jsps/tiles/brandingCard.jsp | 2 +- .../main/webapp/WEB-INF/jsps/tiles/contextLine.jsp | 32 ---------------------- app/src/main/webapp/WEB-INF/tiles.xml | 4 +-- app/src/main/webapp/roller-ui/styles/roller.css | 14 +++------- 4 files changed, 6 insertions(+), 46 deletions(-) diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/brandingCard.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/brandingCard.jsp index 952a5c7fc..471c8bc6d 100644 --- a/app/src/main/webapp/WEB-INF/jsps/tiles/brandingCard.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/tiles/brandingCard.jsp @@ -19,7 +19,7 @@ <%-- The "Powered by" card at the top of the tabbed page sidebar --%> -<div class="card"> +<div class="card roller-branding-card"> <div class="card-body" style="text-align: center"> <img src='<s:url value="/roller-ui/images/feather.svg" />' diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/contextLine.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/contextLine.jsp deleted file mode 100644 index d9a431fe8..000000000 --- a/app/src/main/webapp/WEB-INF/jsps/tiles/contextLine.jsp +++ /dev/null @@ -1,32 +0,0 @@ -<%-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. The ASF licenses this file to You - under the Apache License, Version 2.0 (the "License"); you may not - use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. For additional information regarding - copyright in this work, please see the NOTICE file in the top level - directory of this distribution. ---%> -<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> - -<%-- Media pages use the sidebar for folders, so they show the user and weblog in one line - instead of the "Powered by" card --%> - -<p class="roller-context-line"> - <s:if test="authenticatedUser != null"> - <a href="<s:url action="menu" namespace="/roller-ui" />"><s:property value="authenticatedUser.userName"/></a> - </s:if> - <s:if test="authenticatedUser != null && actionWeblog != null"><span aria-hidden="true"> · </span></s:if> - <s:if test="actionWeblog != null"> - <s:text name="mainPage.currentWebsite" />: - <a href='<s:property value="actionWeblog.absoluteURL" />'><s:property value="actionWeblog.handle" /></a> - </s:if> -</p> diff --git a/app/src/main/webapp/WEB-INF/tiles.xml b/app/src/main/webapp/WEB-INF/tiles.xml index 20c5efa93..113d48ece 100644 --- a/app/src/main/webapp/WEB-INF/tiles.xml +++ b/app/src/main/webapp/WEB-INF/tiles.xml @@ -46,10 +46,8 @@ <put-attribute name="footer" value="/WEB-INF/jsps/tiles/footer.jsp" /> </definition> - <!-- media pages: the sidebar holds folders, so a one-line user/weblog context - replaces the "Powered by" card --> + <!-- media pages --> <definition name=".tiles-mediapage" extends=".tiles-tabbedpage"> - <put-attribute name="branding" value="/WEB-INF/jsps/tiles/contextLine.jsp" /> <!-- media pages are laid out for narrow screens; other tabbed pages are not yet --> <put-attribute name="viewport" value="/WEB-INF/jsps/tiles/viewport.jsp" /> </definition> diff --git a/app/src/main/webapp/roller-ui/styles/roller.css b/app/src/main/webapp/roller-ui/styles/roller.css index a6c60f952..fe2e2963c 100644 --- a/app/src/main/webapp/roller-ui/styles/roller.css +++ b/app/src/main/webapp/roller-ui/styles/roller.css @@ -286,13 +286,6 @@ body { /* media library (MediaFileView.jsp, MediaFileSidebar.jsp, MediaFileCard.jsp) */ -.roller-context-line { - font-size: 0.875rem; - color: var(--bs-secondary-color); - margin: 0 0 1rem; - overflow-wrap: anywhere; -} - .media-folders-header, .media-header { display: flex; @@ -921,8 +914,8 @@ body { } } -/* Narrow screens (media pages set a device-width viewport): the folder list - gives way to the folder picker in the page header */ +/* Narrow screens (media pages set a device-width viewport): the sidebar cards + give way to the folder picker in the page header */ .media-folder-picker { display: none; } @@ -934,7 +927,8 @@ body { padding-right: 0.75rem; } - .roller-column-left .card:has(.media-folders) { + .roller-column-left .card:has(.media-folders), + .roller-branding-card { display: none; }
