From: Jan Michel Date: Tue, 25 Aug 2015 14:51:43 +0000 (+0200) Subject: some updates for presenter X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=09fdd94622bbe7eefece2447326e4aea762ef98a;p=labtools.git some updates for presenter --- diff --git a/presenter/deletePic.pl b/presenter/deletePic.pl new file mode 100755 index 0000000..ed54524 --- /dev/null +++ b/presenter/deletePic.pl @@ -0,0 +1,36 @@ +#!/usr/bin/perl +use CGI::Carp qw(warningsToBrowser fatalsToBrowser); +use CGI; +print "Content-type: text/html\n\n"; + +my $cgi = new CGI(); + + +my $room = $cgi->param("room"); +if (!($room =~ /^[a-zA-Z0-9]+$/) || !(-d "store/$room")) { + print "Invalid room"; + return 1; +} + + +my $t = $cgi->param("img"); +if(($t =~ /[\"\$\(\)\/]/ || !(-e "store/$room/$t")) && ($t =~ /.png$/i || $t =~ /.jpg$/i)) { + print "Invalid selection"; + return 1; +} + +system("rm store/$room/$t store/$room/thumb/$t"); + + +print < + + + + + + + +REDOC + +1; diff --git a/presenter/getfiles.pl b/presenter/getfiles.pl index 5010e7e..c70caff 100755 --- a/presenter/getfiles.pl +++ b/presenter/getfiles.pl @@ -15,11 +15,12 @@ if (!($room =~ /^[a-zA-Z0-9]+$/) || !(-d "store/$room")) { my $cmd = "cd store;cd $room; ls -1 -v"; my @files = qx($cmd); -print "\n"; foreach my $f (@files) { chomp($f); next if $f eq "currentstate"; - print "\n"; } print ""; diff --git a/presenter/scripts.js b/presenter/scripts.js index 42001c3..5b2cafa 100644 --- a/presenter/scripts.js +++ b/presenter/scripts.js @@ -40,6 +40,15 @@ function present(f) { } } +function deletePic(f) { + if(f != "") { + getData("deletePic.pl?img="+f+"&room="+currentRoom); + } + else { + alert("Select a file to show!"); + } + } + function pointer(e) { var t = document.getElementById("screen"); // alert(t.offsetLeft); @@ -66,6 +75,15 @@ function updatepresentation(t) { setTimeout('getData("getPic.pl?old='+t+'&room='+currentRoom+'",null,updatepresentation)',1000); } +function preview(f) { + document.getElementById("preview").innerHTML = '

'; + } + +function previewSelected() { + f = document.getElementById("filelist").value; + document.getElementById("preview").innerHTML = '

'; + } + setTimeout('updatefiles();',500); setTimeout('updatepresentation(" ");',200); diff --git a/presenter/showroom.pl b/presenter/showroom.pl index 738af22..2fc030b 100755 --- a/presenter/showroom.pl +++ b/presenter/showroom.pl @@ -31,15 +31,17 @@ print <Remote Presenter
<-- Click to show or just watch!

Select a file and press upload. -

+ +

HDOC diff --git a/presenter/style.css b/presenter/style.css index 9736239..f498115 100644 --- a/presenter/style.css +++ b/presenter/style.css @@ -38,15 +38,16 @@ h1 { left:-200px; position:absolute; top:0; - border-right:40px solid #000; + border-right:70px solid #000; background:#ccb; - transition:left 0.3s; + transition:left 0.6s 3s ease-out, border 0.6s 3s ease-out; overflow:hidden; } #control:hover { left:0; border:0; + transition:left 0.2s 0s ease-in, border 0.2s 0s ease-in; } #content { @@ -103,3 +104,14 @@ h1 { position:absolute; //animation: pointerani 1s infinite alternate; } + +#preview { + width:205px; + border:1px solid #aaa; + margin:1px; + position:relative; + left:5px; + padding:1px; + text-align:center; + background:white; + } diff --git a/presenter/uploadFiles.pl b/presenter/uploadFiles.pl index 276d4df..487e514 100755 --- a/presenter/uploadFiles.pl +++ b/presenter/uploadFiles.pl @@ -42,7 +42,12 @@ if($basename =~ /\.pdf$/i) { $b =~ s/.pdf//i; system("cd store/$room;../../convert.sh \"$basename\" \"$b\""); system("rm \"store/$room/$basename\""); + system("cd store/$room;mogrify -path thumb -thumbnail 200x200 $b*.png"); } +else { + system("cd store/$room;mogrify -path thumb -thumbnail 200x200 $basename"); + } + sub GetBasename { @@ -60,7 +65,6 @@ sub GetBasename { } - print <