You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/10/09 08:47:37 UTC
svn commit: r1763946 [4/4] - in /openmeetings/application:
branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/
branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/
branches/3.1.x/open...
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=1763946&r1=1763945&r2=1763946&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 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/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=1763946&r1=1763945&r2=1763946&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 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/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=1763946&r1=1763945&r2=1763946&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 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/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=1763946&r1=1763945&r2=1763946&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 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>
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=1763946&r1=1763945&r2=1763946&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 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/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=1763946&r1=1763945&r2=1763946&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 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/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=1763946&r1=1763945&r2=1763946&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 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/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=1763946&r1=1763945&r2=1763946&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 Oct 9 08:47:33 2016
@@ -1964,4 +1964,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/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=1763946&r1=1763945&r2=1763946&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 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/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=1763946&r1=1763945&r2=1763946&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 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/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=1763946&r1=1763945&r2=1763946&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 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/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=1763946&r1=1763945&r2=1763946&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 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/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=1763946&r1=1763945&r2=1763946&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 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>
@@ -1968,4 +1968,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">Лого</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/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=1763946&r1=1763945&r2=1763946&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 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/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=1763946&r1=1763945&r2=1763946&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 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/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=1763946&r1=1763945&r2=1763946&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 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/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=1763946&r1=1763945&r2=1763946&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 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/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=1763946&r1=1763945&r2=1763946&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 Oct 9 08:47:33 2016
@@ -1968,4 +1968,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/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=1763946&r1=1763945&r2=1763946&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 Oct 9 08:47:33 2016
@@ -1932,4 +1932,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/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=1763946&r1=1763945&r2=1763946&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 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>
Copied: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.java (from r1763851, openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java)
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.java?p2=openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.java&p1=openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java&r1=1763851&r2=1763946&rev=1763946&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.java Sun Oct 9 08:47:33 2016
@@ -18,28 +18,35 @@
*/
package org.apache.openmeetings.web.common;
-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 abstract class ImagePanel extends BasePanel {
private static final long serialVersionUID = 1L;
protected final WebMarkupContainer profile = new TransparentWebMarkupContainer("profile");
- private final long userId;
-
- public ProfileImagePanel(String id, final long userId) {
+
+ public ImagePanel(String id) {
super(id);
- this.userId = userId;
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", Application.getString(5L))
- , AttributeModifier.append("src", getUrl(getRequestCycle(), userId))));
+ AttributeModifier.append("alt", getTitle())
+ , AttributeModifier.append("title", getTitle())
+ , AttributeModifier.append("src", getImageUrl())));
}
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java (original)
+++ openmeetings/application/trunk/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);
}
}
Copied: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java (from r1763851, openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java)
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java?p2=openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java&p1=openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java&r1=1763851&r2=1763946&rev=1763946&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java Sun Oct 9 08:47:33 2016
@@ -21,9 +21,9 @@ package org.apache.openmeetings.web.comm
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.core.converter.GenerateImage;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.util.StoredFile;
import org.apache.openmeetings.web.util.BootstrapFileUploadBehavior;
@@ -38,34 +38,41 @@ import org.apache.wicket.util.lang.Bytes
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-public class UploadableProfileImagePanel extends ProfileImagePanel {
+public abstract class UploadableImagePanel extends ImagePanel {
private static final long serialVersionUID = 1L;
- private static final Logger log = Red5LoggerFactory.getLogger(UploadableProfileImagePanel.class, webAppRootKey);
- private FileUploadField fileUploadField;
-
- public UploadableProfileImagePanel(String id, final long userId) {
- super(id, userId);
+ 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 = 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(fileUploadField);
form.add(new UploadProgressBar("progress", form, fileUploadField));
fileUploadField.add(new AjaxFormSubmitBehavior(form, "change") {
private static final long serialVersionUID = 1L;
@@ -76,10 +83,9 @@ public class UploadableProfileImagePanel
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);
+ processImage(sf, fu.writeToTempFile());
} catch (Exception e) {
// TODO display error
log.error("Error", e);
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java (original)
+++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.html?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.html (original)
+++ openmeetings/application/trunk/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
+</html>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.html?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.html (original)
+++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.html?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.html (original)
+++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html (original)
+++ openmeetings/application/trunk/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
@@ -35,4 +35,4 @@
</tr>
</table>
</wicket:panel>
-</html>
\ No newline at end of file
+</html>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html (original)
+++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java?rev=1763946&view=auto
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java (added)
+++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/webapp/css/admin.css
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/admin.css?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/admin.css (original)
+++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/webapp/images/blank.png
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/images/blank.png?rev=1763946&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openmeetings/application/trunk/openmeetings-web/src/main/webapp/images/blank.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream