You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2021/11/24 04:41:21 UTC

[openmeetings] branch master updated: [OPENMEETINGS-2707] my-rooms header text looks better

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new f480c97  [OPENMEETINGS-2707] my-rooms header text looks better
f480c97 is described below

commit f480c97a4597da0590cd2a09ff78abb2d3ee67a0
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Nov 24 11:41:09 2021 +0700

    [OPENMEETINGS-2707] my-rooms header text looks better
---
 .../org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java   | 5 +++--
 openmeetings-web/src/main/webapp/css/raw-general.css                 | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java
index ffff1f7..d10cbf1 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java
@@ -27,6 +27,7 @@ import org.apache.openmeetings.db.dao.room.RoomDao;
 import org.apache.openmeetings.web.app.Application;
 import org.apache.openmeetings.web.common.UserBasePanel;
 import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.model.ResourceModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 
 public class RoomsSelectorPanel extends UserBasePanel {
@@ -58,8 +59,8 @@ public class RoomsSelectorPanel extends UserBasePanel {
 			desc = "778";
 			add(new RoomsPanel(PANEL_ID, roomDao.getPublicRooms()));
 		}
-		add(new Label("title", getString(title)));
-		add(new Label("desc", getString(desc)).setRenderBodyOnly(true));
+		add(new Label("title", new ResourceModel(title)));
+		add(new Label("desc", new ResourceModel(desc)).setRenderBodyOnly(true));
 		super.onInitialize();
 	}
 }
diff --git a/openmeetings-web/src/main/webapp/css/raw-general.css b/openmeetings-web/src/main/webapp/css/raw-general.css
index c93d171..7f2cdee 100644
--- a/openmeetings-web/src/main/webapp/css/raw-general.css
+++ b/openmeetings-web/src/main/webapp/css/raw-general.css
@@ -431,6 +431,9 @@ select.messages.selector {
 	min-height: var(--rooms-header-height);
 	max-height: var(--rooms-header-height);
 	height: var(--rooms-header-height);
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
 }
 #orgTabs, .rooms-area {
 	height: calc(100% - var(--rooms-header-height) - var(--buffer-size));