Skip to content

Convert the admin and editor UI from Bootstrap 3 to Bootstrap 5.3 #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mraible wants to merge 1 commit into from
Open

Convert the admin and editor UI from Bootstrap 3 to Bootstrap 5.3 #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ limitations under the License.
<spring.security.version>7.0.6</spring.security.version>
<struts.version>7.1.1</struts.version>
<struts-bootstrap.version>6.1.0</struts-bootstrap.version>
<bootstrap.version>5.3.8</bootstrap.version>
<bootstrap-icons.version>1.13.1</bootstrap-icons.version>
<velocity.version>2.4.1</velocity.version>
<ws-commons-util.version>1.0.2</ws-commons-util.version>
<xmlrpc-version>3.1.3</xmlrpc-version>
Expand Down Expand Up @@ -246,7 +248,6 @@ limitations under the License.
<version>${struts.version}</version>
</dependency>

<!-- note: update head.jsp on webjar version change -->
<!-- Supplies the "bootstrap" form theme templates the JSPs render with.
Maintained at github.com/struts-community-plugins/struts2-bootstrap. -->
<dependency>
Expand All @@ -255,12 +256,19 @@ limitations under the License.
<version>${struts-bootstrap.version}</version>
</dependency>

<!-- note: update head.jsp on webjar version change -->
<!-- WebJar assets live under META-INF/resources, which Servlet 3.0+
containers serve from the docroot, so no webjars servlet is needed -->
<dependency>
<groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId>
<version>3.4.1</version>
<version>${bootstrap.version}</version>
</dependency>

<dependency>
<groupId>org.webjars.npm</groupId>
<artifactId>bootstrap-icons</artifactId>
<version>${bootstrap-icons.version}</version>
</dependency>

<dependency>
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/resources/ApplicationResources.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1348,6 +1348,10 @@ userSettings.email=Email
userSettings.locale=Locale
userSettings.timeZone=Timezone
userSettings.openIdUrl=Federated Identity
userSettings.oidcIssuer=OIDC Issuer
userSettings.oidcSubject=OIDC Subject
userSettings.tip.oidcIssuer=The identity provider that authenticated you. Assigned at login and cannot be changed here.
userSettings.tip.oidcSubject=Your unique identifier at that identity provider. Assigned at login and cannot be changed here.
userSettings.tip.username=Usernames can''t be changed.

# ----------------------------------------------------------------- Your profile (profile.jsp)
Expand Down
24 changes: 24 additions & 0 deletions app/src/main/resources/template/bootstrap/tooltip.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<#--
* 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.
*
* Overrides the struts2-bootstrap-plugin template, which still emits the
* pre-Bootstrap-5 "data-toggle" attribute. Bootstrap 5 reads "data-bs-toggle"
* and tooltips are opt-in, so roller.js initialises these.
-->
<#if attributes.tooltip?? && attributes.tooltip?has_content>
<i class="bi bi-info-circle s2b_tooltip" data-bs-toggle="tooltip" title="${attributes.tooltip}"></i>
</#if><#t/>
2 changes: 1 addition & 1 deletion app/src/main/webapp/WEB-INF/jsps/admin/CacheInfo.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<s:form action="cacheInfo!clear">
<s:hidden name="salt" />
<s:hidden name="cache" value="%{#cache.key}" />
<s:submit value="%{getText('cacheInfo.clear')}" cssClass="btn btn-default" />
<s:submit theme="simple" value="%{getText('cacheInfo.clear')}" cssClass="btn btn-outline-secondary" />
</s:form>
</td>
</tr>
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@

<%-- "integer" use input type number --%>
<s:elseif test="#pd.type == 'integer'">
<div class="form-group ">
<label class="col-sm-3 control-label"
<div class="row mb-3">
<label class="col-sm-3 col-form-label"
for='globalConfig_<s:property value="#pd.nameWithUnderbars" />'>
<s:text name="%{#pd.key}"/>
</label>
Expand All @@ -86,8 +86,8 @@

<%-- "float" use input type number --%>
<s:elseif test="#pd.type == 'float'">
<div class="form-group ">
<label class="col-sm-3 control-label"
<div class="row mb-3">
<label class="col-sm-3 col-form-label"
for='globalConfig_<s:property value="#pd.nameWithUnderbars" />'>
<s:text name="%{#pd.key}"/>
</label>
Expand All @@ -112,7 +112,7 @@

</s:iterator>

<input id="saveButton" class="btn btn-default" type="submit" value="<s:text name="generic.save"/>"/>
<input id="saveButton" class="btn btn-outline-secondary" type="submit" value="<s:text name="generic.save"/>"/>

