Backport sieve editor fixes from git master

[citadel.git] / webcit / static / t / sieve / add.html

diff --git a/webcit/static/t/sieve/add.html b/webcit/static/t/sieve/add.html
index 9eea08e86a11de400e91cff7bb78df4388060146..b0c4bad48f05f0d4e438deb68b68d73237888a36 100644 (file)
--- a/webcit/static/t/sieve/add.html
+++ b/webcit/static/t/sieve/add.html
@@ -1,32 +1,45 @@
+<?=("head")><?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
+
 <div id="banner">
-<img src="static/advanpage2_48x.gif">
-<?_("Add or delete scripts")>
-</h1>
+       <img src="static/webcit_icons/essen/32x32/config.png">
+       <h1><?_("Add or delete scripts")></h1>
 </div>
        
 <div id="content" class="service">
-<?SIEVE:MESSAGE>
+       <?SIEVE:MESSAGE>
+
+       <table border=0 cellspacing=10><tr valign=top><td>
+               <?=("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">
+                               <input type="hidden" name="nonce" value="<?NONCE>">
+                               <?_("Script name: ")>
+                               <input type="text" name="script_name"><br>
+                               <input type="submit" name="create_button" value='<?_("Create")>'></form></center>
+               <?=("box_end")>
+               <?=("box_begin_1")><?_("Edit scripts")><?=("box_begin_2")>
+                       <br><div align="center">
+                       <a href="do_template?template=sieve_list"><?_("Return to the script editing screen")></a><br><br>
+               <?=("box_end")>
+       </td><td>
+               <?=("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">
+                       <input type="hidden" name="nonce" value="<?NONCE>">
+                       <select name="script_name" size=10 style="width:100%%">
+                               <?ITERATE("SIEVE:SCRIPTS", ="sieve_script_select")>
+                       </select>
+                       <input type="submit" name="delete_button" value='<?_("Delete")>'></form>
+                       </form>
+               <?=("box_end")>
+       <td>
+       </tr>
+       </table>
+
+there is all sorts of stuff missing here, wtf ?
 
-<table border=0 cellspacing=10><tr valign=top><td>
-<?=("beginbox_1")> <?_("Add a new script")><?=("beginbox_2")>
-<?_("To create a new script, enter the desired script name in the box below and click 'Create'.")>
-<br><br>
+</div> <!-- end of 'content' div -->
+<?=("trailing")>
 
-<center><form method="POST" action="create_script">
-<input type="hidden" name="nonce" value="<?NONCE>">
-<?_("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")>
-<br><div align=center><a href="display_sieve"><?_("Return to the script editing screen")></a><br><br>
-<?=("endbox")>
-</td><td>
-<?=("beginbox_1")><?_("Delete scripts")><?=("beginbox_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">
-<input type="hidden" name="nonce" value="<?NONCE>">
-<select name="script_name" size=10 style="width:100%%">
-<?ITERATE("SIEVE:SCRIPTS", ="sieve_script_select")>
-</select>