This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new 3b2e8fc [OPENMEETINGS-1868] 'Check setup' links are added
3b2e8fc is described below
commit 3b2e8fcf780dac0d91640abf0e8d1556d9f6d06d
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Thu Apr 26 23:18:01 2018 +0700
[OPENMEETINGS-1868] 'Check setup' links are added
---
CHANGELOG.md | 2 +-
.../openmeetings/web/user/dashboard/StartWidgetView.html | 2 +-
.../openmeetings/web/user/dashboard/StartWidgetView.java | 14 +++++++++++++-
.../openmeetings/web/user/dashboard/WelcomeWidgetView.html | 1 +
.../openmeetings/web/user/dashboard/WelcomeWidgetView.java | 9 +++++++++
5 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b22187..78d97f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2146,7 +2146,7 @@ Release Notes - OpenMeetings - Version 2.0-INCUBATING
* [OPENMEETINGS-230] - Error in the field name on the form "Add external"
* [OPENMEETINGS-232] - Rooms are imported with invalid room types
* [OPENMEETINGS-233] - Font styles in propertyPanel are getting disabled.
- * [OPENMEETINGS-234] - Video and Screen sharing not working with HTTPS and
RTMPS - Java Application starts but doesnt connect - java trace logs shows
"[WARN] [NioProcessor-2] org.red5.server.net.rtmps.RTMPSMinaIoHandler -
Exception caught Keystore or password are null"
+ * [OPENMEETINGS-234] - Video and Screen sharing not working with HTTPS and
RTMPS - Java Application starts but doesnt connect - java trace logs shows
"[WARN] org.red5.server.net.rtmps.RTMPSMinaIoHandler - Exception caught
Keystore or password are null"
* [OPENMEETINGS-237] - Calender reminder email invitation link fails due
to link missing "&language=x" in URL
* [OPENMEETINGS-238] - Calendar shows incorrect day of week for the actual
date when timezone is GMT+10
* [OPENMEETINGS-239] - Calendar Event details Comment/Description field
text can overflow the boundary of the Description field of the Meeting Room's
Event details dialog box
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
index 2072c0b..c30db5f 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
@@ -23,7 +23,7 @@
<h3><wicket:message key="widget.start.header"/></h3>
<div><div wicket:id="step1" class="clickable
start_step1"><wicket:message key="768"/></div></div>
<div><div wicket:id="step2" class="clickable
start_step2"><wicket:message key="771"/></div></div>
- <div><div wicket:id="step3" class="clickable
start_step3"><wicket:message key="772"/></div></div>
+ <div><div wicket:id="step3" class="start_step3"><a
wicket:id="avTest" target="_blank" rel="noopener"><wicket:message
key="772"/></a></div></div>
<div><div wicket:id="step4" class="clickable
start_step4"><wicket:message key="773"/></div></div>
<table>
<tr>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
index f7caad7..314b5ca 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
@@ -19,16 +19,21 @@
package org.apache.openmeetings.web.user.dashboard;
import static org.apache.openmeetings.web.common.BasePanel.EVT_CLICK;
+import static org.apache.openmeetings.web.room.SwfPanel.SWF;
+import static org.apache.openmeetings.web.room.SwfPanel.SWF_TYPE_SETTINGS;
import static org.apache.openmeetings.web.util.OmUrlFragment.CALENDAR;
import static org.apache.openmeetings.web.util.OmUrlFragment.ROOMS_PUBLIC;
import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.pages.HashPage;
import org.apache.openmeetings.web.pages.MainPage;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.Model;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.wicketstuff.dashboard.Widget;
import org.wicketstuff.dashboard.web.WidgetView;
@@ -45,7 +50,14 @@ public class StartWidgetView extends WidgetView {
protected void onInitialize() {
add(new WebMarkupContainer("step1").add(new
PublicRoomsEventBehavior()));
add(new WebMarkupContainer("step2").add(new
PublicRoomsEventBehavior()));
- add(new WebMarkupContainer("step3").add(new
PublicRoomsEventBehavior()));
+ add(new WebMarkupContainer("step3").add(new
Link<Void>("avTest") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick() {
+ setResponsePage(HashPage.class, new
PageParameters().add(SWF, SWF_TYPE_SETTINGS));
+ }
+ }));
add(new WebMarkupContainer("step4").add(new
PublicRoomsEventBehavior()));
add(new Label("123msg",
Application.getString("widget.start.desc")) //Application here is used to
substitute {0}
.setEscapeModelStrings(false));
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html
index 3a8e1dc..148e5d8 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html
@@ -36,6 +36,7 @@
<a wicket:message="href:282"><wicket:message
key="286"/></a><br/>
<a wicket:message="href:283"><wicket:message
key="287"/></a><br/>
<a wicket:id="netTest" target="_blank"
rel="noopener"><wicket:message key="1527"/></a><br/>
+ <a wicket:id="avTest" target="_blank"
rel="noopener"><wicket:message key="772"/></a><br/>
</td>
</tr>
</table>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
index 80ba6c7..02afec5 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
@@ -23,6 +23,7 @@ import static
org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import static org.apache.openmeetings.web.room.SwfPanel.SWF;
import static org.apache.openmeetings.web.room.SwfPanel.SWF_TYPE_NETWORK;
+import static org.apache.openmeetings.web.room.SwfPanel.SWF_TYPE_SETTINGS;
import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_EDIT;
import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_MESSAGES;
@@ -76,5 +77,13 @@ public class WelcomeWidgetView extends WidgetView {
setResponsePage(HashPage.class, new
PageParameters().add(SWF, SWF_TYPE_NETWORK));
}
});
+ add(new Link<Void>("avTest") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick() {
+ setResponsePage(HashPage.class, new
PageParameters().add(SWF, SWF_TYPE_SETTINGS));
+ }
+ });
}
}
--
To stop receiving notification emails like this one, please contact
[email protected].
