You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2018/12/31 02:33:56 UTC
[roller] branch bootstrap-ui updated (6a7af01 -> 927af81)
This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a change to branch bootstrap-ui
in repository https://gitbox.apache.org/repos/asf/roller.git.
from 6a7af01 Add missing bootstrap style.
add 927af81 Converted planet config, subscriptions and groups pages to Bootstrap. Code complete!
No new revisions were added by this update.
Summary of changes:
.../roller/weblogger/planet/ui/PlanetConfig.java | 8 +-
...anetSubscriptions.java => PlanetGroupSubs.java} | 191 ++++++++++++---------
.../roller/weblogger/planet/ui/PlanetGroups.java | 118 +++++++------
.../roller/weblogger/ui/core/util/menu/Menu.java | 4 +-
.../weblogger/ui/core/util/menu/MenuHelper.java | 42 ++---
.../main/resources/ApplicationResources.properties | 92 +++++-----
.../resources/ApplicationResources_de.properties | 22 +--
.../resources/ApplicationResources_es.properties | 20 +--
.../resources/ApplicationResources_fr.properties | 22 +--
.../resources/ApplicationResources_ja.properties | 22 +--
.../resources/ApplicationResources_ko.properties | 22 +--
.../resources/ApplicationResources_ru.properties | 22 +--
.../ApplicationResources_zh_CN.properties | 20 +--
.../weblogger/ui/struts2/admin/admin-menu.xml | 4 +-
app/src/main/resources/struts.xml | 9 +-
.../webapp/WEB-INF/jsps/admin/PlanetConfig.jsp | 100 +++++------
.../PlanetGroupSidebar.jsp} | 53 +++---
.../webapp/WEB-INF/jsps/admin/PlanetGroupSubs.jsp | 155 +++++++++++++++++
.../PlanetGroupSubsSidebar.jsp} | 79 +++++----
.../webapp/WEB-INF/jsps/admin/PlanetGroups.jsp | 172 +++++++------------
.../WEB-INF/jsps/admin/PlanetSubscriptions.jsp | 101 -----------
.../webapp/WEB-INF/jsps/core/MainMenuSidebar.jsp | 7 -
.../main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp | 6 +-
.../webapp/WEB-INF/jsps/tiles/bannerStatus.jsp | 4 +
.../webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp | 2 +-
.../WEB-INF/jsps/tiles/tiles-installpage.jsp | 2 +-
.../webapp/WEB-INF/jsps/tiles/tiles-loginpage.jsp | 19 +-
.../WEB-INF/jsps/tiles/tiles-mainmenupage.jsp | 33 ++--
.../webapp/WEB-INF/jsps/tiles/tiles-popuppage.jsp | 2 +-
.../WEB-INF/jsps/tiles/tiles-simple-tabbedpage.jsp | 17 +-
.../webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp | 25 +--
.../webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp | 49 +++---
app/src/main/webapp/WEB-INF/tiles.xml | 6 +-
app/src/main/webapp/roller-ui/styles/roller.css | 5 +-
34 files changed, 771 insertions(+), 684 deletions(-)
rename app/src/main/java/org/apache/roller/weblogger/planet/ui/{PlanetSubscriptions.java => PlanetGroupSubs.java} (61%)
copy app/src/main/webapp/WEB-INF/jsps/{editor/MediaFileEditSuccess.jsp => admin/PlanetGroupSidebar.jsp} (69%)
create mode 100644 app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroupSubs.jsp
copy app/src/main/webapp/WEB-INF/jsps/{editor/MediaFileAddSuccessInclude.jsp => admin/PlanetGroupSubsSidebar.jsp} (52%)
delete mode 100644 app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp