From e08b4586decea8b10b4ab2d65b67f43cf69f6e25 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Fri, 15 Jul 2011 12:54:38 +0000 Subject: [PATCH] move beginbox & endbox to box_* so we can tidy up our static/t/ directory a little more. --- webcit/auth.c | 10 +++++----- webcit/event.c | 2 +- webcit/graphics.c | 4 ++-- webcit/listsub.c | 6 +++--- webcit/openid.c | 6 +++--- webcit/sieve.c | 18 +++++++++--------- .../static/t/aide/display_generic_result.html | 4 ++-- .../static/t/{beginbox.html => box/begin.html} | 4 ++-- .../t/{beginbox_1.html => box/begin_1.html} | 0 .../t/{beginbox_2.html => box/begin_2.html} | 0 .../t/{beginbox_nt.html => box/begin_nt.html} | 0 webcit/static/t/{endbox.html => box/end.html} | 0 webcit/static/t/knrooms_rooms.html | 12 ++++++------ webcit/static/t/room/create.html | 4 ++-- webcit/static/t/room/display_private.html | 4 ++-- webcit/static/t/room/zapped_list.html | 4 ++-- webcit/static/t/sieve/add.html | 12 ++++++------ webcit/subst.c | 4 ++-- webcit/sysmsgs.c | 6 +++--- webcit/vcard_edit.c | 6 +++--- 20 files changed, 53 insertions(+), 53 deletions(-) rename webcit/static/t/{beginbox.html => box/begin.html} (61%) rename webcit/static/t/{beginbox_1.html => box/begin_1.html} (100%) rename webcit/static/t/{beginbox_2.html => box/begin_2.html} (100%) rename webcit/static/t/{beginbox_nt.html => box/begin_nt.html} (100%) rename webcit/static/t/{endbox.html => box/end.html} (100%) diff --git a/webcit/auth.c b/webcit/auth.c index dd0156704..a5e357edf 100644 --- a/webcit/auth.c +++ b/webcit/auth.c @@ -607,9 +607,9 @@ void validate(void) output_headers(1, 1, 1, 0, 0, 0); - do_template("beginbox_1"); + do_template("box_begin_1"); StrBufAppendBufPlain(WC->WBuf, _("Validate new users"), -1, 0); - do_template("beginbox_2"); + do_template("box_begin_2"); /* If the user just submitted a validation, process it... */ safestrncpy(buf, bstr("user"), sizeof buf); @@ -723,7 +723,7 @@ void validate(void) wc_printf("\n"); wc_printf("\n"); - do_template("endbox"); + do_template("box_end"); wDumpContent(1); } @@ -799,7 +799,7 @@ void display_changepw(void) memset(&SubTP, 0, sizeof(WCTemplputParams)); SubTP.Filter.ContextType = CTX_STRBUF; SubTP.Context = Buf; - DoTemplate(HKEY("beginbox"), NULL, &SubTP); + DoTemplate(HKEY("box_begin"), NULL, &SubTP); FreeStrBuf(&Buf); @@ -835,7 +835,7 @@ void display_changepw(void) wc_printf("\n"); wc_printf("\n"); - do_template("endbox"); + do_template("box_end"); wDumpContent(1); } diff --git a/webcit/event.c b/webcit/event.c index 0f6168d1d..80c4f51eb 100644 --- a/webcit/event.c +++ b/webcit/event.c @@ -1206,7 +1206,7 @@ STARTOVER: for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDE /* If this was a save or delete, go back to the calendar or summary view. */ if (!havebstr("check_button")) { if (!strcasecmp(bstr("calview"), "summary")) { - summary(); + do_template("summary_page"); } else { readloop(readfwd, eUseDefault); diff --git a/webcit/graphics.c b/webcit/graphics.c index b6bc9bd16..ee7d6bd97 100644 --- a/webcit/graphics.c +++ b/webcit/graphics.c @@ -43,7 +43,7 @@ void display_graphics_upload(char *description, char *filename, char *uplurl) memset(&SubTP, 0, sizeof(WCTemplputParams)); SubTP.Filter.ContextType = CTX_STRBUF; SubTP.Context = Buf; - DoTemplate(HKEY("beginbox"), NULL, &SubTP); + DoTemplate(HKEY("box_begin"), NULL, &SubTP); FreeStrBuf(&Buf); @@ -72,7 +72,7 @@ void display_graphics_upload(char *description, char *filename, char *uplurl) wc_printf("\n"); wc_printf("\n"); - do_template("endbox"); + do_template("box_end"); wDumpContent(1); } diff --git a/webcit/listsub.c b/webcit/listsub.c index 0560d5248..2bb9cbb3a 100644 --- a/webcit/listsub.c +++ b/webcit/listsub.c @@ -62,9 +62,9 @@ void do_listsub(void) wc_printf("
"); wc_printf("
"); - do_template("beginbox_1"); + do_template("box_begin_1"); StrBufAppendBufPlain(WC->WBuf, _("List subscribe/unsubscribe"), -1, 0); - do_template("beginbox_2"); + do_template("box_begin_2"); wc_printf("

"); /* @@ -230,7 +230,7 @@ FORM: wc_printf("
\n"); } wc_printf("
"); - do_template("endbox"); + do_template("box_end"); wc_printf("
"); wc_printf("\n"); diff --git a/webcit/openid.c b/webcit/openid.c index 987ab0cf5..316859f8b 100644 --- a/webcit/openid.c +++ b/webcit/openid.c @@ -30,9 +30,9 @@ void display_openids(void) output_headers(1, 1, 1, 0, 0, 0); - do_template("beginbox_1"); + do_template("box_begin_1"); StrBufAppendBufPlain(WCC->WBuf, _("Manage Account/OpenID Associations"), -1, 0); - do_template("beginbox_2"); + do_template("box_begin_2"); if (WCC->serv_info->serv_supports_openid) { @@ -68,7 +68,7 @@ void display_openids(void) wc_printf(_("%s does not permit authentication via OpenID."), ChrPtr(WCC->serv_info->serv_humannode)); } - do_template("endbox"); + do_template("box_end"); wDumpContent(2); } diff --git a/webcit/sieve.c b/webcit/sieve.c index 8506e1fd9..0c4cd98ec 100644 --- a/webcit/sieve.c +++ b/webcit/sieve.c @@ -712,9 +712,9 @@ void display_add_remove_scripts(char *message) wc_printf("
\n"); - do_template("beginbox_1"); + do_template("box_begin_1"); StrBufAppendBufPlain(WC->WBuf, _("Add a new script"), -1, 0); - do_template("beginbox_2"); + do_template("box_begin_2"); wc_printf(_("To create a new script, enter the desired " "script name in the box below and click 'Create'.")); @@ -727,21 +727,21 @@ void display_add_remove_scripts(char *message) "" "\n", _("Create")); - do_template("endbox"); + do_template("box_end"); - do_template("beginbox_1"); + do_template("box_begin_1"); StrBufAppendBufPlain(WC->WBuf, _("Edit scripts"), -1, 0); - do_template("beginbox_2"); + do_template("box_begin_2"); wc_printf("
%s

\n", _("Return to the script editing screen") ); - do_template("endbox"); + do_template("box_end"); wc_printf("
"); - do_template("beginbox_1"); + do_template("box_begin_1"); StrBufAppendBufPlain(WC->WBuf, _("Delete scripts"), -1, 0); - do_template("beginbox_2"); + do_template("box_begin_2"); wc_printf(_("To delete an existing script, select the script " "name from the list and click 'Delete'.")); @@ -769,7 +769,7 @@ void display_add_remove_scripts(char *message) wc_printf("", _("Delete script"), _("Delete this script?")); wc_printf("\n"); - do_template("endbox"); + do_template("box_end"); wc_printf("
\n"); diff --git a/webcit/static/t/aide/display_generic_result.html b/webcit/static/t/aide/display_generic_result.html index 2a2fae16b..82e024fa7 100644 --- a/webcit/static/t/aide/display_generic_result.html +++ b/webcit/static/t/aide/display_generic_result.html @@ -1,5 +1,5 @@ - + @@ -18,6 +18,6 @@
-
+
diff --git a/webcit/static/t/beginbox.html b/webcit/static/t/box/begin.html similarity index 61% rename from webcit/static/t/beginbox.html rename to webcit/static/t/box/begin.html index 2d9cc609d..661c15a50 100644 --- a/webcit/static/t/beginbox.html +++ b/webcit/static/t/box/begin.html @@ -1,5 +1,5 @@ - +
- + diff --git a/webcit/static/t/beginbox_1.html b/webcit/static/t/box/begin_1.html similarity index 100% rename from webcit/static/t/beginbox_1.html rename to webcit/static/t/box/begin_1.html diff --git a/webcit/static/t/beginbox_2.html b/webcit/static/t/box/begin_2.html similarity index 100% rename from webcit/static/t/beginbox_2.html rename to webcit/static/t/box/begin_2.html diff --git a/webcit/static/t/beginbox_nt.html b/webcit/static/t/box/begin_nt.html similarity index 100% rename from webcit/static/t/beginbox_nt.html rename to webcit/static/t/box/begin_nt.html diff --git a/webcit/static/t/endbox.html b/webcit/static/t/box/end.html similarity index 100% rename from webcit/static/t/endbox.html rename to webcit/static/t/box/end.html diff --git a/webcit/static/t/knrooms_rooms.html b/webcit/static/t/knrooms_rooms.html index 7c7f27491..b545b61b6 100644 --- a/webcit/static/t/knrooms_rooms.html +++ b/webcit/static/t/knrooms_rooms.html @@ -1,18 +1,18 @@ - - + + -
+
- - + +  ">">
- + diff --git a/webcit/static/t/room/create.html b/webcit/static/t/room/create.html index a788cd8b9..4cc1ead79 100644 --- a/webcit/static/t/room/create.html +++ b/webcit/static/t/room/create.html @@ -8,7 +8,7 @@

- +
@@ -101,7 +101,7 @@ else {
- +
diff --git a/webcit/static/t/room/display_private.html b/webcit/static/t/room/display_private.html index c71540651..c80d31215 100644 --- a/webcit/static/t/room/display_private.html +++ b/webcit/static/t/room/display_private.html @@ -4,7 +4,7 @@
- +

@@ -29,6 +29,6 @@  ">
- + diff --git a/webcit/static/t/room/zapped_list.html b/webcit/static/t/room/zapped_list.html index 567f17180..313792fdb 100644 --- a/webcit/static/t/room/zapped_list.html +++ b/webcit/static/t/room/zapped_list.html @@ -4,10 +4,10 @@
- +

- +
diff --git a/webcit/static/t/sieve/add.html b/webcit/static/t/sieve/add.html index 897f6dd01..51c1f3971 100644 --- a/webcit/static/t/sieve/add.html +++ b/webcit/static/t/sieve/add.html @@ -7,7 +7,7 @@
- +

@@ -15,13 +15,13 @@
- - + +


- +
- +

@@ -29,4 +29,4 @@ - + diff --git a/webcit/subst.c b/webcit/subst.c index f857882dc..1a08abc24 100644 --- a/webcit/subst.c +++ b/webcit/subst.c @@ -2166,9 +2166,9 @@ void tmpl_do_boxed(StrBuf *Target, WCTemplputParams *TP) memcpy (&SubTP, TP, sizeof(WCTemplputParams)); SubTP.Context = Headline; SubTP.Filter.ContextType = CTX_STRBUF; - DoTemplate(HKEY("beginbox"), Target, &SubTP); + DoTemplate(HKEY("box_begin"), Target, &SubTP); DoTemplate(TKEY(0), Target, TP); - DoTemplate(HKEY("endbox"), Target, TP); + DoTemplate(HKEY("box_end"), Target, TP); FreeStrBuf(&Headline); } diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c index 6c0ce1d04..aae67d930 100644 --- a/webcit/sysmsgs.c +++ b/webcit/sysmsgs.c @@ -47,9 +47,9 @@ void display_edit(char *description, char *check_cmd, output_headers(1, 1, 0, 0, 0, 0); } - do_template("beginbox_1"); + do_template("box_begin_1"); StrBufAppendPrintf (WC->WBuf, _("Edit %s"), description); - do_template("beginbox_2"); + do_template("box_begin_2"); wc_printf(_("Enter %s below. Text is formatted to the reader's browser." " A newline is forced by preceding the next line by a blank."), description); @@ -68,7 +68,7 @@ void display_edit(char *description, char *check_cmd, wc_printf("
\n", _("Cancel")); wc_printf("
\n"); - do_template("endbox"); + do_template("box_end"); wDumpContent(1); } diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c index 140743038..c732144e3 100644 --- a/webcit/vcard_edit.c +++ b/webcit/vcard_edit.c @@ -1049,9 +1049,9 @@ void do_edit_vcard(long msgnum, char *partnum, /* Display the form */ output_headers(1, 1, 1, 0, 0, 0); - do_template("beginbox_1"); + do_template("box_begin_1"); StrBufAppendBufPlain(WC->WBuf, _("Edit contact information"), -1, 0); - do_template("beginbox_2"); + do_template("box_begin_2"); wc_printf("
\n"); wc_printf("\n", WC->nonce); @@ -1222,7 +1222,7 @@ void do_edit_vcard(long msgnum, char *partnum, ); wc_printf("
\n"); - do_template("endbox"); + do_template("box_end"); wDumpContent(1); if (Msg != NULL) { DestroyMessageSummary(Msg); -- 2.30.2