You are viewing a plain text version of this content. The canonical link for it is here.
Posted to embperl-cvs@perl.apache.org by ri...@apache.org on 2002/06/15 01:38:58 UTC

cvs commit: embperl/eg/web/pod/intro index.htm

richter     2002/06/14 16:38:58

  Modified:    eg/web   Tag: Embperl2c config.pl epwebapp.pl header.epl
                        menuleft.epl messages.pl news.epl
               eg/web/pod/doc Tag: Embperl2c index.htm
               eg/web/pod/intro Tag: Embperl2c index.htm
  Added:       eg/web/pod/doc Tag: Embperl2c doc13.htm
  Log:
  website
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.8   +104 -28   embperl/eg/web/Attic/config.pl
  
  Index: config.pl
  ===================================================================
  RCS file: /home/cvs/embperl/eg/web/Attic/config.pl,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- config.pl	1 Jun 2002 23:44:26 -0000	1.1.2.7
  +++ config.pl	14 Jun 2002 23:38:57 -0000	1.1.2.8
  @@ -1,5 +1,5 @@
   
  -
  +use File::Basename ;
   
   sub new
       {
  @@ -15,7 +15,35 @@
   
       $r -> {imageuri}  = '/eg/images/' ;
       $r -> {baseuri}   = '/eg/web/' ;
  -    $r -> {root}      = $ENV{EMBPERL_SRC} ;
  +
  +    $self -> {supported_lamnguages} = ['de', 'en'] ;
  +    
  +    # Embperl 2 source directory
  +    $r -> {root}      = $ENV{EMBPERL_SRC} . '/' ;
  +    
  +    # check if Embperl 1.3 is installed
  +    my $lib_1_3 = dirname ($INC{'Apache.pm'})  ;
  +    if (-e ($lib_1_3 . '/HTML/Embperl.pod'))
  +        {
  +        $self -> {lib_1_3}     = $lib_1_3 ;
  +        }
  +    else
  +        {
  +        $self -> {lib_1_3}     = '' ;
  +        }
  +
  +    # check if DBIx::Recordset is installed
  +    my $lib_dbix = $lib_1_3. '/..'  ;
  +    if (-e ($lib_dbix . '/DBIx/Intrors.pod'))
  +        {
  +        $self -> {lib_dbix}     = $lib_dbix ;
  +        }
  +    else
  +        {
  +        $self -> {lib_dbix}     = '' ;
  +        }
  +
  +
       }
   
   
  @@ -32,6 +60,7 @@
               'Changes'       => '�nderungen',
               'Sites using Embperl' => 'Sites mit Embperl',
               'Add info about Embperl' => 'Hinzuf�gen Infos',
  +            '1.3.4 documentation' => '1.3.4 Dokumentation',
               }
           ) ;
   
  @@ -40,43 +69,90 @@
           { menu => 'Features',               uri => 'pod/Features.htm',          file => 'Features.pod' },
           { menu => 'Introduction',           uri => 'pod/intro/', sub =>
               [
  -            { menu => 'Embperl',            uri => 'Intro.htm',                 file => { en => 'Intro.pod', 'de' => 'IntroD.pod'}},
  -            { menu => 'Embperl::Object',    uri => 'IntroEmbperlObject.htm',    file => 'IntroEmbperlObject.pod'},
  -            #{ menu => 'DBIx::Recordset',   uri => 'IntroEmbperlObject.htm',    file => 'IntroEmbperlObject.pod'},
  +            { menu => 'Embperl',            uri => 'Intro.htm',                 file => { en => 'Intro.pod', 'de' => 'IntroD.pod'},
  +                  desc => { en => 'Introduction of Embperl basic capablitities', 
  +                            de => 'Einf�hrung in die grundlegenden M�glichkeiten von Embperl' }},
  +            { menu => 'Embperl::Object',    uri => 'IntroEmbperlObject.htm',    file => 'IntroEmbperlObject.pod',
  +                  desc => { en => 'Introduction to object-oriented website creation with Embperl', 
  +                            de => 'Einf�hrung in das objekt-orientierte Erstellen von Websites mit Embperl' }},
  +            { menu => 'DBIx::Recordset',   uri => 'IntroEmbperlObject.htm',    path => '%lib_dbix%/DBIx/Intrors.pod',
  +                  desc => { en => 'Introduction to database access with DBIx::Recordset', 
  +                            de => 'Einf�hrung in den Datenbankzugriff mit DBIx::Recordset' }},
               ]
           },
           { menu => 'Documentation',          uri => 'pod/doc/', sub => 
               [
  -            { menu => 'Embperl',            uri => 'Embperl.htm',               file => { en => 'Embperl.pod', de => 'EmbperlD.pod'}},
  -            { menu => 'Embperl::Object',    uri => 'EmbperlObject.htm',         file => 'Embperl/Object.pm'},
  -            { menu => 'Embperl::Form::Validate',  uri => 'EmbperlFormValidate.htm',         file => 'Embperl/Form/Validate.pm' },
  -            { menu => 'Embperl::Syntax',    uri => 'EmbperlSyntax.htm',         file => 'Embperl/Syntax.pm', sub =>
  -                [
  -                { menu => 'Embperl',        uri => 'Embperl.htm',               file => 'Embperl/Syntax/Embperl.pm'},
  -                { menu => 'EmbperlBlocks',  uri => 'EmbperlBlocks.htm',         file => 'Embperl/Syntax/EmbperlBlocks.pm'},
  -                { menu => 'EmbperlHTML',    uri => 'EmbperlHTML.htm',           file => 'Embperl/Syntax/EmbperlHTML.pm'},
  -                { menu => 'HTML',           uri => 'HTML.htm',                  file => 'Embperl/Syntax/HTML.pm'},
  -                { menu => 'ASP',            uri => 'ASP.htm',                   file => 'Embperl/Syntax/ASP.pm'},
  -                { menu => 'SSI',            uri => 'SSI.htm',                   file => 'Embperl/Syntax/SSI.pm'},
  -                { menu => 'Perl',           uri => 'Perl.htm',                  file => 'Embperl/Syntax/Perl.pm'},
  -                { menu => 'POD',            uri => 'POD.htm',                   file => 'Embperl/Syntax/POD.pm'},
  -                { menu => 'Text',           uri => 'Text.htm',                  file => 'Embperl/Syntax/Text.pm'},
  -                { menu => 'RTF',            uri => 'RTF.htm',                   file => 'Embperl/Syntax/RTF.pm'},
  -                { menu => 'Mail',           uri => 'Mail.htm',                  file => 'Embperl/Syntax/Mail.pm'},
  -                ],
  -            },
  -            { menu => 'Embperl::Recipe',    uri => 'EmbperlRecipe.htm',         file => 'Embperl/Recipe.pm', sub =>
  +                { menu => 'Embperl',            uri => 'Embperl.htm',               file => { en => 'Embperl.pod', de => 'EmbperlD.pod'},
  +                  desc => { en => 'Main Embperl documentation', de => 'Hauptdokumentation' }},
  +                { menu => 'Embperl::Object',    uri => 'EmbperlObject.htm',         file => 'Embperl/Object.pm',
  +                  desc => { en => 'Documentation for creating object-oriented websites', 
  +                            de => 'Dokumentation zur Erstellung von Objekt-Orientierten Websites' }},
  +                { menu => 'Embperl::Form::Validate',  uri => 'EmbperlFormValidate.htm',         file => 'Embperl/Form/Validate.pm' ,
  +                  desc => { en => 'Documentation for easy form validation (client- and server-side)', 
  +                            de => 'Dokumentation zur einfachen �berpr�fung von Formulareingaben (Client- und Serverseitig)' }},
  +                { menu => 'Embperl::Syntax',    uri => 'EmbperlSyntax.htm',         file => 'Embperl/Syntax.pm', 
  +                  desc => { en => 'Documentation about differnent syntaxes in Embperl and how to create your own syntax', 
  +                            de => 'Dokumentation �ber verschiedene Syntaxen von Embperl und wie man eingene Syntaxen erstellt' },
  +                  sub =>
  +                    [
  +                    { menu => 'Embperl',        uri => 'Embperl.htm',               file => 'Embperl/Syntax/Embperl.pm'},
  +                    { menu => 'EmbperlBlocks',  uri => 'EmbperlBlocks.htm',         file => 'Embperl/Syntax/EmbperlBlocks.pm'},
  +                    { menu => 'EmbperlHTML',    uri => 'EmbperlHTML.htm',           file => 'Embperl/Syntax/EmbperlHTML.pm'},
  +                    { menu => 'HTML',           uri => 'HTML.htm',                  file => 'Embperl/Syntax/HTML.pm'},
  +                    { menu => 'ASP',            uri => 'ASP.htm',                   file => 'Embperl/Syntax/ASP.pm'},
  +                    { menu => 'SSI',            uri => 'SSI.htm',                   file => 'Embperl/Syntax/SSI.pm'},
  +                    { menu => 'Perl',           uri => 'Perl.htm',                  file => 'Embperl/Syntax/Perl.pm'},
  +                    { menu => 'POD',            uri => 'POD.htm',                   file => 'Embperl/Syntax/POD.pm'},
  +                    { menu => 'Text',           uri => 'Text.htm',                  file => 'Embperl/Syntax/Text.pm'},
  +                    { menu => 'RTF',            uri => 'RTF.htm',                   file => 'Embperl/Syntax/RTF.pm'},
  +                    { menu => 'Mail',           uri => 'Mail.htm',                  file => 'Embperl/Syntax/Mail.pm'},
  +                    ],
  +                },
  +                { menu => 'Embperl::Recipe',    uri => 'EmbperlRecipe.htm',         file => 'Embperl/Recipe.pm', 
  +                  desc => { en => 'Documentation about recipes and providers', 
  +                            de => 'Dokumentation �ber recipes und provider' },
  +                  sub =>
  +                    [
  +                    { menu => 'Embperl',        uri => 'Embperl.htm',               file => 'Embperl/Recipe/Embperl.pm'},
  +                    { menu => 'EmbperlXSLT',    uri => 'EmbperlXSLT.htm',           file => 'Embperl/Recipe/EmbperlXSLT.pm'},
  +                    { menu => 'XSLT',           uri => 'XSLT.htm',                  file => 'Embperl/Recipe/XSLT.pm'},
  +                    ],
  +                },
  +#                { menu => 'Embperl::Constant',    uri => 'EmbperlConstant.htm',         file => 'Embperl/Constant.pm'},
  +#                { menu => 'Embperl::Log',    uri => 'EmbperlLog.htm',         file => 'Embperl/Log.pm'},
  +#                { menu => 'Embperl::Out',    uri => 'EmbperlOut.htm',         file => 'Embperl/Out.pm'},
  +#                { menu => 'Embperl::Run',    uri => 'EmbperlRun.htm',         file => 'Embperl/Run.pm'},
  +                { menu => 'Embperl::Mail',    uri => 'EmbperlMail.htm',         file => 'Embperl/Mail.pm',
  +                  desc => { en => 'Documentation on how to use Embperl for generating and sending mail', 
  +                            de => 'Dokumentation wie man Embperl benutzt um Mail zu erstellen und zu senden' }},
  +#                { menu => 'Embperl::Util',    uri => 'EmbperlUtil.htm',         file => 'Embperl/Util.pm'},
  +            { menu => '1.3.4 documentation',              uri => 'doc13.htm', 
  +              desc => { en => 'Old documentation from Embperl 1.3.4', 
  +                        de => 'Alte Dokumentation von Embperl 1.3.4' },
  +              sub => ,
                   [
  -                { menu => 'Embperl',        uri => 'Embperl.htm',               file => 'Embperl/Recipe/Embperl.pm'},
  -                { menu => 'EmbperlXSLT',    uri => 'EmbperlXSLT.htm',           file => 'Embperl/Recipe/EmbperlXSLT.pm'},
  -                { menu => 'XSLT',           uri => 'XSLT.htm',                  file => 'Embperl/Recipe/XSLT.pm'},
  +                { menu => 'HTML::Embperl',         uri => 'HTML/Embperl.htm',               path => { en => '%lib_1_3%/HTML/Embperl.pod', de => '%lib_1_3%/HTML/EmbperlD.pod'},
  +                  desc => { en => 'Main Embperl documentation: Configuration, Syntax, Usage etc.', 
  +                            de => 'Hauptdokumentation: Konfiguration, Syntax, Benutzung, etc.' },
  +                },
  +                { menu => 'HTML::EmbperlObject',   uri => 'HTML/EmbperlObject.htm',         path => '%lib_1_3%/HTML/EmbperlObject.pm',
  +                  desc => { en => 'Documentation for creating object-oriented websites', 
  +                            de => 'Dokumentation zur Erstellung von Objekt-Orientierten Websites' }},
  +                { menu => 'HTML::Embperl::Mail',   uri => 'HTML/Embperl/Mail.htm',          path => '%lib_1_3%/HTML/Embperl/Mail.pm' ,
  +                  desc => { en => 'Documentation on how to use Embperl for generating and sending mail', 
  +                            de => 'Dokumentation wie man Embperl benutzt um Mail zu erstellen und zu senden' }},
  +                { menu => 'HTML::Embperl::Session',uri => 'HTML/Embperl/Session.htm',       path => '%lib_1_3%/HTML/Embperl/Session.pm' ,
  +                  desc => { en => 'Documentation for Embperls session handling object', 
  +                            de => 'Dokumentation �ber Embperls Session Objekt' }},
  +                { menu => 'Tips & Tricks',         uri => 'HTML/Embperl/TipsAndTricks.htm', path => '%lib_1_3%/HTML/Embperl/TipsAndTricks.pod' ,
  +                  desc => { en => 'Tips & Tricks for Embperl 1.3.4', 
  +                            de => 'Tips & Tricks f�r Embperl 1.3.4' }},
                   ],
               },
               ],
           },
           { menu => 'Installation',           uri => 'pod/INSTALL.htm',           file => 'INSTALL.pod' },
           { menu => 'FAQ',                    uri => 'pod/Faq.htm',               file => 'Faq.pod' },
  -        { menu => 'Tips & Tricks',          uri => 'pod/TipsAndTricks.htm',     file => 'TipsAndTricks.pod' },
           { menu => 'Examples',               uri => 'examples/' },
           { menu => 'Changes',                uri => 'pod/Changes.htm',           file => 'Changes.pod' },
           #{ menu => 'Sites using Embperl',    uri => 'pod/Sites.htm',             file => 'Sites.pod' },
  
  
  
  1.1.2.6   +62 -3     embperl/eg/web/Attic/epwebapp.pl
  
  Index: epwebapp.pl
  ===================================================================
  RCS file: /home/cvs/embperl/eg/web/Attic/epwebapp.pl,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- epwebapp.pl	13 Mar 2002 06:29:36 -0000	1.1.2.5
  +++ epwebapp.pl	14 Jun 2002 23:38:57 -0000	1.1.2.6
  @@ -5,6 +5,8 @@
   use Embperl::Recipe::EmbperlPODXSLT  ;
   use Embperl::Constant ;
   
  +use Data::Dumper ;
  +
      
   sub fill_menu 
   
  @@ -15,7 +17,26 @@
           {
           $m -> {parent} ||= $parent ;
           $m -> {url}  ||= "$baseuri$m->{uri}" ;
  -        if (!$m -> {file})
  +        if (ref $m -> {path})
  +            {
  +            foreach my $k (keys %{$m -> {path}})
  +                { 
  +                if (($m -> {path}{$k} =~ /^\%(.*?)\%/) && $config -> {$1}) 
  +                    {
  +                    my $val = $config -> {$1} ;
  +                    $m -> {path}{$k} =~ s/^\%.*?\%/$val/ ; 
  +                    }
  +                }
  +            }
  +        elsif ($m -> {path})
  +            {
  +            if (($m -> {path} =~ /^\%(.*?)\%/) && $config -> {$1}) 
  +                {
  +                my $val = $config -> {$1} ;
  +                $m -> {path} =~ s/^\%.*?\%/$val/ ; 
  +                }
  +            }
  +        elsif (!$m -> {file})
               {
               $m -> {path} = $root . $m -> {url} ;
               $m -> {path} .= 'index.htm' if ($m -> {path} =~ m#/$#) ;
  @@ -49,6 +70,25 @@
           }
       }
   
  +#
  +# Add language to uri
  +#
  +
  +sub languri
  +    {
  +    my ($self, $r, $uri, $lang) = @_ ;
  +
  +    my $buri = $r->{baseuri} ;
  +    $lang ||= $r -> {selected_language} ;
  +    if ($lang && ($uri =~ /$buri(.*?)$/))
  +        {
  +        return "$buri$lang/$1" ; 
  +        }
  +
  +    return $uri ;
  +    }
  +
  +
   
   sub map_file
       {
  @@ -84,6 +124,7 @@
                   }
               }
   
  +        $r -> {curritem} = $m ;
           my $path = $m -> {path} ;
           if (ref $path)
               {
  @@ -106,13 +147,31 @@
       $config -> new ($r) ;    
       
       $r -> {config} = $config  ;    
  +
  +    my $langs  = $config -> {supported_lamnguages} ;
  +    my $uri = $r -> param -> uri ;
  +
  +    # serach the url, if there is a language embeded,
  +    # if yes remove it
  +    $r -> {selected_language} = '' ;
  +    foreach (@$langs)
  +        {
  +        if ($uri =~ m#/$_/#) 
  +            {
  +            $r -> param -> language($_) ;
  +            $r -> {selected_language} = $_ ;
  +            $uri =~ s#/$_/#/# ;
  +            $r -> param -> uri ($uri) ;
  +            last ;
  +            }
  +        }
  +
       $r -> {menu}   = $config -> get_menu ($r) ;    
       fill_menu ($config, $r -> {menu}, $r -> {baseuri}, $r -> {root}) ;
       $pf = map_file ($r) ;
       $r -> param -> filename ($pf) ;
   
  -    #use Data::Dumper ;
  -    #print STDERR Dumper ($r -> {menu}, $r -> param -> uri, $pf, \%fdat) ;
  +    print STDERR Dumper ($r -> {menu}, $r -> param -> uri, $pf, \%fdat) ;
       
       Execute ({inputfile => 'messages.pl', syntax => 'Perl'}) ;
   
  
  
  
  1.1.2.4   +7 -5      embperl/eg/web/Attic/header.epl
  
  Index: header.epl
  ===================================================================
  RCS file: /home/cvs/embperl/eg/web/Attic/header.epl,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- header.epl	12 Feb 2002 21:02:42 -0000	1.1.2.3
  +++ header.epl	14 Jun 2002 23:38:57 -0000	1.1.2.4
  @@ -1,14 +1,16 @@
  -[- $r = shift -]
  +[- 
  +$r = shift ;
  +-]
   <table width="100%" cellspacing="0" cellpadding="0" border="0">
       <tr>
           <td valign="top" rowspan=2><img src="/eg/images/kopf-links.gif" width="206" height="97" usemap="#Map" border="0"> 
   	    <map name="Map"> 
  -		<area shape="rect" coords="90,56,151,69" href="../index-d.htm" target="_top">
  -		<area shape="rect" coords="90,70,151,82" href="index-e.htm" target="_top">
  +		<area shape="rect" coords="90,56,151,69" href="[+ $r -> app -> languri($r, $r -> param -> uri, 'de') +]" target="_top">
  +		<area shape="rect" coords="90,70,151,82" href="[+ $r -> app -> languri($r, $r -> param -> uri, 'en') +]" target="_top">
   	    </map>
           </td>
           <td valign="top" width="50%"><img src="/eg/images/kopf-mitte.jpg" width="100%" height="46" vspace=0></td>
  -        <td valign="top"><img src="/eg/images/kopf-rechts-engl.jpg" width="568" height="46" vspace=0></td>
  +        <td valign="top"><img src="/eg/images/kopf-rechts-[+ $r -> param -> language eq 'de'?'deutsch':'engl' +].jpg" width="568" height="46" vspace=0></td>
       </tr>
       <tr>
           <td colspan=2 valign="top" align=left>
  @@ -23,7 +25,7 @@
   			    [$endforeach$] 
                           [$endif$]
   		    </td>
  -		    <td align="right" valign="middle" height="99%">Suchen: <input type="text" name="search"></td>
  +		    <td align="right" valign="middle" height="99%">[= Search =]: <input type="text" name="search"></td>
   		</tr>
   	    </table>
           </td>
  
  
  
  1.1.2.3   +16 -13    embperl/eg/web/Attic/menuleft.epl
  
  Index: menuleft.epl
  ===================================================================
  RCS file: /home/cvs/embperl/eg/web/Attic/menuleft.epl,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- menuleft.epl	16 Feb 2002 18:00:48 -0000	1.1.2.2
  +++ menuleft.epl	14 Jun 2002 23:38:57 -0000	1.1.2.3
  @@ -10,7 +10,7 @@
   		<tr> 
             <td nowrap align=left width=[+ $ndx * 15 + 2 +]><img = src="[+ $r -> {imageuri} +]/transp.gif" width="1"></td>
   		  <td nowrap align=left width=15><img src="[+ $r -> {imageuri} +]/i-sub-[+ $state>1?($state>2?'on':'open'):'off' +].gif" width="11" height="11" vspace="6" hspace="5"></td>
  -		  <td nowrap align=left><a href="[+ $url +]"><font size="1" face="Verdana, Arial, Helvetica, sans-serif" color="0"><div class="cMenu"><b>[+ $r -> gettext ($txt) +]</b></div></font></a></td>
  +		  <td nowrap align=left><a href="[+ $app -> languri ($r, $url) +]"><font size="1" face="Verdana, Arial, Helvetica, sans-serif" color="0"><div class="cMenu"><b>[+ $r -> gettext ($txt) +]</b></div></font></a></td>
   		</tr>
   	  </table>
   	</td>
  @@ -26,26 +26,29 @@
   *]  
     
       [$ foreach my $item (@{$menu}) $]
  -        [- 
  -        if ( $r -> {menuitems}[$ndx] eq $item)
  -            {
  -            menuitem ($item -> {url}, $item -> {menu}, $r -> {menuitems}[$ndx+1]?2:3, $top, $ndx) ;
  -            menu ($item -> {sub}, $ndx + 1, 0) if ($item -> {sub}) ;
  -            }
  -        else
  -            {
  -            menuitem ($item -> {url}, $item -> {menu}, 0, $top, $ndx) ;
  -            }
  -        -]
  +        [$if $item -> {path} $]
  +            [- 
  +            if ( $r -> {menuitems}[$ndx] eq $item)
  +                {
  +                menuitem ($item -> {url}, $item -> {menu}, $r -> {menuitems}[$ndx+1]?2:3, $top, $ndx) ;
  +                menu ($item -> {sub}, $ndx + 1, 0) if ($item -> {sub}) ;
  +                }
  +            else
  +                {
  +                menuitem ($item -> {url}, $item -> {menu}, 0, $top, $ndx) ;
  +                }
  +            -]
           <tr> 
               <td><img src="/eg/images/linie-nav.gif" width="152" height="1"></td>
           </tr>
  +        [$ endif $]
       [$endforeach $]
   
   [$ endsub $]
   
   [- 
   $r = shift ;
  +$app  = $r -> app ;
   -]
   
   <table width="152" border="0" cellspacing="0" cellpadding="0">
  @@ -83,7 +86,7 @@
     </tr>
     <tr> 
       <td bgcolor="#D2E9F5"><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
  -		Beta 2.0b6</b></font></td>
  +		Beta 2.0b8</b></font></td>
     </tr>
     <tr>
       <td><img src="/eg/images/linie-nav.gif" width="152" height="1"></td>
  
  
  
  1.1.2.4   +2 -0      embperl/eg/web/Attic/messages.pl
  
  Index: messages.pl
  ===================================================================
  RCS file: /home/cvs/embperl/eg/web/Attic/messages.pl,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- messages.pl	12 Feb 2002 16:55:01 -0000	1.1.2.3
  +++ messages.pl	14 Jun 2002 23:38:57 -0000	1.1.2.4
  @@ -16,6 +16,7 @@
           'url'     => 'URL',
           'description'  => 'Beschreibung',
           'show2'   => 'Folgender Eintrag wurde erfolgreich der Datenbank hinzugef�gt',
  +        'Search'  => 'Suchen',
           },
       'en' =>
           {
  @@ -30,6 +31,7 @@
           'url'     => 'URL',
           'description'  => 'Description',
           'show2'   => 'The following entry has been sucessfully added to the database',
  +        'Search'  => 'Search',
           },
       ) ;
   
  
  
  
  1.1.2.3   +7 -6      embperl/eg/web/Attic/news.epl
  
  Index: news.epl
  ===================================================================
  RCS file: /home/cvs/embperl/eg/web/Attic/news.epl,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- news.epl	1 Jun 2002 23:44:26 -0000	1.1.2.2
  +++ news.epl	14 Jun 2002 23:38:57 -0000	1.1.2.3
  @@ -8,6 +8,7 @@
   
   if (!$dberr)
       {
  +    eval {
       *set = DBIx::Recordset -> Search ({'!DataSource'    => $r -> {dbdsn},
                                          '!Username'      => $r -> {dbuser},
                                          '!Password'      => $r -> {dbpassword},
  @@ -18,8 +19,8 @@
                                          'language_id'    => $r -> param -> language,
                                          'category_id'    => 1,
                                          '$max'           => 15}) ;
  -
  -    $dberr = "Error accessing $r->{dbdsn}: " . DBIx::Recordset -> LastError if (DBIx::Recordset -> LastError) ;
  +    } ;
  +    $dberr = "Error accessing $r->{dbdsn}: " . DBIx::Recordset -> LastError . $@ if (DBIx::Recordset -> LastError || $@) ;
       }
   
   
  @@ -71,9 +72,9 @@
               [$else$]
                       <table width="100%" border="0" cellspacing="0" cellpadding="0">
                           <tr> 
  -                          <td bgcolor="#327EA7"><font size="1" face="Verdana, Arial, Helvetica, sans-serif"><b>
  +                          <td bgcolor="#327EA7" align=center><font size="1" face="Verdana, Arial, Helvetica, sans-serif"><b>
                               <font color="#FFFFFF">&nbsp;
  -                                News not available because database is not correctly setup
  +                                News not available because database is not correctly set up
                               </font></b></font></td>
                           </tr>
                           <tr> 
  @@ -85,10 +86,10 @@
                                 <tr>
                                   <td><font size="1" face="Verdana, Arial, Helvetica, sans-serif">
                                       [+ $dberr +]<br>
  -                                    To get the database related parts working, go to install
  +                                    <b>To get the database related parts working, install
                                       DBI and DBIx::Recordset, setup a database for Embperl, create tables by
                                       running eg/webutil/setupdb.pl (make sure to edit the DSN inside the
  -                                    script first) and enter the correct DSN in eg/web/config.pl.
  +                                    script first) and enter the correct DSN in eg/web/config.pl.</b>
                                   </font></td>
                                 </tr>
                               </table>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.3   +21 -1     embperl/eg/web/pod/doc/Attic/index.htm
  
  Index: index.htm
  ===================================================================
  RCS file: /home/cvs/embperl/eg/web/pod/doc/Attic/index.htm,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- index.htm	12 Feb 2002 09:11:45 -0000	1.1.2.2
  +++ index.htm	14 Jun 2002 23:38:58 -0000	1.1.2.3
  @@ -1,3 +1,23 @@
  +<blockquote>
   <br>
  -Here you find the whole documention of Embperl
  +[$ if $_[0] -> param -> language eq 'de' $]
  +Hier finden Sie die vollst�ndige Dokumentation von Embperl. Sie enth�lt eine Referenz aller Features.
  +<br><br>
  +F�r schreitweise Tutorials gehen Sie bitte auf die <a href="../intro/">Einf�hrungsseite</a>.
  +<br>
  +Details zur Installation k�nnen Sie in der <a href="../INSTALL.htm">Installationsanweisung</a> nachlesen.
  +[$else$]
  +Here you find the whole documention of Embperl. 
  +This contains the full reference of all Embperl features.
  +<br><br>
  +For step by step tutorials go to the <a href="../intro/">introduction page</a>.
  +<br>
  +Details about the installation can be found on the <a href="../INSTALL.htm">installationpage</a>.
  +[$endif$]
  +<br>
  +<br>
  +[- Execute ('menulist.epl') -]
  +</blockquote>
  +
  +
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +23 -0     embperl/eg/web/pod/doc/Attic/doc13.htm
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +22 -1     embperl/eg/web/pod/intro/Attic/index.htm
  
  Index: index.htm
  ===================================================================
  RCS file: /home/cvs/embperl/eg/web/pod/intro/Attic/index.htm,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- index.htm	12 Feb 2002 07:20:36 -0000	1.1.2.1
  +++ index.htm	14 Jun 2002 23:38:58 -0000	1.1.2.2
  @@ -1 +1,22 @@
  -Here you find several Introductions to Embperl
  \ No newline at end of file
  +<blockquote>
  +<br>
  +[$ if $_[0] -> param -> language eq 'de' $]
  +Hier finden Einf�hrungen zu verschiedenen Aspekten von Embperl. Die Einf�hrungen versuchen
  +einen �berblick �ber und Einstieg in die M�glichkeiten des jeweilig Gebietes zu geben. 
  +<br><br>
  +Eine vollst�ndige Referenz finden Sie bitte in der <a href="../doc/">Dokumentation</a>.
  +<br>
  +Details zur Installation k�nnen Sie in der <a href="../INSTALL.htm">Installationsanweisung</a> nachlesen.
  +[$else$]
  +Here you find several Introductions to Embperl.
  +The introduction tries to give an overview and starting point for the various areas.
  +<br><br>
  +A complete reference of Embperls features can be found on the <a href="../intro/">documentation page</a>.
  +<br>
  +Details about the installation can be found on the <a href="../INSTALL.htm">installationpage</a>.
  +[$endif$]
  +<br>
  +<br>
  +[- Execute ('menulist.epl') -]
  +</blockquote>
  +
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org