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 2013/06/03 11:39:39 UTC
svn commit: r1488939 - in /openmeetings/trunk/singlewebapp:
WebContent/src/base/mainMethods.lzx
src/org/apache/openmeetings/web/app/Application.java
src/org/apache/openmeetings/web/user/record/RecordingsPanel.html
Author: solomax
Date: Mon Jun 3 09:39:39 2013
New Revision: 1488939
URL: http://svn.apache.org/r1488939
Log:
Screensharing link is fixed;
Recordings seems to work as expected;
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/record/RecordingsPanel.html
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1488939&r1=1488938&r2=1488939&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Mon Jun 3 09:39:39 2013
@@ -161,7 +161,7 @@
//if($debug) Debug.write("!!!!!!! getBaseUrl:: [urlObject, port, url]", urlObject, port, url);
url = url + (url.slice(-1) == '/' ? '' : '/');
//if($debug) Debug.write("!!!!!!! getBaseUrl:: [last, url]", url.slice(-1), url);
- return url;
+ return url.substring(0, url.length - 7); // the length of "public/"
]]>
</method>
@@ -178,8 +178,8 @@
if ($debug) Debug.write("mainMethods::getScreenSharingUrl ", hib.userobject, hib.currentdomainObj);
var appBase = canvas.getAppBaseUrlWithoutSwfSuffix();
- Debug.write("appBase=" + appBase);
- var downloadurl = appBase + '../screen.upload?'
+ if ($debug) Debug.write("appBase=" + appBase);
+ var downloadurl = appBase + 'screen.upload?'
+'rtmphostlocal=' + canvas.getHttpHost()
+'&baseurl=' + escape(appBase)
+'&domain=' + hib.conferencedomain
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java?rev=1488939&r1=1488938&r2=1488939&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java Mon Jun 3 09:39:39 2013
@@ -99,14 +99,13 @@ public class Application extends Authent
dashboardSettings.setIncludeJQuery(false);
dashboardSettings.setIncludeJQueryUI(false);
+ getRootRequestMapperAsCompound().add(new NoVersionMapper(getHomePage()));
+ getRootRequestMapperAsCompound().add(new NoVersionMapper("notinited", NotInitedPage.class));
mountPage("swf", SwfPage.class);
mountPage("install", InstallWizardPage.class);
mountPage("signin", getSignInPageClass());
mountResource("/recordings/mp4/${id}", new Mp4RecordingResourceReference());
mountResource("/recordings/ogg/${id}", new OggRecordingResourceReference());
-
- getRootRequestMapperAsCompound().add(new NoVersionMapper(getHomePage()));
- getRootRequestMapperAsCompound().add(new NoVersionMapper("notinited", NotInitedPage.class));
}
private static class NoVersionMapper extends MountedMapper {
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/record/RecordingsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/record/RecordingsPanel.html?rev=1488939&r1=1488938&r2=1488939&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/record/RecordingsPanel.html (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/record/RecordingsPanel.html Mon Jun 3 09:39:39 2013
@@ -22,7 +22,7 @@
<wicket:panel>
<table class="recording">
<tr>
- <td class="files">
+ <td valign="top" class="files">
<div class="icons clear">
<span wicket:id="create" class="folder-create-icon align-left clickable"></span>
<span wicket:id="refresh" class="refresh-icon align-left clickable"></span>