]> jspc29.x-matter.uni-frankfurt.de Git - labtools.git/commitdiff
jspc29 / labtools.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4146a49)
no animation and a proper redirect after upload
authorJan Michel <j.michel@gsi.de>
Fri, 7 Aug 2015 14:14:13 +0000 (16:14 +0200)
committerJan Michel <j.michel@gsi.de>
Fri, 7 Aug 2015 14:14:13 +0000 (16:14 +0200)
presenter/style.css patch | blob | history
presenter/uploadFiles.pl patch | blob | history

diff --git a/presenter/style.css b/presenter/style.css
index 910e2eca19d6ea95f5a639720ee374eed362ab88..9736239576298872de64ee87329b1642a1d76f6d 100644 (file)
--- a/presenter/style.css
+++ b/presenter/style.css
@@ -80,18 +80,26 @@ h1 {
   width:180px;
 }
 
+/*
 @keyframes pointerani {
   0% {width:25px;height:25px;margin:0;}
   100% {width:20px;height:20px;margin:2.5px 0 0 2.5px;}
 }
+*/
+
+@keyframes pointerani {
+  0% {opacity:.2;}
+  100% {opacity:.7;}
+}
+
 
 #pointer {
   width:20px;
   height:20px;
   background:transparent;
-  border:5px solid red;
+  border:7px solid red;
   opacity:0.7;
   border-radius:15px;
   position:absolute;
-  animation: pointerani 1s infinite alternate;
+  //animation: pointerani 1s infinite alternate;
   }
diff --git a/presenter/uploadFiles.pl b/presenter/uploadFiles.pl
index a65737ad8ec89b494987283a30baba65a446f26d..276d4dfc731b5ce9b39e0114b423941be11392eb 100755 (executable)
--- a/presenter/uploadFiles.pl
+++ b/presenter/uploadFiles.pl
@@ -11,7 +11,7 @@ my $upfile = $cgi->param('upfile');
 
 my $room = $cgi->param('room');
 if (!($room =~ /^[a-zA-Z0-9]+$/) || !(-d "store/$room")) {
-  print "Invalid room";
+  print "Invalid room $room";
   return 1;
 }
 
@@ -37,15 +37,14 @@ while ( $nBytes = read($upfile, $buffer, 1024) ) {
 }
 close(OUTFILE);
 
-if($basename =~ /\.pdf$/) {
+if($basename =~ /\.pdf$/i) {
   my $b = $basename;
-  $b =~ s/.pdf//;
+  $b =~ s/.pdf//i;
   system("cd store/$room;../../convert.sh \"$basename\" \"$b\"");
   system("rm \"store/$room/$basename\"");
   }
 
 
-
 sub GetBasename {
   my $fullname = shift;
 
@@ -59,3 +58,16 @@ sub GetBasename {
 
   return(pop(@parts));
 }
+
+
+
+print <<REDOC;
+<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="refresh"   content="0; url=showroom.pl?$room">
+</head>
+<body>
+</body>
+</html>
+REDOC
Tools to control and monitor lab devices