From 1d5dd8d7454f97c23ba9b51b13f270923bd2da72 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Sat, 14 Aug 2010 14:14:31 +0000
Subject: [PATCH] * embed_room_banner () simplify switch to one

---
 webcit/roomops.c | 119 ++++++++++++++++++++++-------------------------
 1 file changed, 56 insertions(+), 63 deletions(-)

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 2a2b34722..380e9fca1 100644
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -167,6 +167,15 @@ void embed_room_banner(void)
 			"%s"
 			"</span></a></li>\n", _("View contacts")
 			);
+		wc_printf(
+			"<li class=\"addnewcontact\">"
+			"<a href=\"display_enter\">"
+			"<img src=\"static/addnewcontact_24x.gif\" "
+			"alt=\"\" width=\"24\" height=\"24\">"
+			"<span class=\"navbar_link\">"
+			"%s"
+			"</span></a></li>\n", _("Add new contact")
+			);
 		break;
 	case VIEW_CALENDAR:
 		wc_printf(
@@ -187,6 +196,17 @@ void embed_room_banner(void)
 			"%s"
 			"</span></a></li>\n", _("Month view")
 			);
+		wc_printf("<li class=\"addevent\"><a href=\"display_enter");
+		if (havebstr("year" )) wc_printf("?year=%s", bstr("year"));
+		if (havebstr("month")) wc_printf("?month=%s", bstr("month"));
+		if (havebstr("day"  )) wc_printf("?day=%s", bstr("day"));
+		wc_printf("\">"
+			  "<img  src=\"static/addevent_24x.gif\" "
+			  "alt=\"\" width=\"24\" height=\"24\">"
+			  "<span class=\"navbar_link\">"
+			  "%s"
+			  "</span></a></li>\n", _("Add new event")
+			);
 		break;
 	case VIEW_CALBRIEF:
 		wc_printf(
@@ -209,6 +229,15 @@ void embed_room_banner(void)
 			"%s"
 			"</span></a></li>\n", _("View tasks")
 			);
+		wc_printf(
+			"<li class=\"newmess\">"
+			"<a href=\"display_enter\">"
+			"<img  src=\"static/newmess3_24x.gif\" "
+			"alt=\"\" width=\"24\" height=\"24\">"
+			"<span class=\"navbar_link\">"
+			"%s"
+			"</span></a></li>\n", _("Add new task")
+			);
 		break;
 	case VIEW_NOTES:
 		wc_printf(
@@ -220,6 +249,15 @@ void embed_room_banner(void)
 			"%s"
 			"</span></a></li>\n", _("View notes")
 			);
+		wc_printf(
+			"<li class=\"enternewnote\">"
+			"<a href=\"add_new_note\">"
+			"<img  src=\"static/enternewnote_24x.gif\" "
+			"alt=\"\" width=\"24\" height=\"24\">"
+			"<span class=\"navbar_link\">"
+			"%s"
+			"</span></a></li>\n", _("Add new note")
+			);
 		break;
 	case VIEW_MAILBOX:
 		wc_printf(
@@ -242,69 +280,6 @@ void embed_room_banner(void)
 			"%s"
 			"</span></a></li>\n", _("Wiki home")
 			);
-		break;
-	default:
-		wc_printf(
-			"<li class=\"readallmess\">"
-			"<a href=\"readfwd\">"
-			"<img src=\"static/readallmess3_24x.gif\" "
-			"alt=\"\" width=\"24\" height=\"24\">"
-			"<span class=\"navbar_link\">"
-			"%s"
-			"</span></a></li>\n", _("Read all messages")
-			);
-		break;
-	}
-	
-	switch(WC->CurRoom.view) {
-	case VIEW_ADDRESSBOOK:
-		wc_printf(
-			"<li class=\"addnewcontact\">"
-			"<a href=\"display_enter\">"
-			"<img src=\"static/addnewcontact_24x.gif\" "
-			"alt=\"\" width=\"24\" height=\"24\">"
-			"<span class=\"navbar_link\">"
-			"%s"
-			"</span></a></li>\n", _("Add new contact")
-			);
-		break;
-	case VIEW_CALENDAR:
-	case VIEW_CALBRIEF:
-		wc_printf("<li class=\"addevent\"><a href=\"display_enter");
-		if (havebstr("year" )) wc_printf("?year=%s", bstr("year"));
-		if (havebstr("month")) wc_printf("?month=%s", bstr("month"));
-		if (havebstr("day"  )) wc_printf("?day=%s", bstr("day"));
-		wc_printf("\">"
-			  "<img  src=\"static/addevent_24x.gif\" "
-			  "alt=\"\" width=\"24\" height=\"24\">"
-			  "<span class=\"navbar_link\">"
-			  "%s"
-			  "</span></a></li>\n", _("Add new event")
-			);
-		break;
-	case VIEW_TASKS:
-		wc_printf(
-			"<li class=\"newmess\">"
-			"<a href=\"display_enter\">"
-			"<img  src=\"static/newmess3_24x.gif\" "
-			"alt=\"\" width=\"24\" height=\"24\">"
-			"<span class=\"navbar_link\">"
-			"%s"
-			"</span></a></li>\n", _("Add new task")
-			);
-		break;
-	case VIEW_NOTES:
-		wc_printf(
-			"<li class=\"enternewnote\">"
-			"<a href=\"add_new_note\">"
-			"<img  src=\"static/enternewnote_24x.gif\" "
-			"alt=\"\" width=\"24\" height=\"24\">"
-			"<span class=\"navbar_link\">"
-			"%s"
-			"</span></a></li>\n", _("Add new note")
-			);
-		break;
-	case VIEW_WIKI:
 		safestrncpy(buf, bstr("page"), sizeof buf);
 		if (IsEmptyStr(buf)) {
 			safestrncpy(buf, "home", sizeof buf);
@@ -346,6 +321,15 @@ void embed_room_banner(void)
 		}
 		break;
 	case VIEW_MAILBOX:
+		wc_printf(
+			"<li class=\"readallmess\">"
+			"<a href=\"readfwd\">"
+			"<img src=\"static/readallmess3_24x.gif\" "
+			"alt=\"\" width=\"24\" height=\"24\">"
+			"<span class=\"navbar_link\">"
+			"%s"
+			"</span></a></li>\n", _("Read all messages")
+			);
 		wc_printf(
 			"<li class=\"newmess\">"
 			"<a href=\"display_enter\">"
@@ -365,6 +349,15 @@ void embed_room_banner(void)
 			);
 		break;
 	default:
+		wc_printf(
+			"<li class=\"readallmess\">"
+			"<a href=\"readfwd\">"
+			"<img src=\"static/readallmess3_24x.gif\" "
+			"alt=\"\" width=\"24\" height=\"24\">"
+			"<span class=\"navbar_link\">"
+			"%s"
+			"</span></a></li>\n", _("Read all messages")
+			);
 		wc_printf(
 			"<li class=\"newmess\">"
 			"<a href=\"display_enter\">"
-- 
2.30.2