anchor.diff:      <td class="standard"><%=dbVersion%></td>
     </tr>
   </table>
  +
   <hr />
  +
   <h3>License and Copyright</h3>
  +
   <div class="boxWrapper">
  -<p>
  -  The <a href="http://www.opennms.org/">OpenNMS&reg;</a> software, as
  -  distributed here, is copyright &copy; 2002-2014
  -  <a href="http://www.opennms.com">The OpenNMS Group, Inc.</a>.
  -  <a href="http://www.opennms.org/">OpenNMS&reg;</a> is a registered
  -  trademark of <a href="http://www.opennms.com">The OpenNMS Group, Inc.</a>
  -</p>
  -<p>
  -  OpenNMS is a derivative work, containing both original code, included
  -  code and modified code that was published under the GNU Affero General Public
  -  License. Please see the source for detailed copyright notices.
  -</p>
  -<p>
  -  The source for this release can be downloaded
  -  <a href="source/opennms-<%=Vault.getProperty("version.display")%>-source.tar.gz">here</a>.
  -</p>
  -<p>
  -  This program is free software; you can redistribute it and/or
  -  modify it under the terms of the 
  -  <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public License</a>
  -  as published by the
  -  <a href="http://www.gnu.org/">Free Software Foundation</a>; either version 3
  -  of the License, or (at your option) any later version.
  -</p>
  -<p>        
  -  This program is distributed in the hope that it will be useful,
  -  but <strong>without any warranty</strong>; without even the implied
  -  warranty of <strong>merchantability</strong> or <strong>fitness for
  -  a particular purpose</strong>.  See the
  -  <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public License</a>
  -  for more details.
  -</p>
  -        
  -<p>
  -  You should have received a copy of the
  -  <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public License</a>
  -  along with this program; if not, write to the</p>
  -    <p>Free Software Foundation, Inc.<br/>
  +  <p>
  +    The <a href="http://www.opennms.org/">OpenNMS&reg;</a> software, as
  +    distributed here, is copyright &copy; 2002-2014
  +    <a href="http://www.opennms.com">The OpenNMS Group, Inc.</a>.
  +    <a href="http://www.opennms.org/">OpenNMS&reg;</a> is a registered
  +    trademark of <a href="http://www.opennms.com">The OpenNMS Group, Inc.</a>
  +  </p>
  +  <p>
  +    OpenNMS is a derivative work, containing both original code, included
  +    code and modified code that was published under the GNU Affero General Public
  +    License. Please see the source for detailed copyright notices.
  +  </p>
  +  <p>
  +    The source for this release can be downloaded
  +    <a href="source/opennms-<%=Vault.getProperty("version.display")%>-source.tar.gz">here</a>.
  +  </p>
  +  <p>
  +    This program is free software; you can redistribute it and/or
  +    modify it under the terms of the
  +    <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public License</a>
  +    as published by the
  +    <a href="http://www.gnu.org/">Free Software Foundation</a>; either version 3
  +    of the License, or (at your option) any later version.
  +  </p>
  +  <p>
  +    This program is distributed in the hope that it will be useful,
  +    but <strong>without any warranty</strong>; without even the implied
  +    warranty of <strong>merchantability</strong> or <strong>fitness for
  +    a particular purpose</strong>.  See the
  +    <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public License</a>
  +    for more details.
  +  </p>
  +
  +  <p>
  +    You should have received a copy of the
  +    <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public License</a>
  +    along with this program; if not, write to the
  +  </p>
  +  <p>
  +    Free Software Foundation, Inc.<br/>
       59 Temple Place - Suite 330<br/>
  -    Boston, MA  02111-1307, USA</p>
  +    Boston, MA  02111-1307, USA
  +  </p>
   </div>
  +
   <hr />
  +
   <h3>OSI Certified Open Source Software</h3>
  +
   <div class="boxWrapper">
  -<a target="_new" href="http://www.opensource.org/"><img src="images/osi-certified.png" style="float: left;" alt="OSI Certified"/></a>
  -<p>This software is OSI Certified Open Source Software.<br/>
  -  OSI Certified is a certification mark of the
  -  <a href="http://www.opensource.org/">Open Source Initiative</a>.
  -</p>
  -<div style="clear:both;"></div>
  +  <a target="_new" href="http://www.opensource.org/"><img src="images/osi-certified.png" style="float: left;" alt="OSI Certified"/></a>
  +  <p>
  +    This software is OSI Certified Open Source Software.<br/>
  +    OSI Certified is a certification mark of the
  +    <a href="http://www.opensource.org/">Open Source Initiative</a>.
  +  </p>
  +  <div style="clear:both;"></div>
   </div>
  +
   <hr />
  +
   <h3>Supporting Applications</h3>
   
  -	<table>
  -	   <tr>
  -      
  -      	   <td style="border-right: none;">
  -		<p align="center">
  -        	Powered By Jetty<br/>
  -		<a href="http://www.eclipse.org/jetty/" target="_new"><img src="images/powered_by_jetty.gif" hspace="0" vspace="0"
  -      		   border="0" alt="eclipse.org/jetty/" align="center"></a>.
  -      		</p>
  -	   </td>
  -           <td style="border-left: none; border-right: none;">
  -		<p align="center">
  -		Support for Tobi Oetiker's RRDTool<br/>
  -        	<a href="http://www.rrdtool.org/" target="_new"><img src="images/rrdtool-logo-dark.png" hspace="0" vspace="0" width="121" height="48"
  -           	border="0" alt="www.rrdtool.org" align="center"></a>
  -      		</p>      
  -	   </td>
  -           <td style="border-left: none;">
  -		<p align="center">
  -		PostgreSQL Powered<br/>
  -        	<a href="http://www.postgresql.org/" target="_new"><img src="images/pg-power_95x51_4.gif" hspace="0" vspace="0" width="95" height="51"
  -           	border="0" alt="www.postgresql.org" align="center"></a>
  -      		</p>      
  -	   </td>
  -	   </tr>
  -	</table>
  - 
  -                                   
  +<table>
  +  <tr>
  +    <td style="border-right: none;">
  +      <p align="center">
  +        Powered By Jetty<br/>
  +        <a href="http://www.eclipse.org/jetty/" target="_new"><img src="images/powered_by_jetty.gif" hspace="0" vspace="0"
  +        border="0" alt="eclipse.org/jetty/" align="center"></a>.
  +      </p>
  +    </td>
  +    <td style="border-left: none; border-right: none;">
  +      <p align="center">
  +        Support for Tobi Oetiker's RRDTool<br/>
  +        <a href="http://www.rrdtool.org/" target="_new"><img src="images/rrdtool-logo-dark.png" hspace="0" vspace="0" width="121" height="48"
  +        border="0" alt="www.rrdtool.org" align="center"></a>
  +      </p>
  +    </td>
  +    <td style="border-left: none;">
  +      <p align="center">
  +        PostgreSQL Powered<br/>
  +        <a href="http://www.postgresql.org/" target="_new"><img src="images/pg-power_95x51_4.gif" hspace="0" vspace="0" width="95" height="51"
  +        border="0" alt="www.postgresql.org" align="center"></a>
  +      </p>
  +    </td>
  +  </tr>
  +</table>
   
   <jsp:include page="/includes/bookmarkAll.jsp" flush="false" >
  -  <jsp:param name="adminrole" 
  -   value="<%= role %>" />
  +  <jsp:param name="adminrole" value="<%= role %>" />
   </jsp:include>
   
   <jsp:include page="/includes/footer.jsp" flush="false"/>
  
