Repository: openmeetings Updated Branches: refs/heads/master 382cbc2bb -> 1ab1ad72b
[OPENMEETINGS-1662] room list is improved Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/1ab1ad72 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/1ab1ad72 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/1ab1ad72 Branch: refs/heads/master Commit: 1ab1ad72bb6936eea335ad47fc962390fa947d6d Parents: 382cbc2 Author: Maxim Solodovnik <[email protected]> Authored: Tue Jul 11 06:39:44 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Tue Jul 11 06:40:15 2017 +0700 ---------------------------------------------------------------------- .../openmeetings/db/dao/room/RoomDao.java | 2 +- .../web/app/Application.properties.xml | 3 + .../web/app/Application_ar.properties.xml | 3 + .../web/app/Application_bg.properties.xml | 3 + .../web/app/Application_ca.properties.xml | 3 + .../web/app/Application_cs.properties.xml | 3 + .../web/app/Application_da.properties.xml | 3 + .../web/app/Application_de.properties.xml | 3 + .../web/app/Application_el.properties.xml | 3 + .../web/app/Application_es.properties.xml | 3 + .../web/app/Application_fa.properties.xml | 3 + .../web/app/Application_fi.properties.xml | 3 + .../web/app/Application_fr.properties.xml | 3 + .../web/app/Application_gl.properties.xml | 3 + .../web/app/Application_hu.properties.xml | 3 + .../web/app/Application_id.properties.xml | 3 + .../web/app/Application_it.properties.xml | 3 + .../web/app/Application_ja.properties.xml | 3 + .../web/app/Application_ko.properties.xml | 3 + .../web/app/Application_nl.properties.xml | 3 + .../web/app/Application_pl.properties.xml | 3 + .../web/app/Application_pt.properties.xml | 3 + .../web/app/Application_pt_BR.properties.xml | 3 + .../web/app/Application_ru.properties.xml | 3 + .../web/app/Application_sk.properties.xml | 3 + .../web/app/Application_sv.properties.xml | 3 + .../web/app/Application_th.properties.xml | 3 + .../web/app/Application_tr.properties.xml | 3 + .../web/app/Application_uk.properties.xml | 3 + .../web/app/Application_zh_CN.properties.xml | 3 + .../web/app/Application_zh_TW.properties.xml | 3 + .../apache/openmeetings/web/pages/BasePage.java | 1 - .../web/user/rooms/RoomListPanel.html | 11 +- .../web/user/rooms/RoomListPanel.java | 19 +- .../src/main/webapp/css/admin-rtl.css | 21 - openmeetings-web/src/main/webapp/css/admin.css | 356 ---------------- openmeetings-web/src/main/webapp/css/forms.css | 83 ---- .../src/main/webapp/css/theme-rtl.css | 5 +- openmeetings-web/src/main/webapp/css/theme.css | 402 ++++++++++++++++++- 39 files changed, 519 insertions(+), 471 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java index 5c82b04..4bb9ad8 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java @@ -259,7 +259,7 @@ public class RoomDao implements IGroupAdminDataProviderDao<Room> { room.setName(name); room.setType(type); room.setComment("My Rooms of ownerId " + ownerId); - room.setNumberOfPartizipants(Room.Type.conference == type ? 25L : 150L); + room.setNumberOfPartizipants(Room.Type.conference == type ? 25L : 120L); room.setAllowUserQuestions(true); room.setOwnerId(ownerId); room.setAllowRecording(true); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml index 1c9ccfd..77241cf 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml @@ -1783,6 +1783,9 @@ <entry key="room.type.conference">conference (1-25 users)</entry> <entry key="room.type.restricted">restricted (1-150 users)</entry> <entry key="room.type.interview">interview (1:1 meeting with recording)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">do not send notification</entry> <entry key="appointment.reminder.email">simple email</entry> <entry key="appointment.reminder.ical">iCal email</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml index 708bbb0..17e72f6 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml @@ -1783,6 +1783,9 @@ <entry key="room.type.conference">conference (1-25 users)</entry> <entry key="room.type.restricted">restricted (1-150 users)</entry> <entry key="room.type.interview">interview (1:1 meeting with recording)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">do not send notification</entry> <entry key="appointment.reminder.email">simple email</entry> <entry key="appointment.reminder.ical">iCal email</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml index 9179615..e69c7c6 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml @@ -1783,6 +1783,9 @@ <entry key="room.type.conference">conference (1-25 users)</entry> <entry key="room.type.restricted">restricted (1-150 users)</entry> <entry key="room.type.interview">interview (1:1 meeting with recording)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">do not send notification</entry> <entry key="appointment.reminder.email">simple email</entry> <entry key="appointment.reminder.ical">iCal email</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml index 7f22b79..8a72fc9 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml @@ -1783,6 +1783,9 @@ <entry key="room.type.conference">conference (1-25 users)</entry> <entry key="room.type.restricted">restricted (1-150 users)</entry> <entry key="room.type.interview">interview (1:1 meeting with recording)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">do not send notification</entry> <entry key="appointment.reminder.email">simple email</entry> <entry key="appointment.reminder.ical">iCal email</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml index 4aa44db..e17caa7 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml @@ -1783,6 +1783,9 @@ <entry key="room.type.conference">conference (1-25 users)</entry> <entry key="room.type.restricted">restricted (1-150 users)</entry> <entry key="room.type.interview">interview (1:1 meeting with recording)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">do not send notification</entry> <entry key="appointment.reminder.email">simple email</entry> <entry key="appointment.reminder.ical">iCal email</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml index a42c32e..de039be 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml @@ -1783,6 +1783,9 @@ <entry key="room.type.conference">conference (1-25 users)</entry> <entry key="room.type.restricted">restricted (1-150 users)</entry> <entry key="room.type.interview">interview (1:1 meeting with recording)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">do not send notification</entry> <entry key="appointment.reminder.email">simple email</entry> <entry key="appointment.reminder.ical">iCal email</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml index ab0b0ec..03d6391 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml @@ -1788,6 +1788,9 @@ <entry key="room.type.conference">Konferenz (1-25 User)</entry> <entry key="room.type.restricted">Limitiert (1-150 User)</entry> <entry key="room.type.interview">Interview (1:1 meeting with recording)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">keine Erinnerung senden</entry> <entry key="appointment.reminder.email">Einfache E-Mail</entry> <entry key="appointment.reminder.ical">iCal E-Mail</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml index 7972b4a..9df8ef8 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml @@ -1783,6 +1783,9 @@ <entry key="room.type.conference">conference (1-25 users)</entry> <entry key="room.type.restricted">restricted (1-150 users)</entry> <entry key="room.type.interview">interview (1:1 meeting with recording)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">do not send notification</entry> <entry key="appointment.reminder.email">simple email</entry> <entry key="appointment.reminder.ical">iCal email</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml index 35a6ea7..842c06a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml @@ -1783,6 +1783,9 @@ <entry key="room.type.conference">conferencia (1-25 usuarios)</entry> <entry key="room.type.restricted">restringida (1-150 usuarios)</entry> <entry key="room.type.interview">interview (1:1 reunión con grabación)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">no envÃe notificación</entry> <entry key="appointment.reminder.email">correo simple</entry> <entry key="appointment.reminder.ical">iCal correo</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml index 0d7c840..071ce10 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml @@ -1783,6 +1783,9 @@ <entry key="room.type.conference">conference (1-25 users)</entry> <entry key="room.type.restricted">restricted (1-150 users)</entry> <entry key="room.type.interview">interview (1:1 meeting with recording)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">do not send notification</entry> <entry key="appointment.reminder.email">simple email</entry> <entry key="appointment.reminder.ical">iCal email</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml index 2b29bb3..eb3fcf2 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml @@ -1783,6 +1783,9 @@ <entry key="room.type.conference">conference (1-25 users)</entry> <entry key="room.type.restricted">restricted (1-150 users)</entry> <entry key="room.type.interview">interview (1:1 meeting with recording)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">do not send notification</entry> <entry key="appointment.reminder.email">simple email</entry> <entry key="appointment.reminder.ical">iCal email</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml index a801eda..f238358 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml @@ -1775,6 +1775,9 @@ <entry key="room.type.conference">conférence (1-25 utilisateurs)</entry> <entry key="room.type.restricted">restreint (1-150 utilisateurs)</entry> <entry key="room.type.interview">interview (1:1 réunion avec enregistrement)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">ne pas envoyer de notification</entry> <entry key="appointment.reminder.email">courriel simple</entry> <entry key="appointment.reminder.ical">courriel iCal</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml index 521fe4a..1555bba 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml @@ -1783,6 +1783,9 @@ <entry key="room.type.conference">conference (1-25 users)</entry> <entry key="room.type.restricted">restricted (1-150 users)</entry> <entry key="room.type.interview">interview (1:1 meeting with recording)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">do not send notification</entry> <entry key="appointment.reminder.email">simple email</entry> <entry key="appointment.reminder.ical">iCal email</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml index 4990355..fd2c6e6 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml @@ -1771,6 +1771,9 @@ <entry key="room.type.conference">csoportmunka (n:n) konferencia (1-25 látogatóval)</entry> <entry key="room.type.restricted">moderált (1:n) konferencia (1-150 látogatóval)</entry> <entry key="room.type.interview">interjú (1:1 megbeszélés felvétellel)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">ne küldjön értesÃtést</entry> <entry key="appointment.reminder.email">egyszerű e-mail</entry> <entry key="appointment.reminder.ical">iCal email</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml index 6a9e743..5c2dac6 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml @@ -1783,6 +1783,9 @@ <entry key="room.type.conference">conference (1-25 users)</entry> <entry key="room.type.restricted">restricted (1-150 users)</entry> <entry key="room.type.interview">interview (1:1 meeting with recording)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">do not send notification</entry> <entry key="appointment.reminder.email">simple email</entry> <entry key="appointment.reminder.ical">iCal email</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml index 8c50194..ad653bb 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml @@ -1784,6 +1784,9 @@ <entry key="room.type.conference">conferenza (1-25 users)</entry> <entry key="room.type.restricted">seminario (1-150 users)</entry> <entry key="room.type.interview">intervista (1:1 con registrazione)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">non inviare notifica</entry> <entry key="appointment.reminder.email">email semplice</entry> <entry key="appointment.reminder.ical">email con iCal</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml index bd26dc5..5c54da2 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml @@ -1783,6 +1783,9 @@ <entry key="room.type.conference">ä¼è°(ã¦ã¼ã¶ã¼æ°:1ã25)</entry> <entry key="room.type.restricted">大人æ°åãä¼è°(ã¦ã¼ã¶ã¼æ°:1ã150)</entry> <entry key="room.type.interview">ã¤ã³ã¿ãã¥ã¼(1対1ã®ãã¼ãã£ã³ã°ï¼é²ç»ä»ã)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">ãªãã¤ã³ãã¼ãéä¿¡ããªã</entry> <entry key="appointment.reminder.email">Eã¡ã¼ã«</entry> <entry key="appointment.reminder.ical">iCal Eã¡ã¼ã«</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml index 4ea8c02..a25b0f6 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml @@ -1785,6 +1785,9 @@ <entry key="room.type.conference">conference (1-25 users)</entry> <entry key="room.type.restricted">restricted (1-150 users)</entry> <entry key="room.type.interview">interview (1:1 meeting with recording)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">do not send notification</entry> <entry key="appointment.reminder.email">simple email</entry> <entry key="appointment.reminder.ical">iCal email</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml index df35bd4..b96749e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml @@ -1783,6 +1783,9 @@ <entry key="room.type.conference">conference (1-25 users)</entry> <entry key="room.type.restricted">restricted (1-150 users)</entry> <entry key="room.type.interview">interview (1:1 meeting with recording)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">do not send notification</entry> <entry key="appointment.reminder.email">simple email</entry> <entry key="appointment.reminder.ical">iCal email</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml index 2a03436..937b7ed 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml @@ -1783,6 +1783,9 @@ <entry key="room.type.conference">conference (1-25 users)</entry> <entry key="room.type.restricted">restricted (1-150 users)</entry> <entry key="room.type.interview">interview (1:1 meeting with recording)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">do not send notification</entry> <entry key="appointment.reminder.email">simple email</entry> <entry key="appointment.reminder.ical">iCal email</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml index 1656ebe..cc6a1b8 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml @@ -1783,6 +1783,9 @@ <entry key="room.type.conference">conference (1-25 users)</entry> <entry key="room.type.restricted">restricted (1-150 users)</entry> <entry key="room.type.interview">interview (1:1 meeting with recording)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">do not send notification</entry> <entry key="appointment.reminder.email">simple email</entry> <entry key="appointment.reminder.ical">iCal email</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml index 0af6ca8..a43e6d3 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml @@ -1783,6 +1783,9 @@ <entry key="room.type.conference">conference (1-25 users)</entry> <entry key="room.type.restricted">restricted (1-150 users)</entry> <entry key="room.type.interview">interview (1:1 meeting with recording)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">do not send notification</entry> <entry key="appointment.reminder.email">simple email</entry> <entry key="appointment.reminder.ical">iCal email</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml index 47b825a..ac91a39 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml @@ -1784,6 +1784,9 @@ <entry key="room.type.conference">конÑеÑÐµÐ½Ñ Ð·Ð°Ð» (1-25 ÑÑаÑÑников)</entry> <entry key="room.type.restricted">огÑаниÑÐµÐ½Ð½Ð°Ñ (1-150 ÑÑаÑÑников)</entry> <entry key="room.type.interview">инÑеÑвÑÑ (1:1 вÑÑÑеÑа Ñ Ð·Ð°Ð¿Ð¸ÑÑÑ)</entry> + <entry key="room.type.conference.desc">"ÐемокÑаÑиÑнаÑ", Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ полÑзоваÑÐµÐ»Ñ ÐµÑÑÑ Ð¿Ñава на иÑполÑзование камеÑÑ Ð¸ микÑоÑона. Ðидео "ÑÑаÑÑÑеÑ" авÑомаÑиÑеÑки</entry> + <entry key="room.type.restricted.desc">"С огÑаниÑениÑми": ÐаждÑй полÑзоваÑÐµÐ»Ñ Ð´Ð¾Ð»Ð¶ÐµÐ½ полÑÑиÑÑ Ð¿Ñава на иÑполÑзование камеÑÑ/микÑоÑона</entry> + <entry key="room.type.interview.desc">ÑолÑко 2 полÑзоваÑÐµÐ»Ñ Ð¼Ð¾Ð³ÑÑ Ð¸ÑполÑзоваÑÑ ÐºÐ°Ð¼ÐµÑÑ/микÑоÑон (в комнаÑе Ð¼Ð¾Ð¶ÐµÑ Ð½Ð°Ñ Ð¾Ð´Ð¸ÑÑÑÑ Ð»Ñбое колиÑеÑÑво ÑÑаÑÑников, модеÑаÑÐ¾Ñ Ð¼Ð¾Ð¶ÐµÑ Ð¼ÐµÐ½ÑÑÑ Ð²ÑÑÑÑпаÑÑÐ¸Ñ )</entry> <entry key="appointment.reminder.none">не поÑÑлаÑÑ Ñведомление</entry> <entry key="appointment.reminder.email">обÑÑнÑй e-майл</entry> <entry key="appointment.reminder.ical">iCal e-майл</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml index d990179..d576bf4 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml @@ -1783,6 +1783,9 @@ <entry key="room.type.conference">conference (1-25 users)</entry> <entry key="room.type.restricted">restricted (1-150 users)</entry> <entry key="room.type.interview">interview (1:1 meeting with recording)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">do not send notification</entry> <entry key="appointment.reminder.email">simple email</entry> <entry key="appointment.reminder.ical">iCal email</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml index 6e2c044..d4b6fa4 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml @@ -1783,6 +1783,9 @@ <entry key="room.type.conference">conference (1-25 users)</entry> <entry key="room.type.restricted">restricted (1-150 users)</entry> <entry key="room.type.interview">interview (1:1 meeting with recording)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">do not send notification</entry> <entry key="appointment.reminder.email">simple email</entry> <entry key="appointment.reminder.ical">iCal email</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml index 3ba738a..dc1723e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml @@ -1783,6 +1783,9 @@ <entry key="room.type.conference">conference (1-25 users)</entry> <entry key="room.type.restricted">restricted (1-150 users)</entry> <entry key="room.type.interview">interview (1:1 meeting with recording)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">do not send notification</entry> <entry key="appointment.reminder.email">simple email</entry> <entry key="appointment.reminder.ical">iCal email</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml index 63a40a6..abc42d8 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml @@ -1783,6 +1783,9 @@ <entry key="room.type.conference">conference (1-25 users)</entry> <entry key="room.type.restricted">restricted (1-150 users)</entry> <entry key="room.type.interview">interview (1:1 meeting with recording)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">do not send notification</entry> <entry key="appointment.reminder.email">simple email</entry> <entry key="appointment.reminder.ical">iCal email</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml index effeee4..5c2674b 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml @@ -1785,6 +1785,9 @@ <entry key="room.type.conference">конÑеÑенÑ-зал (1-25 ÑÑаÑникÑв)</entry> <entry key="room.type.restricted">обмежена (1-150 ÑÑаÑникÑв)</entry> <entry key="room.type.interview">ÑнÑеÑв'Ñ (1:1 зÑÑÑÑÑÑ Ñз запиÑом)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">не поÑилаÑи повÑдомленнÑ</entry> <entry key="appointment.reminder.email">звиÑайний e-майл</entry> <entry key="appointment.reminder.ical">iCal e-майл</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml index fbb811d..4d85a9a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml @@ -1773,6 +1773,9 @@ <entry key="room.type.conference">ä¼è®®å®¤ (1-25 ç¨æ·)</entry> <entry key="room.type.restricted">éå¶æ§ç (1-150 ç¨æ·)</entry> <entry key="room.type.interview">çº¦è§ (1:1 ä¼è§å¹¶è®°å½)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">ä¸åééç¥</entry> <entry key="appointment.reminder.email">ç®åçµåé®ä»¶</entry> <entry key="appointment.reminder.ical">iCalçµåé®ä»¶</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml index 214145f..c8b23bc 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml @@ -1783,6 +1783,9 @@ <entry key="room.type.conference">conference (1-25 users)</entry> <entry key="room.type.restricted">restricted (1-150 users)</entry> <entry key="room.type.interview">interview (1:1 meeting with recording)</entry> + <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry> + <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry> + <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry> <entry key="appointment.reminder.none">do not send notification</entry> <entry key="appointment.reminder.email">simple email</entry> <entry key="appointment.reminder.ical">iCal email</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java index 1339a2d..b9e01fc 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java @@ -103,7 +103,6 @@ public abstract class BasePage extends AsyncUrlFragmentAwarePage { , RuntimeConfigurationType.DEVELOPMENT == getApplication().getConfigurationType() ? "" : "min."))); if (isRtl()) { response.render(CssHeaderItem.forUrl("css/theme-rtl.css")); - response.render(CssHeaderItem.forUrl("css/admin-rtl.css")); } if (!Strings.isEmpty(getGaCode())) { response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(BasePage.class, "om-ga.js")))); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.html index 734fdb0..3bef8d5 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.html @@ -23,11 +23,12 @@ <table class="room-list"> <tr wicket:id="list" class="room-row"> <td> - <div wicket:id="roomContainer"> - <span wicket:id="roomName">[room name]</span><br/> - <wicket:message key="398" /> <span wicket:id="curUsers"></span> / <span - wicket:id="totalUsers"></span> <span wicket:id="refresh" - class="ui-icon ui-icon-arrowrefresh-1-n" style="display: inline-block"></span> + <div wicket:id="roomContainer"> + <div><span wicket:id="roomName">[room name]</span> <span wicket:id="info" class="info-text"> </span></div> + <div> + <wicket:message key="398" /> <span wicket:id="curUsers"></span> / <span + wicket:id="totalUsers"></span> <span wicket:id="refresh"> </span> + </div> </div> </td> <td><button wicket:id="btn"><span wicket:id="label"></span></button></td> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java index 5232a98..454300f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java @@ -24,9 +24,9 @@ import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.web.app.Application; import org.apache.openmeetings.web.common.UserPanel; import org.apache.openmeetings.web.pages.MainPage; +import org.apache.wicket.AttributeModifier; import org.apache.wicket.ajax.AjaxEventBehavior; import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; @@ -34,7 +34,12 @@ import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.model.Model; +import com.googlecode.wicket.jquery.core.JQueryBehavior; +import com.googlecode.wicket.jquery.core.Options; +import com.googlecode.wicket.jquery.ui.JQueryIcon; import com.googlecode.wicket.jquery.ui.form.button.Button; +import com.googlecode.wicket.jquery.ui.markup.html.link.AjaxLink; +import com.googlecode.wicket.jquery.ui.widget.tooltip.TooltipBehavior; public class RoomListPanel extends UserPanel { private static final long serialVersionUID = 1L; @@ -59,6 +64,9 @@ public class RoomListPanel extends UserPanel { } })); roomContainer.add(new Label("roomName", r.getName())); + final WebMarkupContainer info = new WebMarkupContainer("info"); + roomContainer.add(info.setOutputMarkupId(true) + .add(AttributeModifier.append("title", getString(String.format("room.type.%s.desc", r.getType().name()))))); final Label curUsers = new Label("curUsers", new Model<>(Application.getRoomClients(r.getId()).size())); roomContainer.add(curUsers.setOutputMarkupId(true)); roomContainer.add(new Label("totalUsers", r.getNumberOfPartizipants())); @@ -70,7 +78,7 @@ public class RoomListPanel extends UserPanel { onRoomEnter(target, roomId); } })); - roomContainer.add(new AjaxLink<Void>("refresh") { + roomContainer.add(new AjaxLink<String>("refresh") { private static final long serialVersionUID = 1L; @Override @@ -78,9 +86,16 @@ public class RoomListPanel extends UserPanel { target.add(curUsers.setDefaultModelObject(Application.getRoomClients(r.getId()).size())); onRefreshClick(target, r); } + + @Override + public void onConfigure(JQueryBehavior behavior) { + behavior.setOption("icon", Options.asString(JQueryIcon.REFRESH)); + behavior.setOption("showLabel", false); + } }); } }); + add(new TooltipBehavior(".info-text")); } public void update(IPartialPageRequestHandler handler, List<Room> rooms) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/webapp/css/admin-rtl.css ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/admin-rtl.css b/openmeetings-web/src/main/webapp/css/admin-rtl.css deleted file mode 100644 index 30eda1e..0000000 --- a/openmeetings-web/src/main/webapp/css/admin-rtl.css +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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. - */ -.adminForm label, .adminForm input, .adminForm select, .adminForm textarea { - float: right !important; -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/webapp/css/admin.css ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/admin.css b/openmeetings-web/src/main/webapp/css/admin.css deleted file mode 100644 index 9cfcb59..0000000 --- a/openmeetings-web/src/main/webapp/css/admin.css +++ /dev/null @@ -1,356 +0,0 @@ -/* - * 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. - */ -.adminPanel { - min-width: 1070px; -} -/* - ################################ - Column layout admin section - ################################ - */ -.adminPanelColumnTable { - display: inline-block; - vertical-align: top; -} - -table.adminListTable { - max-width: 518px; - min-width: 518px; -} - -table.adminListTable tr:nth-child(odd), table.adminListTableSmall tr:nth-child(odd) { - opacity: .8; -} - -table.adminListTable tr:hover, table.adminListTableSmall tr:hover { - /*SHOULD BE MANUALLY IN SYNC WITH THEME .ui-state-hover */ - border: 1px solid #74b2e2; - background: #e4f1fb; - font-weight: normal; - color: #0070a3; -} - -table.adminListTable th.two_column_layout_column1 { - width: 136px; -} - -table.adminListTable th.two_column_layout_column2 { - width: 354px; -} - -table.adminListTable td.two_column_layout_column1 { - width: 136px; -} - -table.adminListTable td.two_column_layout_column2 { - width: 354px; -} - -table.adminListTable td div.two_column_layout_divcolumn1 { - word-wrap: break-word; - width: 136px; -} - -table.adminListTable td div.two_column_layout_divcolumn2 { - word-wrap: break-word; - width: 354px; -} - -table.adminListTable th.three_column_layout_column1 { - width: 96px; -} - -table.adminListTable th.three_column_layout_column2 { - width: 150px; -} - -table.adminListTable th.three_column_layout_column3 { - width: 244px; -} - -.rooms table.adminListTable th.three_column_layout_column1 { - width: 46px; -} - -.rooms table.adminListTable th.three_column_layout_column2 { - width: 370px; -} - -.rooms table.adminListTable th.three_column_layout_column3 { - width: 74px; -} - -table.adminListTableSmall th.three_column_layout_column1 { - width: 50px; -} - -table.adminListTableSmall th.three_column_layout_column2 { - width: 50px; -} - -table.adminListTableSmall th.three_column_layout_column3 { - width: 218px; -} -table.adminListTableSmall th.three_column_layout_column4 { - width: 150px; -} -table.adminListTableSmall th.three_column_layout_column5 { - width: 50px; -} - -table.adminListTable td.three_column_layout_column1 { - width: 96px; -} - -table.adminListTable td.three_column_layout_column2 { - width: 150px; -} - -table.adminListTable td.three_column_layout_column3 { - width: 244px; -} - -table.adminListTableSmall td.three_column_layout_column1 { - width: 50px; -} - -table.adminListTableSmall td.three_column_layout_column2 { - width: 50px; -} - -table.adminListTableSmall td.three_column_layout_column3 { - width: 218px; -} -table.adminListTableSmall td.three_column_layout_column4 { - width: 150px; -} -table.adminListTableSmall td.three_column_layout_column5 { - width: 50px; -} - -table.adminListTable td div.three_column_layout_divcolumn1 { - word-wrap: break-word; - width: 96px; -} - -table.adminListTable td div.three_column_layout_divcolumn2 { - word-wrap: break-word; - width: 150px; -} - -table.adminListTable td div.three_column_layout_divcolumn3 { - word-wrap: break-word; - width: 244px; -} - -.rooms table.adminListTable td div.three_column_layout_divcolumn1 { - word-wrap: break-word; - width: 44px; -} - -.rooms table.adminListTable td div.three_column_layout_divcolumn2 { - word-wrap: break-word; - width: 382px; -} - -.rooms table.adminListTable td div.three_column_layout_divcolumn3 { - word-wrap: break-word; - width: 74px; -} - -table.adminListTableSmall td div.three_column_layout_divcolumn1 { - width: 50px; -} - -table.adminListTableSmall td div.three_column_layout_divcolumn2 { - width: 50px; -} - -table.adminListTableSmall td div.three_column_layout_divcolumn3 { - width: 218px; -} - -table.adminListTableSmall td div.three_column_layout_divcolumn4 { - width: 150px; -} - -table.adminListTableSmall td div.three_column_layout_divcolumn5 { - width: 50px; -} - -table.adminListTable th.four_column_layout_column1 { - width: 96px; -} - -table.adminListTable th.four_column_layout_column2 { - width: 130px; -} - -table.adminListTable th.four_column_layout_column3 { - width: 132px; -} - -table.adminListTable th.four_column_layout_column4 { - width: 132px; -} - -table.adminListTable td.four_column_layout_column1 { - width: 96px; -} - -table.adminListTable td.four_column_layout_column2 { - width: 130px; -} - -table.adminListTable td.four_column_layout_column3 { - width: 132px; -} - -table.adminListTable td.four_column_layout_column4 { - width: 132px; -} - -table.adminListTable td div.four_column_layout_divcolumn1 { - word-wrap: break-word; - width: 96px; -} - -table.adminListTable td div.four_column_layout_divcolumn2 { - word-wrap: break-word; - width: 130px; -} - -table.adminListTable td div.four_column_layout_divcolumn3 { - word-wrap: break-word; - width: 132px; -} - -table.adminListTable td div.four_column_layout_divcolumn4 { - word-wrap: break-word; - width: 132px; -} -table.adminListTable .one_sixth { - width: 16.67%; -} -.adminPanelColumnForm { - display: inline-block; - vertical-align: top; - margin-top: 2px; -} - -.adminPanelColumnForm div.scrollcontent { - vertical-align: top; - height: 500px; - overflow-y: scroll; -} - -.adminForm { - -} -.adminForm .btn { - width: 280px; -} -.adminForm .input, .adminForm input, .adminForm input.formcheckbox - ,.adminForm textarea, .adminForm select, .adminForm label - { - display: block; - float: left; - font-size: 14px; - padding: 0px 0px; - margin: 2px 2px; -} -.adminForm .input { - border: solid 1px #aacfe4; - width: 280px; - min-height: 20px; - white-space: initial; -} -.adminForm input { - border: solid 1px #aacfe4; - width: 280px; - height: 20px; -} -.adminForm input[type=checkbox], .adminForm input[type=radio] { - width: auto; -} -.adminForm input.formcheckbox { - border: none; - width: 20px; - height: 20px; -} - -.adminForm fieldset { - margin-top: 4px; - padding: 4px; -} - -.adminForm legend { - padding: 0.2em 0.5em; - margin: 0px 10px; - font-style: italic; - text-align: right; -} - -.adminForm textarea { - border: solid 1px #aacfe4; - width: 280px; - height: 60px; -} - -.adminForm div.formelement { - display: block; - clear: both; - max-width: 540px; - white-space: nowrap; -} - -.adminForm select { - height: 20px; - border: solid 1px #aacfe4; - width: 282px; -} - -.adminForm label { - font-weight: bold; - text-align: right; - width: 180px; - white-space: normal; -} -.adminForm .group.logo .profile img { - height: 16px; - width: auto; -} -.adminBackupForm div.formelement { - display: block; - clear: both; - max-width: 1240px; -} -.adminFormsFeedbackPanel { - position: fixed; - left:550px; - width: 480px; - bottom: 16px; - z-index:999; -} -.adminForm .newItem { - padding-left: 25px; - background-image: url(images/new.png); - background-repeat: no-repeat; - background-position: 5px; -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/webapp/css/forms.css ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/forms.css b/openmeetings-web/src/main/webapp/css/forms.css deleted file mode 100644 index 4caaace..0000000 --- a/openmeetings-web/src/main/webapp/css/forms.css +++ /dev/null @@ -1,83 +0,0 @@ -/* - * 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. - */ - - /**** FIXME TODO need to be unified with other icons used ****/ -div.formSaveBar { - height: 22px; -} -.addButton, .delButton { - display: inline-block; - cursor: pointer; - width: 18px; - height: 18px; - border: none; - margin-left: 2px; - margin-top: 2px; - vertical-align: super; -} -div.formSaveButton input { - background: url(images/disk.png) no-repeat; - float: left; - cursor: pointer; - width: 18px; - height: 18px; - border: none; - margin-left: 2px; - margin-top: 2px; -} -.addButton { - background: url(images/plus_icon.png) no-repeat; -} -.delButton { - background: url(images/cancel_icon.png) no-repeat; -} -.formNewButton { - background: url(images/plus_icon.png) no-repeat; - float: left; - cursor: pointer; - width: 18px; - height: 18px; - border: none; - margin-left: 2px; - margin-top: 2px; -} -.formNewButton.disabled { - background: url(images/plus_icon_disabled.png) no-repeat; -} -div.formRefreshButton input { - background: url(images/arrow_refresh_small.png) no-repeat; - float: left; - cursor: pointer; - width: 18px; - height: 18px; - border: none; - margin-left: 2px; - margin-top: 2px; -} -.formCancelButton { - background: url(images/cancel_icon.png) no-repeat; - display: inline-block; - float: left; - cursor: pointer; - width: 18px; - height: 18px; - border: none; - margin-left: 2px; - margin-top: 2px; -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/webapp/css/theme-rtl.css ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/theme-rtl.css b/openmeetings-web/src/main/webapp/css/theme-rtl.css index 38d506d..8eca0c8 100644 --- a/openmeetings-web/src/main/webapp/css/theme-rtl.css +++ b/openmeetings-web/src/main/webapp/css/theme-rtl.css @@ -90,6 +90,9 @@ span.css-emoticon { } .chat.dropdown-menu { left: initial !important; - right: -50px !important; + right: -50px !important; + float: right !important; +} +.adminForm label, .adminForm input, .adminForm select, .adminForm textarea { float: right !important; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1ab1ad72/openmeetings-web/src/main/webapp/css/theme.css ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/theme.css b/openmeetings-web/src/main/webapp/css/theme.css index 1457d6c..2baf20e 100644 --- a/openmeetings-web/src/main/webapp/css/theme.css +++ b/openmeetings-web/src/main/webapp/css/theme.css @@ -196,7 +196,7 @@ html, body { width: inherit; height: inherit; } -.start_step1, .start_step2, .start_step3, .start_step4 { +.start_step1, .start_step2, .start_step3, .start_step4 { padding-left: 30px; background-position: left top; margin: 5px 0px 5px 0px; @@ -690,4 +690,404 @@ form .input { width: 75%; vertical-align: middle; } + /**** FIXME TODO need to be unified with other icons used ****/ +div.formSaveBar { + height: 22px; +} +.addButton, .delButton { + display: inline-block; + cursor: pointer; + width: 18px; + height: 18px; + border: none; + margin-left: 2px; + margin-top: 2px; + vertical-align: super; +} +div.formSaveButton input { + background: url(images/disk.png) no-repeat; + float: left; + cursor: pointer; + width: 18px; + height: 18px; + border: none; + margin-left: 2px; + margin-top: 2px; +} +.addButton { + background: url(images/plus_icon.png) no-repeat; +} +.delButton { + background: url(images/cancel_icon.png) no-repeat; +} +.formNewButton { + background: url(images/plus_icon.png) no-repeat; + float: left; + cursor: pointer; + width: 18px; + height: 18px; + border: none; + margin-left: 2px; + margin-top: 2px; +} +.formNewButton.disabled { + background: url(images/plus_icon_disabled.png) no-repeat; +} +div.formRefreshButton input { + background: url(images/arrow_refresh_small.png) no-repeat; + float: left; + cursor: pointer; + width: 18px; + height: 18px; + border: none; + margin-left: 2px; + margin-top: 2px; +} +.formCancelButton { + background: url(images/cancel_icon.png) no-repeat; + display: inline-block; + float: left; + cursor: pointer; + width: 18px; + height: 18px; + border: none; + margin-left: 2px; + margin-top: 2px; +} +.adminPanel { + min-width: 1070px; +} +/* +################################ + Column layout admin section +################################ + */ +.adminPanelColumnTable { + display: inline-block; + vertical-align: top; +} + +table.adminListTable { + max-width: 518px; + min-width: 518px; +} + +table.adminListTable tr:nth-child(odd), table.adminListTableSmall tr:nth-child(odd) { + opacity: .8; +} +table.adminListTable tr:hover, table.adminListTableSmall tr:hover, tr.room-row:hover { + /*SHOULD BE MANUALLY IN SYNC WITH THEME .ui-state-hover */ + border: 1px solid #74b2e2; + background: #e4f1fb; + font-weight: normal; + color: #0070a3; +} + +table.adminListTable th.two_column_layout_column1 { + width: 136px; +} + +table.adminListTable th.two_column_layout_column2 { + width: 354px; +} + +table.adminListTable td.two_column_layout_column1 { + width: 136px; +} + +table.adminListTable td.two_column_layout_column2 { + width: 354px; +} + +table.adminListTable td div.two_column_layout_divcolumn1 { + word-wrap: break-word; + width: 136px; +} + +table.adminListTable td div.two_column_layout_divcolumn2 { + word-wrap: break-word; + width: 354px; +} + +table.adminListTable th.three_column_layout_column1 { + width: 96px; +} + +table.adminListTable th.three_column_layout_column2 { + width: 150px; +} + +table.adminListTable th.three_column_layout_column3 { + width: 244px; +} + +.rooms table.adminListTable th.three_column_layout_column1 { + width: 46px; +} + +.rooms table.adminListTable th.three_column_layout_column2 { + width: 370px; +} + +.rooms table.adminListTable th.three_column_layout_column3 { + width: 74px; +} + +table.adminListTableSmall th.three_column_layout_column1 { + width: 50px; +} + +table.adminListTableSmall th.three_column_layout_column2 { + width: 50px; +} + +table.adminListTableSmall th.three_column_layout_column3 { + width: 218px; +} +table.adminListTableSmall th.three_column_layout_column4 { + width: 150px; +} +table.adminListTableSmall th.three_column_layout_column5 { + width: 50px; +} + +table.adminListTable td.three_column_layout_column1 { + width: 96px; +} + +table.adminListTable td.three_column_layout_column2 { + width: 150px; +} + +table.adminListTable td.three_column_layout_column3 { + width: 244px; +} + +table.adminListTableSmall td.three_column_layout_column1 { + width: 50px; +} + +table.adminListTableSmall td.three_column_layout_column2 { + width: 50px; +} + +table.adminListTableSmall td.three_column_layout_column3 { + width: 218px; +} +table.adminListTableSmall td.three_column_layout_column4 { + width: 150px; +} +table.adminListTableSmall td.three_column_layout_column5 { + width: 50px; +} + +table.adminListTable td div.three_column_layout_divcolumn1 { + word-wrap: break-word; + width: 96px; +} + +table.adminListTable td div.three_column_layout_divcolumn2 { + word-wrap: break-word; + width: 150px; +} + +table.adminListTable td div.three_column_layout_divcolumn3 { + word-wrap: break-word; + width: 244px; +} + +.rooms table.adminListTable td div.three_column_layout_divcolumn1 { + word-wrap: break-word; + width: 44px; +} + +.rooms table.adminListTable td div.three_column_layout_divcolumn2 { + word-wrap: break-word; + width: 382px; +} + +.rooms table.adminListTable td div.three_column_layout_divcolumn3 { + word-wrap: break-word; + width: 74px; +} + +table.adminListTableSmall td div.three_column_layout_divcolumn1 { + width: 50px; +} + +table.adminListTableSmall td div.three_column_layout_divcolumn2 { + width: 50px; +} + +table.adminListTableSmall td div.three_column_layout_divcolumn3 { + width: 218px; +} + +table.adminListTableSmall td div.three_column_layout_divcolumn4 { + width: 150px; +} + +table.adminListTableSmall td div.three_column_layout_divcolumn5 { + width: 50px; +} + +table.adminListTable th.four_column_layout_column1 { + width: 96px; +} + +table.adminListTable th.four_column_layout_column2 { + width: 130px; +} + +table.adminListTable th.four_column_layout_column3 { + width: 132px; +} + +table.adminListTable th.four_column_layout_column4 { + width: 132px; +} + +table.adminListTable td.four_column_layout_column1 { + width: 96px; +} + +table.adminListTable td.four_column_layout_column2 { + width: 130px; +} + +table.adminListTable td.four_column_layout_column3 { + width: 132px; +} + +table.adminListTable td.four_column_layout_column4 { + width: 132px; +} + +table.adminListTable td div.four_column_layout_divcolumn1 { + word-wrap: break-word; + width: 96px; +} + +table.adminListTable td div.four_column_layout_divcolumn2 { + word-wrap: break-word; + width: 130px; +} + +table.adminListTable td div.four_column_layout_divcolumn3 { + word-wrap: break-word; + width: 132px; +} + +table.adminListTable td div.four_column_layout_divcolumn4 { + word-wrap: break-word; + width: 132px; +} +table.adminListTable .one_sixth { + width: 16.67%; +} +.adminPanelColumnForm { + display: inline-block; + vertical-align: top; + margin-top: 2px; +} + +.adminPanelColumnForm div.scrollcontent { + vertical-align: top; + height: 500px; + overflow-y: scroll; +} + +.adminForm { +} +.adminForm .btn { + width: 280px; +} +.adminForm .input, .adminForm input, .adminForm input.formcheckbox +,.adminForm textarea, .adminForm select, .adminForm label + { + display: block; + float: left; + font-size: 14px; + padding: 0px 0px; + margin: 2px 2px; +} +.adminForm .input { + border: solid 1px #aacfe4; + width: 280px; + min-height: 20px; + white-space: initial; +} +.adminForm input { + border: solid 1px #aacfe4; + width: 280px; + height: 20px; +} +.adminForm input[type=checkbox], .adminForm input[type=radio] { + width: auto; +} +.adminForm input.formcheckbox { + border: none; + width: 20px; + height: 20px; +} + +.adminForm fieldset { + margin-top: 4px; + padding: 4px; +} + +.adminForm legend { + padding: 0.2em 0.5em; + margin: 0px 10px; + font-style: italic; + text-align: right; +} + +.adminForm textarea { + border: solid 1px #aacfe4; + width: 280px; + height: 60px; +} + +.adminForm div.formelement { + display: block; + clear: both; + max-width: 540px; + white-space: nowrap; +} + +.adminForm select { + height: 20px; + border: solid 1px #aacfe4; + width: 282px; +} + +.adminForm label { + font-weight: bold; + text-align: right; + width: 180px; + white-space: normal; +} +.adminForm .group.logo .profile img { + height: 16px; + width: auto; +} +.adminBackupForm div.formelement { + display: block; + clear: both; + max-width: 1240px; +} +.adminFormsFeedbackPanel { + position: fixed; + left:550px; + width: 480px; + bottom: 16px; + z-index:999; +} +.adminForm .newItem { + padding-left: 25px; + background-image: url(images/new.png); + background-repeat: no-repeat; + background-position: 5px; +}
