Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r3599 - in branches/WebAdmin: . graphics perfSONARWebAdmin/admin/exist perfSONARWebAdmin/admin/service perfSONARWebAdmin/admin/wizard perfSONARWebAdmin/auxiliary perfSONARWebAdmin/auxiliary/sqlma perfSONARWebAdmin/auxiliary/wizard

Subject: perfsonar development work

List archive

perfsonar: r3599 - in branches/WebAdmin: . graphics perfSONARWebAdmin/admin/exist perfSONARWebAdmin/admin/service perfSONARWebAdmin/admin/wizard perfSONARWebAdmin/auxiliary perfSONARWebAdmin/auxiliary/sqlma perfSONARWebAdmin/auxiliary/wizard


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r3599 - in branches/WebAdmin: . graphics perfSONARWebAdmin/admin/exist perfSONARWebAdmin/admin/service perfSONARWebAdmin/admin/wizard perfSONARWebAdmin/auxiliary perfSONARWebAdmin/auxiliary/sqlma perfSONARWebAdmin/auxiliary/wizard
  • Date: Thu, 3 Apr 2008 02:03:41 -0400
Author: michalis
Date: 2008-04-03 02:03:41 -0400 (Thu, 03 Apr 2008)
New Revision: 3599

Removed:
branches/WebAdmin/tip_centerwindow.js
branches/WebAdmin/tip_followscroll.js
Modified:
branches/WebAdmin/Service_Admin.js
branches/WebAdmin/default.css
branches/WebAdmin/graphics/Thumbs.db
branches/WebAdmin/graphics/step_1_bottom.gif
branches/WebAdmin/graphics/step_1_slice.gif
branches/WebAdmin/graphics/step_1_top.gif
branches/WebAdmin/graphics/step_2_bottom.gif
branches/WebAdmin/graphics/step_2_slice.gif
branches/WebAdmin/graphics/step_2_top.gif
branches/WebAdmin/index.html
branches/WebAdmin/index_sqlma.html
branches/WebAdmin/main.css
branches/WebAdmin/perfSONARWebAdmin/admin/exist/eXistAdmin.java
branches/WebAdmin/perfSONARWebAdmin/admin/service/Admin.java
branches/WebAdmin/perfSONARWebAdmin/admin/wizard/Wizard.java
branches/WebAdmin/perfSONARWebAdmin/auxiliary/PerfsonarPropertiesImpl.java
branches/WebAdmin/perfSONARWebAdmin/auxiliary/sqlma/HTMLOutput.java
branches/WebAdmin/perfSONARWebAdmin/auxiliary/sqlma/ibatisFileManager.java
branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/HTMLOutput.java
branches/WebAdmin/welcome.htm
branches/WebAdmin/welcome_sqlma.htm
Log:
Committing latest code and html+css changes

Modified: branches/WebAdmin/Service_Admin.js
===================================================================
--- branches/WebAdmin/Service_Admin.js 2008-04-03 05:58:10 UTC (rev 3598)
+++ branches/WebAdmin/Service_Admin.js 2008-04-03 06:03:41 UTC (rev 3599)
@@ -17,6 +17,8 @@

