From 42ea2468c9cec768703d41a1e3a6eee82706035b Mon Sep 17 00:00:00 2001 From: Amanda Anganes Date: Thu, 28 Feb 2013 13:56:09 -0500 Subject: [PATCH] Split up about, contact, stats tags into two each and removed logic from the *Content tag files --- .../main/webapp/WEB-INF/tags/aboutContent.tag | 33 +++++-------------- .../webapp/WEB-INF/tags/contactContent.tag | 28 ++++------------ .../webapp/WEB-INF/tags/landingPageAbout.tag | 5 +++ .../WEB-INF/tags/landingPageContact.tag | 5 +++ .../webapp/WEB-INF/tags/landingPageStats.tag | 5 +++ ...ingPageText.tag => landingPageWelcome.tag} | 0 .../main/webapp/WEB-INF/tags/statsContent.tag | 24 +++----------- .../src/main/webapp/WEB-INF/views/home.jsp | 8 ++--- 8 files changed, 37 insertions(+), 71 deletions(-) create mode 100644 openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageAbout.tag create mode 100644 openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageContact.tag create mode 100644 openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageStats.tag rename openid-connect-server/src/main/webapp/WEB-INF/tags/{landingPageText.tag => landingPageWelcome.tag} (100%) diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/aboutContent.tag b/openid-connect-server/src/main/webapp/WEB-INF/tags/aboutContent.tag index 39a9fca75..eb4fd6e5c 100644 --- a/openid-connect-server/src/main/webapp/WEB-INF/tags/aboutContent.tag +++ b/openid-connect-server/src/main/webapp/WEB-INF/tags/aboutContent.tag @@ -1,25 +1,8 @@ -<%@attribute name="short" required="false" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> - - - - -

About

- -

This OpenID Connect service is built from the MITREid Connect Open Source project started by The MITRE Corporation.

- -

More »

- - - -

About

-

- This OpenID Connect service is built from the MITREid Connect Open Source project started by The MITRE Corporation. -

-

- More information about the project can be found on our GitHub page: MTIREid Connect on GitHub - There, you can submit bug reports, give feedback, or even contribute code patches for additional features you'd like to see. -

- - - \ No newline at end of file +

About

+

+This OpenID Connect service is built from the MITREid Connect Open Source project started by The MITRE Corporation. +

+

+More information about the project can be found on our GitHub page: MTIREid Connect on GitHub +There, you can submit bug reports, give feedback, or even contribute code patches for additional features you'd like to see. +

\ No newline at end of file diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/contactContent.tag b/openid-connect-server/src/main/webapp/WEB-INF/tags/contactContent.tag index ba6967f95..6d74c9747 100644 --- a/openid-connect-server/src/main/webapp/WEB-INF/tags/contactContent.tag +++ b/openid-connect-server/src/main/webapp/WEB-INF/tags/contactContent.tag @@ -1,22 +1,6 @@ -<%@attribute name="short" required="false" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> - - - - -

Contact

- -

For more information or support, contact the administrators of this system.

- -

Email »

- - - -

Contact

-

- For general assistance, email Bob at email@address.com. - To offer feedback, email Sue at email@address.com. - To report a system failure or bug report, email Joe at email@address.com. -

- - \ No newline at end of file +

Contact

+

+For general assistance, email Bob at email@address.com. +To offer feedback, email Sue at email@address.com. +To report a system failure or bug report, email Joe at email@address.com. +

diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageAbout.tag b/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageAbout.tag new file mode 100644 index 000000000..35ac079bb --- /dev/null +++ b/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageAbout.tag @@ -0,0 +1,5 @@ +

About

+ +

This OpenID Connect service is built from the MITREid Connect Open Source project started by The MITRE Corporation.

+ +

More »

\ No newline at end of file diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageContact.tag b/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageContact.tag new file mode 100644 index 000000000..ef5fc1f0f --- /dev/null +++ b/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageContact.tag @@ -0,0 +1,5 @@ +

Contact

+ +

For more information or support, contact the administrators of this system.

+ +

Email »

\ No newline at end of file diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageStats.tag b/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageStats.tag new file mode 100644 index 000000000..eddbfbc38 --- /dev/null +++ b/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageStats.tag @@ -0,0 +1,5 @@ +

Current Statistics

+ +

There have been ${statsSummary["userCount"]} users of this + system who have logged in to ${statsSummary["clientCount"]} + total sites, for a total of ${statsSummary["approvalCount"]} site approvals.

\ No newline at end of file diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageText.tag b/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag similarity index 100% rename from openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageText.tag rename to openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/statsContent.tag b/openid-connect-server/src/main/webapp/WEB-INF/tags/statsContent.tag index d2f88da3f..d735a9213 100644 --- a/openid-connect-server/src/main/webapp/WEB-INF/tags/statsContent.tag +++ b/openid-connect-server/src/main/webapp/WEB-INF/tags/statsContent.tag @@ -1,21 +1,5 @@ -<%@attribute name="short" required="false" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +

Current Statistics

- - - -

Current Statistics

- -

There have been ${statsSummary["userCount"]} users of this - system who have logged in to ${statsSummary["clientCount"]} - total sites, for a total of ${statsSummary["approvalCount"]} site approvals.

- - - -

Current Statistics

- -

There have been ${statsSummary["userCount"]} users of this - system who have logged in to ${statsSummary["clientCount"]} - total sites, for a total of ${statsSummary["approvalCount"]} site approvals.

- - \ No newline at end of file +

There have been ${statsSummary["userCount"]} users of this + system who have logged in to ${statsSummary["clientCount"]} + total sites, for a total of ${statsSummary["approvalCount"]} site approvals.

\ No newline at end of file diff --git a/openid-connect-server/src/main/webapp/WEB-INF/views/home.jsp b/openid-connect-server/src/main/webapp/WEB-INF/views/home.jsp index 8a7138cfb..0bc3f67ab 100644 --- a/openid-connect-server/src/main/webapp/WEB-INF/views/home.jsp +++ b/openid-connect-server/src/main/webapp/WEB-INF/views/home.jsp @@ -10,15 +10,15 @@
- +
- +
- +
@@ -26,7 +26,7 @@
- +