This is an automated email from the ASF dual-hosted git repository.

mraible pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git

commit 3388f4c8386a96d2bd97510d35dda015f4e66a14
Merge: 8ce8b8048 1542418be
Author: Matt Raible <[email protected]>
AuthorDate: Fri Oct 23 23:51:37 2026 -0500

    Merge pull request #218 from mraible/feature/bootstrap-5
    
    Convert the admin and editor UI from Bootstrap 3 to Bootstrap 5.3 (move 
#156 to master)

 app/pom.xml                                        |  12 +-
 .../main/resources/ApplicationResources.properties |   4 +
 .../main/resources/template/bootstrap/tooltip.ftl  |  24 ++
 .../main/webapp/WEB-INF/jsps/admin/CacheInfo.jsp   |   2 +-
 .../webapp/WEB-INF/jsps/admin/GlobalConfig.jsp     |  10 +-
 .../main/webapp/WEB-INF/jsps/admin/PingTargets.jsp |  16 +-
 .../webapp/WEB-INF/jsps/admin/PlanetConfig.jsp     |   2 +-
 .../WEB-INF/jsps/admin/PlanetGroupSidebar.jsp      |   2 +-
 .../webapp/WEB-INF/jsps/admin/PlanetGroupSubs.jsp  |  18 +-
 .../WEB-INF/jsps/admin/PlanetGroupSubsSidebar.jsp  |   4 +-
 .../webapp/WEB-INF/jsps/admin/PlanetGroups.jsp     |   4 +-
 .../main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp   |   2 +-
 .../main/webapp/WEB-INF/jsps/admin/UserEdit.jsp    |   8 +-
 .../webapp/WEB-INF/jsps/core/BootstrapToken.jsp    |  10 +-
 .../webapp/WEB-INF/jsps/core/CreateDatabase.jsp    |   2 +-
 .../main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp |  31 ++-
 app/src/main/webapp/WEB-INF/jsps/core/Login.jsp    |  40 +--
 app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp |  32 +--
 .../webapp/WEB-INF/jsps/core/MainMenuSidebar.jsp   |   6 +-
 app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp  |  24 +-
 app/src/main/webapp/WEB-INF/jsps/core/Register.jsp |  18 +-
 app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp    |  26 +-
 .../webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp   |   8 +-
 .../main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp  |  38 +--
 .../webapp/WEB-INF/jsps/editor/BookmarksImport.jsp |   6 +-
 .../WEB-INF/jsps/editor/BookmarksSidebar.jsp       |   4 +-
 .../main/webapp/WEB-INF/jsps/editor/Categories.jsp |  14 +-
 .../WEB-INF/jsps/editor/CategoriesSidebar.jsp      |   4 +-
 .../main/webapp/WEB-INF/jsps/editor/Comments.jsp   |   2 +-
 .../webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp |  14 +-
 .../main/webapp/WEB-INF/jsps/editor/Entries.jsp    |  24 +-
 .../webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp  |  14 +-
 .../main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp  |  96 +++----
 .../webapp/WEB-INF/jsps/editor/EntryEditor.jsp     |  22 +-
 .../webapp/WEB-INF/jsps/editor/EntrySidebar.jsp    |   8 +-
 .../webapp/WEB-INF/jsps/editor/Maintenance.jsp     |   6 +-
 .../webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp    |  29 ++-
 .../jsps/editor/MediaFileAddExternalInclude.jsp    | 124 ++++-----
 .../WEB-INF/jsps/editor/MediaFileAddSuccess.jsp    |  18 +-
 .../webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp   |  16 +-
 .../WEB-INF/jsps/editor/MediaFileImageChooser.jsp  | 280 ++++++++++-----------
 .../WEB-INF/jsps/editor/MediaFileSidebar.jsp       |   8 +-
 .../webapp/WEB-INF/jsps/editor/MediaFileView.jsp   |  10 +-
 .../webapp/WEB-INF/jsps/editor/MemberResign.jsp    |   4 +-
 .../main/webapp/WEB-INF/jsps/editor/Members.jsp    |   4 +-
 .../webapp/WEB-INF/jsps/editor/MembersInvite.jsp   |   7 +-
 .../webapp/WEB-INF/jsps/editor/MembersSidebar.jsp  |   2 +-
 .../webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp  |  18 +-
 .../webapp/WEB-INF/jsps/editor/TemplateEdit.jsp    |  28 ++-
 .../main/webapp/WEB-INF/jsps/editor/Templates.jsp  |   4 +-
 .../WEB-INF/jsps/editor/TemplatesSidebar.jsp       |   4 +-
 .../main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp  |  47 ++--
 .../webapp/WEB-INF/jsps/editor/WeblogConfig.jsp    |   4 +-
 .../WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp    |   4 +-
 .../WEB-INF/jsps/tiles/bannerInstallation.jsp      |  10 +-
 .../webapp/WEB-INF/jsps/tiles/bannerStatus.jsp     |  66 +++--
 app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp    |  10 +-
 app/src/main/webapp/WEB-INF/jsps/tiles/menu.jsp    |  18 +-
 .../main/webapp/WEB-INF/jsps/tiles/messages.jsp    |  12 +-
 .../WEB-INF/jsps/tiles/tiles-mainmenupage.jsp      |  12 +-
 .../WEB-INF/jsps/tiles/tiles-simple-tabbedpage.jsp |   4 +-
 .../webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp |   4 +-
 .../webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp |  12 +-
 app/src/main/webapp/roller-ui/styles/roller.css    |  43 +++-
 app/src/main/webapp/theme/scripts/roller.js        |  16 +-
 .../main/webapp/themes/basicmobile/_day-mobile.vm  |   6 +-
 .../themes/basicmobile/basic-mobile-custom.css     | 135 +++++++++-
 .../webapp/themes/basicmobile/permalink-mobile.vm  |  17 +-
 .../themes/basicmobile/searchresults-mobile.vm     |  16 +-
 .../webapp/themes/basicmobile/weblog-mobile.vm     |  33 +--
 app/src/main/webapp/themes/basicmobile/weblog.vm   |  17 +-
 .../roller/weblogger/ui/EntryEditorAssetsTest.java |   2 +-
 72 files changed, 889 insertions(+), 712 deletions(-)

Reply via email to