Author: solomax
Date: Fri May 17 02:38:10 2013
New Revision: 1483636
URL: http://svn.apache.org/r1483636
Log:
[OPENMEETINGS-630] Event resize is back (calendar is not resized on window
resize)
web.only build target is fixed;
SignIn dialog is auto-opened;
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarFunctionsBehavior.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/calendar-functions.js
Modified:
openmeetings/trunk/singlewebapp/build.xml
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
Modified: openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.xml?rev=1483636&r1=1483635&r2=1483636&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Fri May 17 02:38:10 2013
@@ -610,7 +610,7 @@
<copy file="NOTICE" tofile="${main.out.dir}/META-INF/NOTICE"
overwrite="true" />
</target>
- <target name="compile.only.nocheck">
+ <target name="compile.only.nocheck" depends="clean.classes,
prepare.mkdir">
<echo message="Compile main to ${main.out.dir}" />
<javac debug="on" debuglevel="lines,vars,source"
destdir="${main.out.dir}" includeantruntime="false"
source="1.6" target="1.6">
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1483636&r1=1483635&r2=1483636&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
Fri May 17 02:38:10 2013
@@ -35,6 +35,8 @@ import org.apache.wicket.ajax.AjaxReques
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.authentication.IAuthenticationStrategy;
+import org.apache.wicket.markup.head.CssContentHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
@@ -46,9 +48,10 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.PropertyModel;
+import com.googlecode.wicket.jquery.core.JQueryBehavior;
+import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.effect.JQueryEffectBehavior;
import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
-import com.googlecode.wicket.jquery.ui.widget.dialog.DialogBehavior;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
public class SignInDialog extends AbstractFormDialog<String> {
@@ -77,15 +80,34 @@ public class SignInDialog extends Abstra
this.f = f;
}
- //TODO need to be removed
@Override
- public DialogBehavior newWidgetBehavior(String selector) {
- DialogBehavior db = super.newWidgetBehavior(selector);
- db.setOption("autoOpen", true);
- db.setOption("closeOnEscape", false);
- db.setOption("resizable", false);
- db.setOption("open", "function(event, ui)
{$('.ui-dialog-titlebar-close').hide();}");
- return db;
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ //to remove upper-right close button
+ response.render(new CssContentHeaderItem(".no-close
.ui-dialog-titlebar-close { display: none; }", "dialog-noclose", ""));
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new JQueryBehavior(JQueryWidget.getSelector(this),
"dialog") {
+ private static final long serialVersionUID =
-249782023133645704L;
+
+ @Override
+ protected String $()
+ {
+ return this.$(Options.asString("open"));
+ }
+ });
+ }
+
+ @Override
+ protected void onConfigure(JQueryBehavior behavior) {
+ super.onConfigure(behavior);
+ //behavior.setOption("autoOpen", true); //TODO need to be
updated as soon as API will be added
+ behavior.setOption("closeOnEscape", false);
+ behavior.setOption("dialogClass", Options.asString("no-close"));
+ behavior.setOption("resizable", false);
}
@Override
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarFunctionsBehavior.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarFunctionsBehavior.java?rev=1483636&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarFunctionsBehavior.java
(added)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarFunctionsBehavior.java
Fri May 17 02:38:10 2013
@@ -0,0 +1,58 @@
+/*
+ * 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.user.calendar;
+
+import java.util.Map;
+
+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.PriorityHeaderItem;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.resource.ResourceReference;
+import org.apache.wicket.resource.TextTemplateResourceReference;
+import org.apache.wicket.util.collections.MicroMap;
+
+public class CalendarFunctionsBehavior extends Behavior {
+ private static final long serialVersionUID = 5455085536095081262L;
+ private final String markupId;
+
+ public CalendarFunctionsBehavior(String markupId) {
+ this.markupId = markupId;
+ }
+
+ private IModel<Map<String, Object>> newResourceModel() {
+ return Model.ofMap(new MicroMap<String, Object>("markupId",
this.markupId));
+ }
+
+ private ResourceReference newResourceReference() {
+ return new
TextTemplateResourceReference(CalendarFunctionsBehavior.class,
"calendar-functions.js", this.newResourceModel());
+ }
+
+ @Override
+ public void renderHead(Component component, IHeaderResponse response) {
+ super.renderHead(component, response);
+ response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forReference(this.newResourceReference(),
"calendar-functions")));
+ }
+}
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=1483636&r1=1483635&r2=1483636&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
Fri May 17 02:38:10 2013
@@ -31,7 +31,6 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.model.Model;
import org.apache.wicket.util.time.Duration;
-import com.googlecode.wicket.jquery.core.JQueryAbstractBehavior;
import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.calendar.Calendar;
import com.googlecode.wicket.jquery.ui.calendar.CalendarView;
@@ -75,22 +74,7 @@ public class CalendarPanel extends UserP
@Override
protected void onInitialize() {
super.onInitialize();
- add(new
JQueryAbstractBehavior("calendar-functions") {
- private static final long
serialVersionUID = -4154770823754288544L;
-
- @Override
- protected String $() {
- return "$(function() {
$(window).on('resize', setCalendarHeight); });\n"
- + "\n"
- + "function
getCalendarHeight() { \n"
- + "\treturn
$(window).height() - $('#" + getMarkupId() + "').position().top - 20;\n"
- + "}\n"
- + "function
setCalendarHeight() { \n"
- + "\t$('#" +
getMarkupId() + "').fullCalendar('option', 'height', getCalendarHeight());\n"
- + "}\n"
- +
"setCalendarHeight();";
- }
- });
+ add(new
CalendarFunctionsBehavior(getMarkupId()));
}
@Override
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/calendar-functions.js
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/calendar-functions.js?rev=1483636&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/calendar-functions.js
(added)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/calendar-functions.js
Fri May 17 02:38:10 2013
@@ -0,0 +1,33 @@
+/*
+ * 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
+ */
+function getCalendarHeight() {
+ return $(window).height() - $('#${markupId}').position().top - 20;
+}
+
+function setCalendarHeight() {
+ $('#${markupId}').fullCalendar('option', 'height', getCalendarHeight());
+}
+
+$(function() {
+ //$(window).on('resize', setCalendarHeight);
+ $(window).load(function() { setCalendarHeight(); } );
+});
