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 2016/01/14 19:12:02 UTC
svn commit: r1724666 - in /openmeetings/application:
branches/3.1.x/openmeetings-flash/
branches/3.1.x/openmeetings-flash/src/main/swf/permissionChecker/
branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/
branches/3.1...
Author: solomax
Date: Thu Jan 14 18:12:01 2016
New Revision: 1724666
URL: http://svn.apache.org/viewvc?rev=1724666&view=rev
Log:
[OPENMEETINGS-1310] initial work on permission dialog
Added:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/permissionChecker/
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/permissionChecker/checker.lzx
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/openlaszlo.xml
openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/openlaszlo.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/openlaszlo.xml?rev=1724666&r1=1724665&r2=1724666&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/openlaszlo.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/openlaszlo.xml Thu Jan 14 18:12:01 2016
@@ -32,7 +32,7 @@
<fileset dir="${laszlo46.home}/WEB-INF/lib" includes="*.jar" />
</path>
- <target name="client.only" depends="compile.laszlo.main,compile.laszlo.networktesting" unless="client-already-built">
+ <target name="client.only" depends="compile.laszlo.main,compile.laszlo.networktesting,compile.permission" unless="client-already-built">
<property name="client-already-built" value="true"/>
</target>
@@ -98,6 +98,18 @@
<param name="flash.debug" value="--debug" />
</antcall>
</target>
+
+ <target name="compile.permission" depends="-retrieve-openlaszlo46">
+ <antcall target="-compile.flash" inheritAll="true" inheritRefs="true">
+ <param name="flash.classpath.ref" value="laszlo46.lib" />
+ <param name="flash.src.dir" value="${src.dir}/permissionChecker" />
+ <param name="flash.lps.home" value="${laszlo46.home}" />
+ <param name="flash.runtime" value="swf11" />
+ <param name="flash.main.file" value="checker.lzx" />
+ <param name="flash.out.file" value="permissionChecker.swf11.swf" />
+ <param name="flash.debug" value="--debug" />
+ </antcall>
+ </target>
<target name="-availability-check" description="Check which libraries need to be retrieved">
<available file="${laszlo46.home}/WEB-INF/lib" type="dir" property="laszlo46.installed" />
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml?rev=1724666&r1=1724665&r2=1724666&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml Thu Jan 14 18:12:01 2016
@@ -70,6 +70,18 @@
<ant.target>compile.laszlo.main.debug</ant.target>
</properties>
</profile>
+ <profile>
+ <id>checker-only-target</id>
+ <activation>
+ <property>
+ <name>checker-only</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <properties>
+ <ant.target>compile.permission</ant.target>
+ </properties>
+ </profile>
</profiles>
<build>
<!-- sourceDirectory>src/main/flex</sourceDirectory-->
Added: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/permissionChecker/checker.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/permissionChecker/checker.lzx?rev=1724666&view=auto
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/permissionChecker/checker.lzx (added)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/permissionChecker/checker.lzx Thu Jan 14 18:12:01 2016
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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.
+
+-->
+<canvas width="220" height="140" title="Permission checker" debug="true">
+ <switch>
+ <when property="$as3">
+ <passthrough>
+ import flash.media.Microphone;
+ import flash.events.*;
+ import flash.system.Security;
+ import flash.system.SecurityPanel;
+ </passthrough>
+ </when>
+ </switch>
+ <switch>
+ <when property="$debug">
+ <method name="doDebugInit">
+ canvas.setAttribute('debug', true);
+ </method>
+ <debug fontsize="11" oninit="Debug.showInternalProperties = true" width="80%" y="50%" x="0" height="50%" />
+ </when>
+ <otherwise>
+ <method name="doDebugInit"/>
+ </otherwise>
+ </switch>
+ <attribute name="mic" />
+
+ <handler name="oninit"><![CDATA[
+ if ($debug) Debug.info("oninit");
+ doDebugInit();
+ mic = Microphone.getMicrophone();
+ if (mic && mic.muted) {
+ mic.addEventListener(StatusEvent.STATUS, statusHandler);
+ Security.showSettings(SecurityPanel.PRIVACY);
+ }
+ ]]></handler>
+
+ <handler name="onmouseover">
+ if ($debug) Debug.write("Panel closed");
+ </handler>
+
+ <method name="statusHandler" args="event"><![CDATA[
+ if ($debug) Debug.write(event);
+ mic.removeEventListener(StatusEvent.STATUS, statusHandler);
+ if (mic && !mic.muted) {
+ if ($debug) Debug.write("Mic unmuted");
+ }
+ /*
+$(document.body).append($('<div id="swf-permission" style="display: none;padding: 0;"><embed height="100%" src="public/permissionChecker.swf11.swf"/></div>'));
+$('#swf-permission').dialog({title: "Dialog Title", dialogClass: 'no-close', closeOnEscape: false, modal: true, width: 300, resizable: false});
+ */
+ ]]></method>
+</canvas>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java?rev=1724666&r1=1724665&r2=1724666&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java Thu Jan 14 18:12:01 2016
@@ -32,8 +32,6 @@ import org.apache.openmeetings.web.app.A
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.markup.head.CssContentHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.form.TextField;
@@ -121,12 +119,6 @@ public class ResetPasswordDialog extends
add(confirmReset);
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(new CssContentHeaderItem(".no-close .ui-dialog-titlebar-close { display: none; }", "dialog-noclose", ""));
- }
-
public void onConfigure(JQueryBehavior behavior) {
super.onConfigure(behavior);
behavior.setOption("dialogClass", Options.asString("no-close"));
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java?rev=1724666&r1=1724665&r2=1724666&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java Thu Jan 14 18:12:01 2016
@@ -60,7 +60,6 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.json.JSONException;
import org.apache.wicket.ajax.json.JSONObject;
-import org.apache.wicket.markup.head.CssContentHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.request.IRequestParameters;
@@ -151,7 +150,6 @@ public class SignInPage extends BaseInit
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(OnDomReadyHeaderItem.forScript(m.getOnClickJavaScript()));
- response.render(new CssContentHeaderItem(".no-close .ui-dialog-titlebar-close { display: none; }", "dialog-noclose", ""));
}
@Override
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java?rev=1724666&r1=1724665&r2=1724666&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java Thu Jan 14 18:12:01 2016
@@ -23,8 +23,6 @@ import org.apache.openmeetings.web.pages
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.ajax.AjaxClientInfoBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.head.CssContentHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.protocol.http.request.WebClientInfo;
public class InstallWizardPage extends BaseNotInitedPage {
@@ -48,10 +46,4 @@ public class InstallWizardPage extends B
}
});
}
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(new CssContentHeaderItem(".no-close .ui-dialog-titlebar-close { display: none; }", "dialog-noclose", ""));
- }
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css?rev=1724666&r1=1724665&r2=1724666&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css Thu Jan 14 18:12:01 2016
@@ -635,3 +635,6 @@ form .input {
overflow-y: auto;
border: 1px solid #cccccc;
}
+.no-close .ui-dialog-titlebar-close {
+ display: none;
+}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java?rev=1724666&r1=1724665&r2=1724666&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java Thu Jan 14 18:12:01 2016
@@ -32,8 +32,6 @@ import org.apache.openmeetings.web.app.A
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.markup.head.CssContentHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.form.TextField;
@@ -121,12 +119,6 @@ public class ResetPasswordDialog extends
add(confirmReset);
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(new CssContentHeaderItem(".no-close .ui-dialog-titlebar-close { display: none; }", "dialog-noclose", ""));
- }
-
public void onConfigure(JQueryBehavior behavior) {
super.onConfigure(behavior);
behavior.setOption("dialogClass", Options.asString("no-close"));
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java?rev=1724666&r1=1724665&r2=1724666&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java Thu Jan 14 18:12:01 2016
@@ -60,7 +60,6 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.json.JSONException;
import org.apache.wicket.ajax.json.JSONObject;
-import org.apache.wicket.markup.head.CssContentHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.request.IRequestParameters;
@@ -151,7 +150,6 @@ public class SignInPage extends BaseInit
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(OnDomReadyHeaderItem.forScript(m.getOnClickJavaScript()));
- response.render(new CssContentHeaderItem(".no-close .ui-dialog-titlebar-close { display: none; }", "dialog-noclose", ""));
}
@Override
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java?rev=1724666&r1=1724665&r2=1724666&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java Thu Jan 14 18:12:01 2016
@@ -23,8 +23,6 @@ import org.apache.openmeetings.web.pages
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.ajax.AjaxClientInfoBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.head.CssContentHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.protocol.http.request.WebClientInfo;
public class InstallWizardPage extends BaseNotInitedPage {
@@ -48,10 +46,4 @@ public class InstallWizardPage extends B
}
});
}
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(new CssContentHeaderItem(".no-close .ui-dialog-titlebar-close { display: none; }", "dialog-noclose", ""));
- }
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css?rev=1724666&r1=1724665&r2=1724666&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css Thu Jan 14 18:12:01 2016
@@ -635,3 +635,6 @@ form .input {
overflow-y: auto;
border: 1px solid #cccccc;
}
+.no-close .ui-dialog-titlebar-close {
+ display: none;
+}