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/27 21:16:29 UTC
svn commit: r1741319 - in /openmeetings/application:
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/
branches/3.2.x/openmeeting...
Author: solomax
Date: Wed Apr 27 19:16:28 2016
New Revision: 1741319
URL: http://svn.apache.org/viewvc?rev=1741319&view=rev
Log:
[OPENMEETINGS-1030] file drop is improved
Added:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/drop.png (with props)
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/drop.png (with props)
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ModeratorRightIcon.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ModeratorRightIcon.java
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html?rev=1741319&r1=1741318&r2=1741319&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html Wed Apr 27 19:16:28 2016
@@ -31,6 +31,7 @@
<div class="room menu" wicket:id="menu"></div>
<div class="room sidebar left" wicket:id="sidebar"></div>
<div wicket:id="wb-area" class="room wb area">
+ <div class="wb-drop-area"></div>
<div class="wb" wicket:id="whiteboard"></div>
</div>
<div wicket:id="activities"></div>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1741319&r1=1741318&r2=1741319&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Wed Apr 27 19:16:28 2016
@@ -22,10 +22,12 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.web.app.Application.addUserToRoom;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.Application.getRoomUsers;
+import static org.apache.openmeetings.web.app.WebSession.getDateFormat;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.Calendar;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
@@ -46,6 +48,7 @@ import org.apache.openmeetings.util.mess
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.Client;
import org.apache.openmeetings.web.app.Client.Right;
+import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.BasePanel;
import org.apache.openmeetings.web.room.activities.ActivitiesPanel;
import org.apache.openmeetings.web.room.activities.Activity;
@@ -169,28 +172,26 @@ public class RoomPanel extends BasePanel
String deniedMessage = null;
if (r.isAppointment()) {
Appointment a = getBean(AppointmentDao.class).getByRoom(r.getId());
- eventDetail = new EventDetailDialog(EVENT_DETAILS_ID, a);
if (a != null && !a.isDeleted()) {
allowed = a.getOwner().getId().equals(getUserId());
log.debug("appointed room, isOwner ? " + allowed);
if (!allowed) {
for (MeetingMember mm : a.getMeetingMembers()) {
- if (mm.getUser().getId() == getUserId()) {
+ if (getUserId().equals(mm.getUser().getId())) {
allowed = true;
break;
}
}
}
- /*
- TODO need to be reviewed
- Calendar c = WebSession.getCalendar();
- if (c.getTime().after(a.getStart()) && c.getTime().before(a.getEnd())) {
- allowed = true;
- } else {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm"); //FIXME format
- deniedMessage = getString("1271") + String.format(" %s - %s", sdf.format(a.getStart()), sdf.format(a.getEnd()));
+ if (allowed) {
+ Calendar c = WebSession.getCalendar();
+ if (c.getTime().after(a.getStart()) && c.getTime().before(a.getEnd())) {
+ eventDetail = new EventDetailDialog(EVENT_DETAILS_ID, a);
+ } else {
+ allowed = false;
+ deniedMessage = getString("1271") + String.format(" %s - %s", getDateFormat().format(a.getStart()), getDateFormat().format(a.getEnd()));
+ }
}
- */
}
} else {
allowed = r.getIspublic() || (r.getOwnerId() != null && r.getOwnerId().equals(getUserId()));
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ModeratorRightIcon.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/ModeratorRightIcon.java?rev=1741319&r1=1741318&r2=1741319&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ModeratorRightIcon.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ModeratorRightIcon.java Wed Apr 27 19:16:28 2016
@@ -31,6 +31,11 @@ public class ModeratorRightIcon extends
}
@Override
+ protected boolean isClickable() {
+ return super.isClickable() && !client.hasRight(Right.superModerator);
+ }
+
+ @Override
protected String getTitle() {
String title;
if (client.hasRight(right)) {
Added: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/drop.png
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/drop.png?rev=1741319&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/drop.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
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=1741319&r1=1741318&r2=1741319&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 Apr 27 19:16:28 2016
@@ -79,6 +79,23 @@
width: 80%;
float: left;
}
+.room.wb.area.ui-state-hover {
+ border: 0;
+}
+.room.wb.area.ui-state-hover .wb {
+ visibility: hidden;
+ height: 1px !important;
+}
+.room.wb.area .wb-drop-area {
+ display: none;
+}
+.room.wb.area.ui-state-hover .wb-drop-area {
+ background-image: url(images/drop.png);
+ display: block;
+ background-repeat: no-repeat;
+ height: inherit;
+ background-position: center;
+}
.room.sidebar.left .ui-tabs .ui-tabs-panel {
padding: 0;
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html?rev=1741319&r1=1741318&r2=1741319&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html Wed Apr 27 19:16:28 2016
@@ -31,6 +31,7 @@
<div class="room menu" wicket:id="menu"></div>
<div class="room sidebar left" wicket:id="sidebar"></div>
<div wicket:id="wb-area" class="room wb area">
+ <div class="wb-drop-area"></div>
<div class="wb" wicket:id="whiteboard"></div>
</div>
<div wicket:id="activities"></div>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1741319&r1=1741318&r2=1741319&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Wed Apr 27 19:16:28 2016
@@ -22,10 +22,12 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.web.app.Application.addUserToRoom;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.Application.getRoomUsers;
+import static org.apache.openmeetings.web.app.WebSession.getDateFormat;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.Calendar;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
@@ -188,28 +190,26 @@ public class RoomPanel extends BasePanel
String deniedMessage = null;
if (r.isAppointment()) {
Appointment a = getBean(AppointmentDao.class).getByRoom(r.getId());
- eventDetail = new EventDetailDialog(EVENT_DETAILS_ID, a);
if (a != null && !a.isDeleted()) {
allowed = a.getOwner().getId().equals(getUserId());
log.debug("appointed room, isOwner ? " + allowed);
if (!allowed) {
for (MeetingMember mm : a.getMeetingMembers()) {
- if (mm.getUser().getId() == getUserId()) {
+ if (getUserId().equals(mm.getUser().getId())) {
allowed = true;
break;
}
}
}
- /*
- TODO need to be reviewed
- Calendar c = WebSession.getCalendar();
- if (c.getTime().after(a.getStart()) && c.getTime().before(a.getEnd())) {
- allowed = true;
- } else {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm"); //FIXME format
- deniedMessage = getString("1271") + String.format(" %s - %s", sdf.format(a.getStart()), sdf.format(a.getEnd()));
+ if (allowed) {
+ Calendar c = WebSession.getCalendar();
+ if (c.getTime().after(a.getStart()) && c.getTime().before(a.getEnd())) {
+ eventDetail = new EventDetailDialog(EVENT_DETAILS_ID, a);
+ } else {
+ allowed = false;
+ deniedMessage = getString("1271") + String.format(" %s - %s", getDateFormat().format(a.getStart()), getDateFormat().format(a.getEnd()));
+ }
}
- */
}
} else {
allowed = r.getIspublic() || (r.getOwnerId() != null && r.getOwnerId().equals(getUserId()));
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ModeratorRightIcon.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ModeratorRightIcon.java?rev=1741319&r1=1741318&r2=1741319&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ModeratorRightIcon.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ModeratorRightIcon.java Wed Apr 27 19:16:28 2016
@@ -31,6 +31,11 @@ public class ModeratorRightIcon extends
}
@Override
+ protected boolean isClickable() {
+ return super.isClickable() && !client.hasRight(Right.superModerator);
+ }
+
+ @Override
protected String getTitle() {
String title;
if (client.hasRight(right)) {
Added: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/drop.png
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/drop.png?rev=1741319&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/drop.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
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=1741319&r1=1741318&r2=1741319&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 Apr 27 19:16:28 2016
@@ -79,6 +79,23 @@
width: 80%;
float: left;
}
+.room.wb.area.ui-state-hover {
+ border: 0;
+}
+.room.wb.area.ui-state-hover .wb {
+ visibility: hidden;
+ height: 1px !important;
+}
+.room.wb.area .wb-drop-area {
+ display: none;
+}
+.room.wb.area.ui-state-hover .wb-drop-area {
+ background-image: url(images/drop.png);
+ display: block;
+ background-repeat: no-repeat;
+ height: inherit;
+ background-position: center;
+}
.room.sidebar.left .ui-tabs .ui-tabs-panel {
padding: 0;
}