This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push: new 5f79a5e [OPENMEETINGS-2186] documentation is updated 5f79a5e is described below commit 5f79a5e216e4cfb66baea00eb9cd6e7b196af8cc Author: Maxim Solodovnik <solomax...@gmail.com> AuthorDate: Wed Mar 25 20:05:23 2020 +0700 [OPENMEETINGS-2186] documentation is updated --- .../src/site/resources/images/cluster2.png | Bin 30889 -> 32980 bytes openmeetings-server/src/site/xdoc/Clustering.xml | 5 ++--- .../web/room/GroupCustomCssResourceReference.java | 2 +- .../web/user/profile/InvitationsPanel.html | 25 ++++++++++++++++----- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/openmeetings-server/src/site/resources/images/cluster2.png b/openmeetings-server/src/site/resources/images/cluster2.png index a7391be..f25046d 100644 Binary files a/openmeetings-server/src/site/resources/images/cluster2.png and b/openmeetings-server/src/site/resources/images/cluster2.png differ diff --git a/openmeetings-server/src/site/xdoc/Clustering.xml b/openmeetings-server/src/site/xdoc/Clustering.xml index 71619d4..604fdb4 100644 --- a/openmeetings-server/src/site/xdoc/Clustering.xml +++ b/openmeetings-server/src/site/xdoc/Clustering.xml @@ -163,10 +163,9 @@ </li> <li>Do the same with only two users but go to _different_ rooms. The calculation should send both users to different servers, cause based on the calculation two different rooms on a cluster - with two nodes should go exactly one room for each node. You can now loggin really to node1 + with two nodes should go exactly one room for each node. You can now login really to node1 and node2 of your cluster while those users are loggedin and go to <tt>Administration > Connections</tt> - and check in the column "Server Name" where they are located. They should be on different server.<br/> - Additionally client details, available on click, should show different servers <tt>tcUrl</tt> for clients with "Stream ID" + and check in the column "Server Name" where they are located. They should be on different server. </li> </ul> <img src="images/cluster2.png" alt="" width="650" height="369" /> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/GroupCustomCssResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/GroupCustomCssResourceReference.java index 05b883f..ddde86d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/GroupCustomCssResourceReference.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/GroupCustomCssResourceReference.java @@ -70,7 +70,7 @@ public class GroupCustomCssResourceReference extends FileSystemResourceReference rr.setFileName(file.getName()); return rr; } else { - log.debug("Custom CSS was not found was found"); + log.debug("Custom CSS was not found"); return null; } } diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationsPanel.html index 8bedb46..6ee324f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationsPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationsPanel.html @@ -52,11 +52,26 @@ <fieldset> <legend><wicket:message key="profile.invitation" /></legend> <div class="formelement"> - <label><wicket:message key="188" /></label><span class="input" wicket:id="id"></span> - <label><wicket:message key="526" /></label><span class="input" wicket:id="valid"></span> - <label><wicket:message key="216" /></label><span class="input" wicket:id="invitee"></span> - <label><wicket:message key="530" /></label><span class="input" wicket:id="validFrom"></span> - <label><wicket:message key="531" /></label><span class="input" wicket:id="validTo"></span> + <div class="row no-gutters"> + <label class="col-6"><wicket:message key="188" /></label> + <span class="input col-6" wicket:id="id"></span> + </div> + <div class="row no-gutters"> + <label class="col-6"><wicket:message key="526" /></label> + <span class="input col-6" wicket:id="valid"></span> + </div> + <div class="row no-gutters"> + <label class="col-6"><wicket:message key="216" /></label> + <span class="input col-6" wicket:id="invitee"></span> + </div> + <div class="row no-gutters"> + <label class="col-6"><wicket:message key="530" /></label> + <span class="input col-6" wicket:id="validFrom"></span> + </div> + <div class="row no-gutters"> + <label class="col-6"><wicket:message key="531" /></label> + <span class="input col-6" wicket:id="validTo"></span> + </div> </div> </fieldset> </div>