Skip to Content.
Sympa Menu

perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r6501 - in trunk: perfsonar-java-sql-ma/src/main/webapp perfsonar-web-admin-0/src/main/webapp

Subject: perfsonar development work

List archive

[pS-dev] [GEANT/SA2/ps-java-services] r6501 - in trunk: perfsonar-java-sql-ma/src/main/webapp perfsonar-web-admin-0/src/main/webapp


Chronological Thread 
  • From:
  • To:
  • Subject: [pS-dev] [GEANT/SA2/ps-java-services] r6501 - in trunk: perfsonar-java-sql-ma/src/main/webapp perfsonar-web-admin-0/src/main/webapp
  • Date: Wed, 12 Mar 2014 17:17:05 +0000 (GMT)
Author: dante.delvaux
Date: 2014-03-12 17:17:05 +0000 (Wed, 12 Mar 2014)
New Revision: 6501

Removed:
trunk/perfsonar-web-admin-0/src/main/webapp/index_sqlma.jsp
trunk/perfsonar-web-admin-0/src/main/webapp/welcome_sqlma.htm
Modified:
trunk/perfsonar-java-sql-ma/src/main/webapp/default.css
trunk/perfsonar-java-sql-ma/src/main/webapp/index.jsp
trunk/perfsonar-java-sql-ma/src/main/webapp/main.css
trunk/perfsonar-web-admin-0/src/main/webapp/default.css
trunk/perfsonar-web-admin-0/src/main/webapp/index.jsp
trunk/perfsonar-web-admin-0/src/main/webapp/main.css
Log:
SQL-MA and web-admin-0: slightly improving default HTML/CSS layout.

Modified: trunk/perfsonar-java-sql-ma/src/main/webapp/default.css
===================================================================
--- trunk/perfsonar-java-sql-ma/src/main/webapp/default.css 2014-02-27
13:51:51 UTC (rev 6500)
+++ trunk/perfsonar-java-sql-ma/src/main/webapp/default.css 2014-03-12
17:17:05 UTC (rev 6501)
@@ -1,9 +1,5 @@

