perfsonar development work

Author: wiku
Date: 2010-01-04 05:46:45 -0500 (Mon, 04 Jan 2010)
New Revision: 5451

Modified:
   branches/new-structure-with-base2/ps-mdm-web-admin/.classpath
   
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
   
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/ObjectMap.java
   
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/servlet/util/Base64.java
   
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/WAXMLReader.java
   
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/XMLUtil.java
   
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/styles/default.css
   branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/styles/main.css
   branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/welcome.jsp
Log:


Modified: branches/new-structure-with-base2/ps-mdm-web-admin/.classpath
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/.classpath       
2010-01-04 09:17:38 UTC (rev 5450)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/.classpath       
2010-01-04 10:46:45 UTC (rev 5451)
@@ -8,7 +8,7 @@
        <classpathentry kind="lib" 
path="lib/repository/Validation/msv/1.0/msv-1.0.jar"/>
        <classpathentry kind="lib" 
path="lib/repository/Validation/relaxngDatatype/1.0/relaxngDatatype-1.0.jar"/>
        <classpathentry kind="lib" 
path="lib/repository/Validation/xsdlib/1.0/xsdlib-1.0.jar"/>
-       <classpathentry kind="lib" 
path="lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar"/>
+       <classpathentry kind="lib" 
path="lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar" 
sourcepath="lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar"/>
        <classpathentry kind="lib" 
path="lib/repository/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar"/>
        <classpathentry kind="lib" 
path="lib/libext/jaxme2/jaxmejs-0.5.2.jar"/>
        <classpathentry kind="lib" path="lib/libext/rngconv/rngconv.jar"/>

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
     2010-01-04 09:17:38 UTC (rev 5450)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
     2010-01-04 10:46:45 UTC (rev 5451)
@@ -5,6 +5,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.logging.Logger;
 
 import org.perfsonar.webadmin.base2.util.HTMLUtil;
 import org.perfsonar.webadmin.base2.util.NSContext;
