# HG changeset patch
# User souliane <souliane@mailoo.org>
# Date 1385557258 -3600
# Node ID 7316a5696366104775f206d3d93bf98aba129b34
# Parent  7a1dc69112b841fe9e402198812fff7652f61a10
browser_side: renamed item and labels for discussion groups

diff -r 7a1dc69112b8 -r 7316a5696366 browser_side/dialog.py
--- a/browser_side/dialog.py	Thu Nov 28 21:43:12 2013 +0100
+++ b/browser_side/dialog.py	Wed Nov 27 14:00:58 2013 +0100
@@ -50,18 +50,19 @@
         Grid.__init__(self, 2, 2, Width='100%')
         self.host = host
 
-        self.exist_radio = RadioButton("room", "Select discussion room:")
-        self.rooms_list = ListBox(Width='100%')
+        self.exist_radio = RadioButton("room", "Already joined:")
+        self.rooms_list = ListBox(Width='95%')
         self.setRooms()
-        self.add(self.exist_radio, 0, 0)
-        self.add(self.rooms_list, 0, 1)
 
-        self.new_radio = RadioButton("room", "New discussion room:")
+        self.new_radio = RadioButton("room", "Discussion room:")
         self.new_radio.setChecked(True)
-        self.box = TextBox(Width='100%')
+        self.box = TextBox(Width='95%')
         self.box.setText(self.GENERATE_MUC if default_room == "" else default_room)
-        self.add(self.new_radio, 1, 0)
-        self.add(self.box, 1, 1)
+
+        self.add(self.new_radio, 0, 0)
+        self.add(self.box, 0, 1)
+        self.add(self.exist_radio, 1, 0)
+        self.add(self.rooms_list, 1, 1)
 
         self.rooms_list.addFocusListener(self)
         self.box.addFocusListener(self)
@@ -155,7 +156,7 @@
 class RoomAndContactsChooser(DialogBox):
     """Select a room and some users to invite in"""
 
-    def __init__(self, host, callback, nb_contact=None, ok_button="OK", title="Group discussions",
+    def __init__(self, host, callback, nb_contact=None, ok_button="OK", title="Discussion groups",
                  title_room="Join room", title_invite="Invite contacts", visible=(True, True)):
         DialogBox.__init__(self, centered=True)
         self.host = host
diff -r 7a1dc69112b8 -r 7316a5696366 browser_side/menu.py
--- a/browser_side/menu.py	Thu Nov 28 21:43:12 2013 +0100
+++ b/browser_side/menu.py	Wed Nov 27 14:00:58 2013 +0100
@@ -147,7 +147,7 @@
         menu_contacts.addItem("Manage groups", MenuCmd(self, "onManageContactGroups"))
 
         menu_group = MenuBar(vertical=True)
-        menu_group.addItem("Join room", MenuCmd(self, "onJoinRoom"))
+        menu_group.addItem("Discussion", MenuCmd(self, "onJoinRoom"))
         menu_group.addItem("Collective radio", MenuCmd(self, "onCollectiveRadio"))
 
         menu_games = MenuBar(vertical=True)