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/28 16:47:14 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2707] tooltip is added
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 0feade0 [OPENMEETINGS-2707] tooltip is added
0feade0 is described below
commit 0feade0b8a90cb44ac8148ceac8919669bfdc657
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sun Nov 28 23:46:59 2021 +0700
[OPENMEETINGS-2707] tooltip is added
---
.../org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.html | 2 +-
.../org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.html
index 17df9ee..efb36d0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.html
@@ -23,7 +23,7 @@
<wicket:panel>
<div class="rooms-header">
<div wicket:id="title" class="rooms title"></div>
- <i class="fas fa-info-circle m-1 text-info"></i><div wicket:id="desc" class="rooms desc"></div>
+ <i wicket:id="desc-info" class="fas fa-info-circle m-1 text-info om-tooltip"></i><div wicket:id="desc" class="rooms desc"></div>
</div>
<div class="rooms-area" wicket:id="rooms"></div>
</wicket:panel>
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 d10cbf1..f8c7716 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
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.user.rooms;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_TITLE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.isMyRoomsEnabled;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import static org.apache.openmeetings.web.util.OmUrlFragment.TYPE_GROUP;
@@ -26,6 +27,8 @@ import static org.apache.openmeetings.web.util.OmUrlFragment.TYPE_MY;
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.AttributeModifier;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
@@ -61,6 +64,7 @@ public class RoomsSelectorPanel extends UserBasePanel {
}
add(new Label("title", new ResourceModel(title)));
add(new Label("desc", new ResourceModel(desc)).setRenderBodyOnly(true));
+ add(new WebMarkupContainer("desc-info").add(AttributeModifier.append(ATTR_TITLE, getString(desc))));
super.onInitialize();
}
}