move beginbox & endbox to box_* so we can tidy up our static/t/ directory a little...

diff --git a/webcit/auth.c b/webcit/auth.c
index dd015670499984a7b4303a0c1f47234ce108fe44..a5e357edf7ca646818e6dc991f029de9a08e2dcc 100644 (file)
--- 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("</div>\n");
        wc_printf("</td></tr></table>\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("</div>\n");
        wc_printf("</form>\n");
 
-       do_template("endbox");
+       do_template("box_end");
        wDumpContent(1);
 }
 

diff --git a/webcit/event.c b/webcit/event.c
index 0f6168d1d072ed86f2d29529dd7968a5a5f55635..80c4f51eb1ccf880b37e9bae4eb0d6f7435ccf95 100644 (file)
--- 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 b6bc9bd16085398ceccce9dbc6a38f57dc14592e..ee7d6bd97ed8ed9e61df624026934cd6c5038f55 100644 (file)
--- 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("</div>\n");
        wc_printf("</form>\n");
 
-       do_template("endbox");
+       do_template("box_end");
 
        wDumpContent(1);
 }

diff --git a/webcit/listsub.c b/webcit/listsub.c
index 0560d524879491dd8a12fc3c4ba377e9348a471a..2bb9cbb3a49053656351762d3dd773beaa9b1ee9 100644 (file)
--- a/webcit/listsub.c
+++ b/webcit/listsub.c
@@ -62,9 +62,9 @@ void do_listsub(void)
        wc_printf("<div align=center>");
        wc_printf("<table border=0 width=75%%><tr><td>");
 