positive.code:   <tr>
      <td class="standardheader">Java Version:</td>
      <td class="standard"><%=System.getProperty( "java.version" )%> <%=System.getProperty( "java.vendor" )%></td>
    </tr>  
    <tr>
      <td class="standardheader">Java Virtual Machine:</td>
      <td class="standard"><%=System.getProperty( "java.vm.version" )%> <%=System.getProperty( "java.vm.vendor" )%></td>
  
negative.code: 
  --%>
  
  <%@page
    language="java"
    contentType="text/html"
    session="true"
    import="org.opennms.web.api.Authentication,
      org.opennms.core.db.DataSourceFactory,
      org.opennms.core.resource.Vault,
      org.opennms.core.utils.WebSecurityUtils,
      org.opennms.core.utils.DBUtils,
      java.sql.Connection
    "
  %>
  
  <%
  boolean role = request.isUserInRole(Authentication.ROLE_ADMIN);
  
  final DBUtils d = new DBUtils();
  String dbName;
  String dbVersion;
  try {
    Connection conn = DataSourceFactory.getInstance().getConnection();
    d.watch(conn);
    dbName = conn.getMetaData().getDatabaseProductName();
    dbVersion = conn.getMetaData().getDatabaseProductVersion();
  } catch (Exception e) {
    dbName = "Unknown";
    dbVersion = "Unknown";
  } finally {
    d.cleanUp();
  }
  %>
  
  <jsp:include page="/includes/header.jsp" flush="false" >
    <jsp:param name="title" value="About" />
  