Permalink
Browse files

Some cleanup (Achim Hasenmueller).

git-svn-id: http://vboxweb.googlecode.com/svn/trunk@75 729376a8-6c6b-11de-afdd-bb9f892af8c1
  • Loading branch information...
vboxweb
vboxweb committed Aug 25, 2009
1 parent e67200c commit 1f9d8408f02c4ba15feb3aa3ce32b47920a4b15c
Showing with 9 additions and 14 deletions.
  1. +1 −5 VBoxWebSrv.py
  2. +0 −2 modules/vboxRDPWeb.py
  3. +1 −1 www/static/js/vboxDialogs.js
  4. +7 −6 www/templates/dialogs.html
View
@@ -30,7 +30,7 @@
import threading
import urllib
import hashlib
-from threading import Thread
+import time
from genshi.template import TemplateLoader
from genshi.filters import HTMLFormFiller
@@ -526,12 +526,10 @@ def main(argv = sys.argv):
})
# Lookup our external IP
- print "Getting external IP (google.com) ..."
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.connect(("google.com", 80))
serverAdr, serverPort = s.getsockname()[:2]
s.close
- print "External IP is:", serverAdr
# Init config
ctx = {'global':g_virtualBoxManager,
@@ -554,7 +552,6 @@ def main(argv = sys.argv):
cherrypy.engine.subscribe('stop', onShutdown)
# Start the webserver thread
- print "Starting web server thread"
ws = WebServerThread(ctx)
ws.start()
@@ -563,7 +560,6 @@ def main(argv = sys.argv):
try:
# Darwin-specific uglyness
if sys.platform == 'darwin':
- import time
while not g_serverTerminated:
# We have no timed waits on Darwin, and waitForEvents(-1)
# blocks signal delivery for some reasons, thus we cannot send
View
@@ -98,9 +98,7 @@ def checkForUpdate(url = None, dest = None, proxies = None, forceUpdate = False)
raise ValueError("No destination URL given!")
# Get latest version information
- print "Looking up latest version of Sun RDP Web Control (from %s) ..." %(url)
fVersion = getRemoteVersion(url, proxies)
- print "Latest version is: ",fVersion
# @todo Implement check of remotely retrieved fVersion to a local
# version to only get update if required (newer)
@@ -41,7 +41,7 @@ var vboxDialogs = Class.create(
jQuery("#poweroff-dialog").dialog({
bgiframe: true,
resizable: false,
- height:200,
+ height: 200,
modal: true,
autoOpen: false,
overlay: {
View
@@ -52,7 +52,7 @@
</td>
<td valign="top" width="100%">
<form id="newvm-form" method="post" action="#">
- <div class="step" style="height: 220px;">
+ <div class="step">
<table width="100%">
<tr>
<td class="wizardpagetitle">Welcome to the New Virtual Machine Wizard!</td>
@@ -65,7 +65,7 @@
</tr>
</table>
</div>
- <div class="step" style="height: 220px;">
+ <div class="step">
<table width="100%">
<tr>
<td class="wizardpagetitle">VM Name and OS Type</td>
@@ -82,23 +82,24 @@
</tr>
</table>
</div>
- <div id="step3" class="step" style="height: 220px;">
+ <div id="step3" class="step">
<h1>step 3 - submit step</h1>
<input disabled="disabled" type="text" value="" /><br />
<input disabled="disabled" type="text" value="" class="required"/><br />
<input disabled="disabled" type="hidden" class="link" value="submit_step" />
</div>
- <div id="step4" class="step" style="height: 220px;">
+ <div id="step4" class="step">
<h1>step 4</h1>
<input disabled="disabled" type="text" value="" /><br />
<input disabled="disabled" type="text" name="email" class="required email" /><br />
</div>
- <div id="step5" class="step" style="height: 220px;">
+ <div id="step5" class="step">
<h1>step 5 - last step</h1>
<input disabled="disabled" type="text" value="" /><br />
<input disabled="disabled" type="text" value="" /><br />
</div>
- <div>
+ <!-- these become to Back Next buttoms -->
+ <div style="position: absolute; bottom: 30px;">
<input type="reset" value="Reset" />
<input type="submit" value="Submit" />
</div>

0 comments on commit 1f9d840

Please sign in to comment.