Changeset 347 in t29-www

Timestamp:

Mar 6, 2013, 3:58:15 AM (10 years ago)

Author:

sven

Message:

Diverse Verbesserungen am Homepagesystem, die bereits lange anstanden.

• Die Suche ist endlich implementiert, wenngleich auch relativ unschoen mittels einer eingebundenen Google-Suche.

Bugfixes:

• de/news.php: Syntaxfehler im Neuigkeiten-Menü

Backend-Aenderungen:

• Englischsprachige Benutzer, die auf die deutsche Seite kommen oder andersrum erhalten einen Hinweis, dass es die andere Sprachversion gibt (noch nicht vollständig implementiert)
• Es gibt ein besseres Logging-System, welches Client- und Serverausgaben verbindet
• Das System generiert jetzt selbst Clean-URLs direkt (zumindest aus Menue/Template, Inhalte werden nicht touchiert). Das reduziert die Anzahl der Zugriffe erheblich.
• Ein paar CSS-Details
• navigation.xml: "#DUMME-VERLINKUNG"-Einträge entfernt

Files:

• de/details1.php (modified) (1 diff)
• de/details2.php (modified) (1 diff)
• de/navigation.xml (modified) (6 diffs)
• de/news.php (modified) (1 diff)
• de/suche.php (modified) (2 diffs)
• en/details1.php (modified) (1 diff)
• en/details2.php (modified) (1 diff)
• en/navigation.xml (modified) (5 diffs)
• en/search.php (modified) (2 diffs)
• lib/host.php (modified) (4 diffs)
• lib/logging.php (modified) (1 diff)
• lib/menu.php (modified) (5 diffs)
• lib/messages.php (modified) (2 diffs)
• lib/search.php (modified) (2 diffs)
• lib/template.php (modified) (19 diffs)
• shared/css-v6/modules/01-boilerplate.css (modified) (1 diff)
• shared/css-v6/modules/11-header.css (modified) (1 diff)
• shared/css-v6/modules/18-content.css (modified) (2 diffs)
• shared/css-v6/modules/22-v5blocks.css (modified) (3 diffs)
• shared/css-v6/pagestyles/suche.css (added)
• shared/js-v6/modules/interlang.js (added)
• shared/js-v6/modules/log.js (modified) (2 diffs)
• shared/js-v6/modules/startup.js (modified) (1 diff)

de/details1.php

@@ -9 +9 @@
 <h2><?php print $titel; ?></h2>
 
-<table width="100%" border="0" cellpadding="0" cellspacing="1">
+<table width="100%" border="0" cellpadding="0" cellspacing="1" class="t29-details">
   <colgroup>
     <col class="middle" /> <!-- middle-Klasse nicht -->

de/details2.php

@@ -8 +8 @@
 <h2><?php print $titel; ?></h2>
 
-<table width="100%" border="0" cellpadding="0" cellspacing="1">
+<table width="100%" border="0" cellpadding="0" cellspacing="1" class="t29-details">
   <colgroup>
     <col class="middle" /> <!-- middle-Klasse nicht -->

de/navigation.xml

@@ -24 +24 @@
                 </ul>
         </li>
-        <li class="has-submenu"><a href="/de/lernprojekte/#DUMME-VERLINKUNG">Projekte</a>
+        <li class="has-submenu"><a href="/de/lernprojekte/">Projekte</a>
                 <ul class="u2">
                         <li class="has-submenu"><a seiten_id="lernprojekte" class="show-rel-next" href="/de/lernprojekte/">Lernprojekte</a>
@@ -58 +58 @@
 <ul class="u1">
         <li class="guide-only start"><a href="/de/">Start</a></li>
-        <li><a href="/de/rechnertechnik/elektro-mechanik.php#DUMME-VERLINKUNG">Computer History</a>
+        <li><a href="/de/rechnertechnik/elektro-mechanik.php">Computer History</a>
                 <ul class="u2">
                         <li><a seiten_id="elektro-mechanik" href="/de/rechnertechnik/elektro-mechanik.php">Mechanische Rechenmaschinen</a>
@@ -66 +66 @@
                                 </ul>
                         </li>
-                        <li><a href="/de/rechnertechnik/lochkarten-edv.php#DUMME-VERLINKUNG">Lochkarten-EDV und gross-Computer</a>
+                        <li><a href="/de/rechnertechnik/lochkarten-edv.php">Lochkarten-EDV und gross-Computer</a>
                                 <ul class="u3">
                                         <li><a seiten_id="lochkarten" href="/de/rechnertechnik/lochkarten-edv.php" title="Lochkartengeräte">Lochkartengeräte und Peripherie</a></li>
@@ -124 +124 @@
                                 </ul>
                         </li>
