Author: solomax
Date: Sun May 19 20:08:10 2013
New Revision: 1484345
URL: http://svn.apache.org/r1484345
Log:
[OPENMEETINGS-638] proper room enter/exit is implemented;
code clean-up;
appointment dialog is re-aligned;
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java
Removed:
openmeetings/trunk/singlewebapp/WebContent/openmeetings/embed-compressed.js
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomEnterButton.java
Modified:
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/UserPanel.java
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/dashboard/StartWidgetView.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomPanel.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/swf-functions.js
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/OmUrlFragment.java
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css?rev=1484345&r1=1484344&r2=1484345&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css Sun
May 19 20:08:10 2013
@@ -552,6 +552,7 @@ div.tableWrapper {
margin: 5px 0px 5px 0px;
background-size: contain;
background-repeat: no-repeat;
+ display: inline-block;
}
.start_step1 {
background-image:
url(../public/themes/basic-theme/dashboard/wizzard_button_1.png);
Modified:
openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx?rev=1484345&r1=1484344&r2=1484345&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
Sun May 19 20:08:10 2013
@@ -111,6 +111,11 @@
-->
<attribute name="currentToolTip" value="null" />
+ <!-- Attributes for wicket login (since it hard not to break
anything)-->
+ <attribute name="wicketsid" type="string" />
+ <attribute name="wicketroomid" value="0" type="number" />
+
+
<method name="registerToolTip" args="viewInstance">
if (this.currentToolTip != null) {
this.currentToolTip.cleanHolder();
Modified:
openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx?rev=1484345&r1=1484344&r2=1484345&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
Sun May 19 20:08:10 2013
@@ -27,6 +27,7 @@
<when property="$as3">
<passthrough>
import flash.net.LocalConnection;
+ import flash.external.ExternalInterface;
</passthrough>
</when>
</switch>
@@ -491,6 +492,9 @@
<method name="immediateExitRoom" args="bool,ctx">
canvas.videoComp_lc.send(canvas.videoComp_lc_name, 'exitRoom',
bool);
+ if (canvas.wicketsid != null) {
+ flash.external.ExternalInterface.call("roomExit");
+ }
</method>
<method name="updateFirstLastName" args="publicSID,first,last">
Modified: openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx?rev=1484345&r1=1484344&r2=1484345&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx Sun May 19
20:08:10 2013
@@ -110,11 +110,14 @@
this.setAttribute('videoComp_lc',videoComp_lc_cback);
var tqueryString = "";
- for (var i=0;i<tInitArgsArry.length;i++) {
+ for (var i = 0; i < tInitArgsArry.length; ++i) {
// if ($debug)
Debug.write(tInitArgsArry[i],lz.Browser.getInitArg(tInitArgsArry[i]));
var tValue = lz.Browser.getInitArg(tInitArgsArry[i]);
if (tValue != undefined) {
- tqueryString += "&"+tInitArgsArry[i]+"="+tValue;
+ tqueryString += "&" + tInitArgsArry[i] + "=" + tValue;
+ if (tInitArgsArry[i].startsWith('wicket')) {
+ canvas.setAttribute(tInitArgsArry[i], tValue);
+ }
}
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java?rev=1484345&r1=1484344&r2=1484345&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java
Sun May 19 20:08:10 2013
@@ -1498,8 +1498,7 @@ public class RoomManager {
* @param rooms_id
* @return Rooms-Object or NULL
*/
- public Room getRoomByOwnerAndTypeId(Long ownerId, Long roomtypesId,
- String roomName) {
+ public Room getRoomByOwnerAndTypeId(Long ownerId, Long roomtypesId,
String roomName) {
try {
if (roomtypesId == null || roomtypesId == 0) {
@@ -1520,8 +1519,7 @@ public class RoomManager {
if (room != null) {
return room;
} else {
- log.debug("Could not find room " + ownerId + "
|| "
- + roomtypesId);
+ log.debug("Could not find room " + ownerId + "
|| " + roomtypesId);
Long rooms_id = this.addRoom(3L, roomName,
roomtypesId,
"My Rooms of ownerId " +
ownerId,
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/UserPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/UserPanel.java?rev=1484345&r1=1484344&r2=1484345&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/UserPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/UserPanel.java
Sun May 19 20:08:10 2013
@@ -18,13 +18,15 @@
*/
package org.apache.openmeetings.web.common;
+import static org.apache.openmeetings.web.app.Application.getBean;
+import static org.apache.openmeetings.web.app.WebSession.getUserId;
+
import java.util.ArrayList;
import java.util.List;
import org.apache.openmeetings.data.conference.RoomManager;
import org.apache.openmeetings.data.conference.dao.RoomDao;
import org.apache.openmeetings.persistence.beans.room.Room;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import
org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
@@ -36,22 +38,11 @@ public abstract class UserPanel extends
super(id);
}
- //FIXME need to be handled somehow differently
public static List<Room> getMyRooms() {
List<Room> result = new ArrayList<Room>();
- Room r1 = new Room();
- r1.setIspublic(true);
- r1.setName(WebSession.getString(1306L));
- //FIXME need to be DAO !!!!
-
r1.setRoomtype(Application.getBean(RoomManager.class).getRoomTypesById(1L));
- result.add(r1);
- Room r2 = new Room();
- r2.setIspublic(true); //TODO weird
- r2.setName(WebSession.getString(1307L));
- //FIXME need to be DAO !!!!
-
r2.setRoomtype(Application.getBean(RoomManager.class).getRoomTypesById(3L));
- result.add(r2);
-
result.addAll(Application.getBean(RoomDao.class).getAppointedRoomsByUser(WebSession.getUserId()));
+
result.add(getBean(RoomManager.class).getRoomByOwnerAndTypeId(getUserId(), 1L,
WebSession.getString(1306L)));
+
result.add(getBean(RoomManager.class).getRoomByOwnerAndTypeId(getUserId(), 3L,
WebSession.getString(1307L)));
+
result.addAll(getBean(RoomDao.class).getAppointedRoomsByUser(getUserId()));
return result;
}
}
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=1484345&r1=1484344&r2=1484345&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
Sun May 19 20:08:10 2013
@@ -58,7 +58,7 @@
<td><input type="password"
wicket:id="password" /></td>
</tr>
<tr>
- <td colspan="2"><wicket:ommessage
key="1445" /></td>
+ <td colspan="2" style="font-size:
smaller;"><wicket:ommessage key="1445" /></td>
</tr>
<!--
<tr>
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=1484345&r1=1484344&r2=1484345&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
Sun May 19 20:08:10 2013
@@ -67,6 +67,11 @@ public class AppointmentDialog extends A
protected final FeedbackPanel feedback;
@Override
+ public int getWidth() {
+ return 550;
+ }
+
+ @Override
public void setModelObject(Appointment object) {
form.setModelObject(object);
super.setModelObject(object);
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html?rev=1484345&r1=1484344&r2=1484345&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
Sun May 19 20:08:10 2013
@@ -21,15 +21,15 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<h3><wicket:ommessage key="774"/></h3>
- <div class="start_step1"><wicket:ommessage key="768"/></div>
- <div class="start_step2"><wicket:ommessage key="771"/></div>
- <div class="start_step3"><wicket:ommessage key="772"/></div>
- <div class="start_step4"><wicket:ommessage key="773"/></div>
+ <div><div wicket:id="step1" class="clickable
start_step1"><wicket:ommessage key="768"/></div></div>
+ <div><div wicket:id="step2" class="clickable
start_step2"><wicket:ommessage key="771"/></div></div>
+ <div><div wicket:id="step3" class="clickable
start_step3"><wicket:ommessage key="772"/></div></div>
+ <div><div wicket:id="step4" class="clickable
start_step4"><wicket:ommessage key="773"/></div></div>
<table>
<tr>
<td><wicket:ommessage key="804"/></td>
<td>
- <input type="button"
wicket:ommessage="value:788"/><br/>
+ <input wicket:id="start" type="button"
wicket:ommessage="value:788"/><br/>
<input wicket:id="calendar"
type="button" wicket:ommessage="value:291"/>
</td>
</tr>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java?rev=1484345&r1=1484344&r2=1484345&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
Sun May 19 20:08:10 2013
@@ -19,10 +19,12 @@
package org.apache.openmeetings.web.user.dashboard;
import static org.apache.openmeetings.web.util.OmUrlFragment.CALENDAR;
+import static org.apache.openmeetings.web.util.OmUrlFragment.ROOMS_PUBLIC;
import org.apache.openmeetings.web.pages.MainPage;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.model.Model;
@@ -34,6 +36,11 @@ public class StartWidgetView extends Wid
public StartWidgetView(String id, Model<Widget> model) {
super(id, model);
+ add(new WebMarkupContainer("step1").add(new
PublicRoomsEventBehavior()));
+ add(new WebMarkupContainer("step2").add(new
PublicRoomsEventBehavior()));
+ add(new WebMarkupContainer("step3").add(new
PublicRoomsEventBehavior()));
+ add(new WebMarkupContainer("step4").add(new
PublicRoomsEventBehavior()));
+ add(new WebMarkupContainer("start").add(new
PublicRoomsEventBehavior()));
add(new Button("calendar").add(new AjaxEventBehavior("onclick")
{
private static final long serialVersionUID =
-1736827409409436737L;
@@ -43,4 +50,17 @@ public class StartWidgetView extends Wid
}
}));
}
+
+ private class PublicRoomsEventBehavior extends AjaxEventBehavior {
+ private static final long serialVersionUID =
1475840707332889254L;
+
+ public PublicRoomsEventBehavior() {
+ super("onclick");
+ }
+
+ @Override
+ protected void onEvent(AjaxRequestTarget target) {
+ ((MainPage)getPage()).updateContents(ROOMS_PUBLIC,
target);
+ }
+ }
}
Added:
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=1484345&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java
(added)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java
Sun May 19 20:08:10 2013
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.user.rooms;
+
+import org.apache.openmeetings.web.pages.MainPage;
+import org.apache.openmeetings.web.util.OmUrlFragment;
+import org.apache.openmeetings.web.util.OmUrlFragment.AreaKeys;
+import org.apache.wicket.ajax.AjaxEventBehavior;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+
+public class RoomEnterBehavior extends AjaxEventBehavior {
+ private static final long serialVersionUID = -5195740583653865055L;
+ private final long roomid;
+
+ public RoomEnterBehavior(long roomid) {
+ super("click");
+ this.roomid = roomid;
+ }
+
+ @Override
+ protected void onEvent(AjaxRequestTarget target) {
+ ((MainPage)getComponent().getPage()).updateContents(new
OmUrlFragment(AreaKeys.room, "" + roomid), target);
+ }
+}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomPanel.html?rev=1484345&r1=1484344&r2=1484345&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomPanel.html
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomPanel.html
Sun May 19 20:08:10 2013
@@ -28,8 +28,6 @@
<img src="images/ajax-loader.gif" />
</div>
<noscript>Please enable JavaScript in order to use this
application.</noscript>
- <script type="text/javascript">
- initSwf();
- </script>
+ <script type="text/javascript" wicket:id="init"></script>
</wicket:panel>
</html>
\ No newline at end of file
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomPanel.java?rev=1484345&r1=1484344&r2=1484345&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomPanel.java
Sun May 19 20:08:10 2013
@@ -18,26 +18,19 @@
*/
package org.apache.openmeetings.web.user.rooms;
-import java.util.Map;
-
import org.apache.openmeetings.web.common.BasePanel;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.PriorityHeaderItem;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.Url;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.mapper.parameter.PageParametersEncoder;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
-import org.apache.wicket.resource.TextTemplateResourceReference;
-import org.apache.wicket.util.collections.MicroMap;
import org.apache.wicket.util.string.StringValue;
public class RoomPanel extends BasePanel {
private static final long serialVersionUID = 2308988314987829510L;
- private final String swf;
- private final PageParameters pp;
public RoomPanel(String id) {
this(id, new PageParameters());
@@ -45,18 +38,15 @@ public class RoomPanel extends BasePanel
public RoomPanel(String id, PageParameters pp) {
super(id);
- this.pp = pp;
+
StringValue swfVal = pp.get("swf");
- swf = swfVal.isEmpty() ? "maindebug.as3.swf11.swf" :
swfVal.toString(); //FIXME
+ String swf = (swfVal.isEmpty() ? "main.as3.swf11.swf" :
swfVal.toString())
+ + new
PageParametersEncoder().encodePageParameters(pp);
+ add(new Label("init", String.format("initSwf('%s');",
swf)).setEscapeModelStrings(false));
}
- private IModel<Map<String, Object>> newResourceModel() {
- Url url = new PageParametersEncoder().encodePageParameters(pp);
- return Model.ofMap(new MicroMap<String, Object>("swfurl", swf +
url));
- }
-
private ResourceReference newResourceReference() {
- return new TextTemplateResourceReference(RoomPanel.class,
"swf-functions.js", this.newResourceModel());
+ return new JavaScriptResourceReference(RoomPanel.class,
"swf-functions.js");
}
@Override
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomsPanel.java?rev=1484345&r1=1484344&r2=1484345&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
Sun May 19 20:08:10 2013
@@ -26,6 +26,7 @@ import org.apache.openmeetings.web.app.A
import org.apache.openmeetings.web.common.UserPanel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
@@ -48,7 +49,7 @@ public class RoomsPanel extends UserPane
final Label curUsers = new Label("curUsers",
curUsersModel);
item.add(curUsers.setOutputMarkupId(true));
item.add(new Label("totalUsers",
r.getNumberOfPartizipants()));
- item.add(new RoomEnterButton("enter",
r.getRooms_id()));
+ item.add(new
WebMarkupContainer("enter").add(new RoomEnterBehavior(r.getRooms_id())));
item.add(new AjaxLink<Void>("refresh") {
private static final long
serialVersionUID = -3426813755917489787L;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/swf-functions.js
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/swf-functions.js?rev=1484345&r1=1484344&r2=1484345&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/swf-functions.js
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/swf-functions.js
Sun May 19 20:08:10 2013
@@ -20,16 +20,16 @@ function getAppletStatus() {
return false;
}
-function initSwf() {
+function initSwf(swfurl) {
var general = {
- url : "${swfurl}",
+ url : swfurl,
bgcolor : '#ffffff',
width : '100%',
height : '100%',
id : 'lzapp',
__lzminimumversion : 8
};
- var options = $.extend(general, {allowfullscreen : 'true'});
+ var options = $.extend({}, general, {allowfullscreen : 'true'});
$('#header, #topLinks, #menu').hide();
var embed = $('<embed>').attr('quality', 'high').attr('bgcolor',
options.bgcolor)
.attr('src', options.url)
@@ -42,3 +42,9 @@ function initSwf() {
.attr('pluginspage',
'http://www.macromedia.com/go/getflashplayer');
$('#swfloading').after($('<div
id="lzappContainer">').append(embed)).width('1px').height('1px');
}
+
+function roomExit() {
+ $('#header, #topLinks, #menu').show();
+ window.location.hash = "#rooms/public";
+ $('#lzappContainer').remove();
+}
\ No newline at end of file
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/OmUrlFragment.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/OmUrlFragment.java?rev=1484345&r1=1484344&r2=1484345&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/OmUrlFragment.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/OmUrlFragment.java
Sun May 19 20:08:10 2013
@@ -65,6 +65,7 @@ public class OmUrlFragment implements Se
public static final OmUrlFragment PROFILE_EDIT = new
OmUrlFragment(AreaKeys.profile, TYPE_EDIT);
public static final OmUrlFragment PROFILE_MESSAGES = new
OmUrlFragment(AreaKeys.profile, TYPE_MESSAGES);
public static final OmUrlFragment CALENDAR = new
OmUrlFragment(AreaKeys.user, TYPE_CALENDAR);
+ public static final OmUrlFragment ROOMS_PUBLIC = new
OmUrlFragment(AreaKeys.rooms, TYPE_PUBLIC);
public enum AreaKeys {
user
