diff --git a/src/www/Bongo.rules b/src/www/Bongo.rules index 37ab14a..56e9962 100644 --- a/src/www/Bongo.rules +++ b/src/www/Bongo.rules @@ -185,6 +185,7 @@ dist_img_DATA := \ src/www/img/bg.png \ src/www/img/Bongo-logo.png \ src/www/img/cbg.png \ + src/www/img/desktop-big.png \ src/www/img/dialog-warning.png \ src/www/img/help-browser.png \ src/www/img/locked.png \ @@ -194,8 +195,7 @@ dist_img_DATA := \ src/www/img/system-installer.png \ src/www/img/system-users.png \ src/www/img/user.png \ - src/www/img/user-desktop.png \ - src/www/img/welcome-box.png + src/www/img/user-desktop.png jsdir = $(htdocsdir)/js diff --git a/src/www/bongo/hawkeye/AgentView.py b/src/www/bongo/hawkeye/AgentView.py index 68ae7dd..c9d5aa1 100644 --- a/src/www/bongo/hawkeye/AgentView.py +++ b/src/www/bongo/hawkeye/AgentView.py @@ -6,4 +6,5 @@ class AgentHandler(HawkeyeHandler): def index_GET(self, req, rp): self.SetVariable("breadcrumb", "Agents") self.SetVariable("agntab", "selecteditem") + self.SetVariable("title", "Agents") return self.SendTemplate(req, rp, "index.tpl") diff --git a/src/www/bongo/hawkeye/BackupView.py b/src/www/bongo/hawkeye/BackupView.py index cb0efa7..0a4dac5 100644 --- a/src/www/bongo/hawkeye/BackupView.py +++ b/src/www/bongo/hawkeye/BackupView.py @@ -13,8 +13,9 @@ class BackupHandler(HawkeyeHandler): def index_GET(self, req, rp): today = datetime.date.today() self.SetVariable("set", today.strftime("%y%m%d")) - self.SetVariable("breadcrumb", "System » Backup and Restore"); - self.SetVariable("systab", "selecteditem"); + self.SetVariable("breadcrumb", "System » Backup and Restore") + self.SetVariable("systab", "selecteditem") + self.SetVariable("title", "Backup and Restore") return self.SendTemplate(req, rp, "index.tpl") def download_GET(self, req, rp): @@ -46,7 +47,7 @@ class BackupHandler(HawkeyeHandler): else: agent["enabled"] = False else: - self.SetVariable("message", "Unable to read config") + self.SetVariable("error", "Unable to read config from store.") self._setManagerFile(req, config) return self.index_GET(req, rp) diff --git a/src/www/bongo/hawkeye/RootView.py b/src/www/bongo/hawkeye/RootView.py index 162cee6..18ca1b3 100644 --- a/src/www/bongo/hawkeye/RootView.py +++ b/src/www/bongo/hawkeye/RootView.py @@ -29,12 +29,14 @@ class RootHandler(HawkeyeHandler): if len(t) == 3: ## and t[0] == VmKey: return float(t[1]) * _scale.get(t[2], 0.0) except: + self.SetVariable("error", "Unable to get memory statistics for your system.") pass return 0.0 def index_GET(self, req, rp): # template ui self.SetVariable("breadcrumb", "Desktop") + self.SetVariable("title", "Welcome!") self.SetVariable("dsktab", "selecteditem") # check ram free cm = self.memory("MemTotal:") diff --git a/src/www/bongo/hawkeye/ServerView.py b/src/www/bongo/hawkeye/ServerView.py index 9bc9b0c..d226284 100644 --- a/src/www/bongo/hawkeye/ServerView.py +++ b/src/www/bongo/hawkeye/ServerView.py @@ -4,13 +4,22 @@ from bongo.store.StoreClient import StoreClient, DocTypes import bongo.external.simplejson as simplejson from HawkeyeHandler import HawkeyeHandler +doneop = 0 + class ServerHandler(HawkeyeHandler): def NeedsAuth(self, rp): return True def index_GET(self, req, rp): + global doneop agentlist = [] config = self._getManagerFile(req) + + if doneop: + self.SetVariable("opsuccess", 1) + doneop = 0 + else: + self.SetVariable("opsuccess", 0) # change things which eval. to False to empty elements if config != None and config.has_key("agents"): @@ -21,13 +30,17 @@ class ServerHandler(HawkeyeHandler): self.SetVariable("success", 1) else: self.SetVariable("success", 0) + self.SetVariable("error", "Unable to read configuration information from the Bongo store. Are you logged in as a user with administrative permissions?") - self.SetVariable("breadcrumb", "Agents » Enable/Disable Agents"); - self.SetVariable("agntab", "selecteditem"); + self.SetVariable("breadcrumb", "Agents » Enable/Disable Agents") + self.SetVariable("title", "Enable/Disable Agents") + self.SetVariable("agntab", "selecteditem") return self.SendTemplate(req, rp, "index.tpl") def index_POST(self, req, rp): + global doneop + if not req.form: return bongo.dragonfly.HTTP_UNAUTHORIZED @@ -42,9 +55,11 @@ class ServerHandler(HawkeyeHandler): else: agent["enabled"] = False else: - self.SetVariable("message", "Unable to read config") + self.SetVariable("error", "Unable to read config") self._setManagerFile(req, config) + # Operation completed OK. + doneop = 1 return self.index_GET(req, rp) def login_POST(self, req, rp): diff --git a/src/www/bongo/hawkeye/SystemView.py b/src/www/bongo/hawkeye/SystemView.py index 2c49472..a36b2a4 100644 --- a/src/www/bongo/hawkeye/SystemView.py +++ b/src/www/bongo/hawkeye/SystemView.py @@ -7,4 +7,5 @@ class SystemHandler(HawkeyeHandler): def index_GET(self, req, rp): self.SetVariable("breadcrumb", "System") self.SetVariable("systab", "selecteditem") + self.SetVariable("title", "System") return self.SendTemplate(req, rp, "index.tpl") diff --git a/src/www/css/hawkeye.css b/src/www/css/hawkeye.css index 209f1da..185d8eb 100644 --- a/src/www/css/hawkeye.css +++ b/src/www/css/hawkeye.css @@ -55,17 +55,27 @@ min-height: 500px; #sidebar { color: #eeeeec; /* Tango WHITE */ -/* background: url('/img/sbg.png'); - background-repeat: repeat-x;*/ + background: url('/img/sbg.png'); + background-repeat: repeat-x; background-color: #2e3436; /* Tango DARK-GREY */ float: left; -height: 500px; +min-height: 500px; width: 175px; text-align: right; margin-right: 0px; padding-right: 0px; --moz-border-radius: 15px; +padding-bottom: 6px; + +-moz-border-radius-bottomleft: 20px; +-khtml-border-radius-bottomleft: 20px; +border-radius-bottomleft: 20px; + +-moz-border-radius-bottomright: 20px; +-khtml-border-radius-bottomright: 20px; +border-radius-bottomright: 20px; + +/*-moz-border-radius: 15px;*/ } .helpitem { /* FIXME! */ @@ -134,18 +144,59 @@ ul.nav{ width: 100%; } .htable { -border: 2px solid #2e3436; -font-size: 110%; +border: 3px solid #729fcf; +/*font-size: 110%;*/ +-moz-border-radius: 10px; } + .hrow { -background-color: #2e3436; -color: #eeeeec; +color: #d3d7cf; + font-weight: bold; padding-left: 4px; } -.drow { -border-bottom: 1px dotted #2e3436; + +.highlight, .highlight0 { +color: #d3d7cf; +background-color: #204a87; } + +.highlight1 { +color: #d3d7cf; +background-color: #3465a4; +} + +.drow { +color: #d3d7cf; +} + +.error, .info { +-moz-border-radius: 5px; + +margin-right: 12px; +min-height:18px; /* Icon size - total padding (top & bottom) */ +padding-top: 8px; +padding-bottom: 8px; + + +padding-left: 36px; +background-repeat: no-repeat; +} + +.error { +background-image: url('/img/dialog-error-32.png'); +background-color: #a40000; +color: #eeeeec; +border: 3px solid #cc0000; +} + +.info { +background-image: url('/img/dialog-information-32.png'); +background-color: #3465a4; +color: #eeeeec; +border: 3px solid #204a85; +} + .tlist { padding-bottom: 3px; padding-top: 3px; diff --git a/src/www/hawkeye/agents/index.tpl b/src/www/hawkeye/agents/index.tpl index df1ed1f..0798778 100644 --- a/src/www/hawkeye/agents/index.tpl +++ b/src/www/hawkeye/agents/index.tpl @@ -1,10 +1,8 @@ %(include|header.tpl)s -

