r4557 - trunk/lib/admin
daigle at ecoinformatics.org
daigle at ecoinformatics.org
Wed Nov 12 10:33:26 PST 2008
Author: daigle
Date: 2008-11-12 10:33:25 -0800 (Wed, 12 Nov 2008)
New Revision: 4557
Added:
trunk/lib/admin/footer-section.jsp
trunk/lib/admin/header-section.jsp
Removed:
trunk/lib/admin/login-footer-section.jsp
Modified:
trunk/lib/admin/admin-login.jsp
trunk/lib/admin/database-configuration.jsp
trunk/lib/admin/geoserver-configuration.jsp
trunk/lib/admin/ldap-configuration.jsp
trunk/lib/admin/metacat-configuration.jsp
trunk/lib/admin/properties-configuration.jsp
trunk/lib/admin/skins-configuration.jsp
Log:
Added header and footer sections that allow admin to log in as different user and to see user documentation.
Modified: trunk/lib/admin/admin-login.jsp
===================================================================
--- trunk/lib/admin/admin-login.jsp 2008-11-12 18:11:53 UTC (rev 4556)
+++ trunk/lib/admin/admin-login.jsp 2008-11-12 18:33:25 UTC (rev 4557)
@@ -53,7 +53,7 @@
<br>
<form name="loginform" method="post" action="<%= request.getContextPath() %>/admin"
- target="_top" onsubmit="return submitform(this);" id="loginform">
+ target="_top" onsubmit="return validateAndSubmitForm(this);" id="loginform">
<table class="admin-login">
<tr>
Modified: trunk/lib/admin/database-configuration.jsp
===================================================================
--- trunk/lib/admin/database-configuration.jsp 2008-11-12 18:11:53 UTC (rev 4556)
+++ trunk/lib/admin/database-configuration.jsp 2008-11-12 18:33:25 UTC (rev 4557)
@@ -45,6 +45,8 @@
</head>
<body>
+<%@ include file="./header-section.jsp"%>
+
<img src="<%= request.getContextPath() %>/metacat-logo.png" width="100px" align="right"/>
<h2>Database Install/Upgrade Utility</h2>
@@ -100,7 +102,7 @@
}
%>
-<br clear="right"/>
+ <%@ include file="./footer-section.jsp"%>
</body>
</html>
Copied: trunk/lib/admin/footer-section.jsp (from rev 4273, trunk/lib/admin/login-footer-section.jsp)
===================================================================
--- trunk/lib/admin/footer-section.jsp (rev 0)
+++ trunk/lib/admin/footer-section.jsp 2008-11-12 18:33:25 UTC (rev 4557)
@@ -0,0 +1,49 @@
+<%@ page language="java"%>
+<%
+/**
+ * '$RCSfile$'
+ * Copyright: 2008 Regents of the University of California and the
+ * National Center for Ecological Analysis and Synthesis
+ * For Details: http://www.nceas.ucsb.edu/
+ *
+ * '$Author$'
+ * '$Date$'
+ * '$Revision$'
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+%>
+
+<hr class="config-line">
+
+<%
+if( request.getSession().getAttribute("userId") != null) {
+%>
+ <div class=small-message>
+ <p>You are logged in as: <%= request.getSession().getAttribute("userId") %></p>
+ <a href="<%= request.getContextPath() %>/admin?configureType=login">log in as different user</a> |
+ <a href="<%= request.getContextPath() %>/docs/user/index.html" target="_blank">view metacat user documentation</a>
+ </div>
+<%
+} else {
+%>
+ <div class=small-message>
+ <p>You are not logged in. %></p>
+ <a href="<%= request.getContextPath() %>/admin?configureType=login">log in as different user</a> |
+ <a href="<%= request.getContextPath() %>/docs/user/index.html" target="_blank">view metacat user documentation</a>
+ </div>
+<%
+}
+%>
\ No newline at end of file
Property changes on: trunk/lib/admin/footer-section.jsp
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
Modified: trunk/lib/admin/geoserver-configuration.jsp
===================================================================
--- trunk/lib/admin/geoserver-configuration.jsp 2008-11-12 18:11:53 UTC (rev 4556)
+++ trunk/lib/admin/geoserver-configuration.jsp 2008-11-12 18:33:25 UTC (rev 4557)
@@ -38,6 +38,8 @@
</head>
<body>
+<%@ include file="./header-section.jsp"%>
+
<img src="<%= request.getContextPath() %>/metacat-logo.png" width="100px" align="right"/>
<h2>Geoserver Configuration</h2>
@@ -82,5 +84,7 @@
</form>
+<%@ include file="./footer-section.jsp"%>
+
</body>
</html>
Added: trunk/lib/admin/header-section.jsp
===================================================================
--- trunk/lib/admin/header-section.jsp (rev 0)
+++ trunk/lib/admin/header-section.jsp 2008-11-12 18:33:25 UTC (rev 4557)
@@ -0,0 +1,47 @@
+<%@ page language="java" %>
+<%
+/**
+ * '$RCSfile$'
+ * Copyright: 2008 Regents of the University of California and the
+ * National Center for Ecological Analysis and Synthesis
+ * For Details: http://www.nceas.ucsb.edu/
+ *
+ * '$Author: daigle $'
+ * '$Date: 2008-07-06 21:25:34 -0700 (Sun, 06 Jul 2008) $'
+ * '$Revision: 4080 $'
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+%>
+
+<%
+if( request.getSession().getAttribute("userId") != null) {
+%>
+ <div class=small-message>
+ <a href="<%= request.getContextPath() %>/admin?configureType=login">log in as different user</a> |
+ <a href="<%= request.getContextPath() %>/docs/user/index.html" target="_blank">view metacat user documentation</a>
+ </div>
+<%
+} else {
+%>
+ <div class=small-message>
+ <a href="<%= request.getContextPath() %>/admin?configureType=login">log in as different user</a> |
+ <a href="<%= request.getContextPath() %>/docs/user/index.html" target="_blank">view metacat user documentation</a>
+ </div>
+<%
+}
+%>
+
+<hr class="config-line">
\ No newline at end of file
Property changes on: trunk/lib/admin/header-section.jsp
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/lib/admin/ldap-configuration.jsp
===================================================================
--- trunk/lib/admin/ldap-configuration.jsp 2008-11-12 18:11:53 UTC (rev 4556)
+++ trunk/lib/admin/ldap-configuration.jsp 2008-11-12 18:33:25 UTC (rev 4557)
@@ -37,6 +37,8 @@
</head>
<body>
+<%@ include file="./header-section.jsp"%>
+
<img src="<%= request.getContextPath() %>/metacat-logo.png" width="100px" align="right"/>
<h2>LDAP Configuration</h2>
Enter authentication service properties here.
@@ -138,5 +140,7 @@
</form>
+<%@ include file="./footer-section.jsp"%>
+
</body>
</html>
Deleted: trunk/lib/admin/login-footer-section.jsp
===================================================================
--- trunk/lib/admin/login-footer-section.jsp 2008-11-12 18:11:53 UTC (rev 4556)
+++ trunk/lib/admin/login-footer-section.jsp 2008-11-12 18:33:25 UTC (rev 4557)
@@ -1,45 +0,0 @@
-<%@ page language="java" import="java.util.Vector" %>
-<%
-/**
- * '$RCSfile$'
- * Copyright: 2008 Regents of the University of California and the
- * National Center for Ecological Analysis and Synthesis
- * For Details: http://www.nceas.ucsb.edu/
- *
- * '$Author$'
- * '$Date$'
- * '$Revision$'
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-%>
-
-<%
-if( request.getSession().getAttribute("userId") != null) {
-%>
- <div class=small-message>
- You are logged in as: <%= request.getSession().getAttribute("userId") %><br>
- <a href="<%= request.getContextPath() %>/admin?configureType=login">log in as different user</a>
- </div>
-<%
-} else {
-%>
- <div class=small-message>
- You are not logged in. %><br>
- <a href="<%= request.getContextPath() %>/admin?configureType=login">log in as different user</a>
- </div>
-<%
-}
-%>
\ No newline at end of file
Modified: trunk/lib/admin/metacat-configuration.jsp
===================================================================
--- trunk/lib/admin/metacat-configuration.jsp 2008-11-12 18:11:53 UTC (rev 4556)
+++ trunk/lib/admin/metacat-configuration.jsp 2008-11-12 18:33:25 UTC (rev 4557)
@@ -50,8 +50,9 @@
</head>
<body>
+<%@ include file="./header-section.jsp"%>
<img src="<%= request.getContextPath() %>/metacat-logo.png" width="100px" align="right"/>
-<h2>MetaCat Configuration</h2>
+<h2>Metacat Configuration</h2>
All of the following sections must be in a configured state for Metacat to run properly:
<br class="main-header">
@@ -231,8 +232,7 @@
}
%>
- <hr class="config-line">
- <%@ include file="./login-footer-section.jsp"%>
+ <%@ include file="./footer-section.jsp"%>
</body>
</html>
Modified: trunk/lib/admin/properties-configuration.jsp
===================================================================
--- trunk/lib/admin/properties-configuration.jsp 2008-11-12 18:11:53 UTC (rev 4556)
+++ trunk/lib/admin/properties-configuration.jsp 2008-11-12 18:33:25 UTC (rev 4557)
@@ -38,10 +38,12 @@
</head>
<body>
+<%@ include file="./header-section.jsp"%>
+
<img src="<%= request.getContextPath() %>/metacat-logo.png" width="100px" align="right"/>
-<h2>MetaCat Properties Configuration</h2>
+<h2>Metacat Properties Configuration</h2>
-<p>Enter MetaCat System properties here. All Fields must be filled in before saving.
+<p>Enter Metacat System properties here. All Fields must be filled in before saving.
</p>
<br clear="right"/>
@@ -143,5 +145,7 @@
</form>
+<%@ include file="./footer-section.jsp"%>
+
</body>
</html>
Modified: trunk/lib/admin/skins-configuration.jsp
===================================================================
--- trunk/lib/admin/skins-configuration.jsp 2008-11-12 18:11:53 UTC (rev 4556)
+++ trunk/lib/admin/skins-configuration.jsp 2008-11-12 18:33:25 UTC (rev 4557)
@@ -44,6 +44,8 @@
</head>
<body>
+<%@ include file="./header-section.jsp"%>
+
<img src="<%= request.getContextPath() %>/metacat-logo.png" width="100px" align="right"/>
<h2>Skins Configuration</h2>
@@ -58,7 +60,7 @@
<h3>Skins Configuration</h3>
<hr class="config-line">
<div class="heading-comment">
- Choose and configure the skins that will be available in this instance of MetaCat
+ Choose and configure the skins that will be available in this instance of Metacat
</div><br>
<%
@@ -223,5 +225,7 @@
</form>
+<%@ include file="./footer-section.jsp"%>
+
</body>
</html>
More information about the Metacat-cvs
mailing list