From d05adbff1d8ec8a6ce596fab3dcfb31082f525ce Mon Sep 17 00:00:00 2001 From: Christian Murphy Date: Mon, 5 Mar 2018 14:24:30 -0700 Subject: [PATCH 1/2] refactor: use Bootstrap css framework provided by uPortal code --- README.md | 19 +++++++++++-------- pom.xml | 2 -- .../webapp/WEB-INF/jsp/addAnnouncement.jsp | 1 - src/main/webapp/WEB-INF/jsp/addMembers.jsp | 1 - src/main/webapp/WEB-INF/jsp/addTopic.jsp | 1 - src/main/webapp/WEB-INF/jsp/baseAdmin.jsp | 5 ++--- src/main/webapp/WEB-INF/jsp/config.jsp | 1 - .../WEB-INF/jsp/displayAnnouncements.jsp | 1 - .../WEB-INF/jsp/displayFullAnnouncement.jsp | 1 - .../webapp/WEB-INF/jsp/displayHistory.jsp | 1 - .../WEB-INF/jsp/editDisplayPreferences.jsp | 1 - src/main/webapp/WEB-INF/jsp/error.jsp | 1 - .../webapp/WEB-INF/jsp/errorPermission.jsp | 1 - src/main/webapp/WEB-INF/jsp/help.jsp | 3 +-- .../WEB-INF/jsp/previewAnnouncement.jsp | 1 - src/main/webapp/WEB-INF/jsp/showHistory.jsp | 1 - src/main/webapp/WEB-INF/jsp/showTopic.jsp | 1 - 17 files changed, 14 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index a60432f4..8e7d9347 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,9 @@ See also documentation in the [AnnouncementsPortlet wiki on Confluence][]. ### Using Encrypted Property Values -You may optionally provide sensitive configuration items -- such as database passwords -- in encrypted format. Use the [Jasypt CLI Tools][] to encrypt the sensitive value, then include it in a `.properties` file like this: +You may optionally provide sensitive configuration items -- such as database passwords -- in encrypted format. Use the [Jasypt CLI Tools][] to encrypt the sensitive value, then include it in a `.properties` file like this: -``` ini +```ini hibernate.connection.password=ENC(9ffpQXJi/EPih9o+Xshm5g==) ``` @@ -24,10 +24,13 @@ Specify the encryption key using the `UP_JASYPT_KEY` environment variable. These dependencies are expected to be loaded by overall uPortal: -* [Font Awesome][] 4, last tested with [Font Awesome 4.7.0][] +* [Font Awesome][] 4, last tested with [Font Awesome 4.7.0][] +* [Bootstrap][] 3, last tested with [Bootstrap 3.3.7][] -[Sponsored Portlet]: https://wiki.jasig.org/display/PLT/Jasig+Sponsored+Portlets -[AnnouncementsPortlet wiki on Confluence]: https://wiki.jasig.org/display/PLT/Announcements+Portlet -[Font Awesome]: http://fontawesome.io/ -[Jasypt CLI Tools]: http://www.jasypt.org/cli.html -[Font Awesome 4.7.0]: https://github.com/FortAwesome/Font-Awesome/releases/tag/v4.7.0 +[sponsored portlet]: https://wiki.jasig.org/display/PLT/Jasig+Sponsored+Portlets +[announcementsportlet wiki on confluence]: https://wiki.jasig.org/display/PLT/Announcements+Portlet +[font awesome]: http://fontawesome.io/ +[bootstrap]: https://getbootstrap.com +[bootstrap 3.3.7]: https://getbootstrap.com/docs/3.3/ +[jasypt cli tools]: http://www.jasypt.org/cli.html +[font awesome 4.7.0]: https://github.com/FortAwesome/Font-Awesome/releases/tag/v4.7.0 diff --git a/pom.xml b/pom.xml index 937c019c..c3c56b40 100644 --- a/pom.xml +++ b/pom.xml @@ -441,8 +441,6 @@ org.jasig.resourceserver resource-server-content - rs/bootstrap-namespaced/3.1.1/ - rs/fontawesome/4.0.3/ rs/jquery/1.11.0/ rs/jquery-migrate/ rs/jqueryui/1.10.3/ diff --git a/src/main/webapp/WEB-INF/jsp/addAnnouncement.jsp b/src/main/webapp/WEB-INF/jsp/addAnnouncement.jsp index 41249447..4f6ef669 100644 --- a/src/main/webapp/WEB-INF/jsp/addAnnouncement.jsp +++ b/src/main/webapp/WEB-INF/jsp/addAnnouncement.jsp @@ -26,7 +26,6 @@ - diff --git a/src/main/webapp/WEB-INF/jsp/addMembers.jsp b/src/main/webapp/WEB-INF/jsp/addMembers.jsp index bf5345c3..a3e424a9 100644 --- a/src/main/webapp/WEB-INF/jsp/addMembers.jsp +++ b/src/main/webapp/WEB-INF/jsp/addMembers.jsp @@ -32,7 +32,6 @@ -
diff --git a/src/main/webapp/WEB-INF/jsp/addTopic.jsp b/src/main/webapp/WEB-INF/jsp/addTopic.jsp index d7ffe97c..545d3914 100644 --- a/src/main/webapp/WEB-INF/jsp/addTopic.jsp +++ b/src/main/webapp/WEB-INF/jsp/addTopic.jsp @@ -25,7 +25,6 @@ - diff --git a/src/main/webapp/WEB-INF/jsp/baseAdmin.jsp b/src/main/webapp/WEB-INF/jsp/baseAdmin.jsp index 197341f9..c957b16d 100644 --- a/src/main/webapp/WEB-INF/jsp/baseAdmin.jsp +++ b/src/main/webapp/WEB-INF/jsp/baseAdmin.jsp @@ -26,7 +26,6 @@ - " rel="stylesheet" type="text/css" /> @@ -163,7 +162,7 @@ -
+ " title=""> @@ -208,7 +207,7 @@ - + " title=""> diff --git a/src/main/webapp/WEB-INF/jsp/config.jsp b/src/main/webapp/WEB-INF/jsp/config.jsp index 1dc2eb45..ed9bb6b3 100644 --- a/src/main/webapp/WEB-INF/jsp/config.jsp +++ b/src/main/webapp/WEB-INF/jsp/config.jsp @@ -21,7 +21,6 @@ - " rel="stylesheet" type="text/css" /> diff --git a/src/main/webapp/WEB-INF/jsp/displayAnnouncements.jsp b/src/main/webapp/WEB-INF/jsp/displayAnnouncements.jsp index bd7f3866..695713ff 100644 --- a/src/main/webapp/WEB-INF/jsp/displayAnnouncements.jsp +++ b/src/main/webapp/WEB-INF/jsp/displayAnnouncements.jsp @@ -19,7 +19,6 @@ --%> - diff --git a/src/main/webapp/WEB-INF/jsp/displayFullAnnouncement.jsp b/src/main/webapp/WEB-INF/jsp/displayFullAnnouncement.jsp index 98f8075f..eb77c5b1 100644 --- a/src/main/webapp/WEB-INF/jsp/displayFullAnnouncement.jsp +++ b/src/main/webapp/WEB-INF/jsp/displayFullAnnouncement.jsp @@ -21,7 +21,6 @@ - diff --git a/src/main/webapp/WEB-INF/jsp/displayHistory.jsp b/src/main/webapp/WEB-INF/jsp/displayHistory.jsp index 40c98839..73e95ac1 100644 --- a/src/main/webapp/WEB-INF/jsp/displayHistory.jsp +++ b/src/main/webapp/WEB-INF/jsp/displayHistory.jsp @@ -21,7 +21,6 @@ -
diff --git a/src/main/webapp/WEB-INF/jsp/editDisplayPreferences.jsp b/src/main/webapp/WEB-INF/jsp/editDisplayPreferences.jsp index 53793742..cbdc7855 100644 --- a/src/main/webapp/WEB-INF/jsp/editDisplayPreferences.jsp +++ b/src/main/webapp/WEB-INF/jsp/editDisplayPreferences.jsp @@ -24,7 +24,6 @@ -
diff --git a/src/main/webapp/WEB-INF/jsp/error.jsp b/src/main/webapp/WEB-INF/jsp/error.jsp index 87d6020b..607ac32e 100644 --- a/src/main/webapp/WEB-INF/jsp/error.jsp +++ b/src/main/webapp/WEB-INF/jsp/error.jsp @@ -20,7 +20,6 @@ --%> -
diff --git a/src/main/webapp/WEB-INF/jsp/errorPermission.jsp b/src/main/webapp/WEB-INF/jsp/errorPermission.jsp index f2d44d82..2eb11efc 100644 --- a/src/main/webapp/WEB-INF/jsp/errorPermission.jsp +++ b/src/main/webapp/WEB-INF/jsp/errorPermission.jsp @@ -20,7 +20,6 @@ --%> -
diff --git a/src/main/webapp/WEB-INF/jsp/help.jsp b/src/main/webapp/WEB-INF/jsp/help.jsp index 7fd6e5c0..85375f1a 100644 --- a/src/main/webapp/WEB-INF/jsp/help.jsp +++ b/src/main/webapp/WEB-INF/jsp/help.jsp @@ -20,7 +20,6 @@ --%> -
@@ -158,4 +157,4 @@ For more details visit the AnnouncementsPortlet "> -
\ No newline at end of file +
diff --git a/src/main/webapp/WEB-INF/jsp/previewAnnouncement.jsp b/src/main/webapp/WEB-INF/jsp/previewAnnouncement.jsp index 57cc2c78..b89ffc4a 100644 --- a/src/main/webapp/WEB-INF/jsp/previewAnnouncement.jsp +++ b/src/main/webapp/WEB-INF/jsp/previewAnnouncement.jsp @@ -21,7 +21,6 @@ - diff --git a/src/main/webapp/WEB-INF/jsp/showHistory.jsp b/src/main/webapp/WEB-INF/jsp/showHistory.jsp index 6b89aa32..cb772d4b 100644 --- a/src/main/webapp/WEB-INF/jsp/showHistory.jsp +++ b/src/main/webapp/WEB-INF/jsp/showHistory.jsp @@ -21,7 +21,6 @@ -
diff --git a/src/main/webapp/WEB-INF/jsp/showTopic.jsp b/src/main/webapp/WEB-INF/jsp/showTopic.jsp index cd51080d..4906ead0 100644 --- a/src/main/webapp/WEB-INF/jsp/showTopic.jsp +++ b/src/main/webapp/WEB-INF/jsp/showTopic.jsp @@ -21,7 +21,6 @@ - From b31747e5c8e8187b56dd041bba8527ab5b3db38b Mon Sep 17 00:00:00 2001 From: Christian Murphy Date: Mon, 5 Mar 2018 14:25:35 -0700 Subject: [PATCH 2/2] refactor: remove unused scoped css wrapper --- src/main/webapp/WEB-INF/jsp/addAnnouncement.jsp | 2 +- src/main/webapp/WEB-INF/jsp/addMembers.jsp | 2 +- src/main/webapp/WEB-INF/jsp/addTopic.jsp | 2 +- src/main/webapp/WEB-INF/jsp/baseAdmin.jsp | 2 +- src/main/webapp/WEB-INF/jsp/displayAnnouncements.jsp | 2 +- src/main/webapp/WEB-INF/jsp/displayFullAnnouncement.jsp | 2 +- src/main/webapp/WEB-INF/jsp/displayHistory.jsp | 2 +- src/main/webapp/WEB-INF/jsp/editDisplayPreferences.jsp | 2 +- src/main/webapp/WEB-INF/jsp/error.jsp | 2 +- src/main/webapp/WEB-INF/jsp/errorPermission.jsp | 2 +- src/main/webapp/WEB-INF/jsp/previewAnnouncement.jsp | 2 +- src/main/webapp/WEB-INF/jsp/showHistory.jsp | 2 +- src/main/webapp/WEB-INF/jsp/showTopic.jsp | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/addAnnouncement.jsp b/src/main/webapp/WEB-INF/jsp/addAnnouncement.jsp index 4f6ef669..9b056dce 100644 --- a/src/main/webapp/WEB-INF/jsp/addAnnouncement.jsp +++ b/src/main/webapp/WEB-INF/jsp/addAnnouncement.jsp @@ -126,7 +126,7 @@ -
+

