moved site config from root/config/main to csc.conf

etc/csc.conf

@@ -0,0 +1,44 @@
+<config prov_user="provisioning username"
+        prov_pass="provisioning password"
+        log4perlconf="/usr/local/etc/logging.conf"
+        site_domain="sip.yourdomain.tld"
+        sip_server="sip.yourdomain.tld"
+        tftp_server="tftp.yourdomain.tld"
+        www_server="www.yourdomain.tld"
+        <!-- only needed if PayPal is used -->
+        paypal_soapuri="/2.0/"
+        paypal_soapurl="https://api-3t.paypal.com/2.0/"
+        paypal_username="your PayPal API user"
+        paypal_password="your PayPal API password"
+        paypal_signature="your PayPal API signature"
+        paypal_redirecturl="https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&amp;useraction=commit&amp;token="
+        paypal_csc_returnurl="https://csc.yourdomain.tld/account/paidack"
+        paypal_csc_cancelurl="https://csc.yourdomain.tld/account/paiderr"
+        paypal_shop_returnurl="https://shop.yourdomain.tld/payment/paidack"
+        paypal_shop_cancelurl="https://shop.yourdomain.tld/payment/paiderr"
+        <!-- only needed if mPAY24 integration is used -->
+        mpay24_baseurl="https://www.mPAY24.com/bin/secure/at/etpv5"
+        mpay24_merchantid="your mPAY24 ID"
+>
+    <site_config title="CSC site title"
+                 language="de"
+                 css="/css/style.css"
+    >
+        <company name="your company"
+                 logo="/path/to/logo.gif"
+                 hotline="customer care phone number"
+                 city="city of company residence"
+                 street="street of company residence"
+                 phone="company phone number"
+                 fax="company fax number"
+                 email="company e-mail address"
+                 webserver="www.yourdomain.tld"
+        />
+    </site_config>
+</config>
+
+<!-- PayPal test environment URLs -->
+<!--
+        paypal_soapurl="https://api.sandbox.paypal.com/2.0/"
+        paypal_redirecturl="https://www.sandbox.paypal.com/cgi-bin/webscr?cmd=_express-checkout&useraction=commit&token="
+-->

root/config/main

@@ -10,24 +10,6 @@
      MACRO debug(message) CALL Catalyst.log.debug(message);
    END;
 
-   # define a data structure to hold sitewide data
-   site = {
-     title     => 'Libratel CSC',
-     company   => {
-                   name      => 'Libratel IP Communications GmbH',
-                   logo      => '/grafik/libratel.gif',
-                   hotline   => '0720 / 456 789',
-                   city      => '2345 Brunn am Gebirge',
-                   street    => 'Europaring F15',
-                   phone     => '+43 (0)720 456789-0',
-                   fax       => '+43 (0)720 456789-10',
-                   email     => 'office@libratel.at',
-                   webserver => 'www.libratel.at',
-                  },
-     language  => 'de',
-     css       => '/css/style.css',
-   };
-
 ##   # load up any other configuration items
 ##   PROCESS config/col
 ##         + config/url;

root/layout/footer

@@ -1,9 +1,13 @@
 <!-- BEGIN layout/footer -->
     <div id="footer">
-      [% site.company.name %] <span>|</span> [% site.company.city %] <span>|</span> [% site.company.street %] <br />
-      Tel. [% site.company.phone %] <span>|</span> Fax [% site.company.fax %] <span>|</span> E-Mail <a href="mailto:[% site.company.email %]" class="link">[% site.company.email %]</a><br />
-		<a href="http://www.mstefan.com" target="_blank" class="ms"><img src="/grafik/ms.gif" width="136" height="9" alt="Design by Markus Stefan" /></a>
-		<a href="http://www.sipwise.com" target="_blank" class="sipwise"><img src="/grafik/sipwise-powered.png" width="131" height="29" alt="Powered by Sipwise" /></a>
+      [% Catalyst.config.site_config.company.name %] <span>|</span>
+      [% Catalyst.config.site_config.company.city %] <span>|</span>
+      [% Catalyst.config.site_config.company.street %] <br />
+      Tel. [% Catalyst.config.site_config.company.phone %] <span>|</span>
+      Fax [% Catalyst.config.site_config.company.fax %] <span>|</span>
+      E-Mail <a href="mailto:[% Catalyst.config.site_config.company.email %]" class="link">[% Catalyst.config.site_config.company.email %]</a><br />
+          <a href="http://www.mstefan.com" target="_blank" class="ms"><img src="/grafik/ms.gif" width="136" height="9" alt="Design by Markus Stefan" /></a>
+          <a href="http://www.sipwise.com" target="_blank" class="sipwise"><img src="/grafik/sipwise-powered.png" width="131" height="29" alt="Powered by Sipwise" /></a>
     </div>
 
     <script type="text/javascript">

