From 24964b15db4b243835de8b5c4c1bc40280c5e881 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 1 Jul 2012 11:01:27 +0200
Subject: [PATCH] Roomedit - Sharing: swap layout

  - if we change the sequence the tables appear, removing columns work.
  - split i18n text so there is no html inside.
---
 webcit/static/t/room/edit/tab_share.html | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/webcit/static/t/room/edit/tab_share.html b/webcit/static/t/room/edit/tab_share.html
index b1acd3cd8..5b0715eae 100644
--- a/webcit/static/t/room/edit/tab_share.html
+++ b/webcit/static/t/room/edit/tab_share.html
@@ -2,8 +2,9 @@
 	<br />
 	<table border="1" cellpadding="5">
 		<tr>
+			<td><b><i><?_("Not shared with")></i></b></td>
 			<td><b><i><?_("Shared with")></i></b></td>
-			<td><b><i><?_("Not shared with")></i></b></td></tr>
+		</tr>
 		<tr>
 			<td valign="top">
 				<table border="0" cellpadding="5">
@@ -12,7 +13,7 @@
 						<td><?_("Remote room name")></td>
 						<td><?_("Actions")></td>
 					</tr>
-					<?ITERATE("ITERATE:THISROOM:GNET", ="room_edit_shared_room_removal", 0, 0, -1, #"ignet_push_share")>
+					<?ITERATE("NODECONFIG", ="room_edit_shared_room_add")>
 				</table>
 			</td>
 			<td valign="top">
@@ -22,19 +23,23 @@
 						<td><?_("Remote room name")></td>
 						<td><?_("Actions")></td>
 					</tr>
-					<?ITERATE("NODECONFIG", ="room_edit_shared_room_add")>
+					<?ITERATE("ITERATE:THISROOM:GNET", ="room_edit_shared_room_removal", 0, 0, -1, #"ignet_push_share")>
 				</table>
 			</td>
 		</tr>
 	</table>
 	<br />
-	<i>
+	<div id="hints">
 		<b><?_("Notes:")></b>
-		<ul>
+		<div><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>
-				<?_("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.")>
+			  <?_("If the remote room name is blank, it is assumed that the room name is identical on the remote node.")>
+			</li> <li>
+		          <?_("If the remote room name is different, the remote node must also configure the name of the room here.")>
 			</li>
-		</ul>
-	</i>
+		</ul></div>
+	</div>
 	<br />
 </div>
-- 
2.30.2