Author: solomax
Date: Tue Jun 4 18:37:44 2013
New Revision: 1489551
URL: http://svn.apache.org/r1489551
Log:
[OPENMEETINGS-626] Styles are enhanced;
Code clean up;
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/RoomTypeDropDown.java
Modified:
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/backup/BackupPanel.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServersPanel.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UsersPanel.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/AddFolderDialog.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.html
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/calendar/CalendarPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessageDialog.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessageDialog.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css?rev=1489551&r1=1489550&r2=1489551&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css Tue
Jun 4 18:37:44 2013
@@ -432,17 +432,6 @@ div.tableWrapper {
box-shadow: 3px 3px 4px #000;
}
-.info-icon {
- background: url(images/information.png) no-repeat;
- float: left;
- cursor: default;
- width: 18px;
- height: 18px;
- border: none;
- margin-left: 2px;
- margin-top: 2px;
-}
-
.sort-icon {
display: inline-block !important;
text-indent: 0px !important;
@@ -777,3 +766,31 @@ table.messages td.main {
width: 18px;
height: 18px;
}
+.messages.column.label {
+ width: 10px;
+}
+input[type="text"].messages.text {
+ width: 100%;
+}
+textarea.messages.body {
+ width: 100%;
+ height: 300px;
+}
+select.messages.selector {
+ width: 120px;
+}
+.info-text {
+ background-image: url(images/information.png);
+ background-repeat: no-repeat;
+ background-position: 2px 2px;
+ cursor: default;
+ border: none;
+ padding-left: 20px;
+ font-style: italic;
+}
+.invisible-form-component {
+ position: absolute;
+ top: -9999px;
+ width: 1px;
+ height: 1px;
+}
\ No newline at end of file
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/backup/BackupPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/backup/BackupPanel.html?rev=1489551&r1=1489550&r2=1489551&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/backup/BackupPanel.html
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/backup/BackupPanel.html
Tue Jun 4 18:37:44 2013
@@ -28,7 +28,7 @@
<fieldset>
<legend><wicket:ommessage key="1066" /></legend>
<div class="formelement">
- <div class="info-icon" /><span
style="font-style: italic;"><wicket:ommessage key="1065" /></span>
+ <div class="info-text"><wicket:ommessage
key="1065" /></div>
</div>
<div class="formelement">
<label><wicket:ommessage key="1537" /></label> <input
type="checkbox" wicket:id="includeFilesInBackup" />
@@ -51,7 +51,7 @@
</div>
<div class="formelement">
<!-- Backup CLI import information -->
- <div class="info-icon" /><span style="font-style:
italic;"><wicket:ommessage key="1505" /></span>
+ <div class="info-text"><wicket:ommessage key="1505"
/></div>
</div>
</fieldset>
</form>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html?rev=1489551&r1=1489550&r2=1489551&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
Tue Jun 4 18:37:44 2013
@@ -78,12 +78,12 @@
<label><wicket:ommessage key="1113"
/></label><span wicket:id="updatedby.login"/>
</div>
<div class="formelement">
- <div class="info-icon" /><span
style="font-style: italic;"><wicket:ommessage key="1114" /></span>
+ <div
class="info-text"><wicket:ommessage key="1114" /></div>
<br/>
<label><wicket:ommessage
key="1115" /></label><input type="text" wicket:id="configFileName"/>
</div>
<div class="formelement">
- <div class="info-icon" /><span
style="font-style: italic;"><wicket:ommessage key="1116" /></span>
+ <div
class="info-text"><wicket:ommessage key="1116" /></div>
<br/>
<label><wicket:ommessage
key="1117" /></label><input type="checkbox" class="formcheckbox"
wicket:id="addDomainToUserName"/>
</div>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html?rev=1489551&r1=1489550&r2=1489551&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
Tue Jun 4 18:37:44 2013
@@ -85,9 +85,9 @@
<label><wicket:ommessage key="195"
/></label><input type="checkbox" class="formcheckbox" wicket:id="ispublic" />
</div>
<div class="formelement">
- <div class="info-icon" /><span
style="font-style: italic;"><wicket:ommessage key="828" /></span>
+ <div
class="info-text"><wicket:ommessage key="828" /></div>
<br/>
- <div class="info-icon" /><span
style="font-style: italic;"><wicket:ommessage key="191" /></span>
+ <div class="info-text"><wicket:ommessage
key="191" /></div>
<br/>
<label><wicket:ommessage
key="191" /></label><select wicket:id="roomOrganisations" style="height: 80px"/>
</div>
@@ -116,9 +116,9 @@
<label><wicket:ommessage
key="1076" /></label><input type="checkbox" class="formcheckbox"
wicket:id="isAudioOnly" />
</div>
<div class="formelement">
- <div class="info-icon" /><span
style="font-style: italic;"><wicket:ommessage key="1077" /></span>
+ <div
class="info-text"><wicket:ommessage key="1077" /></div>
<br/>
- <div class="info-icon"
/><span style="font-style: italic;"><wicket:ommessage key="1101" /></span>
+ <div
class="info-text"><wicket:ommessage key="1101" /></div>
<br/>
<label><wicket:ommessage
key="1076" /></label><input type="checkbox" class="formcheckbox"
wicket:id="isClosed" />
</div>
@@ -126,7 +126,7 @@
<label><wicket:ommessage
key="1100" /></label><input type="text" wicket:id="redirectURL" />
</div>
<div
class="formelement">
- <div
class="info-icon" /><span style="font-style: italic;"><wicket:ommessage
key="1102" /></span>
+ <div
class="info-text"><wicket:ommessage key="1102" /></div>
<br/>
<label><wicket:ommessage
key="1076" /></label><input type="checkbox" class="formcheckbox"
wicket:id="waitForRecording" />
</div>
@@ -180,7 +180,7 @@
<wicket:ommessage key="587" />
<select wicket:id="moderators"/>
<br/>
-->
- <div class="info-icon" /><span
style="font-style: italic;"><wicket:ommessage key="823" /></span>
+ <div
class="info-text"><wicket:ommessage key="823" /></div>
<br/>
<label><wicket:ommessage
key="640" /></label><input type="checkbox" class="formcheckbox"
wicket:id="isModeratedRoom" />
</div>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServersPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServersPanel.html?rev=1489551&r1=1489550&r2=1489551&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServersPanel.html
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServersPanel.html
Tue Jun 4 18:37:44 2013
@@ -84,7 +84,7 @@
<label><wicket:ommessage key="1523"
/></label><input type="text" wicket:id="protocol"/>
</div>
<div class="formelement">
- <div class="info-icon"
/><span style="font-style: italic;"><wicket:ommessage key="1518" /></span>
+ <div
class="info-text"><wicket:ommessage key="1518" /></div>
<br/>
<label><wicket:ommessage key="1517"
/></label><span wicket:id="lastPing"/>
<!-- br/>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UsersPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UsersPanel.html?rev=1489551&r1=1489550&r2=1489551&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UsersPanel.html
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UsersPanel.html
Tue Jun 4 18:37:44 2013
@@ -93,9 +93,8 @@
wicket:id="updatetime" />
</div>
<div class="formelement">
- <div class="info-icon"
/>
- <span
style="font-style: italic;"><wicket:ommessage
-
key="1149" /></span> <br /> <label><wicket:ommessage
+ <div
class="info-text"><wicket:ommessage
+
key="1149" /></div> <br /> <label><wicket:ommessage
key="1148" /></label><input class="formcheckbox" type="checkbox"
wicket:id="forceTimeZoneCheck" />
</div>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/AddFolderDialog.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/AddFolderDialog.html?rev=1489551&r1=1489550&r2=1489551&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/AddFolderDialog.html
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/AddFolderDialog.html
Tue Jun 4 18:37:44 2013
@@ -23,7 +23,7 @@
<form wicket:id="form">
<span style="padding-left: 20px; padding-right:
20px;"><wicket:ommessage key="572"/></span><input type="text"
wicket:id="title"/>
<div wicket:id="feedback"></div>
- <input type="submit" wicket:id="submit" style="position:
absolute; top: -9999px; width: 1px; height: 1px;"/>
+ <input type="submit" wicket:id="submit"
class="invisible-form-component"/>
</form>
</wicket:panel>
</html>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html?rev=1489551&r1=1489550&r2=1489551&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html
Tue Jun 4 18:37:44 2013
@@ -38,8 +38,7 @@
</tr>
</table>
<span wicket:id="feedback"></span>
- <input type="submit" wicket:id="submit"
- style="position: absolute; top: -9999px; width: 1px;
height: 1px;" />
+ <input type="submit" wicket:id="submit"
class="invisible-form-component"/>
</form>
</wicket:panel>
</html>
\ No newline at end of file
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.html?rev=1489551&r1=1489550&r2=1489551&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
Tue Jun 4 18:37:44 2013
@@ -60,7 +60,7 @@
</tr>
</table>
<span wicket:id="feedback"></span>
- <input type="submit" wicket:id="submit" style="position:
absolute; top: -9999px; width: 1px; height: 1px;"/>
+ <input type="submit" wicket:id="submit"
class="invisible-form-component"/>
</form>
</wicket:panel>
</html>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.html?rev=1489551&r1=1489550&r2=1489551&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.html
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.html
Tue Jun 4 18:37:44 2013
@@ -45,7 +45,7 @@
</tr>
</table>
<span wicket:id="feedback"></span>
- <input type="submit" wicket:id="submit" style="position:
absolute; top: -9999px; width: 1px; height: 1px;"/>
+ <input type="submit" wicket:id="submit"
class="invisible-form-component"/>
</form>
</wicket:panel>
</html>
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=1489551&r1=1489550&r2=1489551&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
Tue Jun 4 18:37:44 2013
@@ -71,11 +71,8 @@
</tr>
<tr>
<td><wicket:ommessage key="573" /></td>
- <td><textarea
wicket:id="appointmentDescription"></textarea></td>
+ <td><form
wicket:id="appointmentDescription"></form></td>
</tr>
- <!-- tr>
- <td colspan="2" style="text-align:
right"><input type="button" wicket:id="save" /><input type="button"
wicket:id="cancel" /></td>
- </tr -->
</table>
</form>
</wicket:panel>
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=1489551&r1=1489550&r2=1489551&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
Tue Jun 4 18:37:44 2013
@@ -21,6 +21,7 @@ package org.apache.openmeetings.web.user
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getLanguage;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
+import static org.apache.openmeetings.web.util.RoomTypeDropDown.getRoomTypes;
import java.util.ArrayList;
import java.util.Arrays;
@@ -29,7 +30,6 @@ import java.util.List;
import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDao;
import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
-import org.apache.openmeetings.data.conference.RoomManager;
import org.apache.openmeetings.data.conference.dao.RoomDao;
import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
@@ -38,6 +38,7 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.room.Room;
import org.apache.openmeetings.persistence.beans.room.RoomType;
import org.apache.openmeetings.web.app.WebSession;
+import org.apache.openmeetings.web.util.RoomTypeDropDown;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
import org.apache.wicket.extensions.yui.calendar.DateTimeField;
@@ -49,11 +50,11 @@ import org.apache.wicket.markup.html.for
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 org.apache.wicket.model.PropertyModel;
+//import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.WysiwygEditor;
import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
@@ -82,7 +83,7 @@ public class AppointmentDialog extends A
this.calendar = calendar;
setOutputMarkupId(true);
feedback = new FeedbackPanel("feedback");
- form = new AppointmentForm("appForm", new
CompoundPropertyModel<Appointment>(this.getModel()));
+ form = new AppointmentForm("appForm", model);
add(form);
}
@@ -169,6 +170,7 @@ 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"));
add(new TextField<String>("appointmentLocation"));
add(new DateTimeField("appointmentStarttime"));
@@ -184,11 +186,7 @@ public class AppointmentDialog extends A
, remindTypes
, new
ChoiceRenderer<AppointmentReminderTyps>("name", "typId")));
- List<RoomType> roomTypes = getRoomTypes();
- final DropDownChoice<RoomType> roomType = new
DropDownChoice<RoomType>(
- "room.roomtype"
- , roomTypes
- , new
ChoiceRenderer<RoomType>("label.value", "roomtypes_id"));
+ final DropDownChoice<RoomType> roomType = new
RoomTypeDropDown("room.roomtype");
roomType.setEnabled(createRoom);
roomType.setOutputMarkupId(true);
add(roomType);
@@ -221,12 +219,13 @@ public class AppointmentDialog extends A
});
}
- private boolean isPwdProtected() {
- return
Boolean.TRUE.equals(getModelObject().getIsPasswordProtected());
+ @Override
+ protected void onSubmit() {
+ super.onSubmit();
}
- private List<RoomType> getRoomTypes() {
- return
getBean(RoomManager.class).getAllRoomTypes(getLanguage());
+ private boolean isPwdProtected() {
+ return
Boolean.TRUE.equals(getModelObject().getIsPasswordProtected());
}
private List<AppointmentReminderTyps> getRemindTypes() {
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1489551&r1=1489550&r2=1489551&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
Tue Jun 4 18:37:44 2013
@@ -28,7 +28,7 @@ import org.apache.openmeetings.web.commo
import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.model.Model;
+import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.util.time.Duration;
import com.googlecode.wicket.jquery.core.Options;
@@ -57,7 +57,8 @@ public class CalendarPanel extends UserP
final Form<Date> form = new Form<Date>("form");
add(form);
- final AppointmentDialog dialog = new
AppointmentDialog("appointment", WebSession.getString(815), this, Model.of(new
Appointment()));
+ final AppointmentDialog dialog = new
AppointmentDialog("appointment", WebSession.getString(815)
+ , this, new
CompoundPropertyModel<Appointment>(new Appointment()));
add(dialog);
Options options = new Options();
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessageDialog.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessageDialog.html?rev=1489551&r1=1489550&r2=1489551&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessageDialog.html
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessageDialog.html
Tue Jun 4 18:37:44 2013
@@ -19,32 +19,39 @@
-->
<html xmlns:wicket="http://wicket.apache.org";>
+<wicket:head>
+ <style type="text/css">
+ .ui-autocomplete {
+ z-index: 999 !important;
+ }
+ </style>
+</wicket:head>
<wicket:panel>
<form wicket:id="form">
<table style="width: 100%;">
<tr>
- <td><wicket:ommessage key="1210"/></td>
- <td><input type="text" wicket:id="to"/></td>
+ <td class="messages column
label"><wicket:ommessage key="1210"/></td>
+ <td><input class="messages text" type="text"
wicket:id="to"/></td>
</tr>
<tr>
- <td><wicket:ommessage key="1211"/></td>
- <td><input type="text"
wicket:id="subject"/></td>
+ <td class="messages column
label"><wicket:ommessage key="1211"/></td>
+ <td><input class="messages text" type="text"
wicket:id="subject"/></td>
</tr>
<tr>
- <td colspan="2"><textarea wicket:id="message"
style="width: 100%; height: 300px;"></textarea></td>
+ <td colspan="2"><textarea class="messages body"
wicket:id="message" ></textarea></td>
</tr>
<tr>
<td colspan="2"><input type="checkbox"
wicket:id="room" /><label wicket:for="room"><wicket:ommessage
key="1218"/></label></td>
</tr>
- <tr wicket:id="roomParams">
- <td colspan="2">
+ <tr wicket:id="roomParamsBlock">
+ <td colspan="2" wicket:id="roomParams">
<table style="width: 100%">
<tr>
<td style="width:
70px;">
<table>
<tr>
<td><wicket:ommessage key="194"/></td>
-
<td><select wicket:id="roomType"></select></td>
+
<td><select class="messages selector" wicket:id="roomType"></select></td>
</tr>
<tr>
<td><wicket:ommessage key="570" /></td>
@@ -56,7 +63,7 @@
</tr>
</table>
</td>
- <td><div
class="info-icon"></div><span style="font-style: italic;"><wicket:ommessage
key="1221" /></span></td>
+ <td><div
class="info-text"><wicket:ommessage key="1221" /></div></td>
</tr>
</table>
</td>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessageDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessageDialog.java?rev=1489551&r1=1489550&r2=1489551&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessageDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessageDialog.java
Tue Jun 4 18:37:44 2013
@@ -27,6 +27,7 @@ import org.apache.openmeetings.data.user
import org.apache.openmeetings.persistence.beans.user.PrivateMessage;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.web.app.WebSession;
+import org.apache.openmeetings.web.util.RoomTypeDropDown;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -47,8 +48,14 @@ public class MessageDialog extends Abstr
private final Form<PrivateMessage> form;
private DialogButton send = new DialogButton(WebSession.getString(218));
private DialogButton cancel = new
DialogButton(WebSession.getString(219));
+ private final WebMarkupContainer roomParamsBlock = new
WebMarkupContainer("roomParamsBlock");
private final WebMarkupContainer roomParams = new
WebMarkupContainer("roomParams");
+ @Override
+ public int getWidth() {
+ return 650;
+ }
+
public MessageDialog(String id, IModel<PrivateMessage> model) {
super(id, WebSession.getString(1209), model);
form = new Form<PrivateMessage>("form", getModel());
@@ -63,17 +70,19 @@ public class MessageDialog extends Abstr
});
form.add(new TextField<String>("subject"));
form.add(new TextArea<String>("message"));
- form.add(roomParams.setOutputMarkupId(true));
+ form.add(roomParamsBlock.setOutputMarkupId(true));
form.add(new CheckBox("room",
Model.of(getModelObject().getRoom() != null)).add(new
AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
boolean val = false;
@Override
protected void onEvent(AjaxRequestTarget target) {
- target.add(roomParams.setVisible(val = !val));
+ roomParams.setVisible(val = !val);
+ target.add(roomParamsBlock);
}
}));
- roomParams.add(new WebMarkupContainer("roomType"));
+ roomParamsBlock.add(roomParams);
+ roomParams.add(new RoomTypeDropDown("roomType"));
roomParams.add(new WebMarkupContainer("start"));
roomParams.add(new WebMarkupContainer("end"));
add(form);
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html?rev=1489551&r1=1489550&r2=1489551&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
Tue Jun 4 18:37:44 2013
@@ -41,18 +41,22 @@
<div><b><wicket:ommessage
key="1206"/> (<span wicket:id="unread"></span>)</b></div>
<div wicket:id="navigator"></div>
<table style="width: 100%;">
+ <thead>
<tr>
<th><span
wicket:id="orderById"></span><wicket:ommessage key="1205"/></th>
<th><span
wicket:id="orderByFrom"></span><wicket:ommessage key="1202"/></th>
<th><span
wicket:id="orderBySubject"></span><wicket:ommessage key="1203"/></th>
<th><span
wicket:id="orderBySend"></span><wicket:ommessage key="1204"/></th>
</tr>
+ </thead>
+ <tbody style="background-color:
white;">
<tr wicket:id="messages">
<td wicket:id="id"></td>
<td
wicket:id="from"></td>
<td
wicket:id="subject"></td>
<td
wicket:id="send"></td>
</tr>
+ </tbody>
</table>
</div>
</td>
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/RoomTypeDropDown.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/RoomTypeDropDown.java?rev=1489551&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/RoomTypeDropDown.java
(added)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/RoomTypeDropDown.java
Tue Jun 4 18:37:44 2013
@@ -0,0 +1,45 @@
+/*
+ * 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.util;
+
+import static org.apache.openmeetings.web.app.Application.getBean;
+import static org.apache.openmeetings.web.app.WebSession.getLanguage;
+
+import java.util.List;
+
+import org.apache.openmeetings.data.conference.RoomManager;
+import org.apache.openmeetings.persistence.beans.room.RoomType;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
+import org.apache.wicket.markup.html.form.DropDownChoice;
+
+public class RoomTypeDropDown extends DropDownChoice<RoomType> {
+ private static final long serialVersionUID = 1L;
+ private static List<RoomType> roomTypes;
+
+ public static List<RoomType> getRoomTypes() {
+ if (roomTypes == null) {
+ roomTypes =
getBean(RoomManager.class).getAllRoomTypes(getLanguage());
+ }
+ return roomTypes;
+ }
+
+ public RoomTypeDropDown(String id) {
+ super(id, getRoomTypes(), new
ChoiceRenderer<RoomType>("label.value", "roomtypes_id"));
+ }
+}
