[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    www/international/germany/inc/navigation
From:       Mark Ziegler <mark.ziegler () rakekniven ! de>
Date:       2007-08-20 18:36:45
Message-ID: 1187635005.894016.2816.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 702505 by mvolkert:

Big changes for using Capacity now!
Don't wonder about the many commits. All in one is not possible. I get errors, so I \
try to split it.

 M  +8 -12     nachrichten.inc  
 M  +27 -42    nachrichten_rechts.inc  


--- trunk/www/international/germany/inc/navigation/nachrichten.inc #702504:702505
@@ -1,18 +1,14 @@
 <!-- Beginn KDE-Nachrichten -->
-      <table class="linksbox">
-        <tr><th>KDE Nachrichten</th></tr>
-        <tr>
-          <td>
-            <a href="nachrichten.php">Aktuelle Nachrichten</a><br />
-            <a href="nachrichtenvorschlag2.php">Nachrichtenvorschlag</a><br />
-            <a href="<?php echo $dir;?>appmonth/2007/kdesvn/index.php">kdesvn</a><br \
                />
-            <a href="http://dot.kde.org" target="_blank">dot.kde.org</a>
-          </td>
-        </tr>
-      </table>
+<?php
+  $section =& $this->appendSection("KDE Nachrichten");
+  $section->appendLink("Aktuelle Nachrichten","/nachrichten/nachrichten.php");
+  $section->appendLink("Nachrichtenvorschlag","/nachrichten/nachrichtenvorschlag.php");
 +  $section->appendLink("kdesvn","/appmonth/2007/kdesvn/index.php");
+  $section->appendLink("dot.kde.org","http://dot.kde.org", false);
+?>
 <!-- Ende KDE-Nachrichten -->
 
 
 <!-- Hauptnavigation einbinden -->
-<?php include "$dir/inc/navigation/links.inc"; ?>
+<?php //include "$site_root/inc/navigation/links.inc"; ?>
 <!-- Hauptnavigation einbinden -->
--- trunk/www/international/germany/inc/navigation/nachrichten_rechts.inc \
#702504:702505 @@ -1,22 +1,9 @@
-      <!-- Beginn KDE-Newsletter -->
-      <table class="linksbox">
-        <tr><th>KDE Newsletter</th></tr>
-        <tr>
-          <td>
-            <?php include "$dir/inc/newsletter.inc"; ?>
-          </td>
-        </tr>
-      </table>
-      <!-- Ende KDE-Newsletter -->
+<?php
+  $section =& $this->appendSection("KDE Newsletter");
+  $section->appendLink("Abonnieren","nachrichten/newsletter-subscribe.php");
+?>
 
-
-      <!-- Beginn Nachrichten-Archiv -->
-      <table class="linksbox">
-        <tr><th>Nachrichten Archiv</th></tr>
-        <tr>
-          <td>
 	<?php
-	function buildArchiveLinks() {
 	// Determine name of currently used archive file, we don't want that one
 	// to show up in the archive.
 	$curQuarter = round((date("n") / 4) + 1);
@@ -41,34 +28,32 @@
 		ksort($files);
 		$files = array_reverse($files, TRUE);
 
-		// Now, print the links: for each year, print a little header, then
+		// Now, print the links: for each year, print section header, then
 		// a link for each quarter in the year.
 		foreach ($files as $year => $quarters) {
-  		echo "<p>";
-			echo "<span style=\"color:#000000;font-weight:normal;\">Archiv $year</span><br \
                />\n";
-			foreach ($quarters as $quarter)
-				echo "<a href=\"nachrichten.php?year=$year&amp;quarter=$quarter\">$quarter. \
                Quartal</a><br/>\n";
-      echo "</p>\n";
+			$section =& $this->appendSection("Archiv $year");
+
+			foreach ($quarters as $quarter) {
+			  $section->appendLink("$quarter.Quartal","nachrichten/nachrichten.php?year=$year&amp;quarter=$quarter");
 +
+			}
 		}
 		closedir($dir);
 		}
-	}
-	buildArchiveLinks();
 	?>
-	
-	<p>
-  <span style="color:#000000;font-weight:normal;">Archiv 2000</span><br />
-	<a href="2000_01.html">Januar 2000</a><br />
-	<a href="2000_02.html">Februar 2000</a><br />
-	<a href="2000_03.html">März 2000</a><br />
-	<a href="2000_04.html">April 2000</a><br />
-	<a href="2000_05.html">Mai 2000</a><br />
-	<a href="2000_06.html">Juni 2000</a><br />
-	<a href="2000_07.html">Juli 2000</a><br />
-	<a href="2000_08.html">August 2000</a><br />
-	<a href="2000_09.html">September 2000</a><br />
-	</p>
-	       </td>
-        </tr>
-      </table>
-      <!-- Ende Nachrichten-Archiv -->
+
+<?php
+	//	Old stuff
+  $section =& $this->appendSection("Archiv 2000");
+  $section->appendLink("Januar 2000","/nachrichten/2000_01.html");
+  $section->appendLink("Februar 2000","/nachrichten/2000_02.html");
+  $section->appendLink("März 2000","/nachrichten/2000_03.html");
+  $section->appendLink("April 2000","/nachrichten/2000_04.html");
+  $section->appendLink("Mai 2000","/nachrichten/2000_05.html");
+  $section->appendLink("Juni 2000","/nachrichten/2000_06.html");
+  $section->appendLink("Juli 2000","/nachrichten/2000_07.html");
+  $section->appendLink("August 2000","/nachrichten/2000_08.html");
+  $section->appendLink("September 2000","/nachrichten/2000_09.html");
+?>
+
+<!-- Ende Nachrichten-Archiv -->


[prev in list] [next in list] [prev in thread] [next in thread]