Changeset 350 in t29-www

Timestamp:

Mar 6, 2013, 5:42:27 AM (10 years ago)

Author:

sven

Message:

• Eintrag "Pianola" unter Lernprojekten geht jetzt auch auf Geraete-Extraseite "Funktionserklaerung" statt auf Lernprojekt
• Halbe Implementierung von durch linkspezifische Attribute seitenweise ein/ausstellbare Relationsnavigationssichtbarkeit, Ticket #6.

Files:

• de/lernprojekte/index.php (modified) (1 diff)
• lib/menu.php (modified) (4 diffs)
• lib/template.php (modified) (2 diffs)

de/lernprojekte/index.php

@@ -57 +57 @@
 
 <table>
-<tr><th><a href="pianola">Pianola</a>          <td>Funktionserklärung und Entwurf einer Präsentation
+<tr><th><a href="/de/geraete/pianola-funktionserklaerung/">Pianola</a>          <td>Funktionserklärung und Entwurf einer Präsentation
 <tr><th><a href="schach">Schach</a>            <td>Anleitung für ein Schachspiel gegen den PDP 8 Computer mit 8KB Arbeitsspeicher (freier Zugriff, kein Passwort erforderlich)
 <tr><th><a href="speichermedien">Speichermedien</a>   <td>Entwurf einer Präsentation über historische Speichermedien

lib/menu.php

@@ -114 +114 @@
                         return null;
                 }
-                if(!$seiten_id) $seiten_id = $this->conf['seiten_id'];
+                if(!$seiten_id) $seiten_id = $this->conf['seiten_id'];
                 // convenience: If you found your link already.
                 if($seiten_id instanceof SimpleXMLElement) return $seiten_id;
@@ -153 +153 @@
                 $parent_ul = array_pop($ul);
                 return explode(' ',$parent_ul['class']);
+        }
+        
+        /**
+         * Extracts a list of (CSS) classes the link has,
+         * e.g. <a class="foo bar"> gives array("foo","basr").
+         * @returns array or empty array in case of error
+         **/
+        function get_link_classes($seiten_id=false) {
+                $link = $this->get_link($seiten_id);
+                print "link:"; var_dump($this->xml);
+                if(!$link) return array();
+                var_dump($link); exit;
+                return isset($link['class']) ? explode(' ',$link['class']) : array();
         }
 
@@ -216 +229 @@
         ///////////////////// MENU ACTIVE LINK DETECTION
         /**
+         * print_menu is the central method in this class. It converts the $this->xml
+         * XML tree to valid HTML with all enrichments for appropriate CSS styling.
+         * It also removes all 'seiten_id' attributes.
+         * This method does *not* clone the structure, so this instance won't produce
+         * the same results any more after print_menu invocation! This especially will
+         * affect get_link().
+         *
          * @arg $xpath_menu_selection  one of the horizontal_menu / sidebar_menu consts.
          * @arg $host Instance of t29Host which can be used for link rewriting if given.
+         * @returns nothing, since the output is printed out
          **/
         function print_menu($xpath_menu_selection, $host=null) {
@@ -234 +255 @@
                 }
                 $xml = $xml[0]; // just take the first result (should only one result be present)
+                
+                /*
+                // work on a deep copy of the data. Thus this method won't make the overall
+                // class useless.
+                $dom = dom_import_simplexml($xml);
+                $xml = simplexml_import_dom($dom->cloneNode(true));
+                */
 
                 // aktuelle Seite anmarkern und Hierarchie hochgehen

lib/template.php

@@ -339 +339 @@
                 // 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']);
+                
+                /*
+                // print next or prev entry when the current page has a
+                // "show-rel-next" or "show-rel-prev" class entry
+                $current_link_classes = $this->menu->get_link_classes();
+                print_r($current_link_classes); exit;
+                $show_rel_next = in_array('show-rel-next', $current_link_classes);
+                $show_rel_prev = in_array('show-rel-prev', $current_link_classes);
+                */
         ?>
     <footer class="in-sheet <? if(!$print_footer_menu) print "empty-footer"; ?>">
@@ -347 +356 @@
                 <ul>
                         <?php
-                          if($print_footer_menu)
+                          if($print_footer_menu) //|| $show_rel_prev || $show_rel_next)
                                 foreach($this->page_relations as $rel => $a) {
-                                        printf("\t<li class='%s'><a href='%s' title='%s'>%s <strong>%s</strong></a>\n",
-                                                $rel, $href($a['href']), sprintf($_('head-rel-'.$rel), $this->relational_link_to_string($a)),
-                                                $_('nav-rel-'.$rel), $this->relational_link_to_string($a)
-                                        );
-                                }
+                                        /*
+                                        // only show the links wanted to be shown. Only relevant if
+                                        // the "show-rel-*"-magic is working.
+                                        if( $print_footer_menu
+                                            (!$print_footer_menu && $rel == "prev" && $show_rel_prev) ||
+                                            (!$print_footer_menu && $rel == "next" && $show_rel_next)) {
+                                        */
+                                                printf("\t<li class='%s'><a href='%s' title='%s'>%s <strong>%s</strong></a>\n",
+                                                        $rel, $href($a['href']), sprintf($_('head-rel-'.$rel), $this->relational_link_to_string($a)),
+                                                        $_('nav-rel-'.$rel), $this->relational_link_to_string($a)
+                                                );
+                                        //} // endif
+                                } // endfor
                         ?>
                 </ul>