@@ -23,6 +24,9 @@
 import org.w3c.dom.NodeList;
 
 public class HTMLGenerator {
+
+       private final Logger logger = Logger.getAnonymousLogger();
+
        public enum UIType {
                DROPDOWN, RADIO, RADIOGROUP, TEXTBOX, PASSOWRD;
                public static UIType fromString(String s) {
@@ -77,26 +81,23 @@
                        String cls = advanced ? "configheadinglavender" : 
"configheading";
                        for (Object o : blist) {
                                LinkType l = (LinkType) o;
-                               
-                               String pageId=l.getPageId();
-                               if(pageId!=null){
+
+                               String pageId = l.getPageId();
+                               if (pageId != null) {
                                        basic = HTMLUtil.tag("tr", 
HTMLUtil.tag("td", HTMLUtil.att(
-                                                       "class", cls), 
HTMLUtil.tag("p",
-                                                       HTMLUtil
-                                                                       
.tag("a", HTMLUtil.att("href", "config?page="
-                                                                             
          + pageId)
-                                                                             
          + HTMLUtil.att("target", "_self"), l
-                                                                             
          .getTitle()))
+                                                       "class", cls), 
HTMLUtil.tag("p", HTMLUtil.tag("a",
+                                                       HTMLUtil.att("href", 
"config?page=" + pageId)
+                                                                       + 
HTMLUtil.att("target", "_self"), l
+                                                                       
.getTitle()))
                                                        + HTMLUtil.tag("p", 
"&nbsp")
                                                        + HTMLUtil.tag("p", 
"&nbsp")))
                                                        + "\n";
-                               }else{
+                               } else {
                                        basic = HTMLUtil.tag("tr", 
HTMLUtil.tag("td", HTMLUtil.att(
-                                                       "class", cls), 
HTMLUtil.tag("p",
-                                                       HTMLUtil
-                                                                       
.tag("a", HTMLUtil.att("href",l.getRedirectTo())
-                                                                             
          + HTMLUtil.att("target", "_blank"), l
-                                                                             
          .getTitle()))
+                                                       "class", cls), 
HTMLUtil.tag("p", HTMLUtil.tag("a",
+                                                       HTMLUtil.att("href", 
l.getRedirectTo())
+                                                                       + 
HTMLUtil.att("target", "_blank"), l
+                                                                       
.getTitle()))
                                                        + HTMLUtil.tag("p", 
"&nbsp")
                                                        + HTMLUtil.tag("p", 
"&nbsp")))
                                                        + "\n";
@@ -106,20 +107,21 @@
                } else {
                        for (Object o : blist) {
                                LinkType l = (LinkType) o;
-                               
-                               String pageId=l.getPageId();
-                               
-                               if(pageId!=null){
-                                       basic = HTMLUtil.tag("a", 
HTMLUtil.att("href", "config?page="
-                                                       + pageId)
+
+                               String pageId = l.getPageId();
+
+                               if (pageId != null) {
+                                       basic = HTMLUtil.tag("a", 
HTMLUtil.att("href",
+                                                       "config?page=" + 
pageId)
                                                        + 
HTMLUtil.att("target", "_self"), l.getTitle())
                                                        + "<br/>";
-                               }else{
-                                       basic = HTMLUtil.tag("a", 
HTMLUtil.att("href", l.getRedirectTo())
+                               } else {
+                                       basic = HTMLUtil.tag("a", 
HTMLUtil.att("href", l
+                                                       .getRedirectTo())
                                                        + 
HTMLUtil.att("target", "_blank"), l.getTitle())
                                                        + "<br/>";
                                }
-                               
+
                                if (!basic.equals("")) {
                                        result.add("<p><span 
class=\"navtex\">" + basic
                                                        + "</span> </p>");
@@ -139,8 +141,8 @@
                        throw new RuntimeException("Null web admin 
interface");
                return getLinksList(wai.getBasiclink(), big, false);
        }
-       
-       public String getServiceName(ObjectMap o){
+
+       public String getServiceName(ObjectMap o) {
                WebAdminInterface wai;
                if (o == null)
                        throw new RuntimeException("Null object map");
@@ -148,8 +150,8 @@
                        throw new RuntimeException("Null web admin 
interface");
                return wai.getServiceInformation().getServiceName();
        }
-       
-       public String getVersion(ObjectMap o){
+
+       public String getVersion(ObjectMap o) {
                WebAdminInterface wai;
                if (o == null)
                        throw new RuntimeException("Null object map");
@@ -235,9 +237,10 @@
                        drawTextBox(getRawData(b.getTitle()), 
getSingleData(b.getDefault()));
                        break;
                case PASSOWRD:
-                       drawPasswordBox(getRawData(b.getTitle()), 
getSingleData(b.getDefault()));
+                       drawPasswordBox(getRawData(b.getTitle()), 
getSingleData(b
+                                       .getDefault()));
                        break;
-               
+
                default:
                        throw new RuntimeException("Unexpected BaseUI type.");
                }
@@ -345,9 +348,8 @@
 
        }
 
-       
        public void drawPasswordBox(String title, Tuple<Integer, String> t) {
-               System.out.println("WA --- Drawing a box : title: \"" + title
+               logger.info("WA --- Drawing a password box : title: \"" + 
title
                                + "\" value : \"" + t.second() + "\"");
                try {
                        html.singlerow_begin(20);
@@ -357,10 +359,11 @@
                        e.printStackTrace();
                }
        }
+
        // ////////////////////////////////////////////////////
        // TODO: External HTMLUtil.java -> HTML tags and so on
        public void drawTextBox(String title, Tuple<Integer, String> t) {
-               System.out.println("WA --- Drawing a box : title: \"" + title
+               logger.info("WA --- Drawing a box : title: \"" + title
                                + "\" value : \"" + t.second() + "\"");
                try {
                        html.singlerow_begin(20);
@@ -373,8 +376,8 @@
 
        public void drawRadio(Tuple<Integer, String> title,
                        Tuple<Integer, String[]> values) {
-               System.out.println("WA --- Drawing a radio : title: \""
-                               + title.second() + "\"");
+               logger.info("WA --- Drawing a radio : title: \"" + 
title.second()
+                               + "\"");
                // for( String s : values.second() ) println("\nradio value : 
" + s);
                try {
                        html.singlerow_begin(20);
@@ -387,8 +390,8 @@
 
        public void drawDropdown(Tuple<Integer, String> title,
                        Tuple<Integer, String[]> values) {
-               System.out.println("WA --- Drawing a drop-down : title: \""
-                               + title.second() + "\"");
+               logger.info("WA --- Drawing a drop-down : title: \"" + 
title.second()
+                               + "\"");
                // for( String s : values.second() ) println("\ndrop-down 
value : " +
                // s);
                try {
@@ -402,7 +405,7 @@
        }
 
        public void drawRadiogroup(Tuple<Integer, String[]> values, String 
innerHTML) {
-               System.out.println("WA --- Drawing a group radio: ");
+               logger.info("Drawing a group radio: ");
                boolean enabled = false;
                // FIXME: Hardcoded values
                try {

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/ObjectMap.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/ObjectMap.java
 2010-01-04 09:17:38 UTC (rev 5450)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/ObjectMap.java
 2010-01-04 10:46:45 UTC (rev 5451)
@@ -41,7 +41,7 @@
        NSContext namespaces;
        boolean sync = false;
 
-       public ObjectMap(String basePath, String confPath, String file){
+       public ObjectMap(String basePath, String confPath, String file) {
                // TODO: Unix paths
                waconfigfile = basePath + "/" + confPath + "/" + file;
                try {
@@ -118,8 +118,7 @@
                if (ret != null)
                        return ret;
                String path = basePath + "/" + uri;
-               System.out
-                               .println("WA --- Attempting to locate URI : 
\"" + path + "\"");
+               logger.info("WA --- Attempting to locate URI : \"" + path + 
"\"");
                file2doc.put(uri, (ret = XMLUtil.readDocument(path)));
                return ret;
        }
@@ -156,7 +155,7 @@
        }
 
        private void updateBase(BaseType o, String[] valueArray) {
-               System.out.println("WA --- Should update base type");
+               logger.info("WA --- Should update base type");
                if (valueArray.length == 0) {
                        logger.warning("value is empty");
                        return;

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/servlet/util/Base64.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/servlet/util/Base64.java
      2010-01-04 09:17:38 UTC (rev 5450)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/servlet/util/Base64.java
      2010-01-04 10:46:45 UTC (rev 5451)
@@ -23,8 +23,7 @@
                for (int i = 0; i < 64; i++)
                        map2[map1[i]] = (byte) i;
        }
-       
-       
+
        public Base64() {
 
        }

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/WAXMLReader.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/WAXMLReader.java
 2010-01-04 09:17:38 UTC (rev 5450)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/WAXMLReader.java
 2010-01-04 10:46:45 UTC (rev 5451)
@@ -5,6 +5,7 @@
 import java.io.FileNotFoundException;
 import java.net.MalformedURLException;
 import java.util.List;
+import java.util.logging.Logger;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
@@ -14,12 +15,17 @@
 import org.xml.sax.InputSource;
 
 public class WAXMLReader {
+
+       private final static Logger logger = Logger.getAnonymousLogger();
+
        private final static String CLASS_NAME =
        // FIXME: Should read this from JAXB xml file
        "org.perfsonar.webadmin.base2.waschema.v20090201"; // 
.WebAdminInterface";
 
+       @SuppressWarnings({ "deprecation", "unchecked" })
        public static Tuple<WebAdminInterface, JAXBContext> parseFile(
-                       String fileName) throws FileNotFoundException, 
MalformedURLException, JAXBException{
+                       String fileName) throws FileNotFoundException,
+                       MalformedURLException, JAXBException {
                File f = new File(fileName);
                InputSource isource = new InputSource(new FileInputStream(f));
                isource.setSystemId(f.toURL().toString());
@@ -32,7 +38,6 @@
        public static void main(String[] args) throws Exception {
                WebAdminInterface r = parseFile(args[0]).first();
                List p = r.getPage();
-               System.out.println("Pages " + p.size() + " "
-                               + p.get(0).getClass().getName());
+               logger.info("Pages " + p.size() + " " + 
p.get(0).getClass().getName());
        }
 };

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/XMLUtil.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/XMLUtil.java
     2010-01-04 09:17:38 UTC (rev 5450)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/XMLUtil.java
     2010-01-04 10:46:45 UTC (rev 5451)
@@ -6,6 +6,7 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.util.logging.Logger;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -29,7 +30,10 @@
 import org.xml.sax.SAXException;
 
 public class XMLUtil {
-       
+
+       private final static Logger logger = Logger.getAnonymousLogger();
+
+       @SuppressWarnings("deprecation")
        public static String readFile(String fname) throws Exception {
                java.io.File file = new File(fname);
                String ret = "";
@@ -94,7 +98,7 @@
                        throws Exception {
                try {
                        if (document == null) {
-                               System.out.println("WA -- Cann't write XML to 
file - Null doc");
+                               logger.warning("WA -- Cann't write XML to 
file - Null doc");
                                return;
                        }
                        // Prepare the DOM document for writing
@@ -113,9 +117,9 @@
                        // Write to a file
                        xformer.transform(source, result);
                } catch (TransformerConfigurationException e) {
-                       
System.out.println("TransformerConfigurationException: " + e);
+                       logger.warning("TransformerConfigurationException: " 
+ e);
                } catch (TransformerException e) {
-                       System.out.println("TransformerException: " + e);
+                       logger.warning("TransformerException: " + e);
                }
        }
 

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/styles/default.css
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/styles/default.css  
      2010-01-04 09:17:38 UTC (rev 5450)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/styles/default.css  
      2010-01-04 10:46:45 UTC (rev 5451)
@@ -1,787 +1,114 @@
-
-
-a img{
-    border: none;
+a img {
+       border: none;
 }
+
 /* Wizard CSS */
 .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;
-    padding: 7px;
-    background: #ffffff;
+       display: block;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
+       color: #468C46;
+       margin: 0% 1% 0 1%;
+       border-bottom: 1px dotted #468C46;
+       padding: 7px;
+       background: #ffffff;
 }
 
 .greenasterisk {
-    font-size: 130%;
-    color: #468C46;
+       font-size: 130%;
+       color: #468C46;
 }
 
 .properties {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 13px;
-    padding: 10px;
-    margin: 0% 1% 0 1%;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
+       padding: 10px;
+       margin: 0% 1% 0 1%;
 }
 
+.properties em {
+       display: block;
+       color: red;
+       font-size: 95%;
+}
+
 .properties p {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 13px;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
 }
 
 .properties table {
-    border-bottom: 1px dotted #468C46;
-    margin-bottom: 20px;
+       border-bottom: 1px dotted #468C46;
+       margin-bottom: 20px;
 }
 
-.inner_properties {
-       padding:0px;
-       margin:0px;
-}
-.inner_properties table{
-       border: none;
-       margin:0px;
-       padding:0px;
-}
-
 .properties td {
-    padding: 15px;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 13px;
+       padding: 15px;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
 }
 
-.properties em {
-    display: block;
-    color: red;
-    font-size: 95%;
+.inner_properties {
+       padding: 0px;
+       margin: 0px;
 }
 
-.info_wizard {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 13px;
-    color: #468C46;
+.inner_properties table {
+       border: none;
+       margin: 0px;
+       padding: 0px;
 }
 
-.info_wizard p {
-}
-/* General Purpose CSS*/
-.welcometextlavender {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 13px;
-    font-weight: bold;
-    color: #4169E1;
-    border-bottom-width: 1px;
-    border-bottom-style: dotted;
-    border-bottom-color: #4169E1;
-    clip: rect( auto, auto, auto, auto );
-    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: 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: 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 {
-    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% 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;
-    padding: 5px;
-}
-/*eXist Admin CSS*/
-.content {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 13px;
-    margin: 2% 0% 0 0%;
-    background: #ffffff;
-}
-
-.content ul {
-    margin-top: 5px;
-    display: block;
-    list-style: none outside;
-    padding: 5px;
-}
-
-.content li {
-    margin: 0 0 0 0;
-    padding: 0px;
-    display: block;
-    float: left;
-    position: relative;
-    top: -1.32em;
-}
-
-.manage_exist {
-    background: #ffffff;
-    margin: 0% 0% 0% 0%;
-    padding: 0px;
-}
-
-.showResource {
-    float: none;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 13px;
-    text-indent: 0%;
-    margin-top: 5px;
-    margin-left: 0.3%;
-    padding: 0px;
-    text-align: inherit;
-}
-
-.showResource table {
-    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;
-}
-
-.showResource td {
-    padding: 10px;
-}
-
-.showResource p {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 13px;
-    border: none;
-    padding: 5px;
-    margin: 0% 0% 0% 0%;
-}
-
-.exist_welcome_text {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 13px;
-    font-weight: bold;
-    padding: 5px;
-    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: 0%;
-}
-
 .input {
-    padding: 1em;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 13px;
+       padding: 1em;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
 }
 
 .input_style {
-    border-color: #468C46;
-    border-style: solid;
-    border-width: 1px;
+       border-color: #468C46;
+       border-style: solid;
+       border-width: 1px;
 }
 
-.login_table {
-    background-color: #E6E6FA;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 13px;
-}
-
-.login_table td {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 13px;
-}
-
-.logout {
-    margin-top: 10px;
-    margin-left: 48%;
-}
-
-.logout a {
-    padding: 5px;
-    text-decoration: none;
-    color: green;
-    background: transparent url(graphics/logout_button.gif) no-repeat center 
top;
-    width: 64px;
-    height: 28px;
-    display: block;
-}
-
-.logout a:hover {
-    background: transparent url(graphics/logout_button.gif) no-repeat center 
top;
-    color: #049;
-}
-
-.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 {
-    padding: 7px 80px 7px 80px;
-    width: 210px;
-    height: 28px;
-    text-decoration: none;
-    background: transparent url(graphics/manage_collections_on_tab.gif) 
no-repeat center top;
-}
-
-
-.collections_option_off a {
-    padding: 7px 80px 7px 80px;
-    width: 210px;
-    height: 28px;
-    text-decoration: none;
-    background: transparent url(graphics/manage_collections_off_tab.gif) 
no-repeat center top;
-}
-
-
-.users_option_off a{
-    padding: 7px 65px 7px 65px;
-    width: 210px;
-    height: 28px;
-    text-decoration: none;
-    background: transparent url(graphics/manage_users_off_tab.gif) no-repeat 
center top;
-}
-
-.users_option_on a {
-    padding: 7px 65px 7px 65px;
-    width: 210px;
-    height: 28px;
-    text-decoration: none;
-    background: transparent url(graphics/manage_users_on_tab.gif) no-repeat 
center top;
-}
-
-
-.login_button {
-    width: 54px;
-    height: 28px;
-    margin: 0;
-    padding: 0;
-    border: 0px;
-    font-family: Helvetica, Calibri, Arial, sans-serif;
-    font-size: 90%;
-    font-weight: bold;
-    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;
-}
-
-.edit_button_res {
-    display: block;
-    margin-top: 5px;
-    margin-left: 0px;
-    width: 120px;
-    height: 28px;
-    float: left;
-    outline: none;
-    border: none;
-    text-align: center;
-    font-family: Helvetica, Calibri, Arial, sans-serif;
-    font-size: 90%;
-    font-weight: bold;
-    text-decoration: none;
-    background: url(graphics/button_1_large.gif) no-repeat center;
-    cursor: pointer;
-}
-
-.create_button_res {
-    display: block;
-    margin-top: 5px;
-    width: 120px;
-    height: 28px;
-    float: left;
-    border: none;
-    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;
-}
-
-.delete_button_res {
-    display: block;
-    margin-top: 5px;
-    width: 120px;
-    height: 28px;
-    float: none;
-    border: none;
-    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;
-}
-
-.input_Edit_button {
-    width: 54px;
-    height: 28px;
-    margin: 0;
-    border: 0;
-    padding: 0;
-    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;
-}
-
-.input_Create_button {
-    width: 54px;
-    height: 28px;
-    margin: 0;
-    border: 0;
-    padding: 0;
-    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;
-    height: 28px;
-    margin: 0;
-    border: 0;
-    padding: 0;
-    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: 10px;
-    color: #468C46;
-}
-
-.manage {
-    background: #ffffff;
-    margin: 0 0.3% 0 0.3%;
-    padding: 0px;
-}
-
-.manage table {
-    padding: 3px;
-    border-spacing: 1px 0px;
-}
-
-.manage th {
-    padding-top: 8px;
-    padding-bottom: 8px;
-    padding-left: 5px;
-    text-align: left;
-}
-
-.manage td {
-    padding-top: 8px;
-    padding-bottom: 8px;
-    padding-left: 5px;
-}
 /*Properties Buttons CSS*/
 .floatResetButton {
-    position: fixed;
-    width: 64px;
-    height: 28px;
-    margin: 0;
-    padding: 0;
-    border: 0;
-    text-indent: -1000em;
-    cursor: pointer;
-    background: transparent url(graphics/cancel_button.gif) no-repeat center 
top;
-    float: right;
+       position: fixed;
+       width: 64px;
+       height: 28px;
+       margin: 0;
+       padding: 0;
+       border: 0;
+       text-indent: -1000em;
+       cursor: pointer;
+       background: transparent url(graphics/cancel_button.gif) no-repeat 
center
+               top;
+       float: right;
 }
 
 .floatSubmitButton {
-    position: fixed;;
-    width: 53px;
-    height: 28px;
-    margin: 0;
-    border: 0;
-    padding: 0;
-    text-indent: -1000em;
-    cursor: pointer;
-    background: transparent url(graphics/apply_button_2.gif) no-repeat 
center top;
-    float: right;
+       position: fixed;;
+       width: 53px;
+       height: 28px;
+       margin: 0;
+       border: 0;
+       padding: 0;
+       text-indent: -1000em;
+       cursor: pointer;
+       background: transparent url(graphics/apply_button_2.gif) no-repeat
+               center top;
+       float: right;
 }
 
 .submit_button {
-    width: 53px;
-    height: 28px;
-    margin: 0;
-    border: 0;
-    padding: 0;
-    text-indent: -1000em;
-    cursor: pointer;
-    background: transparent url(graphics/apply_button.gif) no-repeat center 
top;
-    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;
-}
-
-#CreateNewFile {
-    margin: 0% 1% 0% 1%;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 13px;
-    float: none;
-}
-
-.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: 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;
-    margin-top: 5px;
-    width: 54px;
-    height: 28px;
-    float: left;
-    border: none;
-    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;
-    margin-top: 5px;
-    width: 120px;
-    height: 28px;
-    float: left;
-    border: none;
-    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%;
-    color: #4169E1;
-    font-family: Helvetica, Calibri, Arial, sans-serif;
-    font-size: 13px;
-}
-
-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;
-    font-size: 13px;
-}
-
-.init_table th {
-    padding: 8px;
-    text-align: left;
-    color: #4169E1;
-    font-family: Helvetica, Calibri, Arial, sans-serif;
-    font-size: 13px;
-}
-
-.test_table {
-    background-color: #99ff99;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 13px;
-}
-
-.test_table td {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 13px;
-}
-
-/* Stitching Servlet*/
-
-#main_iface_panel{
-       margin-top: 2%;
-       margin-left:2%;
-       background-color: #ffffff;
-       font-family: Verdana, Arial, Helvetica, sans-serif;
-       font-size: 13px;
-       height:100%
-       
-}
-#main_iface_panel a{
-       
-}
-
-#main_iface_panel a:visited a:active{
-       
-}
-#iface_panel_body table{
-       
-}
-#iface_panel_body td{
-       vertical-align:top;
-       height:100%;
-       padding:0px;
-}
-#file_management{
-       border: 1px solid blue;
-       padding:10px;
-       font-weight:bold;
-}
-
-#file_management table{
-       width:100%;
-}
-#file_info{
-       background-color:#BBBBE6;
-       padding:0px;
-}
-
-#file_info table{
-       width:100%;
-}
-#file_info th{
-       
-       background-color:#8282C9;
-       color:#000000;
-       padding: 5px;
-       text-align:left;
-}
-#file_info_header{
-       color:white;
-       background-color:#8282C9;
-       font-weight:bold;
-}
-#file_info td{
-       
-       padding: 5px;
-       text-align:left;
-}
-
-#iface_panel_header{
-       
-       font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 13px;
-       padding: 5px;
-       background-color: #E6E6FA;
-       margin:1px;
-       
-}
-#panel_body_sidebar{
-       
-       background-color: #CBCBED;
-}
-#panel_body_sidebar_devices{
-       height:100%;
-       background-color: #CBCBED;
-       float:left;
-       padding: 5px;
-       margin:1px;
-       
-}
-
-#panel_body_sidebar table{
-       width:100%;
-       height:100%;
-}
-#panel_body_sidebar tr{
-       height:100%;
-}
-#panel_body_sidebar td{
-       padding: 8px;
-}
-
-#panel_body_sidebar a a:visited a:link{
-       padding: 0px;
-       margin:0px
-}
-
-#panel_body_ifaces{
-       background-color: #DEDEF9;
-       float:left;
-       padding-left: 10px;
-       padding-right: 10px;
-       padding-bottom:20px;
-       padding-top:8px;
-       margin:0px;
-}
-#host_name{
-       font-size:15px;
-       font-weight:bold;
-}
-
-#ifaces_table{
-       margin-top: 15px;
-       background-color:#ECECFC;
-       width:100%;
-      border-spacing: 1px 0px;
-
-}
-
-#ifaces_table td{
-       padding: 5px;
-       border-top:none;
-}
-
-
-.ifaces_header1{
-       text-align:left;
-       font-weight:bold;
-       background-color:#8282C9;
-}
-.ifaces_header2{
-       background-color:#8282C9;
-       font-weight:bold;
-       text-align:center;
-}
-
-.execute_button_stitching {
-    display: block;
-    margin: 0px;
-    width: 120px;
-    height: 28px;
-    float: left;
-    border: none;
-    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;
-}
-
+       width: 53px;
+       height: 28px;
+       margin: 0;
+       border: 0;
+       padding: 0;
+       text-indent: -1000em;
+       cursor: pointer;
+       background: transparent url(graphics/apply_button.gif) no-repeat 
center
+               top;
+       float: none;
+}
\ No newline at end of file

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/styles/main.css
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/styles/main.css 
  2010-01-04 09:17:38 UTC (rev 5450)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/styles/main.css 
  2010-01-04 10:46:45 UTC (rev 5451)
@@ -1,8 +1,4 @@
 /* standard elements */
-
-
-
-
 * {
        margin: 0;
        padding: 0;
@@ -14,18 +10,17 @@
        border-left-style: none;
 }
 
-
-body{
+body {
        background-color: #C0C0C0;
        width: 95%;
        height: 92%;
        padding-top: 10px;
 }
 
-div.main{
+div.main {
        overflow: auto;
-       width:100%;
-       height: 100%;   
+       width: 100%;
+       height: 100%;
 }
 
 a:link {
@@ -34,18 +29,21 @@
        font-family: Verdana, Arial, Helvetica, sans-serif;
        font-size: 13px;
 }
+
 a:active {
        color: #117721;
        font-family: Verdana, Arial, Helvetica, sans-serif;
        font-size: 13px;
        font-weight: bold;
 }
+
 a:visited {
        color: #468C46;
        cursor: auto;
        font-family: Verdana, Arial, Helvetica, sans-serif;
        font-size: 13px;
 }
+
 a:hover {
        color: #468C46;
        cursor: pointer;
@@ -54,15 +52,16 @@
        font-size: 13px;
 }
 
-.adminPanel{
+.adminPanel {
        width: 94%;
        height: 50%;
-       float:left;
+       float: left;
        margin-left: 3%;
        margin-right: 5%;
-       background-color:       #ffffff;
+       background-color: #ffffff;
        margin-bottom: 2%;
 }
+
 .navtex {
        font-family: Verdana, Arial, Helvetica, sans-serif;
        font-size: 13px;
@@ -82,8 +81,8 @@
        font-style: normal;
        font-weight: bold;
        line-height: normal;
-       
 }
+
 .welcometext {
        font-family: Verdana, Arial, Helvetica, sans-serif;
        font-size: 13px;
@@ -94,10 +93,11 @@
        padding-top: 10px;
        padding-bottom: 8px;
        padding-right: 0px;
-       clip: rect(auto,auto,auto,auto);
+       clip: rect(auto, auto, auto, auto);
        margin-right: 0px;
        margin-left: 2%;
 }
+
 .heading1 {
        font-family: Verdana, Arial, Helvetica, sans-serif;
        font-size: 14px;
@@ -107,30 +107,7 @@
        font-weight: bold;
        margin-left: 2%;
 }
-       
-.bodytext1 {
-       font-family: Verdana, Arial, Helvetica, sans-serif;
-       font-size: 11px;
-       color: #333333;
-       width: 100%;
-       margin-left: 18%;
-       font-weight: normal;
-       line-height: 22px;
-}
 
-.bodytextgreenline {
-       font-family: Verdana, Arial, Helvetica, sans-serif;
-       font-size: 11px;
-       color: #333333;
-       margin-left: 18%;
-       font-weight: normal;
-       line-height: 18px;
-       border-bottom-width: 1px;
-       border-bottom-style: dotted;
-       border-bottom-color: #468C46;
-       padding-bottom: 11pt;
-}      
-       
 .contenttable {
        font-family: Verdana, Arial, Helvetica, sans-serif;
        font-size: 12px;
@@ -140,6 +117,7 @@
        font-weight: bold;
        background-color: #FFFFFF;
 }
+
 .configheadinglavender {
        font-family: Verdana, Arial, Helvetica, sans-serif;
        font-size: 12px;
@@ -157,18 +135,21 @@
        font-family: Verdana, Arial, Helvetica, sans-serif;
        font-size: 13px;
 }
+
 .configheadinglavender a:active {
        color: #117721;
        font-family: Verdana, Arial, Helvetica, sans-serif;
        font-size: 13px;
        font-weight: bold;
 }
+
 .configheadinglavender a:visited {
        color: #8585C1;
        cursor: auto;
        font-family: Verdana, Arial, Helvetica, sans-serif;
        font-size: 13px;
 }
+
 .configheadinglavender a:hover {
        color: #8585C1;
        cursor: pointer;
@@ -177,7 +158,6 @@
        font-size: 13px;
 }
 
-
 .configheading {
        font-family: Verdana, Arial, Helvetica, sans-serif;
        font-size: 12px;
@@ -195,18 +175,21 @@
        font-family: Verdana, Arial, Helvetica, sans-serif;
        font-size: 13px;
 }
+
 .configheading a:active {
        color: #117721;
        font-family: Verdana, Arial, Helvetica, sans-serif;
        font-size: 13px;
        font-weight: bold;
 }
+
 .configheading a:visited {
        color: #27752C;
        cursor: auto;
        font-family: Verdana, Arial, Helvetica, sans-serif;
        font-size: 13px;
 }
+
 .configheading a:hover {
        color: #27752C;
        cursor: pointer;
@@ -215,66 +198,62 @@
        font-size: 13px;
 }
 
-.banner{
+.banner {
        margin: 5px;
        width: 99%;
        height: 94px;
        background-image: url(../graphics/top_slice.gif);
        background-color: #FFFFFF;
        padding: 0px;
-       clip: rect(auto,auto,auto,auto);
-       float:left;
+       clip: rect(auto, auto, auto, auto);
+       float: left;
 }
-#date{
-       padding-top:5px;
-       float:right;
-       text-align:right;
+
+#date {
+       padding-top: 5px;
+       float: right;
+       text-align: right;
        margin-left: 79.5%;
        font-family: Verdana, Arial, Helvetica, sans-serif;
        font-size: 13px;
 }
 
-#serviceName{
-       padding-top:5px;
-       float:right;
-       text-align:right;
+#serviceName {
+       padding-top: 5px;
+       float: right;
+       text-align: right;
        margin-left: 79.5%;
        font-family: Verdana, Arial, Helvetica, sans-serif;
        font-size: 13px;
-       font-weight:bold;
+       font-weight: bold;
 }
 
-.mainWindow{
+.mainWindow {
        border: none;
        padding: 0px;
        width: 100%;
        height: 750px;
        background-color: #ffffff;
 }
-.centerWindow{
+
+.centerWindow {
        background-color: #FFFFFF;
        width: 82%;
-       height:80%;
+       height: 80%;
        margin-right: 5px;
        margin-bottom: 5px;
        margin-left: 0;
        float: left;
 }
-.centerWindow object{
+
+.centerWindow object {
        width: 101%;
        height: 105%;
        background-color: #FFFFFF;
 }
 
-.welcomepage{
-       background-color: #FFFFFF;
-       width: 100%;
-       height: 100%;
-}
-
 /* Sidebar*/
-
-.sidebar{
+.sidebar {
        width: 15%;
        height: 71.1%;
        padding-bottom: 12.1%;
@@ -288,7 +267,8 @@
        margin-bottom: 5px;
        margin-left: 5px;
 }
-.sidebar th{
+
+.sidebar th {
        color: #ffffff;
        text-align: right;
        background-color: #61AF61;
@@ -296,15 +276,15 @@
        font-family: Verdana, Arial, Helvetica, sans-serif;
        font-size: 12px;
        font-weight: normal;
-       text-decoration:none;
+       text-decoration: none;
        background-repeat: no-repeat;
-       
        padding-top: 10px;
        padding-right: 8%;
        padding-bottom: 10px;
        padding-left: 10px;
 }
-.sidebar td{
+
+.sidebar td {
        text-align: right;
        background-color: #ffffff;
        padding: 10px;
@@ -312,23 +292,21 @@
        border-bottom-style: dotted;
        border-bottom-color: #92C992;
 }
+
 .sidebar a.button {
        color: #ffffff;
-       text-align:left;
+       text-align: left;
        background-color: #61AF61;
        font-family: Verdana, Arial, Helvetica, sans-serif;
        font-size: 12px;
        font-weight: normal;
-       text-decoration:none;
+       text-decoration: none;
        background-position: 100% 50%;
        background-image: url(../graphics/admin_home_target.gif);
        background-repeat: no-repeat;
-       
 }
 
-
-
-.sidebar a{
+.sidebar a {
        font-weight: normal;
        padding-top: 0px;
        padding-right: 0px;
@@ -337,7 +315,7 @@
        margin-bottom: 0px;
 }
 
-.sidebar img{
+.sidebar img {
        float: right;
        border: none;
        padding-top: 0px;
@@ -345,8 +323,7 @@
        padding-bottom: 0px;
 }
 
-
-.footer{
+.footer {
        height: 20px;
        text-align: right;
        color: #61AF61;
@@ -362,133 +339,4 @@
        border-right-color: #FFFFFF;
        border-left-color: #FFFFFF;
        float: none;
-}
-.footermain {
-       height: 20px;
-       text-align: right;
-       color: #61AF61;
-       background-color: #ffffff;
-       font-family: Verdana, Arial, Helvetica, sans-serif;
-       font-size: 10px;
-       border-top-width: 1px;
-       border-top-style: dotted;
-       border-top-color: #61AF61;
-       padding-top: 5px;
-       width: 100%;
-       border-right-style: none;
-       border-right-color: #FFFFFF;
-       border-left-color: #FFFFFF;
-       }
-       
-.execute_button_testdepl {
-    display: block;
-    margin-top: 5px;
-    width: 120px;
-    height: 30px;
-    float: right;
-    border: none;
-    font-family: Helvetica, Calibri, Arial, sans-serif;
-    font-size: 60%;
-    font-weight: 400;
-    text-decoration: none;
-    cursor: pointer;
-    background: transparent url(../graphics/button_2_medium.gif) no-repeat 
center;
-}
-
-.testdeplmain {
-       text-align: left;
-       font-family: Verdana, Arial, Helvetica, sans-serif;
-       font-size: 12px;
-/*     font-weight:bold;;*/
-/*     margin-left: -20%;*/
-       margin-left: 2%;
-       border-width: 1px;
-       border-color: #61AF61;
-       padding: 5px;
-       width: 556px;
-       height:108px;
-       background: transparent url(../graphics/testdepl_main.gif) no-repeat 
center;
-}
-
-.testdeplsucc {
-       text-align: left;
-       float: left;
-       /*font-weight:bold;;*/
-    text-decoration: none;
-/*     margin-left: -20%;*/
-       margin-left: 2%;
-       padding: 5px;
-       font-family: Verdana, Arial, Helvetica, sans-serif;
-       font-size: 12px;
-       border:solid;
-       border-width: 1px;
-       border-color: #61AF61;
-       width: 544px;
-       height: 220px;
-    background: transparent url(../graphics/testdepl_succ.gif) no-repeat 
center;
-}
-
-.testdeplfail {
-       text-align: left;
-       float: left;
-/*     font-weight:bold;;*/
-    text-decoration: none;
-       padding: 5px;
-       margin-left: 2%;
-       /*margin-left: -20%;*/
-    height: 105px;
-    width:555px;
-       font-family: Verdana, Arial, Helvetica, sans-serif;
-       font-size: 12px;
-       border:solid;
-       border-width: 1px;
-       border-color: #61AF61;
-       background: transparent url(../graphics/testdepl_fail.gif) no-repeat 
center;
-}
-
-.testdeplstartbn {
-    display: block;
-    margin-top: 5px;
-    width: 120px;
-    height: 30px;
-    float: right;
-    border: none;
-    font-family: Helvetica, Calibri, Arial, sans-serif;
-    font-size: 60%;
-    font-weight: 400;
-    text-decoration: none;
-    cursor: pointer;
-    background: transparent url(../graphics/testdepl_startbn.gif) no-repeat 
center;
-}
-
-.testdeplretbn {
-    display: block;
-    margin-top: 5px;
-    width: 150px;
-    height: 30px;
-    float: none;;
-    border: none;
-    font-family: Helvetica, Calibri, Arial, sans-serif;
-    font-size: 60%;
-    font-weight: 400;
-    text-decoration: none;
-    cursor: pointer;
-    background: transparent url(../graphics/testdepl_return.gif) no-repeat 
center;
-}
-
-.testdeplretbn2 {
-    display: block;
-    margin-top: 5px;
-    width: 150px;
-    height: 30px;
-    float: right;
-    border: none;
-    font-family: Helvetica, Calibri, Arial, sans-serif;
-    font-size: 60%;
-    font-weight: 400;
-    text-decoration: none;
-    cursor: pointer;
-    background: transparent url(../graphics/testdepl_return.gif) no-repeat 
center;
-}
-       
-
+}
\ No newline at end of file

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/welcome.jsp
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/welcome.jsp 
2010-01-04 09:17:38 UTC (rev 5450)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/welcome.jsp 
2010-01-04 10:46:45 UTC (rev 5451)
@@ -1,115 +1,86 @@
-<!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>
+<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>
 
-                                                       <%
-                                                               for(String 
basicLink:mainBasicLinks){
-                                                                       
out.println(basicLink); 
-                                                               }
-                                                       %>
+                       <%
+                               for (String basicLink : mainBasicLinks) {
+                                       out.println(basicLink);
+                               }
+                       %>
 
-                            <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>
-                                       
-                                       <%
-                                               if( mainAdvancedLinks.length 
!= 0 ){
-                                       %>                              
-                    <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>
-                                                       <%
-                                                               for(String 
mainAdvancedLink:mainAdvancedLinks){
-                                                                       
out.println(mainAdvancedLink);  
-                                                               }
-                                                       %>
+                       <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>
 
-                            <tr>
-                                <td>
-                                    <img src="graphics/step_2_bottom.gif" 
width="350" height="18">
-                                </td>
-                            </tr>
-                        </table>
-                    </td>
-                                       <%
-                                               }
-                                       %>
-                </tr>
-                                       <%
-                                               if( map.needSync() )
-                                               {
-                                       %>
-                                       <tr >
-                                               <td align="center" 
colspan="3" rowspan="2"  >
-                                                                             
                  <p>
-                                        &nbsp;
-                                    </p>
-                                    <p>
-                                        &nbsp;
-                                    </p>
-                                                        <p>
-                      <a href="/wa/index.jsp?page=save" target="_self">Save 
Configuration to Disk</a>
-                      </p>
-                                        </td>
-                                  </tr>
-                                       <%
-                                               }
-                                       %>
-                                </table>
-        </div>
-    </body>
-</html>
+               <%
+                       if (mainAdvancedLinks.length != 0) {
+               %>
+               <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>
+                       <%
+                               for (String mainAdvancedLink : 
mainAdvancedLinks) {
+                                               out.println(mainAdvancedLink);
+                                       }
+                       %>
+
+                       <tr>
+                               <td><img src="graphics/step_2_bottom.gif" 
width="350"
+                                       height="18"></td>
+                       </tr>
+               </table>
+               </td>
+               <%
+                       }
+               %>
+       </tr>
+       <%
+               if (map.needSync()) {
+       %>
+       <tr>
+               <td align="center" colspan="3" rowspan="2">
+               <p>&nbsp;</p>
+               <p>&nbsp;</p>
+               <p><a href="/wa/index.jsp?page=save" target="_self">Save
+               Configuration to Disk</a></p>
+               </td>
+       </tr>
+       <%
+               }
+       %>
+</table>
+</div>