You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2011/12/18 14:34:05 UTC
svn commit: r1220394 - in /incubator/openmeetings/trunk/singlewebapp: docs/
docs/images/ xdocs/ xdocs/images/
Author: sebawagner
Date: Sun Dec 18 13:34:04 2011
New Revision: 1220394
URL: http://svn.apache.org/viewvc?rev=1220394&view=rev
Log:
Sync r4733 trunk to new svn
Added:
incubator/openmeetings/trunk/singlewebapp/docs/images/microphone2.png (with props)
incubator/openmeetings/trunk/singlewebapp/xdocs/images/microphone2.png (with props)
Modified:
incubator/openmeetings/trunk/singlewebapp/docs/images/chat.png
incubator/openmeetings/trunk/singlewebapp/docs/images/dashboard.png
incubator/openmeetings/trunk/singlewebapp/docs/images/file_smal.png
incubator/openmeetings/trunk/singlewebapp/docs/images/poll.png
incubator/openmeetings/trunk/singlewebapp/docs/images/privat_messages.png
incubator/openmeetings/trunk/singlewebapp/docs/images/right_management.png
incubator/openmeetings/trunk/singlewebapp/docs/images/whiteboard.png
incubator/openmeetings/trunk/singlewebapp/docs/index.html
incubator/openmeetings/trunk/singlewebapp/xdocs/images/chat.png
incubator/openmeetings/trunk/singlewebapp/xdocs/images/dashboard.png
incubator/openmeetings/trunk/singlewebapp/xdocs/images/file_smal.png
incubator/openmeetings/trunk/singlewebapp/xdocs/images/poll.png
incubator/openmeetings/trunk/singlewebapp/xdocs/images/privat_messages.png
incubator/openmeetings/trunk/singlewebapp/xdocs/images/right_management.png
incubator/openmeetings/trunk/singlewebapp/xdocs/images/whiteboard.png
incubator/openmeetings/trunk/singlewebapp/xdocs/index.xml
Modified: incubator/openmeetings/trunk/singlewebapp/docs/images/chat.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/images/chat.png?rev=1220394&r1=1220393&r2=1220394&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/openmeetings/trunk/singlewebapp/docs/images/dashboard.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/images/dashboard.png?rev=1220394&r1=1220393&r2=1220394&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/openmeetings/trunk/singlewebapp/docs/images/file_smal.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/images/file_smal.png?rev=1220394&r1=1220393&r2=1220394&view=diff
==============================================================================
Binary files - no diff available.
Added: incubator/openmeetings/trunk/singlewebapp/docs/images/microphone2.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/images/microphone2.png?rev=1220394&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/docs/images/microphone2.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/docs/images/poll.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/images/poll.png?rev=1220394&r1=1220393&r2=1220394&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/openmeetings/trunk/singlewebapp/docs/images/privat_messages.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/images/privat_messages.png?rev=1220394&r1=1220393&r2=1220394&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/openmeetings/trunk/singlewebapp/docs/images/right_management.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/images/right_management.png?rev=1220394&r1=1220393&r2=1220394&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/openmeetings/trunk/singlewebapp/docs/images/whiteboard.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/images/whiteboard.png?rev=1220394&r1=1220393&r2=1220394&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/openmeetings/trunk/singlewebapp/docs/index.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/index.html?rev=1220394&r1=1220393&r2=1220394&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/index.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/index.html Sun Dec 18 13:34:04 2011
@@ -496,8 +496,8 @@ limitations under the License.
</blockquote>
</ul>
- Additional you can change video-/audio-quality, resize webcam
- size
+ Additional you can change video-/audio-quality, choose multiple
+ camera resolutions (4:3, 16:9 or 3:2)
and choose your input devices.
</text>
</td>
@@ -568,14 +568,14 @@ limitations under the License.
<td style="text-align: center;" width="300">
<p>
<a class="fancybox-buttons" data-fancybox-group="button" href="images/file_smal.png">
- <img src="images/file_smal.png" alt="" width="200"
- height="115" />
+ <img src="images/file_smal.png" alt="" width="135"
+ height="200" />
</a>
<!--
<img style="border: 1px solid black;"
title="" src="images/file_smal.png"
- alt="" width="200"
- height="115" />
+ alt="" width="135"
+ height="200" />
</p>
-->
</td>
@@ -616,14 +616,14 @@ limitations under the License.
<td style="text-align: center;" width="300">
<p>
<a class="fancybox-buttons" data-fancybox-group="button" href="images/right_management.png">
- <img src="images/right_management.png" alt="" width="200"
- height="115" />
+ <img src="images/right_management.png" alt="" width="135"
+ height="216" />
</a>
<!--
<img style="border: 1px solid black;"
title="" src="images/right_management.png"
- alt="" width="200"
- height="115" />
+ alt="" width="135"
+ height="216" />
</p>
-->
</td>
@@ -649,9 +649,12 @@ limitations under the License.
Allow/Deny Remote Control Screen
</li>
<li>
+ <img class="alignnone" title="Remote control" src="images/microphone2.png" alt="" />
+ Give exclusive audio to others or self
+ </li>
+ <li>
<img class="alignnone" title="Video Audio" src="images/audio_video.png" alt="" />
- (Re-) Start Audio, Video or Device settings.
- Drive.
+ (Re-) Start Audio, Video or Device settings
</li>
</ul>
</text>
@@ -659,33 +662,33 @@ limitations under the License.
</tr>
</tbody>
</table>
- <h3>Chat and whiteboarding</h3>
+ <h3>Multi-Whiteboard and Chat</h3>
<table border="0">
<tbody>
<tr>
<td style="text-align: center;" width="300">
<p>
<a class="fancybox-buttons" data-fancybox-group="button" href="images/whiteboard.png">
- <img src="images/whiteboard.png" alt="" width="200"
- height="115" />
+ <img src="images/whiteboard.png" alt="" width="240"
+ height="165" />
</a>
<!--
<img style="border: 1px solid black;"
title="" src="images/whiteboard.png"
- alt="" width="200"
- height="115" />
+ alt="" width="240"
+ height="165" />
</p>
-->
<p>
<a class="fancybox-buttons" data-fancybox-group="button" href="images/chat.png">
- <img src="images/chat.png" alt="" width="200"
- height="40" />
+ <img src="images/chat.png" alt="" width="240"
+ height="68" />
</a>
<!--
<img style="border: 1px solid black;"
title="" src="images/chat.png"
- alt="" width="200"
- height="40" />
+ alt="" width="240"
+ height="68" />
</p>
-->
</td>
@@ -728,14 +731,14 @@ limitations under the License.
<td style="text-align: center;" width="300">
<p>
<a class="fancybox-buttons" data-fancybox-group="button" href="images/dashboard.png">
- <img src="images/dashboard.png" alt="" width="200"
- height="115" />
+ <img src="images/dashboard.png" alt="" width="250"
+ height="130" />
</a>
<!--
<img style="border: 1px solid black;"
title="" src="images/dashboard.png"
- alt="" width="200"
- height="115" />
+ alt="" width="250"
+ height="130" />
</p>
-->
</td>
@@ -767,14 +770,14 @@ limitations under the License.
<td style="text-align: center;" width="300">
<p>
<a class="fancybox-buttons" data-fancybox-group="button" href="images/privat_messages.png">
- <img src="images/privat_messages.png" alt="" width="200"
- height="115" />
+ <img src="images/privat_messages.png" alt="" width="230"
+ height="125" />
</a>
<!--
<img style="border: 1px solid black;"
title="" src="images/privat_messages.png"
- alt="" width="200"
- height="115" />
+ alt="" width="230"
+ height="125" />
</p>
-->
</td>
@@ -794,7 +797,7 @@ limitations under the License.
</tr>
</tbody>
</table>
- <h3>Calendaring</h3>
+ <h3>Plan meetings with integrated calendar</h3>
<table border="0">
<tbody>
<tr>
@@ -815,7 +818,7 @@ limitations under the License.
<td>
<text>
<ul>
- <li>Plan your conferencing and invite attendees from !OpenMeetings
+ <li>Plan your conferencing and invite attendees from OpenMeetings
or External.
</li>
<li>The invited attendees will recieve an E-mail with details to
@@ -836,43 +839,19 @@ limitations under the License.
<td style="text-align: center;" width="300">
<p>
<a class="fancybox-buttons" data-fancybox-group="button" href="images/poll.png">
- <img src="images/poll.png" alt="" width="200"
- height="115" />
+ <img src="images/poll.png" alt="" width="250"
+ height="250" />
</a>
<!--
<img style="border: 1px solid black;"
title="" src="images/poll.png"
- alt="" width="200"
- height="115" />
- </p>
- -->
- <p>
- <a class="fancybox-buttons" data-fancybox-group="button" href="images/vote.png">
- <img src="images/vote.png" alt="" width="200"
- height="115" />
- </a>
- <!--
- <img style="border: 1px solid black;"
- title="" src="images/vote.png"
- alt="" width="200"
- height="115" />
- </p>
- -->
- <p>
- <a class="fancybox-buttons" data-fancybox-group="button" href="images/pollresult.png">
- <img src="images/pollresult.png" alt="" width="200"
- height="115" />
- </a>
- <!--
- <img style="border: 1px solid black;"
- title="" src="images/pollresult.png"
- alt="" width="200"
- height="115" />
+ alt="" width="250"
+ height="250" />
</p>
-->
</td>
<td>
- <text>
+ <text>
You can create a poll with yes/no or 1-10 questions, let the
user
vote and see the voting results.
Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/images/chat.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/images/chat.png?rev=1220394&r1=1220393&r2=1220394&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/images/dashboard.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/images/dashboard.png?rev=1220394&r1=1220393&r2=1220394&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/images/file_smal.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/images/file_smal.png?rev=1220394&r1=1220393&r2=1220394&view=diff
==============================================================================
Binary files - no diff available.
Added: incubator/openmeetings/trunk/singlewebapp/xdocs/images/microphone2.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/images/microphone2.png?rev=1220394&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/xdocs/images/microphone2.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/images/poll.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/images/poll.png?rev=1220394&r1=1220393&r2=1220394&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/images/privat_messages.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/images/privat_messages.png?rev=1220394&r1=1220393&r2=1220394&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/images/right_management.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/images/right_management.png?rev=1220394&r1=1220393&r2=1220394&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/images/whiteboard.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/images/whiteboard.png?rev=1220394&r1=1220393&r2=1220394&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/index.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/index.xml?rev=1220394&r1=1220393&r2=1220394&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/xdocs/index.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/xdocs/index.xml Sun Dec 18 13:34:04 2011
@@ -70,14 +70,10 @@
<feature title="Audio and Video Conferencing">
- <image
- fullhref="images/Features_Screen_Conference_Room.png"
- href="images/Features_Screen_Conference_Room_Thumb.png"
- title="OpenMeetings Conference Room"
- width="300" height="210"
- fullwidth="1003" fullheight="703"
- />
-
+ <image fullhref="images/Features_Screen_Conference_Room.png"
+ href="images/Features_Screen_Conference_Room_Thumb.png" title="OpenMeetings Conference Room"
+ width="300" height="210" fullwidth="1003" fullheight="703" />
+
<text>
There are four options to use OpenMeetings audio/video functions,
which you can select during a conference session.
@@ -90,8 +86,8 @@
</blockquote>
</ul>
- Additional you can change video-/audio-quality, resize webcam
- size
+ Additional you can change video-/audio-quality, choose multiple
+ camera resolutions (4:3, 16:9 or 3:2)
and choose your input devices.
</text>
@@ -99,14 +95,10 @@
<feature title="Meeting recording and Screen sharing">
- <image href="images/desktopsharing.png"
- fullhref="images/desktopsharing.png"
- title="Screensharing-/recording"
- width="140" height="150" />
- <image href="images/recordings_timeleine.png"
- fullhref="images/recordings_timeleine.png"
- title="Device"
- width="200" height="115" />
+ <image href="images/desktopsharing.png" fullhref="images/desktopsharing.png"
+ title="Screensharing-/recording" width="140" height="150" />
+ <image href="images/recordings_timeleine.png" fullhref="images/recordings_timeleine.png"
+ title="Device" width="200" height="115" />
<text>
<ul>
<li>Recorded sessions contain everything including sound recorded
@@ -135,8 +127,7 @@
<feature title="File Explorer">
<image href="images/file_smal.png" title="File Explorer"
- fullhref="images/file_smal.png"
- width="200" height="115" />
+ fullhref="images/file_smal.png" width="135" height="200" />
<text>
Advanced File-Explorer in every conference room, Drag and Drop
interface for managing uploaded files, including the possibility to
@@ -168,8 +159,7 @@
<feature title="Moderating System">
<image href="images/right_management.png" title="Right management"
- fullhref="images/right_management.png"
- width="200" height="115" />
+ fullhref="images/right_management.png" width="135" height="216" />
<text>
During a conference, the moderator can adjust the user permission
to every user individually .
@@ -195,10 +185,14 @@
Allow/Deny Remote Control Screen
</li>
<li>
+ <img class="alignnone" title="Remote control" src="images/microphone2.png"
+ alt="" />
+ Give exclusive audio to others or self
+ </li>
+ <li>
<img class="alignnone" title="Video Audio" src="images/audio_video.png"
alt="" />
- (Re-) Start Audio, Video or Device settings.
- Drive.
+ (Re-) Start Audio, Video or Device settings
</li>
</ul>
</text>
@@ -206,14 +200,12 @@
</feature>
- <feature title="Chat and whiteboarding">
+ <feature title="Multi-Whiteboard and Chat">
- <image href="images/whiteboard.png"
- fullhref="images/whiteboard.png"
- title="Whiteboard" width="200" height="115" />
- <image href="images/chat.png"
- fullhref="images/chat.png"
- title="Chat in Conference Room" width="200" height="40" />
+ <image href="images/whiteboard.png" fullhref="images/whiteboard.png"
+ title="Whiteboard" width="240" height="165" />
+ <image href="images/chat.png" fullhref="images/chat.png"
+ title="Chat in Conference Room" width="240" height="68" />
<text>
Multi-Whiteboard, you can add new whiteboard instances, each
white
@@ -246,9 +238,8 @@
<feature title="User and room management">
- <image href="images/dashboard.png"
- fullhref="images/dashboard.png"
- title="Dashboard with MyRooms" width="200" height="115" />
+ <image href="images/dashboard.png" fullhref="images/dashboard.png"
+ title="Dashboard with MyRooms" width="250" height="130" />
<text>
You can manage users and multiple organizations in a single
OpenMeetings instance. You can also create users that only have
@@ -269,9 +260,8 @@
</feature>
<feature title="Private message center">
- <image href="images/privat_messages.png"
- fullhref="images/privat_messages.png"
- title="Private Messages and Contact Search" width="200" height="115" />
+ <image href="images/privat_messages.png" fullhref="images/privat_messages.png"
+ title="Private Messages and Contact Search" width="230" height="125" />
<text>
Send users messages and organize them in folders. You can book
conference rooms by sending private messages. The booked event
@@ -285,13 +275,12 @@
</text>
</feature>
- <feature title="Calendaring">
- <image href="images/calendar.png"
- fullhref="images/calendar.png"
+ <feature title="Plan meetings with integrated calendar">
+ <image href="images/calendar.png" fullhref="images/calendar.png"
title="Calendar" width="200" height="115" />
<text>
<ul>
- <li>Plan your conferencing and invite attendees from !OpenMeetings
+ <li>Plan your conferencing and invite attendees from OpenMeetings
or External.
</li>
<li>The invited attendees will recieve an E-mail with details to
@@ -304,15 +293,8 @@
</feature>
<feature title="Polls and Votes">
- <image href="images/poll.png"
- fullhref="images/poll.png"
- title="Create a poll" width="200" height="115" />
- <image href="images/vote.png"
- fullhref="images/vote.png"
- title="Vote" width="200" height="115" />
- <image href="images/pollresult.png"
- fullhref="images/pollresult.png"
- title="Pollresult" width="200" height="115" />
+ <image href="images/poll.png" fullhref="images/poll.png"
+ title="Create a poll" width="250" height="250" />
<text>
You can create a poll with yes/no or 1-10 questions, let the
user
@@ -324,8 +306,7 @@
</feature>
<feature title="Backup">
- <image href="images/backup.png"
- fullhref="images/backup.png"
+ <image href="images/backup.png" fullhref="images/backup.png"
title="Backup" width="200" height="115" />
<text>
You can backup the hole user-generated data including files