Migrated the sieve screens to room_banner_override. This removes the last of the...

diff --git a/webcit/sieve.c b/webcit/sieve.c
index 668d5f894715bb9732ef58169ff5634f0408ac90..52d68f7574612c1340a8a47c6cb9b98fb979923c 100644 (file)
--- a/webcit/sieve.c
+++ b/webcit/sieve.c
@@ -444,7 +444,7 @@ void create_script(void) {
                }
        }
 
-       output_headers(1, 1, 2, 0, 0, 0);
+       output_headers(1, 1, 1, 0, 0, 0);
        do_template("sieve_add");
        wDumpContent(1);
 }
@@ -458,7 +458,7 @@ void delete_script(void) {
 
        serv_printf("MSIV deletescript|%s", bstr("script_name"));
        serv_getln(buf, sizeof buf);
-       output_headers(1, 1, 2, 0, 0, 0);
+       output_headers(1, 1, 1, 0, 0, 0);
        do_template("sieve_add");
        wDumpContent(1);
 }
@@ -469,7 +469,7 @@ void delete_script(void) {
  */
 void display_no_sieve(void) {
 
-       output_headers(1, 1, 2, 0, 0, 0);
+       output_headers(1, 1, 1, 0, 0, 0);
        do_template("sieve_none");
        wDumpContent(1);
 }

diff --git a/webcit/static/t/sieve/add.html b/webcit/static/t/sieve/add.html
index d3795ea31c56417a5cccfc3422bef31b835b321a..3da5fa245c60b78ee21854cca954cb2dbedcce1d 100644 (file)
--- a/webcit/static/t/sieve/add.html
+++ b/webcit/static/t/sieve/add.html
@@ -1,10 +1,7 @@
-<?=("head")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
-
-<div id="banner">
+<div id="room_banner_override">
        <img src="static/webcit_icons/essen/32x32/config.png">
        <h1><?_("Add or delete scripts")></h1>
 </div>
-       
 <div id="content" class="service">
        <?SIEVE:MESSAGE>
 
@@ -38,5 +35,3 @@
        </tr>
        </table>
 </div> <!-- end of 'content' div -->
-<?=("trailing")>
-

diff --git a/webcit/static/t/sieve/none.html b/webcit/static/t/sieve/none.html
index 6b241265a6d6c1dce9a29e73011e5e4d2e1f1d7a..70884c63005da789738d92da427660ee908ee534 100644 (file)
--- a/webcit/static/t/sieve/none.html
+++ b/webcit/static/t/sieve/none.html
@@ -1,6 +1,4 @@
-<?=("head")>
-<?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
-<div id="banner">
+<div id="room_banner_override">
 <img src="static/advanpage2_48x.gif">
 <h1>
 <?_("View/edit server-side mail filters")>
@@ -11,4 +9,3 @@
 <?_("This installation of Citadel was built without support for server-side mail filtering.<br>Please contact your system administrator if you require this feature.<br>")>
 
 </td></tr></table>
-<?=("trailing")>