Author: sebawagner
Date: Sat Oct 6 13:34:01 2012
New Revision: 1395048
URL: http://svn.apache.org/viewvc?rev=1395048&view=rev
Log:
OPENMEETINGS-428 room administration: More fields
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css?rev=1395048&r1=1395047&r2=1395048&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
Sat Oct 6 13:34:01 2012
@@ -67,7 +67,7 @@
################################
*/
.adminPanelColumnTable {
-
+ vertical-align: top;
}
table.adminListTable {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java?rev=1395048&r1=1395047&r2=1395048&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java
Sat Oct 6 13:34:01 2012
@@ -28,6 +28,7 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.rooms.Rooms;
import org.apache.openmeetings.persistence.beans.rooms.Rooms_Organisation;
import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.components.admin.AdminBaseForm;
import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
import org.apache.wicket.markup.html.form.CheckBox;
@@ -37,7 +38,9 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.ListMultipleChoice;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.TextArea;
+import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.util.time.Duration;
import edu.emory.mathcs.backport.java.util.Arrays;
@@ -54,8 +57,9 @@ public class RoomForm extends AdminBaseF
public RoomForm(String id, final Rooms room) {
super(id, new CompoundPropertyModel<Rooms>(room));
setOutputMarkupId(true);
-
- add(new RequiredTextField<String>("name"));
+ RequiredTextField<String> name = new
RequiredTextField<String>("name");
+ name.setLabel(new Model<String>(WebSession.getString(193)));
+ add(name);
add(new DropDownChoice<Long>("numberOfPartizipants", //
DROPDOWN_NUMBER_OF_PARTICIPANTS, //
@@ -92,6 +96,28 @@ public class RoomForm extends AdminBaseF
orgChoiceList.setMaxRows(6);
add(orgChoiceList);
+ add(new CheckBox("isDemoRoom"));
+ TextField<Integer> demoTime = new
TextField<Integer>("demoTime");
+ demoTime.setLabel(new Model<String>(WebSession.getString(637)));
+ add(demoTime);
+ add(new CheckBox("allowUserQuestions"));
+ add(new CheckBox("isAudioOnly"));
+ add(new CheckBox("isClosed"));
+ add(new TextField<String>("redirectURL"));
+ add(new CheckBox("waitForRecording"));
+ add(new CheckBox("allowRecording"));
+
+ add(new CheckBox("hideTopBar"));
+ add(new CheckBox("hideChat"));
+ add(new CheckBox("hideActivitiesAndActions"));
+ add(new CheckBox("hideFilesExplorer"));
+ add(new CheckBox("hideActionsMenu"));
+ add(new CheckBox("hideScreenSharing"));
+ add(new CheckBox("hideWhiteboard"));
+ add(new CheckBox("showMicrophoneStatus"));
+ add(new CheckBox("chatModerated"));
+
+
// attach an ajax validation behavior to all form component's
keydown
// event and throttle it down to once per second
AjaxFormValidatingBehavior.addToAllFormComponents(this,
"keydown",
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html?rev=1395048&r1=1395047&r2=1395048&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html
Sat Oct 6 13:34:01 2012
@@ -49,6 +49,8 @@
<td class="adminPanelColumnForm">
<form wicket:id="form"
class="adminForm">
<div wicket:id="buttons"></div>
+
+ <!-- General -->
<fieldset>
<legend><wicket:ommessage key="187" /></legend>
<wicket:ommessage
key="193" /> <input type="text" wicket:id="name" />
@@ -60,9 +62,11 @@
<wicket:ommessage key="196" />
<textarea style="width: 200px; height: 100px;" wicket:id="comment"/>
<br/>
<wicket:ommessage key="620" />
<input type="checkbox" wicket:id="appointment" />
- <br/>
- <wicket:ommessage key="191" />
- <br/>
+ </fieldset>
+
+ <!-- Organisations -->
+ <fieldset>
+
<legend><wicket:ommessage key="191" /></legend>
<wicket:ommessage key="195" />
<input type="checkbox" wicket:id="ispublic" />
<br/>
<wicket:ommessage key="828" />
@@ -70,8 +74,69 @@
<wicket:ommessage key="191" />
<br/>
<wicket:ommessage key="191" />
<select wicket:id="roomOrganisations"/>
+ </fieldset>
+
+ <!-- Limitations -->
+ <fieldset>
+
<legend><wicket:ommessage key="830" /></legend>
+ <wicket:ommessage key="636" />
<input type="checkbox" wicket:id="isDemoRoom" />
+ <br/>
+ <wicket:ommessage key="637"
/><input type="text" wicket:id="demoTime" />
+ </fieldset>
+
+ <!-- Rights -->
+ <fieldset>
+
<legend><wicket:ommessage key="881" /></legend>
+ <wicket:ommessage key="879" />
<input type="checkbox" wicket:id="allowUserQuestions" />
+ <br/>
+ <wicket:ommessage key="880" />
+ <br/>
+ <wicket:ommessage key="1076" />
<input type="checkbox" wicket:id="isAudioOnly" />
+ <br/>
+ <wicket:ommessage key="1077" />
+ <br/>
+ <wicket:ommessage key="1101" />
+ <br/>
+ <wicket:ommessage key="1076" />
<input type="checkbox" wicket:id="isClosed" />
+ <br/>
+ <wicket:ommessage key="1100"
/><input type="text" wicket:id="redirectURL" />
+ <br/>
+ <wicket:ommessage
key="1102" />
+ <br/>
+ <wicket:ommessage key="1076" />
<input type="checkbox" wicket:id="waitForRecording" />
+ <br/>
+ <wicket:ommessage key="1076" />
<input type="checkbox" wicket:id="allowRecording" />
+ <br/>
+ </fieldset>
+
+ <!-- Room Layout options -->
+ <fieldset>
+
<legend><wicket:ommessage key="1443" /></legend>
+ <wicket:ommessage
key="1357" /> <input type="checkbox" wicket:id="hideTopBar" />
+ <br/>
+ <wicket:ommessage key="1436" />
<input type="checkbox" wicket:id="hideChat" />
+ <br/>
+ <wicket:ommessage key="1437" />
<input type="checkbox" wicket:id="hideActivitiesAndActions" />
+ <br/>
+ <wicket:ommessage key="1438" />
<input type="checkbox" wicket:id="hideFilesExplorer" />
+ <br/>
+ <wicket:ommessage key="1439" />
<input type="checkbox" wicket:id="hideActionsMenu" />
+ <br/>
+ <wicket:ommessage key="1440" />
<input type="checkbox" wicket:id="hideScreenSharing" />
+ <br/>
+ <wicket:ommessage key="1441" />
<input type="checkbox" wicket:id="hideWhiteboard" />
+ <br/>
+ <wicket:ommessage key="1442" />
<input type="checkbox" wicket:id="showMicrophoneStatus" />
+ <br/>
+ <wicket:ommessage key="1513" />
<input type="checkbox" wicket:id="chatModerated" />
+ <br/>
+ <!--
+ <wicket:ommessage key="587" />
<select wicket:id="moderators"/>
<br/>
+ -->
+
</fieldset>
+
</form>
</td>
</tr>
