* sanitize the_mgts templates as webcit tells us; not functional yet.

diff --git a/webcit/static/t/room/edit.html b/webcit/static/t/room/edit.html
new file mode 100644 (file)
index 0000000..f70087d
--- /dev/null
+++ b/webcit/static/t/room/edit.html
@@ -0,0 +1,22 @@
+<?=("head")><?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
+<div id="banner">
+xxxx
+</div>
+<div id="content" class="service fix_scrollbar_bug">
+
+<table border="0" cellspacing="0" cellpadding="0" ><tr><td>
+<form method="post" action="editroomtodo">
+<input type="hidden" name="nonce" value='<?NONCE>'>
+<?DOTABBED(_("Administration"), ="room_edit_tab_admin",
+          _("Configuration"), ="room_edit_tab_config",
+          _("Message expire policy"), ="room_edit_tab_expire",
+          _("Access controls"), ="room_edit_tab_access",
+          _("Sharing"), ="room_edit_tab_share",
+          _("Mailing list service"), ="room_edit_tab_listserv",
+          _("Remote retrieval"), ="room_edit_tab_feed",
+          "", ="room_edit_submit")>
+</form>
+</td></tr></table>
+
+</div>
+<?=("trailing")>

diff --git a/webcit/static/t/room/edit/er_config_tab_room_option_list.html b/webcit/static/t/room/edit/er_config_tab_room_option_list.html
index e1137aea3e059f1fe454eed6313ef30a002c2d2b..9a58264d36da9cd39416c89bad4543ca12f6c983 100644 (file)
--- a/webcit/static/t/room/edit/er_config_tab_room_option_list.html
+++ b/webcit/static/t/room/edit/er_config_tab_room_option_list.html
@@ -1 +1 @@
-<option <?%("COND:FLOOR:ISSUBROOM", 0, 1, "<?FLOOR:NAME>", "selected="selected", "")> value="<?FLOOR:ID>"><?FLOOR:NAME></option>
+<option <?%("COND:FLOOR:ISSUBROOM", 1, 1, "<?FLOOR:NAME>", 'selected="selected"', "")> value="<?FLOOR:ID>"><?FLOOR:NAME></option> /////TODO: FLOOR:NAME???

diff --git a/webcit/static/t/room/edit/submit.html b/webcit/static/t/room/edit/submit.html
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/webcit/static/t/room/edit/tab_access.html b/webcit/static/t/room/edit/tab_access.html
index 5a9a36af0bc5dc7673a0ae1e73031e0fb14c4d25..faf147e65939fe228625b77a6735c1998c3b4efa 100644 (file)
--- a/webcit/static/t/room/edit/tab_access.html
+++ b/webcit/static/t/room/edit/tab_access.html
@@ -2,31 +2,28 @@
        <table border="0" cellspacing="10">
                <tr valign="top">
                        <td>
-                               <?_("The users listed below have access to this room.  "
-                               "To remove a user from the access list, select the user "
-                               "name from the list and click 'Kick'.")>
+                               <?_("The users listed below have access to this room. To remove a user from the access list, select the user name from the list and click 'Kick'.")>
                                <br /><br />
                                <center>
                                        <form method="post" action="do_invt_kick">
                                                <input type="hidden" name="nonce" value="<?NONCE>" />
                                                <input type="hidden" name="tab" value="access" />
                                                <select name="username" size="10" style="width:100%">
-                                                       <?ITERATE("ITERATE:THISROOM:WHOK", ="username_list", 0, 0, -1, #"username")>
+                                                       <?ITERATE("ITERATE:THISROOM:WHOK", ="room_edit_username_list", 0, 0, -1, #"username")>
                                                </select>
                                                <br />
-                                               <input type="submit" name="kick_button" value="<?_("Kick")" />
+                                               <input type="submit" name="kick_button" value="<?_("Kick")>" />
                                        </form>
                                </center>
                        </td>
                        <td>
-                               <?_("To grant another user access to this room, enter the "
-                               "user name in the box below and click 'Invite'.")>
+                               <?_("To grant another user access to this room, enter the user name in the box below and click 'Invite'.")>
                                <br /><br />
                                <center>
                                        <form method="post" action="do_invt_kick">
                                                <input type="hidden" name="tab" value="access" />
                                                <input type="hidden" name="nonce" value="<?NONCE>">
-                                               <?_("Invite:"));
+                                               <?_("Invite:")>
                                                <input type="text" name="username" id="username_id" style="width:100R"><br />"
                                                <input type="hidden" name="invite_button" value="Invite" />
                                                <input type="submit" value="<?_("Invite")>" />

diff --git a/webcit/static/t/room/edit/tab_admin.html b/webcit/static/t/room/edit/tab_admin.html
index 7b4ee233e2b808bb506685ad6764582a8b2e469c..0ea0f884c014626afb8f8fba61614449ccbcdc9e 100644 (file)
--- a/webcit/static/t/room/edit/tab_admin.html
+++ b/webcit/static/t/room/edit/tab_admin.html
@@ -1,13 +1,13 @@
 <div class="tabcontent">
        <ul>
                <li>
-                       <a href="delete_room" onClick="return confirm('<?_("Are you sure you want to delete this room?")>')>
+                       <a href="delete_room" onClick="return confirm('<?_("Are you sure you want to delete this room?")>'")>
                                <?_("Delete this room")>
                        </a>
                </li>
                <li>
                        <a href="display_editroompic?which_room=<?ROOMNAME("U")>">
-                               <?_("Set or change the icon for this room's banner")>
+                               <?_("Set or change the icon for this rooms banner")>
                        </a>
                </li>
                <li>

diff --git a/webcit/static/t/room/edit/tab_config.html b/webcit/static/t/room/edit/tab_config.html
index 7518b9d307b472bb743791c7d8d8b7103f8e1fa1..2b429e3589bca13ca6c0406fee6bc1cf080e7c9f 100644 (file)
--- a/webcit/static/t/room/edit/tab_config.html
+++ b/webcit/static/t/room/edit/tab_config.html
@@ -9,10 +9,10 @@
                        <li>
                                <?_("Resides on floor: ")>
                                <select name="er_floor" size="1"
-                                       <?%("COND:THISROOM:FLAG:QR", 0, #"QR_MAILBOX", 1, 'disabled="disabled" >', ">")>
-                                       <?!("COND:THISROOM:FLAG:QR", 1, #"QR_MAILBOX")>
-                                               <?ITERATE("LFLR", ="er_config_tab_room_option_list")>
-                                       <??("X", 1)>
+                                       <?%("COND:THISROOM:FLAG:QR", 1, #"QR_MAILBOX", 1, 'disabled="disabled" >', ">")>
+                                       <?!("COND:THISROOM:FLAG:QR", 2, #"QR_MAILBOX")>
+                                               <?ITERATE("LFLR", ="room_edit_er_config_tab_room_option_list")>
+                                       <??("X", 2)>
                                </select>
                         </li>
                        <li>
@@ -21,41 +21,43 @@
                                        <li>
                                                <!-- this COND checks against the value of (QR_PRIVATE + QR_MAILBOX)) == 0 -->
                                                <input type="radio" name="type" value="public" 
-                                               <?%("COND:THISROOM:FLAG:QR", 2, "14688", 1, 'disabled="disabled" >', ">")>
+                                               <?%("COND:THISROOM:FLAG:QR", 3, "14688", 1, 'disabled="disabled" >', ">")>
                                                onChange="if (this.form.type[0].checked == true) { this.form.er_floor.disabled = false; }" />
                                                <?_("Public (automatically appears to everyone)")>
                                        </li>
                                        <li>
                                                <input type="radio" name="type" value="hidden" 
-                                                       <??("COND:THISROOM:FLAG:QR", 3, #"QR_PRIVATE")>
-                                                               <?%("COND:THISROOM:FLAG:QR", 4, #"QR_GUESSNAME", 1, 'checked="checked" ', "")> 
-                                                       <??("X", 3)>
+                                                       <??("COND:THISROOM:FLAG:QR", 4, #"QR_PRIVATE")>
+                                                               <?%("COND:THISROOM:FLAG:QR", 5, #"QR_GUESSNAME", 1, 'checked="checked" ', "")> 
+                                                       <??("X", 4)>
                                                onChange="if (this.form.type[1].checked == true) { this.form.er_floor.disabled = false; }" />
                                                <?_("Private - hidden (accessible to anyone who knows its name)")>
                                        </li>
                                        <li>
                                                <input type="radio" name="type" value="passworded" 
-                                                       <??("COND:THISROOM:FLAG:QR", 5, #"QR_PRIVATE")>
-                                                                       <?%("COND:THISROOM:FLAG:QR", 6, #"QR_PASSWORDED", 1, 'checked="checked" ', "")>
-                                                       <??("X", 5)>
-                                               onChange="this.form.er_floor.disabled = false; { (this.form.type[2].checked == true) } />
+                                                       <??("COND:THISROOM:FLAG:QR", 6, #"QR_PRIVATE")>
+                                                                       <?%("COND:THISROOM:FLAG:QR", 7, #"QR_PASSWORDED", 1, 'checked="checked" ', "")>
+                                                       <??("X", 6)>
+                                               onChange="this.form.er_floor.disabled = false; { (this.form.type[2].checked == true) }"
+                                                       />
                                                <?_("Private - require password: ")>
                                                <input type="text" name="er_password" value="<?PASSWORD("U")>" maxlength="9" />
                                        </li>
                                        <li>
                                                <input type="radio" name="type" value="invonly" 
-                                                       <??("COND:THISROOM:FLAG:QR", 7, #"QR_PRIVATE")>
-                                                                <??("COND:THISROOM:FLAG:QR", 8, #"QR_GUESSNAME")>
-                                                                       <?%("COND:THISROOM:FLAG:QR", 9, #"QR_PASSWORDED", 1, 'checked="checked" ', "")>
-                                                               <??("X", 8)>
-                                                       <??("X", 7)>
+                                                       <??("COND:THISROOM:FLAG:QR", 8, #"QR_PRIVATE")>
+                                                                <??("COND:THISROOM:FLAG:QR", 9, #"QR_GUESSNAME")>
+                                                                       <?%("COND:THISROOM:FLAG:QR", 10, #"QR_PASSWORDED", 1, 'checked="checked" ', "")>
+                                                               <??("X", 9)>
+                                                       <??("X", 8)>
                                                onChange="if (this.form.type[3].checked == true) { this.form.er_floor.disabled = false; }" />
                                                <?_("Private - invitation only")>            
                                        </li>
                                        <li>
                                                <input type="radio" name="type" value="personal" 
-                                                       <?%("COND:THISROOM:FLAG:QR", 10, #"QR_MAILBOX", 1, 'checked="checked" ', "")>
-                                                       onChange="if (this.form.type[4].checked == true) { this.form.er_floor.disabled = true; } />
+                                                       <?%("COND:THISROOM:FLAG:QR", 11, #"QR_MAILBOX", 1, 'checked="checked" ', "")>
+                                                       onChange="if (this.form.type[4].checked == true) { this.form.er_floor.disabled = true; }"
+                                                       />
                                                <?_("Personal (mailbox for you only)")>
                                        </li>
                                        <li>
@@ -65,22 +67,22 @@
                                </ul>
                                <li>
                                        <input type="checkbox" name="prefonly" value="yes" 
-                                       <?%("COND:THISROOM:FLAG:QR", 11, #"QR_PREFONLY", 1, 'checked="checked" ', "")> />     
+                                       <?%("COND:THISROOM:FLAG:QR", 12, #"QR_PREFONLY", 1, 'checked="checked" ', "")> />     
                                        <?_("Preferred users only")>
                                </li>
                                <li>
                                        <input type="checkbox" name="readonly" value="yes" 
-                                       <?%("COND:THISROOM:FLAG:QR", 12, #"QR_READONLY", 1, 'checked="checked" ', "")>  />
+                                       <?%("COND:THISROOM:FLAG:QR", 13, #"QR_READONLY", 1, 'checked="checked" ', "")>  />
                                        <?_("Read-only room")>
                                </li>
                                <li>
                                        <input type="checkbox" name="collabdel" value="yes" 
-                                       <?%("COND:THISROOM:FLAG:QR2", 13, #"QR2_COLLABDEL", 1, 'checked="checked" ', "")> />
+                                       <?%("COND:THISROOM:FLAG:QR2", 14, #"QR2_COLLABDEL", 1, 'checked="checked" ', "")> />
                                        <?_("All users allowed to post may also delete messages")>
                                </li>
                                <li>
                                        <input type="checkbox" name="directory" value="yes" 
-                                       <?%("COND:THISROOM:FLAG:QR", 14, #"QR_DIRECTORY", 1, 'checked="checked" ', "")>  />
+                                       <?%("COND:THISROOM:FLAG:QR", 15, #"QR_DIRECTORY", 1, 'checked="checked" ', "")>  />
                                        <?_("File directory room")>
                                </li>
                                <ul>
@@ -90,34 +92,34 @@
                                        </li>
                                        <li>
                                                <input type="checkbox" name="ulallowed" value="yes" 
-                                               <?%("COND:THISROOM:FLAG:QR", 15, #"QR_UPLOAD", 1, 'checked="checked" ', "")>  />
+                                               <?%("COND:THISROOM:FLAG:QR", 16, #"QR_UPLOAD", 1, 'checked="checked" ', "")>  />
                                                <?_("Uploading allowed")>
                                        </li>
                                        <li>
                                                <input type="checkbox" name="dlallowed" value="yes" 
-                                               <?%("COND:THISROOM:FLAG:QR", 16, #"QR_DOWNLOAD", 1, 'checked="checked" ', "")>  />
+                                               <?%("COND:THISROOM:FLAG:QR", 17, #"QR_DOWNLOAD", 1, 'checked="checked" ', "")>  />
                                                <?_("Downloading allowed")>
                                        </li>
                                        <li>
                                                <input type="checkbox" name="visdir" value="yes" 
-                                               <?%("COND:THISROOM:FLAG:QR", 17, #"QR_VISDIR", 1, 'checked="checked" ', "")>  />
+                                               <?%("COND:THISROOM:FLAG:QR", 18, #"QR_VISDIR", 1, 'checked="checked" ', "")>  />
                                                <?_("Visible directory")>
                                        </li>
                        </ul>
                        
                        <li>
                                <input type="checkbox" name="network" value="yes" 
-                               <?%("COND:THISROOM:FLAG:QR", 18, #"QR_NETWORK", 1, 'checked="checked" ', "")>  />
+                               <?%("COND:THISROOM:FLAG:QR", 19, #"QR_NETWORK", 1, 'checked="checked" ', "")>  />
                                <?_("Network shared room")>
                        </li>                         
                        <li>
                                <input type="checkbox" name="permanent" value="yes" 
-                               <?%("COND:THISROOM:FLAG:QR", 19, #"QR_PERMANENT", 1, 'checked="checked" ', "")>  />
+                               <?%("COND:THISROOM:FLAG:QR", 20, #"QR_PERMANENT", 1, 'checked="checked" ', "")>  />
                                <?_("Permanent (does not auto-purge)")>
                        </li>
                        <li>
                                <input type="checkbox" name="subjectreq" value="yes" 
-                               <?%("COND:THISROOM:FLAG:QR2", 20, #"QR2_SUBJECTREQ", 1, 'checked="checked" ', "")>  />
+                               <?%("COND:THISROOM:FLAG:QR2", 21, #"QR2_SUBJECTREQ", 1, 'checked="checked" ', "")>  />
                                <?_("Subject Required (Force users to specify a message subject)")>
                        </li>
                        <li>
@@ -126,25 +128,26 @@
                         <ul>
                                <li>
                                        <input type="radio" name="anon" value="no" 
-                                       <??("COND:THISROOM:FLAG:QR", 21, #"QR_ANONONLY")>
-                                               <?%("COND:THISROOM:FLAG:QR", 22, #"QR_ANONOPT", 1, 'checked="checked" ', "")>
-                                       <??("X", 21)> />
+                                       <??("COND:THISROOM:FLAG:QR", 22, #"QR_ANONONLY")>
+                                               <?%("COND:THISROOM:FLAG:QR", 23, #"QR_ANONOPT", 1, 'checked="checked" ', "")>
+                                       <??("X", 22)> />
                                        <?_("No anonymous messages")>
                                </li>
                                <li>
                                        <input type="radio" name="anon" value="anononly" 
-                                       <?%("COND:THISROOM:FLAG:QR", 23, #"QR_ANONONLY", 1, 'checked="checked" ', "")> />
+                                       <?%("COND:THISROOM:FLAG:QR", 24, #"QR_ANONONLY", 1, 'checked="checked" ', "")> />
                                        <?_("All messages are anonymous")>
                                </li>
                                <li>
                                        <input type="radio" name="anon" value="anon2" 
-                                       <?%("COND:THISROOM:FLAG:QR", 24, #"QR_ANONOPT", 1, 'checked="checked" ', "")> />
+                                       <?%("COND:THISROOM:FLAG:QR", 25, #"QR_ANONOPT", 1, 'checked="checked" ', "")> />
                                        <?_("Prompt user when entering messages")>
                                </li>
                        </ul>
                        <li>
                                <?_("Room aide: ")>
-                                <?%("COND:THISROOM:GETA", 25, ROOMAIDE, "<em><?GETA></em>", '<input type="text" name="er_roomaide" value="<?ROOMAIDE>" maxlength="25" /'>
+                               ////// TODO: ?GETA???
+                                <?%("COND:THISROOM:GETA", 26, ROOMAIDE, "<em><?GETA></em>")>, '<input type="text" name="er_roomaide" value="<?ROOMAIDE>" maxlength="25" /'>
                        </li>
        </ul>
 

diff --git a/webcit/static/t/room/edit/tab_expire.html b/webcit/static/t/room/edit/tab_expire.html
index b17895f3ec71f39a203ffeb5f4c9417c8873eb8b..20b152fe835f87e272b3a62a232b33e30f598adf 100644 (file)
--- a/webcit/static/t/room/edit/tab_expire.html
+++ b/webcit/static/t/room/edit/tab_expire.html
@@ -14,13 +14,13 @@
                                                ((roompolicy == 0) ? "CHECKED" : "") );
                                        <?_("Use the default policy for this floor")>&nbsp;
                                        <br />
-                                       <input type="radio" name="roompolicy" value="1" <?%("COND:EXPIRE:MODE", 1, #"mailboxespolicy", #"EXPIRE_MANUAL", 'checked="checked"',"" />&nbsp;
+                                       <input type="radio" name="roompolicy" value="1" <?%("COND:EXPIRE:MODE", 1, #"mailboxespolicy", #"EXPIRE_MANUAL", 'checked="checked"',"")> />&nbsp;
                                        <?_("Never automatically expire messages")>
                                        <br />
-                                       <input type="radio" name="roompolicy" value="2" <?%("COND:EXPIRE:MODE", 2, #"mailboxespolicy", #"EXPIRE_NUMMSG", 'checked="checked"', "" />&nbsp;
+                                       <input type="radio" name="roompolicy" value="2" <?%("COND:EXPIRE:MODE", 2, #"mailboxespolicy", #"EXPIRE_NUMMSG", 'checked="checked"', "")> />&nbsp;
                                        <?_("Expire by message count")>
                                        <br />
-                                       <input type="radio" name="roompolicy" value="3" <?%("COND:EXPIRE:MODE", 1, #"mailboxespolicy", #"EXPIRE_AGE", 'checked="checked"', "" /> />&nbsp;
+                                       <input type="radio" name="roompolicy" value="3" <?%("COND:EXPIRE:MODE", 1, #"mailboxespolicy", #"EXPIRE_AGE", 'checked="checked"', "")> />&nbsp;
                                        <?_("Expire by message age")>
                                        <br />
                                        <?_("Number of messages or days: ")>

diff --git a/webcit/static/t/room/edit/tab_feed.html b/webcit/static/t/room/edit/tab_feed.html
index e33240cf790c80ff70d5f3a0fb29064797573c47..48b96947f74ad9daf468830f99e25e6b1929cb3b 100644 (file)
--- a/webcit/static/t/room/edit/tab_feed.html
+++ b/webcit/static/t/room/edit/tab_feed.html
@@ -10,7 +10,7 @@
                        <th><?_("Interval")></th>
                        <th>&nbsp;</th>
                </tr>
-               <?ITERATE("ITERATE:THISROOM:GNET", ="pop3client_removal", 0, 0, -1, #"pop3client")>
+               <?ITERATE("ITERATE:THISROOM:GNET", ="room_edit_pop3client_removal", 0, 0, -1, #"pop3client")>
                <form method="post" action="netedit">
                        <tr>
                                <input type="hidden" name="tab" value="feeds" />
@@ -36,7 +36,7 @@
                        </th>
                        <th></th>
                </tr>
-               <?ITERATE("ITERATE:THISROOM:GNET", ="rssclient_removal", 0, 0, -1, #"rssclient")>
+               <?ITERATE("ITERATE:THISROOM:GNET", ="room_edit_rssclient_removal", 0, 0, -1, #"rssclient")>
                <form method="post" action="netedit">
                        <tr>
                                <input type="hidden" name="tab" value="feeds" />

diff --git a/webcit/static/t/room/edit/tab_listserv.html b/webcit/static/t/room/edit/tab_listserv.html
index 4c9e281c07ef3e1f16221460da6594a14f2a8858..fc7327cf7db19a87551dc6568e22ec47f88c6d7a 100644 (file)
--- a/webcit/static/t/room/edit/tab_listserv.html
+++ b/webcit/static/t/room/edit/tab_listserv.html
@@ -3,7 +3,7 @@
                <table border="0" width="100%" cellpadding="5">
                        <tr><td valign="top">
                        <?_("<i>The contents of this room are being mailed <b>as individual messages</b> to the following list recipients:</i><br /><br />")>
-                       <?ITERATE("ITERATE:THISROOM:GNET", ="listrecp_removal", 0, 0, -1, #"listrecp")>
+                       <?ITERATE("ITERATE:THISROOM:GNET", ="room_edit_listrecp_removal", 0, 0, -1, #"listrecp")>
                        <br />
                        <form method="post" action="netedit">
                                <input type="hidden" name="tab" value="listserv" />
@@ -15,7 +15,7 @@
                        </td>
                        <td valign="top">
                        <?_("<i>The contents of this room are being mailed <b>in digest form</b> to the following list recipients:</i><br /><br />")>
-                       <?ITERATE("ITERATE:THISROOM:GNET", ="digestrecp_removal", 0, 0, -1, #"digestrecp")>
+                       <?ITERATE("ITERATE:THISROOM:GNET", ="room_edit_digestrecp_removal", 0, 0, -1, #"digestrecp")>
                        <br />
                        <form method="post" action="netedit">
                                <input type="hidden" name="tab" value="listserv" />
@@ -47,13 +47,13 @@
                                <tr>
                                        <td colspan="2">
                                                <?_("The URL for subscribe/unsubscribe is: ")>
-                                               <tt><?%("COND:ISHTTPS", 3, 1, #"ISHTTPS", "https", "http">://<?SERV:FQDN>/listsub</tt>
+                                               <tt><?%("COND:IS_HTTPS", 3, 1, 0, "https", "http")>://<?SERV:FQDN>/listsub</tt>
                                        </td>
                                </tr>
                                <!-- Public posting? -->
                                <tr>
-                                       <td><?_("Allow non-subscribers to mail to this room.")></td>
-                                       <td><input type="checkbox" name="QR2_SubsOnly" value="yes" <?%("COND:THISROOM:FLAG:QR2", 20, #"QR2_SUBSONLY", 1, 'checked="checked" ', "")> /></td>
+                                       <td><?_("Allow non-subscribers to mail to this room.")></td> //// TODO: subonly / SMTP_PUBLIC??
+                                       <td><input type="checkbox" name="QR2_SubsOnly" value="yes" <?%("COND:THISROOM:FLAG:QR2", 20, #"QR2_SMTP_PUBLIC", 1, 'checked="checked" ', "")> /></td>
                                </tr>
                
                                <!-- Moderated List? -->

diff --git a/webcit/static/t/room/edit/tab_share.html b/webcit/static/t/room/edit/tab_share.html
index 6ed82a6dd3c66df2cf0c5dd8b4af54a38c8ced85..c74662ce382ce381ad597a35e9969f9e23d1c13a 100644 (file)
--- a/webcit/static/t/room/edit/tab_share.html
+++ b/webcit/static/t/room/edit/tab_share.html
@@ -12,7 +12,7 @@
                                                <td><?_("Remote room name")></td>
                                                <td><?_("Actions")></td>
                                        </tr>
-                                       <?ITERATE("ITERATE:THISROOM:GNET", ="shared_room_removal", 0, 0, -1, #"ignet_push_share")>
+                                       <?ITERATE("ITERATE:THISROOM:GNET", ="room_edit_shared_room_removal", 0, 0, -1, #"ignet_push_share")>
                                </table>
                        </td>
                        <td valign="top">
@@ -22,7 +22,7 @@
                                                <td><?_("Remote room name")></td>
                                                <td><?_("Actions")></td>
                                        </tr>
-                                       <?ITERATE("ITERATE:THISROOM:GNET", ="shared_room_add", 0, 0, -1, #"ignet_push_share")>
+                                       <?ITERATE("ITERATE:THISROOM:GNET", ="room_edit_shared_room_add", 0, 0, -1, #"ignet_push_share")>
                                </table>
                        </td>
                </tr>
@@ -32,15 +32,7 @@
                <b><?_("Notes:")></b>
                <ul>
                        <li>
-                               <?_("When sharing a room, 
-                               it must be shared from both ends.  Adding a node to 
-                               the 'shared' list sends messages out, but in order to
-                                receive messages, the other nodes must be configured
-                                to send messages out to your system as well. 
-                       <li>If the remote room name is blank, it is assumed 
-                               that the room name is identical on the remote node.
-                       <li>If the remote room name is different, the remote 
-                               node must also configure the name of the room here.")>
+                               <?_("When sharing a room, it must be shared from both ends.  Adding a node to the 'shared' list sends messages out, but in order to receive messages, the other nodes must be configured to send messages out to your system as well. <li>If the remote room name is blank, it is assumed that the room name is identical on the remote node. <li>If the remote room name is different, the remote node must also configure the name of the room here.")>
                </ul>
        </i>
        <br />