Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml Sun May 22 17:25:53 2016 @@ -1924,4 +1924,6 @@ <entry key="install.room.restricted.micro">РаÑÑиÑÐµÐ½Ð½Ð°Ñ ÐºÐ¾Ð¼Ð½Ð°Ñа Ñо ÑÑаÑÑÑом микÑоÑона</entry> <entry key="install.room.conference.micro">ÐомнаÑа Ð´Ð»Ñ ÐºÐ¾Ð½ÑеÑенÑий Ñо ÑÑаÑÑÑом микÑоÑона</entry> <entry key="install.room.private.conference">ÐакÑÑÑÐ°Ñ ÐºÐ¾Ð¼Ð½Ð°Ñа Ð´Ð»Ñ ÐºÐ¾Ð½ÑеÑенÑий</entry> + <entry key="appointment.tab.general">ÐбÑие</entry> + <entry key="appointment.tab.advanced">ÐополниÑелÑнÑе</entry> </properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml Sun May 22 17:25:53 2016 @@ -1888,4 +1888,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html Sun May 22 17:25:53 2016 @@ -22,68 +22,95 @@ <wicket:panel> <form wicket:id="appForm" class="appointmentPopUp"> <span wicket:id="feedback"></span> - <table> - <tr> - <td><wicket:message key="572" /></td> - <td><input type="text" wicket:id="title" /></td> - </tr> - <tr> - <td><wicket:message key="570" /></td> - <td><span class="date time picker" wicket:id="start"></span></td> - </tr> - <tr> - <td><wicket:message key="571" /></td> - <td><span class="date time picker" wicket:id="end"></span></td> - </tr> - <tr> - <td><wicket:message key="565" /></td> - <td><select wicket:id="reminder" ></select></td> - </tr> - <tr> - <td colspan="2"><input type="checkbox" wicket:id="createRoom" /><label wicket:for="createRoom"><wicket:message key="1509" /></label></td> - </tr> - <tr> - <td><wicket:message key="619" /></td> - <td><select wicket:id="room.type" ></select></td> - </tr> - <tr> - <td><wicket:message key="406" /></td> - <td><select wicket:id="room" ></select></td> - </tr> - <tr wicket:id="sip-container"> - <td><wicket:message key="1003"/></td> - <td><span wicket:id="room.confno"></span></td> - </tr> - <tr> - <td colspan="2"><input type="checkbox" wicket:id="passwordProtected" /><label wicket:for="passwordProtected"><wicket:message key="524" /></label></td> - </tr> - <tr> - <td><wicket:message key="525" /></td> - <td><input type="password" wicket:id="password" /></td> - </tr> - <tr> - <td colspan="2" style="font-size: smaller;"><wicket:message key="1445" /></td> - </tr> - <tr> - <td><wicket:message key="1156" /></td> - <td><span wicket:id="aowner"></span></td> - </tr> - <tr> - <td><wicket:message key="803" /></td> - <td wicket:message="title:1588" class="om-select2"><select class="appointment attendees input" wicket:id="attendees"></select></td> - </tr> - <tr> - <td><wicket:message key="569" /></td> - <td><input type="text" wicket:id="location" /></td> - </tr> - <tr> - <td><wicket:message key="573" /></td> - <td> - <div wicket:id="toolbarContainer"></div> - <div wicket:id="description"></div> - </td> - </tr> - </table> + <div id="tabs"> + <ul> + <li><a href="#tab1"><wicket:message key="appointment.tab.general"/></a></li> + <li><a href="#tab2"><wicket:message key="436"/></a></li> + <li><a href="#tab3"><wicket:message key="appointment.tab.advanced"/></a></li> + </ul> + <div id="tab1"> + <table> + <tr> + <td><wicket:message key="572" /></td> + <td><input type="text" wicket:id="title" /></td> + </tr> + <tr> + <td><wicket:message key="570" /></td> + <td><span class="date time picker" wicket:id="start"></span></td> + </tr> + <tr> + <td><wicket:message key="571" /></td> + <td><span class="date time picker" wicket:id="end"></span></td> + </tr> + <tr wicket:id="owner-row"> + <td><wicket:message key="1156" /></td> + <td><span wicket:id="aowner"></span></td> + </tr> + <tr> + <td><wicket:message key="803" /></td> + <td wicket:message="title:1588" class="om-select2"><select class="appointment attendees input" wicket:id="attendees"></select></td> + </tr> + <tr> + <td><wicket:message key="569" /></td> + <td><input type="text" wicket:id="location" /></td> + </tr> + <tr> + <td><wicket:message key="573" /></td> + <td> + <div wicket:id="toolbarContainer"></div> + <div wicket:id="description"></div> + </td> + </tr> + </table> + </div> + <div id="tab2"> + <table> + <tbody> + <tr> + <td colspan="2"><input type="checkbox" wicket:id="createRoom" /><label wicket:for="createRoom"><wicket:message key="1509" /></label></td> + </tr> + </tbody> + <tbody wicket:id="create-room-block"> + <tr> + <td><wicket:message key="619" /></td> + <td><select wicket:id="room.type" ></select></td> + </tr> + <tr> + <td><label wicket:for="room.moderated"><wicket:message key="640" /></label></td> + <td><input type="checkbox" wicket:id="room.moderated" /></td> + </tr> + </tbody> + <tbody> + <tr> + <td><wicket:message key="436" /></td> + <td><select wicket:id="room" ></select></td> + </tr> + <tr wicket:id="sip-container"> + <td><wicket:message key="1003"/></td> + <td><span wicket:id="room.confno"></span></td> + </tr> + </tbody> + </table> + </div> + <div id="tab3"> + <table> + <tr> + <td><wicket:message key="565" /></td> + <td><select wicket:id="reminder" ></select></td> + </tr> + <tr> + <td colspan="2"><input type="checkbox" wicket:id="passwordProtected" /><label wicket:for="passwordProtected"><wicket:message key="524" /></label></td> + </tr> + <tr> + <td><wicket:message key="525" /></td> + <td><input type="password" wicket:id="password" /></td> + </tr> + <tr> + <td colspan="2" style="font-size: smaller;"><wicket:message key="1445" /></td> + </tr> + </table> + </div> + </div> </form> <div wicket:id="confirmDelete"></div> </wicket:panel> Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Sun May 22 17:25:53 2016 @@ -54,6 +54,7 @@ import org.apache.wicket.ajax.markup.htm import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.markup.html.form.CheckBox; import org.apache.wicket.markup.html.form.ChoiceRenderer; import org.apache.wicket.markup.html.form.DropDownChoice; import org.apache.wicket.markup.html.form.Form; @@ -70,7 +71,9 @@ import org.red5.logging.Red5LoggerFactor import org.slf4j.Logger; import org.threeten.bp.LocalDateTime; +import com.googlecode.wicket.jquery.core.JQueryBehavior; import com.googlecode.wicket.jquery.core.Options; +import com.googlecode.wicket.jquery.ui.JQueryUIBehavior; import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.WysiwygEditor; import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.toolbar.DefaultWysiwygToolbar; import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractDialog; @@ -102,6 +105,12 @@ public class AppointmentDialog extends A return 650; } + @Override + public void onConfigure(JQueryBehavior behavior) { + super.onConfigure(behavior); + behavior.setOption("dialogClass", Options.asString("appointment")); + } + public void setModelObjectWithAjaxTarget(Appointment a, AjaxRequestTarget target) { form.setModelObject(a); form.start.setModelObject(getDateTime(a.getStart())); @@ -159,12 +168,12 @@ public class AppointmentDialog extends A @Override public Form<?> getForm() { - return this.form; + return form; } @Override protected void onOpen(IPartialPageRequestHandler handler) { - handler.add(this.form); + handler.add(form.add(new JQueryUIBehavior("#tabs", "tabs"))); } @Override @@ -240,6 +249,8 @@ public class AppointmentDialog extends A private final DateTimePicker end = new OmDateTimePicker("end", Model.of(LocalDateTime.now())); private final PasswordTextField pwd = new PasswordTextField("password"); private final Label owner = new Label("aowner", Model.of("")); + private final WebMarkupContainer ownerPanel = new WebMarkupContainer("owner-row"); + private final WebMarkupContainer createRoomBlock = new WebMarkupContainer("create-room-block"); private final DropDownChoice<Room.Type> roomType = new RoomTypeDropDown("room.type"); private final DropDownChoice<Room> room = new DropDownChoice<Room>( "room" @@ -283,9 +294,8 @@ public class AppointmentDialog extends A } } pwd.setEnabled(a.isPasswordProtected()); - owner.setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true); owner.setDefaultModel(Model.of(FormatHelper.formatUser(a.getOwner()))); - owner.setVisible(!isOwner(a)); + ownerPanel.setVisible(!isOwner(a)); } public AppointmentForm(String id, CompoundPropertyModel<Appointment> model) { @@ -293,17 +303,33 @@ public class AppointmentDialog extends A setOutputMarkupId(true); add(feedback.setOutputMarkupId(true)); + //General add(new RequiredTextField<String>("title").setLabel(Model.of(Application.getString(572)))); + add(start); + add(end); + add(ownerPanel.add(owner)); + add(new UserMultiChoice("attendees", attendeesModel)); + add(new TextField<String>("location")); DefaultWysiwygToolbar toolbar = new DefaultWysiwygToolbar("toolbarContainer"); add(toolbar); add(new WysiwygEditor("description", toolbar)); - add(new TextField<String>("location")); - add(start); - add(end); - pwd.setEnabled(getModelObject().isPasswordProtected()); - pwd.setOutputMarkupId(true); - add(pwd); + //room + add(new AjaxCheckBox("createRoom", new PropertyModel<Boolean>(this, "createRoom")) { + private static final long serialVersionUID = 1L; + + @Override + protected void onUpdate(AjaxRequestTarget target) { + createRoom = getConvertedInput(); + target.add(createRoomBlock.setEnabled(createRoom), room.setEnabled(!createRoom)); + } + }); + add(createRoomBlock.add(roomType, new CheckBox("room.moderated")).setEnabled(createRoom).setOutputMarkupId(true)); + add(room.setRequired(true).setLabel(Model.of(Application.getString(406))).setEnabled(!createRoom).setOutputMarkupId(true)); + add(sipContainer.setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true)); + sipContainer.add(new Label("room.confno", "")).setVisible(false); + + //Advanced add(new DropDownChoice<Reminder>( "reminder" , Arrays.asList(Reminder.values()) @@ -330,21 +356,6 @@ public class AppointmentDialog extends A return null; } })); - - add(roomType.setEnabled(createRoom).setOutputMarkupId(true)); - - add(room.setRequired(true).setLabel(Model.of(Application.getString(406))).setEnabled(!createRoom).setOutputMarkupId(true)); - add(new AjaxCheckBox("createRoom", new PropertyModel<Boolean>(this, "createRoom")) { - private static final long serialVersionUID = 1L; - - @Override - protected void onUpdate(AjaxRequestTarget target) { - createRoom = getConvertedInput(); - target.add(roomType.setEnabled(createRoom), room.setEnabled(!createRoom)); - } - }); - add(sipContainer.setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true)); - sipContainer.add(new Label("room.confno", "")).setVisible(false); add(new AjaxCheckBox("passwordProtected") { private static final long serialVersionUID = 1L; @@ -355,9 +366,9 @@ public class AppointmentDialog extends A target.add(pwd); } }); - add(new UserMultiChoice("attendees", attendeesModel)); - - add(owner); + pwd.setEnabled(getModelObject().isPasswordProtected()); + pwd.setOutputMarkupId(true); + add(pwd); } private List<Room> getRoomList() { Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/calendar.css URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/calendar.css?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/calendar.css (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/calendar.css Sun May 22 17:25:53 2016 @@ -52,3 +52,7 @@ overflow-x: scroll; float: left; } + +.appointment.ui-dialog .ui-dialog-content { + padding: 0; +} Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/AbstractWebServiceTest.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/AbstractWebServiceTest.java?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/AbstractWebServiceTest.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/AbstractWebServiceTest.java Sun May 22 17:25:53 2016 @@ -48,7 +48,7 @@ public class AbstractWebServiceTest exte public static ServiceResult login() { ServiceResult sr = getClient(USER_SERVICE_URL).path("/login").query("user", username).query("pass", userpass) .get(ServiceResult.class); - assertEquals("Login should be successful", sr.getType(), Type.SUCCESS.name()); + assertEquals("Login should be successful", Type.SUCCESS.name(), sr.getType()); return sr; } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml Sun May 22 17:25:53 2016 @@ -1928,4 +1928,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml Sun May 22 17:25:53 2016 @@ -1912,4 +1912,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml Sun May 22 17:25:53 2016 @@ -1884,4 +1884,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml Sun May 22 17:25:53 2016 @@ -1906,4 +1906,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml Sun May 22 17:25:53 2016 @@ -1920,4 +1920,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml Sun May 22 17:25:53 2016 @@ -1924,4 +1924,6 @@ <entry key="install.room.restricted.micro">РаÑÑиÑÐµÐ½Ð½Ð°Ñ ÐºÐ¾Ð¼Ð½Ð°Ñа Ñо ÑÑаÑÑÑом микÑоÑона</entry> <entry key="install.room.conference.micro">ÐомнаÑа Ð´Ð»Ñ ÐºÐ¾Ð½ÑеÑенÑий Ñо ÑÑаÑÑÑом микÑоÑона</entry> <entry key="install.room.private.conference">ÐакÑÑÑÐ°Ñ ÐºÐ¾Ð¼Ð½Ð°Ñа Ð´Ð»Ñ ÐºÐ¾Ð½ÑеÑенÑий</entry> + <entry key="appointment.tab.general">ÐбÑие</entry> + <entry key="appointment.tab.advanced">ÐополниÑелÑнÑе</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml Sun May 22 17:25:53 2016 @@ -1888,4 +1888,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml Sun May 22 17:25:53 2016 @@ -1918,4 +1918,6 @@ <entry key="install.room.restricted.micro">Restricted room with micro option set</entry> <entry key="install.room.conference.micro">Conference room with micro option set</entry> <entry key="install.room.private.conference">Private Conference Room</entry> + <entry key="appointment.tab.general">General</entry> + <entry key="appointment.tab.advanced">Advanced</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html Sun May 22 17:25:53 2016 @@ -22,68 +22,95 @@ <wicket:panel> <form wicket:id="appForm" class="appointmentPopUp"> <span wicket:id="feedback"></span> - <table> - <tr> - <td><wicket:message key="572" /></td> - <td><input type="text" wicket:id="title" /></td> - </tr> - <tr> - <td><wicket:message key="570" /></td> - <td><span class="date time picker" wicket:id="start"></span></td> - </tr> - <tr> - <td><wicket:message key="571" /></td> - <td><span class="date time picker" wicket:id="end"></span></td> - </tr> - <tr> - <td><wicket:message key="565" /></td> - <td><select wicket:id="reminder" ></select></td> - </tr> - <tr> - <td colspan="2"><input type="checkbox" wicket:id="createRoom" /><label wicket:for="createRoom"><wicket:message key="1509" /></label></td> - </tr> - <tr> - <td><wicket:message key="619" /></td> - <td><select wicket:id="room.type" ></select></td> - </tr> - <tr> - <td><wicket:message key="406" /></td> - <td><select wicket:id="room" ></select></td> - </tr> - <tr wicket:id="sip-container"> - <td><wicket:message key="1003"/></td> - <td><span wicket:id="room.confno"></span></td> - </tr> - <tr> - <td colspan="2"><input type="checkbox" wicket:id="passwordProtected" /><label wicket:for="passwordProtected"><wicket:message key="524" /></label></td> - </tr> - <tr> - <td><wicket:message key="525" /></td> - <td><input type="password" wicket:id="password" /></td> - </tr> - <tr> - <td colspan="2" style="font-size: smaller;"><wicket:message key="1445" /></td> - </tr> - <tr> - <td><wicket:message key="1156" /></td> - <td><span wicket:id="aowner"></span></td> - </tr> - <tr> - <td><wicket:message key="803" /></td> - <td wicket:message="title:1588" class="om-select2"><select class="appointment attendees input" wicket:id="attendees"></select></td> - </tr> - <tr> - <td><wicket:message key="569" /></td> - <td><input type="text" wicket:id="location" /></td> - </tr> - <tr> - <td><wicket:message key="573" /></td> - <td> - <div wicket:id="toolbarContainer"></div> - <div wicket:id="description"></div> - </td> - </tr> - </table> + <div id="tabs"> + <ul> + <li><a href="#tab1"><wicket:message key="appointment.tab.general"/></a></li> + <li><a href="#tab2"><wicket:message key="436"/></a></li> + <li><a href="#tab3"><wicket:message key="appointment.tab.advanced"/></a></li> + </ul> + <div id="tab1"> + <table> + <tr> + <td><wicket:message key="572" /></td> + <td><input type="text" wicket:id="title" /></td> + </tr> + <tr> + <td><wicket:message key="570" /></td> + <td><span class="date time picker" wicket:id="start"></span></td> + </tr> + <tr> + <td><wicket:message key="571" /></td> + <td><span class="date time picker" wicket:id="end"></span></td> + </tr> + <tr wicket:id="owner-row"> + <td><wicket:message key="1156" /></td> + <td><span wicket:id="aowner"></span></td> + </tr> + <tr> + <td><wicket:message key="803" /></td> + <td wicket:message="title:1588" class="om-select2"><select class="appointment attendees input" wicket:id="attendees"></select></td> + </tr> + <tr> + <td><wicket:message key="569" /></td> + <td><input type="text" wicket:id="location" /></td> + </tr> + <tr> + <td><wicket:message key="573" /></td> + <td> + <div wicket:id="toolbarContainer"></div> + <div wicket:id="description"></div> + </td> + </tr> + </table> + </div> + <div id="tab2"> + <table> + <tbody> + <tr> + <td colspan="2"><input type="checkbox" wicket:id="createRoom" /><label wicket:for="createRoom"><wicket:message key="1509" /></label></td> + </tr> + </tbody> + <tbody wicket:id="create-room-block"> + <tr> + <td><wicket:message key="619" /></td> + <td><select wicket:id="room.type" ></select></td> + </tr> + <tr> + <td><label wicket:for="room.moderated"><wicket:message key="640" /></label></td> + <td><input type="checkbox" wicket:id="room.moderated" /></td> + </tr> + </tbody> + <tbody> + <tr> + <td><wicket:message key="436" /></td> + <td><select wicket:id="room" ></select></td> + </tr> + <tr wicket:id="sip-container"> + <td><wicket:message key="1003"/></td> + <td><span wicket:id="room.confno"></span></td> + </tr> + </tbody> + </table> + </div> + <div id="tab3"> + <table> + <tr> + <td><wicket:message key="565" /></td> + <td><select wicket:id="reminder" ></select></td> + </tr> + <tr> + <td colspan="2"><input type="checkbox" wicket:id="passwordProtected" /><label wicket:for="passwordProtected"><wicket:message key="524" /></label></td> + </tr> + <tr> + <td><wicket:message key="525" /></td> + <td><input type="password" wicket:id="password" /></td> + </tr> + <tr> + <td colspan="2" style="font-size: smaller;"><wicket:message key="1445" /></td> + </tr> + </table> + </div> + </div> </form> <div wicket:id="confirmDelete"></div> </wicket:panel> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Sun May 22 17:25:53 2016 @@ -54,6 +54,7 @@ import org.apache.wicket.ajax.markup.htm import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.markup.html.form.CheckBox; import org.apache.wicket.markup.html.form.ChoiceRenderer; import org.apache.wicket.markup.html.form.DropDownChoice; import org.apache.wicket.markup.html.form.Form; @@ -70,7 +71,9 @@ import org.red5.logging.Red5LoggerFactor import org.slf4j.Logger; import org.threeten.bp.LocalDateTime; +import com.googlecode.wicket.jquery.core.JQueryBehavior; import com.googlecode.wicket.jquery.core.Options; +import com.googlecode.wicket.jquery.ui.JQueryUIBehavior; import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.WysiwygEditor; import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.toolbar.DefaultWysiwygToolbar; import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractDialog; @@ -102,6 +105,12 @@ public class AppointmentDialog extends A return 650; } + @Override + public void onConfigure(JQueryBehavior behavior) { + super.onConfigure(behavior); + behavior.setOption("dialogClass", Options.asString("appointment")); + } + public void setModelObjectWithAjaxTarget(Appointment a, AjaxRequestTarget target) { form.setModelObject(a); form.start.setModelObject(getDateTime(a.getStart())); @@ -159,12 +168,12 @@ public class AppointmentDialog extends A @Override public Form<?> getForm() { - return this.form; + return form; } @Override protected void onOpen(IPartialPageRequestHandler handler) { - handler.add(this.form); + handler.add(form.add(new JQueryUIBehavior("#tabs", "tabs"))); } @Override @@ -240,6 +249,8 @@ public class AppointmentDialog extends A private final DateTimePicker end = new OmDateTimePicker("end", Model.of(LocalDateTime.now())); private final PasswordTextField pwd = new PasswordTextField("password"); private final Label owner = new Label("aowner", Model.of("")); + private final WebMarkupContainer ownerPanel = new WebMarkupContainer("owner-row"); + private final WebMarkupContainer createRoomBlock = new WebMarkupContainer("create-room-block"); private final DropDownChoice<Room.Type> roomType = new RoomTypeDropDown("room.type"); private final DropDownChoice<Room> room = new DropDownChoice<Room>( "room" @@ -283,9 +294,8 @@ public class AppointmentDialog extends A } } pwd.setEnabled(a.isPasswordProtected()); - owner.setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true); owner.setDefaultModel(Model.of(FormatHelper.formatUser(a.getOwner()))); - owner.setVisible(!isOwner(a)); + ownerPanel.setVisible(!isOwner(a)); } public AppointmentForm(String id, CompoundPropertyModel<Appointment> model) { @@ -293,17 +303,33 @@ public class AppointmentDialog extends A setOutputMarkupId(true); add(feedback.setOutputMarkupId(true)); + //General add(new RequiredTextField<String>("title").setLabel(Model.of(Application.getString(572)))); + add(start); + add(end); + add(ownerPanel.add(owner)); + add(new UserMultiChoice("attendees", attendeesModel)); + add(new TextField<String>("location")); DefaultWysiwygToolbar toolbar = new DefaultWysiwygToolbar("toolbarContainer"); add(toolbar); add(new WysiwygEditor("description", toolbar)); - add(new TextField<String>("location")); - add(start); - add(end); - pwd.setEnabled(getModelObject().isPasswordProtected()); - pwd.setOutputMarkupId(true); - add(pwd); + //room + add(new AjaxCheckBox("createRoom", new PropertyModel<Boolean>(this, "createRoom")) { + private static final long serialVersionUID = 1L; + + @Override + protected void onUpdate(AjaxRequestTarget target) { + createRoom = getConvertedInput(); + target.add(createRoomBlock.setEnabled(createRoom), room.setEnabled(!createRoom)); + } + }); + add(createRoomBlock.add(roomType, new CheckBox("room.moderated")).setEnabled(createRoom).setOutputMarkupId(true)); + add(room.setRequired(true).setLabel(Model.of(Application.getString(406))).setEnabled(!createRoom).setOutputMarkupId(true)); + add(sipContainer.setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true)); + sipContainer.add(new Label("room.confno", "")).setVisible(false); + + //Advanced add(new DropDownChoice<Reminder>( "reminder" , Arrays.asList(Reminder.values()) @@ -330,21 +356,6 @@ public class AppointmentDialog extends A return null; } })); - - add(roomType.setEnabled(createRoom).setOutputMarkupId(true)); - - add(room.setRequired(true).setLabel(Model.of(Application.getString(406))).setEnabled(!createRoom).setOutputMarkupId(true)); - add(new AjaxCheckBox("createRoom", new PropertyModel<Boolean>(this, "createRoom")) { - private static final long serialVersionUID = 1L; - - @Override - protected void onUpdate(AjaxRequestTarget target) { - createRoom = getConvertedInput(); - target.add(roomType.setEnabled(createRoom), room.setEnabled(!createRoom)); - } - }); - add(sipContainer.setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true)); - sipContainer.add(new Label("room.confno", "")).setVisible(false); add(new AjaxCheckBox("passwordProtected") { private static final long serialVersionUID = 1L; @@ -355,9 +366,9 @@ public class AppointmentDialog extends A target.add(pwd); } }); - add(new UserMultiChoice("attendees", attendeesModel)); - - add(owner); + pwd.setEnabled(getModelObject().isPasswordProtected()); + pwd.setOutputMarkupId(true); + add(pwd); } private List<Room> getRoomList() { Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/calendar.css URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/calendar.css?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/calendar.css (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/calendar.css Sun May 22 17:25:53 2016 @@ -52,3 +52,7 @@ overflow-x: scroll; float: left; } + +.appointment.ui-dialog .ui-dialog-content { + padding: 0; +} Modified: openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/AbstractWebServiceTest.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/AbstractWebServiceTest.java?rev=1745075&r1=1745074&r2=1745075&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/AbstractWebServiceTest.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/AbstractWebServiceTest.java Sun May 22 17:25:53 2016 @@ -48,7 +48,7 @@ public class AbstractWebServiceTest exte public static ServiceResult login() { ServiceResult sr = getClient(USER_SERVICE_URL).path("/login").query("user", username).query("pass", userpass) .get(ServiceResult.class); - assertEquals("Login should be successful", sr.getType(), Type.SUCCESS.name()); + assertEquals("Login should be successful", Type.SUCCESS.name(), sr.getType()); return sr; }