Agents

- %(include|footer.tpl)s diff --git a/src/www/hawkeye/backup/index.tpl b/src/www/hawkeye/backup/index.tpl index a9e1b7d..f83d153 100644 --- a/src/www/hawkeye/backup/index.tpl +++ b/src/www/hawkeye/backup/index.tpl @@ -1,7 +1,5 @@ %(include|header.tpl)s -

Backup and Restore

-

This allows you to save and restore copies of the Bongo server configuration. It does not look at user data such as contacts or e-mail: use the specialist bongo-backup tool to handle those (potentially very large) diff --git a/src/www/hawkeye/footer.tpl b/src/www/hawkeye/footer.tpl index 19d0481..2b68b51 100644 --- a/src/www/hawkeye/footer.tpl +++ b/src/www/hawkeye/footer.tpl @@ -1,3 +1,4 @@ + diff --git a/src/www/hawkeye/header.tpl b/src/www/hawkeye/header.tpl index b635599..416fa8d 100644 --- a/src/www/hawkeye/header.tpl +++ b/src/www/hawkeye/header.tpl @@ -27,3 +27,10 @@

%(breadcrumb)s

+

Untitled page

+ +
Something happened, but I'm not sure.
+
An error occured while processing your request. No more information is available.
+
Operation completed sucessfully.
+ + diff --git a/src/www/hawkeye/root/index.tpl b/src/www/hawkeye/root/index.tpl index 3b85646..fb96339 100644 --- a/src/www/hawkeye/root/index.tpl +++ b/src/www/hawkeye/root/index.tpl @@ -1,38 +1,39 @@ %(include|header.tpl)s -Welcome to Bongo +Welcome to Bongo -