diff --git a/src/main/webapp/WEB-INF/jsp/addMembers.jsp b/src/main/webapp/WEB-INF/jsp/addMembers.jsp index a3e424a9..8569b257 100644 --- a/src/main/webapp/WEB-INF/jsp/addMembers.jsp +++ b/src/main/webapp/WEB-INF/jsp/addMembers.jsp @@ -34,7 +34,7 @@ -
+

diff --git a/src/main/webapp/WEB-INF/jsp/addTopic.jsp b/src/main/webapp/WEB-INF/jsp/addTopic.jsp index 545d3914..92e15eb2 100644 --- a/src/main/webapp/WEB-INF/jsp/addTopic.jsp +++ b/src/main/webapp/WEB-INF/jsp/addTopic.jsp @@ -66,7 +66,7 @@ } #tooltip h3, #tooltip div { margin: 0; } -
+

diff --git a/src/main/webapp/WEB-INF/jsp/baseAdmin.jsp b/src/main/webapp/WEB-INF/jsp/baseAdmin.jsp index c957b16d..2118ca35 100644 --- a/src/main/webapp/WEB-INF/jsp/baseAdmin.jsp +++ b/src/main/webapp/WEB-INF/jsp/baseAdmin.jsp @@ -105,7 +105,7 @@ } -
+
diff --git a/src/main/webapp/WEB-INF/jsp/displayAnnouncements.jsp b/src/main/webapp/WEB-INF/jsp/displayAnnouncements.jsp index 695713ff..506f1754 100644 --- a/src/main/webapp/WEB-INF/jsp/displayAnnouncements.jsp +++ b/src/main/webapp/WEB-INF/jsp/displayAnnouncements.jsp @@ -105,7 +105,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/jsp/displayFullAnnouncement.jsp b/src/main/webapp/WEB-INF/jsp/displayFullAnnouncement.jsp index eb77c5b1..2f83e30a 100644 --- a/src/main/webapp/WEB-INF/jsp/displayFullAnnouncement.jsp +++ b/src/main/webapp/WEB-INF/jsp/displayFullAnnouncement.jsp @@ -57,7 +57,7 @@ }); -
+
diff --git a/src/main/webapp/WEB-INF/jsp/displayHistory.jsp b/src/main/webapp/WEB-INF/jsp/displayHistory.jsp index 73e95ac1..d60ad94c 100644 --- a/src/main/webapp/WEB-INF/jsp/displayHistory.jsp +++ b/src/main/webapp/WEB-INF/jsp/displayHistory.jsp @@ -23,7 +23,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/jsp/editDisplayPreferences.jsp b/src/main/webapp/WEB-INF/jsp/editDisplayPreferences.jsp index cbdc7855..13b2999d 100644 --- a/src/main/webapp/WEB-INF/jsp/editDisplayPreferences.jsp +++ b/src/main/webapp/WEB-INF/jsp/editDisplayPreferences.jsp @@ -26,7 +26,7 @@ -
+

