From 1d432dd802ffdf4fd7960bf105e8e06251f402c5 Mon Sep 17 00:00:00 2001
From: Andy Bavier <acb@cs.princeton.edu>
Date: Wed, 23 Jun 2010 18:00:00 -0400
Subject: [PATCH] Tweaks
---
Configure.py | 3 ++-
SfaData.py | 6 +++--
Welcome.py | 8 +++---
public/SfaGUI.css | 62 +++++++++++++++++++++++------------------------
4 files changed, 41 insertions(+), 38 deletions(-)
diff --git a/Configure.py b/Configure.py
index 2d5db33..c863135 100644
--- a/Configure.py
+++ b/Configure.py
@@ -75,6 +75,7 @@ class Configure(Sink):
applyButton = Button("Apply", self.apply)
hp.add(applyButton)
panel.add(hp)
+ panel.setStyleName("infoProse")
self.initWidget(panel)
@@ -87,4 +88,4 @@ class Configure(Sink):
pass
def init():
- return SinkInfo("Configure", "Configure SFA Federation GUI", Configure)
+ return SinkInfo("Configure", "Configure the PlanetLab Federation GUI", Configure)
diff --git a/SfaData.py b/SfaData.py
index 117c06d..953179c 100644
--- a/SfaData.py
+++ b/SfaData.py
@@ -60,7 +60,10 @@ class SfaData:
slice = self.getSlice()
# Write RSpec to file for testing.
filename = os.path.expanduser("~/.sfi/" + slice + ".rspec")
- os.remove(filename)
+ try:
+ os.remove(filename)
+ except:
+ pass
call(["sfi.py", "-u", self.getUser(), "-a", self.getAuthority(),
"-r", self.registry, "-s", self.slicemgr, "resources",
"-o", slice, slice])
@@ -72,7 +75,6 @@ class SfaData:
def applyRSpec(self, xml):
slice = self.getSlice()
filename = os.path.expanduser("~/.sfi/" + slice + ".rspec")
- os.remove(filename)
f = open(filename, "w")
f.write(xml)
f.close()
diff --git a/Welcome.py b/Welcome.py
index 3c7d664..c56d25e 100644
--- a/Welcome.py
+++ b/Welcome.py
@@ -6,9 +6,9 @@ class Welcome(Sink):
Sink.__init__(self)
- text="<div class='infoProse'>This is the SFA Federation GUI. "
- text+="It allows users to manage their SFA identities and slices, "
- text+="add resources from various testbeds to their slices, "
+ text="<div class='infoProse'>This is the PlanetLab Federation GUI. "
+ text+="It allows users to "
+ text+="add resources from various testbeds to their slices "
text+="and browse the SFA Registry.</p></div>"
self.initWidget(HTML(text, True))
@@ -17,4 +17,4 @@ class Welcome(Sink):
def init():
- return SinkInfo("Welcome", "Welcome to the SFA Federation GUI", Welcome)
+ return SinkInfo("Welcome", "Welcome to the PlanetLab Federation GUI", Welcome)
diff --git a/public/SfaGUI.css b/public/SfaGUI.css
index 32ad2a2..9994267 100644
--- a/public/SfaGUI.css
+++ b/public/SfaGUI.css
@@ -32,13 +32,13 @@ a:visited {
}
.gwt-DialogBox {
- sborder: 8px solid #C3D9FF;
+ sborder: 8px solid darkgray;
border: 2px outset;
background-color: white;
}
.gwt-DialogBox .Caption {
- background-color: #C3D9FF;
+ background-color: darkgray;
padding: 3px;
margin: 2px;
font-weight: bold;
@@ -53,12 +53,12 @@ a:visited {
.gwt-HorizontalSplitter .Bar {
width: 8px;
- background-color: #C3D9FF;
+ background-color: darkgray;
}
.gwt-VerticalSplitter .Bar {
height: 8px;
- background-color: #C3D9FF;
+ background-color: darkgray;
}
.gwt-HTML {
@@ -79,8 +79,8 @@ a:visited {
}
.gwt-MenuBar {
- background-color: #C3D9FF;
- border: 1px solid #87B3FF;
+ background-color: darkgray;
+ border: 1px solid gray;
cursor: default;
}
@@ -105,31 +105,31 @@ a:visited {
}
.gwt-TabPanelBottom {
- border-left: 1px solid #87B3FF;
+ border-left: 1px solid gray;
}
.gwt-TabBar {
- background-color: #C3D9FF;
+ background-color: darkgray;
/* font-size: smaller; */
}
.gwt-TabBar .gwt-TabBarFirst {
height: 100%;
- border-bottom: 1px solid #87B3FF;
+ border-bottom: 1px solid gray;
padding-left: 3px;
}
.gwt-TabBar .gwt-TabBarRest {
- border-bottom: 1px solid #87B3FF;
+ border-bottom: 1px solid gray;
padding-right: 3px;
}
.gwt-TabBar .gwt-TabBarItem {
- background-color: white;
- border-top: 1px solid #87B3FF;
- border-left: 1px solid #87B3FF;
- border-right: 1px solid #87B3FF;
- border-bottom: 1px solid #87B3FF;
+ background-color: silver;
+ border-top: 1px solid gray;
+ border-left: 1px solid gray;
+ border-right: 1px solid gray;
+ border-bottom: 1px solid gray;
padding: 2px;
padding-left: 8px;
padding-right: 8px;
@@ -142,9 +142,9 @@ a:visited {
.gwt-TabBar .gwt-TabBarItem-selected {
background-color: #E8EEF7;
font-weight: bold;
- border-top: 1px solid #87B3FF;
- border-left: 1px solid #87B3FF;
- border-right: 1px solid #87B3FF;
+ border-top: 1px solid gray;
+ border-left: 1px solid gray;
+ border-right: 1px solid gray;
border-bottom: 1px solid #E8EEF7;
padding: 2px;
padding-left: 8px;
@@ -169,14 +169,14 @@ a:visited {
}
.gwt-Tree .gwt-TreeItem-selected {
- background-color: #C3D9FF;
+ background-color: darkgray;
}
.gwt-StackPanel {
}
.gwt-StackPanel .gwt-StackPanelItem {
- background-color: #C3D9FF;
+ background-color: darkgray;
cursor: pointer;
cursor: hand;
}
@@ -186,14 +186,14 @@ a:visited {
/* -------------------------------------------------------------------------- */
.ks-Sink {
- border: 8px solid #C3D9FF;
+ border: 8px solid darkgray;
background-color: #E8EEF7;
width: 100%;
height: 24em;
-}
+}
.ks-Info {
- background-color: #C3D9FF;
+ background-color: darkgray;
padding: 10px 10px 2px 10px;
font-weight: bold
}
@@ -206,10 +206,10 @@ a:visited {
.ks-List .ks-SinkItem {
background-color: white;
- border-top: 1px solid #C3D9FF;
- border-left: 1px solid #C3D9FF;
- border-right: 1px solid #C3D9FF;
- border-bottom: 1px solid #C3D9FF;
+ border-top: 1px solid darkgray;
+ border-left: 1px solid darkgray;
+ border-right: 1px solid darkgray;
+ border-bottom: 1px solid darkgray;
width: 100%;
padding: 0.3em;
padding-right: 32px;
@@ -218,7 +218,7 @@ a:visited {
}
.ks-List .ks-SinkItem-selected {
- background-color: #C3D9FF;
+ background-color: darkgray;
font-weight: bold;
}
@@ -239,7 +239,7 @@ a:visited {
}
.ks-layouts-Label {
- background-color: #C3D9FF;
+ background-color: darkgray;
font-weight: bold;
margin-top: 1em;
padding: 2px 0px 2px 0px;
@@ -248,14 +248,14 @@ a:visited {
.ks-layouts-Scroller {
height: 128px;
- border: 2px solid #C3D9FF;
+ border: 2px solid darkgray;
padding: 8px;
margin: 8px;
}
.ks-popups-Popup {
background-color: white;
- border: 1px solid #87B3FF;
+ border: 1px solid gray;
padding: 4px;
}
--
2.47.0