You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by vd...@apache.org on 2016/11/15 09:52:45 UTC
svn commit: r1769765 - in
/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right:
AudioRightIcon.java RemoteControlRightIcon.java ScreenShareRightIcon.java
VideoRightIcon.java
Author: vdegtyarev
Date: Tue Nov 15 09:52:44 2016
New Revision: 1769765
URL: http://svn.apache.org/viewvc?rev=1769765&view=rev
Log:
OPENMEETINGS-1376 partially fixed. Right actions tooltips are corrected.
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/AudioRightIcon.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/RemoteControlRightIcon.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/ScreenShareRightIcon.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/VideoRightIcon.java
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/AudioRightIcon.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/AudioRightIcon.java?rev=1769765&r1=1769764&r2=1769765&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/AudioRightIcon.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/AudioRightIcon.java Tue Nov 15 09:52:44 2016
@@ -32,6 +32,6 @@ public class AudioRightIcon extends Room
@Override
protected String getTitle() {
- return getString(self ? "1606" : "1604");
+ return getString(self ? (hasRight() ? "1607" : "1606") : (hasRight() ? "1605" : "1604"));
}
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/RemoteControlRightIcon.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/RemoteControlRightIcon.java?rev=1769765&r1=1769764&r2=1769765&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/RemoteControlRightIcon.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/RemoteControlRightIcon.java Tue Nov 15 09:52:44 2016
@@ -32,13 +32,7 @@ public class RemoteControlRightIcon exte
@Override
protected String getTitle() {
- String title;
- if (client.hasRight(right)) {
- title = self ? "1081" : "1078";
- } else {
- title = "1080";
- }
- return getString(title);
+ return getString(self ? (hasRight() ? "1081" : "1080") : (hasRight() ? "1079" : "1078"));
}
@Override
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/ScreenShareRightIcon.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/ScreenShareRightIcon.java?rev=1769765&r1=1769764&r2=1769765&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/ScreenShareRightIcon.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/ScreenShareRightIcon.java Tue Nov 15 09:52:44 2016
@@ -32,13 +32,7 @@ public class ScreenShareRightIcon extend
@Override
protected String getTitle() {
- String title;
- if (client.hasRight(right)) {
- title = self ? "1071" : "1068";
- } else {
- title = "1072";
- }
- return getString(title);
+ return getString(self ?(hasRight() ? "1071" : "1070") : (hasRight() ? "1068" : "1067"));
}
@Override
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/VideoRightIcon.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/VideoRightIcon.java?rev=1769765&r1=1769764&r2=1769765&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/VideoRightIcon.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/VideoRightIcon.java Tue Nov 15 09:52:44 2016
@@ -32,7 +32,7 @@ public class VideoRightIcon extends Room
@Override
protected String getTitle() {
- return getString(self ? "687" : "683");
+ return getString(self ? (hasRight() ? "690" : "687"): (hasRight() ? "684": "683"));
}
@Override