-       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("<div align=center><br>");
 
        /*
@@ -230,7 +230,7 @@ FORM:               wc_printf("<form method=\"POST\" action=\"listsub\">\n");
        }
 
        wc_printf("</div>");
-       do_template("endbox");
+       do_template("box_end");
        wc_printf("</td></tr></table></div>");
 
        wc_printf("</BODY></HTML>\n");

diff --git a/webcit/openid.c b/webcit/openid.c
index 987ab0cf51449c87b8d237bafb6e595a5f183a7b..316859f8bef3e39764986a2c76883cb4e88a10eb 100644 (file)
--- 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 8506e1fd9f0be6a2bbb479d1527d28801f592e7a..0c4cd98ec27b555b16492f0f391ba475dc072bc9 100644 (file)
--- a/webcit/sieve.c
+++ b/webcit/sieve.c
@@ -712,9 +712,9 @@ void display_add_remove_scripts(char *message)
 
        wc_printf("<table border=0 cellspacing=10><tr valign=top><td>\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)
                "<input type=\"submit\" name=\"create_button\" value=\"%s\">"
                "</form></center>\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("<br><div align=center><a href=\"display_sieve\">%s</a><br><br>\n",
                _("Return to the script editing screen")
        );
-       do_template("endbox");
+       do_template("box_end");
 
        wc_printf("</td><td>");
 
-       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("<input type=\"submit\" name=\"delete_button\" value=\"%s\" "
                "onClick=\"return confirm('%s');\">", _("Delete script"), _("Delete this script?"));
         wc_printf("</form></center>\n");
-       do_template("endbox");
+       do_template("box_end");
 
        wc_printf("</td></tr></table>\n");
 

diff --git a/webcit/static/t/aide/display_generic_result.html b/webcit/static/t/aide/display_generic_result.html
index 2a2fae16bd0b2b27d3a5fd1fe7f189067b792234..82e024fa7d108e429c0565bbdc28e6d02db839f0 100644 (file)
--- a/webcit/static/t/aide/display_generic_result.html
+++ b/webcit/static/t/aide/display_generic_result.html
@@ -1,5 +1,5 @@
 <?=("head")>
-<?=("beginbox_1")><?_("Server command results")><?=("beginbox_2")>
+<?=("box_begin_1")><?_("Server command results")><?=("box_begin_2")>
 
 </td><td valign=top> 
 
@@ -18,6 +18,6 @@
 <a href="do_template?template=aide_display_generic_cmd"><?_("Enter another command")></a><br>
 <a href="display_advanced"><?_("Return to menu")></a>
 
-<?=("endbox")><br>
+<?=("box_end")><br>
 
 <?=("trailing")>

diff --git a/webcit/static/t/beginbox.html b/webcit/static/t/beginbox.html
deleted file mode 100644 (file)
index 2d9cc60..0000000
--- a/webcit/static/t/beginbox.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- start beginbox.html-->
-<div class="box">
-<div class="boxlabel"><?CONTEXTSTR("X")></div>
-<div class="boxcontent">
-<!-- end beginbox.html-->

diff --git a/webcit/static/t/beginbox_1.html b/webcit/static/t/beginbox_1.html
deleted file mode 100644 (file)
index 2d425d1..0000000
--- a/webcit/static/t/beginbox_1.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<div class="box">
-<div class="boxlabel">

diff --git a/webcit/static/t/beginbox_2.html b/webcit/static/t/beginbox_2.html
deleted file mode 100644 (file)
index a36b107..0000000
--- a/webcit/static/t/beginbox_2.html
+++ /dev/null
@@ -1,2 +0,0 @@
-</div>
-<div class="boxcontent">

diff --git a/webcit/static/t/beginbox_nt.html b/webcit/static/t/beginbox_nt.html
deleted file mode 100644 (file)
index adb84e3..0000000
--- a/webcit/static/t/beginbox_nt.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<! start beginbox_nt.html>
-<table border=1 cellspacing=0 cellpadding=0 width=100%><tr><td>
-<table border=0 cellspacing=0 cellpadding=3 width=100%>
-<tr><td bgcolor="#FFFFFF">
-<! end beginbox_nt.html>

diff --git a/webcit/static/t/box/begin.html b/webcit/static/t/box/begin.html
new file mode 100644 (file)
index 0000000..661c15a
--- /dev/null
+++ b/webcit/static/t/box/begin.html
@@ -0,0 +1,5 @@
+<!-- start box_begin.html-->
+<div class="box">
+<div class="boxlabel"><?CONTEXTSTR("X")></div>
+<div class="boxcontent">
+<!-- end box_begin.html-->

diff --git a/webcit/static/t/box/begin_1.html b/webcit/static/t/box/begin_1.html
new file mode 100644 (file)
index 0000000..2d425d1
--- /dev/null
+++ b/webcit/static/t/box/begin_1.html
@@ -0,0 +1,2 @@
+<div class="box">
+<div class="boxlabel">

diff --git a/webcit/static/t/box/begin_2.html b/webcit/static/t/box/begin_2.html
new file mode 100644 (file)
index 0000000..a36b107
--- /dev/null
+++ b/webcit/static/t/box/begin_2.html
@@ -0,0 +1,2 @@
+</div>
+<div class="boxcontent">

diff --git a/webcit/static/t/box/begin_nt.html b/webcit/static/t/box/begin_nt.html
new file mode 100644 (file)
index 0000000..adb84e3
--- /dev/null
+++ b/webcit/static/t/box/begin_nt.html
@@ -0,0 +1,5 @@
+<! start beginbox_nt.html>
+<table border=1 cellspacing=0 cellpadding=0 width=100%><tr><td>
+<table border=0 cellspacing=0 cellpadding=3 width=100%>
+<tr><td bgcolor="#FFFFFF">
+<! end beginbox_nt.html>

diff --git a/webcit/static/t/box/end.html b/webcit/static/t/box/end.html
new file mode 100644 (file)
index 0000000..e04ad1b
--- /dev/null
+++ b/webcit/static/t/box/end.html
@@ -0,0 +1 @@
+</div></div>

diff --git a/webcit/static/t/endbox.html b/webcit/static/t/endbox.html
deleted file mode 100644 (file)
index e04ad1b..0000000
--- a/webcit/static/t/endbox.html
+++ /dev/null
@@ -1 +0,0 @@
-</div></div>

diff --git a/webcit/static/t/knrooms_rooms.html b/webcit/static/t/knrooms_rooms.html
index 7c7f27491975901a62909dceeb3e0a8db6af402e..b545b61b682821cac776cf8680d407076a1fe6b6 100644 (file)
--- a/webcit/static/t/knrooms_rooms.html
+++ b/webcit/static/t/knrooms_rooms.html
@@ -1,18 +1,18 @@
 <?!("COND:ITERATE:FIRSTN", 1)>
-       <tr><td valign=top><?=("beginbox_1")>
-       <?ROOM:INFO:FLOOR:NAME><?=("beginbox_2")>
+       <tr><td valign=top><?=("box_begin_1")>
+       <?ROOM:INFO:FLOOR:NAME><?=("box_begin_2")>
 <?!("X", 1)>
 <?!("COND:ITERATE:ISGROUPCHANGE", 2)>
-       <?=("endbox")><br>
+       <?=("box_end")><br>
        <?!("COND:ITERATE:ISGROUPCHANGE", 3, 2)>
                </td><td valign=top>
        <?!("X", 3)>
-       <?=("beginbox_1")>
-       <?ROOM:INFO:FLOOR:NAME><?=("beginbox_2")>
+       <?=("box_begin_1")>
+       <?ROOM:INFO:FLOOR:NAME><?=("box_begin_2")>
 <?!("X", 2)>
 &nbsp;<a href="dotgoto?room=<?ROOM:INFO:NAME("U")>"><span class="<?%("COND:ROOM:FLAG:UA", 4, #"UA_HASNEWMSGS", 0, "roomlist_new", "roomlist_old")>">
 <?ROOM:INFO:LEVELNTIMES("&nbsp;&nbsp;&nbsp;")><?ROOM:INFO:BASENAME("X")></span></a>
 <?%("COND:ROOM:INFO:IS_INBOX", 5, 0, 0, _"(INBOX)", "")><br>
 <?!("COND:ITERATE:LASTN", 2)>
-       <?=("endbox")></td></tr>
+       <?=("box_end")></td></tr>
 <??("X", 2)>

diff --git a/webcit/static/t/room/create.html b/webcit/static/t/room/create.html
index a788cd8b972b98d928754ae5d7f9d16be3c2a088..4cc1ead794a18aada5b7475be07fade73851f61e 100644 (file)
--- a/webcit/static/t/room/create.html
+++ b/webcit/static/t/room/create.html
@@ -8,7 +8,7 @@
 </div>
 <div id="content" class="service">
 <br>
-<?=("beginbox_1")><?_("Create a new room")><?=("beginbox_2")>
+<?=("box_begin_1")><?_("Create a new room")><?=("box_begin_2")>
 
 <form name="create_room_form" method="POST" action="entroom">
 <input type="hidden" name="nonce" value="<?NONCE>">
@@ -101,7 +101,7 @@ else {
 </form><hr />
 <?SERV:MESG("roomaccess")>
 
-<?=("endbox")>
+<?=("box_end")>
 </div>
 
 <?=("trailing")>

diff --git a/webcit/static/t/room/display_private.html b/webcit/static/t/room/display_private.html
index c715406515b7ece8219523b5d39ecf3713147c6c..c80d31215dea3a7437c5fc5374e919826463102f 100644 (file)
--- a/webcit/static/t/room/display_private.html
+++ b/webcit/static/t/room/display_private.html
@@ -4,7 +4,7 @@
 </div>
 <div id="content" class="service">
 
-<?=("beginbox_1")><?_("Go to a hidden room")><?=("beginbox_2")>
+<?=("box_begin_1")><?_("Go to a hidden room")><?=("box_begin_2")>
 <p><?_("If you know the name of a hidden (guess-name) or passworded room, you can enter that room by typing its name below.  Once you gain access to a private room, it will appear in your regular room listings so you don‘t have to keep returning here.")></p>
 <form method="post" action="goto_private">
 <input type="hidden" name="nonce" value="<?NONCE>">
@@ -29,6 +29,6 @@
 &nbsp;<input type="submit" name="cancel_button" value="<?_("Cancel")>">
 </div></form>
 
-<?=("endbox")>
+<?=("box_end")>
 </div>
 <?=("trailing")>

diff --git a/webcit/static/t/room/zapped_list.html b/webcit/static/t/room/zapped_list.html
index 567f17180e25864e5d480c8dda3200c3e95ade2c..313792fdbe70f0decaee0c438178df13b11f16bf 100644 (file)
--- a/webcit/static/t/room/zapped_list.html
+++ b/webcit/static/t/room/zapped_list.html
@@ -4,10 +4,10 @@
 </div>
 <div id="content" class="service">
 
-<?=("beginbox_1")><?_("Zapped (forgotten) rooms")><?=("beginbox_2")>
+<?=("box_begin_1")><?_("Zapped (forgotten) rooms")><?=("box_begin_2")>
 <?ITERATE("LZRM", ="room_zap_entry")>
 <br><br>
 <?_("Click on any room to un-zap it and goto that room.")>
-<?=("endbox")>
+<?=("box_end")>
 </div>
 <?=("trailing")>

diff --git a/webcit/static/t/sieve/add.html b/webcit/static/t/sieve/add.html
index 897f6dd01bb619ee874c5cac99b443d75454e92e..51c1f39714ac5b3d9bd58d6c42bd9ec546ee8290 100644 (file)
--- a/webcit/static/t/sieve/add.html
+++ b/webcit/static/t/sieve/add.html
@@ -7,7 +7,7 @@
        <?SIEVE:MESSAGE>
 
        <table border=0 cellspacing=10><tr valign=top><td>
-               <?=("beginbox_1")><?_("Add a new script")><?=("beginbox_2")>
+               <?=("box_begin_1")><?_("Add a new script")><?=("box_begin_2")>
                        <?_("To create a new script, enter the desired script name in the box below and click 'Create'.")>
                        <br><br>
                        <center><form method="POST" action="create_script">
@@ -15,13 +15,13 @@
                                <?_("Script name: ")>
                                <input type="text" name="script_name"><br>
                                <input type="submit" name="create_button" value='<?_("Create")>'></form></center>
-               <?=("endbox")>
-               <?=("beginbox_1")><?_("Edit scripts")><?=("beginbox_2")>
+               <?=("box_end")>
+               <?=("box_begin_1")><?_("Edit scripts")><?=("box_begin_2")>
                        <br><div align="center">
                        <a href="display_sieve"><?_("Return to the script editing screen")></a><br><br>
-               <?=("endbox")>
+               <?=("box_end")>
        </td><td>
-               <?=("beginbox_1")><?_("Delete scripts")><?=("beginbox_2")>
+               <?=("box_begin_1")><?_("Delete scripts")><?=("box_begin_2")>
                        <?_("To delete an existing script, select the script name from the list and click 'Delete'.")>
                        <br><br>
                        <center><form method="POST" action="delete_script">
@@ -29,4 +29,4 @@
                        <select name="script_name" size=10 style="width:100%%">
                                <?ITERATE("SIEVE:SCRIPTS", ="sieve_script_select")>
                        </select>
-               <?=("endbox")>
+               <?=("box_end")>

diff --git a/webcit/subst.c b/webcit/subst.c
index f857882dc9c24156dce0d4f3fd71e670bff25eab..1a08abc245f131cc1a3fed562d130db4862b8848 100644 (file)
--- 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 6c0ce1d04ae2d7241b135c0859cb2eb234063084..aae67d9304b26604fdb627f42f019cdfa8c0796a 100644 (file)
--- 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("<input type=\"submit\" name=\"cancel_button\" value=\"%s\"><br>\n", _("Cancel"));
        wc_printf("</div></form>\n");
 
-       do_template("endbox");
+       do_template("box_end");
        wDumpContent(1);
 }
 

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 14074303843ab8c0eccc9ac98386e4dd84d6ca86..c732144e3c9093e08a9db565bae4a312ed991f88 100644 (file)
--- 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("<form method=\"POST\" action=\"submit_vcard\">\n");
        wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
@@ -1222,7 +1222,7 @@ void do_edit_vcard(long msgnum, char *partnum,
        );
        
        wc_printf("</td></tr></table>\n");
-       do_template("endbox");
+       do_template("box_end");
        wDumpContent(1);
        if (Msg != NULL) {
                DestroyMessageSummary(Msg);