nieuws: article lists in left layout with images

diff --git a/nieuws.inc.php b/nieuws.inc.php
index 454c91c023a9f457da5d3b735e4abb313d82495d..57c53fc9b57884d148b3fa4a1cba6a967daabbca 100644 (file)
--- a/nieuws.inc.php
+++ b/nieuws.inc.php
@@ -53,15 +53,22 @@ function shownewsarticle($url, $link = TRUE, $title = NULL)
 function shownews($input, $limit = 1000)
 {
        if (!is_array($input)) $input = glob("$input/*.html");
-       foreach (array_reverse($input) as $url) {
-               print "<article>";
+       print '<ul class="left">'."\n\n";
+       foreach (array_reverse($input) as $filename) {
+               $url = preg_replace('/\.html$/', '', $filename);
+               print '<li>';
+               if ($image = shownewsimage($url)) {
+                       printf('<img src="%s" class="left" />', "/thumb/300x/".$image);
+               }
+               print '<article>';
                ob_start();
-               include $url;
-               print shownewsarticle(preg_replace('/\.html$/', '', $url));
-               print "</article>\n\n";
+               include $filename;
+               print shownewsarticle($url);
+               print "</article></li>\n\n";
 
                if (--$limit <= 0) break;
        }
+       print "</ul>\n\n";
 }
 
 function printtoc($input)

diff --git a/nieuws/index.php b/nieuws/index.php
index d6a85e7f36d88c62e0291505fcde2dac18e6d7e8..cf57dbc0b4882d73c92b4157f33fa113e816d91e 100644 (file)
--- a/nieuws/index.php
+++ b/nieuws/index.php
@@ -26,9 +26,7 @@ if ($year) {
        }
 
        print "<h2>$title</h2>\n\n";
-       print '<div id="news">'."\n\n";
        shownews(glob($match.'*.html'));
-       print "</div>\n\n";
        return 1;
 }