first commit of the new gui design, to branch b3-4 (3.4)

tcl/intranet-forum-procs.tcl

@@ -1239,52 +1239,22 @@ ad_proc -public im_forum_navbar { base_url export_var_list {forum_folder 0} } {
 	}
     }
 
-    set sel "<td class=tabsel>"
-    set nosel "<td class=tabnotsel>"
-    set a_white "<a class=whitelink"
-    set tdsp "<td>&nbsp;</td>"
-
-    set active_topics "$tdsp$nosel<a href='index'>[_ intranet-forum.Inbox]</a></td>"
-    set deleted_topics "$tdsp$nosel<a href='index?forum_folder=1'>[_ intranet-forum.Deleted]</a></td>"
-    set unresolved_topics "$tdsp$nosel<a href='index?forum_folder=2'>[_ intranet-forum.Unresolved]</a></td>"
-    set discussion_view "$tdsp$nosel<a href='index?forum_view_name=forum_list_discussion'>[_ intranet-forum.Discussion_View]</a></td>"
-    set history "$tdsp$nosel<a href='index?forum_view_name=forum_list_history'>[_ intranet-forum.History]</a></td>"
-
-    switch $section {
-"Inbox" {set active_topics "$tdsp$sel [_ intranet-forum.Inbox]</td>"}
-"Deleted" {set deleted_topics "$tdsp$sel [_ intranet-forum.Deleted]</td>"}
-"Unresolved" {set unresolved_topics "$tdsp$sel [_ intranet-forum.Unresolved]</td>"}
-"Discussion View" {set discussion_view "$tdsp$sel [_ intranet-forum.Discussion_View]</td>"}
-"History" {set history "$tdsp$sel [_ intranet-forum.History]</td>"}
-default {
-    # Nothing - just let all sections deselected
-}
-    }
+    set active_topics [im_navbar_tab "index" [_ intranet-forum.Inbox] [expr {$section eq "Inbox"}]]
+    set deleted_topics [im_navbar_tab "index?forum_folder=1" [_ intranet-forum.Deleted] [expr {$section eq "Deleted"}]]
+    set unresolved_topics [im_navbar_tab "index?forum_folder=2" [_ intranet-forum.Unresolved] [expr {$section eq "Unresolved"}]]
+    set discussion_view [im_navbar_tab "index?forum_view_name=forum_list_discussion" [_ intranet-forum.Discussion_View] [expr {$section eq "Discussion View"}]]
+    set history [im_navbar_tab "index?forum_view_name=forum_list_history" [_ intranet-forum.History] [expr {$section eq "History"}]]
 
+    # $discussion_view $history
 
-# $discussion_view $history
-
-    set navbar "
-<table width=100% cellpadding=0 cellspacing=0 border=0>
-  <tr>
-    <td colspan=6 align=right>
-      <table cellpadding=1 cellspacing=0 border=0>
-	<tr>
-	  $active_topics
-	  $deleted_topics
-	  $unresolved_topics
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td colspan=6 class=tabnotsel align=center>
-	&nbsp;
-    </td>
-  </tr>
-</table>
-"
-    return $navbar
+    return "
+         <div id=\"navbar_sub_wrapper\">
+            <ul id=\"navbar_sub\">
+    	       $active_topics
+	       $deleted_topics
+	       $unresolved_topics
+            </ul>
+         </div>"
 }
 
 

www/index.adp

@@ -6,13 +6,25 @@
 <property name="title">@page_title@</property>
 <property name="context">@context_bar@</property>
 <property name="main_navbar_label">forum</property>
+<property name="sub_navbar">@sub_navbar;noquote@</property>
 
+<div class="filter-list">
+   <div class="filter">
+      <div class="filter-block">
+         <div class="filter-title">
+            #intranet-forum.Filter_Topics#
+         </div>
+         <form method=get action="index">
+            <%= [export_form_vars forum_group_id forum_start_idx forum_order_by forum_how_many forum_view_name] %>
+            @filter_html;noquote@
+         </form>
+      </div>
+   </div>
 
-<form method=get action='index'>
-<%= [export_form_vars forum_group_id forum_start_idx forum_order_by forum_how_many forum_view_name] %>
-@filter_html;noquote@
-</form>
+   <div class="fullwidth-list">
+      <%= [im_table_with_title "Forum" $forum_content] %>
+   </div>
 
-<%= [im_forum_navbar "/intranet-forum/index" [list forum_group_id forum_start_idx forum_order_byforum_how_many forum_mine_p forum_view_name] $forum_folder] %>
+   <div class="filter-list-footer"></div>
 
-@forum_content;noquote@
+</div>
\ No newline at end of file

www/index.tcl

@@ -90,11 +90,6 @@ set project_types [linsert $project_types 0 0 All]
 
 set filter_html "
 	<table border=0 cellpadding=0 cellspacing=1>
-	<tr>
-	  <td colspan='2' class=rowtitle align=center>
-		[_ intranet-forum.Filter_Topics]
-	  </td>
-	</tr>
 "
 
 if {[im_permission $current_user_id "view_topics_all"]} {
@@ -117,6 +112,7 @@ append filter_html "
 	    <input type=submit value=Go name=submit>
 	  </td>
 	</tr>
+        </table>
 "
 
 # ---------------------------------------------------------------
@@ -152,6 +148,8 @@ set forum_content [im_forum_component \
 # Join all parts together
 # ---------------------------------------------------------------
 
+set sub_navbar [im_forum_navbar "/intranet-forum/index" [list forum_group_id forum_start_idx forum_order_byforum_how_many forum_mine_p forum_view_name] $forum_folder]
+
 db_release_unused_handles
 
 ad_return_template
\ No newline at end of file