Author: sebawagner
Date: Sun Jul 21 04:53:17 2013
New Revision: 1505272
URL: http://svn.apache.org/r1505272
Log:
Fixes OPENMEETINGS-708 - issue was that I set a static div-id in the form
component, Wicket does not seem to like that.
Modified:
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/calendar.css
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
Modified:
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/calendar.css
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/calendar.css?rev=1505272&r1=1505271&r2=1505272&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/calendar.css
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/calendar.css
Sun Jul 21 04:53:17 2013
@@ -16,44 +16,44 @@
* specific language governing permissions and limitations
* under the License.
*/
-#appointmentPopUp td {
+.appointmentPopUp td {
vertical-align: top;
}
-#appointmentPopUp input[name="appointmentName"] {
+.appointmentPopUp input[name="appointmentName"] {
width: 420px;
}
-#appointmentPopUp input[name="password"] {
+.appointmentPopUp input[name="password"] {
width: 420px;
}
-#appointmentPopUp input[name="appointmentLocation"] {
+.appointmentPopUp input[name="appointmentLocation"] {
width: 420px;
}
-#appointmentPopUp textarea[name="appointmentDescription"] {
+.appointmentPopUp textarea[name="appointmentDescription"] {
width: 424px;
height: 80px;
}
-#appointmentPopUp select[name="remind"] {
+.appointmentPopUp select[name="remind"] {
width: 426px;
}
-#appointmentPopUp select[name="room.roomtype"] {
+.appointmentPopUp select[name="room.roomtype"] {
width: 426px;
}
-#appointmentPopUp select[name="room"] {
+.appointmentPopUp select[name="room"] {
width: 426px;
}
-#appointmentPopUp .formNewButton {
+.appointmentPopUp .formNewButton {
float: left;
}
-#appointmentPopUp .attendeeContainer {
+.appointmentPopUp .attendeeContainer {
background-color: #FFFFFF;
border: solid 1px #aacfe4;
width: 424px;
@@ -62,20 +62,20 @@
float: left;
}
-#appointmentPopUp .attendeeContainer table td:FIRST-CHILD div {
+.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 {
+.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 {
+.appointmentPopUp .attendeeContainer table td:nth-child(3) div {
width: 20px;
}
\ No newline at end of file
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java?rev=1505272&r1=1505271&r2=1505272&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
Sun Jul 21 04:53:17 2013
@@ -402,7 +402,11 @@ public class Appointment implements Seri
@Override
public String toString() {
- return "" + super.toString() + " Appointment ID: " +
this.getAppointmentId();
+ return "" + super.toString()
+ + " Appointment ID: " + getAppointmentId()
+ + " Starttime: " + getAppointmentStarttime()
+ + " Endtime: " + getAppointmentEndtime()
+ + " Name: " + getAppointmentName();
}
}
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=1505272&r1=1505271&r2=1505272&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
Sun Jul 21 04:53:17 2013
@@ -44,6 +44,7 @@ import org.apache.openmeetings.web.util.
import org.apache.wicket.ajax.AjaxEventBehavior;
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.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
@@ -187,8 +188,7 @@ public class AppointmentDialog extends A
public AppointmentForm(String id, IModel<Appointment> model) {
super(id, model);
setOutputMarkupId(true);
- //this will only work if there is only a single
instance of this element on the screen! (sebawagner, 21-07-2013)
- setMarkupId("appointmentPopUp");
+ add(new AttributeAppender("class", new
Model<String>("appointmentPopUp"), " "));
add(feedback.setOutputMarkupId(true));
add(new
RequiredTextField<String>("appointmentName").setLabel(Model.of(WebSession.getString(572))));
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=1505272&r1=1505271&r2=1505272&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
Sun Jul 21 04:53:17 2013
@@ -175,6 +175,7 @@ public class CalendarPanel extends UserP
dialog.setModelObject(a);
dialog.open(target);
+
}
@Override
