Changeset 700 in t29-www for en

Timestamp:

Dec 30, 2014, 9:09:50 AM (8 years ago)

Author:

heribert

Message:

mal schauen, ob´s funktioniert

Location:

en

Files:

• navigation.xml (modified) (1 diff)
• news.php (modified) (2 diffs)

en/navigation.xml

@@ -15 +15 @@
 <ul class="u1">
         <li><a seiten_id="startseite" href="/en/">Start</a></li>
-        <li class="has-submenu"><a seiten_id="news" href="/en/news.php">News</a>
-                <ul class="u2 rich-text">
+        <li><a seiten_id="news" href="/en/news.php">News</a>
+                <ul class="u2 rich-text hidden">
                         <!-- magic comment (do not replace): -->
                         <!--# INSERT_NEWS #-->

en/news.php

@@ -5 +5 @@
         $menu_version = 2;
 
-        $neues_menu = <<< MENU
-        
-- datum: July 2014
-  titel: "Historic workshop device"
-  text: "<em>A historic 5-bit character decoder</em> from the university. Here it is used as a decryption engine in our experimental workshop."
-  bild: /shared/photos/kommunikationstechnik/telegrafenalphabet.jpg
-  link: /en/communication/fax.php#decoder
-
-- datum: June 2014
-  titel: "Art installation with cards"
-  text:  "Our Cardpunch IBM029 were on jorney: For some time, it were part of an art installation in Tübingen (Baden-Wüttemberg, near Stuttgart)."
-  bild: /shared/photos/rechnertechnik/tuebingen.jpg
-  link: http://www.kunst-stoff.fr/tresorraum/wir-die-iborgs/
-
-- datum: May 2014
-  titel: "Facit papertape device"
-  untertitel: "IBM1130"
-  text: "Periphery of the 1130: Facit tape devices"
-  bild: /shared/photos/rechnertechnik/facit4000.jpg
-  link: /en/computer/ibm1130.php#1130
-
-- datum: January 2014
-  titel: "IBM 1130"
-  text: "A new callenge: IBM 1130 Mainframe"
-  bild: /shared/photos/rechnertechnik/ibm-1130.jpg
-  link: /en/computer/ibm1130.php#ibm1130
-
-- datum: December 2013
-  titel: Reproducing punch
-  untertitel: A new IBM device
-  text: "Recruit: A large IBM reproducing punch from the early days of computing"
-  bild: /shared/photos/rechnertechnik/ibm-514.jpg
-  link: /en/computer/punchcard.php#reproducing
-
-- datum: September 2013
-  titel: "Gamma 55 is up und running"
-  text: "Success! The BULL GAMMA 55 is up and running! An historical moment."
-  bild: /shared/photos/rechnertechnik/leser617.jpg
-  link: /en/computer/gamma55.php#ge-55
-
-MENU;
-// ende der menue-Eintraege
-
+        // muss noch entfernt werden:
+        $neues_menu = "";
         if(!require("../lib/news.php")) return;
 ?>
@@ -56 +15 @@
        posts are on top.</p>
 
-<!--
-  ACHTUNG, Testlauf im ENGLISCHEN:
-
-  Der Inhalt der Neuigkeiten-Datei im englischen ist nun nicht mehr "doppelt-gemoppelt", sondern
-  wird nur noch einmal gewartet, und zwar in dem obigen Auflistungsbereich. Im Bereich hier unten
-  wird der obige Inhalt nur noch in die gewohnte HTML-Formatierung gebracht.
-
-  - Sven, 28. August 2014
--->
-
-<ul class="news-feed news-ng">
-        <?php /* soll funktion werden in news.php */
-//function print_newsfeed() {
-//      global $neues_menu, $lib;
-        require $lib.'/spyc.php';
-        $data = Spyc::YAMLLoad($neues_menu);
-        $fields = array('titel', 'datum', 'text');
-
-        $news_ul_content = '';
-        foreach($data as $e) {
-                if(!array_reduce(array_map(function($x) use ($fields,$e){ return isset($e[$x]); }, $fields),
-                                function($a,$b){ return $a && $b;}, true)) {
-                        print "<li><a href='#'>Fehler in Formatierung!<em>Dieser Menüeintrag ist falsch formatiert</em></a></li>";
-                        $this->log->WARN("<h5>Neuigkeiten-Liste: Fehler in Formatierung</h5><p>Ein Eintrag in der Neuigkeisten-Liste ist falsch formatiert. Ich erwarte zu jedem Menüeintrag die Felder ".implode(", ", $fields).". Eine der Angaben fehlt oder ist fehlerhaft formatiert: <pre>".var_export($e, true)."</pre>");
-                } else {
-                        ?><li><a href="<?php print isset($e['link']) ? $e['link'] : '#'; ?>">
-                                <h3><?php print $e['datum']; ?></h3>
-                                <?php print isset($e['bild']) ? "<img src='$e[bild]' alt='$e[titel]'>" : ''; ?>
-                                <?php print $e['text']; ?>
-                        </a></li>
-                        <?php
-                }
-        }
-//}
-
-
-//       print_newsfeed(); 
-?>
+           <ul class="news-feed news-ng">
+        <li><a href="/en/communication/fax.php#decoder">
+                                <h3>July 2014</h3>
+                                <img src='/shared/photos/kommunikationstechnik/telegrafenalphabet.jpg' alt='Historic workshop device'>                          <em>A historic 5-bit character decoder</em> from the university. Here it is used as a decryption engine in our experimental workshop.                   </a></li>
+                        <li><a href="http://www.kunst-stoff.fr/tresorraum/wir-die-iborgs/">
+                                <h3>June 2014</h3>
+                                <img src='/shared/photos/rechnertechnik/tuebingen.jpg' alt='Art installation with cards'>                               Our Cardpunch IBM029 were on jorney: For some time, it were part of an art installation in Tübingen (Baden-Wüttemberg, near Stuttgart).                 </a></li>
+                        <li><a href="/en/computer/ibm1130.php#1130">
+                                <h3>May 2014</h3>
+                                <img src='/shared/photos/rechnertechnik/facit4000.jpg' alt='Facit papertape device'>                            Periphery of the 1130: Facit tape devices                       </a></li>
+                        <li><a href="/en/computer/ibm1130.php#ibm1130">
+                                <h3>January 2014</h3>
+                                <img src='/shared/photos/rechnertechnik/ibm-1130.jpg' alt='IBM 1130'>                           A new callenge: IBM 1130 Mainframe                      </a></li>
+                        <li><a href="/en/computer/punchcard.php#reproducing">
+                                <h3>December 2013</h3>
+                                <img src='/shared/photos/rechnertechnik/ibm-514.jpg' alt='Reproducing punch'>                           Recruit: A large IBM reproducing punch from the early days of computing                 </a></li>
+                        <li><a href="/en/computer/gamma55.php#ge-55">
+                                <h3>September 2013</h3>
+                                <img src='/shared/photos/rechnertechnik/leser617.jpg' alt='Gamma 55 is up und running'>                         Success! The BULL GAMMA 55 is up and running! An historical moment.                     </a></li>
+                        </ul>
 </ul>