Welcome

Thank you for choosing Bongo as your calendaring and mail solution.

-

This screen enables you to briefly overview your system status, and to access commonly and recently used tasks.

-

Help can be accessed by clicking on the help menu at any time.
To get started, either click on one of the menus to the left, or click on one of the common tasks listed below.

+

This screen enables you to briefly overview your system status, and as a starting point to the different administration tasks available.

+

Help can be accessed by clicking on the help menu at any time.
To get started, click on one of the menu items to your left.

+ +
- + - + - + - - + - + - + diff --git a/src/www/hawkeye/server/index.tpl b/src/www/hawkeye/server/index.tpl index f749990..69554a9 100644 --- a/src/www/hawkeye/server/index.tpl +++ b/src/www/hawkeye/server/index.tpl @@ -1,31 +1,27 @@ %(include|header.tpl)s -

Enable/Disable Agents

+

-

No message.

- -

- Unable to read configuration information from the Bongo store. - Are you logged in as a user with administrative permissions? -

- -
+
-
Agent StatusOperation normal.Operation normal.
Bongo Updates -

Running version: unknown
- Latest available: unknown

-

Upgrade to new version recommended.

+ 		+ Running version: unknown
+ Latest available: unknown +
Upgrade to new version recommended.
 Warning
System Status Current processing load: unknown
Memory Usage RAM
Load Unknown
- - - +
Enabled?Agent Name
+ + + - - +
EnabledAgent Name
+
unknown agent
+
+

+ %(include|footer.tpl)s diff --git a/src/www/hawkeye/system/index.tpl b/src/www/hawkeye/system/index.tpl index ec72a57..e2f9d0a 100644 --- a/src/www/hawkeye/system/index.tpl +++ b/src/www/hawkeye/system/index.tpl @@ -1,7 +1,5 @@ %(include|header.tpl)s -

System

- diff --git a/src/www/img/desktop-big.png b/src/www/img/desktop-big.png new file mode 100644 index 0000000..8dd22b2 Binary files /dev/null and b/src/www/img/desktop-big.png differ diff --git a/src/www/img/dialog-error-32.png b/src/www/img/dialog-error-32.png new file mode 100644 index 0000000..cdd95ba Binary files /dev/null and b/src/www/img/dialog-error-32.png differ diff --git a/src/www/img/dialog-information-32.png b/src/www/img/dialog-information-32.png new file mode 100644 index 0000000..2ac5747 Binary files /dev/null and b/src/www/img/dialog-information-32.png differ diff --git a/src/www/img/welcome-box.png b/src/www/img/welcome-box.png deleted file mode 100644 index 04abdc5..0000000 Binary files a/src/www/img/welcome-box.png and /dev/null differ