Modified: openmeetings/application/trunk/openmeetings-server/src/site/xdoc/CallForLogo.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/CallForLogo.xml?rev=1772144&r1=1772143&r2=1772144&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-server/src/site/xdoc/CallForLogo.xml (original) +++ openmeetings/application/trunk/openmeetings-server/src/site/xdoc/CallForLogo.xml Thu Dec 1 04:22:52 2016 @@ -49,7 +49,7 @@ var ib = e.closest('table').find('.logo-big'); var bi = $('#bannerLeft img'); bi.attr('src', ib.attr('src')); - bi[0].scrollIntoView(); + $('.subhead')[0].scrollIntoView() } function applyLogoSmall(e) { var pp = $('.powered-preview'); @@ -60,7 +60,7 @@ } var ib = e.closest('table').find('.logo-square'); l.css('background-image', 'url(' + ib.attr('src') + ')'); - l[0].scrollIntoView(); + $('#Preview')[0].scrollIntoView(); } //]]> </script> @@ -70,7 +70,7 @@ <table> <tr> <td><img class="logo-big" src="images/logo.png" alt="Apache OpenMeetings"/></td> - <td><button class="btn btn-primary" onclick="applyLogoBig($(this));"/>Apply</td> + <td><span class="btn btn-primary" onclick="applyLogoBig($(this));">Apply</span></td> </tr> <tr> <td>Author</td> @@ -82,7 +82,7 @@ <table> <tr> <td><img class="logo-big" src="images/logos/logo_om_big3.png" alt="Apache OpenMeetings"/></td> - <td><button class="btn btn-primary" onclick="applyLogoBig($(this));"/>Apply</td> + <td><span class="btn btn-primary" onclick="applyLogoBig($(this));">Apply</span></td> </tr> <tr> <td>Author</td> @@ -94,7 +94,7 @@ <table> <tr> <td><img class="logo-big" src="images/logos/logo_om_big4.png" alt="Apache OpenMeetings"/></td> - <td><button class="btn btn-primary" onclick="applyLogoBig($(this));"/>Apply</td> + <td><span class="btn btn-primary" onclick="applyLogoBig($(this));">Apply</span></td> </tr> <tr> <td>Author</td> @@ -106,7 +106,7 @@ <table> <tr> <td><img class="logo-big" src="images/logos/logo_om_big5.png" alt="Apache OpenMeetings"/></td> - <td><button class="btn btn-primary" onclick="applyLogoBig($(this));"/>Apply</td> + <td><span class="btn btn-primary" onclick="applyLogoBig($(this));">Apply</span></td> </tr> <tr> <td>Author</td> @@ -121,7 +121,7 @@ <table> <tr> <td><img class="logo-square" src="images/logos/logo_om1.png" alt="Square version" width="50"/></td> - <td><button class="btn btn-primary" onclick="applyLogoSmall($(this));"/>Apply</td> + <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td> </tr> <tr> <td>Author</td> @@ -133,7 +133,7 @@ <table> <tr> <td><img class="logo-square" src="images/logos/logo_om_small2.png" alt="Square version" width="50"/></td> - <td><button class="btn btn-primary" onclick="applyLogoSmall($(this));"/>Apply</td> + <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td> </tr> <tr> <td>Author</td> @@ -145,7 +145,7 @@ <table> <tr> <td><img class="logo-square" src="images/logos/logo_om_small3.png" alt="Square version" width="50"/></td> - <td><button class="btn btn-primary" onclick="applyLogoSmall($(this));"/>Apply</td> + <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td> </tr> <tr> <td>Author</td> @@ -157,7 +157,7 @@ <table> <tr> <td><img class="logo-square" src="images/logos/logo_om_small4.png" alt="Square version" width="50"/></td> - <td><button class="btn btn-primary" onclick="applyLogoSmall($(this));"/>Apply</td> + <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td> </tr> <tr> <td>Author</td> @@ -169,7 +169,7 @@ <table> <tr> <td><img class="logo-square" src="images/logos/logo_om_small5.png" alt="Square version" width="50"/></td> - <td><button class="btn btn-primary" onclick="applyLogoSmall($(this));"/>Apply</td> + <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td> </tr> <tr> <td>Author</td> @@ -181,7 +181,7 @@ <table> <tr> <td><img class="logo-square" src="images/logos/logo_om_small6.png" alt="Square version" width="50"/></td> - <td><button class="btn btn-primary" onclick="applyLogoSmall($(this));"/>Apply</td> + <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td> </tr> <tr> <td>Author</td> @@ -193,7 +193,7 @@ <table> <tr> <td><img class="logo-square" src="images/logos/logo_om_small7.png" alt="Square version" width="50"/></td> - <td><button class="btn btn-primary" onclick="applyLogoSmall($(this));"/>Apply</td> + <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td> </tr> <tr> <td>Author</td> @@ -205,7 +205,7 @@ <table> <tr> <td><img class="logo-square" src="images/logos/logo_om_small8.png" alt="Square version" width="50"/></td> - <td><button class="btn btn-primary" onclick="applyLogoSmall($(this));"/>Apply</td> + <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td> </tr> <tr> <td>Author</td>
Modified: openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ConferenceRoomLayoutOptions.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ConferenceRoomLayoutOptions.xml?rev=1772144&r1=1772143&r2=1772144&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ConferenceRoomLayoutOptions.xml (original) +++ openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ConferenceRoomLayoutOptions.xml Thu Dec 1 04:22:52 2016 @@ -22,65 +22,63 @@ <body> <section name="Layout options for conference rooms"> <p> - Each room has "Hidden room elements" section. - You can choose which elements for each room will be hidden in Administration > Rooms<br/> - <br/> - Please NOTE this elements were checkboxes before 3.2.0. + Each room has a number of attributes to generate different layouts. + You can change those values individually for each room in Administration > Rooms </p> <p></p> <table> <tr> - <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Element </th> + <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> key </th> <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> default </th> <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> meaning </th> - <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> available since OpenMeetings version </th> + <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> availabe since OpenMeetings version </th> </tr> <tr> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> TopBar </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> displayed </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Top bar with the menus and exit button </td> + <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideTopBar </td> + <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td> + <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the top bar with the menus and exit button </td> <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td> </tr> <tr> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Chat </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> displayed </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Chat tab in the room</td> + <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideChat </td> + <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td> + <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the chat tab and use space for whiteboard </td> <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td> </tr> <tr> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Activities </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> displayed </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Activities window with the notifications about user activities</td> + <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideActivitiesAndActions </td> + <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td> + <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the activities window with the notofications aber user activities</td> <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td> </tr> <tr> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Files </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> displayed </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Room file explorer</td> + <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideFilesExplorer </td> + <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td> + <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the file explorer</td> <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td> </tr> <tr> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> ActionMenu </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> displayed </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Menu with the actions</td> + <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideActionsMenu </td> + <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td> + <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the menu with the actions</td> <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td> </tr> <tr> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> ScreenSharing </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> displayed </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> The button and menu item to start screen-sharing/recording</td> + <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideScreenSharing </td> + <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td> + <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the button to start screensharing/recording</td> <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td> </tr> <tr> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Whiteboard </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> displayed </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Whiteboard room element, if this element is hidden, the videos will be in the area of the whiteboard</td> + <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideWhiteboard </td> + <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td> + <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the whiteboard, if this option is true, the videos will be in the area of the whiteboard</td> <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td> </tr> <tr> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> MicrophoneStatus </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hidden </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Current status of the microphone (off/on) on the bottom of each video view</td> + <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> showMicrophoneStatus </td> + <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td> + <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Show the current status of the microphone (off/on) on the bottom of each video view</td> <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td> </tr> </table> Modified: openmeetings/application/trunk/openmeetings-server/src/site/xdoc/NetworkCalculator.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/NetworkCalculator.xml?rev=1772144&r1=1772143&r2=1772144&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-server/src/site/xdoc/NetworkCalculator.xml (original) +++ openmeetings/application/trunk/openmeetings-server/src/site/xdoc/NetworkCalculator.xml Thu Dec 1 04:22:52 2016 @@ -20,14 +20,11 @@ </properties> <head> - <script type="text/javascript" src="js/jquery-ui.min.js"></script> - <script type="text/javascript" src="js/netcalc.js"></script> <link rel="stylesheet" href="css/jquery-ui.css"/> <link rel="stylesheet" href="css/netcalc.css"/> </head> <body> <section name="Network bandwidth for OpenMeetings"> - <div id="content"> <span class="result-area"> Server inbound bandwidth: Modified: openmeetings/application/trunk/openmeetings-server/src/site/xdoc/OpenOfficeConverter.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/OpenOfficeConverter.xml?rev=1772144&r1=1772143&r2=1772144&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-server/src/site/xdoc/OpenOfficeConverter.xml (original) +++ openmeetings/application/trunk/openmeetings-server/src/site/xdoc/OpenOfficeConverter.xml Thu Dec 1 04:22:52 2016 @@ -21,28 +21,27 @@ </properties> <body> - <section name="OpenOffice Service for OpenMeetings"> - <p> To import .doc, .docx, .odp, .xls, .xlsx, .ppt, .pptx, ... [ all files that you can open with OpenOffice ] to OpenMeetings and use them in the whiteboard you need OpenOffice or LibreOffice - installed - the machine that runs OpenMeetings. + installed the machine that runs OpenMeetings. </p> - <p> + <div class="alert alert-success"> <i>Since Version 2.0 of OpenMeetings starting of OpenOffice/LibreOffice as service in not required, JODConverter will automatically start and shut down the service! </i> - </p> + </div> + <div class="alert alert-success"> + <i>JODConverter is bundled into OpenMeetings since 3.1.4</i> + </div> <p> - Installation of JODConverter means: You donwload the ZIP binary from + Installation of JODConverter means: You download the ZIP binary from their - <a href="http://code.google.com/p/jodconverter/"; target="_blank" - rel="nofollow">website</a> + <a href="https://code.google.com/archive/p/jodconverter/downloads"; target="_blank" rel="nofollow">website</a> and then configure in Apache OpenMeetings Administration > Configuration (or during installation) the config key <tt>jod.path</tt> @@ -50,10 +49,6 @@ There is no restart of OpenMeetings required. </p> <p>You should use an OpenOffice version greater 3</p> - </section> - - </body> - -</document> \ No newline at end of file +</document> Modified: openmeetings/application/trunk/openmeetings-server/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/index.xml?rev=1772144&r1=1772143&r2=1772144&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-server/src/site/xdoc/index.xml (original) +++ openmeetings/application/trunk/openmeetings-server/src/site/xdoc/index.xml Thu Dec 1 04:22:52 2016 @@ -20,79 +20,42 @@ </properties> <body> - + <section name="Audio/Video Conferencing"> + <img src="images/cut_conference_room.png" alt="Conference Room" /> + <p>OpenMeetings enables you to make Audio/Video conferencing.</p> + </section> + <section name="Calendar"> + <img src="images/cut_integrated_calendar.png" alt="Calendar" /> + <p>You can create meetings with the integrated calendar, conference rooms and invitations are + automatically send to everybody</p> + </section> + <section name="File Explorer"> + <img src="images/cut_file_explorer.png" alt="File Explorer" /> + <p>Each room has its own File-Explorer. Each user has his own private drive and additionally there + is a public drive to share files with other participants</p> + </section> + <section name="Integration API"> + <img src="images/cut_integration_api.png" alt="Integration API" /> + <p>There is a SOAP/REST API to integrate into your website or intranet, as well + as LDAP/ADS connectors and VoIP/Asterisk integration modules</p> + </section> + <section name="Private messages and contacts"> + <img src="images/cut_private_messages.png" alt="Private messages" /> + <p>From the private message center you can send invitations by email + and attach meeting invitations to every email</p> + </section> + <section name="Administration and Configuration"> + <img src="images/cut_administration_configuration.png" alt="Administration" /> + <p>You can configure users, rooms, usergroups, config settings or + edit labels with a Web-Frontend integrated in the application</p> + </section> + <section name="Screen sharing and Recording"> + <img src="images/cut_recordings_playback.png" alt="Share and Record" /> + <p>You can do screen sharing as well as recording of whole sessions including audio/video. + Recordings can be downloaded as AVI/FLV or watched online in the integrated player.</p> + </section> + <hr/> <section name="Apache OpenMeetings - Features and overview"> - <div id="slider"> - <div class="carousel-inner"> - <div class="item active"> - <img src="images/cut_conference_room.png" alt="Conference Room" /> - <span class="carousel-caption"> - <span class="title">Audio/Video Conferencing</span> - <span class="desc">OpenMeetings enables you to make Audio/Video conferencing.</span> - </span> - </div> - <div class="item"> - <img src="images/cut_integrated_calendar.png" alt="Calendar" /> - <span class="carousel-caption"> - <span class="title">Calendar</span> - <span class="desc">You can create meetings with the integrated calendar, conference rooms and invitations are - automatically send to everybody</span> - </span> - </div> - <div class="item"> - <img src="images/cut_file_explorer.png" alt="File Explorer" /> - <span class="carousel-caption"> - <span class="title">File Explorer</span> - <span class="desc">Each room has its own File-Explorer. Each user has his own private drive and additionally there - is a public drive to share files with other participants</span> - </span> - </div> - <div class="item"> - <img src="images/cut_integration_api.png" alt="Integration API" /> - <span class="carousel-caption"> - <span class="title">Integration API</span> - <span class="desc">There is a SOAP/REST API to integrate into your website or intranet, as well - as LDAP/ADS - connectors and VoIP/Asterisk integration modules - </span> - </span> - </div> - <div class="item"> - <img src="images/cut_private_messages.png" alt="Private messages" /> - <span class="carousel-caption"> - <span class="title">Private messages and contacts</span> - <span class="desc">From the private message center you can send invitations by email - and attach meeting invitations - to every email - </span> - </span> - </div> - <div class="item"> - <img src="images/cut_administration_configuration.png" alt="Administration" /> - <span class="carousel-caption"> - <span class="title">Administration and Configuration</span> - <span class="desc">You can configure users, rooms, usergroups, config settings or - edit labels with a Web-Frontend - integrated in the application - </span> - </span> - </div> - <div class="item"> - <img src="images/cut_recordings_playback.png" alt="Share and Record" /> - <span class="carousel-caption"> - <span class="title">Screen sharing and Recording</span> - <span class="desc">You can do screen sharing as well as recording of whole sessions - including audio/video. - Recordings can be downloaded as AVI/FLV or - watched online in the integrated player. - </span> - </span> - </div> - </div> - <a class="carousel-control left" href="#slider">‹</a> - <a class="carousel-control right" href="#slider">›</a> - </div> - <p> Openmeetings provides video conferencing, instant messaging, white board, collaborative document editing and other groupware tools using API functions of the Red5 Streaming Server for Remoting @@ -146,312 +109,271 @@ </section> <section name="Feature details"> - - <div class="feature clearfix"> - <span class="feature title">Audio and Video Conferencing</span> - <span class="desc_image"> - <a href="images/Features_Screen_Conference_Room_Thumb.png" class="example-image-link" - title="OpenMeetings Conference Room" style="float:none; display: block; width:250px;height:175px;border:0;"> - <img src="images/Features_Screen_Conference_Room_Thumb.png" title="OpenMeetings Conference Room" - width="250px" height="175px" alt="" /> - </a> - </span> - <span class="desc" > - <span class="p_content">There are four options to use OpenMeetings audio/video functions, - which you can select during a conference session. - </span> - - <ul> - - <li>audio + video</li> - - <li>audio only</li> - - <li>video only</li> - - <li>picture only</li> - </ul> - <span class="p_content">Additional you can change video-/audio-quality, choose multiple - camera resolutions (4:3, 16:9 or 3:2) and choose your input devices. - </span> - </span> - </div> - - - <div class="feature clearfix"> - <span class="feature title">Meeting recording and Screen sharing</span> - - <span class="desc_image" > - <a href="images/desktopsharing.png" class="example-image-link" - title="Screensharing-recording" style="float:none; display: block; width: 140px; height: 150px"> - <img src="images/desktopsharing.png" title="Screensharing-recording" style="float:none; display: block; width: 140px; height: 150px" alt="" /> - </a> - <a href="images/recordings_timeleine.png" class="example-image-link" - title="Device" style="float:none; display: block; width: 200px; height: 115px"> - <img src="images/recordings_timeleine.png" title="Device" style="float:none; display: block; width: 200px; height: 115px" alt="" /> - </a> - </span> - <span class="desc" style="margin-top: 50px;"> - - <ul> - - <li>Recorded sessions contain everything including sound recorded - from all audio streams in exactly the way you've seen it in the conference. - </li> - - <li>Recorded sessions can be downloaded as AVI/FLV files.</li> - - <li>Possibility to select a screen area for sharing.</li> - - <li>Different quality steps for Screensharing.</li> - - <li>Watch and organize recordings in an integrated Drag and Drop File-Explorer</li> - </ul> - </span> - </div> - - - <div class="feature clearfix"> - <span class="feature title">File Explorer</span> - - <span class="desc_image"> - <a href="images/file_smal.png" class="example-image-link" - title="File Explorer" style="float:none; display: block; width:135px;height:200px;border:0;"> - - <img src="images/file_smal.png" title="File Explorer" width="135px" height="200px" alt="" - style="float:none; display: block; width:135px;height:200px;border:0;"/> - </a> - </span> - <span class="desc"> - <span class="p_content">Advanced File-Explorer in every conference room, Drag and Drop - interface for managing uploaded files, including the possibility to - create a document tree with folders. - </span> - <br /> - <span class="p_content"> - Private and Public Drive in File-Explorer. The File-Explorer has two different views, one is the - <b>Private Drive</b> and the other the <b>Public Drive</b>. The Private Drive always contains the same files. - Those files are visible only to the user currently loggedin. The Public Drive is not - bound to the user, but to the conference room instead. All users in the conference room - have access to the Public Drive. - </span> - </span> - </div> - - - <div class="feature clearfix"> - <span class="feature title">Moderating System</span> - <span class="desc_image"> - <a href="images/right_management.png" class="example-image-link" - title="Right management" style="float:none; display: block; width:135px;height:216px;border:0;"> - <img src="images/right_management.png" title="Right management" width="135px" height="216px" alt="" - style="float:none; display: block; width:135px;height:216px;border:0;"/> - </a> - </span> - <span class="desc"> - <span class="p_content">During a conference, the moderator can adjust the user permission to every user individually. - </span> - - <ul> - - <li> - <img src="images/user_add.png" class="alignnone" title="Allow modaration" alt="" /> - Allow/Deny moderation - </li> - - <li> - <img src="images/pencil_add.png" class="alignnone" title="Whiteboard Access" alt="" /> - Allow/Deny to draw on white board - </li> - - <li> - <img src="images/monitor_add.png" class="alignnone" title="Screenshare" alt="" /> - Allow/Deny screen-sharing/record screen - </li> - - <li> - <img src="images/mouse_add.png" class="alignnone" title="Remote control" alt="" /> - Allow/Deny Remote Control Screen - </li> - - <li> - <img src="images/micro_small.png" class="alignnone" title="Remote control" alt="" /> - Give exclusive audio to others or self - </li> - - <li> - <img src="images/audio_and_video.png" class="alignnone" title="Video Audio" alt="" /> - (Re-) Start Audio, Video or Device settings - </li> - </ul> - </span> - </div> - - - <div class="feature clearfix"> - <span class="feature title">Multi-Whiteboard and Chat</span> - - <span class="desc_image" > - <a href="images/whiteboard.png" class="example-image-link" - title="Whiteboard" style="float:none; display: block; width:240px;height:165px;border:0;"> - <img src="images/whiteboard.png" title="Whiteboard" - style="float:none; display: block; width: 240px; height: 165px" alt="" /> - </a> - <a href="images/chat.png" class="example-image-link" - title="Chat in Conference Room" style="float:none; display: block; width:240px;height:68px;border:0;"> - <img src="images/chat.png" title="Chat in Conference Room" - style="float:none; display: block; width: 240px; height: 68px" alt="" /> - </a> - </span> - <span class="desc"> - <span class="p_content" style="width: 450px"> - Multi-Whiteboard, you can add new whiteboard instances, each - white board can have the full range of tools and - documents inside. - <br /> - <br /> - Save white boards. You can save each whiteboard instance as a file. - The file is located in the File-Explorer and - can be drag n' drop'ed - to the white board again and organized like any other document, - image or folder. - <br /> - <br /> - White board with drawing, writing, Drag n' Drop, Resizing, Images - (Drag n' Drop from File-Explorer), - Symbol(s)/Cliparts . - <br /> - <br /> - Full-fit does rescale the document on the screen to be 100% visible - on all screens no matter what kind of screen - resolution different users have. - <br /> - <br /> - You can import from a wide range of document formats (PDF, DOC, ODT, PPT, et cetera...) - </span> - </span> - </div> - - - <div class="feature clearfix"> - <span class="feature title">User and room management</span> - <span class="desc_image"> - <a href="images/dashboard.png" class="example-image-link" - title="Dashboard with MyRooms" style="float:none; display: block; width:250px;height:130px;border:0;"> - <img src="images/dashboard.png" title="Dashboard with MyRooms" width="250px" height="130px" alt="" - style="float:none; display: block; width:250px;height:130px;border:0;"/> - </a> - </span> - <span class="desc"> - <span class="p_content" > - You can manage users and multiple organizations in a single - OpenMeetings instance. You can also create users that only have - access via the SOAP-API. - <br /> - <br /> - MyRooms section. Each user has by default 2 personal rooms that are - always accessible exclusively for that user. There are buttons to - enter those rooms from the Dashboard. - <br /> - <br /> - You can assign conference room to all users, or you can assign them - only to specific user-groups. - </span> - </span> - </div> - - - <div class="feature clearfix"> - <span class="feature title">Private message center</span> - <span class="desc_image" > - <a href="images/privat_messages.png" class="example-image-link" - title="Private Messages and Contact Search" style="float:none; display: block; width:230px;height:125px;border:0;"> - <img src="images/privat_messages.png" title="Private Messages and Contact Search" - width="230px" height="125px" alt="" - style="float:none; display: block; width:230px;height:125px;border:0;"/> - </a> - </span> - <span class="desc"> - <span class="p_content"> - Send users messages and organize them in folders. You can book - conference rooms by sending private messages. The booked event - automatically is in your and the participants calendar, changes to - that event will be populated to all users booked to the event. - <br /> - <br /> - User contacts, you can search users and add them to your contacts. You - can even give them the right to see your calendar. - </span> - </span> - </div> - - - <div class="feature clearfix"> - <span class="feature title">Plan meetings with integrated calendar</span> - <span class="desc_image" > - <a href="images/calendar.png" class="example-image-link" - title="Calendar" style="float:none; display: block; width:200px;height:115px;border:0;"> - <img src="images/calendar.png" title="Calendar" width="200px" height="115px" alt="" - style="float:none; display: block; width:200px;height:115px;border:0;"/> - </a> - </span> - <span class="desc"> - - <ul> - - <li>Plan your conferencing and invite attendees from OpenMeetings or External.</li> - - <li>The invited attendees will recieve an E-mail with details to the meetings and a link with a - secure hash to the conference room. - </li> - - <li>Share your calendar with your contacts.</li> - </ul> - </span> - </div> - - - <div class="feature clearfix"> - <span class="feature title">Polls and Votes</span> - <span class="desc_image" > - <a href="images/poll.png" class="example-image-link" - title="Create a poll" style="float:none; display: block; width:250px;height:250px;border:0;"> - <img src="images/poll.png" title="Create a poll" width="250px" height="250px" alt="" - style="float:none; display: block; width:250px;height:250px;border:0;"/> - </a> - </span> - <span class="desc"> - <span class="p_content"> - You can create a poll with yes/no or 1-10 questions, let the - user vote and see the voting results. - <br /> + <subsection name="Audio and Video Conferencing"> + <div class="row"> + <div class="span3"> + <a href="images/Features_Screen_Conference_Room_Thumb.png" class="example-image-link" + title="OpenMeetings Conference Room" style="float:none; display: block; width:250px;height:175px;border:0;"> + <img src="images/Features_Screen_Conference_Room_Thumb.png" title="OpenMeetings Conference Room" + style="width: 250px; height: 175px;" alt="" /> + </a> + </div> + <div class="span5"> + <span class="p_content">There are four options to use OpenMeetings audio/video functions, + which you can select during a conference session. + </span> + <ul> + <li>audio + video</li> + <li>audio only</li> + <li>video only</li> + <li>picture only</li> + </ul> + <span class="p_content">Additional you can change video-/audio-quality, choose multiple + camera resolutions (4:3, 16:9 or 3:2) and choose your input devices. + </span> + </div> + </div> + </subsection> + <subsection name="Meeting recording and Screen sharing"> + <div class="row"> + <div class="span3"> + <a href="images/desktopsharing.png" class="example-image-link" + title="Screensharing-recording" style="float:none; display: block; width: 140px; height: 150px"> + <img src="images/desktopsharing.png" title="Screensharing-recording" style="float:none; display: block; width: 140px; height: 150px" alt="" /> + </a> + <a href="images/recordings_timeleine.png" class="example-image-link" + title="Device" style="float:none; display: block; width: 200px; height: 115px"> + <img src="images/recordings_timeleine.png" title="Device" style="float:none; display: block; width: 200px; height: 115px" alt="" /> + </a> + </div> + <div class="span5"> + <ul> + <li>Recorded sessions contain everything including sound recorded + from all audio streams in exactly the way you've seen it in the conference. + </li> + <li>Recorded sessions can be downloaded as AVI/FLV files.</li> + <li>Possibility to select a screen area for sharing.</li> + <li>Different quality steps for Screensharing.</li> + <li>Watch and organize recordings in an integrated Drag and Drop File-Explorer</li> + </ul> + </div> + </div> + </subsection> + <subsection name="File Explorer"> + <div class="row"> + <div class="span3"> + <a href="images/file_smal.png" class="example-image-link" + title="File Explorer" style="float:none; display: block; width:135px;height:200px;border:0;"> + <img src="images/file_smal.png" title="File Explorer" alt="" + style="float:none; display: block; width:135px;height:200px;border:0;"/> + </a> + </div> + <div class="span5"> + <span class="p_content">Advanced File-Explorer in every conference room, Drag and Drop + interface for managing uploaded files, including the possibility to + create a document tree with folders. + </span> <br /> - Polls can be stored and results viewed as pie-chart - </span> - </span> - </div> - - - <div class="feature clearfix"> - <span class="feature title">Backup</span> - <span class="desc_image" > - <a href="images/backup.png" class="example-image-link" - title="Backup" style="float:none; display: block; width:240px;height:135px;border:0;"> - <img src="images/backup.png" title="Backup" width="250px" alt="" - style="float:none; display: block; width:250px;height:135px;border:0;"/> - </a> - </span> - <span class="desc"> - <span class="p_content">You can backup all user-generated data including files - uploaded by the users in a single ZIP file and import that ZIP into - a new installation of OpenMeetings again. - </span> - </span> - </div> - - - + <span class="p_content"> + Private and Public Drive in File-Explorer. The File-Explorer has two different views, one is the + <b>Private Drive</b> and the other the <b>Public Drive</b>. The Private Drive always contains the same files. + Those files are visible only to the user currently loggedin. The Public Drive is not + bound to the user, but to the conference room instead. All users in the conference room + have access to the Public Drive. + </span> + </div> + </div> + </subsection> + <subsection name="Moderating System"> + <div class="row"> + <div class="span3"> + <a href="images/right_management.png" class="example-image-link" + title="Right management" style="float:none; display: block; width:135px;height:216px;border:0;"> + <img src="images/right_management.png" title="Right management" alt="" + style="float:none; display: block; width:135px;height:216px;border:0;"/> + </a> + </div> + <div class="span5"> + <span class="p_content">During a conference, the moderator can adjust the user permission to every user individually.</span> + <ul> + <li> + <img src="images/user_add.png" class="alignnone" title="Allow modaration" alt="" /> + Allow/Deny moderation + </li> + <li> + <img src="images/pencil_add.png" class="alignnone" title="Whiteboard Access" alt="" /> + Allow/Deny to draw on white board + </li> + <li> + <img src="images/monitor_add.png" class="alignnone" title="Screenshare" alt="" /> + Allow/Deny screen-sharing/record screen + </li> + <li> + <img src="images/mouse_add.png" class="alignnone" title="Remote control" alt="" /> + Allow/Deny Remote Control Screen + </li> + <li> + <img src="images/micro_small.png" class="alignnone" title="Remote control" alt="" /> + Give exclusive audio to others or self + </li> + <li> + <img src="images/audio_and_video.png" class="alignnone" title="Video Audio" alt="" /> + (Re-) Start Audio, Video or Device settings + </li> + </ul> + </div> + </div> + </subsection> + <subsection name="Multi-Whiteboard and Chat"> + <div class="row"> + <div class="span3"> + <a href="images/whiteboard.png" class="example-image-link" + title="Whiteboard" style="float:none; display: block; width:240px;height:165px;border:0;"> + <img src="images/whiteboard.png" title="Whiteboard" + style="float:none; display: block; width: 240px; height: 165px" alt="" /> + </a> + <a href="images/chat.png" class="example-image-link" + title="Chat in Conference Room" style="float:none; display: block; width:240px;height:68px;border:0;"> + <img src="images/chat.png" title="Chat in Conference Room" + style="float:none; display: block; width: 240px; height: 68px" alt="" /> + </a> + </div> + <div class="span5"> + <span class="p_content" style="width: 450px"> + Multi-Whiteboard, you can add new whiteboard instances, each + white board can have the full range of tools and + documents inside. + <br /> + <br /> + Save white boards. You can save each whiteboard instance as a file. + The file is located in the File-Explorer and + can be drag n' drop'ed + to the white board again and organized like any other document, + image or folder. + <br /> + <br /> + White board with drawing, writing, Drag n' Drop, Resizing, Images + (Drag n' Drop from File-Explorer), + Symbol(s)/Cliparts . + <br /> + <br /> + Full-fit does rescale the document on the screen to be 100% visible + on all screens no matter what kind of screen + resolution different users have. + <br /> + <br /> + You can import from a wide range of document formats (PDF, DOC, ODT, PPT, et cetera...) + </span> + </div> + </div> + </subsection> + <subsection name="User and room management"> + <div class="row"> + <div class="span3"> + <a href="images/dashboard.png" class="example-image-link" + title="Dashboard with MyRooms" style="float:none; display: block; width:250px;height:130px;border:0;"> + <img src="images/dashboard.png" title="Dashboard with MyRooms" alt="" + style="float:none; display: block; width:250px;height:130px;border:0;"/> + </a> + </div> + <div class="span5"> + <span class="p_content" > + You can manage users and multiple organizations in a single + OpenMeetings instance. You can also create users that only have + access via the SOAP-API. + <br /> + <br /> + MyRooms section. Each user has by default 2 personal rooms that are + always accessible exclusively for that user. There are buttons to + enter those rooms from the Dashboard. + <br /> + <br /> + You can assign conference room to all users, or you can assign them + only to specific user-groups. + </span> + </div> + </div> + </subsection> + <subsection name="Private message center"> + <div class="row"> + <div class="span3"> + <a href="images/privat_messages.png" class="example-image-link" + title="Private Messages and Contact Search" style="float:none; display: block; width:230px;height:125px;border:0;"> + <img src="images/privat_messages.png" title="Private Messages and Contact Search" alt="" + style="float:none; display: block; width:230px;height:125px;border:0;"/> + </a> + </div> + <div class="span5"> + <span class="p_content"> + Send users messages and organize them in folders. You can book + conference rooms by sending private messages. The booked event + automatically is in your and the participants calendar, changes to + that event will be populated to all users booked to the event. + <br /> + <br /> + User contacts, you can search users and add them to your contacts. You + can even give them the right to see your calendar. + </span> + </div> + </div> + </subsection> + <subsection name="Plan meetings with integrated calendar"> + <div class="row"> + <div class="span3"> + <a href="images/calendar.png" class="example-image-link" + title="Calendar" style="float:none; display: block; width:200px;height:115px;border:0;"> + <img src="images/calendar.png" title="Calendar" alt="" + style="float:none; display: block; width:200px;height:115px;border:0;"/> + </a> + </div> + <div class="span5"> + <ul> + <li>Plan your conferencing and invite attendees from OpenMeetings or External.</li> + <li>The invited attendees will recieve an E-mail with details to the meetings and a link with a + secure hash to the conference room. + </li> + <li>Share your calendar with your contacts.</li> + </ul> + </div> + </div> + </subsection> + <subsection name="Polls and Votes"> + <div class="row"> + <div class="span3"> + <a href="images/poll.png" class="example-image-link" + title="Create a poll" style="float:none; display: block; width:250px;height:250px;border:0;"> + <img src="images/poll.png" title="Create a poll" alt="" + style="float:none; display: block; width:250px;height:250px;border:0;"/> + </a> + </div> + <div class="span5"> + <span class="p_content"> + You can create a poll with yes/no or 1-10 questions, let the + user vote and see the voting results. + <br /> + <br /> + Polls can be stored and results viewed as pie-chart + </span> + </div> + </div> + </subsection> + <subsection name="Backup"> + <div class="row"> + <div class="span3"> + <a href="images/backup.png" class="example-image-link" + title="Backup" style="float:none; display: block; width:240px;height:135px;border:0;"> + <img src="images/backup.png" title="Backup" alt="" + style="float:none; display: block; width:250px;height:135px;border:0;"/> + </a> + </div> + <div class="span5"> + <span class="p_content">You can backup all user-generated data including files + uploaded by the users in a single ZIP file and import that ZIP into + a new installation of OpenMeetings again. + </span> + </div> + </div> + </subsection> </section> - </body> </document> Modified: openmeetings/application/trunk/pom.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/pom.xml?rev=1772144&r1=1772143&r2=1772144&view=diff ============================================================================== --- openmeetings/application/trunk/pom.xml (original) +++ openmeetings/application/trunk/pom.xml Thu Dec 1 04:22:52 2016 @@ -39,7 +39,7 @@ <junit.version>4.12</junit.version> <maven.javadoc.version>2.10.3</maven.javadoc.version> <maven.surefire.version>2.19.1</maven.surefire.version> - <maven-site.version>3.6</maven-site.version> + <maven-site.version>3.3</maven-site.version> <wicket.version>7.5.0</wicket.version> <wicketju.version>7.5.0</wicketju.version> <wickets.version>7.5.0</wickets.version> @@ -703,6 +703,19 @@ </goals> </execution> </executions> + <dependencies> + <dependency> + <groupId>lt.velykis.maven.skins</groupId> + <artifactId>reflow-velocity-tools</artifactId> + <version>1.1.1</version> + </dependency> + <!-- Reflow skin requires Velocity >= 1.7 --> + <dependency> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + <version>1.7</version> + </dependency> + </dependencies> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -883,6 +896,7 @@ <notes></notes> <patterns> <pattern>Licensed MIT</pattern> + <pattern>MIT/GPL2 Licensed</pattern> </patterns> </license> </licenses> Modified: openmeetings/application/trunk/src/site/resources/site.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/src/site/resources/site.xml?rev=1772144&r1=1772143&r2=1772144&view=diff ============================================================================== --- openmeetings/application/trunk/src/site/resources/site.xml (original) +++ openmeetings/application/trunk/src/site/resources/site.xml Thu Dec 1 04:22:52 2016 @@ -12,8 +12,8 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/DECORATION/1.6.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"; +<project xmlns="http://maven.apache.org/DECORATION/1.7.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"; name="Apache OpenMeetings Project"> <body> @@ -29,4 +29,12 @@ <item name="JavaDoc" href="/apidocs/index.html" target="_blank" /> </menu> </body> + <custom> + <reflowSkin> + <bottomNav maxSpan="12"> + <column>Parent Project</column> + <column>Project</column> + </bottomNav> + </reflowSkin> + </custom> </project> Modified: openmeetings/application/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/src/site/site.xml?rev=1772144&r1=1772143&r2=1772144&view=diff ============================================================================== --- openmeetings/application/trunk/src/site/site.xml (original) +++ openmeetings/application/trunk/src/site/site.xml Thu Dec 1 04:22:52 2016 @@ -12,8 +12,8 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/DECORATION/1.6.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"; +<project xmlns="http://maven.apache.org/DECORATION/1.7.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"; name="Apache OpenMeetings Project"> <bannerLeft> @@ -28,33 +28,50 @@ </bannerRight> <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.6</version> + <groupId>lt.velykis.maven.skins</groupId> + <artifactId>reflow-maven-skin</artifactId> + <version>1.1.1</version> </skin> - + <version position="none"/> - + <body> <head> - <![CDATA[<script type="text/javascript" src="http://openmeetings.apache.org/js/site.js";></script>]]> + <link rel="stylesheet" href="$resourcePath/css/site.css"/> </head> - <links> <item name="Demo" href="http://openmeetings.apache.org/demo.html"/> <item name="Download" href="http://openmeetings.apache.org/downloads.html"/> - <item name="Installation" href="http://openmeetings.apache.org/installation.html"/> <item name="Wiki" href="https://cwiki.apache.org/confluence/display/OPENMEETINGS"/> </links> - <menu ref="modules" inherit="bottom"/> + <menu ref="modules" inherit="top"/> </body> - + <poweredBy></poweredBy> - + <custom> - <fluidoSkin> - <topBarEnabled>false</topBarEnabled> - <sideBarEnabled>true</sideBarEnabled> - </fluidoSkin> + <reflowSkin> + <brand> + <name><![CDATA[ + <span class="color-highlight">Apache</span> OpenMeetings + ]]></name> + </brand> + <!--localResources>true</localResources--><!-- DEVELOPMENT --> + <!--absoluteResourceURL>http://localhost:5080/openmeetings/docs</absoluteResourceURL--><!-- DEVELOPMENT --> + <absoluteResourceURL>http://openmeetings.apache.org</absoluteResourceURL> + <protocolRelativeURLs>true</protocolRelativeURLs> + <theme>site</theme><!-- http://bootswatch.com/2/cerulean offline --> + <bottomNav maxSpan="12"> + <column>General</column> + <column>Installation</column> + <column>Community</column> + <column>Development</column> + </bottomNav> + <toc>sidebar</toc> + <skinAttribution>false</skinAttribution> + <endContent> + <script src="$resourcePath/js/site.js"></script> + </endContent> + </reflowSkin> </custom> </project>
