github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Split up about, contact, stats tags into two each and removed logic from the *Content tag files

pull/306/merge
Amanda Anganes 2013-02-28 13:56:09 -05:00
parent 8677f6516d
commit 42ea2468c9
8 changed files with 37 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
openid-connect-server/src/main/webapp/WEB-INF/tags/aboutContent.tag
View File

@ -1,25 +1,8 @@
<%@attribute name="short" required="false" %> <h2>About</h2>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <p>
This OpenID Connect service is built from the MITREid Connect Open Source project started by The MITRE Corporation.
<c:choose> </p>
<c:when test="${short == 'true'}"> <p>
<!-- Display short version of About page --> More information about the project can be found on our GitHub page: <a href="http://github.com/mitreid-connect/">MTIREid Connect on GitHub</a>
<h2>About</h2> There, you can submit bug reports, give feedback, or even contribute code patches for additional features you'd like to see.
</p>
<p>This OpenID Connect service is built from the MITREid Connect Open Source project started by The MITRE Corporation.</p>
<p><a class="btn" href="http://github.com/mitreid-connect/">More &raquo;</a></p>
</c:when>
<c:when test="${short == 'false' || empty short }">
<!-- Display long version of about page -->
<h2>About</h2>
<p>
This OpenID Connect service is built from the MITREid Connect Open Source project started by The MITRE Corporation.
</p>
<p>
More information about the project can be found on our GitHub page: <a href="http://github.com/mitreid-connect/">MTIREid Connect on GitHub</a>
There, you can submit bug reports, give feedback, or even contribute code patches for additional features you'd like to see.
</p>
</c:when>
</c:choose>

28
openid-connect-server/src/main/webapp/WEB-INF/tags/contactContent.tag
View File

@ -1,22 +1,6 @@
<%@attribute name="short" required="false" %> <h2>Contact</h2>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <p>
For general assistance, email Bob at <a href="mailto:email@address.com?Subject=OIDC%20Server%20Assistance">email@address.com</a>.
<c:choose> To offer feedback, email Sue at <a href="mailto:email@address.com?Subject=OIDC%20Server%20Feedback">email@address.com</a>.
<c:when test="${short == 'true'}"> To report a system failure or bug report, email Joe at <a href="mailto:email@address.com?Subject=OIDC%20Server%20Failure">email@address.com</a>.
<!-- Display short version of Contact page --> </p>
<h2>Contact</h2>
<p>For more information or support, contact the administrators of this system.</p>
<p><a class="btn" href="mailto:idp@example.com?Subject=OpenID Connect">Email &raquo;</a></p>
</c:when>
<c:when test="${short == 'false' || empty short }">
<!-- Display long version of Contact page -->
<h2>Contact</h2>
<p>
For general assistance, email Bob at <a href="mailto:email@address.com?Subject=OIDC%20Server%20Assistance">email@address.com</a>.
To offer feedback, email Sue at <a href="mailto:email@address.com?Subject=OIDC%20Server%20Feedback">email@address.com</a>.
To report a system failure or bug report, email Joe at <a href="mailto:email@address.com?Subject=OIDC%20Server%20Failure">email@address.com</a>.
</p>
</c:when>
</c:choose>

5
openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageAbout.tag Normal file
View File

@ -0,0 +1,5 @@
<h2>About</h2>
<p>This OpenID Connect service is built from the MITREid Connect Open Source project started by The MITRE Corporation.</p>
<p><a class="btn" href="http://github.com/mitreid-connect/">More &raquo;</a></p>

5
openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageContact.tag Normal file
View File

@ -0,0 +1,5 @@
<h2>Contact</h2>
<p>For more information or support, contact the administrators of this system.</p>
<p><a class="btn" href="mailto:idp@example.com?Subject=OpenID Connect">Email &raquo;</a></p>

5
openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageStats.tag Normal file
View File

@ -0,0 +1,5 @@
<h2>Current Statistics</h2>
<p>There have been <span class="label label-info">${statsSummary["userCount"]}</span> users of this
system who have logged in to <span class="label label-info">${statsSummary["clientCount"]}</span>
total sites, for a total of <span class="label label-info">${statsSummary["approvalCount"]}</span> site approvals.</p>

0
openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageText.tag → openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag
View File

20
openid-connect-server/src/main/webapp/WEB-INF/tags/statsContent.tag
View File

@ -1,21 +1,5 @@
<%@attribute name="short" required="false" %> <h2>Current Statistics</h2>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<c:choose> <p>There have been <span class="label label-info">${statsSummary["userCount"]}</span> users of this
<c:when test="${short == 'true'}">
<!-- Display short version of Statistics page -->
<h2>Current Statistics</h2>
<p>There have been <span class="label label-info">${statsSummary["userCount"]}</span> users of this
system who have logged in to <span class="label label-info">${statsSummary["clientCount"]}</span> system who have logged in to <span class="label label-info">${statsSummary["clientCount"]}</span>
total sites, for a total of <span class="label label-info">${statsSummary["approvalCount"]}</span> site approvals.</p> total sites, for a total of <span class="label label-info">${statsSummary["approvalCount"]}</span> site approvals.</p>
</c:when>
<c:when test="${short == 'false' || empty short }">
<!-- Display long version of Statistics page -->
<h2>Current Statistics</h2>
<p>There have been <span class="label label-info">${statsSummary["userCount"]}</span> users of this
system who have logged in to <span class="label label-info">${statsSummary["clientCount"]}</span>
total sites, for a total of <span class="label label-info">${statsSummary["approvalCount"]}</span> site approvals.</p>
</c:when>
</c:choose>

8
openid-connect-server/src/main/webapp/WEB-INF/views/home.jsp
View File

@ -10,15 +10,15 @@
<div class="span10"> <div class="span10">
<!-- Main hero unit for a primary marketing message or call to action --> <!-- Main hero unit for a primary marketing message or call to action -->
<div class="hero-unit"> <div class="hero-unit">
<o:landingPageText/> <o:landingPageWelcome/>
</div> </div>
<!-- Example row of columns --> <!-- Example row of columns -->
<div class="row-fluid"> <div class="row-fluid">
<div class="span6"> <div class="span6">
<o:aboutContent short="true"/> <o:landingPageAbout/>
</div> </div>
<div class="span6"> <div class="span6">
<o:contactContent short="true"/> <o:landingPageContact/>
</div> </div>
</div> </div>
@ -26,7 +26,7 @@
<!-- Example row of columns --> <!-- Example row of columns -->
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<o:statsContent short="true"/> <o:landingPageStats/>
</div> </div>
</div> </div>