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 2017/07/11 16:42:02 UTC
openmeetings git commit: [OPENMEETINGS-533] save to image is
implemented
Repository: openmeetings
Updated Branches:
refs/heads/master 17f3204a8 -> 563588791
[OPENMEETINGS-533] save to image is implemented
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/56358879
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/56358879
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/56358879
Branch: refs/heads/master
Commit: 563588791ebcf1a8618041f6ad7e4b5680bd4810
Parents: 17f3204
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Tue Jul 11 23:41:50 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Tue Jul 11 23:41:50 2017 +0700
----------------------------------------------------------------------
.../core/remote/ConferenceLibrary.java | 118 -------------------
.../web/app/Application.properties.xml | 8 +-
.../web/app/Application_ar.properties.xml | 8 +-
.../web/app/Application_bg.properties.xml | 8 +-
.../web/app/Application_ca.properties.xml | 8 +-
.../web/app/Application_cs.properties.xml | 8 +-
.../web/app/Application_da.properties.xml | 8 +-
.../web/app/Application_de.properties.xml | 8 +-
.../web/app/Application_el.properties.xml | 8 +-
.../web/app/Application_es.properties.xml | 8 +-
.../web/app/Application_fa.properties.xml | 8 +-
.../web/app/Application_fi.properties.xml | 8 +-
.../web/app/Application_fr.properties.xml | 8 +-
.../web/app/Application_gl.properties.xml | 8 +-
.../web/app/Application_hu.properties.xml | 8 +-
.../web/app/Application_id.properties.xml | 8 +-
.../web/app/Application_it.properties.xml | 8 +-
.../web/app/Application_ja.properties.xml | 8 +-
.../web/app/Application_ko.properties.xml | 8 +-
.../web/app/Application_nl.properties.xml | 8 +-
.../web/app/Application_pl.properties.xml | 8 +-
.../web/app/Application_pt.properties.xml | 8 +-
.../web/app/Application_pt_BR.properties.xml | 8 +-
.../web/app/Application_ru.properties.xml | 8 +-
.../web/app/Application_sk.properties.xml | 8 +-
.../web/app/Application_sv.properties.xml | 8 +-
.../web/app/Application_th.properties.xml | 8 +-
.../web/app/Application_tr.properties.xml | 8 +-
.../web/app/Application_uk.properties.xml | 8 +-
.../web/app/Application_zh_CN.properties.xml | 8 +-
.../web/app/Application_zh_TW.properties.xml | 8 +-
.../openmeetings/web/common/menu/MenuItem.java | 1 -
.../web/room/menu/RoomMenuPanel.java | 17 ++-
.../org/apache/openmeetings/web/room/wb/wb.js | 19 ++-
.../WEB-INF/classes/applicationContext.xml | 1 -
openmeetings-web/src/main/webapp/css/menu.css | 2 +-
36 files changed, 121 insertions(+), 277 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
deleted file mode 100644
index 230cc89..0000000
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
+++ /dev/null
@@ -1,118 +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.
- */
-package org.apache.openmeetings.core.remote;
-
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-
-import java.util.ArrayList;
-
-import org.apache.openmeetings.core.documents.LibraryChartLoader;
-import org.apache.openmeetings.core.documents.LibraryDocumentConverter;
-import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
-import org.apache.openmeetings.db.dao.server.SessiondataDao;
-import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.entity.file.FileExplorerItem;
-import org.apache.openmeetings.db.entity.file.FileItem.Type;
-import org.apache.openmeetings.db.entity.server.Sessiondata;
-import org.apache.openmeetings.db.util.AuthLevelUtil;
-import org.apache.openmeetings.util.OmFileHelper;
-import org.red5.logging.Red5LoggerFactory;
-import org.red5.server.api.service.IPendingServiceCall;
-import org.red5.server.api.service.IPendingServiceCallback;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- *
- * @author swagner
- *
- */
-public class ConferenceLibrary implements IPendingServiceCallback {
- private static final Logger log = Red5LoggerFactory.getLogger(ConferenceLibrary.class, webAppRootKey);
-
- @Autowired
- private SessiondataDao sessionDao;
- @Autowired
- private UserDao userDao;
- @Autowired
- private FileExplorerItemDao fileDao;
-
- /**
- *
- * Save an Object to the library and returns the file-explorer Id
- *
- * @param sid
- * @param roomId
- * @param fileName
- * @param tObjectRef
- * @return - file-explorer Id in case of success, -1 otherwise
- */
- public Long saveAsObject(String sid, Long roomId, String fileName, Object tObjectRef) {
- try {
- Sessiondata sd = sessionDao.check(sid);
- if (AuthLevelUtil.hasUserLevel(userDao.getRights(sd.getUserId()))) {
- // LinkedHashMap tObject = (LinkedHashMap)t;
- // ArrayList tObject = (ArrayList)t;
-
- log.debug("saveAsObject :1: " + tObjectRef);
- log.debug("saveAsObject :2: " + tObjectRef.getClass().getName());
-
- @SuppressWarnings("rawtypes")
- ArrayList tObject = (ArrayList) tObjectRef;
-
- log.debug("saveAsObject" + tObject.size());
-
- FileExplorerItem file = fileDao.add(fileName, null, null, roomId, sd.getUserId(), Type.WmlFile, "", "");
- LibraryDocumentConverter.writeToLocalFolder(file.getHash(), tObject);
-
- return file.getId();
- }
- } catch (Exception err) {
- log.error("[saveAsObject] ", err);
- }
- return -1L;
- }
-
- /**
- *
- * Loads a chart object
- *
- * @param sid
- * @param room_id
- * @param fileName
- * @return - chart object
- */
- @SuppressWarnings("rawtypes")
- public ArrayList loadChartObject(String sid, Long room_id, String fileName) {
- try {
- Sessiondata sd = sessionDao.check(sid);
- if (AuthLevelUtil.hasUserLevel(userDao.getRights(sd.getUserId()))) {
- return LibraryChartLoader.getInstance().loadChart(OmFileHelper.getUploadRoomDir(room_id.toString()), fileName);
- }
- } catch (Exception err) {
- log.error("[loadChartObject] ", err);
- }
- return null;
- }
-
- @Override
- public void resultReceived(IPendingServiceCall arg0) {
- // TODO Auto-generated method stub
- }
-}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 77241cf..956710e 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
@@ -573,11 +573,6 @@
<entry key="557">Pointer</entry>
<entry key="558">Synchronizing</entry>
<entry key="559">Synchronizing, please wait</entry>
- <entry key="560"><u>Download as SVG</u></entry>
- <entry key="561"><u>Download as PNG</u></entry>
- <entry key="562"><u>Download as JPG</u></entry>
- <entry key="563"><u>Download as PDF</u></entry>
- <entry key="564"><u>Download as TIF</u></entry>
<entry key="565">Notification type</entry>
<entry key="566">Category</entry>
<entry key="567">Repetition</entry>
@@ -1927,4 +1922,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Create a conference, quickly!</entry>
<entry key="widget.start.desc">{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.</entry>
+ <entry key="download.png">Download as PNG</entry>
+ <entry key="download.jpg">Download as JPG</entry>
+ <entry key="download.pdf">Download as PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 17e72f6..4f26fda 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
@@ -573,11 +573,6 @@
<entry key="557">المؤشر</entry>
<entry key="558">المزامنة</entry>
<entry key="559">مزامنة المستخدمين، الرجاء الإنتظار</entry>
- <entry key="560"><u>Download as SVG</u></entry>
- <entry key="561"><u>Download as PNG</u></entry>
- <entry key="562"><u>Download as JPG</u></entry>
- <entry key="563"><u>Download as PDF</u></entry>
- <entry key="564"><u>Download as TIF</u></entry>
<entry key="565">مذكرة:</entry>
<entry key="566">فئة:</entry>
<entry key="567">التكرار:</entry>
@@ -1927,4 +1922,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">الطريق إلى المؤتمر:</entry>
<entry key="widget.start.desc">{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.</entry>
+ <entry key="download.png">Download as PNG</entry>
+ <entry key="download.jpg">Download as JPG</entry>
+ <entry key="download.pdf">Download as PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 e69c7c6..49ad642 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
@@ -573,11 +573,6 @@
<entry key="557">Указател</entry>
<entry key="558">Синхронизация</entry>
<entry key="559">Синхронизация на потребители, моля изчакайте</entry>
- <entry key="560">&lt;u&gt;Сваляне в SVG&lt;/u&gt;</entry>
- <entry key="561">&lt;u&gt;Сваляне в PNG&lt;/u&gt;</entry>
- <entry key="562">&lt;u&gt;Сваляне в JPG&lt;/u&gt;</entry>
- <entry key="563">&lt;u&gt;Сваляне в PDF&lt;/u&gt;</entry>
- <entry key="564">&lt;u&gt;Сваляне в TIF&lt;/u&gt;</entry>
<entry key="565">Напомняне:</entry>
<entry key="566">Категория:</entry>
<entry key="567">Повтаряне:</entry>
@@ -1927,4 +1922,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Create a conference, quickly!</entry>
<entry key="widget.start.desc">{0}, your web conferencing platform. Моля, следвайте инструкциите и натиснете бутона Start, за да започнете конференция веднага или отидете в календара, за да планирате бъдеща конференция.</entry>
+ <entry key="download.png">Сваляне в PNG</entry>
+ <entry key="download.jpg">Сваляне в JPG</entry>
+ <entry key="download.pdf">Сваляне в PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 8a72fc9..98e2f46 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
@@ -573,11 +573,6 @@
<entry key="557">Punter</entry>
<entry key="558">Sincronitzant</entry>
<entry key="559">Sincronitzant usuaris. Per favor, esperi.</entry>
- <entry key="560"><u>Descarregar com SVG</u></entry>
- <entry key="561"><u>Descarregar com PNG</u></entry>
- <entry key="562"><u>Descarregar com JPG</u></entry>
- <entry key="563"><u>Descarregar com PDF</u></entry>
- <entry key="564"><u>Descarregar com TIF</u></entry>
<entry key="565">Recordi:</entry>
<entry key="566">Categoria:</entry>
<entry key="567">Repetició:</entry>
@@ -1927,4 +1922,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Instruccions Conferència:</entry>
<entry key="widget.start.desc">{0}, la seva Plataforma Web de Videoconferència. Només segueixi les instruccions, pressioni el botó per a iniciar immediatament o vagi al Calendari per a programar una Trobada més endavant.</entry>
+ <entry key="download.png">Descarregar com PNG</entry>
+ <entry key="download.jpg">Descarregar com JPG</entry>
+ <entry key="download.pdf">Descarregar com PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 e17caa7..5cc5fff 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
@@ -573,11 +573,6 @@
<entry key="557">Ukazovátko</entry>
<entry key="558">Synchronizuji</entry>
<entry key="559">Synchronizuji uživatele, čekejte prosím</entry>
- <entry key="560"><u>Načti jako SVG</u></entry>
- <entry key="561"><u>Načti jako PNG</u></entry>
- <entry key="562"><u>Načti jako JPG</u></entry>
- <entry key="563"><u>Načti jako PDF</u></entry>
- <entry key="564"><u>Načti jako TIF</u></entry>
<entry key="565">Připomínka:</entry>
<entry key="566">Kategorie:</entry>
<entry key="567">Opakování:</entry>
@@ -1927,4 +1922,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Create a conference, quickly!</entry>
<entry key="widget.start.desc">{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.</entry>
+ <entry key="download.png">Načti jako PNG</entry>
+ <entry key="download.jpg">Načti jako JPG</entry>
+ <entry key="download.pdf">Načti jako PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 de039be..c71d470 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
@@ -573,11 +573,6 @@
<entry key="557">Peger</entry>
<entry key="558">Synkroniserer</entry>
<entry key="559">Synkroniserer brugere, vent venligst</entry>
- <entry key="560"><u>Dovnload som SVG</u></entry>
- <entry key="561"><u>Download som PNG</u></entry>
- <entry key="562"><u>Download som JPG</u></entry>
- <entry key="563"><u>Download som PDF</u></entry>
- <entry key="564"><u>Download som TIF</u></entry>
<entry key="565">Påmindelse:</entry>
<entry key="566">Kategori:</entry>
<entry key="567">Repetition:</entry>
@@ -1927,4 +1922,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Sådan gør du</entry>
<entry key="widget.start.desc">{0}, konferenceplatform. Klik på startknappen for at starte en konference med det samme eller gå til din kalender for at planlægge et møde.</entry>
+ <entry key="download.png">Download som PNG</entry>
+ <entry key="download.jpg">Download som JPG</entry>
+ <entry key="download.pdf">Download som PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 03d6391..ddcaa92 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
@@ -573,11 +573,6 @@
<entry key="557">Pointer</entry>
<entry key="558">Synchronisiere</entry>
<entry key="559">Synchroniziere Benutzer, bitte warten Sie</entry>
- <entry key="560"><u>Download als SVG</u></entry>
- <entry key="561"><u>Download als PNG</u></entry>
- <entry key="562"><u>Download als JPG</u></entry>
- <entry key="563"><u>Download als PDF</u></entry>
- <entry key="564"><u>Download als TIF</u></entry>
<entry key="565">Erinnerung</entry>
<entry key="566">Kategorie</entry>
<entry key="567">Wiederholung</entry>
@@ -1932,4 +1927,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Wie starte ich eine Konferenz</entry>
<entry key="widget.start.desc">{0}, Ihre Web Konferenz Plattform. Entweder starten Sie sofort ein Meeting indem Sie den 1-2-3 Anweisungen folgen oder Sie benutzen "Meetings planen" um eine Konferenz zu planen.</entry>
+ <entry key="download.png">Download als PNG</entry>
+ <entry key="download.jpg">Download als JPG</entry>
+ <entry key="download.pdf">Download als PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 9df8ef8..21789ae 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
@@ -573,11 +573,6 @@
<entry key="557">Δείκτης</entry>
<entry key="558">Συγχρονισμός</entry>
<entry key="559">Συγχρονισμός Χρηστών. Παρακαλούμε περιμένετε.</entry>
- <entry key="560"><u>Αποθήκευση ως SVG</u></entry>
- <entry key="561"><u>Αποθήκευση ως PNG</u></entry>
- <entry key="562"><u>Αποθήκευση ως JPG</u></entry>
- <entry key="563"><u>Αποθήκευση ως PDF</u></entry>
- <entry key="564"><u>Αποθήκευση ως TIF</u></entry>
<entry key="565">Υπενθύμιση:</entry>
<entry key="566">Κατηγορία:</entry>
<entry key="567">Επανάληψη:</entry>
@@ -1927,4 +1922,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Διαδικασία Συνδιάσκεψης:</entry>
<entry key="widget.start.desc">{0}, Η Πλατφόρμα Σας για Web Συνδιασκέψεις. Μπορείτε να ακολουθήσετε τις Οδηγίες, να πατήσετε το κουμπί Έναρξης και να ξεκινήσετε αμέσως μια Συνδιάσκεψη ή να μετα-φερθείτε στο Ημερολόγιο και να προγραμματίσετε μια Συνδιάσκεψη για το μέλλον.</entry>
+ <entry key="download.png">Αποθήκευση ως PNG</entry>
+ <entry key="download.jpg">Αποθήκευση ως JPG</entry>
+ <entry key="download.pdf">Αποθήκευση ως PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 842c06a..d2ea552 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
@@ -573,11 +573,6 @@
<entry key="557">Puntero</entry>
<entry key="558">Sincronizando</entry>
<entry key="559">Sincronizando usuarios. Por favor, espere.</entry>
- <entry key="560"><u>Descargar como SVG</u></entry>
- <entry key="561"><u>Descargar como PNG</u></entry>
- <entry key="562"><u>Descargar como JPG</u></entry>
- <entry key="563"><u>Descargar como PDF</u></entry>
- <entry key="564"><u>Descargar como TIF</u></entry>
<entry key="565">Recuerde:</entry>
<entry key="566">Categoría:</entry>
<entry key="567">Repetición:</entry>
@@ -1927,4 +1922,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Instrucciones Conferencia:</entry>
<entry key="widget.start.desc">{0}, su Plataforma Web de Videoconferencia. Sólo siga las instrucciones, presione el botón para iniciar inmediatamente o vaya al Calendario para programar un Encuentro más adelante.</entry>
+ <entry key="download.png">Descargar como PNG</entry>
+ <entry key="download.jpg">Descargar como JPG</entry>
+ <entry key="download.pdf">Descargar como PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 071ce10..a8e3fb8 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
@@ -573,11 +573,6 @@
<entry key="557">Pointer</entry>
<entry key="558">Synchronizing</entry>
<entry key="559">Synchronizing Users, please wait</entry>
- <entry key="560"><u>Download as SVG</u></entry>
- <entry key="561"><u>Download as PNG</u></entry>
- <entry key="562"><u>Download as JPG</u></entry>
- <entry key="563"><u>Download as PDF</u></entry>
- <entry key="564"><u>Download as TIF</u></entry>
<entry key="565">Reminder:</entry>
<entry key="566">Category:</entry>
<entry key="567">Repetition:</entry>
@@ -1927,4 +1922,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Create a conference, quickly!</entry>
<entry key="widget.start.desc">{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.</entry>
+ <entry key="download.png">Download as PNG</entry>
+ <entry key="download.jpg">Download as JPG</entry>
+ <entry key="download.pdf">Download as PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 eb3fcf2..7bb2bdb 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
@@ -573,11 +573,6 @@
<entry key="557">Osoitin</entry>
<entry key="558">Synkronisoidaan</entry>
<entry key="559">Synkronisoidaan käyttäjiä, ole hyvä ja odota</entry>
- <entry key="560"><u>Lataa SVG</u></entry>
- <entry key="561"><u>Lataa PNG</u></entry>
- <entry key="562"><u>Lataa JPG</u></entry>
- <entry key="563"><u>Lataa PDF</u></entry>
- <entry key="564"><u>Lataa TIF</u></entry>
<entry key="565">Muistutus:</entry>
<entry key="566">Kategoria:</entry>
<entry key="567">Toisto:</entry>
@@ -1927,4 +1922,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Create a conference, quickly!</entry>
<entry key="widget.start.desc">{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.</entry>
+ <entry key="download.png">Lataa PNG</entry>
+ <entry key="download.jpg">Lataa JPG</entry>
+ <entry key="download.pdf">Lataa PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 f238358..b27423e 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
@@ -573,11 +573,6 @@
<entry key="557">Pointeur</entry>
<entry key="558">Synchronisation</entry>
<entry key="559">Synchronisation des utilisateurs, patientez s'il vous plait...</entry>
- <entry key="560"><u>Télécharger en SVG</u></entry>
- <entry key="561"><u>Télécharger en PNG</u></entry>
- <entry key="562"><u>Télécharger en JPG</u></entry>
- <entry key="563"><u>Télécharger en PDF</u></entry>
- <entry key="564"><u>Télécharger en TIF</u></entry>
<entry key="565">Rappel :</entry>
<entry key="566">Catégorie:</entry>
<entry key="567">Répétition:</entry>
@@ -1919,4 +1914,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Chronologie d'emploi:</entry>
<entry key="widget.start.desc">{0}, votre plateforme de conférence web. Suivez les instructions.<br/>Cliquez sur le bouton 'Début' pour commencer une réunion immédiatement ou allez au calendrier pour planifier une réunion.</entry>
+ <entry key="download.png">Télécharger en PNG</entry>
+ <entry key="download.jpg">Télécharger en JPG</entry>
+ <entry key="download.pdf">Télécharger en PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 1555bba..774663f 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
@@ -573,11 +573,6 @@
<entry key="557">Punteiro</entry>
<entry key="558">Sincronizando</entry>
<entry key="559">Sincronizando, por favor agarde</entry>
- <entry key="560"><u>Descargar como SVG</u></entry>
- <entry key="561"><u>Descargar como PNG</u></entry>
- <entry key="562"><u>Descargar como JPG</u></entry>
- <entry key="563"><u>Descargar como PDF</u></entry>
- <entry key="564"><u>Descargar como TIF</u></entry>
<entry key="565">Lembranza:</entry>
<entry key="566">Categoría:</entry>
<entry key="567">Repetición:</entry>
@@ -1927,4 +1922,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Instruccións «Conferencia»:</entry>
<entry key="widget.start.desc">{0}, a súa Plataforma Web de Videoconferencia. Tan só ten que segir as instruccións, prema no botón para iniciar unha conferencia inmediatamente ou vaia ao calendario para planificar unha conferencia para o futuro.</entry>
+ <entry key="download.png">Descargar como PNG</entry>
+ <entry key="download.jpg">Descargar como JPG</entry>
+ <entry key="download.pdf">Descargar como PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 fd2c6e6..5616f84 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
@@ -573,11 +573,6 @@
<entry key="557">Mutató</entry>
<entry key="558">Szinkronizálás</entry>
<entry key="559">Szinkronizálás a látogatókkal, kérem várjon</entry>
- <entry key="560"><u>Letöltés mint SVG</u></entry>
- <entry key="561"><u>Letöltés mint PNG</u></entry>
- <entry key="562"><u>Letöltés mint JPG</u></entry>
- <entry key="563"><u>Letöltés mint PDF</u></entry>
- <entry key="564"><u>Letöltés mint TIF</u></entry>
<entry key="565">Emlékeztető:</entry>
<entry key="566">Kategória:</entry>
<entry key="567">Ismétlés:</entry>
@@ -1915,4 +1910,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Hogyan indíthat konferenciát</entry>
<entry key="widget.start.desc">{0}, az Ön webkonferencia platformja. Kövesse az utasításokat és gombnyomásra nyithat egy konferenciát, vagy bejegyezhet a naptárba és beállíthat egy előadást előre.</entry>
+ <entry key="download.png">Letöltés mint PNG</entry>
+ <entry key="download.jpg">Letöltés mint JPG</entry>
+ <entry key="download.pdf">Letöltés mint PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 5c2dac6..631cda4 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
@@ -573,11 +573,6 @@
<entry key="557">Pointer</entry>
<entry key="558">Synchronizing</entry>
<entry key="559">Synchronizing Users, please wait</entry>
- <entry key="560"><u>Download as SVG</u></entry>
- <entry key="561"><u>Download as PNG</u></entry>
- <entry key="562"><u>Download as JPG</u></entry>
- <entry key="563"><u>Download as PDF</u></entry>
- <entry key="564"><u>Download as TIF</u></entry>
<entry key="565">Reminder:</entry>
<entry key="566">Category:</entry>
<entry key="567">Repetition:</entry>
@@ -1927,4 +1922,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Create a conference, quickly!</entry>
<entry key="widget.start.desc">{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.</entry>
+ <entry key="download.png">Download as PNG</entry>
+ <entry key="download.jpg">Download as JPG</entry>
+ <entry key="download.pdf">Download as PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 ad653bb..01efafe 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
@@ -573,11 +573,6 @@
<entry key="557">Puntatore</entry>
<entry key="558">Sincronizzazione</entry>
<entry key="559">Sincronizzazione, prego attendere</entry>
- <entry key="560">Scarica come SVG</entry>
- <entry key="561">Scarica come PNG</entry>
- <entry key="562">Scarica come JPG</entry>
- <entry key="563">Scarica come PDF</entry>
- <entry key="564">Scarica come TIF</entry>
<entry key="565">Tipo di notifica</entry>
<entry key="566">Categoria</entry>
<entry key="567">Ripetizione</entry>
@@ -1929,4 +1924,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Come fare una videoconferenza:</entry>
<entry key="widget.start.desc">{0}, la tua piattaforma di videoconferenza. Segui le istruzioni premendo il tasto inizio per cominciare una videoconferenza o pianifica una conferenza dal Calendario.</entry>
+ <entry key="download.png">Scarica come PNG</entry>
+ <entry key="download.jpg">Scarica come JPG</entry>
+ <entry key="download.pdf">Scarica come PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 5c54da2..43ad3e7 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
@@ -573,11 +573,6 @@
<entry key="557">ポインタ</entry>
<entry key="558">同期しています</entry>
<entry key="559">ユーザーを同期しています。しばらくお待ちください。</entry>
- <entry key="560"><u>SVGとしてダウンロード</u></entry>
- <entry key="561"><u>PNGとしてダウンロード</u></entry>
- <entry key="562"><u>JPGとしてダウンロード</u></entry>
- <entry key="563"><u>PDFとしてダウンロード</u></entry>
- <entry key="564"><u>TIFとしてダウンロード</u></entry>
<entry key="565">リマインダ:</entry>
<entry key="566">カテゴリ:</entry>
<entry key="567">繰り返し:</entry>
@@ -1927,4 +1922,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">使用方法:</entry>
<entry key="widget.start.desc">{0} (オープン・ミーティングス) ウェブ会議プラットホーム</entry>
+ <entry key="download.png">PNGとしてダウンロード</entry>
+ <entry key="download.jpg">JPGとしてダウンロード</entry>
+ <entry key="download.pdf">PDFとしてダウンロード</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 a25b0f6..164f9ce 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
@@ -575,11 +575,6 @@
<entry key="557">Pointer</entry>
<entry key="558">Synchronizing</entry>
<entry key="559">Synchronizing Users, please wait</entry>
- <entry key="560"><u>Download as SVG</u></entry>
- <entry key="561"><u>Download as PNG</u></entry>
- <entry key="562"><u>Download as JPG</u></entry>
- <entry key="563"><u>Download as PDF</u></entry>
- <entry key="564"><u>Download as TIF</u></entry>
<entry key="565">Reminder:</entry>
<entry key="566">Category:</entry>
<entry key="567">Repetition:</entry>
@@ -1929,4 +1924,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Create a conference, quickly!</entry>
<entry key="widget.start.desc">{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.</entry>
+ <entry key="download.png">Download as PNG</entry>
+ <entry key="download.jpg">Download as JPG</entry>
+ <entry key="download.pdf">Download as PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 b96749e..1ef8dd3 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
@@ -573,11 +573,6 @@
<entry key="557">Aanwijzer</entry>
<entry key="558">Synchronisatie</entry>
<entry key="559">Aan het synchroniseren. Even geduld aub</entry>
- <entry key="560"><u>Opslaan als SVG</u></entry>
- <entry key="561"><u>Opslaan als PNG</u></entry>
- <entry key="562"><u>Opslaan als JPG</u></entry>
- <entry key="563"><u>Opslaan als PDF</u></entry>
- <entry key="564"><u>Opslaan als TIF</u></entry>
<entry key="565">Herinnering:</entry>
<entry key="566">Categorie:</entry>
<entry key="567">Herhaling:</entry>
@@ -1927,4 +1922,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Create a conference, quickly!</entry>
<entry key="widget.start.desc">{0}, your web conferencing platform. Kies voor BEGIN om meteen een overleg te starten of ga naar de kalendar om iets te plannen.</entry>
+ <entry key="download.png">Opslaan als PNG</entry>
+ <entry key="download.jpg">Opslaan als JPG</entry>
+ <entry key="download.pdf">Opslaan als PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 937b7ed..be534e0 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
@@ -573,11 +573,6 @@
<entry key="557">Wskaźnik</entry>
<entry key="558">Synchronizuję</entry>
<entry key="559">Synchronizuję użytkowników, proszę czekać</entry>
- <entry key="560"><u>Pobierz jako SVG</u></entry>
- <entry key="561"><u>Pobierz jako PNG</u></entry>
- <entry key="562"><u>Pobierz jako JPG</u></entry>
- <entry key="563"><u>Pobierz jako PDF</u></entry>
- <entry key="564"><u>Pobierz jako TIF</u></entry>
<entry key="565">Typ zaproszenia:</entry>
<entry key="566">Kategoria:</entry>
<entry key="567">Powtarzanie:</entry>
@@ -1927,4 +1922,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Create a conference, quickly!</entry>
<entry key="widget.start.desc">{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.</entry>
+ <entry key="download.png">Pobierz jako PNG</entry>
+ <entry key="download.jpg">Pobierz jako JPG</entry>
+ <entry key="download.pdf">Pobierz jako PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 cc6a1b8..caf71a6 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
@@ -573,11 +573,6 @@
<entry key="557">Pointer</entry>
<entry key="558">Synchronizing</entry>
<entry key="559">Synchronizing Users, please wait</entry>
- <entry key="560"><u>Download as SVG</u></entry>
- <entry key="561"><u>Download as PNG</u></entry>
- <entry key="562"><u>Download as JPG</u></entry>
- <entry key="563"><u>Download as PDF</u></entry>
- <entry key="564"><u>Download as TIF</u></entry>
<entry key="565">Reminder:</entry>
<entry key="566">Category:</entry>
<entry key="567">Repetition:</entry>
@@ -1927,4 +1922,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Create a conference, quickly!</entry>
<entry key="widget.start.desc">{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.</entry>
+ <entry key="download.png">Download as PNG</entry>
+ <entry key="download.jpg">Download as JPG</entry>
+ <entry key="download.pdf">Download as PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 a43e6d3..f911686 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
@@ -573,11 +573,6 @@
<entry key="557">Ponteiro</entry>
<entry key="558">Sincronizando</entry>
<entry key="559">Sincronizando usuários, aguarde.</entry>
- <entry key="560"><u>Download como SVG</u></entry>
- <entry key="561"><u>Download como PNG</u></entry>
- <entry key="562"><u>Download como JPG</u></entry>
- <entry key="563"><u>Download como PDF</u></entry>
- <entry key="564"><u>Download como TIF</u></entry>
<entry key="565">Lembrete:</entry>
<entry key="566">Categoria:</entry>
<entry key="567">Repetição:</entry>
@@ -1927,4 +1922,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Passos para a conferência:</entry>
<entry key="widget.start.desc">{0}, sua plataforma de conferência web. Você pode seguir os passos 1-2-3 para entrar em uma sala de conferência diretamente ou selecione a opcão calendário para planejar uma reunião.</entry>
+ <entry key="download.png">Download como PNG</entry>
+ <entry key="download.jpg">Download como JPG</entry>
+ <entry key="download.pdf">Download como PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 ac91a39..7d1159b 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
@@ -573,11 +573,6 @@
<entry key="557">Указатель</entry>
<entry key="558">Синхронизация</entry>
<entry key="559">Синхронизация участников, подождите</entry>
- <entry key="560"></entry>
- <entry key="561"></entry>
- <entry key="562"></entry>
- <entry key="563"></entry>
- <entry key="564"></entry>
<entry key="565">Напоминатель:</entry>
<entry key="566">Категория:</entry>
<entry key="567">Повторение:</entry>
@@ -1928,4 +1923,7 @@
<entry key="widget.start.title">Быстрый старт</entry>
<entry key="widget.start.header">Как участвовать в конференции</entry>
<entry key="widget.start.desc">{0}, платформа ваших веб-конференций. Вы можете 1) следуя инструкциям, нажать кнопку "Старт" и участвовать в конференции или 2) перейти в календарь и назначить время.</entry>
+ <entry key="download.png">Сохранить как PNG</entry>
+ <entry key="download.jpg">Сохранить как JPG</entry>
+ <entry key="download.pdf">Сохранить как PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 d576bf4..64426d2 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
@@ -573,11 +573,6 @@
<entry key="557">Ukazovátko</entry>
<entry key="558">Synchronizovanie</entry>
<entry key="559">Synchronizovanie, prosím čakajte</entry>
- <entry key="560"><u>Stiahnúť ako SVG</u></entry>
- <entry key="561"><u>Stiahnúť ako PNG</u></entry>
- <entry key="562"><u>Stiahnúť ako JPG</u></entry>
- <entry key="563"><u>Stiahnúť ako PDF</u></entry>
- <entry key="564"><u>Stiahnúť ako TIF</u></entry>
<entry key="565">Pripomienka</entry>
<entry key="566">Kategória</entry>
<entry key="567">Opakovanie</entry>
@@ -1927,4 +1922,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Ako konferencovať:</entry>
<entry key="widget.start.desc">{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up a meeting.</entry>
+ <entry key="download.png">Stiahnúť ako PNG</entry>
+ <entry key="download.jpg">Stiahnúť ako JPG</entry>
+ <entry key="download.pdf">Stiahnúť ako PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 d4b6fa4..0dafc7f 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
@@ -573,11 +573,6 @@
<entry key="557">Pekare</entry>
<entry key="558">Synkroniserar</entry>
<entry key="559">Synkroniserar användare, var vänlig vänta</entry>
- <entry key="560"><u>Ladda ner som SVG</u></entry>
- <entry key="561"><u>Ladda ner som PNG</u></entry>
- <entry key="562"><u>Ladda ner som JPG</u></entry>
- <entry key="563"><u>Ladda ner som PDF</u></entry>
- <entry key="564"><u>Ladda ner som TIF</u></entry>
<entry key="565">Påminnelse:</entry>
<entry key="566">Kategori:</entry>
<entry key="567">Repetition:</entry>
@@ -1927,4 +1922,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Create a conference, quickly!</entry>
<entry key="widget.start.desc">{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.</entry>
+ <entry key="download.png">Ladda ner som PNG</entry>
+ <entry key="download.jpg">Ladda ner som JPG</entry>
+ <entry key="download.pdf">Ladda ner som PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 dc1723e..eb06920 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
@@ -573,11 +573,6 @@
<entry key="557">พอยเตอร์</entry>
<entry key="558">กำลังซิงค์โครไนซ์</entry>
<entry key="559">กำลังซิงค์โครไนซ์กับผู้ใช้ โปรดรอสักครู่</entry>
- <entry key="560"><u>ดาวน์โหลดเป็น SVG</u></entry>
- <entry key="561"><u>ดาวน์โหลดเป็น PNG</u></entry>
- <entry key="562"><u>ดาวน์โหลดเป็น JPG</u></entry>
- <entry key="563"><u>ดาวน์โหลดเป็น PDF</u></entry>
- <entry key="564"><u>ดาวน์โหลดเป็น TIF</u></entry>
<entry key="565">เตือนความจำ:</entry>
<entry key="566">ประเภท:</entry>
<entry key="567">การทำซ้ำ:</entry>
@@ -1927,4 +1922,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Create a conference, quickly!</entry>
<entry key="widget.start.desc">{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.</entry>
+ <entry key="download.png">ดาวน์โหลดเป็น PNG</entry>
+ <entry key="download.jpg">ดาวน์โหลดเป็น JPG</entry>
+ <entry key="download.pdf">ดาวน์โหลดเป็น PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 abc42d8..79e18d1 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
@@ -573,11 +573,6 @@
<entry key="557">İmleç</entry>
<entry key="558">Eşitliyor…</entry>
<entry key="559">Kullanıcıları eşitliyor, lütfen bekleyiniz</entry>
- <entry key="560"><u>SVG Olarak Yükle</u></entry>
- <entry key="561"><u>PNG Olarak Yükle</u></entry>
- <entry key="562"><u>JPG Olarak Yükle</u></entry>
- <entry key="563"><u>PDF Olarak Yükle</u></entry>
- <entry key="564"><u>TIF Olarak Yükle</u></entry>
<entry key="565">Hatırlatıcı:</entry>
<entry key="566">Kategori:</entry>
<entry key="567">Tekrar:</entry>
@@ -1927,4 +1922,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Create a conference, quickly!</entry>
<entry key="widget.start.desc">{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.</entry>
+ <entry key="download.png">PNG Olarak Yükle</entry>
+ <entry key="download.jpg">JPG Olarak Yükle</entry>
+ <entry key="download.pdf">PDF Olarak Yükle</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 5c2674b..c3e9ea5 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
@@ -573,11 +573,6 @@
<entry key="557">Указатель</entry>
<entry key="558">Синхронізація</entry>
<entry key="559">Синхронізація учасників, зачекайте</entry>
- <entry key="560"><u>Завантажити як SVG</u></entry>
- <entry key="561"><u>Завантажити як PNG</u></entry>
- <entry key="562"><u>Завантажити як JPG</u></entry>
- <entry key="563"><u>Завантажити як PDF</u></entry>
- <entry key="564"><u>Завантажити як TIF</u></entry>
<entry key="565">Нагадувач:</entry>
<entry key="566">Категорія:</entry>
<entry key="567">Повторення:</entry>
@@ -1929,4 +1924,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Як брати участь у конференції:</entry>
<entry key="widget.start.desc">{0}, платформа ваших веб-конференцій. Ви можете 1) дотримуючись інструкцій, натиснути кнопку "Старт" і брати участь в конференції або 2) перейти в календар і призначити час.</entry>
+ <entry key="download.png">Завантажити як PNG</entry>
+ <entry key="download.jpg">Завантажити як JPG</entry>
+ <entry key="download.pdf">Завантажити як PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 4d85a9a..6695530 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
@@ -573,11 +573,6 @@
<entry key="557">指针</entry>
<entry key="558">同步</entry>
<entry key="559">正在同步用户, 请等待</entry>
- <entry key="560"><u>下载为 SVG</u></entry>
- <entry key="561"><u>下载为 PNG</u></entry>
- <entry key="562"><u>下载为 JPG</u></entry>
- <entry key="563"><u>下载为 PDF</u></entry>
- <entry key="564"><u>下载为 TIF</u></entry>
<entry key="565">提醒:</entry>
<entry key="566">类别:</entry>
<entry key="567">重复:</entry>
@@ -1917,4 +1912,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">参加视频会议的步骤如下:</entry>
<entry key="widget.start.desc">{0}, 本远程视频会议系统是一个用来召开远程视频会议、培训演讲、审查文件的平台。按照上面的指引，按下开始按钮可以马上进入会议。或者进入日历预约一个会议计划.</entry>
+ <entry key="download.png">下载为 PNG</entry>
+ <entry key="download.jpg">下载为 JPG</entry>
+ <entry key="download.pdf">下载为 PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/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 c8b23bc..edeb016 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
@@ -573,11 +573,6 @@
<entry key="557">Pointer</entry>
<entry key="558">Synchronizing</entry>
<entry key="559">Synchronizing Users, please wait</entry>
- <entry key="560"><u>Download as SVG</u></entry>
- <entry key="561"><u>Download as PNG</u></entry>
- <entry key="562"><u>Download as JPG</u></entry>
- <entry key="563"><u>Download as PDF</u></entry>
- <entry key="564"><u>Download as TIF</u></entry>
<entry key="565">Reminder:</entry>
<entry key="566">Category:</entry>
<entry key="567">Repetition:</entry>
@@ -1927,4 +1922,7 @@
<entry key="widget.start.title">Getting Started</entry>
<entry key="widget.start.header">Create a conference, quickly!</entry>
<entry key="widget.start.desc">{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.</entry>
+ <entry key="download.png">Download as PNG</entry>
+ <entry key="download.jpg">Download as JPG</entry>
+ <entry key="download.pdf">Download as PDF</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java
index a7336dd..839aef9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java
@@ -54,4 +54,3 @@ public class MenuItem extends com.googlecode.wicket.jquery.ui.widget.menu.MenuIt
return this;
}
}
-
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
index ff7891f..73ff489 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
@@ -266,6 +266,22 @@ public class RoomMenuPanel extends Panel {
actionsMenu.getItems().add(pollResultMenuItem); //FIXME enable/disable
actionsMenu.getItems().add(pollVoteMenuItem); //FIXME enable/disable
actionsMenu.getItems().add(sipDialerMenuItem);
+ actionsMenu.getItems().add(new RoomMenuItem(Application.getString("download.png"), Application.getString("download.png")) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ target.appendJavaScript("WbArea.download('png');");
+ }
+ });
+ actionsMenu.getItems().add(new RoomMenuItem(Application.getString("download.jpg"), Application.getString("download.jpg")) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ target.appendJavaScript("WbArea.download('jpeg');");
+ }
+ });
//TODO seems need to be removed actionsMenu.getItems().add(new RoomMenuItem(Application.getString(1126), Application.getString(1490)));
menu.add(actionsMenu);
return menu;
@@ -351,4 +367,3 @@ public class RoomMenuPanel extends Panel {
}
}
}
-
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js
index d10581c..8063039 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js
@@ -512,7 +512,7 @@ var Clipart = function(wb, btn) {
var Wb = function() {
const ACTIVE = 'active';
const BUMPER = 100;
- var wb = {id: -1}, a, t, s, canvases = [], mode, slide = 0, width = 0, height = 0
+ var wb = {id: -1, name: ''}, a, t, s, canvases = [], mode, slide = 0, width = 0, height = 0
, minWidth = 0, minHeight = 0, role = null, extraProps = ['uid', 'fileId', 'fileType', 'count', 'slide'];
function getBtn(m) {
@@ -906,7 +906,7 @@ var Wb = function() {
}
});
}
- /*TODO interactive text chage
+ /*TODO interactive text change
var textEditedHandler = function (e) {
var obj = e.target;
console.log('Text Edit Exit', obj);
@@ -989,8 +989,9 @@ var Wb = function() {
internalInit();
}
};
- wb.init = function(_wbId, tid, _role) {
- wb.id = _wbId;
+ wb.init = function(wbo, tid, _role) {
+ wb.id = wbo.wbId;
+ wb.name = wbo.name;
a = $('#' + tid);
addCanvas();
wb.setRole(_role);
@@ -1271,7 +1272,7 @@ var WbArea = (function() {
_addCloseBtn(li);
var wbo = Wb();
- wbo.init(obj.wbId, tid, role);
+ wbo.init(obj, tid, role);
wb.data(wbo);
_resizeWbs();
}
@@ -1331,6 +1332,14 @@ var WbArea = (function() {
wbTabs.height(hh);
_resizeWbs();
}
+ self.download = function(fmt) {
+ var wb = getActive().data(), cnv = wb.getCanvas()
+ , a = document.createElement('a');
+ a.setAttribute('target', '_blank')
+ a.setAttribute('download', wb.name + '.' + fmt);
+ a.setAttribute('href', cnv.toDataURL({format: fmt, width: cnv.width, height: cnv.height, left: 0, top: 0})); //TODO zoom
+ a.dispatchEvent(new MouseEvent('click', {view: window, bubbles: false, cancelable: true}));
+ }
return self;
})();
$(function() {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
index ce0c968..5990b80 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
@@ -71,7 +71,6 @@
<!-- Start of Services -->
<bean id="xmlcrm.service" class="org.apache.openmeetings.core.remote.MainService" />
- <bean id="fileservice.service" class="org.apache.openmeetings.core.remote.ConferenceLibrary" />
<bean id="openmeetings.FileProcessor" class="org.apache.openmeetings.core.data.file.FileProcessor" />
<bean id="openmeetings.FlvExplorerConverter" class="org.apache.openmeetings.core.converter.FlvExplorerConverter" />
<bean id="recordingservice.service" class="org.apache.openmeetings.core.remote.RecordingService" />
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56358879/openmeetings-web/src/main/webapp/css/menu.css
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/css/menu.css b/openmeetings-web/src/main/webapp/css/menu.css
index daf1d45..ae25a9c 100644
--- a/openmeetings-web/src/main/webapp/css/menu.css
+++ b/openmeetings-web/src/main/webapp/css/menu.css
@@ -35,7 +35,7 @@
font-weight: bold;
}
.ui-menu .ui-menu-item.sub {
- width: 250px;
+ width: 280px;
display: block;
}
.ui-menu .ui-menu-item.top {