function FloatPosition(){
var ns = (navigator.appName.indexOf("Netscape") != -1);
+ var x = screen.width;
+ var y = screen.height;
var button = document.getElementById("Button");
var reset_button = document.getElementById("ResetButton");
if (reset_button) {
@@ -24,16 +26,25 @@
var offset = reset_button.parentNode.offsetLeft;
var leftoffset = parent
if (reset_button != null) {
- reset_button.style.top = 96 + '%';
- reset_button.style.left = 85+ '%';
- //reset_button.style.top = (innerHeight - 28) + 'px';
- //reset_button.style.left = (offset + width - 53 - 68) + 'px';
+ if (y == 768) {
+ reset_button.style.top = 95 + '%';
+ reset_button.style.left = 83 + '%';
+ }
+ else {
+ //alert("Not 768 "+x);
+ reset_button.style.top = 95 + '%';
+ reset_button.style.left = 67 + '%';
+ }
}
if (button != null) {
- button.style.top = 96 + '%';
- button.style.left = 91.5+ '%';
- // button.style.top = (innerHeight - 28) + 'px';
- // button.style.left = (offset + width - 55) + 'px';
+ if (y == 768) {
+ button.style.top = 95 + '%';
+ button.style.left = 91.5 + '%';
+ }
+ else {
+ button.style.top = 95 + '%';
+ button.style.left = 74 + '%';
+ }
}
}


Modified: branches/WebAdmin/default.css
===================================================================
--- branches/WebAdmin/default.css 2008-04-03 05:58:10 UTC (rev 3598)
+++ branches/WebAdmin/default.css 2008-04-03 06:03:41 UTC (rev 3599)
@@ -20,6 +20,7 @@
.top {
display: block;
font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
color: #468C46;
margin: 0% 1% 0 1%;
border-bottom: 1px dotted #468C46;
@@ -34,12 +35,14 @@

.properties {
font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
padding: 10px;
margin: 0% 1% 0 1%;
}

.properties p {
- font-size: 120%;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}

.properties table {
@@ -49,6 +52,8 @@

.properties td {
padding: 15px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}

.properties em {
@@ -58,8 +63,8 @@
}

.info_wizard {
- font-family: erdana, Arial, Helvetica, sans-serif;
- font-size: 100%;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
color: #468C46;
}

@@ -68,64 +73,93 @@
/* General Purpose CSS*/
.welcometextlavender {
font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 110%;
+ font-size: 13px;
font-weight: bold;
color: #4169E1;
- font-weight: bold;
border-bottom-width: 1px;
border-bottom-style: dotted;
border-bottom-color: #4169E1;
clip: rect( auto, auto, auto, auto );
- margin-left: 1%;
+ margin-left: 0%;
}

+.formated_text {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
.blueheader {
text-align: left;
color: #4169E1;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}

.info {
font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 100%;
+ font-size: 13px;
color: #4169E1;
+ float: none;
margin: 0% 0% 0% 1%;
}

.info p {
+ float: none;
+ text-align: justify;
}

.lightgrey {
background-color: #f1f3f1;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
}

.lightgrey td {
- padding: 8px
+ padding: 5px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
}

.darkgrey {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
background-color: #e1e5e1;
}

.darkgrey td {
- padding: 8px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ padding: 5px;
}

.hilighted {
color: #4169E1;
border-bottom: 1px solid #4169E1;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}

.underlined {
border-bottom: 1px solid #4169E1;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}

.tablessContent {
- margin: 2% 1% 0 1%;
+ margin: 2% 0 0 0.3%;
background: #ffffff;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}

+.input_style_blue {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+}
+
.headerlavender {
font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
background-color: #A0A0D8;
margin-right: 0px;
margin-left: 0px;
@@ -133,9 +167,9 @@
}
/*eXist Admin CSS*/
.content {
- font-family: arial;
- font-size: 120%;
- margin: 2% 1% 0 1%;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ margin: 2% 0% 0 0%;
background: #ffffff;
}

@@ -157,15 +191,17 @@

.manage_exist {
background: #ffffff;
- margin: 0% 1% 0% 0%;
+ margin: 0% 0% 0% 0%;
padding: 0px;
}

.showResource {
- font-weight: bold;
+ float: none;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
text-indent: 0%;
margin-top: 5px;
- margin-left: 1%;
+ margin-left: 0.3%;
padding: 0px;
text-align: inherit;
}
@@ -174,10 +210,13 @@
left: -100px;
position: static;
margin-top: 0px;
+ border-spacing: 1px 0px;
}

.showResource th {
padding: 10px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
background-color: #C7C7F2;
}

@@ -187,23 +226,15 @@

.showResource p {
font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 100%;
+ font-size: 13px;
border: none;
padding: 5px;
- margin: 0% 4% 0% 0%;
+ margin: 0% 0% 0% 0%;
}

-#exist_text {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- text-align: left;
- font-size: 100%;
- border: none;
- margin: 0% 3% 0% 0%;
-}
-
.exist_welcome_text {
font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 100%;
+ font-size: 13px;
font-weight: bold;
padding: 5px;
color: #4169E1;
@@ -212,13 +243,13 @@
border-bottom-style: dotted;
border-bottom-color: #4169E1;
clip: rect( auto, auto, auto, auto );
- margin-left: 1%;
+ margin-left: 0%;
}

.input {
padding: 1em;
- font-size: 110%;
- font-family: arial;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}

.input_style {
@@ -228,15 +259,16 @@
}

.login_table {
- background-color: #E6E6FA;
-
+ background-color: #E6E6FA;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}

-.login_table td{
- font-weight:bold;
+.login_table td {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}

-
.logout {
margin-top: 10px;
margin-left: 48%;
@@ -260,15 +292,21 @@
.input_table {
border: 1px solid #4169E1;
border-spacing: 0px 1px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}

.input_table td {
padding: 5px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}

.input_table th {
padding: 5px;
text-align: left;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}
/*Exist Buttons CSS*/
.collections_option_on a {
@@ -324,12 +362,13 @@
height: 28px;
margin: 0;
padding: 0;
- border:0px;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 80%;
+ border: 0px;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
font-weight: bold;
- text-align:center;
- clip: rect(auto,auto,auto,auto);
+ text-align: center;
+ clip: rect( auto, auto, auto, auto );
+ cursor: pointer;
background: transparent url(graphics/button_1_small.gif) no-repeat
center top;
float: left;
}
@@ -337,17 +376,19 @@
.edit_button_res {
display: block;
margin-top: 5px;
+ margin-left: 0px;
width: 120px;
height: 28px;
float: left;
- outline: none;
+ outline: none;
border: none;
- text-align: center;
+ text-align: center;
font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 70%;
+ font-size: 90%;
font-weight: bold;
text-decoration: none;
- background:url(graphics/button_1_large.gif) no-repeat center;
+ background: url(graphics/button_1_large.gif) no-repeat center;
+ cursor: pointer;
}

.create_button_res {
@@ -357,10 +398,11 @@
height: 28px;
float: left;
border: none;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 70%;
- font-weight:600;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
text-decoration: none;
+ cursor: pointer;
background: transparent url(graphics/button_1_large.gif) no-repeat
center;
}

@@ -369,12 +411,13 @@
margin-top: 5px;
width: 120px;
height: 28px;
- float: left;
+ float: none;
border: none;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 70%;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
font-weight: 600;
text-decoration: none;
+ cursor: pointer;
background: transparent url(graphics/button_1_large.gif) no-repeat
center top;
}

@@ -384,9 +427,10 @@
margin: 0;
border: 0;
padding: 0;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 70%;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
font-weight: 600;
+ cursor: pointer;
background: transparent url(graphics/button_1_small.gif) no-repeat
center top;
float: left;
}
@@ -397,49 +441,56 @@
margin: 0;
border: 0;
padding: 0;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 70%;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
font-weight: 600;
+ cursor: pointer;
background: transparent url(graphics/button_1_small.gif) no-repeat
center top;
float: left;
}
-.execute_button_users{
- width: 54px;
+
+.execute_button_users {
+ width: 54px;
height: 28px;
margin: 0;
border: 0;
padding: 0;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 70%;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
font-weight: 600;
+ cursor: pointer;
background: transparent url(graphics/button_1_small.gif) no-repeat
center top;
float: right;
}
/*Properties CSS */
.groupheading {
font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
+ font-size: 10px;
color: #468C46;
}

.manage {
background: #ffffff;
- margin: 0 1% 0 1%;
+ margin: 0 0.3% 0 0.3%;
padding: 0px;
}

.manage table {
- padding: 10px;
+ padding: 3px;
border-spacing: 1px 0px;
}

.manage th {
- padding: 10px;
+ padding-top: 8px;
+ padding-bottom: 8px;
+ padding-left: 5px;
text-align: left;
}

.manage td {
- padding: 10px;
+ padding-top: 8px;
+ padding-bottom: 8px;
+ padding-left: 5px;
}
/*Properties Buttons CSS*/
.floatResetButton {
@@ -450,6 +501,7 @@
padding: 0;
border: 0;
text-indent: -1000em;
+ cursor: pointer;
background: transparent url(graphics/cancel_button.gif) no-repeat center
top;
float: right;
}
@@ -462,6 +514,7 @@
border: 0;
padding: 0;
text-indent: -1000em;
+ cursor: pointer;
background: transparent url(graphics/apply_button_2.gif) no-repeat
center top;
float: right;
}
@@ -473,94 +526,115 @@
border: 0;
padding: 0;
text-indent: -1000em;
+ cursor: pointer;
background: transparent url(graphics/apply_button.gif) no-repeat center
top;
- float: left;
+ float: none;
}
/* SQLMA Admin CSS*/
.manage_slqma {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
margin: 0% 1% 0% 1%;
}

.Options {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
margin: 0% 1% 0% 1%;
}

#options {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
margin: 0% 1% 0% 1%;
}

-
#EditFile {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
margin: 0% 1% 0% 1%;
- float:none;
+ float: none;
}

#CreateNewFile {
margin: 0% 1% 0% 1%;
- float:none;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ float: none;
}
-.execute_button_sqlma{
-
- display: block;
+
+.execute_button_sqlma {
+ display: block;
margin-top: 5px;
width: 120px;
height: 28px;
float: left;
border: none;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 70%;
- font-weight:600;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
text-decoration: none;
+ cursor: pointer;
background: transparent url(graphics/button_1_large.gif) no-repeat
center;
}

-.execute_button_sqlma_small{
-
- display: block;
+.execute_button_sqlma_small {
+ display: block;
margin-top: 5px;
width: 54px;
height: 28px;
float: left;
border: none;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 70%;
- font-weight:600;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
text-decoration: none;
+ cursor: pointer;
background: transparent url(graphics/button_1_small.gif) no-repeat
center;
}
-.execute_button_sqlma_large{
-
- display: block;
+
+.execute_button_sqlma_large {
+ display: block;
margin-top: 5px;
width: 120px;
height: 28px;
float: left;
border: none;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 70%;
- font-weight:600;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
text-decoration: none;
+ cursor: pointer;
background: transparent url(graphics/button_1_large.gif) no-repeat
center;
}
+
.sqlmaheader {
- margin-left:1%;
+ margin-left: 1%;
color: #4169E1;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 13px;
}
-init_table{
- margin-left:1%;
- float:left;
+
+init_table {
+ margin-left: 1%;
+ float: left;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 13px;
}

-.init_table td{
- padding:8px;
- text-align:left;
- font-family: Helvetica, Calibri, Arial, sans-serif;
+.init_table td {
+ padding: 8px;
+ text-align: left;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 13px;
}
-.init_table th{
- padding:8px;
- text-align:left;
- color:#4169E1;
- font-family: Helvetica, Calibri, Arial, sans-serif;
+
+.init_table th {
+ padding: 8px;
+ text-align: left;
+ color: #4169E1;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 13px;
}



Modified: branches/WebAdmin/graphics/Thumbs.db
===================================================================
(Binary files differ)

Modified: branches/WebAdmin/graphics/step_1_bottom.gif
===================================================================
(Binary files differ)

Modified: branches/WebAdmin/graphics/step_1_slice.gif
===================================================================
(Binary files differ)

Modified: branches/WebAdmin/graphics/step_1_top.gif
===================================================================
(Binary files differ)

Modified: branches/WebAdmin/graphics/step_2_bottom.gif
===================================================================
(Binary files differ)

Modified: branches/WebAdmin/graphics/step_2_slice.gif
===================================================================
(Binary files differ)

Modified: branches/WebAdmin/graphics/step_2_top.gif
===================================================================
(Binary files differ)

Modified: branches/WebAdmin/index.html
===================================================================
--- branches/WebAdmin/index.html 2008-04-03 05:58:10 UTC (rev 3598)
+++ branches/WebAdmin/index.html 2008-04-03 06:03:41 UTC (rev 3599)
@@ -10,33 +10,39 @@
}

.style3 {
- color: #8585c1
+ color: #8585c1;
+ font-size: 13px;
}
- .style3 a:link {
- color: #8585C1;
- cursor: pointer;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-.style3 a:active {
- color: #117721;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- font-weight: bold;
-}
-.style3 a:visited {
- color: #8585C1;
- cursor: auto;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-.style3 a:hover {
- color: #8585C1;
- cursor: pointer;
- text-decoration: underline;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- 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>
@@ -56,7 +62,7 @@
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<th>
- <a href="welcome.htm" class="button"
target="main" >Admin home &nbsp; &nbsp; &nbsp;</a>
+ <a href="welcome.htm" class="button"
target="main">Admin home &nbsp; &nbsp; &nbsp;</a>
</th>
</tr>
<tr>
@@ -68,7 +74,7 @@
</span>
</p>
<p>
- <span class="navtex"><a href="Wizard"
target="main">Service</a></span>
+ <span class="navtex"><a href="Wizard"
target="main">Service</a></span>
</p>
</p>
</td>
@@ -87,7 +93,7 @@
<a
href="ServiceAdmin?loggingProperties" target="main">Logging</a>
<br>
<a href="eXistAdmin"
target="main">eXist Database</a>
-
<br>
+ <br>
</span>
</p>
</td>
@@ -97,8 +103,8 @@
</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="106%" >
+ <div class="centerWindow">
+ <object data="welcome.htm" type="text/html" name="main"
width="99%" height="100%">
</object>
</div>
</div>

Modified: branches/WebAdmin/index_sqlma.html
===================================================================
--- branches/WebAdmin/index_sqlma.html 2008-04-03 05:58:10 UTC (rev 3598)
+++ branches/WebAdmin/index_sqlma.html 2008-04-03 06:03:41 UTC (rev 3599)
@@ -10,33 +10,39 @@
}

.style3 {
- color: #8585c1
+ color: #8585c1;
+ font-size: 13px;
}
- .style3 a:link {
- color: #8585C1;
- cursor: pointer;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-.style3 a:active {
- color: #117721;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- font-weight: bold;
-}
-.style3 a:visited {
- color: #8585C1;
- cursor: auto;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-.style3 a:hover {
- color: #8585C1;
- cursor: pointer;
- text-decoration: underline;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- 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>
@@ -56,7 +62,7 @@
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<th>
- <a href="welcome.htm" class="button"
target="main" >Admin home &nbsp; &nbsp; &nbsp;</a>
+ <a href="welcome.htm" class="button"
target="main">Admin home &nbsp; &nbsp; &nbsp;</a>
</th>
</tr>
<tr>
@@ -68,7 +74,7 @@
</span>
</p>
<p>
- <span class="navtex"><a href="Wizard"
target="main">Service</a></span>
+ <span class="navtex"><a href="Wizard"
target="main">Service</a></span>
</p>
</p>
</td>
@@ -87,9 +93,9 @@
<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 Administration</a>
- <br>
+ <br>
+ <a href="SQLMAdmin"
target="main">SQL MA Admin</a>
+ <br>
</span>
</p>
</td>
@@ -99,8 +105,8 @@
</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="106%" >
+ <div class="centerWindow">
+ <object data="welcome.htm" type="text/html" name="main"
width="99%" height="100%">
</object>
</div>
</div>

Modified: branches/WebAdmin/main.css
===================================================================
--- branches/WebAdmin/main.css 2008-04-03 05:58:10 UTC (rev 3598)
+++ branches/WebAdmin/main.css 2008-04-03 06:03:41 UTC (rev 3599)
@@ -48,10 +48,10 @@
}

.adminPanel{
- width: 90%;
+ width: 94%;
height: 50%;
float:left;
- margin-left: 5%;
+ margin-left: 3%;
margin-right: 5%;
background-color: #ffffff;
margin-bottom: 2%;
@@ -214,12 +214,13 @@
height: 94px;
background-image: url(top_slice.gif);
background-color: #FFFFFF;
- padding-left: 0px;
+ padding: 0px;
clip: rect(auto,auto,auto,auto);
float:left;
}
.mainWindow{
border: none;
+ padding: 0px;
width: 100%;
height: 750px;
background-color: #ffffff;
@@ -230,11 +231,11 @@
height:80%;
margin-right: 5px;
margin-bottom: 5px;
- margin-left: 5px;
+ margin-left: 0;
float: left;
}
.centerWindow object{
- width: 100%;
+ width: 101%;
height: 105%;
background-color: #FFFFFF;
}
@@ -249,7 +250,7 @@

.sidebar{
width: 15%;
- height: 66%;
+ height: 71.1%;
padding-bottom: 12.1%;
padding-right: 0px;
float: left;

Modified: branches/WebAdmin/perfSONARWebAdmin/admin/exist/eXistAdmin.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/admin/exist/eXistAdmin.java
2008-04-03 05:58:10 UTC (rev 3598)
+++ branches/WebAdmin/perfSONARWebAdmin/admin/exist/eXistAdmin.java
2008-04-03 06:03:41 UTC (rev 3599)
@@ -560,12 +560,12 @@
.println("<input type=\"hidden\"
name=\"currentCollection\" value=\""
+ childCollection + "\" >");
out.println("<input type=\"hidden\" name=\"ChildCollection\"
value=\""
- + childCollection + "\" > </p></p>");
+ + childCollection + "\" >");

// Setting function as a hidded parameter for reference in
the next
// request
out
- .println("<input type=\"hidden\"
name=\"function\" value=\"collections\" >");
+ .println("<input type=\"hidden\"
name=\"function\" value=\"collections\" > </p><p/>");

out.println("</form><br/>");
out.println("</div>");
@@ -1535,7 +1535,7 @@

preempt(out, true,"");
out.println("<div class=\"info\">");
- out.println("<br><p><h4>" + message + "</h4>");
+ out.println("<br><p>" + message );
if (back) {
out.println("<a href=\"/perfSONAR/eXistAdmin\" \">Go
Back</a>");
}
@@ -1625,7 +1625,7 @@

out.println("<div class=\"info\" >");
out.println("<p>");
- out.println("<h3>" + message + "</h3>");
+ out.println(message);
if (back) {

out

Modified: branches/WebAdmin/perfSONARWebAdmin/admin/service/Admin.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/admin/service/Admin.java
2008-04-03 05:58:10 UTC (rev 3598)
+++ branches/WebAdmin/perfSONARWebAdmin/admin/service/Admin.java
2008-04-03 06:03:41 UTC (rev 3599)
@@ -454,7 +454,7 @@
}
out
.println("<p
class=\"welcometextlavender\">"+tableName+"</p>");
- out.println("<br>The listed settings are optional. You can
configure them to customise your installation. Place your mouse cursor on a
setting to display help.</br><br/>");
+ out.println("<p class=\"formated_text\" >The listed settings
are optional. You can configure them to customise your installation. Place
your mouse cursor on a setting to display help.</p><br/>");
out.println("<form action=\"ServiceAdmin\" method=\"POST\">
");

out.println("<table>");

Modified: branches/WebAdmin/perfSONARWebAdmin/admin/wizard/Wizard.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/admin/wizard/Wizard.java
2008-04-03 05:58:10 UTC (rev 3598)
+++ branches/WebAdmin/perfSONARWebAdmin/admin/wizard/Wizard.java
2008-04-03 06:03:41 UTC (rev 3599)
@@ -176,7 +176,7 @@
if (request.getParameterMap().isEmpty()) {
output

.showAllProperties(groupedProperties,
-
"Please fill in all fields. Mandatory fileds are marked with an asterisk.");
+
"Please fill in all fields. Mandatory fields are marked with an asterisk.");
} else {
// If there are parameters in the
request, that means the
// user has probably used the
sercvlet to provide input

Modified:
branches/WebAdmin/perfSONARWebAdmin/auxiliary/PerfsonarPropertiesImpl.java
===================================================================
---
branches/WebAdmin/perfSONARWebAdmin/auxiliary/PerfsonarPropertiesImpl.java
2008-04-03 05:58:10 UTC (rev 3598)
+++
branches/WebAdmin/perfSONARWebAdmin/auxiliary/PerfsonarPropertiesImpl.java
2008-04-03 06:03:41 UTC (rev 3599)
@@ -123,8 +123,8 @@
if (prop.length >= 1 &&
prop.length <= 2) {
if
(!prop[0].equals("")) {

PerfsonarProperty property = new PerfsonarProperty();
-
property.setGroup("Not Specified");
-
property.setDescription("Not Specified");
+
property.setGroup("Misc");
+
property.setDescription("Misc");

property.setKey(prop[0]);
if
(prop.length == 2) {

property.setValue(prop[1]);

Modified: branches/WebAdmin/perfSONARWebAdmin/auxiliary/sqlma/HTMLOutput.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/auxiliary/sqlma/HTMLOutput.java
2008-04-03 05:58:10 UTC (rev 3598)
+++ branches/WebAdmin/perfSONARWebAdmin/auxiliary/sqlma/HTMLOutput.java
2008-04-03 06:03:41 UTC (rev 3599)
@@ -227,7 +227,7 @@
.println("<tr><th>Table Name:</th><td><input
type=\"text\" name=\"tableName\" value=\"\" size=\"20\" /></td></tr>");

out
- .println("<tr><td><input
class=\"execute_button_sqlma\" type=\"submit\" name=\"Execute\"
value=\"Create\" /></td><td/></tr>");
+ .println("<tr><td><input
class=\"input_Create_button\" type=\"submit\" name=\"Execute\"
value=\"Create\" /></td><td/></tr>");
out.println("</table></form>");
out.println("</div>");


Modified:
branches/WebAdmin/perfSONARWebAdmin/auxiliary/sqlma/ibatisFileManager.java
===================================================================
---
branches/WebAdmin/perfSONARWebAdmin/auxiliary/sqlma/ibatisFileManager.java
2008-04-03 05:58:10 UTC (rev 3598)
+++
branches/WebAdmin/perfSONARWebAdmin/auxiliary/sqlma/ibatisFileManager.java
2008-04-03 06:03:41 UTC (rev 3599)
@@ -124,11 +124,23 @@
String mapFile) throws Exception {

File file = new File(ibatisDirectory + "/" + ibatisFile);
- boolean success1 = file.renameTo(new File(ibatisDirectory +
"/"
- + ibatisFile + ".old"));
+ boolean success1 =false;
+
+ if(file.exists()){
+ success1 = file.renameTo(new File(ibatisDirectory +
"/"
+ + ibatisFile + ".old"));
+ }else{
+ success1=true;
+ }
File file2 = new File(ibatisDirectory + "/" + mapFile);
- boolean success2 = file2.renameTo(new File(ibatisDirectory +
"/"
- + mapFile + ".old"));
+ boolean success2=false;
+ if(file2.exists()){
+ success2 = file2.renameTo(new File(ibatisDirectory +
"/"
+ + mapFile + ".old"));
+ }else{
+ success2 =true;
+ }
+
if (success1 && success2) {
IbatisConf conf = new IbatisConf();


Modified: branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/HTMLOutput.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/HTMLOutput.java
2008-04-03 05:58:10 UTC (rev 3598)
+++ branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/HTMLOutput.java
2008-04-03 06:03:41 UTC (rev 3599)
@@ -251,17 +251,17 @@
if (group.equals("LS")) {

out
- .println("<tr><td>Do
you wish to register to an LS?</td><td>");
+ .println("<tr><td>Do
you wish to register to a
LS?</td><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
out
.println("<input
type=\"radio\" name=\"useLS\" value=\"yes\" "
- +
onClick + ">yes</input>");
+ +
onClick + ">&nbsp&nbsp;yes&nbsp;</input>");
out
- .println("<input
type=\"radio\" checked name=\"useLS\" value=\"no\" "
- +
onClick + ">no</input></td><td>");
+
.println("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type=\"radio\" checked
name=\"useLS\" value=\"no\" "
+ +
onClick +
">&nbsp&nbsp;no&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</input></td><td>");

} else {
out.println("<tr><td>" +
pr.getPropertyComment()
- + "</td><td>");
+ +
"</td><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
String[] values =
pr.getAcceptedValues();
if (values != null) {

@@ -271,8 +271,8 @@
: "";
out.println("<input
type=\"radio\"" + checked
+ "
name=\"" + pr.getKey() + "\" value=\""
- +
values[i] + "\" " + onClick + ">"
- +
values[i] + "</input></td><td>");
+ +
values[i] + "\" " + onClick + ">&nbsp&nbsp;"
+ +
values[i] + "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</input></td><td>");
}
}
}
@@ -303,6 +303,9 @@
out.println("</table>");
out.println("</div>");
}
+ for(int i=0;i<126;i++){
+ out.print("&nbsp;");
+ }
out.println("<input align=\"right\" input id=\"Button\"
class=\"submit_button\" type=\"submit\" name=\"Submit\" value=\"Submit
Changes\" />");
out.println("</form> ");
out.println("</div>");

Deleted: branches/WebAdmin/tip_centerwindow.js

Deleted: branches/WebAdmin/tip_followscroll.js

Modified: branches/WebAdmin/welcome.htm
===================================================================
--- branches/WebAdmin/welcome.htm 2008-04-03 05:58:10 UTC (rev 3598)
+++ branches/WebAdmin/welcome.htm 2008-04-03 06:03:41 UTC (rev 3599)
@@ -17,7 +17,7 @@
<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="401" height="122">
+ <img src="graphics/step_1_top.gif"
width="350" height="122">
</td>
</tr>
<tr>
@@ -62,7 +62,7 @@
<tr><td> </td></tr>
<tr>
<td>
- <img src="graphics/step_1_bottom.gif"
width="401" height="18">
+ <img src="graphics/step_1_bottom.gif"
width="350" height="18">
</td>
</tr>
</table>
@@ -71,7 +71,7 @@
<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="401" height="118">
+ <img src="graphics/step_2_top.gif"
width="350" height="118">
</td>
</tr>
<tr>
@@ -103,7 +103,7 @@
<tr>
<td class="configheadinglavender">
<p>
- <a href="eXistAdmin"
target="main">eXist database settings</a>
+ <a href="eXistAdmin"
target="main">eXist Database settings</a>
</p>
<p>
&nbsp;
@@ -115,7 +115,7 @@
</tr>
<tr>
<td>
- <img src="graphics/step_2_bottom.gif"
width="401" height="18">
+ <img src="graphics/step_2_bottom.gif"
width="350" height="18">
</td>
</tr>
</table>

Modified: branches/WebAdmin/welcome_sqlma.htm
===================================================================
--- branches/WebAdmin/welcome_sqlma.htm 2008-04-03 05:58:10 UTC (rev 3598)
+++ branches/WebAdmin/welcome_sqlma.htm 2008-04-03 06:03:41 UTC (rev 3599)
@@ -17,7 +17,7 @@
<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="401" height="122">
+ <img src="graphics/step_1_top.gif"
width="350" height="122">
</td>
</tr>
<tr>
@@ -75,7 +75,7 @@
<tr><td> </td></tr>
<tr>
<td>
- <img src="graphics/step_1_bottom.gif"
width="401" height="18">
+ <img src="graphics/step_1_bottom.gif"
width="350" height="18">
</td>
</tr>
</table>
@@ -84,7 +84,7 @@
<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="401" height="118">
+ <img src="graphics/step_2_top.gif"
width="350" height="118">
</td>
</tr>
<tr>
@@ -116,7 +116,7 @@
<tr>
<td class="configheadinglavender">
<p>
- <a href="eXistAdmin"
target="main">eXist database settings</a>
+ <a href="eXistAdmin"
target="main">eXist Database settings</a>
</p>
<p>
&nbsp;
@@ -129,19 +129,19 @@
<tr>
<td class="configheadinglavender">
<p>
- <a href="SQLMAdmin"
target="main">SQL MA Administration</a>
+ <a href="SQLMAdmin"
target="main">SQL MA Administration settings</a>
</p>
<p>
&nbsp;
</p>
- <p>
+ <p>
&nbsp;
</p>
</td>
</tr>
<tr>
<td>
- <img src="graphics/step_2_bottom.gif"
width="401" height="18">
+ <img src="graphics/step_2_bottom.gif"
width="350" height="18">
</td>
</tr>
</table>


  • perfsonar: r3599 - in branches/WebAdmin: . graphics perfSONARWebAdmin/admin/exist perfSONARWebAdmin/admin/service perfSONARWebAdmin/admin/wizard perfSONARWebAdmin/auxiliary perfSONARWebAdmin/auxiliary/sqlma perfSONARWebAdmin/auxiliary/wizard, svnlog, 04/03/2008

Archive powered by MHonArc 2.6.16.

Top of Page