root/layout/fp_header

@@ -2,7 +2,7 @@
 
     <div id="head">
 
-      <h1><a href="http://[% Catalyst.config.www_server %]/" title="zur Startseite"><img src="[% site.company.logo %]" width="192" height="44" alt="[% site.company.name %]" /></a></h1>
+      <h1><a href="http://[% Catalyst.config.www_server %]/" title="zur Startseite"><img src="[% Catalyst.config.site_config.company.logo %]" width="192" height="44" alt="[% Catalyst.config.site_config.company.name %]" /></a></h1>
 
       <ul id="menusmall">
         <li><a href="http://[% Catalyst.config.www_server %]/impressum.html">Impressum</a></li>
@@ -12,7 +12,7 @@
       </ul>
 
       <p id="hotline">
-        HOTLINE: <strong>[% site.company.hotline %]</strong>
+        HOTLINE: <strong>[% Catalyst.config.site_config.company.hotline %]</strong>
       </p>
     
       <ul id="menu">

root/layout/header

@@ -1,7 +1,7 @@
 <!-- BEGIN layout/header -->
     <div id="head">
 
-      <h1><a href="http://[% site.company.webserver %]/" title="home"><img src="[% site.company.logo %]" width="192" height="44" alt="[% site.company.name %]" /></a></h1>
+      <h1><a href="http://[% Catalyst.config.site_config.company.webserver %]/" title="home"><img src="[% Catalyst.config.site_config.company.logo %]" width="192" height="44" alt="[% Catalyst.config.site_config.company.name %]" /></a></h1>
 
       <ul id="menusmall">
         <li><a href="impressum.html">Impressum</a></li>
@@ -14,7 +14,7 @@
       </ul>
 <!--
       <p id="hotline">
-        HOTLINE: <strong>[% site.company.hotline %]</strong>
+        HOTLINE: <strong>[% Catalyst.config.site_config.company.hotline %]</strong>
       </p>
 -->
 

root/layout/html

@@ -1,21 +1,21 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="[% site.language %]">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="[% Catalyst.config.site_config.language %]">
 
 <head>
 
-  <title>[% template.title or site.title %]</title>
+  <title>[% template.title or Catalyst.config.site_config.title %]</title>
 
   [% FOREACH css_file = site_config.css %]
     <link rel="stylesheet" type="text/css" href="[% css_file %]" />
   [% END %]
 
   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-  <meta http-equiv="content-language" content="[% site.language %]" />
+  <meta http-equiv="content-language" content="[% Catalyst.config.site_config.language %]" />
 
-  <meta name="description" content="[% template.title or site.title %]" />
-  <meta name="title" content="[% template.title or site.title %]" />
-  <meta name="Company" content="[% site.company.name %]" />
+  <meta name="description" content="[% template.title or Catalyst.config.site_config.title %]" />
+  <meta name="title" content="[% template.title or Catalyst.config.site_config.title %]" />
+  <meta name="Company" content="[% Catalyst.config.site_config.company.name %]" />
   <meta name="keywords" content="" />
   <meta name="Language" content="Deutsch" />
 
@@ -37,7 +37,7 @@
 
 </head>
 
-<body id="[% site.language %]">
+<body id="[% Catalyst.config.site_config.language %]">
 [% content %]
 </body>
 

root/tt/shop/finish.tt

@@ -37,7 +37,7 @@
           <p class="anmeldeninfo">
             Ihre Daten wurden gespeichert.<br />
             Für Änderungen, Anregungen und weitere Hilfe wenden Sie sich bitte an unseren
-            <a href="http://[% site.company.webserver %]/kontakt.html">Support</a>.
+            <a href="http://[% Catalyst.config.site_config.company.webserver %]/kontakt.html">Support</a>.
           </p>
 
         </div><br clear="all" />