svn commit: samba r9763 - in branches/SAMBA_4_0/swat: desktop
scripting/client
deryck at samba.org
deryck at samba.org
Mon Aug 29 22:04:11 GMT 2005
Author: deryck
Date: 2005-08-29 22:04:11 +0000 (Mon, 29 Aug 2005)
New Revision: 9763
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9763
Log:
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
Modified:
branches/SAMBA_4_0/swat/desktop/index.esp
branches/SAMBA_4_0/swat/scripting/client/desktop.js
Changeset:
Modified: branches/SAMBA_4_0/swat/desktop/index.esp
===================================================================
--- branches/SAMBA_4_0/swat/desktop/index.esp 2005-08-29 22:01:18 UTC (rev 9762)
+++ branches/SAMBA_4_0/swat/desktop/index.esp 2005-08-29 22:04:11 UTC (rev 9763)
@@ -8,6 +8,7 @@
<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 @@
regWin.setVisible('true');
}
-function startSwat()
+function startMenu()
{
var sMenu = new QxMenu;
with(sMenu) {
@@ -204,8 +205,4 @@
}
</script>
-<div id="toolbar">
-<h3><a href="javascript:startSwat()">SWAT (Start)</a></h3>
-</div>
-
<% page_footer(); %>
Modified: branches/SAMBA_4_0/swat/scripting/client/desktop.js
===================================================================
--- branches/SAMBA_4_0/swat/scripting/client/desktop.js 2005-08-29 22:01:18 UTC (rev 9762)
+++ branches/SAMBA_4_0/swat/scripting/client/desktop.js 2005-08-29 22:04:11 UTC (rev 9763)
@@ -35,9 +35,8 @@
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 @@
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()
More information about the samba-cvs
mailing list