Author: solomax
Date: Wed Nov 23 11:16:48 2016
New Revision: 1770948
URL: http://svn.apache.org/viewvc?rev=1770948&view=rev
Log:
[OPENMEETINGS-1488] room logo is displayed in 3.2+
Modified:
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/room.css
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css
Modified:
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.java?rev=1770948&r1=1770947&r2=1770948&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.java
Wed Nov 23 11:16:48 2016
@@ -44,6 +44,7 @@ public abstract class AbstractAppointmen
abstract String getPrefix();
+ @Override
Fragment getSubjectFragment() {
Fragment f = new Fragment(COMP_ID, "subject", this);
f.add(new OmTextLabel("prefix", getPrefix())
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/room.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/room.css?rev=1770948&r1=1770947&r2=1770948&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/room.css
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/room.css
Wed Nov 23 11:16:48 2016
@@ -73,6 +73,12 @@
.room.menu.right .icon.share {
background-image: url(images/monitor_go.png);
}
+.room.menu.right .icon .profile {
+ margin-top: 3px;
+}
+.room.menu.right .icon .profile img {
+ width: 28px;
+}
.room.sidebar.left {
min-width: 200px;
width: 315px;
@@ -118,16 +124,22 @@
height: 40px;
padding-left: 5px;
padding-top: 5px;
+ background-size: 40px 40px;
+ background-repeat: no-repeat;
+ background-position: 2px 2px;
}
-.room.sidebar.left .user.list .user .user.name {
+.room.sidebar.left .user.list .user .name {
line-height: 18px;
height: 18px;
padding: 0;
+ padding-left: 44px;
+ overflow: hidden;
}
-.room.sidebar.left .user.list .user .user.actions {
+.room.sidebar.left .user.list .user .actions {
position: relative;
height: 18px;
padding: 0;
+ padding-left: 44px;
visibility: hidden;
}
.room.sidebar.left .user.list .user:hover .user.actions {
@@ -164,9 +176,6 @@
.right.moderator.ui-icon.granted {
background-image: url(images/user_delete.png);
}
-.right.ui-icon {
- opacity: 0.2;
-}
.right.wb.ui-icon {
background-image: url(images/pencil_add.png);
}
@@ -186,27 +195,21 @@
background-image: url(images/mouse_delete.png);
}
.right.audio.ui-icon {
- opacity: 1;
background-image: url(images/microphone_add.png);
}
.right.audio.ui-icon.granted {
- opacity: 0.2;
background-image: url(images/microphone_delete.png);
}
.right.camera.ui-icon {
- opacity: 1;
background-image: url(images/webcam_add.png);
}
.right.camera.ui-icon.granted {
- opacity: 0.2;
background-image: url(images/webcam_delete.png);
}
.global-mute.ui-icon {
- opacity: 0.2;
background-image: url(images/sound.png);
}
.exclsv-audio.ui-icon {
- opacity: 0.2;
background-image: url(images/microphone_exclusive.png);
}
.kick.ui-icon {
@@ -216,12 +219,27 @@
.restart.ui-icon {
background-image: url(images/arrow_refresh_small.png);
}
+.settings.ui-icon {
+ background-image: url(images/settings.png);
+}
+.activity.cam.ui-icon {
+ background-image: url(images/webcam_enable.png);
+}
+.activity.cam.enabled.ui-icon {
+ background-image: url(images/webcam_disable.png);
+}
+.activity.mic.ui-icon {
+ background-image: url(images/microphone_enable.png);
+}
+.activity.mic.enabled.ui-icon {
+ background-image: url(images/microphone_disable.png);
+}
.room.sidebar.left .tabs, .room.sidebar.left .tabs #utab, .room.sidebar.left
.tabs #ftab {
padding: 0;
}
.room.sidebar.left .user.list .user.current {
font-weight: bold;
- background: #00FF00;
+ background-color: #00FF00;
}
.ui-dialog.video, .ui-dialog.video .ui-dialog-titlebar, .ui-dialog.video
.video.ui-dialog-content {
padding: 0;
Modified:
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.java?rev=1770948&r1=1770947&r2=1770948&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.java
Wed Nov 23 11:16:48 2016
@@ -44,6 +44,7 @@ public abstract class AbstractAppointmen
abstract String getPrefix();
+ @Override
Fragment getSubjectFragment() {
Fragment f = new Fragment(COMP_ID, "subject", this);
f.add(new OmTextLabel("prefix", getPrefix())
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html?rev=1770948&r1=1770947&r2=1770948&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
Wed Nov 23 11:16:48 2016
@@ -25,6 +25,8 @@
<span wicket:id="ask" class="icon ask"></span>
<span wicket:id="share" class="icon share"></span>
<span wicket:id="roomName" class="room name"></span>
+ <span wicket:id="tag" class="room name"></span>
+ <span wicket:id="logo" class="icon"></span>
<span wicket:id="demo" class="ui-state-error room demo"></span>
</div>
<div wicket:id="invite"></div>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java?rev=1770948&r1=1770947&r2=1770948&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
Wed Nov 23 11:16:48 2016
@@ -23,6 +23,7 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.Application.removeUserFromRoom;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
+import static
org.apache.openmeetings.web.util.GroupLogoResourceReference.getUrl;
import static org.apache.openmeetings.web.util.OmUrlFragment.ROOMS_PUBLIC;
import java.util.ArrayList;
@@ -36,12 +37,14 @@ import org.apache.openmeetings.db.dao.us
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.Room.RoomElement;
import org.apache.openmeetings.db.entity.room.RoomPoll;
+import org.apache.openmeetings.db.entity.user.Group;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.util.message.RoomMessage;
import org.apache.openmeetings.util.message.TextRoomMessage;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.Client;
import org.apache.openmeetings.web.app.WebSession;
+import org.apache.openmeetings.web.common.ImagePanel;
import org.apache.openmeetings.web.common.InvitationDialog;
import org.apache.openmeetings.web.common.OmButton;
import org.apache.openmeetings.web.common.menu.MenuPanel;
@@ -174,6 +177,21 @@ public class RoomMenuPanel extends Panel
sipDialer.open(target);
}
};
+ private final ImagePanel logo = new ImagePanel("logo") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected String getImageUrl() {
+ return getUrl(getRequestCycle(), getGroup().getId());
+ }
+ };
+
+ private Group getGroup() {
+ Room r = room.getRoom();
+ return r.getRoomGroups() == null || r.getRoomGroups().isEmpty()
+ ? new Group()
+ : r.getRoomGroups().get(0).getGroup();
+ }
public RoomMenuPanel(String id, final RoomPanel room) {
super(id);
@@ -184,6 +202,8 @@ public class RoomMenuPanel extends Panel
add((menuPanel = new MenuPanel("menu",
getMenu())).setVisible(isVisible()));
add(askBtn);
add((roomName = new Label("roomName",
r.getName())).setOutputMarkupId(true));
+ String tag = getGroup().getTag();
+ add(logo, new Label("tag",
tag).setVisible(!Strings.isEmpty(tag)));
add(shareBtn = new StartSharingButton("share",
room.getClient()));
RoomInvitationForm rif = new RoomInvitationForm("form",
room.getRoom().getId());
add(invite = new InvitationDialog("invite", rif));
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css?rev=1770948&r1=1770947&r2=1770948&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css
Wed Nov 23 11:16:48 2016
@@ -73,6 +73,12 @@
.room.menu.right .icon.share {
background-image: url(images/monitor_go.png);
}
+.room.menu.right .icon .profile {
+ margin-top: 3px;
+}
+.room.menu.right .icon .profile img {
+ width: 28px;
+}
.room.sidebar.left {
min-width: 200px;
width: 315px;
Modified:
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.java?rev=1770948&r1=1770947&r2=1770948&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.java
(original)
+++
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.java
Wed Nov 23 11:16:48 2016
@@ -44,6 +44,7 @@ public abstract class AbstractAppointmen
abstract String getPrefix();
+ @Override
Fragment getSubjectFragment() {
Fragment f = new Fragment(COMP_ID, "subject", this);
f.add(new OmTextLabel("prefix", getPrefix())
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html?rev=1770948&r1=1770947&r2=1770948&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
Wed Nov 23 11:16:48 2016
@@ -25,6 +25,8 @@
<span wicket:id="ask" class="icon ask"></span>
<span wicket:id="share" class="icon share"></span>
<span wicket:id="roomName" class="room name"></span>
+ <span wicket:id="tag" class="room name"></span>
+ <span wicket:id="logo" class="icon"></span>
<span wicket:id="demo" class="ui-state-error room demo"></span>
</div>
<div wicket:id="invite"></div>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java?rev=1770948&r1=1770947&r2=1770948&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
Wed Nov 23 11:16:48 2016
@@ -23,6 +23,7 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.Application.removeUserFromRoom;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
+import static
org.apache.openmeetings.web.util.GroupLogoResourceReference.getUrl;
import static org.apache.openmeetings.web.util.OmUrlFragment.ROOMS_PUBLIC;
import java.util.ArrayList;
@@ -36,12 +37,14 @@ import org.apache.openmeetings.db.dao.us
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.Room.RoomElement;
import org.apache.openmeetings.db.entity.room.RoomPoll;
+import org.apache.openmeetings.db.entity.user.Group;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.util.message.RoomMessage;
import org.apache.openmeetings.util.message.TextRoomMessage;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.Client;
import org.apache.openmeetings.web.app.WebSession;
+import org.apache.openmeetings.web.common.ImagePanel;
import org.apache.openmeetings.web.common.InvitationDialog;
import org.apache.openmeetings.web.common.OmButton;
import org.apache.openmeetings.web.common.menu.MenuPanel;
@@ -174,6 +177,21 @@ public class RoomMenuPanel extends Panel
sipDialer.open(target);
}
};
+ private final ImagePanel logo = new ImagePanel("logo") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected String getImageUrl() {
+ return getUrl(getRequestCycle(), getGroup().getId());
+ }
+ };
+
+ private Group getGroup() {
+ Room r = room.getRoom();
+ return r.getRoomGroups() == null || r.getRoomGroups().isEmpty()
+ ? new Group()
+ : r.getRoomGroups().get(0).getGroup();
+ }
public RoomMenuPanel(String id, final RoomPanel room) {
super(id);
@@ -184,6 +202,8 @@ public class RoomMenuPanel extends Panel
add((menuPanel = new MenuPanel("menu",
getMenu())).setVisible(isVisible()));
add(askBtn);
add((roomName = new Label("roomName",
r.getName())).setOutputMarkupId(true));
+ String tag = getGroup().getTag();
+ add(logo, new Label("tag",
tag).setVisible(!Strings.isEmpty(tag)));
add(shareBtn = new StartSharingButton("share",
room.getClient()));
RoomInvitationForm rif = new RoomInvitationForm("form",
room.getRoom().getId());
add(invite = new InvitationDialog("invite", rif));
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css?rev=1770948&r1=1770947&r2=1770948&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css
Wed Nov 23 11:16:48 2016
@@ -73,6 +73,12 @@
.room.menu.right .icon.share {
background-image: url(images/monitor_go.png);
}
+.room.menu.right .icon .profile {
+ margin-top: 3px;
+}
+.room.menu.right .icon .profile img {
+ width: 28px;
+}
.room.sidebar.left {
min-width: 200px;
width: 315px;
