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/05 15:14:05 UTC
svn commit: r1622694 - in /openmeetings/trunk/singlewebapp: ./
openmeetings-web/
openmeetings-web/src/main/java/org/apache/openmeetings/web/common/
openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/
openmeetings-web/src/main/java...
Author: solomax
Date: Fri Sep 5 13:14:05 2014
New Revision: 1622694
URL: http://svn.apache.org/r1622694
Log:
[OPENMEETINGS-980] wicket.jqueryui version is updated
Removed:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/kendo/
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
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/pages/install/InstallWizard.java
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/user/calendar/AppointmentDialog.html
openmeetings/trunk/singlewebapp/pom.xml
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml?rev=1622694&r1=1622693&r2=1622694&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml Fri Sep 5 13:14:05 2014
@@ -344,27 +344,32 @@
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui-core</artifactId>
- <version>${wicket.jqueryui.version}</version>
+ <version>${wicket.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui</artifactId>
- <version>${wicket.jqueryui.version}</version>
+ <version>${wicket.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui-calendar</artifactId>
- <version>${wicket.jqueryui.version}</version>
+ <version>${wicket.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui-plugins</artifactId>
- <version>${wicket.jqueryui.version}</version>
+ <version>${wicket.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-kendo-ui</artifactId>
- <version>${wicket.jqueryui.version}</version>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.wicket-jquery-ui</groupId>
+ <artifactId>wicket-kendo-ui-theme-default</artifactId>
+ <version>${wicket.version}</version>
</dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
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=1622694&r1=1622693&r2=1622694&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 Fri Sep 5 13:14:05 2014
@@ -19,10 +19,6 @@
-->
<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>
<div class="formSaveBar ui-widget-header">
<div class="formSaveButton">
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java?rev=1622694&r1=1622693&r2=1622694&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java Fri Sep 5 13:14:05 2014
@@ -339,7 +339,7 @@ public class InstallWizard extends Wizar
);
} else {
progressBar.setModelObject(Application.get()._getBean(ImportInitvalues.class).getProgress());
- progressBar.respond(target);
+ progressBar.refresh(target);
//TODO uncomment later target.add(value);
//TODO add current step result as info
}
Modified: 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=1622694&r1=1622693&r2=1622694&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html Fri Sep 5 13:14:05 2014
@@ -19,10 +19,6 @@
-->
<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>
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=1622694&r1=1622693&r2=1622694&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 Fri Sep 5 13:14:05 2014
@@ -19,10 +19,6 @@
-->
<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" class="appointmentPopUp">
<span wicket:id="feedback"></span>
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1622694&r1=1622693&r2=1622694&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Fri Sep 5 13:14:05 2014
@@ -42,7 +42,6 @@
<maven.surefire.version>2.17</maven.surefire.version>
<maven-site.version>3.4</maven-site.version>
<wicket.version>7.0.0-M3</wicket.version>
- <wicket.jqueryui.version>7.0.0-SNAPSHOT</wicket.jqueryui.version>
<red5-server.version>1.0.3-RELEASE</red5-server.version>
<batik.version>1.7</batik.version>
<commons-transaction.version>1.2</commons-transaction.version>