Author: solomax
Date: Tue Nov 10 18:11:33 2015
New Revision: 1713707
URL: http://svn.apache.org/viewvc?rev=1713707&view=rev
Log:
[OPENMEETINGS-1276] html5 part seems to work, room is broken
Added:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MainMenuItem.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuFunctionsBehavior.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/menu-functions.js
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/HeaderPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/OmCalendarEvent.java
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1713707&r1=1713706&r2=1713707&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
Tue Nov 10 18:11:33 2015
@@ -292,7 +292,7 @@ public class MobileService {
for (Organisation_Users ou : u.getOrganisation_users()) {
Organisation org = ou.getOrganisation();
boolean first = true;
- for (Room r :
roomDao.getOrganisationRooms(org.getId())) {
+ for (Room r : roomDao.getGroupRooms(org.getId())) {
addRoom("private", org.getName(), first,
result, r);
first = false;
}
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java?rev=1713707&r1=1713706&r2=1713707&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
Tue Nov 10 18:11:33 2015
@@ -119,8 +119,8 @@ public class RoomDao implements IDataPro
return q.getResultList();
}
- public List<Room> getOrganisationRooms(long orgId) {
- TypedQuery<Room> q =
em.createNamedQuery("getOrganisationRooms", Room.class);
+ public List<Room> getGroupRooms(long orgId) {
+ TypedQuery<Room> q = em.createNamedQuery("getGroupRooms",
Room.class);
q.setParameter("orgId", orgId);
return q.getResultList();
}
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java?rev=1713707&r1=1713706&r2=1713707&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
Tue Nov 10 18:11:33 2015
@@ -78,10 +78,10 @@ public class LdapConfigDao implements ID
log.debug("addLdapConfig :2: " + insertedby);
ldapConfig = em.merge(ldapConfig);
- Long ldapConfigId = ldapConfig.getId();
+ Long id = ldapConfig.getId();
- if (ldapConfigId > 0) {
- return ldapConfigId;
+ if (id > 0) {
+ return id;
} else {
throw new Exception("Could not store
SOAPLogin");
}
@@ -99,10 +99,10 @@ public class LdapConfigDao implements ID
ldapConfig.setInserted(new Date());
ldapConfig = em.merge(ldapConfig);
- Long ldapConfigId = ldapConfig.getId();
+ Long id = ldapConfig.getId();
- if (ldapConfigId > 0) {
- return ldapConfigId;
+ if (id > 0) {
+ return id;
} else {
throw new Exception("Could not store
SOAPLogin");
}
@@ -113,12 +113,12 @@ public class LdapConfigDao implements ID
return null;
}
- public Long updateLdapConfig(Long ldapConfigId, String name,
+ public Long updateLdapConfig(Long id, String name,
Boolean addDomainToUserName, String configFileName,
String domain,
Long updatedby, Boolean isActive) {
try {
- LdapConfig ldapConfig = this.get(ldapConfigId);
+ LdapConfig ldapConfig = this.get(id);
if (ldapConfig == null) {
return -1L;
@@ -139,9 +139,9 @@ public class LdapConfigDao implements ID
log.debug("updateLdapConfig :2: " + updatedby);
ldapConfig = em.merge(ldapConfig);
- ldapConfigId = ldapConfig.getId();
+ id = ldapConfig.getId();
- return ldapConfigId;
+ return id;
} catch (Exception ex2) {
log.error("[updateLdapConfig]: ", ex2);
@@ -149,16 +149,16 @@ public class LdapConfigDao implements ID
return -1L;
}
- public LdapConfig get(long ldapConfigId) {
+ public LdapConfig get(long id) {
try {
String hql = "select c from LdapConfig c "
- + "WHERE c.ldapConfigId = :ldapConfigId
"
+ + "WHERE c.id = :id "
+ "AND c.deleted = :deleted";
TypedQuery<LdapConfig> query = em
.createQuery(hql, LdapConfig.class);
- query.setParameter("ldapConfigId", ldapConfigId);
+ query.setParameter("id", id);
query.setParameter("deleted", false);
LdapConfig ldapConfig = null;
@@ -216,7 +216,7 @@ public class LdapConfigDao implements ID
try {
TypedQuery<Long> query = em
.createQuery(
- "select
count(c.ldapConfigId) from LdapConfig c where c.deleted = false",
+ "select count(c) from
LdapConfig c where c.deleted = false",
Long.class);
List<Long> ll = query.getResultList();
log.debug("selectMaxFromLdapConfig" + ll.get(0));
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1713707&r1=1713706&r2=1713707&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
Tue Nov 10 18:11:33 2015
@@ -103,7 +103,7 @@ public class RoomForm extends AdminBaseF
}
}));
- add(new
RoomTypeDropDown("roomtype").setRequired(true).setLabel(Model.of(Application.getString(194))));
+ add(new
RoomTypeDropDown("type").setRequired(true).setLabel(Model.of(Application.getString(194))));
add(new TextArea<String>("comment"));
@@ -115,7 +115,7 @@ public class RoomForm extends AdminBaseF
for (Organisation org : orgList) {
orgRooms.add(new RoomGroup(org, getModelObject()));
}
- add(new Select2MultiChoice<RoomGroup>("roomOrganisations",
null, new TextChoiceProvider<RoomGroup>() {
+ add(new Select2MultiChoice<RoomGroup>("roomGroups", null, new
TextChoiceProvider<RoomGroup>() {
private static final long serialVersionUID = 1L;
@Override
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html?rev=1713707&r1=1713706&r2=1713707&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
Tue Nov 10 18:11:33 2015
@@ -68,7 +68,7 @@
<label><wicket:message key="482"
/></label><select wicket:id="numberOfPartizipants"/>
</div>
<div class="formelement">
- <label><wicket:message key="194"
/></label><select wicket:id="roomtype"/>
+ <label><wicket:message key="194"
/></label><select wicket:id="type"/>
</div>
<div class="formelement">
<label><wicket:message key="196"
/></label><textarea style="width: 200px; height: 100px;" wicket:id="comment"/>
@@ -86,7 +86,7 @@
</div>
<div class="formelement">
<div
class="info-text"><wicket:message key="828" /></div>
- <label><wicket:message
key="191" /></label><input type="hidden" class="input"
wicket:id="roomOrganisations" style="max-height: 80px"/>
+ <label><wicket:message
key="191" /></label><input type="hidden" class="input" wicket:id="roomGroups"
style="max-height: 80px"/>
</div>
</fieldset>
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java?rev=1713707&r1=1713706&r2=1713707&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
Tue Nov 10 18:11:33 2015
@@ -56,7 +56,7 @@ public abstract class AddFolderDialog ex
title.setLabel(Model.of(Application.getString(572)));
add(feedback.setOutputMarkupId(true));
add(new AjaxButton("submit") { //FAKE button so
"submit-on-enter" works as expected
- private static final long
serialVersionUID = -3612671587183668912L;
+ private static final long
serialVersionUID = 1L;
@Override
protected void
onSubmit(AjaxRequestTarget target, Form<?> form) {
@@ -74,8 +74,8 @@ public abstract class AddFolderDialog ex
}
@Override
- protected void onOpen(IPartialPageRequestHandler target) {
- super.onOpen(target);
+ protected void onOpen(IPartialPageRequestHandler handler) {
+ super.onOpen(handler);
setModelObject(name);
getFeedbackMessages().clear();
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java?rev=1713707&r1=1713706&r2=1713707&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
Tue Nov 10 18:11:33 2015
@@ -121,7 +121,7 @@ public class GeneralUserForm extends For
add(new TextField<String>("address.additionalname"));
add(new TextField<String>("address.zip"));
add(new TextField<String>("address.town"));
- add(new DropDownChoice<State>("address.state",
getBean(StateDao.class).get(), new ChoiceRenderer<State>("name", "state_id")));
+ add(new DropDownChoice<State>("address.state",
getBean(StateDao.class).get(), new ChoiceRenderer<State>("name", "id")));
add(new TextArea<String>("address.comment"));
final List<Organisation_Users> orgUsers;
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/HeaderPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/HeaderPanel.java?rev=1713707&r1=1713706&r2=1713707&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/HeaderPanel.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/HeaderPanel.java
Tue Nov 10 18:11:33 2015
@@ -22,10 +22,11 @@ import org.apache.wicket.markup.html.bas
import org.apache.wicket.util.string.Strings;
public class HeaderPanel extends BasePanel {
- private static final long serialVersionUID = 9020842845946685193L;
+ private static final long serialVersionUID = 1L;
public HeaderPanel(String id, String appName) {
super(id);
+ setOutputMarkupPlaceholderTag(true);
add(new Label("appName", Strings.isEmpty(appName) ? " " :
appName).setEscapeModelStrings(false));
}
}
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java?rev=1713707&r1=1713706&r2=1713707&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
Tue Nov 10 18:11:33 2015
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.common;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.web.app.Application.getBean;
import java.util.List;
@@ -34,9 +35,12 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.upload.FileUploadField;
import org.apache.wicket.model.IModel;
import org.apache.wicket.util.lang.Bytes;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
public class UploadableProfileImagePanel extends ProfileImagePanel {
private static final long serialVersionUID = 1L;
+ private static final Logger log =
Red5LoggerFactory.getLogger(UploadableProfileImagePanel.class, webAppRootKey);
private FileUploadField fileUploadField;
public UploadableProfileImagePanel(String id, final long userId) {
@@ -72,11 +76,10 @@ public class UploadableProfileImagePanel
boolean asIs = sf.isAsIs();
try {
//FIXME need to work
with InputStream !!!
-
getBean(GenerateImage.class)
-
.convertImageUserProfile(fu.writeToTempFile(), userId, asIs);
+
getBean(GenerateImage.class).convertImageUserProfile(fu.writeToTempFile(),
userId, asIs);
} catch (Exception e) {
// TODO display error
- e.printStackTrace();
+ log.error("Error", e);
}
} else {
//TODO display error
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java?rev=1713707&r1=1713706&r2=1713707&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java
Tue Nov 10 18:11:33 2015
@@ -26,7 +26,6 @@ import java.util.List;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.entity.room.Room;
-import org.apache.openmeetings.db.entity.room.Room.Type;
import org.apache.openmeetings.web.app.Application;
import
org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
import org.apache.wicket.model.IModel;
@@ -45,8 +44,8 @@ public abstract class UserPanel extends
public static List<Room> getMyRooms() {
List<Room> result = new ArrayList<Room>();
- result.add(getBean(RoomDao.class).getUserRoom(getUserId(),
Type.conference, Application.getString(1306L)));
- result.add(getBean(RoomDao.class).getUserRoom(getUserId(),
Type.conference, Application.getString(1307L)));
+ result.add(getBean(RoomDao.class).getUserRoom(getUserId(),
Room.Type.conference, Application.getString(1306L)));
+ result.add(getBean(RoomDao.class).getUserRoom(getUserId(),
Room.Type.restricted, Application.getString(1307L)));
result.addAll(getBean(RoomDao.class).getAppointedRoomsByUser(getUserId()));
return result;
}
Added:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MainMenuItem.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MainMenuItem.java?rev=1713707&view=auto
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MainMenuItem.java
(added)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MainMenuItem.java
Tue Nov 10 18:11:33 2015
@@ -0,0 +1,44 @@
+/*
+ * 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.common.menu;
+
+import org.apache.openmeetings.db.entity.basic.Navimain;
+import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.pages.MainPage;
+import org.apache.openmeetings.web.util.OmUrlFragment;
+import org.apache.openmeetings.web.util.OmUrlFragment.MenuActions;
+import org.apache.openmeetings.web.util.OmUrlFragment.MenuParams;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+
+public class MainMenuItem extends MenuItem {
+ private static final long serialVersionUID = 1L;
+ private MenuActions action;
+ private MenuParams params;
+
+ public MainMenuItem(Navimain m) {
+ super(Application.getString(m.getLabelId()),
Application.getString(m.getTooltipLabelId()));
+ action = MenuActions.valueOf(m.getAction());
+ params = m.getParams() != null ?
MenuParams.valueOf(m.getParams()) : MenuParams.publicTabButton;
+ }
+
+ @Override
+ public void onClick(MainPage page, AjaxRequestTarget target) {
+ page.updateContents(new OmUrlFragment(action, params), target);
+ }
+}
Added:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuFunctionsBehavior.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuFunctionsBehavior.java?rev=1713707&view=auto
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuFunctionsBehavior.java
(added)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuFunctionsBehavior.java
Tue Nov 10 18:11:33 2015
@@ -0,0 +1,52 @@
+/*
+ * 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.
+ */
+/**
+ * @author Sebastien Briquet
+ */
+package org.apache.openmeetings.web.common.menu;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
+
+public class MenuFunctionsBehavior extends Behavior {
+ private static final long serialVersionUID = 1L;
+ private final static JavaScriptResourceReference MENU_FUNCTIONS = new
JavaScriptResourceReference(MenuFunctionsBehavior.class, "menu-functions.js");
+ private final String menuContainerId;
+ private final String menuId;
+
+ public MenuFunctionsBehavior(String menuContainerId, String menuId) {
+ this.menuContainerId = menuContainerId;
+ this.menuId = menuId;
+ }
+
+ public String getInitScript() {
+ return String.format("initMenu('%s', '%s');", menuContainerId,
menuId);
+ }
+
+ @Override
+ public void renderHead(Component component, IHeaderResponse response) {
+ super.renderHead(component, response);
+
response.render(JavaScriptHeaderItem.forReference(MENU_FUNCTIONS));
+
response.render(OnDomReadyHeaderItem.forScript(getInitScript()));
+ }
+}
Added:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java?rev=1713707&view=auto
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java
(added)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java
Tue Nov 10 18:11:33 2015
@@ -0,0 +1,87 @@
+/*
+ * 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.common.menu;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.apache.openmeetings.web.pages.MainPage;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+
+public abstract class MenuItem implements Serializable {
+ private static final long serialVersionUID = 1L;
+ protected String name;
+ protected String desc;
+ protected String cssClass;
+ protected boolean active = true;
+ protected List<MenuItem> children = null;
+
+ public MenuItem() {}
+
+ public MenuItem(String name) {
+ this(name, null);
+ }
+
+ public MenuItem(String name, String desc) {
+ this.name = name;
+ this.desc = desc;
+ }
+
+ public abstract void onClick(MainPage page, AjaxRequestTarget target);
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDesc() {
+ return desc;
+ }
+
+ public void setDesc(String desc) {
+ this.desc = desc;
+ }
+
+ public boolean isActive() {
+ return active;
+ }
+
+ public void setActive(boolean active) {
+ this.active = active;
+ }
+
+ public List<MenuItem> getChildren() {
+ return children;
+ }
+
+ public void setChildren(List<MenuItem> children) {
+ this.children = children;
+ }
+
+ public String getCssClass() {
+ return cssClass;
+ }
+
+ public void setCssClass(String cssClass) {
+ this.cssClass = cssClass;
+ }
+}
Added:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java?rev=1713707&view=auto
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java
(added)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java
Tue Nov 10 18:11:33 2015
@@ -0,0 +1,48 @@
+/*
+ * 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.common.menu;
+
+import org.apache.openmeetings.web.pages.MainPage;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+
+public class RoomMenuItem extends MenuItem {
+ private static final long serialVersionUID = 1L;
+
+ public RoomMenuItem(String name) {
+ this(name, null);
+ }
+
+ public RoomMenuItem(String name, String desc) {
+ this(name, desc, true);
+ }
+
+ public RoomMenuItem(String name, String desc, boolean active) {
+ super(name, desc);
+ this.active = active;
+ }
+
+ public RoomMenuItem(String name, String desc, String cssClass) {
+ super(name, desc);
+ this.cssClass = cssClass;
+ }
+
+ @Override
+ public void onClick(MainPage page, AjaxRequestTarget target) {
+ }
+}
Added:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/menu-functions.js
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/menu-functions.js?rev=1713707&view=auto
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/menu-functions.js
(added)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/menu-functions.js
Tue Nov 10 18:11:33 2015
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+function initMenu(menuContainerId, menuId) {
+ $("#" + menuContainerId).menubar({
+ autoExpand: true
+ , menuIcon: true
+ , buttons: true
+ , position: {
+ my: "left top",
+ at: "left bottom",
+ collision: "none"
+ }
+ //, select: select
+ });
+}
\ No newline at end of file
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html?rev=1713707&r1=1713706&r2=1713707&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
Tue Nov 10 18:11:33 2015
@@ -44,7 +44,7 @@
</tr>
<tr>
<td><wicket:message key="619" /></td>
- <td><select wicket:id="room.roomtype"
></select></td>
+ <td><select wicket:id="room.type"
></select></td>
</tr>
<tr>
<td><wicket:message key="406" /></td>
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1713707&r1=1713706&r2=1713707&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
Tue Nov 10 18:11:33 2015
@@ -360,7 +360,7 @@ public class AppointmentDialog extends A
RoomDao dao = getBean(RoomDao.class);
result.addAll(dao.getPublicRooms());
for (Organisation_Users ou :
getBean(UserDao.class).get(getUserId()).getOrganisation_users()) {
-
result.addAll(dao.getOrganisationRooms(ou.getOrganisation().getId()));
+
result.addAll(dao.getGroupRooms(ou.getOrganisation().getId()));
}
if (getModelObject().getRoom() != null &&
getModelObject().getRoom().isAppointment()) { //FIXME review
result.add(getModelObject().getRoom());
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1713707&r1=1713706&r2=1713707&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
Tue Nov 10 18:11:33 2015
@@ -72,20 +72,21 @@ public class CalendarPanel extends UserP
private Calendar calendar;
@Override
- public void onMenuPanelLoad(IPartialPageRequestHandler target) {
+ public void onMenuPanelLoad(IPartialPageRequestHandler handler) {
+ super.onMenuPanelLoad(handler);
}
@Override
- public void cleanup(IPartialPageRequestHandler target) {
- refreshTimer.stop(target);
+ public void cleanup(IPartialPageRequestHandler handler) {
+ refreshTimer.stop(handler);
}
private AppointmentDao getDao() {
return getBean(AppointmentDao.class);
}
- public void refresh(IPartialPageRequestHandler target) {
- calendar.refresh(target);
+ public void refresh(IPartialPageRequestHandler handler) {
+ calendar.refresh(handler);
}
Calendar getCalendar() {
@@ -261,7 +262,7 @@ public class CalendarPanel extends UserP
private Appointment getDefault() {
Appointment a = new Appointment();
- a.setReminder(Reminder.email); //TODO: Make configurable
+ a.setReminder(Reminder.ical); //TODO: Make configurable
a.setOwner(getBean(UserDao.class).get(getUserId()));
a.setTitle(Application.getString(1444));
log.debug(" -- getDefault -- Current model " + a);
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java?rev=1713707&r1=1713706&r2=1713707&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
Tue Nov 10 18:11:33 2015
@@ -61,7 +61,7 @@ public class RoomsTabbedPanel extends Us
protected void
populateItem(ListItem<Organisation_Users> item) {
Organisation org =
item.getModelObject().getOrganisation();
item.add(new RoomsPanel("rooms"
- ,
getBean(RoomDao.class).getOrganisationRooms(org.getId()))
+ ,
getBean(RoomDao.class).getGroupRooms(org.getId()))
.setMarkupId("org" +
org.getId())).setRenderBodyOnly(true);
}
});
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1713707&r1=1713706&r2=1713707&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
Tue Nov 10 18:11:33 2015
@@ -78,7 +78,7 @@ public class CalendarPanel extends UserP
@Override
public void cleanup(IPartialPageRequestHandler handler) {
- refreshTimer.stop((AjaxRequestTarget)handler);
+ refreshTimer.stop(handler);
}
private AppointmentDao getDao() {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/OmCalendarEvent.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/OmCalendarEvent.java?rev=1713707&r1=1713706&r2=1713707&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/OmCalendarEvent.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/OmCalendarEvent.java
Tue Nov 10 18:11:33 2015
@@ -19,6 +19,7 @@
package org.apache.openmeetings.web.user.calendar;
import static org.apache.openmeetings.web.util.CalendarWebHelper.getDateTime;
+
import org.apache.openmeetings.db.entity.calendar.Appointment;
import com.googlecode.wicket.jquery.ui.calendar.CalendarEvent;