</s:form>

Expand Down
12 changes: 6 additions & 6 deletions app/src/main/webapp/WEB-INF/jsps/admin/PingTargets.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@
'<s:property value="#pingTarget.name" />',
'<s:property value="#pingTarget.pingUrl" />'
)">
<span class="glyphicon glyphicon-edit" aria-hidden="true"> </span>
<span class="bi bi-pencil-square" aria-hidden="true"> </span>
</a>
</td>

<td class="rollertable" align="center">
<a href="#" onclick="showDeleteModal('<s:property value="#pingTarget.id"/>')">
<span class="glyphicon glyphicon-trash" aria-hidden="true"> </span>
<span class="bi bi-trash" aria-hidden="true"> </span>
</a>
</td>

Expand All @@ -94,7 +94,7 @@
<s:param name="weblog" value="actionWeblog.handle"/>
</s:url>
<a href="#" onclick="showAddEditModal()">
<span class="glyphicon glyphicon-plus-sign" aria-hidden="true"> </span>
<span class="bi bi-plus-circle" aria-hidden="true"> </span>
<s:text name="pingTarget.addTarget"/>
</a>
</div>
Expand Down Expand Up @@ -123,9 +123,9 @@
</div>

<div class="modal-footer">
<s:submit cssClass="btn btn-danger"
<s:submit theme="simple" cssClass="btn btn-danger"
value="%{getText('generic.yes')}" action="commonPingTargets!delete"/>
<button type="button" class="btn" data-dismiss="modal">
<button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">
<s:text name="generic.cancel"/>
</button>
</div>
Expand Down Expand Up @@ -190,7 +190,7 @@
<s:text name="generic.save"/>
</button>

<button type="button" class="btn" data-dismiss="modal">
<button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">
<s:text name="generic.cancel"/>
</button>

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/webapp/WEB-INF/jsps/admin/PlanetConfig.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@

</s:iterator>

<input class="btn btn-default" type="submit" value="<s:text name="generic.save"/>"/>
<input class="btn btn-outline-secondary" type="submit" value="<s:text name="generic.save"/>"/>

</s:form>
2 changes: 1 addition & 1 deletion app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroupSidebar.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@
</s:url>

<s:a href="%{createNewUrl}">
<span class="glyphicon glyphicon-plus" aria-hidden="true"> </span>
<span class="bi bi-plus-lg" aria-hidden="true"> </span>
Create new Custom Planet Group
</s:a>
18 changes: 9 additions & 9 deletions app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroupSubs.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,19 @@
<%-- only show edit form for custom group --%>
<s:if test="groupHandle != 'all'">

<div class="panel panel-default">
<div class="panel-heading">
<div class="card">
<div class="card-header">
<p><s:text name="planetGroupSubs.properties"/></p>
</div>
<div class="panel-body">
<div class="card-body">
<s:if test="createNew">
<s:text name="planetGroupSubs.creatingNewGroup" />
</s:if>
<s:else>
<s:text name="planetGroupSubs.editingExistingGroup" />
</s:else>

<s:form action="planetGroupSubs!saveGroup" theme="bootstrap" cssClass="form-horizontal" style="margin-top:1em">
<s:form action="planetGroupSubs!saveGroup" theme="bootstrap" style="margin-top:1em" cssClass="form-horizontal">
<s:hidden name="salt"/>
<s:hidden name="group.id"/>

Expand All @@ -76,12 +76,12 @@
tooltip="%{getText('planetGroups.tip.handle')}"/>


<div class="form-group ">
<label class="col-sm-3 control-label"></label>
<div class="row mb-3">
<label class="col-sm-3 col-form-label"></label>
<div class="col-sm-9 controls">
<s:submit value="%{getText('generic.save')}" cssClass="btn btn-default"/>
<s:submit theme="simple" value="%{getText('generic.save')}" cssClass="btn btn-outline-secondary"/>
<s:if test="createNew">
<input type="button" class="btn"
<input type="button" class="btn btn-outline-secondary"
value='<s:text name="generic.cancel" />'
onclick="window.location='<s:url action="planetGroups"/>'"/>
</s:if>
Expand Down Expand Up @@ -127,7 +127,7 @@
<td><s:set var="feedURL" value="#sub.feedURL"/> ${fn:substring(feedURL, 0, 100)} </td>
<td>
<a href="javascript: void(0);" onclick="confirmDelete('<s:property value="feedURL"/>')">
<span class="glyphicon glyphicon-remove" aria-hidden="true"> </span>
<span class="bi bi-x-lg" aria-hidden="true"> </span>
<s:text name="generic.delete"/>
</a>
</td>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroupSubsSidebar.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<s:text name="planetGroupSubs.addFeed"/>

