From: Wilfried Göesgens <willi@citadel.org>
Date: Sun, 29 Aug 2010 16:56:31 +0000 (+0000)
Subject: * split boxes into beginbox_1 + 2, and put title directly. remove svput of boxtitle.
X-Git-Tag: v8.01~823
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=061684b1fca9be37ecc01cac2b10be94502def65

* split boxes into beginbox_1 + 2, and put title directly. remove svput of boxtitle.
---

diff --git a/webcit/listsub.c b/webcit/listsub.c
index 01a567bd6..1a6b992e4 100644
--- a/webcit/listsub.c
+++ b/webcit/listsub.c
@@ -48,8 +48,9 @@ void do_listsub(void)
 	wc_printf("<div align=center>");
 	wc_printf("<table border=0 width=75%%><tr><td>");
 
-	svput("BOXTITLE", WCS_STRING, _("List subscribe/unsubscribe"));
-	do_template("beginboxx", NULL);
+	do_template("beginbox_1", NULL);
+	StrBufAppendBufPlain(WC->WBuf, _("List subscribe/unsubscribe"), -1, 0);
+	do_template("beginbox_2", NULL);
 	wc_printf("<div align=center><br>");
 
 	/*
diff --git a/webcit/openid.c b/webcit/openid.c
index b489a55c4..c5842112c 100644
--- a/webcit/openid.c
+++ b/webcit/openid.c
@@ -18,8 +18,9 @@ void display_openids(void)
 
 	wc_printf("<div class=\"fix_scrollbar_bug\">");
 
-	svput("BOXTITLE", WCS_STRING, _("Manage Account/OpenID Associations"));
-	do_template("beginboxx", NULL);
+	do_template("beginbox_1", NULL);
+	StrBufAppendBufPlain(WCC->WBuf, _("Manage Account/OpenID Associations"), -1, 0);
+	do_template("beginbox_2", NULL);
 
 	if (WCC->serv_info->serv_supports_openid) {
 
diff --git a/webcit/sieve.c b/webcit/sieve.c
index 8e333031b..b048b6b30 100644
--- a/webcit/sieve.c
+++ b/webcit/sieve.c
@@ -657,8 +657,9 @@ void display_add_remove_scripts(char *message)
 
 	wc_printf("<table border=0 cellspacing=10><tr valign=top><td>\n");
 
-	svput("BOXTITLE", WCS_STRING, _("Add a new script"));
-	do_template("beginboxx", NULL);
+	do_template("beginbox_1", NULL);
+	StrBufAppendBufPlain(WC->WBuf, _("Add a new script"), -1, 0);
+	do_template("beginbox_2", NULL);
 
 	wc_printf(_("To create a new script, enter the desired "
 		"script name in the box below and click 'Create'."));
@@ -673,8 +674,9 @@ void display_add_remove_scripts(char *message)
 
 	do_template("endbox", NULL);
 
-	svput("BOXTITLE", WCS_STRING, _("Edit scripts"));
-	do_template("beginboxx", NULL);
+	do_template("beginbox_1", NULL);
+	StrBufAppendBufPlain(WC->WBuf, _("Edit scripts"), -1, 0);
+	do_template("beginbox_2", NULL);
 	wc_printf("<br /><div align=center><a href=\"display_sieve\">%s</a><br /><br />\n",
 		_("Return to the script editing screen")
 	);
@@ -682,8 +684,9 @@ void display_add_remove_scripts(char *message)
 
 	wc_printf("</td><td>");
 
-	svput("BOXTITLE", WCS_STRING, _("Delete scripts"));
-	do_template("beginboxx", NULL);
+	do_template("beginbox_1", NULL);
+	StrBufAppendBufPlain(WC->WBuf, _("Delete scripts"), -1, 0);
+	do_template("beginbox_2", NULL);
 
 	wc_printf(_("To delete an existing script, select the script "
 		"name from the list and click 'Delete'."));
diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 7cea1b7fe..64061d7ba 100644
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -831,8 +831,9 @@ void do_edit_vcard(long msgnum, char *partnum,
 	/* Display the form */
 	output_headers(1, 1, 1, 0, 0, 0);
 
-	svput("BOXTITLE", WCS_STRING, _("Edit contact information"));
-	do_template("beginboxx", NULL);
+	do_template("beginbox_1", NULL);
+	StrBufAppendBufPlain(WC->WBuf, _("Edit contact information"), -1, 0);
+	do_template("beginbox_2", NULL);
 
 	wc_printf("<form method=\"POST\" action=\"submit_vcard\">\n");
 	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);