Author: vdegtyarev
Date: Fri Aug 23 09:07:34 2013
New Revision: 1516761
URL: http://svn.apache.org/r1516761
Log:
OPENMEETINGS-769 Enter to the room link is improved.
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html?rev=1516761&r1=1516760&r2=1516761&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
Fri Aug 23 09:07:34 2013
@@ -87,9 +87,6 @@
<td><wicket:ommessage key="573" /></td>
<td><textarea
wicket:id="appointmentDescription"></textarea></td>
</tr>
- <tr>
- <td><button
wicket:id="enterRoom"><wicket:ommessage key="1282"/></button></td>
- </tr>
</table>
</form>
<div wicket:id="addAttendees"></div>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1516761&r1=1516760&r2=1516761&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
Fri Aug 23 09:07:34 2013
@@ -40,6 +40,7 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.room.Room;
import org.apache.openmeetings.persistence.beans.room.RoomType;
import org.apache.openmeetings.web.app.WebSession;
+import org.apache.openmeetings.web.pages.MainPage;
import org.apache.openmeetings.web.user.rooms.RoomEnterBehavior;
import org.apache.openmeetings.web.util.RoomTypeDropDown;
import org.apache.wicket.ajax.AjaxEventBehavior;
@@ -81,11 +82,11 @@ public class AppointmentDialog extends A
private DialogButton save = new DialogButton(WebSession.getString(813));
private DialogButton cancel = new
DialogButton(WebSession.getString(1130));
private DialogButton delete = new
DialogButton(WebSession.getString(814));
+ private DialogButton enterRoom = new
DialogButton(WebSession.getString(1282));
private final CalendarPanel calendar;
protected final FeedbackPanel feedback;
final MeetingMemberDialog addAttendees;
final MessageDialog confirmDelete;
- private WebMarkupContainer enterRoom;
@Override
public int getWidth() {
return 650;
@@ -98,21 +99,10 @@ public class AppointmentDialog extends A
log.debug(" -- setModelObjectWithAjaxTarget -- Current model "
+ object);
if (object.getAppointmentId() != null) {
delete.setVisible(true, target);
- if (null != object.getRoom()) {
- enterRoom.add(new
RoomEnterBehavior(object.getRoom().getRooms_id()) {
- private static final long
serialVersionUID = 3988702711022099320L;
-
- @Override
- protected void
onEvent(AjaxRequestTarget target) {
- super.onEvent(target);
-
AppointmentDialog.this.close(target, null);
- }
- });
- }
- enterRoom.setVisible(true);
+ enterRoom.setVisible(object.getRoom() != null, target);
} else {
delete.setVisible(false, target);
- enterRoom.setVisible(false);
+ enterRoom.setVisible(false, target);
}
super.setModelObject(object);
}
@@ -146,7 +136,7 @@ public class AppointmentDialog extends A
@Override
protected List<DialogButton> getButtons() {
- return Arrays.asList(save, delete, cancel);
+ return Arrays.asList(enterRoom, save, delete, cancel);
}
@Override
@@ -168,6 +158,8 @@ public class AppointmentDialog extends A
public void onClose(AjaxRequestTarget target, DialogButton button) {
if (delete.equals(button)) {
confirmDelete.open(target);
+ } else if (enterRoom.equals(button)) {
+ RoomEnterBehavior.roomEnter((MainPage)getPage(),
target, getModelObject().getRoom().getRooms_id());
}
}
@@ -307,8 +299,6 @@ public class AppointmentDialog extends A
}
});
add(attendeeContainer.setOutputMarkupId(true));
- enterRoom = new WebMarkupContainer("enterRoom");
- add(enterRoom.setOutputMarkupId(true));
}
private boolean isPwdProtected() {
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java?rev=1516761&r1=1516760&r2=1516761&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java
Fri Aug 23 09:07:34 2013
@@ -28,6 +28,10 @@ public class RoomEnterBehavior extends A
private static final long serialVersionUID = -5195740583653865055L;
private final long roomid;
+ public static void roomEnter(MainPage page, AjaxRequestTarget target,
long roomId) {
+ page.updateContents(new OmUrlFragment(AreaKeys.room, "" +
roomId), target);
+ }
+
public RoomEnterBehavior(long roomid) {
super("click");
this.roomid = roomid;
@@ -35,6 +39,6 @@ public class RoomEnterBehavior extends A
@Override
protected void onEvent(AjaxRequestTarget target) {
- ((MainPage)getComponent().getPage()).updateContents(new
OmUrlFragment(AreaKeys.room, "" + roomid), target);
+ roomEnter((MainPage)getComponent().getPage(), target, roomid);
}
}
