Changeset 195

Timestamp:

Feb 20, 2006 11:15:06 AM (18 years ago)

Author:

mmc

Message:

• Fixed the filexfer server to handle session numbers with letters (e.g., 110L, 17D) properly.

• Fixed the upload form to open with a smaller size, and to go away after upload when running on a Safari browser.

Location:

trunk/gui

Files:

• filexfer/upload.html (modified) (2 diffs)
• scripts/filexfer.tcl (modified) (2 diffs)
• scripts/valueresult.tcl (modified) (1 diff)

trunk/gui/filexfer/upload.html

@@ -7 +7 @@
   @STYLESHEET@
   <script language="JavaScript">
+  function setup() {
+    window.resizeTo(750,800);
+    showhide('textcntls','hidden');
+  }
+  window.onload = setup;
+
   function showhide(name,vis) {
     if (document.getElementById) {
@@ -41 +47 @@
         File: <input type="file" name="file">
       </div>
-      <div id="textcntls" style="visibility:hidden; height:0">
+      <div id="textcntls">
         Text: <textarea rows="20" cols="80" name="text"></textarea>
       </div>

trunk/gui/scripts/filexfer.tcl

@@ -518 +518 @@
 </html>
 } $port $user $cookie]
-    } elseif {[regexp {^/?spool\/([0-9]+)/(.+)$} $url match session tail]} {
+    } elseif {[regexp {^/?spool\/([^/]+)/(.+)$} $url match session tail]} {
         #
         # Send back a spooled file...
@@ -707 +707 @@
   <title>Upload Complete</title>
   <script language="JavaScript">
-    setTimeout("window.close()",100);
+    function setup() {
+        setTimeout("window.close()",100);
+    }
+    window.onload = setup;
   </script>
 </head>

trunk/gui/scripts/valueresult.tcl

@@ -163 +163 @@
             set lstr [$itk_component(label) cget -text]
             set vstr [$itk_component(value) cget -text]
-            return [list .txt "$lstr: $vstr"]
+            return [list .txt "$lstr $vstr"]
         }
         default {