]> jspc29.x-matter.uni-frankfurt.de Git - trb3web.git/commitdiff
added internal pages and bookkeeping tables
authorJan Michel <j.michel@gsi.de>
Fri, 19 Dec 2014 16:53:39 +0000 (17:53 +0100)
committerJan Michel <j.michel@gsi.de>
Fri, 19 Dec 2014 16:53:39 +0000 (17:53 +0100)
WebConfig.pm
frame.pm
index.pl
internal/.htaccess [new file with mode: 0644]
internal/.htpasswd [new file with mode: 0644]
internal/bookkeepingpadiwa.htm [new file with mode: 0644]
internal/bookkeepingpadiwaamps.htm [new file with mode: 0644]
internal/bookkeepingtrb3.htm [new file with mode: 0644]
internal/index.pl [new file with mode: 0755]
internal/internal.htm [new file with mode: 0644]
internal/users.htm [new file with mode: 0644]

index 633d3b0e5c52a422a20e653ac98d08114b71c9f1..be0d182a5b358d117cd146e9ec3682a41d552bd2 100644 (file)
@@ -10,7 +10,7 @@
 our @toplink = (["main","Main"],
                 ["designfiles","Designs"],
                 ["schematics","Schematics"],
-               ["publications","Publications"],
+                ["publications","Publications"],
                 ["contact","Contact"]
                );
 
