Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml Sun Oct 9 08:47:33 2016 @@ -1953,4 +1953,13 @@ <entry key="network.test.upl.speed">Upload speed</entry> <entry key="access.denied.header">Access denied. You are not authorized to perform this action.</entry> <entry key="save.success">Saved successfully</entry> + <entry key="admin.group.form.logo">Logo</entry> + <entry key="admin.group.form.tag">Tag</entry> + <entry key="admin.group.form.limited">Limits enabled</entry> + <entry key="admin.group.form.maxFilesSize">Maximum files size</entry> + <entry key="admin.group.form.maxRecordingsSize">Maximum recordings size</entry> + <entry key="admin.group.form.maxRooms">Maximum room number</entry> + <entry key="admin.group.form.recordingTtl">Recordings expire in</entry> + <entry key="admin.group.form.reminderDays">Expire reminder sent in</entry> + <entry key="admin.group.form.days">days</entry> </properties>
Modified: openmeetings/application/branches/3.1.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.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml Sun Oct 9 08:47:33 2016 @@ -144,10 +144,10 @@ <entry key="124">Ðа главнÑÑ</entry> <entry key="125">ÐолÑзоваÑели</entry> <entry key="126">ÐÑÑппÑ</entry> - <entry key="127">ÐÑганизаÑии</entry> + <entry key="127">ÐÑÑппÑ</entry> <entry key="128">ÐомнаÑÑ ÑовеÑаний</entry> <entry key="129">ÐÑблиÑно</entry> - <entry key="130">ÐÑганизаÑиÑ</entry> + <entry key="130">ÐÑÑппа</entry> <entry key="131">ÐÑ Ð¾Ð´</entry> <entry key="132">Ðогин</entry> <entry key="133">ÐаÑолÑ</entry> @@ -1959,4 +1959,13 @@ <entry key="network.test.upl.speed">СкоÑоÑÑÑ Ð·Ð°Ð³ÑÑзки</entry> <entry key="access.denied.header">ÐоÑÑÑп запÑеÑÑн. У Ð²Ð°Ñ Ð½ÐµÐ´Ð¾ÑÑаÑоÑно пÑав на ÑÑо дейÑÑвие.</entry> <entry key="save.success">УÑпеÑно ÑÐ¾Ñ Ñанено</entry> + <entry key="admin.group.form.logo">Ðого</entry> + <entry key="admin.group.form.tag">ТÑг</entry> + <entry key="admin.group.form.limited">РазÑеÑиÑÑ Ð¾Ð³ÑаниÑениÑ</entry> + <entry key="admin.group.form.maxFilesSize">ÐакÑималÑнÑй ÑÐ°Ð·Ð¼ÐµÑ Ñайлов</entry> + <entry key="admin.group.form.maxRecordingsSize">ÐакÑималÑнÑй ÑÐ°Ð·Ð¼ÐµÑ Ð·Ð°Ð¿Ð¸Ñей</entry> + <entry key="admin.group.form.maxRooms">ÐакÑималÑное колиÑеÑÑво комнаÑ</entry> + <entry key="admin.group.form.recordingTtl">ÐапиÑи ÑÑиÑаÑÑÑÑ ÑеÑез</entry> + <entry key="admin.group.form.reminderDays">Ðапоминание о ÑÑиÑании поÑÑлаеÑÑÑ Ð·Ð°</entry> + <entry key="admin.group.form.days">дней</entry> </properties> Modified: openmeetings/application/branches/3.1.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.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml Sun Oct 9 08:47:33 2016 @@ -1953,4 +1953,13 @@ <entry key="network.test.upl.speed">Upload speed</entry> <entry key="access.denied.header">Access denied. You are not authorized to perform this action.</entry> <entry key="save.success">Saved successfully</entry> + <entry key="admin.group.form.logo">Logo</entry> + <entry key="admin.group.form.tag">Tag</entry> + <entry key="admin.group.form.limited">Limits enabled</entry> + <entry key="admin.group.form.maxFilesSize">Maximum files size</entry> + <entry key="admin.group.form.maxRecordingsSize">Maximum recordings size</entry> + <entry key="admin.group.form.maxRooms">Maximum room number</entry> + <entry key="admin.group.form.recordingTtl">Recordings expire in</entry> + <entry key="admin.group.form.reminderDays">Expire reminder sent in</entry> + <entry key="admin.group.form.days">days</entry> </properties> Modified: openmeetings/application/branches/3.1.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.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml Sun Oct 9 08:47:33 2016 @@ -1953,4 +1953,13 @@ <entry key="network.test.upl.speed">Upload speed</entry> <entry key="access.denied.header">Access denied. You are not authorized to perform this action.</entry> <entry key="save.success">Saved successfully</entry> + <entry key="admin.group.form.logo">Logo</entry> + <entry key="admin.group.form.tag">Tag</entry> + <entry key="admin.group.form.limited">Limits enabled</entry> + <entry key="admin.group.form.maxFilesSize">Maximum files size</entry> + <entry key="admin.group.form.maxRecordingsSize">Maximum recordings size</entry> + <entry key="admin.group.form.maxRooms">Maximum room number</entry> + <entry key="admin.group.form.recordingTtl">Recordings expire in</entry> + <entry key="admin.group.form.reminderDays">Expire reminder sent in</entry> + <entry key="admin.group.form.days">days</entry> </properties> Modified: openmeetings/application/branches/3.1.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.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml Sun Oct 9 08:47:33 2016 @@ -1953,4 +1953,13 @@ <entry key="network.test.upl.speed">Upload speed</entry> <entry key="access.denied.header">Access denied. You are not authorized to perform this action.</entry> <entry key="save.success">Saved successfully</entry> + <entry key="admin.group.form.logo">Logo</entry> + <entry key="admin.group.form.tag">Tag</entry> + <entry key="admin.group.form.limited">Limits enabled</entry> + <entry key="admin.group.form.maxFilesSize">Maximum files size</entry> + <entry key="admin.group.form.maxRecordingsSize">Maximum recordings size</entry> + <entry key="admin.group.form.maxRooms">Maximum room number</entry> + <entry key="admin.group.form.recordingTtl">Recordings expire in</entry> + <entry key="admin.group.form.reminderDays">Expire reminder sent in</entry> + <entry key="admin.group.form.days">days</entry> </properties> Modified: openmeetings/application/branches/3.1.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.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml Sun Oct 9 08:47:33 2016 @@ -1953,4 +1953,13 @@ <entry key="network.test.upl.speed">Upload speed</entry> <entry key="access.denied.header">Access denied. You are not authorized to perform this action.</entry> <entry key="save.success">Saved successfully</entry> + <entry key="admin.group.form.logo">Logo</entry> + <entry key="admin.group.form.tag">Tag</entry> + <entry key="admin.group.form.limited">Limits enabled</entry> + <entry key="admin.group.form.maxFilesSize">Maximum files size</entry> + <entry key="admin.group.form.maxRecordingsSize">Maximum recordings size</entry> + <entry key="admin.group.form.maxRooms">Maximum room number</entry> + <entry key="admin.group.form.recordingTtl">Recordings expire in</entry> + <entry key="admin.group.form.reminderDays">Expire reminder sent in</entry> + <entry key="admin.group.form.days">days</entry> </properties> Modified: openmeetings/application/branches/3.1.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.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml Sun Oct 9 08:47:33 2016 @@ -1960,4 +1960,13 @@ <entry key="network.test.upl.speed">Upload speed</entry> <entry key="access.denied.header">Access denied. You are not authorized to perform this action.</entry> <entry key="save.success">Saved successfully</entry> + <entry key="admin.group.form.logo">Logo</entry> + <entry key="admin.group.form.tag">Tag</entry> + <entry key="admin.group.form.limited">Limits enabled</entry> + <entry key="admin.group.form.maxFilesSize">Maximum files size</entry> + <entry key="admin.group.form.maxRecordingsSize">Maximum recordings size</entry> + <entry key="admin.group.form.maxRooms">Maximum room number</entry> + <entry key="admin.group.form.recordingTtl">Recordings expire in</entry> + <entry key="admin.group.form.reminderDays">Expire reminder sent in</entry> + <entry key="admin.group.form.days">days</entry> </properties> Modified: openmeetings/application/branches/3.1.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.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml Sun Oct 9 08:47:33 2016 @@ -1923,4 +1923,13 @@ <entry key="network.test.upl.speed">Upload speed</entry> <entry key="access.denied.header">Access denied. You are not authorized to perform this action.</entry> <entry key="save.success">Saved successfully</entry> + <entry key="admin.group.form.logo">Logo</entry> + <entry key="admin.group.form.tag">Tag</entry> + <entry key="admin.group.form.limited">Limits enabled</entry> + <entry key="admin.group.form.maxFilesSize">Maximum files size</entry> + <entry key="admin.group.form.maxRecordingsSize">Maximum recordings size</entry> + <entry key="admin.group.form.maxRooms">Maximum room number</entry> + <entry key="admin.group.form.recordingTtl">Recordings expire in</entry> + <entry key="admin.group.form.reminderDays">Expire reminder sent in</entry> + <entry key="admin.group.form.days">days</entry> </properties> Modified: openmeetings/application/branches/3.1.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.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml Sun Oct 9 08:47:33 2016 @@ -1953,4 +1953,13 @@ <entry key="network.test.upl.speed">Upload speed</entry> <entry key="access.denied.header">Access denied. You are not authorized to perform this action.</entry> <entry key="save.success">Saved successfully</entry> + <entry key="admin.group.form.logo">Logo</entry> + <entry key="admin.group.form.tag">Tag</entry> + <entry key="admin.group.form.limited">Limits enabled</entry> + <entry key="admin.group.form.maxFilesSize">Maximum files size</entry> + <entry key="admin.group.form.maxRecordingsSize">Maximum recordings size</entry> + <entry key="admin.group.form.maxRooms">Maximum room number</entry> + <entry key="admin.group.form.recordingTtl">Recordings expire in</entry> + <entry key="admin.group.form.reminderDays">Expire reminder sent in</entry> + <entry key="admin.group.form.days">days</entry> </properties> Added: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.java?rev=1763946&view=auto ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.java (added) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.java Sun Oct 9 08:47:33 2016 @@ -0,0 +1,52 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License") + you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.openmeetings.web.common; + +import org.apache.wicket.AttributeModifier; +import org.apache.wicket.markup.html.TransparentWebMarkupContainer; +import org.apache.wicket.markup.html.WebMarkupContainer; + +public abstract class ImagePanel extends BasePanel { + private static final long serialVersionUID = 1L; + protected final WebMarkupContainer profile = new TransparentWebMarkupContainer("profile"); + + public ImagePanel(String id) { + super(id); + add(profile.setOutputMarkupId(true)); + } + + @Override + protected void onInitialize() { + super.onInitialize(); + update(); + } + + protected abstract String getImageUrl(); + + protected String getTitle() { + return getString("5"); + } + + public void update() { + profile.addOrReplace(new WebMarkupContainer("img").add( + AttributeModifier.append("alt", getTitle()) + , AttributeModifier.append("title", getTitle()) + , AttributeModifier.append("src", getImageUrl()))); + } +} Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html Sun Oct 9 08:47:33 2016 @@ -9,7 +9,7 @@ with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java Sun Oct 9 08:47:33 2016 @@ -110,15 +110,6 @@ public class MainPanel extends Panel { updateContents(PROFILE_MESSAGES, target); } }); - topLinks.add(new ConfirmableAjaxBorder("logout", getString("310"), getString("634")) { - private static final long serialVersionUID = 1L; - - @Override - protected void onSubmit(AjaxRequestTarget target, Form<?> form) { - getSession().invalidate(); - setResponsePage(Application.get().getSignInPageClass()); - } - }); topLinks.add(new AjaxLink<Void>("profile") { private static final long serialVersionUID = 1L; @@ -226,6 +217,20 @@ public class MainPanel extends Panel { } }); } + + @Override + protected void onInitialize() { + super.onInitialize(); + topLinks.add(new ConfirmableAjaxBorder("logout", getString("310"), getString("634")) { + private static final long serialVersionUID = 1L; + + @Override + protected void onSubmit(AjaxRequestTarget target, Form<?> form) { + getSession().invalidate(); + setResponsePage(Application.get().getSignInPageClass()); + } + }); + } private List<IMenuItem> getMainMenu() { List<IMenuItem> menu = new ArrayList<>(); Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java Sun Oct 9 08:47:33 2016 @@ -20,26 +20,17 @@ package org.apache.openmeetings.web.comm import static org.apache.openmeetings.web.util.ProfileImageResourceReference.getUrl; -import org.apache.openmeetings.web.app.Application; -import org.apache.wicket.AttributeModifier; -import org.apache.wicket.markup.html.TransparentWebMarkupContainer; -import org.apache.wicket.markup.html.WebMarkupContainer; - -public class ProfileImagePanel extends BasePanel { +public class ProfileImagePanel extends ImagePanel { private static final long serialVersionUID = 1L; - protected final WebMarkupContainer profile = new TransparentWebMarkupContainer("profile"); private final long userId; - + public ProfileImagePanel(String id, final long userId) { super(id); this.userId = userId; - add(profile.setOutputMarkupId(true)); - update(); } - - public void update() { - profile.addOrReplace(new WebMarkupContainer("img").add( - AttributeModifier.append("alt", Application.getString(5L)) - , AttributeModifier.append("src", getUrl(getRequestCycle(), userId)))); + + @Override + protected String getImageUrl() { + return getUrl(getRequestCycle(), userId); } } Added: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java?rev=1763946&view=auto ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java (added) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java Sun Oct 9 08:47:33 2016 @@ -0,0 +1,104 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License") + you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.openmeetings.web.common; + +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.web.app.Application.getBean; + +import java.io.File; +import java.util.List; + +import org.apache.openmeetings.db.dao.basic.ConfigurationDao; +import org.apache.openmeetings.util.StoredFile; +import org.apache.openmeetings.web.util.BootstrapFileUploadBehavior; +import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior; +import org.apache.wicket.extensions.ajax.markup.html.form.upload.UploadProgressBar; +import org.apache.wicket.markup.html.form.Form; +import org.apache.wicket.markup.html.form.upload.FileUpload; +import org.apache.wicket.markup.html.form.upload.FileUploadField; +import org.apache.wicket.model.IModel; +import org.apache.wicket.util.lang.Bytes; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; + +public abstract class UploadableImagePanel extends ImagePanel { + private static final long serialVersionUID = 1L; + private static final Logger log = Red5LoggerFactory.getLogger(UploadableImagePanel.class, webAppRootKey); + private final FileUploadField fileUploadField = new FileUploadField("image", new IModel<List<FileUpload>>() { + private static final long serialVersionUID = 1L; + + //FIXME this need to be eliminated + @Override + public void detach() { + } + + @Override + public void setObject(List<FileUpload> object) { + } + + @Override + public List<FileUpload> getObject() { + return null; + } + }); + + public UploadableImagePanel(String id) { + super(id); + } + + protected abstract void processImage(StoredFile sf, File f) throws Exception; + + @Override + protected void onInitialize() { + super.onInitialize(); + final Form<Void> form = new Form<Void>("form"); + form.setMultiPart(true); + form.setMaxSize(Bytes.bytes(getBean(ConfigurationDao.class).getMaxUploadSize())); + // Model is necessary here to avoid writing image to the User object + form.add(fileUploadField); + form.add(new UploadProgressBar("progress", form, fileUploadField)); + fileUploadField.add(new AjaxFormSubmitBehavior(form, "change") { + private static final long serialVersionUID = 1L; + + @Override + protected void onSubmit(AjaxRequestTarget target) { + FileUpload fu = fileUploadField.getFileUpload(); + if (fu != null) { + StoredFile sf = new StoredFile(fu.getClientFileName()); + if (sf.isImage()) { + try { + //FIXME need to work with InputStream !!! + processImage(sf, fu.writeToTempFile()); + } catch (Exception e) { + // TODO display error + log.error("Error", e); + } + } else { + //TODO display error + } + } + update(); + target.add(profile, form); + } + }); + add(form.setOutputMarkupId(true)); + add(BootstrapFileUploadBehavior.INSTANCE); + } +} Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java Sun Oct 9 08:47:33 2016 @@ -18,81 +18,30 @@ */ package org.apache.openmeetings.web.common; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import static org.apache.openmeetings.web.app.Application.getBean; +import static org.apache.openmeetings.web.util.ProfileImageResourceReference.getUrl; -import java.util.List; +import java.io.File; import org.apache.openmeetings.core.converter.GenerateImage; -import org.apache.openmeetings.db.dao.basic.ConfigurationDao; import org.apache.openmeetings.util.StoredFile; -import org.apache.openmeetings.web.util.BootstrapFileUploadBehavior; -import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior; -import org.apache.wicket.extensions.ajax.markup.html.form.upload.UploadProgressBar; -import org.apache.wicket.markup.html.form.Form; -import org.apache.wicket.markup.html.form.upload.FileUpload; -import org.apache.wicket.markup.html.form.upload.FileUploadField; -import org.apache.wicket.model.IModel; -import org.apache.wicket.util.lang.Bytes; -import org.red5.logging.Red5LoggerFactory; -import org.slf4j.Logger; -public class UploadableProfileImagePanel extends ProfileImagePanel { +public class UploadableProfileImagePanel extends UploadableImagePanel { private static final long serialVersionUID = 1L; - private static final Logger log = Red5LoggerFactory.getLogger(UploadableProfileImagePanel.class, webAppRootKey); - private FileUploadField fileUploadField; - + private final long userId; + public UploadableProfileImagePanel(String id, final long userId) { - super(id, userId); - final Form<Void> form = new Form<Void>("form"); - form.setMultiPart(true); - form.setMaxSize(Bytes.bytes(getBean(ConfigurationDao.class).getMaxUploadSize())); - // Model is necessary here to avoid writing image to the User object - form.add(fileUploadField = new FileUploadField("image", new IModel<List<FileUpload>>() { - private static final long serialVersionUID = 1L; - - //FIXME this need to be eliminated - @Override - public void detach() { - } - - @Override - public void setObject(List<FileUpload> object) { - } - - @Override - public List<FileUpload> getObject() { - return null; - } - })); - form.add(new UploadProgressBar("progress", form, fileUploadField)); - fileUploadField.add(new AjaxFormSubmitBehavior(form, "change") { - private static final long serialVersionUID = 1L; - - @Override - protected void onSubmit(AjaxRequestTarget target) { - FileUpload fu = fileUploadField.getFileUpload(); - if (fu != null) { - StoredFile sf = new StoredFile(fu.getClientFileName()); - if (sf.isImage()) { - boolean asIs = sf.isAsIs(); - try { - //FIXME need to work with InputStream !!! - getBean(GenerateImage.class).convertImageUserProfile(fu.writeToTempFile(), userId, asIs); - } catch (Exception e) { - // TODO display error - log.error("Error", e); - } - } else { - //TODO display error - } - } - update(); - target.add(profile, form); - } - }); - add(form.setOutputMarkupId(true)); - add(BootstrapFileUploadBehavior.INSTANCE); + super(id); + this.userId = userId; + } + + @Override + protected void processImage(StoredFile sf, File f) throws Exception { + getBean(GenerateImage.class).convertImageUserProfile(f, userId, sf.isAsIs()); + } + + @Override + protected String getImageUrl() { + return getUrl(getRequestCycle(), userId); } } Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.html URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.html?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.html (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.html Sun Oct 9 08:47:33 2016 @@ -9,7 +9,7 @@ with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -20,6 +20,6 @@ --> <html xmlns:wicket="http://wicket.apache.org";> <wicket:panel> - <div wicket:id="rooms"></div> + <div wicket:id="rooms"></div> </wicket:panel> </html> \ No newline at end of file Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.html URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.html?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.html (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.html Sun Oct 9 08:47:33 2016 @@ -9,7 +9,7 @@ with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.html URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.html?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.html (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.html Sun Oct 9 08:47:33 2016 @@ -9,7 +9,7 @@ with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -27,7 +27,7 @@ $.ajax({ url: url , type: 'GET' - , crossDomain: true + , crossDomain: true , dataType: 'xml' , success: function(data, status, xhr) { var $xml = $(data); Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html Sun Oct 9 08:47:33 2016 @@ -9,7 +9,7 @@ with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html Sun Oct 9 08:47:33 2016 @@ -20,24 +20,24 @@ --> <html xmlns:wicket="http://wicket.apache.org";> <wicket:panel> - <table> - <tr> - <td><div wicket:id="img"></div></td> - <td> - <h3><wicket:message key="376"/> <span wicket:id="firstname"></span> <span wicket:id="lastname"></span></h3> - <wicket:message key="1143"/> <span wicket:id="tz"></span><br/> - <wicket:message key="378"/> <a wicket:id="openUnread"><span wicket:id="unread"></span></a><br/> - <a wicket:id="editProfile"><wicket:message key="377"/></a> - </td> - </tr> - <tr> - <td colspan="2" class="help support"> - <h3><wicket:message key="281"/></h3> - <a wicket:message="href:282"><wicket:message key="286"/></a><br/> - <a wicket:message="href:283"><wicket:message key="287"/></a><br/> + <table> + <tr> + <td><div wicket:id="img"></div></td> + <td> + <h3><wicket:message key="376"/> <span wicket:id="firstname"></span> <span wicket:id="lastname"></span></h3> + <wicket:message key="1143"/> <span wicket:id="tz"></span><br/> + <wicket:message key="378"/> <a wicket:id="openUnread"><span wicket:id="unread"></span></a><br/> + <a wicket:id="editProfile"><wicket:message key="377"/></a> + </td> + </tr> + <tr> + <td colspan="2" class="help support"> + <h3><wicket:message key="281"/></h3> + <a wicket:message="href:282"><wicket:message key="286"/></a><br/> + <a wicket:message="href:283"><wicket:message key="287"/></a><br/> <a wicket:id="netTest" target="_blank"><wicket:message key="1527"/></a><br/> </td> - </tr> - </table> + </tr> + </table> </wicket:panel> </html> Added: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java?rev=1763946&view=auto ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java (added) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java Sun Oct 9 08:47:33 2016 @@ -0,0 +1,75 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License") + you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.openmeetings.web.util; + +import static org.apache.openmeetings.util.OmFileHelper.PNG_MIME_TYPE; +import static org.apache.openmeetings.util.OmFileHelper.getGroupLogo; + +import java.io.File; +import java.io.IOException; + +import org.apache.wicket.request.cycle.RequestCycle; +import org.apache.wicket.request.mapper.parameter.PageParameters; +import org.apache.wicket.request.resource.IResource; +import org.apache.wicket.resource.FileSystemResource; +import org.apache.wicket.resource.FileSystemResourceReference; +import org.apache.wicket.util.string.StringValue; + +public class GroupLogoResourceReference extends FileSystemResourceReference { + private static final long serialVersionUID = 1L; + + public GroupLogoResourceReference() { + super(GroupLogoResourceReference.class, "grouplogo"); + } + + @Override + public IResource getResource() { + return new FileSystemResource() { + private static final long serialVersionUID = 1L; + + @Override + protected String getMimeType() throws IOException { + return PNG_MIME_TYPE; + } + + @Override + protected ResourceResponse newResourceResponse(Attributes attributes) { + PageParameters params = attributes.getParameters(); + StringValue _id = params.get("id"); + Long id = null; + try { + id = _id.toOptionalLong(); + } catch (Exception e) { + //no-op expected + } + return createResourceResponse(getGroupLogo(id, true).toPath()); + } + }; + } + + public static String getUrl(RequestCycle rc, Long groupId) { + PageParameters pp = new PageParameters(); + if (groupId != null) { + pp.add("id", groupId); + } + File img = getGroupLogo(groupId, true); + return rc.urlFor(new GroupLogoResourceReference(), pp.add("anticache", img.lastModified())).toString(); + } + +} Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/admin.css URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/admin.css?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/admin.css (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/admin.css Sun Oct 9 08:47:33 2016 @@ -313,7 +313,8 @@ table.adminListTable td div.four_column_ .adminForm div.formelement { display: block; clear: both; - max-width: 490px; + max-width: 540px; + white-space: nowrap; } .adminForm select { Added: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/images/blank.png URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/images/blank.png?rev=1763946&view=auto ============================================================================== Binary file - no diff available. Propchange: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/images/blank.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java Sun Oct 9 08:47:33 2016 @@ -112,6 +112,14 @@ public class GenerateImage extends BaseC private ConverterProcessResult convertSingleJpg(File in, File out) throws IOException { String[] argv = new String[] { getPathToImageMagick(), in.getCanonicalPath(), out.getCanonicalPath() }; - return ProcessHelper.executeScript("generateBatchThumbByWidth", argv); + return ProcessHelper.executeScript("convertSingleJpg", argv); + } + + public ConverterProcessResult resize(File in, File out, Integer width, Integer height) throws IOException { + String[] argv = new String[] { getPathToImageMagick() + , "-size", (width == null ? "" : width) + (height == null ? "" : "x" + height) + , in.getCanonicalPath(), out.getCanonicalPath() + }; + return ProcessHelper.executeScript("GenerateImage::resize", argv); } } Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java Sun Oct 9 08:47:33 2016 @@ -44,40 +44,68 @@ import org.simpleframework.xml.Root; , @NamedQuery(name="countGroups", query="SELECT COUNT(c) FROM Group AS c WHERE c.deleted = false") }) @Table(name = "om_group") -@Root(name="organisation") +@Root(name = "organisation") public class Group implements IDataProviderEntity { private static final long serialVersionUID = 1L; - + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") @Element(data = true, name = "organisation_id") private Long id; - - @Column(name="name") + + @Column(name = "name") @Element(data = true, required = false) private String name; - - @Column(name="insertedby") + + @Column(name = "insertedby") private Long insertedby; - - @Column(name="updatedby") + + @Column(name = "updatedby") private Long updatedby; - - @Column(name="inserted") + + @Column(name = "inserted") private Date inserted; - - @Column(name="updated") + + @Column(name = "updated") private Date updated; - - @Column(name="deleted") + + @Column(name = "deleted") @Element(data = true, required = false) private boolean deleted; - + + @Column(name = "tag") + @Element(data = true, required = false) + private String tag; + + @Column(name = "limited") + @Element(data = true, required = false) + private boolean limited; + + @Column(name = "max_files_size") + @Element(data = true, required = false) + private int maxFilesSize; + + @Column(name = "max_rec_size") + @Element(data = true, required = false) + private int maxRecordingsSize; + + @Column(name = "max_rooms") + @Element(data = true, required = false) + private int maxRooms; + + @Column(name = "recording_ttl") + @Element(data = true, required = false) + private int recordingTtl; + + @Column(name = "reminder_days") + @Element(data = true, required = false) + private int reminderDays; public Long getInsertedby() { return insertedby; } + public void setInsertedby(Long insertedby) { this.insertedby = insertedby; } @@ -85,6 +113,7 @@ public class Group implements IDataProvi public String getName() { return name; } + public void setName(String name) { this.name = name; } @@ -93,6 +122,7 @@ public class Group implements IDataProvi public Long getId() { return id; } + @Override public void setId(Long id) { this.id = id; @@ -101,14 +131,15 @@ public class Group implements IDataProvi public Long getUpdatedby() { return updatedby; } + public void setUpdatedby(Long updatedby) { this.updatedby = updatedby; - } - + } public Date getInserted() { return inserted; } + public void setInserted(Date inserted) { this.inserted = inserted; } @@ -116,18 +147,77 @@ public class Group implements IDataProvi public Date getUpdated() { return updated; } + public void setUpdated(Date updated) { this.updated = updated; } - + public boolean isDeleted() { return deleted; } + public void setDeleted(boolean deleted) { this.deleted = deleted; } + + public String getTag() { + return tag; + } + + public void setTag(String tag) { + this.tag = tag; + } + + public boolean isLimited() { + return limited; + } + + public void setLimited(boolean limited) { + this.limited = limited; + } + + public int getMaxFilesSize() { + return maxFilesSize; + } + + public void setMaxFilesSize(int maxFilesSize) { + this.maxFilesSize = maxFilesSize; + } + + public int getMaxRecordingsSize() { + return maxRecordingsSize; + } + + public void setMaxRecordingsSize(int maxRecordingsSize) { + this.maxRecordingsSize = maxRecordingsSize; + } + + public int getMaxRooms() { + return maxRooms; + } + + public void setMaxRooms(int maxRooms) { + this.maxRooms = maxRooms; + } + + public int getRecordingTtl() { + return recordingTtl; + } + + public void setRecordingTtl(int recordingTtl) { + this.recordingTtl = recordingTtl; + } + + public int getReminderDays() { + return reminderDays; + } + + public void setReminderDays(int reminderDays) { + this.reminderDays = reminderDays; + } + @Override public String toString() { return "Group [id=" + id + ", name=" + name + ", deleted=" + deleted + "]"; - } + } } Modified: openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java Sun Oct 9 08:47:33 2016 @@ -40,11 +40,11 @@ public class OmFileHelper { */ private static File OM_HOME = null; private static final String UPLOAD_DIR = "upload"; - private static final String FILES_DIR = "files"; private static final String PUBLIC_DIR = "public"; private static final String CLIPARTS_DIR = "cliparts"; private static final String WEB_INF_DIR = "WEB-INF"; private static final String PROFILES_DIR = "profiles"; + private static final String GROUP_LOGO_DIR = "grouplogo"; private static final String STREAMS_DIR = "streams"; private static final String EMOTIONS_DIR = "emoticons"; private static final String LANGUAGES_DIR = "languages"; @@ -58,7 +58,8 @@ public class OmFileHelper { private static final String INSTALL_FILE = "install.xml"; public static final String SCREENSHARING_DIR = "screensharing"; - + + public static final String FILES_DIR = "files"; public static final String PERSISTENCE_NAME = "classes/META-INF/persistence.xml"; public static final String DB_PERSISTENCE_NAME = "classes/META-INF/%s_persistence.xml"; public static final String profilesPrefix = "profile_"; @@ -83,6 +84,7 @@ public class OmFileHelper { public static final String FLV_MIME_TYPE = "video/" + EXTENSION_FLV; public static final String MP4_MIME_TYPE = "video/" + EXTENSION_MP4; public static final String JPG_MIME_TYPE = "image/jpeg"; + public static final String PNG_MIME_TYPE = "image/png"; public static void setOmHome(File omHome) { OmFileHelper.OM_HOME = omHome; @@ -129,6 +131,18 @@ public class OmFileHelper { return getDir(getUploadProfilesDir(), profilesPrefix + userId); } + public static File getGroupLogoDir() { + return getDir(getUploadDir(), GROUP_LOGO_DIR); + } + + public static File getGroupLogo(Long groupId, boolean check) { + File logo = new File(getGroupLogoDir(), String.format("logo%s.png", groupId)); + if (check && !logo.exists()) { + logo = new File(getImagesDir(), "blank.png"); + } + return logo; + } + public static File getDefaultProfilePicture() { return new File(getImagesDir(), defaultProfileImageName); } Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java Sun Oct 9 08:47:33 2016 @@ -20,21 +20,30 @@ package org.apache.openmeetings.web.admi import static org.apache.openmeetings.web.app.Application.getBean; import static org.apache.openmeetings.web.app.WebSession.getUserId; +import static org.apache.openmeetings.util.OmFileHelper.getGroupLogo; +import static org.apache.openmeetings.web.util.GroupLogoResourceReference.getUrl; +import java.io.File; + +import org.apache.openmeetings.core.converter.GenerateImage; import org.apache.openmeetings.db.dao.user.GroupDao; import org.apache.openmeetings.db.dao.user.GroupUserDao; import org.apache.openmeetings.db.entity.user.Group; import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.db.entity.user.User; +import org.apache.openmeetings.util.StoredFile; import org.apache.openmeetings.web.admin.AdminBaseForm; import org.apache.openmeetings.web.admin.AdminUserChoiceProvider; -import org.apache.openmeetings.web.app.Application; +import org.apache.openmeetings.web.common.UploadableImagePanel; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior; +import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.form.Form; +import org.apache.wicket.markup.html.form.NumberTextField; import org.apache.wicket.markup.html.form.RequiredTextField; +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; @@ -43,8 +52,13 @@ import org.wicketstuff.select2.Select2Ch public class GroupForm extends AdminBaseForm<Group> { private static final long serialVersionUID = 1L; private GroupUsersPanel usersPanel; - private WebMarkupContainer groupList; - private Select2Choice<User> userToadd = null; + private final WebMarkupContainer groupList; + private final Select2Choice<User> userToadd; + private final NumberTextField<Integer> maxFilesSize = new NumberTextField<>("maxFilesSize"); + private final NumberTextField<Integer> maxRecordingsSize = new NumberTextField<>("maxRecordingsSize"); + private final NumberTextField<Integer> maxRooms = new NumberTextField<>("maxRooms"); + private final NumberTextField<Integer> recordingTtl = new NumberTextField<>("recordingTtl"); + private final NumberTextField<Integer> reminderDays = new NumberTextField<>("reminderDays"); static String formatUser(User choice) { return String.format("%s [%s %s]", choice.getLogin(), choice.getFirstname(), choice.getLastname()); @@ -55,7 +69,6 @@ public class GroupForm extends AdminBase this.groupList = groupList; setOutputMarkupId(true); - add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString(165)))); usersPanel = new GroupUsersPanel("users", getGroupId()); add(usersPanel); @@ -99,10 +112,59 @@ public class GroupForm extends AdminBase // event and throttle it down to once per second add(new AjaxFormValidatingBehavior("keydown", Duration.ONE_SECOND)); } - + + @Override + protected void onInitialize() { + super.onInitialize(); + add(new RequiredTextField<String>("name").setLabel(Model.of(getString("165")))); + add(new UploadableImagePanel("logo") { + private static final long serialVersionUID = 1L; + + @Override + protected String getImageUrl() { + return getUrl(getRequestCycle(), GroupForm.this.getModelObject().getId()); + } + + @Override + protected void processImage(StoredFile sf, File f) throws Exception { + getBean(GenerateImage.class).resize(f, getGroupLogo(GroupForm.this.getModelObject().getId(), false), null, 23); + } + + @Override + protected String getTitle() { + return getString("admin.group.form.logo"); + } + }); + add(new TextField<String>("tag").setLabel(Model.of(getString("admin.group.form.tag")))); + add(new AjaxCheckBox("limited") { + private static final long serialVersionUID = 1L; + + @Override + protected void onUpdate(AjaxRequestTarget target) { + target.add( + maxFilesSize.setEnabled(getModelObject()) + , maxRecordingsSize.setEnabled(getModelObject()) + , maxRooms.setEnabled(getModelObject()) + , recordingTtl.setEnabled(getModelObject()) + , reminderDays.setEnabled(getModelObject()) + ); + } + }.setLabel(Model.of(getString("admin.group.form.limited")))); + add(maxFilesSize.setLabel(Model.of(getString("admin.group.form.maxFilesSize"))).setEnabled(false).setOutputMarkupId(true)); + add(maxRecordingsSize.setLabel(Model.of(getString("admin.group.form.maxRecordingsSize"))).setEnabled(false).setOutputMarkupId(true)); + add(maxRooms.setLabel(Model.of(getString("admin.group.form.maxRooms"))).setEnabled(false).setOutputMarkupId(true)); + add(recordingTtl.setLabel(Model.of(getString("admin.group.form.recordingTtl"))).setEnabled(false).setOutputMarkupId(true)); + add(reminderDays.setLabel(Model.of(getString("admin.group.form.reminderDays"))).setEnabled(false).setOutputMarkupId(true)); + } + public void updateView(AjaxRequestTarget target) { userToadd.setModelObject(null); usersPanel.update(getGroupId()); + maxFilesSize.setEnabled(getModelObject().isLimited()); + maxRecordingsSize.setEnabled(getModelObject().isLimited()); + maxRooms.setEnabled(getModelObject().isLimited()); + recordingTtl.setEnabled(getModelObject().isLimited()); + reminderDays.setEnabled(getModelObject().isLimited()); target.add(this, groupList); target.appendJavaScript("groupsInit();"); } Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html Sun Oct 9 08:47:33 2016 @@ -9,7 +9,7 @@ with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -27,11 +27,11 @@ <th class="ui-widget-header" style="width: 34px; max-width: 34px; overflow: hidden;" wicket:message="title:98"><wicket:message key="98" /></th> <th class="ui-widget-header" style="width: 360px"><wicket:message key="177" /></th> <th class="ui-widget-header" style="width: 34px"><wicket:message key="275" /></th> - </tr> + </tr> </table> - <div class="tableWrapper" style="width: 460px; height: 460px;"> - <table class="adminListTable" style="min-width: 440px; max-width: 440px"> - <tbody> + <div class="tableWrapper" style="width: 460px; height: 250px;"> + <table class="adminListTable" style="min-width: 440px; max-width: 440px"> + <tbody> <tr wicket:id="userList" class="ui-widget-content"> <td style="width: 34px"><input type="checkbox" wicket:id="isModerator"/></td> <td style="width: 360px"><div style="width: 360px"><span wicket:id="label"></span></div></td> Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html Sun Oct 9 08:47:33 2016 @@ -9,7 +9,7 @@ with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -59,11 +59,35 @@ <label><wicket:message key="171" /></label><input type="text" wicket:id="name" /> </div> <div class="formelement"> + <label><wicket:message key="admin.group.form.logo" /></label><div wicket:id="logo" class="input"></div> + </div> + <div class="formelement"> + <label><wicket:message key="admin.group.form.tag" /></label><input type="text" wicket:id="tag" /> + </div> + <div class="formelement"> <label style="font-weight: bold;"><wicket:message key="178" /></label><div class="om-select2"><select wicket:id="user2add" class="input"></select></div> </div> <div class="formelement"> <div wicket:id="users"></div> </div> + <div class="formelement"> + <label><wicket:message key="admin.group.form.limited" /></label><input type="checkbox" wicket:id="limited" /> + </div> + <div class="formelement"> + <label><wicket:message key="admin.group.form.maxFilesSize" /></label><input type="number" wicket:id="maxFilesSize" /><wicket:message key="network.test.mb"/> + </div> + <div class="formelement"> + <label><wicket:message key="admin.group.form.maxRecordingsSize" /></label><input type="number" wicket:id="maxRecordingsSize" /><wicket:message key="network.test.mb"/> + </div> + <div class="formelement"> + <label><wicket:message key="admin.group.form.maxRooms" /></label><input type="number" wicket:id="maxRooms" /> + </div> + <div class="formelement"> + <label><wicket:message key="admin.group.form.recordingTtl" /></label><input type="number" wicket:id="recordingTtl" /><wicket:message key="admin.group.form.days"/> + </div> + <div class="formelement"> + <label><wicket:message key="admin.group.form.maxFilesSize" /></label><input type="number" wicket:id="reminderDays" /><wicket:message key="admin.group.form.days"/> + </div> </fieldset> </div> </form> Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java Sun Oct 9 08:47:33 2016 @@ -299,10 +299,10 @@ public class RoomForm extends AdminBaseF } }).setOutputMarkupId(true)); - add(new CheckBox("moderated")); + add(new CheckBox("moderated")); add(new TextField<String>("confno").setEnabled(false)); - add(pin = new TextField<String>("pin")); + add(pin = new TextField<>("pin")); pin.setEnabled(room.isSipEnabled()); add(new TextField<String>("ownerId").setEnabled(false)); add(new AjaxCheckBox("sipEnabled") { Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java Sun Oct 9 08:47:33 2016 @@ -70,6 +70,7 @@ import org.apache.openmeetings.web.user. import org.apache.openmeetings.web.user.record.JpgRecordingResourceReference; import org.apache.openmeetings.web.user.record.Mp4RecordingResourceReference; import org.apache.openmeetings.web.user.record.OggRecordingResourceReference; +import org.apache.openmeetings.web.util.GroupLogoResourceReference; import org.apache.openmeetings.web.util.ProfileImageResourceReference; import org.apache.openmeetings.web.util.UserDashboardPersister; import org.apache.wicket.Localizer; @@ -156,6 +157,7 @@ public class Application extends Authent mountResource("/recordings/jpg/${id}", new JpgRecordingResourceReference()); //should be in sync with VideoPlayer mountResource("/room/file/${id}", new RoomResourceReference()); mountResource("/profile/${id}", new ProfileImageResourceReference()); + mountResource("/group/${id}", new GroupLogoResourceReference()); } private static class NoVersionMapper extends MountedMapper { Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.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.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml Sun Oct 9 08:47:33 2016 @@ -1714,7 +1714,6 @@ target="_blank">Mailing lists</a></span> <br /> <br /> - <b> <span style="font-size: 1.2em">Commercial-Support:</span></b> <br /> <br /> @@ -1962,4 +1961,13 @@ <entry key="calendar.googleID">Google Calendar ID</entry> <entry key="calendar.gcal">Google Calendar</entry> <entry key="calendar.defaultTitle">New Calendar</entry> + <entry key="admin.group.form.logo">Logo</entry> + <entry key="admin.group.form.tag">Tag</entry> + <entry key="admin.group.form.limited">Limits enabled</entry> + <entry key="admin.group.form.maxFilesSize">Maximum files size</entry> + <entry key="admin.group.form.maxRecordingsSize">Maximum recordings size</entry> + <entry key="admin.group.form.maxRooms">Maximum room number</entry> + <entry key="admin.group.form.recordingTtl">Recordings expire in</entry> + <entry key="admin.group.form.reminderDays">Expire reminder sent in</entry> + <entry key="admin.group.form.days">days</entry> </properties> Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.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_ar.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml Sun Oct 9 08:47:33 2016 @@ -1962,4 +1962,13 @@ <entry key="calendar.googleID">Google Calendar ID</entry> <entry key="calendar.gcal">Google Calendar</entry> <entry key="calendar.defaultTitle">New Calendar</entry> + <entry key="admin.group.form.logo">Logo</entry> + <entry key="admin.group.form.tag">Tag</entry> + <entry key="admin.group.form.limited">Limits enabled</entry> + <entry key="admin.group.form.maxFilesSize">Maximum files size</entry> + <entry key="admin.group.form.maxRecordingsSize">Maximum recordings size</entry> + <entry key="admin.group.form.maxRooms">Maximum room number</entry> + <entry key="admin.group.form.recordingTtl">Recordings expire in</entry> + <entry key="admin.group.form.reminderDays">Expire reminder sent in</entry> + <entry key="admin.group.form.days">days</entry> </properties> Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.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_bg.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml Sun Oct 9 08:47:33 2016 @@ -1962,4 +1962,13 @@ <entry key="calendar.googleID">Google Calendar ID</entry> <entry key="calendar.gcal">Google Calendar</entry> <entry key="calendar.defaultTitle">New Calendar</entry> + <entry key="admin.group.form.logo">Logo</entry> + <entry key="admin.group.form.tag">Tag</entry> + <entry key="admin.group.form.limited">Limits enabled</entry> + <entry key="admin.group.form.maxFilesSize">Maximum files size</entry> + <entry key="admin.group.form.maxRecordingsSize">Maximum recordings size</entry> + <entry key="admin.group.form.maxRooms">Maximum room number</entry> + <entry key="admin.group.form.recordingTtl">Recordings expire in</entry> + <entry key="admin.group.form.reminderDays">Expire reminder sent in</entry> + <entry key="admin.group.form.days">days</entry> </properties> Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.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_ca.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml Sun Oct 9 08:47:33 2016 @@ -1962,4 +1962,13 @@ <entry key="calendar.googleID">Google Calendar ID</entry> <entry key="calendar.gcal">Google Calendar</entry> <entry key="calendar.defaultTitle">New Calendar</entry> + <entry key="admin.group.form.logo">Logo</entry> + <entry key="admin.group.form.tag">Tag</entry> + <entry key="admin.group.form.limited">Limits enabled</entry> + <entry key="admin.group.form.maxFilesSize">Maximum files size</entry> + <entry key="admin.group.form.maxRecordingsSize">Maximum recordings size</entry> + <entry key="admin.group.form.maxRooms">Maximum room number</entry> + <entry key="admin.group.form.recordingTtl">Recordings expire in</entry> + <entry key="admin.group.form.reminderDays">Expire reminder sent in</entry> + <entry key="admin.group.form.days">days</entry> </properties> Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.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_cs.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml Sun Oct 9 08:47:33 2016 @@ -1962,4 +1962,13 @@ <entry key="calendar.googleID">Google Calendar ID</entry> <entry key="calendar.gcal">Google Calendar</entry> <entry key="calendar.defaultTitle">New Calendar</entry> + <entry key="admin.group.form.logo">Logo</entry> + <entry key="admin.group.form.tag">Tag</entry> + <entry key="admin.group.form.limited">Limits enabled</entry> + <entry key="admin.group.form.maxFilesSize">Maximum files size</entry> + <entry key="admin.group.form.maxRecordingsSize">Maximum recordings size</entry> + <entry key="admin.group.form.maxRooms">Maximum room number</entry> + <entry key="admin.group.form.recordingTtl">Recordings expire in</entry> + <entry key="admin.group.form.reminderDays">Expire reminder sent in</entry> + <entry key="admin.group.form.days">days</entry> </properties> Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.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_da.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml Sun Oct 9 08:47:33 2016 @@ -1962,4 +1962,13 @@ <entry key="calendar.googleID">Google Calendar ID</entry> <entry key="calendar.gcal">Google Calendar</entry> <entry key="calendar.defaultTitle">New Calendar</entry> + <entry key="admin.group.form.logo">Logo</entry> + <entry key="admin.group.form.tag">Tag</entry> + <entry key="admin.group.form.limited">Limits enabled</entry> + <entry key="admin.group.form.maxFilesSize">Maximum files size</entry> + <entry key="admin.group.form.maxRecordingsSize">Maximum recordings size</entry> + <entry key="admin.group.form.maxRooms">Maximum room number</entry> + <entry key="admin.group.form.recordingTtl">Recordings expire in</entry> + <entry key="admin.group.form.reminderDays">Expire reminder sent in</entry> + <entry key="admin.group.form.days">days</entry> </properties> Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.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_de.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml Sun Oct 9 08:47:33 2016 @@ -1972,4 +1972,13 @@ <entry key="calendar.googleID">Google Calendar ID</entry> <entry key="calendar.gcal">Google Calendar</entry> <entry key="calendar.defaultTitle">New Calendar</entry> + <entry key="admin.group.form.logo">Logo</entry> + <entry key="admin.group.form.tag">Tag</entry> + <entry key="admin.group.form.limited">Limits enabled</entry> + <entry key="admin.group.form.maxFilesSize">Maximum files size</entry> + <entry key="admin.group.form.maxRecordingsSize">Maximum recordings size</entry> + <entry key="admin.group.form.maxRooms">Maximum room number</entry> + <entry key="admin.group.form.recordingTtl">Recordings expire in</entry> + <entry key="admin.group.form.reminderDays">Expire reminder sent in</entry> + <entry key="admin.group.form.days">days</entry> </properties> Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.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_el.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml Sun Oct 9 08:47:33 2016 @@ -1962,4 +1962,13 @@ <entry key="calendar.googleID">Google Calendar ID</entry> <entry key="calendar.gcal">Google Calendar</entry> <entry key="calendar.defaultTitle">New Calendar</entry> + <entry key="admin.group.form.logo">Logo</entry> + <entry key="admin.group.form.tag">Tag</entry> + <entry key="admin.group.form.limited">Limits enabled</entry> + <entry key="admin.group.form.maxFilesSize">Maximum files size</entry> + <entry key="admin.group.form.maxRecordingsSize">Maximum recordings size</entry> + <entry key="admin.group.form.maxRooms">Maximum room number</entry> + <entry key="admin.group.form.recordingTtl">Recordings expire in</entry> + <entry key="admin.group.form.reminderDays">Expire reminder sent in</entry> + <entry key="admin.group.form.days">days</entry> </properties> Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.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_es.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml Sun Oct 9 08:47:33 2016 @@ -1956,4 +1956,13 @@ <entry key="calendar.googleID">Google Calendar ID</entry> <entry key="calendar.gcal">Google Calendar</entry> <entry key="calendar.defaultTitle">New Calendar</entry> + <entry key="admin.group.form.logo">Logo</entry> + <entry key="admin.group.form.tag">Tag</entry> + <entry key="admin.group.form.limited">Limits enabled</entry> + <entry key="admin.group.form.maxFilesSize">Maximum files size</entry> + <entry key="admin.group.form.maxRecordingsSize">Maximum recordings size</entry> + <entry key="admin.group.form.maxRooms">Maximum room number</entry> + <entry key="admin.group.form.recordingTtl">Recordings expire in</entry> + <entry key="admin.group.form.reminderDays">Expire reminder sent in</entry> + <entry key="admin.group.form.days">days</entry> </properties> Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.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_fa.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml Sun Oct 9 08:47:33 2016 @@ -1962,4 +1962,13 @@ <entry key="calendar.googleID">Google Calendar ID</entry> <entry key="calendar.gcal">Google Calendar</entry> <entry key="calendar.defaultTitle">New Calendar</entry> + <entry key="admin.group.form.logo">Logo</entry> + <entry key="admin.group.form.tag">Tag</entry> + <entry key="admin.group.form.limited">Limits enabled</entry> + <entry key="admin.group.form.maxFilesSize">Maximum files size</entry> + <entry key="admin.group.form.maxRecordingsSize">Maximum recordings size</entry> + <entry key="admin.group.form.maxRooms">Maximum room number</entry> + <entry key="admin.group.form.recordingTtl">Recordings expire in</entry> + <entry key="admin.group.form.reminderDays">Expire reminder sent in</entry> + <entry key="admin.group.form.days">days</entry> </properties> Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.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_fi.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml Sun Oct 9 08:47:33 2016 @@ -1962,4 +1962,13 @@ <entry key="calendar.googleID">Google Calendar ID</entry> <entry key="calendar.gcal">Google Calendar</entry> <entry key="calendar.defaultTitle">New Calendar</entry> + <entry key="admin.group.form.logo">Logo</entry> + <entry key="admin.group.form.tag">Tag</entry> + <entry key="admin.group.form.limited">Limits enabled</entry> + <entry key="admin.group.form.maxFilesSize">Maximum files size</entry> + <entry key="admin.group.form.maxRecordingsSize">Maximum recordings size</entry> + <entry key="admin.group.form.maxRooms">Maximum room number</entry> + <entry key="admin.group.form.recordingTtl">Recordings expire in</entry> + <entry key="admin.group.form.reminderDays">Expire reminder sent in</entry> + <entry key="admin.group.form.days">days</entry> </properties> Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.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_fr.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml Sun Oct 9 08:47:33 2016 @@ -1928,4 +1928,13 @@ <entry key="calendar.googleID">Google Calendar ID</entry> <entry key="calendar.gcal">Google Calendar</entry> <entry key="calendar.defaultTitle">New Calendar</entry> + <entry key="admin.group.form.logo">Logo</entry> + <entry key="admin.group.form.tag">Tag</entry> + <entry key="admin.group.form.limited">Limits enabled</entry> + <entry key="admin.group.form.maxFilesSize">Maximum files size</entry> + <entry key="admin.group.form.maxRecordingsSize">Maximum recordings size</entry> + <entry key="admin.group.form.maxRooms">Maximum room number</entry> + <entry key="admin.group.form.recordingTtl">Recordings expire in</entry> + <entry key="admin.group.form.reminderDays">Expire reminder sent in</entry> + <entry key="admin.group.form.days">days</entry> </properties> Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.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_gl.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml Sun Oct 9 08:47:33 2016 @@ -1962,4 +1962,13 @@ <entry key="calendar.googleID">Google Calendar ID</entry> <entry key="calendar.gcal">Google Calendar</entry> <entry key="calendar.defaultTitle">New Calendar</entry> + <entry key="admin.group.form.logo">Logo</entry> + <entry key="admin.group.form.tag">Tag</entry> + <entry key="admin.group.form.limited">Limits enabled</entry> + <entry key="admin.group.form.maxFilesSize">Maximum files size</entry> + <entry key="admin.group.form.maxRecordingsSize">Maximum recordings size</entry> + <entry key="admin.group.form.maxRooms">Maximum room number</entry> + <entry key="admin.group.form.recordingTtl">Recordings expire in</entry> + <entry key="admin.group.form.reminderDays">Expire reminder sent in</entry> + <entry key="admin.group.form.days">days</entry> </properties> Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.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_hu.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml Sun Oct 9 08:47:33 2016 @@ -1950,4 +1950,13 @@ <entry key="calendar.googleID">Google Calendar ID</entry> <entry key="calendar.gcal">Google Calendar</entry> <entry key="calendar.defaultTitle">New Calendar</entry> + <entry key="admin.group.form.logo">Logo</entry> + <entry key="admin.group.form.tag">Tag</entry> + <entry key="admin.group.form.limited">Limits enabled</entry> + <entry key="admin.group.form.maxFilesSize">Maximum files size</entry> + <entry key="admin.group.form.maxRecordingsSize">Maximum recordings size</entry> + <entry key="admin.group.form.maxRooms">Maximum room number</entry> + <entry key="admin.group.form.recordingTtl">Recordings expire in</entry> + <entry key="admin.group.form.reminderDays">Expire reminder sent in</entry> + <entry key="admin.group.form.days">days</entry> </properties>
