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 2016/04/20 20:20:21 UTC

svn commit: r1740181 - in /openmeetings/application: branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/

Author: solomax
Date: Wed Apr 20 18:20:21 2016
New Revision: 1740181

URL: http://svn.apache.org/viewvc?rev=1740181&view=rev
Log:
[OPENMEETINGS-1376] actions are hidden for non-moderators

Modified:
    openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
    openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
    openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
    openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java

Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html?rev=1740181&r1=1740180&r2=1740181&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html Wed Apr 20 18:20:21 2016
@@ -29,7 +29,7 @@
 				<span class="ui-icon align-right clickable restart" wicket:message="title:610"></span>
 				<div wicket:id="name" class="user name"></div>
 				<span class="ui-icon align-right clickable audio-activity" wicket:message="title:372"></span>
-				<div class="user actions">
+				<div wicket:id="actions" class="user actions">
 					<span class="ui-icon align-left clickable moderator-right" wicket:message="title:676"></span>
 					<span class="ui-icon align-left clickable wb-right" wicket:message="title:611"></span>
 					<span class="ui-icon align-left clickable screen-share-right" wicket:message="title:1067"></span>

Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java?rev=1740181&r1=1740180&r2=1740181&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java Wed Apr 20 18:20:21 2016
@@ -63,21 +63,31 @@ public class RoomSidebar extends Panel {
 		protected void populateItem(ListItem<RoomClient> item) {
 			RoomClient rc = item.getModelObject();
 			item.setMarkupId(String.format("user%s", rc.c.getUid()));
-			WebMarkupContainer status = new WebMarkupContainer("status");
+			String status = null, statusTitle = null;
 			if (rc.c.hasRight(Right.moderator)) {
-				status.add(AttributeAppender.append("class", "status-mod"), AttributeAppender.replace("title", getString("679")));
+				status = "status-mod";
+				statusTitle = "679";
 			} else if (rc.c.hasRight(Right.whiteBoard)) {
-				status.add(AttributeAppender.append("class", "status-wb"), AttributeAppender.replace("title", getString("678")));
+				status = "status-wb";
+				statusTitle = "678";
 			} else {
-				status.add(AttributeAppender.append("class", "status-user"), AttributeAppender.replace("title", getString("677")));
+				status = "status-user";
+				statusTitle = "677";
 			}
-			item.add(status);
+			item.add(new WebMarkupContainer("status").add(AttributeAppender.append("class", status), AttributeAppender.replace("title", getString(statusTitle))));
 			item.add(new Label("name", rc.u.getFirstname() + " " + rc.u.getLastname()));
 			item.add(AttributeAppender.append("data-userid", rc.u.getId()));
-			item.add(new WebMarkupContainer("privateChat").setVisible(!room.getRoom().isHidden(RoomElement.Chat) && !getUserId().equals(rc.u.getId())));
-			if (room.getClient() != null && rc.c.getUid().equals(room.getClient().getUid())) {
-				item.add(AttributeAppender.append("class", "current"));
+			WebMarkupContainer actions = new WebMarkupContainer("actions");
+			actions.add(new WebMarkupContainer("privateChat").setVisible(!room.getRoom().isHidden(RoomElement.Chat) && !getUserId().equals(rc.u.getId())));
+			if (room.getClient() != null) {
+				actions.setVisible(room.getClient().hasRight(Right.moderator));
+				if (rc.c.getUid().equals(room.getClient().getUid())) {
+					item.add(AttributeAppender.append("class", "current"));
+				}
+			} else {
+				actions.setVisible(false);
 			}
+			item.add(actions);
 		}
 	};
 	

Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html?rev=1740181&r1=1740180&r2=1740181&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html Wed Apr 20 18:20:21 2016
@@ -29,7 +29,7 @@
 				<span class="ui-icon align-right clickable restart" wicket:message="title:610"></span>
 				<div wicket:id="name" class="user name"></div>
 				<span class="ui-icon align-right clickable audio-activity" wicket:message="title:372"></span>
-				<div class="user actions">
+				<div wicket:id="actions" class="user actions">
 					<span class="ui-icon align-left clickable moderator-right" wicket:message="title:676"></span>
 					<span class="ui-icon align-left clickable wb-right" wicket:message="title:611"></span>
 					<span class="ui-icon align-left clickable screen-share-right" wicket:message="title:1067"></span>

Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java?rev=1740181&r1=1740180&r2=1740181&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java Wed Apr 20 18:20:21 2016
@@ -63,21 +63,31 @@ public class RoomSidebar extends Panel {
 		protected void populateItem(ListItem<RoomClient> item) {
 			RoomClient rc = item.getModelObject();
 			item.setMarkupId(String.format("user%s", rc.c.getUid()));
-			WebMarkupContainer status = new WebMarkupContainer("status");
+			String status = null, statusTitle = null;
 			if (rc.c.hasRight(Right.moderator)) {
-				status.add(AttributeAppender.append("class", "status-mod"), AttributeAppender.replace("title", getString("679")));
+				status = "status-mod";
+				statusTitle = "679";
 			} else if (rc.c.hasRight(Right.whiteBoard)) {
-				status.add(AttributeAppender.append("class", "status-wb"), AttributeAppender.replace("title", getString("678")));
+				status = "status-wb";
+				statusTitle = "678";
 			} else {
-				status.add(AttributeAppender.append("class", "status-user"), AttributeAppender.replace("title", getString("677")));
+				status = "status-user";
+				statusTitle = "677";
 			}
-			item.add(status);
+			item.add(new WebMarkupContainer("status").add(AttributeAppender.append("class", status), AttributeAppender.replace("title", getString(statusTitle))));
 			item.add(new Label("name", rc.u.getFirstname() + " " + rc.u.getLastname()));
 			item.add(AttributeAppender.append("data-userid", rc.u.getId()));
-			item.add(new WebMarkupContainer("privateChat").setVisible(!room.getRoom().isHidden(RoomElement.Chat) && !getUserId().equals(rc.u.getId())));
-			if (room.getClient() != null && rc.c.getUid().equals(room.getClient().getUid())) {
-				item.add(AttributeAppender.append("class", "current"));
+			WebMarkupContainer actions = new WebMarkupContainer("actions");
+			actions.add(new WebMarkupContainer("privateChat").setVisible(!room.getRoom().isHidden(RoomElement.Chat) && !getUserId().equals(rc.u.getId())));
+			if (room.getClient() != null) {
+				actions.setVisible(room.getClient().hasRight(Right.moderator));
+				if (rc.c.getUid().equals(room.getClient().getUid())) {
+					item.add(AttributeAppender.append("class", "current"));
+				}
+			} else {
+				actions.setVisible(false);
 			}
+			item.add(actions);
 		}
 	};