-                        <li><a href="/de/rechnertechnik/elektronenroehren.php#DUMME-VERLINKUNG" title="Tischrechner mit Elektronenröhren">Elektronische Tischrechner</a>
+                        <li><a href="/de/rechnertechnik/elektronenroehren.php" title="Tischrechner mit Elektronenröhren">Elektronische Tischrechner</a>
                                 <ul class="u3">
                                         <li><a seiten_id="elektronenroehren" href="/de/rechnertechnik/elektronenroehren.php" title="Tischrechner mit Röhren">mit Röhren</a></li>
@@ -177 +177 @@
                 </ul>
         </li>
-        <li><a href="/de/kommunikationstechnik/rundfunk.php#DUMME-VERLINKUNG">Kommunikations-technik</a>
+        <li><a href="/de/kommunikationstechnik/rundfunk.php">Kommunikations-technik</a>
                 <ul class="u2">
                         <li><a seiten_id="rundfunk" href="/de/kommunikationstechnik/rundfunk.php">Rundfunk</a>
@@ -204 +204 @@
                 </ul>
         </li>
-        <li><a href="/de/kommunikationstechnik/messtechnik.php#DUMME-VERLINKUNG">Weitere Themen</a>
+        <li><a href="/de/kommunikationstechnik/messtechnik.php">Weitere Themen</a>
                 <ul class="u2">
                         <li><a seiten_id="messtechnik" href="/de/kommunikationstechnik/messtechnik.php">Mess- und Experimentaltechnik</a></li>

de/news.php

@@ -26 +26 @@
   link: "#Juli_2012"
   
-- 
-
 MENU;
 // ende der menue-Eintraege

de/suche.php

@@ -10 +10 @@
 
         require "../lib/technikum29.php";
-        
         // Todo: add interlang link from page. needs some kind of
         //       callback
 ?>
-        <h2>Suchen</h2>
-        <p>Hilfe zur Suchfunktion
+        <h2>Suche</h2>
+        <?php
+        $search->google_search_snippet();
+        ?>
+        <!--
         <p>Suchfeld
         <?php if(isset($_GET['q'])) { ?>
@@ -21 +23 @@
                 <p>...
         <?php } ?>
+        -->

en/details1.php

@@ -9 +9 @@
 <h2><?php print $titel; ?></h2>
 
-<table width="100%" border="0" cellpadding="0" cellspacing="1">
+<table width="100%" border="0" cellpadding="0" cellspacing="1" class="t29-details">
   <colgroup>
     <col class="middle">

en/details2.php

@@ -8 +8 @@
 <h2><?php print $titel; ?></h2>
 
-<table width="100%" border="0" cellpadding="0" cellspacing="1">
+<table width="100%" border="0" cellpadding="0" cellspacing="1" class="t29-details">
   <colgroup>
     <col class="middle">

en/navigation.xml

@@ -21 +21 @@
                 </ul>
         </li>
-        <li class="has-submenu"><a href="/en/development-projects.php#DUMME-VERLINKUNG">Projects</a>
+        <li class="has-submenu"><a href="/en/development-projects.php">Projects</a>
                 <ul class="u2">
                         <li class="has-submenu"><a seiten_id="lernprojekte" href="/en/study-projects.php">Study projects</a></li>
@@ -50 +50 @@
                                 </ul>
                         </li>
-                        <li><a href="/en/computer/punchcard.php#DUMME-VERLINKUNG">Punch card computing</a>
+                        <li><a href="/en/computer/punchcard.php">Punch card computing</a>
                                 <ul class="u3">
                                         <li><a seiten_id="lochkarten" href="/en/computer/punchcard.php" title="Punchers and Periphery">Punchers</a></li>
@@ -109 +109 @@
                                 </ul>
                         </li>
-                        <li><a href="/en/computer/electron-tubes.php#DUMME-VERLINKUNG">Electronical desk calculators</a>
+                        <li><a href="/en/computer/electron-tubes.php">Electronical desk calculators</a>
                                 <ul class="u3">
                                         <li><a seiten_id="elektronenroehren" href="/en/computer/electron-tubes.php">with electron tubes</a></li>
@@ -161 +161 @@
                 </ul>
         </li>
-        <li><a href="/en/communication/broadcasting.php#DUMME-VERLINKUNG">Communication Technology</a>
+        <li><a href="/en/communication/broadcasting.php">Communication Technology</a>
                 <ul class="u2">
                         <li><a seiten_id="rundfunk" href="/en/communication/broadcasting.php">Broadcasting</a>
@@ -188 +188 @@
                 </ul>
         </li>
-        <li><a href="/en/communication/measurement.php#DUMME-VERLINKUNG">Miscellaneous</a>
+        <li><a href="/en/communication/measurement.php">Miscellaneous</a>
                 <ul class="u2">
                         <li><a seiten_id="messtechnik" href="/en/communication/measurement.php">Measurement and Experimental technology</a></li>

