perfsonar-dev - perfsonar: r5405 - in branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html: . parts
Subject: perfsonar development work
List archive
perfsonar: r5405 - in branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html: . parts
Chronological Thread
- From:
- To:
- Subject: perfsonar: r5405 - in branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html: . parts
- Date: Fri, 11 Dec 2009 07:18:46 -0500
Author: trzaszcz
Date: 2009-12-11 07:18:45 -0500 (Fri, 11 Dec 2009)
New Revision: 5405
Added:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/parts/
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/parts/banner.jsp
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/parts/configurationSaved.jsp
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/parts/error.jsp
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/parts/footer.jsp
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/parts/savedFailed.jsp
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/parts/sideBar.jsp
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/parts/welcome.jsp
Removed:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/welcome.jsp
Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/index.jsp
Log:
jsp views enhancement
Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/index.jsp
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/index.jsp
2009-12-11 11:32:43 UTC (rev 5404)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/index.jsp
2009-12-11 12:18:45 UTC (rev 5405)
@@ -3,9 +3,8 @@
<title>perfSONAR Service Web Administration page</title>
<link rel="stylesheet" type="text/css" href="main.css"/>
<meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1">
- <script src="Service_Admin.js"></script>
- <!-- <script src="liveclock.js"></script>-->
-
+ <script src="Service_Admin.js"></script>
+
<style type="text/css">
<!--
@@ -50,127 +49,50 @@
</style>
</head>
<body>
-
<%
- org.perfsonar.webadmin.base2.config.ObjectMap map =
ConfigurationServletHelper.objectMap(getServletContext());
- if( map == null )
-
- {
- %>
- <center>
- <h2> Failed to load web admin configuration
file(s).
- <br/>
- Please check
- Tomcat log files for further information.
- <br/>
- Restart Tomcat after saving web admin
configuration
- files and click
- <a href="index.jsp" target="_self">
- here</a>.
-
- </h2>
- </center>
- </body>
- </html>
- <%
- return;
- }
- System.out.println("------------------------------------");
- String save = request.getParameter("page");
- System.out.println("page :"+save);
- if( save != null && save.equals("save")){
- if( request.getParameter("ok")!=null ) {
-
- %>
- <p class="heading1">
- The configuration files have been saved.
- </p>
-
- <%
- System.out.println("if");
- }else{
- System.out.println("Else");
- %>
- <p class="heading1">
- An error occurred while saving te
configuration files.
- Please check Tomcat
log files for further information.
- </p>
-
- <%
- }
- }
- String[] smallLinks
=org.perfsonar.webadmin.base2.config.HTMLGenerator.makeLinks(map,false);
- %>
+ org.perfsonar.webadmin.base2.config.ObjectMap map =
ConfigurationServletHelper.objectMap(getServletContext());
+ String[] smallLinks
=org.perfsonar.webadmin.base2.config.HTMLGenerator.makeLinks(map,false);
+ %>
+
<div class="adminPanel">
<div class="banner">
- <table border="0" align="left" cellpadding="0"
cellspacing="0">
- <tr>
- <td>
- <a href="index.jsp" target="_self"><img
src="graphics/perfsonar_logo.gif" alt="perfSONAR" width="192" height="94"
border="0" align="right"></a>
- </td>
- <td>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
+ <jsp:include page="parts/banner.jsp"/>
</div>
<div class="mainWindow">
<div class="sidebar">
- <table border="0" cellpadding="0" cellspacing="0">
- <tr>
- <th>
- <a href="index.jsp" class="button"
target="_self">Admin home </a>
- </th>
- </tr>
- <tr>
- <td>
- <p>
- <span class="navtexheading">Basic
- <br>
- Configuration
- </span>
- </p>
- <%
-
out.println(smallLinks[0]);
- %>
- </td>
- </tr>
- <%
- if(
smallLinks[1].equals("") == false )
- {
- %>
-
- <tr>
- <td>
- <p>
- <span class="navtexheading">Advanced
- <br>
- Configuration
- </span>
- </p>
- <%
-
out.println(smallLinks[1]);
- %>
- </td>
- </tr>
- <%
- }
- %>
- <tr>
- </tr>
- </table>
- <img src="graphics/logos.gif" alt="perfSONAR project
partners" width="117" height="263" border="0" align="top"/>
+
<%@include
file="parts/sideBar.jsp"%>
</div>
<div class="centerWindow">
- <!-- <object data="index.jsp" type="text/html"
name="main" width="99%" height="100%"> </object>-->
- <%@ include
file="welcome.jsp" %>
-
+ <%
+ String save = request.getParameter("page");
+ System.out.println("page :"+save);
+
+ if(map==null){
+ %>
+ <jsp:include page="parts/error.jsp"/>
+
+ <%
+
+
+ }else if(save != null && save.equals("save")){
+ %>
+
+ <% if(request.getParameter("ok")!=null){ %>
+ <jsp:include
page="parts/configurationSaved.jsp"/>
+ <% }else { %>
+ <jsp:include
page="parts/savedFailed.jsp"/>
+ <% } %>
+ <%
+ }else{
+ %>
+
<%@include
file="parts/welcome.jsp" %>
+ <%
+ }
+ %>
</div>
</div>
<div class="footer">
- PERFormance Service-Oriented Network monitoring ARchitecture
+ <jsp:include page="parts/footer.jsp"/>
</div>
</div>
</body>
Added:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/parts/banner.jsp
Added:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/parts/configurationSaved.jsp
Added:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/parts/error.jsp
Added:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/parts/footer.jsp
Added:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/parts/savedFailed.jsp
Added:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/parts/sideBar.jsp
Added:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/parts/welcome.jsp
Property changes on:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/parts/welcome.jsp
___________________________________________________________________
Name: svn:executable
+ *
Deleted:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/welcome.jsp
- perfsonar: r5405 - in branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html: . parts, svnlog, 12/11/2009
Archive powered by MHonArc 2.6.16.