From a7b6200402e341e97472ec401eabe4cf49f1161c Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Fri, 21 May 2010 12:38:09 +0000
Subject: More info in views.

---
 forum/utils/forums.php  |  4 ++-
 forum/utils/threads.php | 11 +++++--
 forum/utils/view.php    | 86 +++++++++++++++++++++++++++----------------------
 3 files changed, 59 insertions(+), 42 deletions(-)

(limited to 'forum/utils')

diff --git a/forum/utils/forums.php b/forum/utils/forums.php
index 06196a6..c9c48b5 100644
--- a/forum/utils/forums.php
+++ b/forum/utils/forums.php
@@ -25,7 +25,7 @@ class Forum {
 
 	public function show()
 	{
-    $newcls = "";
+    $newcls = " forum_nonew";
     if($this->newStuff) $newcls = " forum_new";
 
 		echo "    <div class=\"forum\">\n";
@@ -84,9 +84,11 @@ class Forums {
 
 	public function show()
 	{
+    echo "<div class=\"forums\">\n";
 		foreach($this->forums as $forum) {
 			$forum->show();
 		}
+    echo "</div>\n";
 	}
 
 	private function read()
diff --git a/forum/utils/threads.php b/forum/utils/threads.php
index 11c54ee..258f97c 100644
--- a/forum/utils/threads.php
+++ b/forum/utils/threads.php
@@ -22,15 +22,19 @@ class Thread {
 		global $fid, $current_user;
 
 		$jumptonew = "";
-    $newcls = "";
+    $newcls = " thread_nonew";
 		if($this->lastseen[$current_user->uid] < $this->lastpost) {
       $newcls = " thread_new";
 			$jumptonew = "#firstunread";
     }
 
 		echo "    <div class=\"thread\">\n";
-    echo "      <span class=\"thread_icon".$newcls."\"></span>";
-		echo "      <a href=\"?fid=" . $fid . "&amp;tid=" .	$this->tid . $jumptonew."\">" . $this->name . "</a>\n";
+    echo "      <span class=\"thread_icon".$newcls."\">&nbsp;</span>\n";
+		echo "      <a class=\"thread_title\" href=\"?fid=" . $fid .
+      "&amp;tid=" .	$this->tid . $jumptonew."\">" . $this->name . "</a>\n";
+    echo "      <span class=\"thread_lastpost\">Last post: ".
+      date("j. M Y - G:i", $this->lastpost)."</span>\n";
+    //    echo "      <span class=\"thread_numposts\">".$this->numposts." posts</span>\n";
 		echo "    </div>\n";
 	}
 
@@ -51,6 +55,7 @@ class Thread {
 		$this->tid = $tid;
 		$this->name = $name;
 		$this->lastpost = $lastpost;
+    if($this->lastpost == "") $this->lastpost = 0;
 		$this->loadLastSeen($lastseen);
 	}
 }
diff --git a/forum/utils/view.php b/forum/utils/view.php
index d22c8d8..2673394 100644
--- a/forum/utils/view.php
+++ b/forum/utils/view.php
@@ -1,46 +1,56 @@
 <?php
 echo "    <div class=\"navigation\">";
-if($fid) echo "<a href=\"?\">forums</a>";
-if($tid) echo ":: <a href=\"?fid=" . $fid . "\">threads</a>";
-if($pid) echo ":: <a href=\"?fid=" . $fid . "&amp;tid=" . $tid . "\">posts</a>";
-echo "</div>\n";
-
-
-	 if($fid && $tid) {
-		 //		 echo "<h1>Posts</h1>";
-		 include_once("posts.php");
-		 $posts = new Posts($FORUMS_DIR . "/" . $fid . "/" . $tid . ".xml");
-		 $posts->show();
-	 } else if($fid) {
-		 echo "    <h1>Threads</h1>\n";
-		 echo "    <a href=\"?mode=editor&amp;task=new&amp;fid=".$fid.
-			 "&amp;tid=".time()."&amp;pid=-1\">New thread</a>\n";
-
-		 include_once("threads.php");
-		 $threads = new Threads($FORUMS_DIR . "/" . $fid);
-		 $threads->show();
-	 } else {
-		 echo "    <h1>Forums</h1>\n";
-		 include_once("forums.php");
-		 $forums = new Forums($FORUMS_DIR . "/forums.xml");
-
-		 if($action == "addforum") {
-			 $newfid = 1;
-			 while($forums->getForum($newfid)) $newfid++;
-
-			 $forums->add(new Forum($newfid, $title));
-			 $forums->write();
-		 }
-
-		 $forums->show();
-
-		 if($current_user->uid == 0) {
+if($fid) {
+  echo "Legend: <a href=\"?\">Forums</a>";
+  if($tid) {
+    include_once("forums.php");
+    $forums = new Forums($FORUMS_DIR . "/forums.xml");
+    $forum = $forums->getForum($fid);
+    echo " :: <a href=\"?fid=" . $fid . "\">".$forum->name."</a>";
+
+    include_once("posts.php");
+    $posts = new Posts($FORUMS_DIR . "/" . $fid . "/" . $tid . ".xml");
+    echo " :: ".$posts->thread->name;
+
+    $posts->show();
+
+  } else {
+    include_once("forums.php");
+    $forums = new Forums($FORUMS_DIR . "/forums.xml");
+    $forum = $forums->getForum($fid);
+    echo " :: ".$forum->name;
+
+    echo "    <h1>Threads in '".$forum->name."'</h1>\n";
+    echo "    <a href=\"?mode=editor&amp;task=new&amp;fid=".$fid.
+      "&amp;tid=".time()."&amp;pid=-1\">New thread</a>\n";
+    
+    include_once("threads.php");
+    $threads = new Threads($FORUMS_DIR . "/" . $fid);
+    $threads->show();
+  }
+} else {
+  echo "Legend: Forums";
+  echo "    <h1>Forums</h1>\n";
+  include_once("forums.php");
+  $forums = new Forums($FORUMS_DIR . "/forums.xml");
+  
+  if($action == "addforum") {
+    $newfid = 1;
+    while($forums->getForum($newfid)) $newfid++;
+    
+    $forums->add(new Forum($newfid, $title));
+    $forums->write();
+  }
+  
+  $forums->show();
+  
+  if($current_user->uid == 0) {
 ?>
 <form method="post" action="?mode=forum&amp;action=addforum">
 Add new forum: <input name="title" value=""><button type="submit">Add</button>
 </form>
 <?php
-		 } 
-
-	 }
+   } 
+}
+echo "</div>\n";
 ?>
\ No newline at end of file
-- 
cgit v1.2.3