diff --git a/src/main/webapp/WEB-INF/jsp/error.jsp b/src/main/webapp/WEB-INF/jsp/error.jsp index 607ac32e..883b6037 100644 --- a/src/main/webapp/WEB-INF/jsp/error.jsp +++ b/src/main/webapp/WEB-INF/jsp/error.jsp @@ -22,7 +22,7 @@ -
+

diff --git a/src/main/webapp/WEB-INF/jsp/errorPermission.jsp b/src/main/webapp/WEB-INF/jsp/errorPermission.jsp index 2eb11efc..262188ac 100644 --- a/src/main/webapp/WEB-INF/jsp/errorPermission.jsp +++ b/src/main/webapp/WEB-INF/jsp/errorPermission.jsp @@ -22,7 +22,7 @@ -
+

diff --git a/src/main/webapp/WEB-INF/jsp/previewAnnouncement.jsp b/src/main/webapp/WEB-INF/jsp/previewAnnouncement.jsp index b89ffc4a..cfaf4c54 100644 --- a/src/main/webapp/WEB-INF/jsp/previewAnnouncement.jsp +++ b/src/main/webapp/WEB-INF/jsp/previewAnnouncement.jsp @@ -27,7 +27,7 @@ -
+

diff --git a/src/main/webapp/WEB-INF/jsp/showHistory.jsp b/src/main/webapp/WEB-INF/jsp/showHistory.jsp index cb772d4b..9abc7969 100644 --- a/src/main/webapp/WEB-INF/jsp/showHistory.jsp +++ b/src/main/webapp/WEB-INF/jsp/showHistory.jsp @@ -25,7 +25,7 @@
-
+

diff --git a/src/main/webapp/WEB-INF/jsp/showTopic.jsp b/src/main/webapp/WEB-INF/jsp/showTopic.jsp index 4906ead0..2f854a37 100644 --- a/src/main/webapp/WEB-INF/jsp/showTopic.jsp +++ b/src/main/webapp/WEB-INF/jsp/showTopic.jsp @@ -79,7 +79,7 @@ } -
+