<s:form action="planetGroupSubs!saveSubscription"
theme="bootstrap" cssClass="form-horizontal" style="margin-top:1em">
theme="bootstrap" style="margin-top:1em" cssClass="form-horizontal">
<s:hidden name="salt"/>
<s:hidden name="group.handle"/>

Expand All @@ -38,7 +38,7 @@

<p id="feedback-area" style="clear:right; width:100%"></p>

<s:submit value="%{getText('generic.save')}" cssClass="btn btn-default" />
<s:submit theme="simple" value="%{getText('generic.save')}" cssClass="btn btn-outline-secondary" />

</s:form>

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@
<s:param name="group.id" value="#group.id"/>
</s:url>
<s:a href="%{groupUrl}">
<span class="glyphicon glyphicon-edit" aria-hidden="true"></span>
<span class="bi bi-pencil-square" aria-hidden="true"></span>
<s:text name='generic.edit'/>
</s:a>
</td>

<td>
<a href="javascript: void(0);" onclick="confirmDelete('<s:property value="#group.handle"/>')">
<span class="glyphicon glyphicon-remove" aria-hidden="true"> </span>
<span class="bi bi-x-lg" aria-hidden="true"> </span>
<s:text name="generic.delete"/>
</a>
</td>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

<s:select class="form-control" id="userList" size="10" onchange="onUserSelected()" list="bean.list" />

<button type="submit" class="btn btn-default" id="user-submit">
<button type="submit" class="btn btn-outline-secondary" id="user-submit">
<s:text name="generic.edit" />
</button>

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/webapp/WEB-INF/jsps/core/CreateDatabase.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@

<s:form action="install!create">
<s:hidden name="salt" />
<s:submit value="%{getText('installer.yesCreateTables')}" cssClass="btn btn-default" />
<s:submit theme="simple" value="%{getText('installer.yesCreateTables')}" cssClass="btn btn-outline-secondary" />
</s:form>

</s:else>
Expand Down
31 changes: 15 additions & 16 deletions app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
name="bean.handle" size="30" maxlength="30"
onkeyup="handlePreview(this)" data-msg-required="%{getText('CreateWeblog.error.handleNull')}" required="required"/>

<div class="form-group">
<div class="row mb-3">
<label class="col-sm-3"></label>
<div class="col-sm-9 controls">
<s:text name="createWebsite.weblogUrl" />:&nbsp;
Expand All @@ -59,24 +59,28 @@
tooltip="%{getText('createWebsite.tip.timezone')}"
name="bean.timeZone" size="1" list="timeZonesList"/>

<div class="form-group" ng-app="themeSelectModule" ng-controller="themeController">
<label class="col-sm-3 control-label" for="createWeblog_bean_timeZone">
<div class="row mb-3" ng-app="themeSelectModule" ng-controller="themeController">
<label class="col-sm-3 col-form-label" for="createWeblog_bean_timeZone">
<s:text name="createWebsite.theme" />
</label>
<div class="col-sm-9 controls">
<s:select name="bean.theme" size="1" list="themes" listKey="id" listValue="name"
<s:select theme="simple" cssClass="form-select" name="bean.theme" size="1"
list="themes" listKey="id" listValue="name"
onchange="previewImage(this[selectedIndex].value)"/>
<p id="themedescription"></p>
<p><img id="themeThumbnail" src="" class="img-responsive img-thumbnail" style="max-width: 30em" /></p>
<p><img id="themeThumbnail" src="" class="img-fluid img-thumbnail" style="max-width: 30em" /></p>

</div>
</div>

<s:submit cssClass="btn btn-default"
value="%{getText('createWebsite.button.save')}"/>

<input class="btn" type="button" value="<s:text name="generic.cancel"/>"
onclick="window.location='<s:url action="menu"/>'"/>
<div class="row mb-3">
<div class="col-sm-9 offset-sm-3">
<s:submit cssClass="btn btn-primary"
value="%{getText('createWebsite.button.save')}" theme="simple"/>
<input class="btn btn-outline-secondary" type="button" value="<s:text name="generic.cancel"/>"
onclick="window.location='<s:url action="menu"/>'"/>
</div>
</div>

</s:form>

Expand All @@ -92,12 +96,7 @@

saveButton = $("#createWeblog_0");

<s:if test="bean.theme == null">
previewImage('<s:property value="themes[0].id"/>');
</s:if>
<s:else>
previewImage('<s:property value="bean.theme"/>');
</s:else>
previewImage($('select[name="bean.theme"]').val());

});

Expand Down
Loading
Loading