Author: solomax
Date: Wed Jul 18 13:21:24 2012
New Revision: 1362937
URL: http://svn.apache.org/viewvc?rev=1362937&view=rev
Log:
OPENMEETINGS-353 is partially fixed
Modified:
incubator/openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html
incubator/openmeetings/trunk/singlewebapp/docs/SakaiPlugin.html
incubator/openmeetings/trunk/singlewebapp/docs/SugarCRMPlugin.html
incubator/openmeetings/trunk/singlewebapp/docs/WebsiteGuide.html
incubator/openmeetings/trunk/singlewebapp/docs/license.html
incubator/openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/SakaiPlugin.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/SugarCRMPlugin.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/WebsiteGuide.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/stylesheets/site.vsl
Modified: incubator/openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html?rev=1362937&r1=1362936&r2=1362937&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html Wed Jul
18 13:21:24 2012
@@ -790,7 +790,6 @@ limitations under the License.
Restart red5 and try to connect to
<a href="https://your.server";
rel="nofollow">https://your.server</a>
- you should be redirected to the
OpenMeetings
- <a
href="/p/openmeetings/w/edit/OpenMeetings">?</a>
app and all access should be via HTTPS
or RTMPS (close port 5080 to
be sure).
</li>
Modified: incubator/openmeetings/trunk/singlewebapp/docs/SakaiPlugin.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/SakaiPlugin.html?rev=1362937&r1=1362936&r2=1362937&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/SakaiPlugin.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/SakaiPlugin.html Wed Jul 18
13:21:24 2012
@@ -656,21 +656,25 @@ limitations under the License.
<p>The plugin contains the following
features: </p>
<ul>
<li>Create videoconference rooms through Sakai:
</li>
- <ol>
- <li>Integrated with calendar </li>
- <li>Integrated with announcements </li>
- <li>Sends an email to all site
participants </li>
- <li>Rooms restricted to site groups
</li>
- <li>Configurable room type </li>
- </ol>
+ <li>
+ <ol>
+ <li>Integrated with calendar
</li>
+ <li>Integrated with
announcements </li>
+ <li>Sends an email to all site
participants </li>
+ <li>Rooms restricted to site
groups </li>
+ <li>Configurable room type </li>
+ </ol>
+ </li>
</ul>
<p />
<ul>
<li>Future requirements </li>
- <ol>
- <li>Publish room recordings to students
</li>
- <li>Room reservation </li>
- </ol>
+ <li>
+ <ol>
+ <li>Publish room recordings to
students </li>
+ <li>Room reservation </li>
+ </ol>
+ </li>
</ul>
</blockquote>
</td></tr>
Modified: incubator/openmeetings/trunk/singlewebapp/docs/SugarCRMPlugin.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/SugarCRMPlugin.html?rev=1362937&r1=1362936&r2=1362937&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/SugarCRMPlugin.html
(original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/SugarCRMPlugin.html Wed Jul
18 13:21:24 2012
@@ -640,12 +640,14 @@ limitations under the License.
<p>The plugin contains the following
features: </p>
<ul>
<li>Create videoconference rooms through
SugarCRM: </li>
- <ol>
- <li>Integrated with calendar </li>
- <li>Integrated with SugarCRM meetings
</li>
- <li>Sends invetations emails to meeting
participants </li>
- <li>Configurable room type </li>
- </ol>
+ <li>
+ <ol>
+ <li>Integrated with calendar
</li>
+ <li>Integrated with SugarCRM
meetings </li>
+ <li>Sends invetations emails to
meeting participants </li>
+ <li>Configurable room type </li>
+ </ol>
+ </li>
</ul>
</blockquote>
</td></tr>
Modified: incubator/openmeetings/trunk/singlewebapp/docs/WebsiteGuide.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/WebsiteGuide.html?rev=1362937&r1=1362936&r2=1362937&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/WebsiteGuide.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/WebsiteGuide.html Wed Jul 18
13:21:24 2012
@@ -609,13 +609,13 @@ limitations under the License.
</td></tr>
<tr><td>
<blockquote>
- <p>
+ <div>
Required software:
<ul>
<li>Sun JDK6</li>
<li>Apache ANT (1.8 or later)</li>
</ul>
- </p>
+ </div>
<p>
OpenMeetings website (
<a
href="http://incubator.apache.org/openmeetings/";>http://incubator.apache.org/openmeetings/</a>
@@ -626,7 +626,7 @@ limitations under the License.
<a
href="http://svn.apache.org/repos/asf/incubator/openmeetings/trunk/singlewebapp/docs/";>http://svn.apache.org/repos/asf/incubator/openmeetings/trunk/singlewebapp/docs/
</a>
</p>
- <p>
+ <div>
To update the website you checkout trunk:
<br />
<a
href="https://svn.apache.org/repos/asf/incubator/openmeetings/trunk/singlewebapp/";>https://svn.apache.org/repos/asf/incubator/openmeetings/trunk/singlewebapp/
@@ -638,7 +638,7 @@ limitations under the License.
</div>
control the output locally in the folder
<tt>docs</tt><br />
And then checkin into the SVN <i>both</i> the
edited xml and generated html files.
- </p>
+ </div>
<p>
Changes to the website should be online
immediately.
</p>
Modified: incubator/openmeetings/trunk/singlewebapp/docs/license.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/license.html?rev=1362937&r1=1362936&r2=1362937&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/license.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/license.html Wed Jul 18
13:21:24 2012
@@ -609,14 +609,8 @@ limitations under the License.
<tr><td>
<blockquote>
<div align="left">
- <table cellspacing="4" cellpadding="0" border="0">
+ <table style="border: solid 1px #023264; padding: 5px;">
<tr>
- <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
- <td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
- <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
- </tr>
- <tr>
- <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
<td bgcolor="#ffffff"><pre>
@@ -825,12 +819,6 @@ limitations under the License.
</pre></td>
- <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
- </tr>
- <tr>
- <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
- <td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
- <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
</tr>
</table>
</div>
Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml?rev=1362937&r1=1362936&r2=1362937&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml Wed Jul
18 13:21:24 2012
@@ -172,7 +172,6 @@
Restart red5 and try to connect to
<a href="https://your.server";
rel="nofollow">https://your.server</a>
- you should be redirected to the
OpenMeetings
- <a
href="/p/openmeetings/w/edit/OpenMeetings">?</a>
app and all access should be via HTTPS
or RTMPS (close port 5080 to
be sure).
</li>
Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/SakaiPlugin.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/SakaiPlugin.xml?rev=1362937&r1=1362936&r2=1362937&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/xdocs/SakaiPlugin.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/xdocs/SakaiPlugin.xml Wed Jul 18
13:21:24 2012
@@ -56,21 +56,25 @@
<p>The plugin contains the following features: </p>
<ul>
<li>Create videoconference rooms through Sakai:
</li>
- <ol>
- <li>Integrated with calendar </li>
- <li>Integrated with announcements </li>
- <li>Sends an email to all site
participants </li>
- <li>Rooms restricted to site groups
</li>
- <li>Configurable room type </li>
- </ol>
+ <li>
+ <ol>
+ <li>Integrated with calendar
</li>
+ <li>Integrated with
announcements </li>
+ <li>Sends an email to all site
participants </li>
+ <li>Rooms restricted to site
groups </li>
+ <li>Configurable room type </li>
+ </ol>
+ </li>
</ul>
<p />
<ul>
<li>Future requirements </li>
- <ol>
- <li>Publish room recordings to students
</li>
- <li>Room reservation </li>
- </ol>
+ <li>
+ <ol>
+ <li>Publish room recordings to
students </li>
+ <li>Room reservation </li>
+ </ol>
+ </li>
</ul>
</section>
Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/SugarCRMPlugin.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/SugarCRMPlugin.xml?rev=1362937&r1=1362936&r2=1362937&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/xdocs/SugarCRMPlugin.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/xdocs/SugarCRMPlugin.xml Wed Jul
18 13:21:24 2012
@@ -40,12 +40,14 @@
<p>The plugin contains the following features: </p>
<ul>
<li>Create videoconference rooms through
SugarCRM: </li>
- <ol>
- <li>Integrated with calendar </li>
- <li>Integrated with SugarCRM meetings
</li>
- <li>Sends invetations emails to meeting
participants </li>
- <li>Configurable room type </li>
- </ol>
+ <li>
+ <ol>
+ <li>Integrated with calendar
</li>
+ <li>Integrated with SugarCRM
meetings </li>
+ <li>Sends invetations emails to
meeting participants </li>
+ <li>Configurable room type </li>
+ </ol>
+ </li>
</ul>
</section>
Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/WebsiteGuide.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/WebsiteGuide.xml?rev=1362937&r1=1362936&r2=1362937&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/xdocs/WebsiteGuide.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/xdocs/WebsiteGuide.xml Wed Jul 18
13:21:24 2012
@@ -19,13 +19,13 @@
<section name="How to update Apache OpenMeetings incubator
website">
- <p>
+ <div>
Required software:
<ul>
<li>Sun JDK6</li>
<li>Apache ANT (1.8 or later)</li>
</ul>
- </p>
+ </div>
<p>
OpenMeetings website (
@@ -39,7 +39,7 @@
</a>
</p>
- <p>
+ <div>
To update the website you checkout trunk:
<br />
<a
@@ -52,7 +52,7 @@
</div>
control the output locally in the folder
<tt>docs</tt><br/>
And then checkin into the SVN <i>both</i> the
edited xml and generated html files.
- </p>
+ </div>
<p>
Changes to the website should be online
immediately.
Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/stylesheets/site.vsl
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/stylesheets/site.vsl?rev=1362937&r1=1362936&r2=1362937&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/xdocs/stylesheets/site.vsl
(original)
+++ incubator/openmeetings/trunk/singlewebapp/xdocs/stylesheets/site.vsl Wed
Jul 18 13:21:24 2012
@@ -152,21 +152,9 @@ limitations under the License.
#macro ( source $value)
<div align="left">
- <table cellspacing="4" cellpadding="0" border="0">
+ <table style="border: solid 1px #023264; padding: 5px;">
<tr>
- <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
- <td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
- <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
- </tr>
- <tr>
- <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
<td bgcolor="#ffffff"><pre>$escape.getText($value.getText())</pre></td>
- <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
- </tr>
- <tr>
- <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
- <td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
- <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
</tr>
</table>
</div>