en/search.php

@@ -3 +3 @@
         $version = '$Id$';
         $titel = 'Search';
-        
+        $dynamischer_inhalt = true;
+
+        require "../lib/search.php";
+        $search = new t29Search();
+        $search->page_handler();
+
         require "../lib/technikum29.php";
 ?>
         <h2>Search</h2>
-        <p>Search options and help
+        <?php
+                $search->google_search_snippet();
+        ?>
+        <!--
         <p>Search field
         <?php if(isset($_GET['q'])) { ?>
@@ -13 +21 @@
                 <p>...
         <?php } ?>
+        -->

lib/host.php

@@ -22 +22 @@
         public $hostname = "undefined";
 
-
         /**
          * Factory for creating a t29Host instance automatically
@@ -37 +36 @@
                         if(class_exists(self::webroot_local_host_classname)) {
                                 $x = self::webroot_local_host_classname;
-                                return new $x;
+                                $host = new $x;
+                                $host->setup();
+                                return $host;
                         } else {
                                 print "Warning: Hostfile $hostfile does not contain class ".self::webroot_local_host_classname."\n";
@@ -47 +48 @@
                         case 'heribert':
                         case 'localhost':
-                                return new t29HeribertHost;
+                                $localhost = new t29HeribertHost;
+                                $localhost->setup();
+                                return $localhost;
                 }
                 
-                return new t29PublicHost;
+                $publichost = new t29PublicHost;
+                $publichost->setup();
+                return $publichost;
+        }
+        
+        /**
+         * A constructing method which is always called by the t29Host::detect() factory.
+         * It does some general stuff.
+         * Of course you can always write your own setup() class - it's just your __constructor.
+         * The constructor will of course be called before the setup() method.
+         **/
+        function setup() {
+                $this->is_rewriting_host = isset($_SERVER[self::env_hidesuffix_name]);
         }
         
         function check_url_rewrite() {
-                if(isset($_SERVER[self::env_hidesuffix_name])) {
+                if($this->is_rewriting_host) {
                         $path = $_SERVER['REQUEST_URI'];
-                        $newpath = preg_replace("/\.(php|shtml?)$/i", '', $path);
+                        $newpath = $this->rewrite_link($path);
                         if($path != $newpath) {
                                 header('HTTP/1.1 301 Moved Permanently');
@@ -67 +82 @@
 
         public function __toString() {
-                return 't29v6/host:'.$this->hostname;
+                return 't29v6/'.$this->hostname;
+        }
+        
+        function rewrite_link($link_target) {
+                // rewrite link if neccessary. This function will be called hundreds of times
+                // while rendering a page, rewriting all links found.
+                if($this->is_rewriting_host) {
+                        $new_target = preg_replace('/\.(?:php|shtml?)([#?].+)?$/i', '\\1', $link_target);
+                        return $new_target;
+                } else {
+                        // just the identity function
+                        return $link_target;
+                }
+                
+        }
+        
+        function get_shorthand_link_returner() {
+                $t = $this;
+                return function($link_target)use($t) { return $t->rewrite_link($link_target); };
         }
 

lib/logging.php

@@ -89 +89 @@
         function print_all($ul_classes='') {
                 // causal printing function. Flushes entries afterwards!
-                print "<ul class='$ul_classes'>";
+                // if $ul_classes is given, will print a list around
+                if($ul_classes)
+                        print "<ul class='$ul_classes'>";
                 foreach($this->entries as $entry) {
                         printf('<li class="%s">%s</li>'.PHP_EOL, $entry[0], $entry[1]);
                 }
-                print "</ul>";
+                if($ul_classes) print "</ul>";
                 $this->entries = array(); // flush entries!
         }
         
         // convenience functions
-        public function FATAL($line, $args = self::NO_ARGUMENTS){
-                $this->log($line, self::FATAL, $args);
-        }
-
-        public function INFO($line, $args = self::NO_ARGUMENTS){
-                $this->log($line, self::INFO, $args);
-        }
-
-        public function DEBUG($line, $args = self::NO_ARGUMENTS){
-                $this->log($line, self::INFO, $args);
-        }
+        public function FATAL($line, $args = self::NO_ARGUMENTS) { $this->log($line, self::FATAL, $args); }
+        public function INFO($line, $args = self::NO_ARGUMENTS)  { $this->log($line, self::INFO, $args); }
+        public function DEBUG($line, $args = self::NO_ARGUMENTS) { $this->log($line, self::DEBUG, $args); }
+        public function WARN($line, $args = self::NO_ARGUMENTS) { $this->log($line, self::WARN, $args); }
         
 } // class

lib/menu.php

@@ -7 +7 @@
 
 require_once dirname(__FILE__).'/messages.php';
+require_once dirname(__FILE__).'/logging.php';
  
 class t29Menu {
         public $conf;
         public $xml;
+        public $log; // just for convenience
 
         // Bevor es eine ordentliche Dev-Moeglichkeit gibt: Der magische
@@ -26 +28 @@
         function __construct($conf_array) {
                 $this->conf = $conf_array;
+                $this->log = t29Log::get(); // just for convenience
                 
                 // create a message object if not given
@@ -70 +73 @@
                         if(!array_reduce(array_map(function($x) use ($fields,$e){ return isset($e[$x]); }, $fields),
                                         function($a,$b){ return $a && $b;}, true)) {
-                                $li = "<li>Fehler in Formatierung!";
+                                $li = "<li><a href='#'>Fehler in Formatierung!<em>Dieser Menüeintrag ist falsch formatiert</em></a></li>";
+                                $this->log->WARN("<h5>Neuigkeiten-Menü: Fehler in Formatierung</h5><p>Ein Eintrag im Neuigkeiten-Menü ist falsch formatiert.");
                         } else {
                                 $url = ($e['link']{0} == '#' ? $this->conf['lang_path'].'/'.self::news_file : '').$e['link'];
@@ -205 +209 @@
         /**
          * @arg $xpath_menu_selection  one of the horizontal_menu / sidebar_menu consts.
-         **/
-        function print_menu($xpath_menu_selection) {
+         * @arg $host Instance of t29Host which can be used for link rewriting if given.
+         **/
+        function print_menu($xpath_menu_selection, $host=null) {
                 if($this->xml_is_defective()) {
                         print "The Menu file is broken.";
@@ -254 +259 @@
                                 $uld->parentNode->removeChild($uld);
                         }
+                }
+                
+                // alle Links mittels t29Host umwandeln (idR .php-Endung entfernen),
+                // falls erwuenscht
+                if($host) {
+                        $links = $xml->xpath("//a[@href]");
+                        foreach($links as $a)
+                                $a['href'] = $host->rewrite_link($a['href']);
                 }
         

lib/messages.php

@@ -146 +146 @@
                 'head-rel-prev'          => array('Zur vorherigen Seite (%s)', 'Previous Page (%s)'),
                 'head-rel-next'          => array('Zur folgenden Seite (%s)', 'Next Page (%s)'),
-                'head-rel-interlang'     => array('Deutsche Version dieser Seite (%s)', 'English Version of this page (%s)'),
+                 //'head-rel-interlang'     => array('Deutsche Version dieser Seite (%s)', 'English Version of this page (%s)'),
                 
                 // used in /shared/js/modules/heading_links.js
@@ -160 +160 @@
                 'js-piwik-url-prefix' => '/logs/piwik/',
                 'js-piwik-siteid' => '1',
+                
+                // interlang.js
+                'js-interlang-notify-heading' => array("This page is also avaliable in English", "Diese Website gibt es auch auf Deutsch"),
+                'js-interlang-notify-text' => array("Do you want to switch to the English version <i>%s</i>?", "Möchtest du die deutschsprachige Seite <i>%s</i> lesen?"),
         );
 }

lib/search.php

@@ -7 +7 @@
 
         function page_handler() {
-                if(!isset($_GET['action']))
+                if(!isset($_GET['action'])) {
+                        // This is an "ordinary" page call.
+                        // do some organisation stuff and return.
+                        $this->setup_interlang();
                         return;
+                }
                 $action = $_GET['action'];
                 if(array_key_exists($action, self::$actions)) {
@@ -40 +44 @@
                 exit;
         }
+        
+        /**
+         * Since the search isn't denoted in the navigation.xml, the interlanguage
+         * system doesn't work. This method fixes that by talking with t29Template.
+         * This must be done after including technikum29.php.
+         **/
+        function setup_interlang() {
+                $GLOBALS['template_callback'] = function($template) {
+                        // Interlanguage Links: Defakto nicht cachebar da das Cachesystem fuer dynamische Seiten
+                        // den header/footer cacht und damit auch die Interlang-Eintraege. Links wie
+                        // "/de/suche.php"+$_SERVER['QUERY_STRING'] funktionieren daher nicht dynamisch,
+                        // da der Head ja gecacht wird. Ist ein nicht so wichtiges FIXME.
+                        $template->set_interlang_link("de", "/de/suche.php", "Suche");
+                        $template->set_interlang_link("en", "/en/search.php", "Search");
+                };
+        }
+        
+        function google_search_snippet() {
+        ?>
+        <script>
+                (function() {
+                var cx = '010117769997860607363:ovbd9zjaaps';
+                var gcse = document.createElement('script');
+                gcse.type = 'text/javascript';
+                gcse.async = true;
+                gcse.src = (document.location.protocol == 'https' ? 'https:' : 'http:') +
+                        '//www.google.com/cse/cse.js?cx=' + cx;
+                var s = document.getElementsByTagName('script')[0];
+                s.parentNode.insertBefore(gcse, s);
+                })();
+        </script>
+        <gcse:search></gcse:search>
+        <?php
+        }
 }

lib/template.php

@@ -1 +1 @@
 <?php
 /**
- * technikum29v6 Page Template
+ * technikum29v6 Page Template.
+ * Initially written 08.01.2012, Sven Koeppel
+ *
+ * This file contains the t29v6 HTML5 template (header, footer, structure, ...).
  *
  * Global vars:
@@ -18 +21 @@
         public $log; // lightweight logging system
 
+        /**
+         * The t29Template constructor.
+         *
+         * The template class is embedded into the t29v6 class framework. It
+         * uses t29Log for logging, t29Messages for any localisation strings,
+         * t29RessourceLoader for resolving URLs for CSS and JavaScript ressources.
+         * t29Menu is a helper class considered for parsing and extracting
+         * any relations between pages and the menu from navigation.xml.
+         *
+         * From the t29v6 entrypoint, technikum29.php, this class is instanced
+         * at the end, if no caching has worked. That call looks like
+         *
+         *   $template = new t29Template($GLOBALS);
+         *
+         * which means that our configuration $this->conf will be set up from the
+         * former global namespace. For correct working, at least some global vars
+         * like
+         *   $lib
+         *   $lang
+         *   $host
+         *   ...
+         * are considered as present (see above for a list).
+         *
+         **/
         function __construct($conf_array) {
                 $this->conf = $conf_array;
@@ -24 +51 @@
                 require_once $this->conf['lib'].'/logging.php';
                 $this->log = t29Log::get();
-
+                
                 // create a menu:
                 require_once $this->conf['lib'].'/menu.php';
@@ -40 +67 @@
 
                 // fill up configuration
-
+                
                 // optional html headers which can be filled by hooks or parts
                 if(!isset($this->conf['header_prepend']))
                         $this->conf['header_prepend'] = array(); // list
 
-                // as t29Host for configuration fillup fillup
+                // ask t29Host for configuration fillup
                 $this->conf['host']->fillup_template_conf($this->conf);
                 
@@ -79 +106 @@
                         $this->javascript_config[$key] = $this->conf[$key];
                 
-                // get all kind of relations
+                // get all kind of relations. Pages can afterwards be overwritten with t29Template
+                // methods (see below).
                 $this->page_relations = $this->menu->get_page_relations();
                 $this->interlang_links = $this->menu->get_interlanguage_link();
@@ -100 +128 @@
                         $this->conf['html_title'] = $this->conf['seiten_link'] . ' - ';
                 $this->conf['html_title'] .= $this->msg->_('html-title');
+                
+                // Unfortunately mostly a t29Template instance won't be visible to a page
+                // handled by technikum29.php. Therefore there is this small "future" trick:
+                if(isset($this->conf['template_callback']))
+                        $this->conf['template_callback']($this);
+                // Now you can use code like
+                // $template_callback = function($template) {
+                //    $template->set_page_relation("next", "/de/example", "foo");
+                //    $template->menu->... read and modify anything ... etc
+                // }
+                // so the callback function is called at the end of the template constructor.
+                // This can be considered whenever giving a static configuration variables
+                // is not enough.
+        }
+        
+        /**
+         * Overwrite the page relations given by the t29Menu.
+         * By setting $relation to "prev" or "next", you can overwrite the
+         * relations which has been set up by construction by $this->menu->get_page_relations().
+         * Thus any page can state any relations. For sure they are only one-directional,
+         * the other pages don't know anything about such relations because no vice-versa
+         * introspection can be done.
+         **/
+        function set_page_relation($relation, $href, $label) {
+                // good values for $relation are: "prev", "next".
+                // Link is composed as <a href="$href">$label</a>.
+                $this->page_relations[$relation] = t29Menu::dom_new_link($href, $label);
+                print_r($this->page_relations);
+        }
+
+        /**
+         * Overwrite the interlanguage link list given by the t29Menu.
+         * This does the same as set_page_relation() only for interlanguage links.
+         **/
+        function set_interlang_link($lang, $href, $label) {
+                // good values for $lang are: "de", "en".
+                // Link is composed as <a href="$href">$label</a>.
+                $this->interlang_links[$lang] = t29Menu::dom_new_link($href, $label);
         }
         
@@ -133 +199 @@
 
         function print_header() {
-                $p = $this->msg->get_shorthand_printer();
-                $_ = $this->msg->get_shorthand_returner();
+                $p = $this->msg->get_shorthand_printer(); // t29Messages gettext printer
+                $_ = $this->msg->get_shorthand_returner(); // t29Messages gettext
+                $href = $this->conf['host']->get_shorthand_link_returner(); // t29Host link rewriter
 ?>
 <!doctype html>
@@ -141 +208 @@
   <meta charset="utf-8">
   <title><?php echo $this->conf['html_title']; ?></title>
-  <meta name="description" content="Produziert am 08.01.2012">
   <meta name="author" content="technikum29-Team">
   <meta name="generator" content="<?php print $this->conf['host']; ?>">
@@ -155 +221 @@
   
   <?php
-        foreach(array_merge(array("first" => t29Menu::dom_new_link($this->conf['lang_path'], $_('head-rel-first'))),
-          $this->page_relations) as $rel => $a) {
+        foreach(array_merge(
+                array("first" => t29Menu::dom_new_link($this->conf['lang_path'], $_('head-rel-first'))),
+                $this->page_relations
+        ) as $rel => $a) {
                 if($rel == 'start') continue; // not in standard
                 printf("\n  <link rel='%s' href='%s' title='%s' />",
-                        $rel, $a['href'], sprintf($_('head-rel-'.$rel), $this->relational_link_to_string($a))
+                        $rel, $href($a['href']), sprintf($_('head-rel-'.$rel), $this->relational_link_to_string($a))
                 );
         }
   ?>
   
-  <link rel="copyright" href="<?php $p('footer-legal-file'); ?>" title="<?php $p('footer-legal-link'); ?>">
-  <link rel="search" type="application/opensearchdescription+xml" href="<?php $p('topnav-search-page'); print '?action=opensearch-desc&amp;lang='.$this->conf['lang']; ?>" title="<?php $p('opensearch-desc'); ?>">
+  <link rel="copyright" href="<?php $href($p('footer-legal-file')); ?>" title="<?php $href($p('footer-legal-link')); ?>">
+  <link rel="search" type="application/opensearchdescription+xml" href="<?php $href($p('topnav-search-page')); print '?action=opensearch-desc&amp;lang='.$this->conf['lang']; ?>" title="<?php $p('opensearch-desc'); ?>">
   <?php
         // print interlanguage links for all languages except the active one
@@ -171 +239 @@
                 if($lang != $this->conf['lang'] && !is_null($a)) {
                         printf('<link rel="alternate" href="%s" hreflang="%s" title="%s">',
-                                $a['href'], $lang, sprintf($_('head-rel-interlang', $lang), $a)
+                                $href($a['href']), $lang, $this->relational_link_to_string($a)
                         );
                 }
@@ -190 +258 @@
         <div id="background-color-container"><!-- helper -->
         <section class="main content" role="main" id="content">
-                <?php 
-                        if(!$this->log->is_empty()) {
-                                print '<div class="errorpane">';
-                                $this->log->print_all();
-                                print '</div>';
-                        }
+                <ul class="messages panel <?php if($this->log->is_empty()) echo 'empty'; ?> nolist">
+                <?php
+                        // This prints out error messages collected by the log only until this point
+                        $this->log->print_all();
+                        // All log entries generated until final processing will be flushed out at the
+                        // end; a userspace javascript helper will then move them here.
                 ?>
+                </ul>   
                 <!--<header class="teaser">
                         <h2 id="pdp8L">Wissenschaftliche Rechner und Minicomputer</h2>
@@ -206 +275 @@
 
         function print_footer() {
-                $p = $this->msg->get_shorthand_printer();
-                $_ = $this->msg->get_shorthand_returner();
+                $p = $this->msg->get_shorthand_printer(); // t29Messages gettext printer
+                $_ = $this->msg->get_shorthand_returner(); // t29Messages gettext
+                $href = $this->conf['host']->get_shorthand_link_returner(); // t29Host link rewriter
+                
         ?>
         <!-- end content -->
@@ -215 +286 @@
                         <h2 class="visuallyhidden"><?php $p("sidebar-h2-tour"); ?></h2>
                         <nav class="side">
-                                <?php $this->menu->print_menu(t29Menu::sidebar_menu); ?>
+                                <?php $this->menu->print_menu(t29Menu::sidebar_menu, $this->conf['host']); ?>
                         </nav>
                         <!-- menu changing buttons are made with javascript -->
@@ -227 +298 @@
                 <h2 class="visuallyhidden"><?php $p("sidebar-h2-mainnav"); ?></h2>
                 <nav class="horizontal">
-                        <?php $this->menu->print_menu(t29Menu::horizontal_menu); ?>
+                        <?php $this->menu->print_menu(t29Menu::horizontal_menu, $this->conf['host']); ?>
                 </nav>
                 <nav class="top">
@@ -250 +321 @@
                                                 printf("\t\t\t\t<li%s><a href='%s' title='%s'>%s</a></li>\n",
                                                         (empty($class) ? '' : " class='$class'"),
-                                                        $a['href'], htmlspecialchars($title),
+                                                        $href($a['href']), htmlspecialchars($title),
                                                         $this->conf['languages'][$lang][0] // verbose language name
                                                 );
@@ -256 +327 @@
                                 ?>
                         </ul>
-                        <form method="get" action="<?php $p('topnav-search-page'); ?>">
+                        <form method="get" action="<?php $href($p('topnav-search-page')); ?>">
                                 <span class="no-js"><?php $p('topnav-search-label'); ?>:</span>
                                 <input type="text" value="" data-defaultvalue="<?php $p('topnav-search-label'); ?>" name="q" class="text">
@@ -265 +336 @@
         <hr>
         <?php
-                // only print menu when in sidebar where it applies
-                $print_footer_menu = ($this->conf['seite_in_nav'] == 'side');
+                // only print menu when in sidebar where it applies.
+                // it can also be forced with a global setting $force_footer_menu = 1
+                $print_footer_menu = ($this->conf['seite_in_nav'] == 'side') || isset($this->conf['force_footer_menu']);
         ?>
     <footer class="in-sheet <? if(!$print_footer_menu) print "empty-footer"; ?>">
@@ -278 +350 @@
                                 foreach($this->page_relations as $rel => $a) {
                                         printf("\t<li class='%s'><a href='%s' title='%s'>%s <strong>%s</strong></a>\n",
-                                                $rel, $a['href'], sprintf($_('head-rel-'.$rel), $this->relational_link_to_string($a)),
+                                                $rel, $href($a['href']), sprintf($_('head-rel-'.$rel), $this->relational_link_to_string($a)),
                                                 $_('nav-rel-'.$rel), $this->relational_link_to_string($a)
                                         );
@@ -295 +367 @@
         <ul class="clearfix">
         <li class="logo">
-                <a href="<?php $p('footer-legal-file'); ?>" class="img" title="technikum29 Logo">Logo</a>
+                <a href="<?php $href($p('footer-legal-file')); ?>" class="img" title="technikum29 Logo">Logo</a>
                 <p><?php $p('footer-copyright-tag'); ?>
-                   <br><?php printf('<a href="%s">%s</a>', $_('footer-legal-file'), $_('footer-legal-link')); ?>
+                   <br><?php printf('<a href="%s">%s</a>', $href($_('footer-legal-file')), $_('footer-legal-link')); ?>
                 </p>
         </li>
         <li class="copy">
-                <a href="<?php $p('footer-legal-file'); ?>#image-copyright" class="img">CC</a>
-                <p>Viele Bilder können unter einer <a href="<?php $p('footer-legal-file'); ?>#image-copyright">CreativeCommons-Lizenz</a>
-                   verwendet werden. <a href="<?php $p('footer-legal-file'); ?>#image-copyright">Erkundigen Sie sich</a>.</p>
+                <a href="<?php $href($p('footer-legal-file')); ?>#image-copyright" class="img">CC</a>
+                <p>Viele Bilder können unter einer <a href="<?php $href($p('footer-legal-file')); ?>#image-copyright">CreativeCommons-Lizenz</a>
+                   verwendet werden. <a href="<?php $href($p('footer-legal-file')); ?>#image-copyright">Erkundigen Sie sich</a>.</p>
         </li>
         </ul>
         -->
+        <?php
+                // pending log messages
+                if(!$this->log->is_empty()) {
+                        echo '<ul class="messages footer nolist">';
+                        $this->log->print_all();
+                        echo '</ul>';
+                }
+        ?>
   </footer>
 </div><!-- end of div id="footer-background-container" helper -->

shared/css-v6/modules/01-boilerplate.css

@@ -102 +102 @@
 ul, ol { margin: 1em 0; padding: 0 0 0 40px; }
 dd { margin: 0 0 0 40px; }
-nav ul, nav ol, footer ul, footer ol { list-style: none; list-style-image: none; margin: 0; padding: 0; }
+nav ul, nav ol, footer ul, footer ol, #content ul.nolist, #content ol.nolist {
+  list-style: none; list-style-image: none; margin: 0; padding: 0; }
 
 

shared/css-v6/modules/11-header.css

@@ -176 +176 @@
 nav.top form {
         /* Suche, solange sie noch nicht fertig ist, ausblenden. */
-        display: none;
+        /*display: none;*/ /* Online gegangen im Maerz 2013 */
 }
 

shared/css-v6/modules/18-content.css

@@ -8 +8 @@
  *              Blockdesign, etc.
  *
+ *   .messages = Logging, zentralisiert (siehe logging.php, template.php und log.js)
  **/
 
@@ -64 +65 @@
         color: #882224;
 }
+
+/**
+ *  Logging
+ **/
+
+.messages.panel.empty {
+        /* Hide empty message boxes */
+        display: none;
+}
+
+.messages.panel { margin-bottom: 20px; }
+
+.messages.panel li {
+        margin-bottom: 5px;
+        background-color: #FCF8E3;
+        border: 1px solid #FBEED5;
+        border-radius: 4px 4px 4px 4px;
+        margin-bottom: 20px;
+        padding: 8px 35px 8px 14px;
+        text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+}
+
+.messages.panel p { margin: 2px 0; }
+.messages.panel button.close {
+        float: right;
+}
+
+.messages.footer {
+        /* sollte eigentlich gar nicht dargestellt werden, sondern von log.js
+           in den .messages.panel-Bereich verschoben werden. */
+        opacity: .8;
+}

shared/css-v6/modules/22-v5blocks.css

@@ -26 +26 @@
 
 
-#content td, #content table, #content tr {
+#content table.t29-details td,
+#content table.t29-details,
+#content table.t29-details tr {
     font: 12px Verdana;
 }
 
-#content table {
+#content table.t29-details {
     border-spacing: 1px;
     border-collapse: separate;
 }
 
-#content table p {
+#content table.t29-details p {
     text-align: justify;
     line-height: 120%;
 }
 
-#content table p.center {
+#content table.t29-details p.center {
     margin: 5px 0px;
     text-align: center;
 }
 
-#content td b {
+#content table.t29-details td b {
     display: block;
 }
 
-#content td.b, #content td.b a {
+#content table.t29-details td.b, #content table.t29-details td.b a {
     font-weight: bold;
 }
 
-#content table {
+#content table.t29-details {
     background-color: #7090C0;
 }
 
