From ebfd9ff053b04ab379acfc0fefedee5a31b6d8a5 Mon Sep 17 00:00:00 2001
From: "Stephen D. Huston" <shuston@apache.org>
Date: Fri, 21 Oct 2011 01:19:00 +0000
Subject: Undo bad merge from trunk - merged at wrong level.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187150 13f79535-47bb-0310-9956-ffa450edef68
---
 .../management/client/console/fragments/header.jsp | 36 ++++++++++++++++++++++
 java/management/client/console/fragments/menu.jsp  | 31 +++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 java/management/client/console/fragments/header.jsp
 create mode 100644 java/management/client/console/fragments/menu.jsp

(limited to 'java/management/client/console/fragments')

diff --git a/java/management/client/console/fragments/header.jsp b/java/management/client/console/fragments/header.jsp
new file mode 100644
index 0000000000..b401fee7a0
--- /dev/null
+++ b/java/management/client/console/fragments/header.jsp
@@ -0,0 +1,36 @@
+<!--
+ 
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ 
+-->
+
+<div id="header" align="center">
+	<div id="pagetitle">
+		<div id="asf-header" align="left">
+              	<table width="100%">
+                  	<tr>
+                      	<td align="left"><img src="images/qpid-logo.png" height="100" width="200" /></td>
+                      	<td align="right"><img src="images/asf-logo.png" height="69" width="225" /></td>
+                      </tr>
+                  </table>
+              </div>            	
+		<div id="title" class="titletext" align="right">
+              	<span class="bluetitle"><%=request.getParameter("title")%></span>
+		</div>
+	</div>
+</div>
diff --git a/java/management/client/console/fragments/menu.jsp b/java/management/client/console/fragments/menu.jsp
new file mode 100644
index 0000000000..6924fd5d43
--- /dev/null
+++ b/java/management/client/console/fragments/menu.jsp
@@ -0,0 +1,31 @@
+<!--
+ 
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ 
+-->
+
+<div id="menu" align="center">
+	<div id="linksmenu" align="left">
+		<a href="<%=request.getContextPath()%>/console"> &nbsp; &gt; System Overview</a>
+		<a href="<%=request.getContextPath()%>/brokers_management">&nbsp; &gt; Brokers Management</a>
+		<a href="<%=request.getContextPath()%>/resources_management">&nbsp; &gt; Resources Management</a>
+		<a>&nbsp; &gt; Subscriptions Management</a>
+		<a>&nbsp; &gt; System Health</a>
+		<a href="<%=request.getContextPath()%>/logging_configuration">&nbsp; &gt; Logging Configuration</a>
+	</div>	
+</div>
-- 
cgit v1.2.1