- now pretty much running

tcl/intranet-wiki-procs.tcl

@@ -6,8 +6,42 @@ ad_library {
     @creation-date  27 April 2005
 }
 
+
 ad_proc im_wiki_home_component { } {
     Wiki component to be shown at the system home page
+} {
+    return [im_wiki_base_component "" 0]
+}
+
+
+ad_proc im_wiki_project_component { project_id } {
+    Wiki component to be shown at the system home page
+} {
+    return [im_wiki_base_component im_project $project_id]
+}
+
+ad_proc im_wiki_company_component { company_id } {
+    Wiki component to be shown at the system home page
+} {
+    return [im_wiki_base_component im_company $company_id]
+}
+
+ad_proc im_wiki_office_component { office_id } {
+    Wiki component to be shown at the system home page
+} {
+    return [im_wiki_base_component im_office $office_id]
+}
+
+ad_proc im_wiki_user_component { user_id } {
+    Wiki component to be shown at the system home page
+} {
+    return [im_wiki_base_component user $user_id]
+}
+
+
+
+ad_proc im_wiki_base_component { object_type object_id } {
+    Wiki component to be shown at the system home page
 } {
     set folder_id [wiki::get_folder_id]
     set colspan 1
@@ -17,39 +51,58 @@ ad_proc im_wiki_home_component { } {
 	select
 		ap.package_id,
 		cf.folder_id,
-		cr.title
+		cr.title as wiki_title,
+		sn.name as wiki_mount
 	from
 		apm_packages ap,
 		cr_folders cf,
 		cr_items ci,
-		cr_revisions cr
+		cr_revisions cr,
+		site_nodes sn
 	where
 		ap.package_key = 'wiki'
 		and cf.package_id = ap.package_id
 		and ci.parent_id = cf.folder_id
 		and ci.name = 'index'
 		and cr.revision_id = ci.live_revision
+		and sn.object_id = ap.package_id
     "
+
+    set object_name [db_string object_name_for_one_object_id "" -default ""]
+    set object_name_mangled [ns_urlencode $object_name]
+
+    set ctr 0
     set wikis_html ""
     db_foreach wikis $wikis_sql {
-	append wikis_html "<tr><td>
-	  <A href="$package_id>$title</a>
-	</td></tr>\n"
-    }
 
-    set html "
-<table>
-<tr>
-  <td colspan=$colspan>
-    &nbsp;
-  </td>
-</tr>
-<tr>
-  <td class=rowtitle colspan=$colspan>Title</td>
-</tr>
-$wikis_html
-</table>
+	incr ctr
+	append wikis_html "<b>$wiki_title Wiki</b><br>\n"
+
+	if {0 != $object_id} {
+	    append wikis_html "<li><A href=\"/$wiki_mount/$object_name_mangled\">$object_name</A>\n"
+	}
+
+	append wikis_html "
+<li><A href=\"/$wiki_mount/index\">Main Index</A>
+<li><A href=\"/$wiki_mount/Category\">Categories</A>
 "
-  
-    return [im_table_with_title "Wikis" $html]
+
+	set admin_p [permission::permission_p \
+                -object_id $package_id \
+		-party_id [ad_conn user_id] \
+                -privilege "admin"
+	]
+
+	if {$admin_p} {
+	    append wikis_html "<li><A href=\"/intranet/admin/permissions/one?object_id=$folder_id\">Admin Wiki Permissions</A>\n"
+	    append wikis_html "<li><A href=\"/intranet-wiki/admin/index?folder_id=$folder_id\">Admin Wiki Changes</A>\n"
+	}
+
+	append wikis_html "<p>\n"
+    }
+
+    # Skip the component if there is no Wiki
+    if {0 == $ctr} { return "" }
+
+    return [im_table_with_title "Wikis" $wikis_html]
 }

www/index.adp

@@ -2,5 +2,11 @@
 <property name="title">Wiki</property>
 <property name="main_navbar_label">home</property>
 
+<table>
+<tr>
+<td>
 @wiki_html;noquote@
+</td>
+</tr>
+</table>
 

www/index.tcl

-# /packages/intranet-filestorage/www/index.tcl
+# /packages/intranet-wiki/www/index.tcl
 #
 # Copyright (C) 2003-2004 Project/Open
 #
@@ -18,8 +18,3 @@ ad_page_contract {
 set wiki_html [im_wiki_home_component]
 
 
-#db_release_unused_handles
-#ad_returnredirect "/intranet/"
-
-
-