Author: solomax
Date: Sat Dec 15 06:16:41 2012
New Revision: 1422190
URL: http://svn.apache.org/viewvc?rev=1422190&view=rev
Log:
OPENMEETINGS-477 generate invitation url, additioanl fix (code seems to be not
fully merged)
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/resetForm.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/inviteMainWindow.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/layouts/dragEvent.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/newPrivateMessage.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/resetForm.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/resetForm.lzx?rev=1422190&r1=1422189&r2=1422190&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/resetForm.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/resetForm.lzx
Sat Dec 15 06:16:41 2012
@@ -58,21 +58,7 @@
} else {
parent.resetByMail.setAttribute('text','');
}
-
- //Point URL to actual File
- var urlObject = lz.Browser.getBaseURL();
- //If Port is Null or undefinied use port 80
- if (urlObject.port!=null && urlObject.port!=undefined){
- var port = urlObject.port;
-
- if (port != 80) {
- parent.baseUrl =
urlObject.protocol+"://"+urlObject.host+":"+port+urlObject.path;
- } else {
- parent.baseUrl =
urlObject.protocol+"://"+urlObject.host+urlObject.path;
- }
- } else {
- parent.baseUrl =
urlObject.protocol+"://"+urlObject.host+urlObject.path;
- }
+ parent.baseUrl = canvas.getAppBaseUrl();
parent.resetUserPwd.doCall();
]]>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1422190&r1=1422189&r2=1422190&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
Sat Dec 15 06:16:41 2012
@@ -142,7 +142,17 @@
return getUrl() + '?swf=networktesting' + ($debug ? 'debug' : '') +
'.swf10.swf';
]]>
</method>
-
+
+ <method name="getAppBaseUrl">
+ <![CDATA[
+ var urlObject = lz.Browser.getBaseURL();
+ //If Port is Null or undefinied use port 80
+ var port = (urlObject.port != null && urlObject.port !=
undefined) ? urlObject.port : 80;
+ //if($debug) Debug.write("getBaseUrl:: [urlObject, port]", urlObject,
port);
+ return urlObject.protocol + "://" + urlObject.host + ":" +
(port != 80 ? port : '') + urlObject.path;;
+ ]]>
+ </method>
+
<dataset type="http" name="languageData" request="false"
src="${ canvas.currentlanguage+'.xml' }" proxied="false">
<handler name="ondata" args="value">
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/inviteMainWindow.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/inviteMainWindow.lzx?rev=1422190&r1=1422189&r2=1422190&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/inviteMainWindow.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/inviteMainWindow.lzx
Sat Dec 15 06:16:41 2012
@@ -35,25 +35,17 @@
<handler name="oninit">
<![CDATA[
-
- lz.ModeManager.makeModal(this);
- var pressEnter = new LzDelegate(this, "register");
- lz.Keys.callOnKeyCombo(pressEnter, ["enter"]);
-
- getTimeZoneOffset(this);
-
- var urlObject = lz.Browser.getBaseURL();
- //If Port is Null or undefinied use port 80
- var port = urlObject.port;
- if (port!=null && port!=undefined && port !=
80){
- this.baseUrl =
urlObject.protocol+"://"+urlObject.host+":"+port+urlObject.path;
- } else {
- this.baseUrl =
urlObject.protocol+"://"+urlObject.host+urlObject.path;
- }
- if( $debug ) Debug.write("this.baseUrl: ",
this.baseUrl);
- if (!canvas.isConference){
- this.roomType = "restricted"; //FIXME
- }
+ lz.ModeManager.makeModal(this);
+ var pressEnter = new LzDelegate(this, "register");
+ lz.Keys.callOnKeyCombo(pressEnter, ["enter"]);
+
+ getTimeZoneOffset(this);
+
+ this.baseUrl = canvas.getAppBaseUrl();
+ if( $debug ) Debug.write("this.baseUrl: ",
this.baseUrl);
+ if (!canvas.isConference){
+ this.roomType = "restricted"; //FIXME
+ }
]]>
</handler>
@@ -181,29 +173,17 @@
</simpleLabelButton>
<!-- label: send -->
- <simpleLabelButton labelid="218" x="$once{ parent.width-260 }"
width="120" y="$once{ parent.height-26 }">
+ <simpleLabelButton name="send" labelid="218" x="$once{
parent.width-260 }" width="120" y="$once{ parent.height-26 }">
<handler name="onclick">
- <![CDATA[
- var urlObject =
lz.Browser.getBaseURL();
- //If Port is Null or undefinied use
port 80
- if (urlObject.port!=null &&
urlObject.port!=undefined){
- var port = urlObject.port;
-
- if (port != 80) {
- parent.baseUrl =
urlObject.protocol+"://"+urlObject.host+":"+port+urlObject.path;
- } else {
- parent.baseUrl =
urlObject.protocol+"://"+urlObject.host+urlObject.path;
- }
- } else {
- parent.baseUrl =
urlObject.protocol+"://"+urlObject.host+urlObject.path;
- }
-
- if( $debug )
Debug.write("parent.baseUrl: ",parent.baseUrl);
- if (!canvas.isConference){
- parent.roomType = "audience";
- }
-
- parent.sendInvitationHash.doCall();
+ <![CDATA[
+ for (var eg in this.parent.subviews){
+ this.parent.subviews[eg].setAttribute('enabled', false);
+ }
+ if (parent.display) {
+ parent.sendInvitationByHash.doCall();
+ } else {
+ parent.sendInvitationHash.doCall();
+ }
]]>
</handler>
</simpleLabelButton>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/layouts/dragEvent.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/layouts/dragEvent.lzx?rev=1422190&r1=1422189&r2=1422190&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/layouts/dragEvent.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/layouts/dragEvent.lzx
Sat Dec 15 06:16:41 2012
@@ -220,19 +220,7 @@
this.updateObj = new Object();
//Point URL to actual File
- var urlObject = lz.Browser.getBaseURL();
- //If Port is Null or undefinied use port 80
- if (urlObject.port!=null &&
urlObject.port!=undefined){
- var port = urlObject.port;
-
- if (port != 80) {
- this.baseUrl =
urlObject.protocol+"://"+urlObject.host+":"+port+urlObject.path;
- } else {
- this.baseUrl =
urlObject.protocol+"://"+urlObject.host+urlObject.path;
- }
- } else {
- this.baseUrl =
urlObject.protocol+"://"+urlObject.host+urlObject.path;
- }
+ this.baseUrl = canvas.getAppBaseUrl();
var currentOverTrackView =
this.calendarViewRef.currentOverTrackView;
if (currentOverTrackView == null) {
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx?rev=1422190&r1=1422189&r2=1422190&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx
Sat Dec 15 06:16:41 2012
@@ -56,21 +56,8 @@
canvas._loadingAll.hideContentOnly();
//Point URL to actual File
- var urlObject = lz.Browser.getBaseURL();
- //If Port is Null or undefinied use port 80
- if (urlObject.port!=null &&
urlObject.port!=undefined){
- var port = urlObject.port;
-
- if (port != 80) {
- this.baseUrl =
urlObject.protocol+"://"+urlObject.host+":"+port+urlObject.path;
- } else {
- this.baseUrl =
urlObject.protocol+"://"+urlObject.host+urlObject.path;
- }
- } else {
- this.baseUrl =
urlObject.protocol+"://"+urlObject.host+urlObject.path;
- }
+ this.baseUrl = canvas.getAppBaseUrl();
- if ($debug) Debug.write("urlObject ",urlObject);
if ($debug) Debug.write("this.baseUrl ",this.baseUrl);
if ($debug) Debug.write("this.dataElement
",this.dataElement);
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/newPrivateMessage.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/newPrivateMessage.lzx?rev=1422190&r1=1422189&r2=1422190&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/newPrivateMessage.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/newPrivateMessage.lzx
Sat Dec 15 06:16:41 2012
@@ -447,19 +447,7 @@
<simpleLabelButton labelid="218" x="$once{ parent.width-260 }"
width="120" y="$once{ parent.height-26 }">
<handler name="onclick">
<![CDATA[
- var urlObject = lz.Browser.getBaseURL();
- //If Port is Null or undefinied use port 80
- if (urlObject.port!=null &&
urlObject.port!=undefined){
- var port = urlObject.port;
-
- if (port != 80) {
- parent.baseUrl =
urlObject.protocol+"://"+urlObject.host+":"+port+urlObject.path;
- } else {
- parent.baseUrl =
urlObject.protocol+"://"+urlObject.host+urlObject.path;
- }
- } else {
- parent.baseUrl =
urlObject.protocol+"://"+urlObject.host+urlObject.path;
- }
+ parent.baseUrl = canvas.getAppBaseUrl();
parent.send();
]]>
