Modified: 
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/CallForLogo.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/CallForLogo.xml?rev=1772144&r1=1772143&r2=1772144&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/CallForLogo.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/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/branches/3.1.x/openmeetings-server/src/site/xdoc/NetworkCalculator.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/NetworkCalculator.xml?rev=1772144&r1=1772143&r2=1772144&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/NetworkCalculator.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/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/branches/3.1.x/openmeetings-server/src/site/xdoc/OpenOfficeConverter.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/OpenOfficeConverter.xml?rev=1772144&r1=1772143&r2=1772144&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/OpenOfficeConverter.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/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/branches/3.1.x/openmeetings-server/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/index.xml?rev=1772144&r1=1772143&r2=1772144&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/index.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/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">&lsaquo;</a>
-                               <a class="carousel-control right" 
href="#slider">&rsaquo;</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/branches/3.1.x/pom.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/pom.xml?rev=1772144&r1=1772143&r2=1772144&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/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>
@@ -715,6 +715,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>
@@ -895,6 +908,7 @@
                                                                <notes></notes>
                                                                <patterns>
                                                                        
<pattern>Licensed MIT</pattern>
+                                                                       
<pattern>MIT/GPL2 Licensed</pattern>
                                                                </patterns>
                                                        </license>
                                                </licenses>

Modified: openmeetings/application/branches/3.1.x/src/site/resources/site.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/src/site/resources/site.xml?rev=1772144&r1=1772143&r2=1772144&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/src/site/resources/site.xml 
(original)
+++ openmeetings/application/branches/3.1.x/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/branches/3.1.x/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/src/site/site.xml?rev=1772144&r1=1772143&r2=1772144&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/src/site/site.xml (original)
+++ openmeetings/application/branches/3.1.x/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>

Added: 
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/resources/css/bootstrap-responsive.min.css
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-server/src/site/resources/css/bootstrap-responsive.min.css?rev=1772144&view=auto
==============================================================================
--- 
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/resources/css/bootstrap-responsive.min.css
 (added)
+++ 
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/resources/css/bootstrap-responsive.min.css
 Thu Dec  1 04:22:52 2016
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap Responsive v2.3.2
+ *
+ * Copyright 2013 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world by @mdo and @fat.
+ 
*/.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0
 
a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@-ms-viewport{width:device-width}.hidden{display:none;visibility:hidden}.visible-phone{display:none!important}.visible-tablet{display:none!important}.hidden-desktop{display:none!important}.visible-desktop{display:inherit!important}@media(min-width:768px)
 and 
(max-width:979px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-tablet{display:inherit!important}.hidden-tablet{display:none!important}}@media(max-width:767px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-phone{display:inherit!important}.hidden-phone{display:none!important}}.visible-print{dis
 play:none!important}@media 
