diff options
author | Deryck Hodge <deryck@samba.org> | 2005-08-29 22:04:11 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:34:57 -0500 |
commit | 33f4328c69a3a06e859b9180f5f509faec37aeee (patch) | |
tree | cda79cf37af0b8472889d756917be27498f6e41f /swat | |
parent | ec934124db8a5234d8c83799a23c7bdced5dd95a (diff) | |
download | samba-33f4328c69a3a06e859b9180f5f509faec37aeee.tar.gz samba-33f4328c69a3a06e859b9180f5f509faec37aeee.tar.bz2 samba-33f4328c69a3a06e859b9180f5f509faec37aeee.zip |
r9763: Add the start bar as a widget from the
desktop file. This is more portable to IE, though
there are still some IE issues hanging around.
deryck
(This used to be commit a70b52bb04689de90ee5ec59109d669175b91c04)
Diffstat (limited to 'swat')
-rw-r--r-- | swat/desktop/index.esp | 7 | ||||
-rw-r--r-- | swat/scripting/client/desktop.js | 20 |
2 files changed, 20 insertions, 7 deletions
diff --git a/swat/desktop/index.esp b/swat/desktop/index.esp index 21ca766f59..ee4290f234 100644 --- a/swat/desktop/index.esp +++ b/swat/desktop/index.esp @@ -8,6 +8,7 @@ libinclude("base.js"); <script type="text/javascript" src="/scripting/client/js_scripts.js"></script> <script type="text/javascript" src="/scripting/client/desktop.js"></script> <script type="text/javascript" src="/scripting/client/status.js"></script> +<script type="text/javascript" src="/scripting/client/regedit.js"></script> <script type="text/javascript"> @@ -115,7 +116,7 @@ function showReg() regWin.setVisible('true'); } -function startSwat() +function startMenu() { var sMenu = new QxMenu; with(sMenu) { @@ -204,8 +205,4 @@ function startSwat() } </script> -<div id="toolbar"> -<h3><a href="javascript:startSwat()">SWAT (Start)</a></h3> -</div> - <% page_footer(); %> diff --git a/swat/scripting/client/desktop.js b/swat/scripting/client/desktop.js index b1c77dc613..6383e58bda 100644 --- a/swat/scripting/client/desktop.js +++ b/swat/scripting/client/desktop.js @@ -35,9 +35,8 @@ function docX() function docY() { var y; - // Less 25px to not cover the toolbar if (browser != "mshtml") { - y = window.innerHeight - 25; + y = window.innerHeight; } else { y = document.documentElement.clientHeight; } @@ -154,6 +153,23 @@ window.application.main = function() var doc = this.getClientWindow().getClientDocument(); doc.addEventListener("contextmenu", showContextMenu); doc.add(w); + + var bar = new QxMenuBar; + with (bar) { + setBottom(0); + setLeft(0); + setWidth("100%"); + setHeight(25); + setBackgroundColor("ThreeDFace"); + } + + var start = new QxMenuButton("START"); + start.addEventListener("click", function() { + startMenu(); + }); + bar.add(start); + + w.add(bar); } window.onresize = function() |