minor bugfix, and move styles from templates to css

diff --git a/forum.pl b/forum.pl
index eb59bac95b3a584f611da61fe514294f603022b4..cdd51fec478d0ac40bb4047a133da8bb831b483e 100644 (file)
--- a/forum.pl
+++ b/forum.pl
@@ -121,9 +121,9 @@ GROUP BY fb.fbid,fb.board
        $BODY->param(Overview => 1);
        $categories->execute or $ERROR .= p($DBH->errstr);
 my $boards = $DBH->prepare(q{SELECT fb.fbid AS id,fb.board,count(NULLIF(COALESCE(fp.fpid::boolean,FALSE) AND COALESCE(fp.time > ftv.time,TRUE),FALSE)) AS unread
-FROM forum_boards fb NATURAL JOIN forum_access fa LEFT OUTER JOIN (forum_threads ft JOIN forum_posts fp USING (ftid)) ON fb.fbid = ft.fbid LEFT OUTER JOIN (SELECT * FROM forum_thread_visits WHERE uid = $2) ftv ON ftv.ftid = ft.ftid
-WHERE fb.fcid = $1 AND (gid = -1 OR gid IN (SELECT gid FROM groupmembers
-               WHERE uid = $2))
+FROM forum_boards fb LEFT OUTER JOIN (forum_threads ft JOIN forum_posts fp USING (ftid)) ON fb.fbid = ft.fbid LEFT OUTER JOIN (SELECT * FROM forum_thread_visits WHERE uid = $2) ftv ON ftv.ftid = ft.ftid
+WHERE fb.fcid = $1 AND 
+       fb.fbid IN (SELECT fbid FROM forum_access WHERE gid IN (SELECT groups($2)))
 GROUP BY fb.fbid, fb.board
 ORDER BY fb.fbid       });
        my @categories;

diff --git a/nd.css b/nd.css
index 6078b618b27624f02110996432cba9f072c9708b..4e031f1c56214d629d38397ea657c75ee79ea790 100644 (file)
--- a/nd.css
+++ b/nd.css
@@ -44,6 +44,12 @@ table.boards th {
 table.boards tr.even {
        background: white;
 }
+
+table.boards a {
+       text-decoration: none;
+       width: 100%;
+       display: block;
+}
 fieldset.forum-post {
        width: 40em;
 }
@@ -73,6 +79,8 @@ ul.linkbar li {
 }
 ul.linkbar a {
        text-decoration: none;
+       width: 100%;
+       display: block;
 }
 input.coordsinput {
        width: 4em;

diff --git a/templates/forum.tmpl b/templates/forum.tmpl
index b02811eac312844c4531f5554718dba90d8a6e5b..2d2d5fc896096573285a6d4ed1a38ebeb11c5c0d 100644 (file)
--- a/templates/forum.tmpl
+++ b/templates/forum.tmpl
@@ -11,7 +11,7 @@
        <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
                <td align="center"><TMPL_VAR NAME=Unread></td>
                <td align="center"><TMPL_VAR NAME=Posts></td>
-               <td><a style="width:100%;display:block;" href="<TMPL_VAR NAME=PAGE>?t=<TMPL_VAR NAME=Id>#NewPosts">&nbsp;<TMPL_VAR NAME=Subject>&nbsp;</a></td>
+               <td><a href="<TMPL_VAR NAME=PAGE>?t=<TMPL_VAR NAME=Id>#NewPosts">&nbsp;<TMPL_VAR NAME=Subject>&nbsp;</a></td>
        </tr>
 </TMPL_LOOP>
 </table>
@@ -38,7 +38,7 @@
        <TMPL_LOOP Boards>
        <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
                <td align="center"><TMPL_VAR NAME=Unread></td>
-               <td><a style="width:100%;display:block;" href="<TMPL_VAR NAME=PAGE>?b=<TMPL_VAR NAME=Id>"><TMPL_VAR NAME=Board></a></td>
+               <td><a href="<TMPL_VAR NAME=PAGE>?b=<TMPL_VAR NAME=Id>"><TMPL_VAR NAME=Board></a></td>
        </tr>
        </TMPL_LOOP>
 </TMPL_LOOP>