From 6739b508c3bc244478041194bf87b6a505b2efc3 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Thu, 4 Jan 2018 16:27:56 +0000
Subject: [PATCH] Small css and text fixes

---
 css/converse.css            | 3 ++-
 css/inverse.css             | 6 +++++-
 sass/_controlbox.scss       | 1 +
 sass/inverse/_roster.scss   | 3 +++
 sass/inverse/inverse.scss   | 1 +
 src/converse-muc.js         | 9 ++++++---
 src/templates/no_rooms.html | 1 +
 7 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 sass/inverse/_roster.scss
 create mode 100644 src/templates/no_rooms.html

diff --git a/css/converse.css b/css/converse.css
index 6bbc6ee7d..444a03e67 100644
--- a/css/converse.css
+++ b/css/converse.css
@@ -2037,7 +2037,8 @@
         font-weight: normal;
         padding: 0;
         padding-bottom: 0.5em;
-        text-shadow: 0 1px 0 #FAFAFA; }
+        text-shadow: 0 1px 0 #FAFAFA;
+        word-wrap: break-word; }
       #conversejs #controlbox #chatrooms .rooms-list-container dl.rooms-list .available-chatroom,
       #conversejs #controlbox #chatrooms .rooms-list-container dl.rooms-list .open-chatroom {
         border: none;
diff --git a/css/inverse.css b/css/inverse.css
index bcfeb1284..6be5d98fd 100644
--- a/css/inverse.css
+++ b/css/inverse.css
@@ -2123,7 +2123,8 @@ body {
         font-weight: normal;
         padding: 0;
         padding-bottom: 0.5em;
-        text-shadow: 0 1px 0 #FAFAFA; }
+        text-shadow: 0 1px 0 #FAFAFA;
+        word-wrap: break-word; }
       #conversejs #controlbox #chatrooms .rooms-list-container dl.rooms-list .available-chatroom,
       #conversejs #controlbox #chatrooms .rooms-list-container dl.rooms-list .open-chatroom {
         border: none;
@@ -2633,6 +2634,9 @@ body {
     line-height: 22px;
     width: 100%; }
 
+#conversejs #converse-roster {
+  padding-bottom: 3em; }
+
 #conversejs #controlbox #chatrooms .bookmarks-list dl.rooms-list.bookmarks dd.available-chatroom a.open-room {
   width: 80%; }
 
diff --git a/sass/_controlbox.scss b/sass/_controlbox.scss
index d4f4a5ce2..978ced7bd 100644
--- a/sass/_controlbox.scss
+++ b/sass/_controlbox.scss
@@ -205,6 +205,7 @@
                         padding: 0;
                         padding-bottom: 0.5em;
                         text-shadow: 0 1px 0 $text-shadow-color;
+                        word-wrap: break-word;
                     }
                     .available-chatroom,
                     .open-chatroom {
diff --git a/sass/inverse/_roster.scss b/sass/inverse/_roster.scss
new file mode 100644
index 000000000..8f6075af9
--- /dev/null
+++ b/sass/inverse/_roster.scss
@@ -0,0 +1,3 @@
+#conversejs #converse-roster {
+    padding-bottom: 3em;
+}
diff --git a/sass/inverse/inverse.scss b/sass/inverse/inverse.scss
index 937edde91..06cf8e3ac 100644
--- a/sass/inverse/inverse.scss
+++ b/sass/inverse/inverse.scss
@@ -17,6 +17,7 @@
 @import "../controlbox";
 @import "controlbox";
 @import "../roster";
+@import "roster";
 @import "../bookmarks";
 @import "bookmarks";
 @import "../chatrooms";
diff --git a/src/converse-muc.js b/src/converse-muc.js
index d0d7992e7..c5219b249 100644
--- a/src/converse-muc.js
+++ b/src/converse-muc.js
@@ -28,6 +28,7 @@
             "tpl!chatroom_toolbar",
             "tpl!chatrooms_tab",
             "tpl!info",
+            "tpl!no_rooms",
             "tpl!occupant",
             "tpl!room_description",
             "tpl!room_item",
@@ -58,6 +59,7 @@
             tpl_chatroom_toolbar,
             tpl_chatrooms_tab,
             tpl_info,
+            tpl_no_rooms,
             tpl_occupant,
             tpl_room_description,
             tpl_room_item,
@@ -2633,8 +2635,9 @@
 
                 informNoRoomsFound () {
                     const chatrooms_el = this.el.querySelector('#available-chatrooms');
-                    // For translators: %1$s is a variable and will be replaced with the XMPP server name
-                    chatrooms_el.innerHTML = `<dt>${__('No rooms on %1$s', this.model.get('muc_domain'))}</dt>`;
+                    chatrooms_el.innerHTML = tpl_no_rooms({
+                        'no_rooms_text': __('No rooms found')
+                    });
                     const input_el = this.el.querySelector('input#show-rooms');
                     input_el.classList.remove('hidden')
                     this.removeSpinner();
@@ -2677,7 +2680,7 @@
                 },
 
                 updateRoomsList () {
-                    /* Send and IQ stanza to the server asking for all rooms
+                    /* Send an IQ stanza to the server asking for all rooms
                      */
                     _converse.connection.sendIQ(
                         $iq({
diff --git a/src/templates/no_rooms.html b/src/templates/no_rooms.html
new file mode 100644
index 000000000..2fe068d88
--- /dev/null
+++ b/src/templates/no_rooms.html
@@ -0,0 +1 @@
+<dt class="centered">{{{ o.no_rooms_text }}}</dt>