-#content td {
+#content table.t29-details td {
     padding: 2px;
     vertical-align: middle;
@@ -64 +66 @@
 }
 
-#content th {
+#content table.t29-details th {
     padding: 2px;
     text-align: center;
@@ -70 +72 @@
 }
 
-#content .bemerkungen {
+#content table.t29-details .bemerkungen {
     vertical-align: middle;
     text-align: justify;

shared/js-v6/modules/log.js

@@ -1 +1 @@
 /**
- * Logging functions, basics provided by HTML5 Boilerplate
+ * t29v6 Logging subsystem
+ * 
+ * Logging on client side is splitted in two parts:
+ *   1. Javascript console.log calls which won't offend the user
+ *   2. the t29.log class to notify the user.
+ * 
+ * Considering console.log, the code is borrowed by HTML5 Boilerplate
+ * 
  *
  **/
@@ -20 +27 @@
 {console.log();return window.console;}catch(err){return window.console={};}})());
 
+
+if(!t29) window.t29 = {}; // the t29 namespace
+t29.log = {}; // the t29.log namespace
+
+t29.log.setup = function() {
+        // setup our spaces
+        t29.log.$panel = $(".messages.panel");
+        t29.log.$end = $(".messages.footer");
+        
+        // find end messages and push them to the first
+        if((end_li = t29.log.$end.find("li")).length) {
+                end_li.appendTo(t29.log.$panel);
+                t29.log.$end.hide(); // hide bottom panel
+                t29.log.$panel.removeClass("empty"); // show top panel
+        }
+        
+        // setup some functions
+        levels = ["emerg", "alert", "crit", "error", "warn", "notice", "info"];
+        $.each(levels, function() {
+                level = this;
+                t29.log[level] = function(msg) { t29.log.append(level, msg) }
+        });
+}
+
+t29.log.append = function(level, msg) {
+        // tell the panel that it's now not empty (thus it will become CSS visible)
+        t29.log.$panel.removeClass("empty");
+        
+        if(jQuery.type(msg) == "string")
+                s = msg;
+        else {
+                s = "";
+                if(msg.dismissable) s += "<button class='close'>&times;</button>";
+                if(msg.heading) s += "<h5>"+msg.heading+"</h5>";
+                if(msg.text) s += "<p>"+msg.text+"</p>";
+        }
+        infoelement = $("<li>", {"class": level}).html(s).hide().appendTo(t29.log.$panel).slideDown();
+        
+        // fill eventual close button with action
+        $(infoelement).find("button.close").click(function(){
+                $(this).closest("li").slideUp();
+        });
+}

shared/js-v6/modules/startup.js

@@ -20 +20 @@
         'img_license',
         'lightbox',
+        'log',
 
         // ganz am anfang
         'prefs',
+        
+        // needs log, t29msg
+        'interlang',
 
         // needs prefs