You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/04/20 10:59:09 UTC
svn commit: r1740070 [2/2] - in /openmeetings/application:
branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/
branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/
branches/3.2.x/open...
Modified: openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ConferenceRoomLayoutOptions.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ConferenceRoomLayoutOptions.xml?rev=1740070&r1=1740069&r2=1740070&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ConferenceRoomLayoutOptions.xml (original)
+++ openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ConferenceRoomLayoutOptions.xml Wed Apr 20 08:59:09 2016
@@ -15,79 +15,75 @@
<document xmlns="http://maven.apache.org/XDOC/2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
-
- <properties>
- <title>Layout options for a conference room in OpenMeetings</title>
+ <properties>
+ <title>Layout options for a conference room in OpenMeetings</title>
<author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
- </properties>
-
- <body>
-
- <section name="Layout options for conference rooms">
-
- <p>Each room has a number of attributes to generate different layouts.
- You can change those values individually for each room in Administration > Rooms
- </p>
- <p></p>
- <table>
- <tr>
- <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> key </th>
- <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> default </th>
- <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> meaning </th>
- <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> availabe since OpenMeetings version </th>
- </tr>
- <tr>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideTopBar </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the top bar with the menus and exit button </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
- </tr>
- <tr>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideChat </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the chat tab and use space for whiteboard </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
- </tr>
- <tr>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideActivitiesAndActions </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the activities window with the notofications aber user activities</td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
- </tr>
- <tr>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideFilesExplorer </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the file explorer</td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
- </tr>
- <tr>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideActionsMenu </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the menu with the actions</td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
- </tr>
- <tr>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideScreenSharing </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the button to start screensharing/recording</td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
- </tr>
- <tr>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideWhiteboard </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the whiteboard, if this option is true, the videos will be in the area of the whiteboard</td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
- </tr>
- <tr>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> showMicrophoneStatus </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Show the current status of the microphone (off/on) on the bottom of each video view</td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
- </tr>
- </table>
-
- </section>
-
- </body>
-
-</document>
\ No newline at end of file
+ </properties>
+ <body>
+ <section name="Layout options for conference rooms">
+ <p>
+ Each room has "Hidden room elements" section.
+ You can choose which elements for each room will be hidden in Administration > Rooms<br/>
+ <br/>
+ Please NOTE this elements were checkboxes before 3.2.0.
+ </p>
+ <p></p>
+ <table>
+ <tr>
+ <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Element </th>
+ <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> default </th>
+ <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> meaning </th>
+ <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> available since OpenMeetings version </th>
+ </tr>
+ <tr>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> TopBar </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> displayed </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Top bar with the menus and exit button </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
+ </tr>
+ <tr>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Chat </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> displayed </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Chat tab in the room</td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
+ </tr>
+ <tr>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Activities </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> displayed </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Activities window with the notifications about user activities</td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
+ </tr>
+ <tr>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Files </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> displayed </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Room file explorer</td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
+ </tr>
+ <tr>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> ActionMenu </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> displayed </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Menu with the actions</td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
+ </tr>
+ <tr>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> ScreenSharing </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> displayed </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> The button and menu item to start screen-sharing/recording</td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
+ </tr>
+ <tr>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Whiteboard </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> displayed </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Whiteboard room element, if this element is hidden, the videos will be in the area of the whiteboard</td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
+ </tr>
+ <tr>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> MicrophoneStatus </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hidden </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Current status of the microphone (off/on) on the bottom of each video view</td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
+ </tr>
+ </table>
+ </section>
+ </body>
+</document>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html?rev=1740070&r1=1740069&r2=1740070&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html Wed Apr 20 08:59:09 2016
@@ -37,7 +37,9 @@
</div>
<div wicket:id="tree-container" class="trees">
<div id="tree-anchor" style="height: 2px; width: 2px;"></div>
- <div wicket:id="tree"></div>
+ <div wicket:id="tree">
+ <div wicket:id="item"></div>
+ </div>
</div>
<div class="sizes" wicket:id="sizes">
<table>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java?rev=1740070&r1=1740069&r2=1740070&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java Wed Apr 20 08:59:09 2016
@@ -21,6 +21,7 @@ package org.apache.openmeetings.web.comm
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
+import java.util.ArrayList;
import java.util.Date;
import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
@@ -36,11 +37,13 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.AjaxSelfUpdatingTimerBehavior;
+import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
@@ -59,7 +62,19 @@ public abstract class FileTreePanel exte
protected final IModel<String> publicSize = Model.of((String)null);
final ConvertingErrorsDialog errorsDialog = new ConvertingErrorsDialog("errors", Model.of((Recording)null));
protected FileItemTree<? extends FileItem> selected;
- protected RepeatingView treesView = new RepeatingView("tree");
+ protected ListView<ITreeProvider<? extends FileItem>> treesView = new ListView<ITreeProvider<? extends FileItem>>("tree", new ArrayList<ITreeProvider<? extends FileItem>>()) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void populateItem(ListItem<ITreeProvider<? extends FileItem>> item) {
+ @SuppressWarnings({ "unchecked", "rawtypes" }) //TODO investigate this
+ FileItemTree<? extends FileItem> fit = new FileItemTree("item", FileTreePanel.this, item.getModelObject());
+ if (selected == null) {
+ selected = fit;
+ }
+ item.add(fit);
+ }
+ };
public FileTreePanel(String id) {
super(id);
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java?rev=1740070&r1=1740069&r2=1740070&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java Wed Apr 20 08:59:09 2016
@@ -35,7 +35,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.Group;
import org.apache.openmeetings.db.entity.user.GroupUser;
import org.apache.openmeetings.web.app.Application;
-import org.apache.openmeetings.web.common.tree.FileItemTree;
import org.apache.openmeetings.web.common.tree.FileTreePanel;
import org.apache.openmeetings.web.common.tree.MyRecordingTreeProvider;
import org.apache.openmeetings.web.common.tree.PublicRecordingTreeProvider;
@@ -88,13 +87,13 @@ public class RoomFilePanel extends FileT
FileExplorerItem f = new FileExplorerItem();
f.setOwnerId(getUserId());
selectedFile.setObject(f);
- treesView.add(selected = new FileItemTree<FileExplorerItem>(treesView.newChildId(), this, new FilesTreeProvider(null)));
- treesView.add(new FileItemTree<FileExplorerItem>(treesView.newChildId(), this, new FilesTreeProvider(room.getRoom().getId())));
- treesView.add(new FileItemTree<Recording>(treesView.newChildId(), this, new MyRecordingTreeProvider()));
- treesView.add(new FileItemTree<Recording>(treesView.newChildId(), this, new PublicRecordingTreeProvider(null, null)));
+ treesView.getList().add(new FilesTreeProvider(null));
+ treesView.getList().add(new FilesTreeProvider(room.getRoom().getId()));
+ treesView.getList().add(new MyRecordingTreeProvider());
+ treesView.getList().add(new PublicRecordingTreeProvider(null, null));
for (GroupUser ou : getBean(UserDao.class).get(getUserId()).getGroupUsers()) {
Group o = ou.getGroup();
- treesView.add(new FileItemTree<Recording>(treesView.newChildId(), this, new PublicRecordingTreeProvider(o.getId(), o.getName())));
+ treesView.getList().add(new PublicRecordingTreeProvider(o.getId(), o.getName()));
}
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java?rev=1740070&r1=1740069&r2=1740070&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java Wed Apr 20 08:59:09 2016
@@ -30,7 +30,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.Group;
import org.apache.openmeetings.db.entity.user.GroupUser;
import org.apache.openmeetings.web.common.UserPanel;
-import org.apache.openmeetings.web.common.tree.FileItemTree;
import org.apache.openmeetings.web.common.tree.FileTreePanel;
import org.apache.openmeetings.web.common.tree.MyRecordingTreeProvider;
import org.apache.openmeetings.web.common.tree.PublicRecordingTreeProvider;
@@ -49,11 +48,11 @@ public class RecordingsPanel extends Use
@Override
public void defineTrees() {
selectedFile.setObject(new Recording());
- treesView.add(selected = new FileItemTree<Recording>(treesView.newChildId(), this, new MyRecordingTreeProvider()));
- treesView.add(new FileItemTree<Recording>(treesView.newChildId(), this, new PublicRecordingTreeProvider(null, null)));
+ treesView.getList().add(new MyRecordingTreeProvider());
+ treesView.getList().add(new PublicRecordingTreeProvider(null, null));
for (GroupUser ou : getBean(UserDao.class).get(getUserId()).getGroupUsers()) {
Group o = ou.getGroup();
- treesView.add(new FileItemTree<Recording>(treesView.newChildId(), this, new PublicRecordingTreeProvider(o.getId(), o.getName())));
+ treesView.getList().add(new PublicRecordingTreeProvider(o.getId(), o.getName()));
}
}