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 2013/08/26 19:24:20 UTC
svn commit: r1517613 - in
/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user:
ChatPanel.html ChatPanel.java calendar/AppointmentDialog.html
calendar/AppointmentDialog.java profile/MessageDialog.html
profile/MessageDialog.java
Author: solomax
Date: Mon Aug 26 17:24:19 2013
New Revision: 1517613
URL: http://svn.apache.org/r1517613
Log:
[OPENMEETINGS-558] wysiwyg editor is added
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.html
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.html
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.html?rev=1517613&r1=1517612&r2=1517613&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.html (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.html Mon Aug 26 17:24:19 2013
@@ -50,7 +50,9 @@
<div id="controlBlock" onclick="toggleChat();"><div id="control" class="ui-icon ui-icon-carat-1-n sort-icon"></div></div>
<div wicket:id="messages"></div>
<form wicket:id="sendForm">
- <textarea wicket:id="message"></textarea><input type="submit" wicket:id="send"/>
+ <div wicket:id="toolbarContainer"></div>
+ <div wicket:id="message"></div>
+ <input type="submit" wicket:id="send"/>
</form>
</div>
</wicket:panel>
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java?rev=1517613&r1=1517612&r2=1517613&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java Mon Aug 26 17:24:19 2013
@@ -40,7 +40,6 @@ import org.apache.wicket.markup.head.OnD
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.protocol.ws.IWebSocketSettings;
import org.apache.wicket.protocol.ws.api.IWebSocketConnection;
@@ -49,6 +48,8 @@ import org.red5.logging.Red5LoggerFactor
import org.slf4j.Logger;
import com.googlecode.wicket.jquery.ui.plugins.emoticons.EmoticonsBehavior;
+import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.WysiwygEditor;
+import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.toolbar.DefaultWysiwygToolbar;
public class ChatPanel extends UserPanel {
private static final Logger log = Red5LoggerFactory.getLogger(ChatPanel.class, webAppRootKey);
@@ -97,7 +98,9 @@ public class ChatPanel extends UserPanel
add(new EmoticonsBehavior("#" + MESSAGE_AREA_ID));
add(new WebMarkupContainer("messages").setMarkupId(MESSAGE_AREA_ID));
final Form<Void> f = new Form<Void>("sendForm");
- f.add(new TextArea<String>("message", new PropertyModel<String>(ChatPanel.this, "message")).setOutputMarkupId(true));
+ DefaultWysiwygToolbar toolbar = new DefaultWysiwygToolbar("toolbarContainer");
+ f.add(toolbar);
+ f.add(new WysiwygEditor("message", new PropertyModel<String>(ChatPanel.this, "message"), toolbar).setOutputMarkupId(true));
f.add(new Button("send").add(new AjaxFormSubmitBehavior("onclick"){
private static final long serialVersionUID = -3746739738826501331L;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html?rev=1517613&r1=1517612&r2=1517613&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html Mon Aug 26 17:24:19 2013
@@ -85,7 +85,10 @@
</tr>
<tr>
<td><wicket:ommessage key="573" /></td>
- <td><!-- div wicket:id="appointmentDescription"></div--><textarea wicket:id="appointmentDescription"></textarea></td>
+ <td>
+ <div wicket:id="toolbarContainer"></div>
+ <div wicket:id="appointmentDescription"></div>
+ </td>
</tr>
</table>
</form>
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1517613&r1=1517612&r2=1517613&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Mon Aug 26 17:24:19 2013
@@ -53,7 +53,6 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.form.RequiredTextField;
-import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
@@ -64,6 +63,8 @@ import org.apache.wicket.model.PropertyM
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
+import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.WysiwygEditor;
+import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.toolbar.DefaultWysiwygToolbar;
import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButtons;
@@ -212,8 +213,9 @@ public class AppointmentDialog extends A
add(feedback.setOutputMarkupId(true));
add(new RequiredTextField<String>("appointmentName").setLabel(Model.of(WebSession.getString(572))));
- //add(new WysiwygEditor("appointmentDescription"));
- add(new TextArea<String>("appointmentDescription"));
+ DefaultWysiwygToolbar toolbar = new DefaultWysiwygToolbar("toolbarContainer");
+ add(toolbar);
+ add(new WysiwygEditor("appointmentDescription", toolbar));
add(new TextField<String>("appointmentLocation"));
add(new DateTimeField("appointmentStarttime"));
add(new DateTimeField("appointmentEndtime"));
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.html?rev=1517613&r1=1517612&r2=1517613&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.html (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.html Mon Aug 26 17:24:19 2013
@@ -41,7 +41,10 @@
<td><input class="messages text" type="text" wicket:id="subject"/></td>
</tr>
<tr>
- <td colspan="2"><textarea class="messages body" wicket:id="message" ></textarea></td>
+ <td colspan="2">
+ <div wicket:id="toolbarContainer"></div>
+ <div wicket:id="message"></div>
+ </td>
</tr>
<tr>
<td colspan="2"><input type="checkbox" wicket:id="bookedRoom" /><label wicket:for="bookedRoom"><wicket:ommessage key="1218"/></label></td>
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java?rev=1517613&r1=1517612&r2=1517613&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java Mon Aug 26 17:24:19 2013
@@ -42,13 +42,14 @@ import org.apache.wicket.extensions.yui.
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.WysiwygEditor;
+import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.toolbar.DefaultWysiwygToolbar;
import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
@@ -107,7 +108,9 @@ public class MessageDialog extends Abstr
form.add(feedback.setOutputMarkupId(true));
form.add(new UserAutoCompleteTextField("to").setRequired(true));
form.add(new TextField<String>("subject"));
- form.add(new TextArea<String>("message"));
+ DefaultWysiwygToolbar toolbar = new DefaultWysiwygToolbar("toolbarContainer");
+ form.add(toolbar);
+ form.add(new WysiwygEditor("message", toolbar));
form.add(roomParamsBlock.setOutputMarkupId(true));
final CheckBox bookedRoom = new CheckBox("bookedRoom");
form.add(bookedRoom.setOutputMarkupId(true).add(new AjaxEventBehavior("click") {