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 2014/09/04 20:23:28 UTC
svn commit: r1622524 - in
/openmeetings/trunk/singlewebapp/openmeetings-web/src/main:
java/org/apache/openmeetings/web/app/
java/org/apache/openmeetings/web/common/
java/org/apache/openmeetings/web/room/
java/org/apache/openmeetings/web/user/calendar/ ...
Author: solomax
Date: Thu Sep 4 18:23:28 2014
New Revision: 1622524
URL: http://svn.apache.org/r1622524
Log:
[OPENMEETINGS-359] Invitation dialog stub is implemented
Added:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/calendar.css
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java?rev=1622524&r1=1622523&r2=1622524&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java Thu Sep 4 18:23:28 2014
@@ -288,8 +288,9 @@ public class WebSession extends Abstract
public static String getString(long id) {
String s = getBean(FieldLanguagesValuesDao.class).getString(id, getLanguage());
- return s == null ? "[Missing]" :
+ s = s == null ? "[Missing]" :
(STRINGS_WITH_APP.contains(id) ? s.replaceAll("\\$APP_NAME", getBean(ConfigurationDao.class).getAppName()) : s);
+ return s;// + (Application.get().getDebugSettings().isDevelopmentUtilitiesEnabled() ? "[" + id + "]" : "");
}
public void setLanguage(long languageId) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.html?rev=1622524&r1=1622523&r2=1622524&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.html Thu Sep 4 18:23:28 2014
@@ -21,7 +21,7 @@
<html xmlns:wicket="http://wicket.apache.org">
<wicket:head>
<link rel="stylesheet" type="text/css" href="css/kendo/kendo.common.min.css" media="all" />
- <link rel="stylesheet" type="text/css" href="css/kendo/kendo.default.min.css" media="all" />
+ <link rel="stylesheet" type="text/css" href="css/kendo/kendo.default.min.css" media="all" />
</wicket:head>
<wicket:panel>
<div class="formSaveBar ui-widget-header">
Added: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html?rev=1622524&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html (added)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html Thu Sep 4 18:23:28 2014
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+
+-->
+<html xmlns:wicket="http://wicket.apache.org">
+<wicket:head>
+ <link rel="stylesheet" type="text/css" href="css/kendo/kendo.common.min.css" media="all" />
+ <link rel="stylesheet" type="text/css" href="css/kendo/kendo.default.min.css" media="all" />
+</wicket:head>
+<wicket:panel>
+ <form wicket:id="form">
+ <span wicket:id="feedback"></span>
+ <table>
+ <tr><!-- <label wicket:for="email" -->
+ <td><wicket:ommessage key="216" /></td><td><input type="text"/></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="215" /></td><td><input type="text"/></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="217" /></td><td><textarea></textarea></td>
+ </tr>
+ <tr>
+ <td colspan="2"><input type="checkbox"/><wicket:ommessage key="524" /></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="525" /></td><td><input type="password"/></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="526" /></td>
+ <td><div><input type="radio"><wicket:ommessage key="527" /></input>
+ <input type="radio"><wicket:ommessage key="528" /></input>
+ <input type="radio"><wicket:ommessage key="529" /></input></div>
+ </td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="530" /></td><td></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="531" /></td><td></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="1143" /></td><td><select/></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="59" /></td><td><select/></td>
+ </tr>
+ <tr>
+ <td colspan="2"><input type="text" disabled="disabled"/></td>
+ </tr>
+ </table>
+ </form>
+</wicket:panel>
+</html>
Added: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java?rev=1622524&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java (added)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java Thu Sep 4 18:23:28 2014
@@ -0,0 +1,74 @@
+/*
+ * 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.room;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.openmeetings.db.entity.room.Invitation;
+import org.apache.openmeetings.web.app.WebSession;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.form.Form;
+
+import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
+import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
+import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
+
+public class InvitationDialog extends AbstractFormDialog<Invitation> {
+ private static final long serialVersionUID = 1L;
+ private DialogButton generate = new DialogButton(WebSession.getString(1526));
+ private DialogButton send = new DialogButton(WebSession.getString(218));
+ private DialogButton cancel = new DialogButton(WebSession.getString(219));
+ private Form<Invitation> form;
+ private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback");
+
+ public InvitationDialog(String id) {
+ super(id, WebSession.getString(214));
+ add(form = new Form<Invitation>("form") {
+ private static final long serialVersionUID = 1L;
+
+ {
+ add(feedback);
+ }
+ });
+ }
+
+ @Override
+ public Form<Invitation> getForm() {
+ return form;
+ }
+
+ @Override
+ protected DialogButton getSubmitButton() {
+ return send;
+ }
+
+ @Override
+ protected List<DialogButton> getButtons() {
+ return Arrays.asList(generate, send, cancel);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target) {
+ }
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target) {
+ }
+}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html?rev=1622524&r1=1622523&r2=1622524&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html Thu Sep 4 18:23:28 2014
@@ -40,5 +40,6 @@
<div class="room wb area">
<div class="wb" wicket:id="whiteboard"></div>
</div>
+ <div wicket:id="invite"></div>
</wicket:panel>
</html>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1622524&r1=1622523&r2=1622524&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Thu Sep 4 18:23:28 2014
@@ -115,6 +115,7 @@ public class RoomPanel extends BasePanel
}
};
+ private InvitationDialog invite = new InvitationDialog("invite");
public RoomPanel(String id, long _roomId) {
this(id, getBean(RoomDao.class).get(_roomId));
@@ -199,6 +200,7 @@ public class RoomPanel extends BasePanel
startSharing.respond(target);
}
}).add(new AttributeAppender("title", WebSession.getString(1480)))); //FIXME add/remove
+ add(invite);
}
private JSONArray getStringLabels(long... ids) {
@@ -291,6 +293,7 @@ public class RoomPanel extends BasePanel
@Override
public void onClick(MainPage page, AjaxRequestTarget target) {
+ target.appendJavaScript("$('.room.video').dialog('destroy');");
if (WebSession.getRights().contains(Right.Dashboard)) {
page.updateContents(ROOMS_PUBLIC, target);
} else {
@@ -310,7 +313,14 @@ public class RoomPanel extends BasePanel
MenuItem actions = new RoomMenuItem(WebSession.getString(635));
List<RoomMenuItem> actionItems = new ArrayList<RoomMenuItem>();
- actionItems.add(new RoomMenuItem(WebSession.getString(213), WebSession.getString(1489)));
+ actionItems.add(new RoomMenuItem(WebSession.getString(213), WebSession.getString(1489)) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(MainPage page, AjaxRequestTarget target) {
+ invite.open(target);
+ }
+ });
actionItems.add(new RoomMenuItem(WebSession.getString(239), WebSession.getString(1480)) {
private static final long serialVersionUID = 1L;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js?rev=1622524&r1=1622523&r2=1622524&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js Thu Sep 4 18:23:28 2014
@@ -96,7 +96,7 @@ function initVideo(sid, roomid, audioOnl
};
var type = 'application/x-shockwave-flash';
var src = 'public/main.swf?cache' + new Date().getTime();
- var r = $('<div class="video">');
+ var r = $('<div class="room video">');
var o = $('<object>').attr('type', type).attr('data', src).attr('width', options.width).attr('height', options.height);
o.append($('<param>').attr('name', 'quality').attr('value', 'best'));
o.append($('<param>').attr('name', 'wmode').attr('value', 'transparent'));
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html?rev=1622524&r1=1622523&r2=1622524&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html Thu Sep 4 18:23:28 2014
@@ -19,8 +19,12 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
+ <wicket:head>
+ <link rel="stylesheet" type="text/css" href="css/kendo/kendo.common.min.css" media="all" />
+ <link rel="stylesheet" type="text/css" href="css/kendo/kendo.default.min.css" media="all" />
+ </wicket:head>
<wicket:panel>
- <form wicket:id="appForm">
+ <form wicket:id="appForm" class="appointmentPopUp">
<span wicket:id="feedback"></span>
<table>
<tr>
@@ -29,11 +33,11 @@
</tr>
<tr>
<td><wicket:ommessage key="570" /></td>
- <td><span wicket:id="start"></span></td>
+ <td><span class="date" wicket:id="start"></span></td>
</tr>
<tr>
<td><wicket:ommessage key="571" /></td>
- <td><span wicket:id="end"></span></td>
+ <td><span class="date" wicket:id="end"></span></td>
</tr>
<tr>
<td><wicket:ommessage key="565" /></td>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1622524&r1=1622523&r2=1622524&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Thu Sep 4 18:23:28 2014
@@ -51,8 +51,6 @@ import org.apache.openmeetings.web.util.
import org.apache.openmeetings.web.util.UserMultiChoice;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.extensions.yui.calendar.DateTimeField;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
@@ -76,6 +74,7 @@ import com.googlecode.wicket.jquery.ui.w
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButtons;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogIcon;
import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
+import com.googlecode.wicket.kendo.ui.form.datetime.DateTimePicker;
public class AppointmentDialog extends AbstractFormDialog<Appointment> {
private static final long serialVersionUID = 1L;
@@ -220,8 +219,8 @@ public class AppointmentDialog extends A
private class AppointmentForm extends Form<Appointment> {
private static final long serialVersionUID = 1L;
private boolean createRoom = true;
- private DateTimeField start;
- private DateTimeField end;
+ private DateTimePicker start;
+ private DateTimePicker end;
private final PasswordTextField pwd = new PasswordTextField("password");
private final Label owner = new Label("owner");
@@ -262,15 +261,14 @@ public class AppointmentDialog extends A
}
}
pwd.setEnabled(a.isPasswordProtected());
- owner.setOutputMarkupId(true);
+ owner.setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true);
owner.setDefaultModel(Model.of(FormatHelper.formatUser(a.getOwner())));
- owner.setVisible(!isOwner(a));
+ owner.setVisible(a.getOwner() != null);
}
public AppointmentForm(String id, IModel<Appointment> model) {
super(id, model);
setOutputMarkupId(true);
- add(new AttributeAppender("class", new Model<String>("appointmentPopUp"), " "));
add(feedback.setOutputMarkupId(true));
add(new RequiredTextField<String>("title").setLabel(Model.of(WebSession.getString(572))));
@@ -278,8 +276,8 @@ public class AppointmentDialog extends A
add(toolbar);
add(new WysiwygEditor("description", toolbar));
add(new TextField<String>("location"));
- add(start = new DateTimeField("start"));
- add(end = new DateTimeField("end"));
+ add(start = new DateTimePicker("start", "yyyy MMM dd", "HH:mm:ss")); //FIXME use user locale
+ add(end = new DateTimePicker("end", "yyyy MMM dd", "HH:mm:ss")); //FIXME use user locale
pwd.setEnabled(getModelObject().isPasswordProtected());
pwd.setOutputMarkupId(true);
add(pwd);
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=1622524&r1=1622523&r2=1622524&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 Thu Sep 4 18:23:28 2014
@@ -67,6 +67,7 @@ public class CalendarPanel extends UserP
@Override
public void onMenuPanelLoad(AjaxRequestTarget target) {
+ super.onMenuPanelLoad(target);
}
@Override
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/calendar.css
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/calendar.css?rev=1622524&r1=1622523&r2=1622524&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/calendar.css (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/calendar.css Thu Sep 4 18:23:28 2014
@@ -53,6 +53,12 @@
float: left;
}
+.appointmentPopUp td {
+ vertical-align: middle;
+}
+.appointmentPopUp td .date {
+ font-size: 12px;
+}
.appointmentPopUp .attendeeContainer {
background-color: #FFFFFF;
border: solid 1px #aacfe4;
@@ -62,23 +68,6 @@
float: left;
}
-.appointmentPopUp .attendeeContainer table td:FIRST-CHILD div {
- width: 130px;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-
-.appointmentPopUp .attendeeContainer table td:nth-child(2) div {
- width: 260px;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-
-.appointmentPopUp .attendeeContainer table td:nth-child(3) div {
- width: 20px;
-}
.appointment.attendees {
width: 100%;
}