print{.visible-print{display:inherit!important}.hidden-print{display:none!important}}@media(min-width:1200px){.row{margin-left:-30px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:30px}.container,.navbar-static-top
 .container,.navbar-fixed-top .container,.navbar-fixed-bottom 
.container{width:1170px}.span12{width:1170px}.span11{width:1070px}.span10{width:970px}.span9{width:870px}.span8{width:770px}.span7{width:670px}.span6{width:570px}.span5{width:470px}.span4{width:370px}.span3{width:270px}.span2{width:170px}.span1{width:70px}.offset12{margin-left:1230px}.offset11{margin-left:1130px}.offset10{margin-left:1030px}.offset9{margin-left:930px}.offset8{margin-left:830px}.offset7{margin-left:730px}.offset6{margin-left:630px}.offset5{margin-left:530px}.offset4{margin-left:430px}.offset3{margin-left:330px}.offset2{margin-left:230px}.offset1{margin-left:130px}.row-flui
 
d{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid
 
[class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.564102564102564%;*margin-left:2.5109110747408616%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid
 [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row 
[class*="span"]+[class*="span"]{margin-left:2.564102564102564%}.row-fluid 
.span12{width:100%;*width:99.94680851063829%}.row-fluid 
.span11{width:91.45299145299145%;*width:91.39979996362975%}.row-fluid 
.span10{width:82.90598290598291%;*width:82.8527914166212%}.row-fluid 
.span9{width:74.35897435897436%;*width:74.30578286961266%}.row-fluid 
.span8{width:65.81196581196582%;*width:65.75877432260411%}.row-fluid 
.span7{width:57.26495726495726%;*width:57.21176577559556%}.row-fluid 
.span6{width:48.717948717948715%;*width:48.664757228587014%}.row-fluid 
.span5{width:40.17094017094
 017%;*width:40.11774868157847%}.row-fluid 
.span4{width:31.623931623931625%;*width:31.570740134569924%}.row-fluid 
.span3{width:23.076923076923077%;*width:23.023731587561375%}.row-fluid 
.span2{width:14.52991452991453%;*width:14.476723040552828%}.row-fluid 
.span1{width:5.982905982905983%;*width:5.929714493544281%}.row-fluid 
.offset12{margin-left:105.12820512820512%;*margin-left:105.02182214948171%}.row-fluid
 
.offset12:first-child{margin-left:102.56410256410257%;*margin-left:102.45771958537915%}.row-fluid
 
.offset11{margin-left:96.58119658119658%;*margin-left:96.47481360247316%}.row-fluid
 
.offset11:first-child{margin-left:94.01709401709402%;*margin-left:93.91071103837061%}.row-fluid
 
.offset10{margin-left:88.03418803418803%;*margin-left:87.92780505546462%}.row-fluid
 
.offset10:first-child{margin-left:85.47008547008548%;*margin-left:85.36370249136206%}.row-fluid
 
.offset9{margin-left:79.48717948717949%;*margin-left:79.38079650845607%}.row-fluid
 .offset9:first-child{margin-left:76.92307692307
 693%;*margin-left:76.81669394435352%}.row-fluid 
.offset8{margin-left:70.94017094017094%;*margin-left:70.83378796144753%}.row-fluid
 
.offset8:first-child{margin-left:68.37606837606839%;*margin-left:68.26968539734497%}.row-fluid
 
.offset7{margin-left:62.393162393162385%;*margin-left:62.28677941443899%}.row-fluid
 
.offset7:first-child{margin-left:59.82905982905982%;*margin-left:59.72267685033642%}.row-fluid
 
.offset6{margin-left:53.84615384615384%;*margin-left:53.739770867430444%}.row-fluid
 
.offset6:first-child{margin-left:51.28205128205128%;*margin-left:51.175668303327875%}.row-fluid
 
.offset5{margin-left:45.299145299145295%;*margin-left:45.1927623204219%}.row-fluid
 
.offset5:first-child{margin-left:42.73504273504273%;*margin-left:42.62865975631933%}.row-fluid
 
.offset4{margin-left:36.75213675213675%;*margin-left:36.645753773413354%}.row-fluid
 
.offset4:first-child{margin-left:34.18803418803419%;*margin-left:34.081651209310785%}.row-fluid
 .offset3{margin-left:28.205128205128204%;*margin-left:
 28.0987452264048%}.row-fluid 
.offset3:first-child{margin-left:25.641025641025642%;*margin-left:25.53464266230224%}.row-fluid
 
.offset2{margin-left:19.65811965811966%;*margin-left:19.551736679396257%}.row-fluid
 
.offset2:first-child{margin-left:17.094017094017094%;*margin-left:16.98763411529369%}.row-fluid
 
.offset1{margin-left:11.11111111111111%;*margin-left:11.004728132387708%}.row-fluid
 
.offset1:first-child{margin-left:8.547008547008547%;*margin-left:8.440625568285142%}input,textarea,.uneditable-input{margin-left:0}.controls-row
 
[class*="span"]+[class*="span"]{margin-left:30px}input.span12,textarea.span12,.uneditable-input.span12{width:1156px}input.span11,textarea.span11,.uneditable-input.span11{width:1056px}input.span10,textarea.span10,.uneditable-input.span10{width:956px}input.span9,textarea.span9,.uneditable-input.span9{width:856px}input.span8,textarea.span8,.uneditable-input.span8{width:756px}input.span7,textarea.span7,.uneditable-input.span7{width:656px}input.span6,textarea.span
 
6,.uneditable-input.span6{width:556px}input.span5,textarea.span5,.uneditable-input.span5{width:456px}input.span4,textarea.span4,.uneditable-input.span4{width:356px}input.span3,textarea.span3,.uneditable-input.span3{width:256px}input.span2,textarea.span2,.uneditable-input.span2{width:156px}input.span1,textarea.span1,.uneditable-input.span1{width:56px}.thumbnails{margin-left:-30px}.thumbnails>li{margin-left:30px}.row-fluid
 .thumbnails{margin-left:0}}@media(min-width:768px) and 
(max-width:979px){.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top
 .container,.navbar-fixed-top .container,.navbar-fixed-bottom 
.container{width:724px}.span12{width:724px}.span11{width:662px}.span10{width:600px}.span9{width:538px}.span8{width:476px}.span7{width:414px}.span6{width:352px}.span5{width:290px}.span4{width:228px}.span3{width:166px}.span2{width:104px
 
}.span1{width:42px}.offset12{margin-left:764px}.offset11{margin-left:702px}.offset10{margin-left:640px}.offset9{margin-left:578px}.offset8{margin-left:516px}.offset7{margin-left:454px}.offset6{margin-left:392px}.offset5{margin-left:330px}.offset4{margin-left:268px}.offset3{margin-left:206px}.offset2{margin-left:144px}.offset1{margin-left:82px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid
 
[class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.7624309392265194%;*margin-left:2.709239449864817%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid
 [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row 
[class*="span"]+[class*="span"]{margin-left:2.7624309392265194%}.row-fluid 
.span12{width:100%;*width:99.94680851063829%}.row-fluid 
.span11{width:91.43646408839778%;*width:91.38327259903608%}.row-fluid 
.span10{width:82.87
 292817679558%;*width:82.81973668743387%}.row-fluid 
.span9{width:74.30939226519337%;*width:74.25620077583166%}.row-fluid 
.span8{width:65.74585635359117%;*width:65.69266486422946%}.row-fluid 
.span7{width:57.18232044198895%;*width:57.12912895262725%}.row-fluid 
.span6{width:48.61878453038674%;*width:48.56559304102504%}.row-fluid 
.span5{width:40.05524861878453%;*width:40.00205712942283%}.row-fluid 
.span4{width:31.491712707182323%;*width:31.43852121782062%}.row-fluid 
.span3{width:22.92817679558011%;*width:22.87498530621841%}.row-fluid 
.span2{width:14.3646408839779%;*width:14.311449394616199%}.row-fluid 
.span1{width:5.801104972375691%;*width:5.747913483013988%}.row-fluid 
.offset12{margin-left:105.52486187845304%;*margin-left:105.41847889972962%}.row-fluid
 
.offset12:first-child{margin-left:102.76243093922652%;*margin-left:102.6560479605031%}.row-fluid
 
.offset11{margin-left:96.96132596685082%;*margin-left:96.8549429881274%}.row-fluid
 .offset11:first-child{margin-left:94.1988950276243%;*margi
 n-left:94.09251204890089%}.row-fluid 
.offset10{margin-left:88.39779005524862%;*margin-left:88.2914070765252%}.row-fluid
 
.offset10:first-child{margin-left:85.6353591160221%;*margin-left:85.52897613729868%}.row-fluid
 
.offset9{margin-left:79.8342541436464%;*margin-left:79.72787116492299%}.row-fluid
 
.offset9:first-child{margin-left:77.07182320441989%;*margin-left:76.96544022569647%}.row-fluid
 
.offset8{margin-left:71.2707182320442%;*margin-left:71.16433525332079%}.row-fluid
 
.offset8:first-child{margin-left:68.50828729281768%;*margin-left:68.40190431409427%}.row-fluid
 
.offset7{margin-left:62.70718232044199%;*margin-left:62.600799341718584%}.row-fluid
 
.offset7:first-child{margin-left:59.94475138121547%;*margin-left:59.838368402492065%}.row-fluid
 
.offset6{margin-left:54.14364640883978%;*margin-left:54.037263430116376%}.row-fluid
 
.offset6:first-child{margin-left:51.38121546961326%;*margin-left:51.27483249088986%}.row-fluid
 .offset5{margin-left:45.58011049723757%;*margin-left:45.4737275185141
 7%}.row-fluid 
.offset5:first-child{margin-left:42.81767955801105%;*margin-left:42.71129657928765%}.row-fluid
 
.offset4{margin-left:37.01657458563536%;*margin-left:36.91019160691196%}.row-fluid
 
.offset4:first-child{margin-left:34.25414364640884%;*margin-left:34.14776066768544%}.row-fluid
 
.offset3{margin-left:28.45303867403315%;*margin-left:28.346655695309746%}.row-fluid
 
.offset3:first-child{margin-left:25.69060773480663%;*margin-left:25.584224756083227%}.row-fluid
 
.offset2{margin-left:19.88950276243094%;*margin-left:19.783119783707537%}.row-fluid
 
.offset2:first-child{margin-left:17.12707182320442%;*margin-left:17.02068884448102%}.row-fluid
 
.offset1{margin-left:11.32596685082873%;*margin-left:11.219583872105325%}.row-fluid
 
.offset1:first-child{margin-left:8.56353591160221%;*margin-left:8.457152932878806%}input,textarea,.uneditable-input{margin-left:0}.controls-row
 
[class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:710px}input.sp
 
an11,textarea.span11,.uneditable-input.span11{width:648px}input.span10,textarea.span10,.uneditable-input.span10{width:586px}input.span9,textarea.span9,.uneditable-input.span9{width:524px}input.span8,textarea.span8,.uneditable-input.span8{width:462px}input.span7,textarea.span7,.uneditable-input.span7{width:400px}input.span6,textarea.span6,.uneditable-input.span6{width:338px}input.span5,textarea.span5,.uneditable-input.span5{width:276px}input.span4,textarea.span4,.uneditable-input.span4{width:214px}input.span3,textarea.span3,.uneditable-input.span3{width:152px}input.span2,textarea.span2,.uneditable-input.span2{width:90px}input.span1,textarea.span1,.uneditable-input.span1{width:28px}}@media(max-width:767px){body{padding-right:20px;padding-left:20px}.navbar-fixed-top,.navbar-fixed-bottom,.navbar-static-top{margin-right:-20px;margin-left:-20px}.container-fluid{padding:0}.dl-horizontal
 dt{float:none;width:auto;clear:none;text-align:left}.dl-horizontal 
dd{margin-left:0}.container{width:aut
 
o}.row-fluid{width:100%}.row,.thumbnails{margin-left:0}.thumbnails>li{float:none;margin-left:0}[class*="span"],.uneditable-input[class*="span"],.row-fluid
 
[class*="span"]{display:block;float:none;width:100%;margin-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.span12,.row-fluid
 
.span12{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid
 
[class*="offset"]:first-child{margin-left:0}.input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.input-prepend
 input,.input-append input,.input-prepend input[class*="span"],.input-append 
input[class*="span"]{display:inline-block;width:auto}.controls-row 
[class*="span"]+[class*="span"]{margin-left:0}.modal{position:fixed;top:20px;right:20px;left:20px;width:auto;margin:0}.m
 
odal.fade{top:-100px}.modal.fade.in{top:20px}}@media(max-width:480px){.nav-collapse{-webkit-transform:translate3d(0,0,0)}.page-header
 h1 
small{display:block;line-height:20px}input[type="checkbox"],input[type="radio"]{border:1px
 solid #ccc}.form-horizontal 
.control-label{float:none;width:auto;padding-top:0;text-align:left}.form-horizontal
 .controls{margin-left:0}.form-horizontal 
.control-list{padding-top:0}.form-horizontal 
.form-actions{padding-right:10px;padding-left:10px}.media .pull-left,.media 
.pull-right{display:block;float:none;margin-bottom:10px}.media-object{margin-right:0;margin-left:0}.modal{top:10px;right:10px;left:10px}.modal-header
 
.close{padding:10px;margin:-10px}.carousel-caption{position:static}}@media(max-width:979px){body{padding-top:0}.navbar-fixed-top,.navbar-fixed-bottom{position:static}.navbar-fixed-top{margin-bottom:20px}.navbar-fixed-bottom{margin-top:20px}.navbar-fixed-top
 .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding:5px}.navbar 
.container{width:a
 uto;padding:0}.navbar .brand{padding-right:10px;padding-left:10px;margin:0 0 0 
-5px}.nav-collapse{clear:both}.nav-collapse .nav{float:none;margin:0 0 
10px}.nav-collapse .nav>li{float:none}.nav-collapse 
.nav>li>a{margin-bottom:2px}.nav-collapse 
.nav>.divider-vertical{display:none}.nav-collapse .nav 
.nav-header{color:#777;text-shadow:none}.nav-collapse .nav>li>a,.nav-collapse 
.dropdown-menu a{padding:9px 
15px;font-weight:bold;color:#777;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.nav-collapse
 .btn{padding:4px 10px 
4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.nav-collapse
 .dropdown-menu li+li a{margin-bottom:2px}.nav-collapse 
.nav>li>a:hover,.nav-collapse .nav>li>a:focus,.nav-collapse .dropdown-menu 
a:hover,.nav-collapse .dropdown-menu 
a:focus{background-color:#f2f2f2}.navbar-inverse .nav-collapse 
.nav>li>a,.navbar-inverse .nav-collapse .dropdown-menu 
a{color:#999}.navbar-inverse .nav-collapse .nav>li>a:hover,.navbar
 -inverse .nav-collapse .nav>li>a:focus,.navbar-inverse .nav-collapse 
.dropdown-menu a:hover,.navbar-inverse .nav-collapse .dropdown-menu 
a:focus{background-color:#111}.nav-collapse.in 
.btn-group{padding:0;margin-top:5px}.nav-collapse 
.dropdown-menu{position:static;top:auto;left:auto;display:none;float:none;max-width:none;padding:0;margin:0
 
15px;background-color:transparent;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.nav-collapse
 .open>.dropdown-menu{display:block}.nav-collapse 
.dropdown-menu:before,.nav-collapse 
.dropdown-menu:after{display:none}.nav-collapse .dropdown-menu 
.divider{display:none}.nav-collapse .nav>li>.dropdown-menu:before,.nav-collapse 
.nav>li>.dropdown-menu:after{display:none}.nav-collapse 
.navbar-form,.nav-collapse .navbar-search{float:none;padding:10px 
15px;margin:10px 0;border-top:1px solid #f2f2f2;border-bottom:1px solid 
#f2f2f2;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,
 255,0.1),0 1px 0 rgba(255,255,255,0.1);-moz-box-shadow:inset 0 1px 0 
rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 
rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}.navbar-inverse 
.nav-collapse .navbar-form,.navbar-inverse .nav-collapse 
.navbar-search{border-top-color:#111;border-bottom-color:#111}.navbar 
.nav-collapse 
.nav.pull-right{float:none;margin-left:0}.nav-collapse,.nav-collapse.collapse{height:0;overflow:hidden}.navbar
 .btn-navbar{display:block}.navbar-static 
.navbar-inner{padding-right:10px;padding-left:10px}}@media(min-width:980px){.nav-collapse.collapse{height:auto!important;overflow:visible!important}}

Added: 
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/resources/css/bootstrap.min.css
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-server/src/site/resources/css/bootstrap.min.css?rev=1772144&view=auto
==============================================================================
--- 
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/resources/css/bootstrap.min.css
 (added)
+++ 
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/resources/css/bootstrap.min.css
 Thu Dec  1 04:22:52 2016
@@ -0,0 +1,9 @@
+/*@import url(//fonts.googleapis.com/css?family=Telex);/*!
+ * Bootstrap v2.3.2
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.

[... 2 lines stripped ...]

Reply via email to