@@ -20,16 +20,19 @@ our @toplink = (["main","Main"],
 #Entries for sidebar menu
 our $menues = {
 
-#    contact  => [["contact", "Contact"],
-#                 ["help", "Help"]             
-#                ],
+    internal  => [["internal/bookkeepingpadiwa", "Bookk.Padiwa"],
+                  ["internal/bookkeepingpadiwaamps","Bookk. Padiwa Amps"],
+                  ["internal/bookkeepingtrb3","Bookk. TRB3"],
+                  ["internal/users", "User list"]             
+                 ],
                  
     withouthelp  => [["main","Main"],
                      ["designfiles","Designs"],
                      ["schematics","Schematics"],
-                    ["publications","Publications"],
+                     ["publications","Publications"],
+                     ["internal/internal","Internal"],
                      ["contact", "Contact"],
-                    ["help", "For Developers"]
+                     ["help", "For Developers"]
                     ],
 };
 
@@ -38,7 +41,11 @@ our $menues = {
 #file name => menue name
 our $menuselect = {
   "default" => "withouthelp",
-#  "contact" => "contact",                  #just to demonstrate it
+  "internal/internal" => "internal",
+  "internal/users"    => "internal",
+  "internal/bookkeepingpadiwa" => "internal",
+  "internal/bookkeepingpadiwaamps" => "internal",
+  "internal/bookkeepingtrb3" => "internal",
   };
            
            
index 49dc00236d5b5ff2aadba06ebdf7433267065a05..8a98bbee426a5c684677af7c291fd2da9e5ea1cb 100755 (executable)
--- a/frame.pm
+++ b/frame.pm
@@ -2,11 +2,7 @@
 \r
 \r
 use WebConfig;\r
-\r
-           \r
-           \r
-           \r
-           \r
+       \r
            \r
 ###################################\r
 ##Functions\r
@@ -14,7 +10,7 @@ use WebConfig;
 \r
 \r
 sub makeframe {\r
-my ($select) = @_;\r
+my ($select,$path) = @_;\r
 my $menu = $menuselect->{"default"};\r
 $menu = $menuselect->{$select} if exists $menuselect->{$select};\r
 \r
@@ -25,7 +21,7 @@ print <<HDOC;
 \r
 <head>\r
  <title>TRB Readout Platform</title>\r
- <link rel="stylesheet" type="text/css" href="styleold.css">\r
+ <link rel="stylesheet" type="text/css" href="$path/styleold.css">\r
  <meta  charset="UTF-8"/>\r
 </head>\r
 \r
@@ -38,14 +34,14 @@ print <<HDOC;
 HDOC\r
 \r
 while (my ($k) = each @toplink) {\r
-  print "<li><a href=\"index.pl?$toplink[$k]->[0]\">$toplink[$k]->[1]</a>\n";\r
+  print "<li><a href=\"$path/index.pl?$toplink[$k]->[0]\">$toplink[$k]->[1]</a>\n";\r
   }\r
 \r
 \r
 print <<HDOC;\r
 </ul>\r
 \r
-<div id="logo"><a href="/trb"><img src="logo.png" alt="Logo"></a></div>\r
+<div id="logo"><a href="/trb"><img src="$path/logo.png" alt="Logo"></a></div>\r
 \r
 <h2 class="header">a DAQ and TDC (in FPGA) platform</h2>\r
 <h3 class="header"><font size="4"><i>Fascinating!</i></font><font size="2"><b> - Spock,</b> Science Officer, Starfleet</font></h3>\r
@@ -56,14 +52,17 @@ HDOC
 print "<dl id=\"navigation\"><dt>\n";\r
 print "\n<dd><ul>\n";\r
 while (my ($k) = each $menues->{$menu})  {\r
-  print "<li><a href=\"index.pl?$menues->{$menu}->[$k]->[0]\">$menues->{$menu}->[$k]->[1]</a>\n";\r
+  if($menues->{$menu}->[$k]->[0] =~ /internal/ && !($path =~ /internal/)) {\r
+    $path.="/internal";\r
+    }\r
+  print "<li><a href=\"$path/index.pl?$menues->{$menu}->[$k]->[0]\">$menues->{$menu}->[$k]->[1]</a>\n";\r
   }\r
 print "</ul></dl>\r\n";\r
 }\r
 \r
 \r
 \r
-sub makefoot() {\r
+sub makefoot {\r
 print <<HDOC;\r
 </div>\r
 <!--<div id="footer"></div>-->\r
index 41d0b1504fcb2ef6b580ce32fa47c16db0869e28..488d6106d258470c6c619e80fc641c04e2e3f43f 100755 (executable)
--- a/index.pl
+++ b/index.pl
@@ -6,17 +6,19 @@ use warnings;
 use CGI::Carp qw(fatalsToBrowser);
 use frame;
 
+my $path = ".";
+
 
 my $file = $ENV{'QUERY_STRING'};
-$file = "main" unless (defined $file && $file =~ /^\w+$/ && -e "$file.htm");
+$file = "main" unless (defined $file && $file =~ /^\w+$/ && -e "$path/$file.htm" && !($file =~ /\./));
 
 
 
-makeframe($file);
+makeframe($file,$path);
 print "<div id=\"content\">\n\n";
 
 my $MYF;
-open ($MYF, "<$file.htm") or return "";
+open ($MYF, "<$path/$file.htm") or return "";
 while (<$MYF>){
   print $_;
   }
@@ -24,4 +26,4 @@ while (<$MYF>){
 print "\n\n</div>";
 
 
-makefoot();
\ No newline at end of file
+makefoot($path);
\ No newline at end of file
diff --git a/internal/.htaccess b/internal/.htaccess
new file mode 100644 (file)
index 0000000..6a36c01
--- /dev/null
@@ -0,0 +1,4 @@
+ AuthType Basic
+ AuthName "TRB internal"
+ AuthUserFile /srv/www/htdocs/trb/internal/.htpasswd
+ Require valid-user
\ No newline at end of file
diff --git a/internal/.htpasswd b/internal/.htpasswd
new file mode 100644 (file)
index 0000000..dd889ff
--- /dev/null
@@ -0,0 +1 @@
+trb:$apr1$gyATK0hv$I4lQqdAWQNOdmzIagiA6X1
diff --git a/internal/bookkeepingpadiwa.htm b/internal/bookkeepingpadiwa.htm
new file mode 100644 (file)
index 0000000..f9616bf
--- /dev/null
@@ -0,0 +1,5 @@
+<h3>Padiwa Boards</h3>
+
+<table>
+<tr><th>Serial<th>Version<th>Owner<th>Location<th>Modification<th>Notes
+<tr><td>999<td>4<td>Santa Claus<td>Cloud No. 9<td>flapping wings<td>awesome
\ No newline at end of file
diff --git a/internal/bookkeepingpadiwaamps.htm b/internal/bookkeepingpadiwaamps.htm
new file mode 100644 (file)
index 0000000..da70578
--- /dev/null
@@ -0,0 +1,5 @@
+<h3>PadiwaAmps Boards</h3>
+
+<table>
+<tr><th>Serial<th>Owner<th>Location<th>Modification<th>Notes
+<tr><td>999<td>Santa Claus<td>Cloud No. 9<td>flapping wings<td>awesome
\ No newline at end of file
diff --git a/internal/bookkeepingtrb3.htm b/internal/bookkeepingtrb3.htm
new file mode 100644 (file)
index 0000000..271d954
--- /dev/null
@@ -0,0 +1,135 @@
+<h3>Padiwa Boards</h3>
+
+<table>
+<tr><th>Serial<th>Owner<th>Location<th>Modification<th>Notes
+<tr><td>1<td>Frankfurt<td>Frankfurt<td><td>
+<tr><td>2<td>Frankfurt<td>Frankfurt<td><td>
+<tr><td>3<td><td><td><td>
+<tr><td>4<td><td><td><td>
+<tr><td>5<td><td><td><td>
+<tr><td>6<td><td><td><td>
+<tr><td>7<td><td><td><td>
+<tr><td>8<td><td><td><td>
+<tr><td>9<td><td><td><td>
+<tr><td>10<td><td><td><td>
+<tr><td>11<td><td><td><td>
+<tr><td>12<td><td><td><td>
+<tr><td>13<td><td><td><td>
+<tr><td>14<td><td><td><td>
+<tr><td>15<td><td><td><td>
+<tr><td>16<td><td><td><td>
+<tr><td>17<td><td><td><td>
+<tr><td>18<td><td><td><td>
+<tr><td>19<td><td><td><td>
+<tr><td>20<td><td><td><td>
+<tr><td>21<td><td><td><td>
+<tr><td>22<td><td><td><td>
+<tr><td>23<td><td><td><td>
+<tr><td>24<td><td><td><td>
+<tr><td>25<td><td><td><td>
+<tr><td>26<td><td><td><td>
+<tr><td>27<td><td><td><td>
+<tr><td>28<td><td><td><td>
+<tr><td>29<td><td><td><td>
+<tr><td>30<td><td><td><td>
+<tr><td>31<td><td><td><td>
+<tr><td>32<td><td><td><td>
+<tr><td>33<td><td><td><td>
+<tr><td>34<td><td><td><td>
+<tr><td>35<td><td><td><td>
+<tr><td>36<td><td><td><td>
+<tr><td>37<td><td><td><td>
+<tr><td>38<td><td><td><td>
+<tr><td>39<td><td><td><td>
+<tr><td>40<td><td><td><td>
+<tr><td>41<td><td><td><td>
+<tr><td>42<td><td><td><td>
+<tr><td>43<td><td><td><td>
+<tr><td>44<td><td><td><td>
+<tr><td>45<td><td><td><td>
+<tr><td>46<td><td><td><td>
+<tr><td>47<td><td><td><td>
+<tr><td>48<td><td><td><td>
+<tr><td>49<td><td><td><td>
+<tr><td>50<td><td><td><td>
+<tr><td>51<td><td><td><td>
+<tr><td>52<td><td><td><td>
+<tr><td>53<td><td><td><td>
+<tr><td>54<td><td><td><td>
+<tr><td>55<td><td><td><td>
+<tr><td>56<td><td><td><td>
+<tr><td>57<td><td><td><td>
+<tr><td>58<td><td><td><td>
+<tr><td>59<td><td><td><td>
+<tr><td>60<td><td><td><td>
+<tr><td>61<td><td><td><td>
+<tr><td>62<td><td><td><td>
+<tr><td>63<td><td><td><td>
+<tr><td>64<td><td><td><td>
+<tr><td>65<td><td><td><td>
+<tr><td>66<td><td><td><td>
+<tr><td>67<td><td><td><td>
+<tr><td>68<td><td><td><td>
+<tr><td>69<td><td><td><td>
+<tr><td>70<td><td><td><td>
+<tr><td>71<td><td><td><td>
+<tr><td>72<td><td><td><td>
+<tr><td>73<td><td><td><td>
+<tr><td>74<td><td><td><td>
+<tr><td>75<td><td><td><td>
+<tr><td>76<td><td><td><td>
+<tr><td>77<td><td><td><td>
+<tr><td>78<td><td><td><td>
+<tr><td>79<td><td><td><td>
+<tr><td>80<td><td><td><td>
+<tr><td>81<td><td><td><td>
+<tr><td>82<td><td><td><td>
+<tr><td>83<td><td><td><td>
+<tr><td>84<td><td><td><td>
+<tr><td>85<td><td><td><td>
+<tr><td>86<td><td><td><td>
+<tr><td>87<td><td><td><td>
+<tr><td>88<td><td><td><td>
+<tr><td>89<td><td><td><td>
+<tr><td>90<td><td><td><td>
+<tr><td>91<td><td><td><td>
+<tr><td>92<td><td><td><td>
+<tr><td>93<td><td><td><td>
+<tr><td>94<td><td><td><td>
+<tr><td>95<td><td><td><td>
+<tr><td>96<td><td><td><td>
+<tr><td>97<td><td><td><td>
+<tr><td>98<td><td><td><td>
+<tr><td>99<td><td><td><td>
+<tr><td>100<td><td><td><td>
+<tr><td>101<td><td><td><td>
+<tr><td>102<td><td><td><td>
+<tr><td>103<td><td><td><td>
+<tr><td>104<td><td><td><td>
+<tr><td>105<td><td><td><td>
+<tr><td>106<td><td><td><td>
+<tr><td>107<td><td><td><td>
+<tr><td>108<td><td><td><td>
+<tr><td>109<td><td><td><td>
+<tr><td>110<td><td><td><td>
+<tr><td>111<td><td><td><td>
+<tr><td>112<td><td><td><td>
+<tr><td>113<td><td><td><td>
+<tr><td>114<td><td><td><td>
+<tr><td>115<td><td><td><td>
+<tr><td>116<td><td><td><td>
+<tr><td>117<td><td><td><td>
+<tr><td>118<td><td><td><td>
+<tr><td>119<td><td><td><td>
+<tr><td>120<td><td><td><td>
+<tr><td>121<td><td><td><td>
+<tr><td>122<td><td><td><td>
+<tr><td>123<td><td><td><td>
+<tr><td>124<td><td><td><td>
+<tr><td>125<td><td><td><td>
+<tr><td>126<td><td><td><td>
+<tr><td>127<td><td><td><td>
+<tr><td>128<td><td><td><td>
+<tr><td>129<td><td><td><td>
+<tr><td>130<td><td><td><td>
\ No newline at end of file
diff --git a/internal/index.pl b/internal/index.pl
new file mode 100755 (executable)
index 0000000..e0fe6bd
--- /dev/null
@@ -0,0 +1,30 @@
+#!/usr/bin/perl -w
+print "Content-type: text/html\n\n";
+
+use strict;
+use warnings;
+use CGI::Carp qw(fatalsToBrowser);
+use lib "../";
+use frame;
+
+my $path = "..";
+
+
+my $file = $ENV{'QUERY_STRING'};
+$file = "main" unless (defined $file && $file =~ /^[\w\/]+$/ && -e "$path/$file.htm" && !($file =~ /\./));
+
+
+
+makeframe($file,$path);
+print "<div id=\"content\">\n\n";
+
+my $MYF;
+open ($MYF, "<$path/$file.htm") or return "";
+while (<$MYF>){
+  print $_;
+  }
+
+print "\n\n</div>";
+
+
+makefoot($path);
\ No newline at end of file
diff --git a/internal/internal.htm b/internal/internal.htm
new file mode 100644 (file)
index 0000000..d8540cc
--- /dev/null
@@ -0,0 +1,2 @@
+<h3>Internal Information</h3>
+<p>Bookkeeping of Boards, Users list etc.
\ No newline at end of file
diff --git a/internal/users.htm b/internal/users.htm
new file mode 100644 (file)
index 0000000..dd1dbe5
--- /dev/null
@@ -0,0 +1,36 @@
+<h3>TRB3 User Groups</h3>
+<table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
+<caption></caption>
+<colgroup><col align="left" /><col align="left" /><col align="left" /><col align="left" /><col align="left" /><col align="left" /><col align="left" /><col align="left" />
+</colgroup>
+<thead>
+<tr><th scope="col">Experiment<th scope="col">Nation<th scope="col">Location<th scope="col">User<th scope="col">Project<th scope="col">Configuration<th><th>
+</thead>
+<tbody>
+<tr><td>CBM MVD<td>D<td>Frankfurt<td>Manuel Penschuck<td>CBMnet implementation<td>single TRB<td>11/13: in progress<td>
+<tr><td>CBM MVD<td>D<td>Frankfurt<td>Jan Michel<td>MVD read-out<td>single TRB<td>11/13: in progress<td>
+<tr><td>CBM RICH<td>D<td>Gießen<td>Christian Pauly<td><td>CbmRich board<td><td>
+<tr><td>CBM TOF<td>D<td>GSI<td>Jochen Frühauf<td>comparison of TRB vs. GET4<td>CBMTof board + 2 TRB<td>setup phase<td>
+<tr><td>CBM PSD<td>Russia<td>Dubna<td>Fedor Guber<td>CBM<td>only the decision to take TRB<td><td>
+<tr><td>A2 Crystal Ball<td>D<td>Mainz / MAMI<td>Andreas Neiser<td><td><td>Padiwa-AMPS<td>Debian linux
+<tr><td>A1 Neutron Detektor<td>D<td>Mainz / MAMI<td>Michaela Thiel<td>Neutron Detektor / PMTs<td>13 TRB<td>bought and delivered<td>
+<tr><td>Panda Barrel Dirc<td>D<td>Mainz<td><td><td>6 TRB &amp; 100 Padiwa<td>in setup/ beamtime parallel to HADES<td>
+<tr><td>Panda Disc Dirc<td>D<td>Gießen<td>Benno Kroek<td><td>4 TRB &amp; 30 Padiwa<td><td>Scientific Linux
+<tr><td>Panda/WASA<td>D<td>Erlangen<td>Adrian Zink(Schmidt)<td><td>12 TRB &amp; Padiwa<td><td>
+<tr><td>Panda Luminosity<td>D<td>Mainz<td>Tobias Weber<td>Luminosity Monitor<td>1 TRB<td><td>
+<tr><td>Panda Straws<td>PL<td>Cracow<td>Piotr Salabura<td><td>2 TRB<td><td>
+<tr><td>Panda DAQ + SODA<td>NL<td>KVI<td>Myroslav Kavatsyuk<td><td>2 TRB<td>working<td>
+<tr><td>HADES Ecal<td>D<td>GSI<td><td><td>TRB &amp; Padiwa<sub>Amps</sub><td><td>
+<tr><td>HADES Pion Tracker<td>D<td>München<td>Ludwig Maier<td><td>TRB &amp; nxyter-AddOn<td><td>
+<tr><td>HADES Diamond<td>D<td>GSI<td><td><td><td><td>
+<tr><td>Human/Animal PET<td>Portugal<td>Coimbra<td>Paulo Fonte<td><td>TRB3 &amp; ADC-AddOn<td>11/13:AddOn development started<td>
+<tr><td>New PET<td>P<td>Cracow<td>Pawel Moskal<td>innovative PET approach<td><td><td>
+<tr><td>PET<td>CH<td>Zürich/CERN<td>Werner Lustermann<td>ETH-Zürich PET<td>1 TRB &amp; Padiwa<td>working system<td>
+<tr><td>MUSE@PSI<td>Israel<td>Jerusalem<td>Guy Ron<td>MUSE<td>1 TRB &amp; Padiwa<td><td>
+<tr><td>MUSE@PSI<td>USA<td>Washington/Rutgers<td>Ron Gilman<td>MUSE<td>1 TRB &amp; Padiwa<td><td>
+<tr><td>BM@N, JINR<td>Russia<td>Dubna<td>Vladimir Ladygin<td>Scifi-hodoscope<td>3 TRB &amp; Padiwa2<td>setup phase<td>
+<tr><td>HZB<td>D<td>Berlin<td>Thomas Kleisch<td>Neutronendetektor<td>1 TRB &amp; GP-AddOn1<td>working system<td>
+<tr><td>NA61<td>CH<td>CERN<td>Jovan Puzovic<td>NA61 TOF<td>1 TRB &amp; Padiwa<td>running system, performance was bad<td>
+<tr><td>CB-ELSA/TAPS<td>D<td>Bonn<td>Peter Klassen<td>Crystal Barrel<td>1 TRB &amp; GPIN<td><td>
+</tbody>
+</table>