From: Jan Michel Date: Fri, 19 Dec 2014 16:53:39 +0000 (+0100) Subject: added internal pages and bookkeeping tables X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=17fbd419169bd48f6d189a6872d891dfd76d775f;p=trb3web.git added internal pages and bookkeeping tables --- diff --git a/WebConfig.pm b/WebConfig.pm index 633d3b0..be0d182 100644 --- a/WebConfig.pm +++ b/WebConfig.pm @@ -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", }; diff --git a/frame.pm b/frame.pm index 49dc002..8a98bbe 100755 --- a/frame.pm +++ b/frame.pm @@ -2,11 +2,7 @@ use WebConfig; - - - - - + ################################### ##Functions @@ -14,7 +10,7 @@ use WebConfig; sub makeframe { -my ($select) = @_; +my ($select,$path) = @_; my $menu = $menuselect->{"default"}; $menu = $menuselect->{$select} if exists $menuselect->{$select}; @@ -25,7 +21,7 @@ print < TRB Readout Platform - + @@ -38,14 +34,14 @@ print <[0]\">$toplink[$k]->[1]\n"; + print "
  • [0]\">$toplink[$k]->[1]\n"; } print < - +

    a DAQ and TDC (in FPGA) platform

    Fascinating! - Spock, Science Officer, Starfleet

    @@ -56,14 +52,17 @@ HDOC print "
    \n"; print "\n
    \r\n"; } -sub makefoot() { +sub makefoot { print < diff --git a/index.pl b/index.pl index 41d0b15..488d610 100755 --- 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 "
    \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
    "; -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 index 0000000..6a36c01 --- /dev/null +++ b/internal/.htaccess @@ -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 index 0000000..dd889ff --- /dev/null +++ b/internal/.htpasswd @@ -0,0 +1 @@ +trb:$apr1$gyATK0hv$I4lQqdAWQNOdmzIagiA6X1 diff --git a/internal/bookkeepingpadiwa.htm b/internal/bookkeepingpadiwa.htm new file mode 100644 index 0000000..f9616bf --- /dev/null +++ b/internal/bookkeepingpadiwa.htm @@ -0,0 +1,5 @@ +

    Padiwa Boards

    + + +
    SerialVersionOwnerLocationModificationNotes +
    9994Santa ClausCloud No. 9flapping wingsawesome \ No newline at end of file diff --git a/internal/bookkeepingpadiwaamps.htm b/internal/bookkeepingpadiwaamps.htm new file mode 100644 index 0000000..da70578 --- /dev/null +++ b/internal/bookkeepingpadiwaamps.htm @@ -0,0 +1,5 @@ +

    PadiwaAmps Boards

    + + +
    SerialOwnerLocationModificationNotes +
    999Santa ClausCloud No. 9flapping wingsawesome \ No newline at end of file diff --git a/internal/bookkeepingtrb3.htm b/internal/bookkeepingtrb3.htm new file mode 100644 index 0000000..271d954 --- /dev/null +++ b/internal/bookkeepingtrb3.htm @@ -0,0 +1,135 @@ +

    Padiwa Boards

    + + +
    SerialOwnerLocationModificationNotes +
    1FrankfurtFrankfurt +
    2FrankfurtFrankfurt +
    3 +
    4 +
    5 +
    6 +
    7 +
    8 +
    9 +
    10 +
    11 +
    12 +
    13 +
    14 +
    15 +
    16 +
    17 +
    18 +
    19 +
    20 +
    21 +
    22 +
    23 +
    24 +
    25 +
    26 +
    27 +
    28 +
    29 +
    30 +
    31 +
    32 +
    33 +
    34 +
    35 +
    36 +
    37 +
    38 +
    39 +
    40 +
    41 +
    42 +
    43 +
    44 +
    45 +
    46 +
    47 +
    48 +
    49 +
    50 +
    51 +
    52 +
    53 +
    54 +
    55 +
    56 +
    57 +
    58 +
    59 +
    60 +
    61 +
    62 +
    63 +
    64 +
    65 +
    66 +
    67 +
    68 +
    69 +
    70 +
    71 +
    72 +
    73 +
    74 +
    75 +
    76 +
    77 +
    78 +
    79 +
    80 +
    81 +
    82 +
    83 +
    84 +
    85 +
    86 +
    87 +
    88 +
    89 +
    90 +
    91 +
    92 +
    93 +
    94 +
    95 +
    96 +
    97 +
    98 +
    99 +
    100 +
    101 +
    102 +
    103 +
    104 +
    105 +
    106 +
    107 +
    108 +
    109 +
    110 +
    111 +
    112 +
    113 +
    114 +
    115 +
    116 +
    117 +
    118 +
    119 +
    120 +
    121 +
    122 +
    123 +
    124 +
    125 +
    126 +
    127 +
    128 +
    129 +
    130 + \ No newline at end of file diff --git a/internal/index.pl b/internal/index.pl new file mode 100755 index 0000000..e0fe6bd --- /dev/null +++ b/internal/index.pl @@ -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 "
    \n\n"; + +my $MYF; +open ($MYF, "<$path/$file.htm") or return ""; +while (<$MYF>){ + print $_; + } + +print "\n\n
    "; + + +makefoot($path); \ No newline at end of file diff --git a/internal/internal.htm b/internal/internal.htm new file mode 100644 index 0000000..d8540cc --- /dev/null +++ b/internal/internal.htm @@ -0,0 +1,2 @@ +

    Internal Information

    +

    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 index 0000000..dd1dbe5 --- /dev/null +++ b/internal/users.htm @@ -0,0 +1,36 @@ +

    TRB3 User Groups

    + + ++ + + + + +
    ExperimentNationLocationUserProjectConfiguration +
    CBM MVDDFrankfurtManuel PenschuckCBMnet implementationsingle TRB11/13: in progress +
    CBM MVDDFrankfurtJan MichelMVD read-outsingle TRB11/13: in progress +
    CBM RICHDGießenChristian PaulyCbmRich board +
    CBM TOFDGSIJochen Frühaufcomparison of TRB vs. GET4CBMTof board + 2 TRBsetup phase +
    CBM PSDRussiaDubnaFedor GuberCBMonly the decision to take TRB +
    A2 Crystal BallDMainz / MAMIAndreas NeiserPadiwa-AMPSDebian linux +
    A1 Neutron DetektorDMainz / MAMIMichaela ThielNeutron Detektor / PMTs13 TRBbought and delivered +
    Panda Barrel DircDMainz6 TRB & 100 Padiwain setup/ beamtime parallel to HADES +
    Panda Disc DircDGießenBenno Kroek4 TRB & 30 PadiwaScientific Linux +
    Panda/WASADErlangenAdrian Zink(Schmidt)12 TRB & Padiwa +
    Panda LuminosityDMainzTobias WeberLuminosity Monitor1 TRB +
    Panda StrawsPLCracowPiotr Salabura2 TRB +
    Panda DAQ + SODANLKVIMyroslav Kavatsyuk2 TRBworking +
    HADES EcalDGSITRB & PadiwaAmps +
    HADES Pion TrackerDMünchenLudwig MaierTRB & nxyter-AddOn +
    HADES DiamondDGSI +
    Human/Animal PETPortugalCoimbraPaulo FonteTRB3 & ADC-AddOn11/13:AddOn development started +
    New PETPCracowPawel Moskalinnovative PET approach +
    PETCHZürich/CERNWerner LustermannETH-Zürich PET1 TRB & Padiwaworking system +
    MUSE@PSIIsraelJerusalemGuy RonMUSE1 TRB & Padiwa +
    MUSE@PSIUSAWashington/RutgersRon GilmanMUSE1 TRB & Padiwa +
    BM@N, JINRRussiaDubnaVladimir LadyginScifi-hodoscope3 TRB & Padiwa2setup phase +
    HZBDBerlinThomas KleischNeutronendetektor1 TRB & GP-AddOn1working system +
    NA61CHCERNJovan PuzovicNA61 TOF1 TRB & Padiwarunning system, performance was bad +
    CB-ELSA/TAPSDBonnPeter KlassenCrystal Barrel1 TRB & GPIN +