/* standard elements */
-html {
- min-height: 100%;
-}
-
* {
margin: 0;
padding: 0;

Modified: trunk/perfsonar-java-sql-ma/src/main/webapp/index.jsp
===================================================================
--- trunk/perfsonar-java-sql-ma/src/main/webapp/index.jsp 2014-02-27
13:51:51 UTC (rev 6500)
+++ trunk/perfsonar-java-sql-ma/src/main/webapp/index.jsp 2014-03-12
17:17:05 UTC (rev 6501)
@@ -140,7 +140,7 @@
<img src="graphics/logos.gif" alt="perfSONAR project
partners" width="117" height="263" border="0" align="top"/>
</div>
<div class="centerWindow">
- <object data="welcome.htm" type="text/html" name="main"
width="99%" height="100%">
+ <object data="welcome.htm" type="text/html" name="main">
</object>
</div>
</div>

Modified: trunk/perfsonar-java-sql-ma/src/main/webapp/main.css
===================================================================
--- trunk/perfsonar-java-sql-ma/src/main/webapp/main.css 2014-02-27
13:51:51 UTC (rev 6500)
+++ trunk/perfsonar-java-sql-ma/src/main/webapp/main.css 2014-03-12
17:17:05 UTC (rev 6501)
@@ -49,8 +49,7 @@

.adminPanel{
width: 94%;
- height: 50%;
- float:left;
+ float: left;
margin-left: 3%;
margin-right: 5%;
background-color: #ffffff;
@@ -241,21 +240,20 @@
border: none;
padding: 0px;
width: 100%;
- height: 750px;
background-color: #ffffff;
}
.centerWindow{
background-color: #FFFFFF;
width: 82%;
- height:80%;
margin-right: 5px;
margin-bottom: 5px;
margin-left: 0;
float: left;
}
.centerWindow object{
- width: 101%;
- height: 105%;
+ width: 100%;
+ height: 80%;
+ min-height: 550px;
background-color: #FFFFFF;
}

@@ -269,8 +267,8 @@

.sidebar{
width: 15%;
- height: 71.1%;
- padding-bottom: 12.1%;
+ height: 80%;
+ min-height: 550px;
padding-right: 0px;
float: left;
border-right-width: 1px;
@@ -340,7 +338,6 @@


.footer{
- height: 20px;
text-align: right;
color: #61AF61;
background-color: #ffffff;
@@ -354,7 +351,7 @@
border-right-style: none;
border-right-color: #FFFFFF;
border-left-color: #FFFFFF;
- float: none;
+ clear: both;
}
.footermain {
height: 20px;

Modified: trunk/perfsonar-web-admin-0/src/main/webapp/default.css
===================================================================
--- trunk/perfsonar-web-admin-0/src/main/webapp/default.css 2014-02-27
13:51:51 UTC (rev 6500)
+++ trunk/perfsonar-web-admin-0/src/main/webapp/default.css 2014-03-12
17:17:05 UTC (rev 6501)
@@ -1,9 +1,5 @@

/* standard elements */
-html {
- min-height: 100%;
-}
-
* {
margin: 0;
padding: 0;

Modified: trunk/perfsonar-web-admin-0/src/main/webapp/index.jsp
===================================================================
--- trunk/perfsonar-web-admin-0/src/main/webapp/index.jsp 2014-02-27
13:51:51 UTC (rev 6500)
+++ trunk/perfsonar-web-admin-0/src/main/webapp/index.jsp 2014-03-12
17:17:05 UTC (rev 6501)
@@ -72,9 +72,6 @@
<body>
<%

- // java.text.DateFormat dateFormat = new
java.text.SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy");
- //java.util.Date now= new java.util.Date();
- //java.util.Date date= dateFormat.parse(now.toString());
String confPath = "WEB-INF/classes/perfsonar/conf/";
String ServicePropertiesPath = confPath+ "service.properties";
ServletContext sc = getServletContext();
@@ -166,7 +163,7 @@
<img src="graphics/logos.gif" alt="perfSONAR project
partners" width="117" height="263" border="0" align="top"/>
</div>
<div class="centerWindow">
- <object data="welcome.htm" type="text/html" name="main"
width="99%" height="100%">
+ <object data="welcome.htm" type="text/html" name="main">
</object>
</div>
</div>

Deleted: trunk/perfsonar-web-admin-0/src/main/webapp/index_sqlma.jsp
===================================================================
--- trunk/perfsonar-web-admin-0/src/main/webapp/index_sqlma.jsp 2014-02-27
13:51:51 UTC (rev 6500)
+++ trunk/perfsonar-web-admin-0/src/main/webapp/index_sqlma.jsp 2014-03-12
17:17:05 UTC (rev 6501)
@@ -1,151 +0,0 @@
-<%@ page
import="perfSONARWebAdmin.auxiliary.PerfsonarProperties,perfSONARWebAdmin.auxiliary.PerfsonarPropertiesImpl,perfSONARWebAdmin.auxiliary.PerfsonarProperty,java.io.File,java.io.FileInputStream,java.io.FileOutputStream,java.io.IOException"
%>
-
-<html>
- <head>
- <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>
-
- <style type="text/css">
- <!--
-
- a {
- }
-
- .style3 {
- color: #8585c1;
- font-size: 13px;
- }
-
- .style3 a:link {
- color: #8585C1;
- cursor: pointer;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- }
-
- .style3 a:active {
- color: #117721;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- }
-
- .style3 a:visited {
- color: #8585C1;
- cursor: auto;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- /*font-weight: bold;*/
- }
-
-
- .style3 a:hover {
- color: #8585C1;
- cursor: pointer;
- text-decoration: underline;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- }
- -->
- </style>
- </head>
- <body>
- <%
- java.text.DateFormat dateFormat = new java.text.SimpleDateFormat("EEE
MMM dd HH:mm:ss zzz yyyy");
- java.util.Date now= new java.util.Date();
- java.util.Date date= dateFormat.parse(now.toString());
- String confPath = "WEB-INF/classes/perfsonar/conf/";
- String ServicePropertiesPath = confPath+ "service.properties";
- ServletContext sc = getServletContext();
- String ServicePath = sc.getRealPath("/");
- PerfsonarProperty property = new PerfsonarProperty();
- PerfsonarProperties serviceProperties = new PerfsonarPropertiesImpl();
- serviceProperties.loadProperties(new FileInputStream(ServicePath
- + ServicePropertiesPath));
-
- String serviceName=
serviceProperties.getProperty("service.r.service_name").getValue().trim();
- String serviceVersion=
serviceProperties.getProperty("service.r.service_version").getValue().trim();
-
-
- %>
- <div class="adminPanel">
- <div class="banner">
- <table border="0" align="left" cellpadding="0"
cellspacing="0">
- <tr>
- <td>
- <a href="welcome.htm" target="main"><img
src="perfsonar_logo.gif" alt="perfSONAR" width="192" height="94" border="0"
align="right"></a>
- </td>
- <td>
- <table>
- <tr><td
id="date"><%=date.toString()%></td></tr>
- <tr><td id="serviceName"><%=serviceName %>
&nbsp;<%=serviceVersion%></td></tr>
- </table>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </div>
- <div class="mainWindow">
- <div class="sidebar">
- <table border="0" cellpadding="0" cellspacing="0">
- <tr>
- <th>
- <a href="welcome.htm" class="button"
target="main">Admin home &nbsp; &nbsp; &nbsp;</a>
- </th>
- </tr>
- <tr>
- <td>
- <p>
- <span class="navtexheading">Basic
- <br>
- Configuration
- </span>
- </p>
- <p>
- <span class="navtex"><a href="Wizard"
target="main">Service</a></span>
- <br>
- <a href="testdepl.jsp"
target="main">Test</a>
- </p>
- </td>
- </tr>
-
- <tr>
- <td>
- <p>
- <span class="navtexheading
style3">Advanced
- <br>
- Configuration
- </span>
- </p>
- <p>
- <span class="navtex style3"><a
href="ServiceAdmin?serviceProperties" target="main">Service</a>
- <br>
- <a
href="ServiceAdmin?loggingProperties" target="main">Logging</a>
- <br>
- <a href="eXistAdmin"
target="main">eXist Database</a>
- <br>
- <a href="SQLMAdmin"
target="main">SQL MA Admin</a>
- <br>
- </span>
- </p>
- </td>
- </tr>
- <tr>
- </tr>
- </table>
- <img src="graphics/logos.gif" alt="perfSONAR project
partners" width="117" height="263" border="0" align="top"/>
- </div>
- <div class="centerWindow">
- <object data="welcome.htm" type="text/html" name="main"
width="99%" height="100%">
- </object>
- </div>
- </div>
- <div class="footer">
- PERFormance Service-Oriented Network monitoring ARchitecture
&nbsp;
- </div>
- </div>
- </body>
-</html>

Modified: trunk/perfsonar-web-admin-0/src/main/webapp/main.css
===================================================================
--- trunk/perfsonar-web-admin-0/src/main/webapp/main.css 2014-02-27
13:51:51 UTC (rev 6500)
+++ trunk/perfsonar-web-admin-0/src/main/webapp/main.css 2014-03-12
17:17:05 UTC (rev 6501)
@@ -49,7 +49,6 @@

.adminPanel{
width: 94%;
- height: 50%;
float:left;
margin-left: 3%;
margin-right: 5%;
@@ -241,21 +240,20 @@
border: none;
padding: 0px;
width: 100%;
- height: 750px;
background-color: #ffffff;
}
.centerWindow{
background-color: #FFFFFF;
width: 82%;
- height:80%;
margin-right: 5px;
margin-bottom: 5px;
margin-left: 0;
float: left;
}
.centerWindow object{
- width: 101%;
- height: 105%;
+ width: 100%;
+ height: 80%;
+ min-height: 550px;
background-color: #FFFFFF;
}

@@ -269,8 +267,8 @@

.sidebar{
width: 15%;
- height: 71.1%;
- padding-bottom: 12.1%;
+ height: 80%;
+ min-height: 550px;
padding-right: 0px;
float: left;
border-right-width: 1px;
@@ -340,7 +338,6 @@


.footer{
- height: 20px;
text-align: right;
color: #61AF61;
background-color: #ffffff;
@@ -354,7 +351,7 @@
border-right-style: none;
border-right-color: #FFFFFF;
border-left-color: #FFFFFF;
- float: none;
+ clear: both;
}
.footermain {
height: 20px;

Deleted: trunk/perfsonar-web-admin-0/src/main/webapp/welcome_sqlma.htm
===================================================================
--- trunk/perfsonar-web-admin-0/src/main/webapp/welcome_sqlma.htm
2014-02-27 13:51:51 UTC (rev 6500)
+++ trunk/perfsonar-web-admin-0/src/main/webapp/welcome_sqlma.htm
2014-03-12 17:17:05 UTC (rev 6501)
@@ -1,153 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1"/>
- <title>Untitled Document</title>
- <link rel="stylesheet" type="text/css" href="main.css"/>
- </head>
- <body style="background-color: #FFFFFF" >
- <div class="centerWindow" >
- <p class="welcometext">Welcome to the perfSONAR service web
admin administration interface</p>
- <p class="heading1">
- Configuration Settings
- </p>
- <table width="0" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td>
- <table width="0" border="0" cellpadding="0"
cellspacing="0" background="graphics/step_1_slice.gif" class="contenttable">
- <tr>
- <td>
- <img src="graphics/step_1_top.gif"
width="350" height="122">
- </td>
- </tr>
- <tr>
- <td class="configheading">
- <p>
- <a href="Wizard"
target="main">Service Settings</a>
- </p>
- <p>
- &nbsp;
- </p>
- <p>
- &nbsp;
- </p>
- </td>
- </tr>
- <tr>
- <td >
- <p>
- &nbsp;
- </p>
- <p>
- &nbsp;
- </p>
- <p>
- &nbsp;
- </p>
- </td>
- </tr>
- <tr>
- <td >
- <p>
- &nbsp;
- </p>
- <p>
- &nbsp;
- </p>
- <p>
- &nbsp;
- </p>
- </td>
- </tr>
- <tr>
- <td >
- <p>
- &nbsp;
- </p>
- <p>
- &nbsp;
- </p>
- <p>
- &nbsp;
- </p>
- </td>
- </tr>
- <tr><td> </td></tr>
- <tr>
- <td>
- <img src="graphics/step_1_bottom.gif"
width="350" height="18">
- </td>
- </tr>
- </table>
- </td>
- <td>
- <table width="0" border="0" cellpadding="0"
cellspacing="0" background="graphics/step_2_slice.gif" class="contenttable">
- <tr>
- <td>
- <img src="graphics/step_2_top.gif"
width="350" height="118">
- </td>
- </tr>
- <tr>
- <td class="configheadinglavender">
- <p>
- <a
href="ServiceAdmin?serviceProperties" target="main">Service Settings</a>
- </p>
- <p>
- &nbsp;
- </p>
- <p>
- &nbsp;
- </p>
- </td>
- </tr>
- <tr>
- <td class="configheadinglavender">
- <p>
- <a
href="ServiceAdmin?loggingProperties" target="main">Logging Settings</a>
- </p>
- <p>
- &nbsp;
- </p>
- <p>
- &nbsp;
- </p>
- </td>
- </tr>
- <tr>
- <td class="configheadinglavender">
- <p>
- <a href="eXistAdmin"
target="main">eXist Database settings</a>
- </p>
- <p>
- &nbsp;
- </p>
- <p>
- &nbsp;
- </p>
- </td>
- </tr>
- <tr>
- <td class="configheadinglavender">
- <p>
- <a href="SQLMAdmin"
target="main">SQL MA Administration settings</a>
- </p>
- <p>
- &nbsp;
- </p>
- <p>
- &nbsp;
- </p>
- </td>
- </tr>
- <tr>
- <td>
- <img src="graphics/step_2_bottom.gif"
width="350" height="18">
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </div>
- </body>
-</html>
\ No newline at end of file


  • [pS-dev] [GEANT/SA2/ps-java-services] r6501 - in trunk: perfsonar-java-sql-ma/src/main/webapp perfsonar-web-admin-0/src/main/webapp, svn-noreply, 03/12/2014

Archive powered by MHonArc 2.6.16.

Top of Page