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/08/07 06:55:56 UTC
openmeetings git commit: [OPENMEETINGS-1642] fullFit and pageWidth
modes seems to work
Repository: openmeetings
Updated Branches:
refs/heads/master cb3b99162 -> c5cc6af49
[OPENMEETINGS-1642] fullFit and pageWidth modes seems to work
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/c5cc6af4
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/c5cc6af4
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/c5cc6af4
Branch: refs/heads/master
Commit: c5cc6af49d7be87cf3b12758a2b903335cf8aeaa
Parents: cb3b991
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Aug 7 13:55:46 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Aug 7 13:55:46 2017 +0700
----------------------------------------------------------------------
.../openmeetings/db/dto/room/Whiteboard.java | 15 ++++---
.../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 | 5 ++-
.../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 +-
.../openmeetings/web/room/wb/WbPanel.html | 3 +-
.../openmeetings/web/room/wb/WbPanel.java | 2 +-
.../org/apache/openmeetings/web/room/wb/wb.js | 45 ++++++++++++--------
34 files changed, 101 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
index 5fc4e8f..b95bcc9 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
@@ -34,12 +34,17 @@ import com.github.openjson.JSONObject;
public class Whiteboard implements Serializable {
private static final long serialVersionUID = 1L;
+ public enum ZoomMode {
+ fullFit
+ , pageWidth
+ , zoom
+ }
public static final String ITEMS_KEY = "roomItems";
private static final int DEFAULT_WIDTH = 1920;
private static final int DEFAULT_HEIGHT = 1080;
private long id;
private double zoom = 1.;
- private boolean fullFit = true;
+ private ZoomMode zoomMode = ZoomMode.fullFit;
private int width = DEFAULT_WIDTH;
private int height = DEFAULT_HEIGHT;
private Map<String, String> roomItems = Collections.synchronizedMap(new LinkedHashMap<>());
@@ -78,12 +83,12 @@ public class Whiteboard implements Serializable {
this.zoom = zoom;
}
- public boolean isFullFit() {
- return fullFit;
+ public ZoomMode getZoomMode() {
+ return zoomMode;
}
- public void setFullFit(boolean fullFit) {
- this.fullFit = fullFit;
+ public void setZoomMode(ZoomMode zoomMode) {
+ this.zoomMode = zoomMode;
}
public void clear() {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 db34eef..e54780a 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
@@ -851,7 +851,6 @@
<entry key="844">Show mouse position to viewers</entry>
<entry key="845">Share audio with SIP applet</entry>
<entry key="846">Share audio with SIP and video with Flash</entry>
- <entry key="847">Full-Fit</entry>
<entry key="848">View screen</entry>
<entry key="849">The user</entry>
<entry key="850">wants to share their screen. Do you want to see it?</entry>
@@ -1925,4 +1924,6 @@
<entry key="download.png">Download as PNG</entry>
<entry key="download.jpg">Download as JPG</entry>
<entry key="download.pdf">Download as PDF</entry>
+ <entry key="zoom.fullFit">Full-Fit</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 fba80f3..6536748 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
@@ -851,7 +851,6 @@
<entry key="844">Show mouse position to viewers</entry>
<entry key="845">Share Audio with SIP Applet</entry>
<entry key="846">Share Audio with SIP and Video with Flash</entry>
- <entry key="847">Full-Fit</entry>
<entry key="848">View Screen</entry>
<entry key="849">The user</entry>
<entry key="850">wants to share its screen. Do you want to see it?</entry>
@@ -1925,4 +1924,6 @@
<entry key="download.png">Download as PNG</entry>
<entry key="download.jpg">Download as JPG</entry>
<entry key="download.pdf">Download as PDF</entry>
+ <entry key="zoom.fullFit">Full-Fit</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 16c671f..977bfa8 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
@@ -851,7 +851,6 @@
<entry key="844">Показване позицията на мишката на гледащите</entry>
<entry key="845">Share Audio with SIP Applet</entry>
<entry key="846">Share Audio with SIP and Video with Flash</entry>
- <entry key="847">Full-Fit</entry>
<entry key="848">View Screen</entry>
<entry key="849">The user</entry>
<entry key="850">wants to share its screen. Do you want to see it?</entry>
@@ -1925,4 +1924,6 @@
<entry key="download.png">Сваляне в PNG</entry>
<entry key="download.jpg">Сваляне в JPG</entry>
<entry key="download.pdf">Сваляне в PDF</entry>
+ <entry key="zoom.fullFit">Full-Fit</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 b43dafd..988e239 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
@@ -851,7 +851,6 @@
<entry key="844">Mostrar la posició del ratolí als participants</entry>
<entry key="845">Compartir Àudio amb el applet SIP</entry>
<entry key="846">Compartir Àudio amb SIP i Vídeo amb Flash</entry>
- <entry key="847">Pantalla completa</entry>
<entry key="848">Veure pantalla</entry>
<entry key="849">El usuari</entry>
<entry key="850">desitja compartir la seva pantalla. Desitja visualitzar-la?</entry>
@@ -1925,4 +1924,6 @@
<entry key="download.png">Descarregar com PNG</entry>
<entry key="download.jpg">Descarregar com JPG</entry>
<entry key="download.pdf">Descarregar com PDF</entry>
+ <entry key="zoom.fullFit">Pantalla completa</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 ff13897..8d7428b 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
@@ -851,7 +851,6 @@
<entry key="844">Show mouse position to viewers</entry>
<entry key="845">Share Audio with SIP Applet</entry>
<entry key="846">Share Audio with SIP and Video with Flash</entry>
- <entry key="847">Full-Fit</entry>
<entry key="848">View Screen</entry>
<entry key="849">The user</entry>
<entry key="850">wants to share its screen. Do you want to see it?</entry>
@@ -1925,4 +1924,6 @@
<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>
+ <entry key="zoom.fullFit">Full-Fit</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 3b148e3..bf4a0d4 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
@@ -851,7 +851,6 @@
<entry key="844">Vis musens position for brugerne</entry>
<entry key="845">Del lyd med SIP Appletten</entry>
<entry key="846">Del lyd med SIP og video med Flash</entry>
- <entry key="847">Fyldig</entry>
<entry key="848">Se skærm</entry>
<entry key="849">Brugeren</entry>
<entry key="850">ønsker at dele sin skærm. Vil du se?</entry>
@@ -1925,4 +1924,6 @@
<entry key="download.png">Download som PNG</entry>
<entry key="download.jpg">Download som JPG</entry>
<entry key="download.pdf">Download som PDF</entry>
+ <entry key="zoom.fullFit">Fyldig</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 f60046e..c6793b6 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
@@ -851,7 +851,6 @@
<entry key="844">Teilnehmern Mauszeiger anzeigen</entry>
<entry key="845">Audio mit SIP Applet übertragen</entry>
<entry key="846">Audio mit SIP und Video mit Flash übertragen</entry>
- <entry key="847">Vollformat</entry>
<entry key="848">Bildschirm zeigen</entry>
<entry key="849">Der Nutzer</entry>
<entry key="850">möchte den Bildschirm übertragen. Wollen Sie ihn sehen?</entry>
@@ -1930,4 +1929,6 @@
<entry key="download.png">Download als PNG</entry>
<entry key="download.jpg">Download als JPG</entry>
<entry key="download.pdf">Download als PDF</entry>
+ <entry key="zoom.fullFit">Vollformat</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 f98e321..0760444 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
@@ -851,7 +851,6 @@
<entry key="844">Εμφάνιση θέσης ποντικιού στους θεατές</entry>
<entry key="845">Share Audio with SIP Applet</entry>
<entry key="846">Share Audio with SIP and Video with Flash</entry>
- <entry key="847">Full-Fit</entry>
<entry key="848">View Screen</entry>
<entry key="849">The user</entry>
<entry key="850">wants to share its screen. Do you want to see it?</entry>
@@ -1925,4 +1924,6 @@
<entry key="download.png">Αποθήκευση ως PNG</entry>
<entry key="download.jpg">Αποθήκευση ως JPG</entry>
<entry key="download.pdf">Αποθήκευση ως PDF</entry>
+ <entry key="zoom.fullFit">Full-Fit</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 011cc50..c0498cd 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
@@ -851,7 +851,6 @@
<entry key="844">Mostrar la posición del ratón a los participantes</entry>
<entry key="845">Compartir audio con el applet SIP</entry>
<entry key="846">Compartir audio con SIP y vídeo con Flash</entry>
- <entry key="847">Pantalla completa</entry>
<entry key="848">Ver escritorio</entry>
<entry key="849">El usuario</entry>
<entry key="850">desea compartir su escritorio. ¿Desea visualizarlo?</entry>
@@ -1925,4 +1924,6 @@
<entry key="download.png">Descargar como PNG</entry>
<entry key="download.jpg">Descargar como JPG</entry>
<entry key="download.pdf">Descargar como PDF</entry>
+ <entry key="zoom.fullFit">Pantalla completa</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 6fc6204..c2c550e 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
@@ -851,7 +851,6 @@
<entry key="844">Show mouse position to viewers</entry>
<entry key="845">Share Audio with SIP Applet</entry>
<entry key="846">Share Audio with SIP and Video with Flash</entry>
- <entry key="847">Full-Fit</entry>
<entry key="848">View Screen</entry>
<entry key="849">The user</entry>
<entry key="850">wants to share its screen. Do you want to see it?</entry>
@@ -1925,4 +1924,6 @@
<entry key="download.png">Download as PNG</entry>
<entry key="download.jpg">Download as JPG</entry>
<entry key="download.pdf">Download as PDF</entry>
+ <entry key="zoom.fullFit">Full-Fit</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 72412b2..843ed43 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
@@ -851,7 +851,6 @@
<entry key="844">Show mouse position to viewers</entry>
<entry key="845">Share Audio with SIP Applet</entry>
<entry key="846">Share Audio with SIP and Video with Flash</entry>
- <entry key="847">Full-Fit</entry>
<entry key="848">View Screen</entry>
<entry key="849">The user</entry>
<entry key="850">wants to share its screen. Do you want to see it?</entry>
@@ -1925,4 +1924,6 @@
<entry key="download.png">Lataa PNG</entry>
<entry key="download.jpg">Lataa JPG</entry>
<entry key="download.pdf">Lataa PDF</entry>
+ <entry key="zoom.fullFit">Full-Fit</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 7e4ba5a..34cbee9 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
@@ -851,7 +851,6 @@
<entry key="844">Montrer la souris sur l'écran</entry>
<entry key="845">Partager l'audio avec l'applet SIP</entry>
<entry key="846">Partager l'audio avec SIP et la vidéo avec Flash</entry>
- <entry key="847">Zoom 100%</entry>
<entry key="848">Voir écran</entry>
<entry key="849">L'utilisateur</entry>
<entry key="850">souhaite partager son écran. Voulez-vous le voir ?</entry>
@@ -1917,4 +1916,6 @@
<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>
+ <entry key="zoom.fullFit">Full-Fit</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 0024569..776cd91 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
@@ -851,7 +851,6 @@
<entry key="844">Mostrar a posición do rato aos participantes</entry>
<entry key="845">Compartir o son co miniaplicativo SIP</entry>
<entry key="846">Compartir o son con SIP e o vídeo con Flash</entry>
- <entry key="847">Pantalla completa</entry>
<entry key="848">Ver o escritorio</entry>
<entry key="849">O usuario</entry>
<entry key="850">desexa compartir o seu escritorio. Desexa visualizalo?</entry>
@@ -1925,4 +1924,6 @@
<entry key="download.png">Descargar como PNG</entry>
<entry key="download.jpg">Descargar como JPG</entry>
<entry key="download.pdf">Descargar como PDF</entry>
+ <entry key="zoom.fullFit">Pantalla completa</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 596265c..741c671 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
@@ -851,7 +851,6 @@
<entry key="844">Mutasd az egér pozíciót a nézőknek</entry>
<entry key="845">Audio megosztása SIP alkalmazáson</entry>
<entry key="846">Audio megosztása SIP-n és video flash alatt</entry>
- <entry key="847">Teljes méret</entry>
<entry key="848">Képernyő nézete</entry>
<entry key="849">A felhasználó</entry>
<entry key="850">megosztotta a képernyőjét. Megnézi?</entry>
@@ -1913,4 +1912,6 @@
<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>
+ <entry key="zoom.fullFit">Teljes méret</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 a44c852..522f527 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
@@ -851,7 +851,6 @@
<entry key="844">Show mouse position to viewers</entry>
<entry key="845">Share Audio with SIP Applet</entry>
<entry key="846">Share Audio with SIP and Video with Flash</entry>
- <entry key="847">Full-Fit</entry>
<entry key="848">View Screen</entry>
<entry key="849">The user</entry>
<entry key="850">wants to share its screen. Do you want to see it?</entry>
@@ -1925,4 +1924,6 @@
<entry key="download.png">Download as PNG</entry>
<entry key="download.jpg">Download as JPG</entry>
<entry key="download.pdf">Download as PDF</entry>
+ <entry key="zoom.fullFit">Full-Fit</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 126db5a..ea08929 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
@@ -851,7 +851,6 @@
<entry key="844">Visualizza posizione del mouse ai partecipanti</entry>
<entry key="845">Condividi Audio con Applet SIP</entry>
<entry key="846">Condividi Audio con SIP ed il Video con Flash</entry>
- <entry key="847">Schermo-Intero</entry>
<entry key="848">Visualizza Schermo</entry>
<entry key="849">L'utente</entry>
<entry key="850">vuole condividero il suo schermo. Vuoi vederlo?</entry>
@@ -1927,4 +1926,6 @@
<entry key="download.png">Scarica come PNG</entry>
<entry key="download.jpg">Scarica come JPG</entry>
<entry key="download.pdf">Scarica come PDF</entry>
+ <entry key="zoom.fullFit">Schermo-Intero</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 7c7721b..34eb7f8 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
@@ -851,7 +851,6 @@
<entry key="844">ビューア上でマウス・ポインタを表示する</entry>
<entry key="845">SIPアプレットと音声を共有する</entry>
<entry key="846">SIPと音声を、Flashと画像を共有する</entry>
- <entry key="847">画面サイズに合わせる</entry>
<entry key="848">デスクトップを表示する</entry>
<entry key="849">ユーザー「</entry>
<entry key="850">」さんがデスクトップ共有を要求してます。表示しますか?</entry>
@@ -1925,4 +1924,6 @@
<entry key="download.png">PNGとしてダウンロード</entry>
<entry key="download.jpg">JPGとしてダウンロード</entry>
<entry key="download.pdf">PDFとしてダウンロード</entry>
+ <entry key="zoom.fullFit">画面サイズに合わせる</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 706355f..18d65b2 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
@@ -853,7 +853,6 @@
<entry key="844">Show mouse position to viewers</entry>
<entry key="845">Share Audio with SIP Applet</entry>
<entry key="846">Share Audio with SIP and Video with Flash</entry>
- <entry key="847">Full-Fit</entry>
<entry key="848">View Screen</entry>
<entry key="849">The user</entry>
<entry key="850">wants to share its screen. Do you want to see it?</entry>
@@ -1927,4 +1926,6 @@
<entry key="download.png">Download as PNG</entry>
<entry key="download.jpg">Download as JPG</entry>
<entry key="download.pdf">Download as PDF</entry>
+ <entry key="zoom.fullFit">Full-Fit</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 54cea53..63e9011 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
@@ -851,7 +851,6 @@
<entry key="844">Toon muis positie aan kijkers</entry>
<entry key="845">Deel geluid middels SIP</entry>
<entry key="846">Deel geluid middels SIP en beeld via flash</entry>
- <entry key="847">Beeldvullend</entry>
<entry key="848">Toon scherm</entry>
<entry key="849">De gebruiker</entry>
<entry key="850">wil zijn scherm delen, wil je dit zien?</entry>
@@ -1925,4 +1924,6 @@
<entry key="download.png">Opslaan als PNG</entry>
<entry key="download.jpg">Opslaan als JPG</entry>
<entry key="download.pdf">Opslaan als PDF</entry>
+ <entry key="zoom.fullFit">Beeldvullend</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 99f3593..4890612 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
@@ -851,7 +851,6 @@
<entry key="844">Show mouse position to viewers</entry>
<entry key="845">Share Audio with SIP Applet</entry>
<entry key="846">Share Audio with SIP and Video with Flash</entry>
- <entry key="847">Full-Fit</entry>
<entry key="848">View Screen</entry>
<entry key="849">The user</entry>
<entry key="850">wants to share its screen. Do you want to see it?</entry>
@@ -1925,4 +1924,6 @@
<entry key="download.png">Pobierz jako PNG</entry>
<entry key="download.jpg">Pobierz jako JPG</entry>
<entry key="download.pdf">Pobierz jako PDF</entry>
+ <entry key="zoom.fullFit">Full-Fit</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 22016ca..2f8a665 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
@@ -851,7 +851,6 @@
<entry key="844">Show mouse position to viewers</entry>
<entry key="845">Share Audio with SIP Applet</entry>
<entry key="846">Share Audio with SIP and Video with Flash</entry>
- <entry key="847">Full-Fit</entry>
<entry key="848">View Screen</entry>
<entry key="849">The user</entry>
<entry key="850">wants to share its screen. Do you want to see it?</entry>
@@ -1925,4 +1924,6 @@
<entry key="download.png">Download as PNG</entry>
<entry key="download.jpg">Download as JPG</entry>
<entry key="download.pdf">Download as PDF</entry>
+ <entry key="zoom.fullFit">Full-Fit</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 f2094bb..bca5b0d 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
@@ -851,7 +851,6 @@
<entry key="844">Mostra a posição do mouse para os espectadores</entry>
<entry key="845">Compartilhar Audio com o SIP Applet</entry>
<entry key="846">Compartilhar Áudio e Vídeo via SIP com Flash</entry>
- <entry key="847">Ajuste</entry>
<entry key="848">Ver Tela</entry>
<entry key="849">O Usuário</entry>
<entry key="850">quer compartihar sua tela. Você quer ver?</entry>
@@ -1925,4 +1924,6 @@
<entry key="download.png">Download como PNG</entry>
<entry key="download.jpg">Download como JPG</entry>
<entry key="download.pdf">Download como PDF</entry>
+ <entry key="zoom.fullFit">Ajuste</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 7d1159b..bc2f3aa 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
@@ -850,8 +850,7 @@
<entry key="843">Свойства</entry>
<entry key="844">Показывать позицию мыши зрителям</entry>
<entry key="845">Совместно использовать аудио и SIP</entry>
- <entry key="846">Совмистно использовать аудио с SIP и видео с флеш</entry>
- <entry key="847">Full-Fit</entry>
+ <entry key="846">Совместно использовать аудио с SIP и видео с флеш</entry>
<entry key="848">Смотреть экран</entry>
<entry key="849">Пользователь</entry>
<entry key="850">хочет сделать экран общим. Хотите видеть его?</entry>
@@ -1926,4 +1925,6 @@
<entry key="download.png">Сохранить как PNG</entry>
<entry key="download.jpg">Сохранить как JPG</entry>
<entry key="download.pdf">Сохранить как PDF</entry>
+ <entry key="zoom.fullFit">По размеру страницы</entry>
+ <entry key="zoom.pageWidth">По ширине страницы</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 00db4b5..4f3fb8d 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
@@ -851,7 +851,6 @@
<entry key="844">Zobraziť pozíciu kurzora</entry>
<entry key="845">Zdieľať audio cez SIP applet</entry>
<entry key="846">Zdieľať audio cez SIP a video cez Flash</entry>
- <entry key="847">Napasovanie</entry>
<entry key="848">Vidieť plochu</entry>
<entry key="849">Používateľ</entry>
<entry key="850">chce zdieľať svoju plochu. Zobraziť?</entry>
@@ -1925,4 +1924,6 @@
<entry key="download.png">Stiahnúť ako PNG</entry>
<entry key="download.jpg">Stiahnúť ako JPG</entry>
<entry key="download.pdf">Stiahnúť ako PDF</entry>
+ <entry key="zoom.fullFit">Napasovanie</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 2c4641d..04e561e 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
@@ -851,7 +851,6 @@
<entry key="844">Show mouse position to viewers</entry>
<entry key="845">Share Audio with SIP Applet</entry>
<entry key="846">Share Audio with SIP and Video with Flash</entry>
- <entry key="847">Full-Fit</entry>
<entry key="848">View Screen</entry>
<entry key="849">The user</entry>
<entry key="850">wants to share its screen. Do you want to see it?</entry>
@@ -1925,4 +1924,6 @@
<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>
+ <entry key="zoom.fullFit">Full-Fit</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 75d18d6..5a12cd3 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
@@ -851,7 +851,6 @@
<entry key="844">Show mouse position to viewers</entry>
<entry key="845">Share Audio with SIP Applet</entry>
<entry key="846">Share Audio with SIP and Video with Flash</entry>
- <entry key="847">Full-Fit</entry>
<entry key="848">View Screen</entry>
<entry key="849">The user</entry>
<entry key="850">wants to share its screen. Do you want to see it?</entry>
@@ -1925,4 +1924,6 @@
<entry key="download.png">ดาวน์โหลดเป็น PNG</entry>
<entry key="download.jpg">ดาวน์โหลดเป็น JPG</entry>
<entry key="download.pdf">ดาวน์โหลดเป็น PDF</entry>
+ <entry key="zoom.fullFit">Full-Fit</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 2270c0f..d7f085f 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
@@ -851,7 +851,6 @@
<entry key="844">Show mouse position to viewers</entry>
<entry key="845">Share Audio with SIP Applet</entry>
<entry key="846">Share Audio with SIP and Video with Flash</entry>
- <entry key="847">Full-Fit</entry>
<entry key="848">View Screen</entry>
<entry key="849">The user</entry>
<entry key="850">wants to share its screen. Do you want to see it?</entry>
@@ -1925,4 +1924,6 @@
<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>
+ <entry key="zoom.fullFit">Full-Fit</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 c3e9ea5..4823b99 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
@@ -851,7 +851,6 @@
<entry key="844">Показувати позицію миші глядачам</entry>
<entry key="845">Спільно використовувати аудіо і SIP</entry>
<entry key="846">Совмистно використовувати аудіо з SIP і відео з флеш</entry>
- <entry key="847">Full-Fit</entry>
<entry key="848">Дивитися екран</entry>
<entry key="849">Користувач</entry>
<entry key="850">хоче зробити екран загальним. Хочете бачити його?</entry>
@@ -1927,4 +1926,6 @@
<entry key="download.png">Завантажити як PNG</entry>
<entry key="download.jpg">Завантажити як JPG</entry>
<entry key="download.pdf">Завантажити як PDF</entry>
+ <entry key="zoom.fullFit">Full-Fit</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 6a49f4e..927bbb5 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
@@ -851,7 +851,6 @@
<entry key="844">在共享器中显示鼠标位置</entry>
<entry key="845">使用SIP小应用程序共享音频</entry>
<entry key="846">使用SIP小应用程序共享音频，用flash共享视频</entry>
- <entry key="847">满屏</entry>
<entry key="848">显示屏幕</entry>
<entry key="849">用户</entry>
<entry key="850">想分享他的屏幕。你想看到它吗？</entry>
@@ -1915,4 +1914,6 @@
<entry key="download.png">下载为 PNG</entry>
<entry key="download.jpg">下载为 JPG</entry>
<entry key="download.pdf">下载为 PDF</entry>
+ <entry key="zoom.fullFit">满屏</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 4addeb2..ea2c43b 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
@@ -851,7 +851,6 @@
<entry key="844">Show mouse position to viewers</entry>
<entry key="845">Share Audio with SIP Applet</entry>
<entry key="846">Share Audio with SIP and Video with Flash</entry>
- <entry key="847">Full-Fit</entry>
<entry key="848">View Screen</entry>
<entry key="849">The user</entry>
<entry key="850">wants to share its screen. Do you want to see it?</entry>
@@ -1925,4 +1924,6 @@
<entry key="download.png">Download as PNG</entry>
<entry key="download.jpg">Download as JPG</entry>
<entry key="download.pdf">Download as PDF</entry>
+ <entry key="zoom.fullFit">Full-Fit</entry>
+ <entry key="zoom.pageWidth">Page Width</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
index 3cdc08f..d3c2446 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
@@ -72,7 +72,8 @@
<button type="button" class="btn btn-default zoom-in" wicket:message="title:260"><span class="ui-icon ui-icon-plusthick"></span></button>
</div>
<select class="zoom" data-custom-val="1.20">
- <option value="full-fit"><wicket:message key="847"/></option>
+ <option value="fullFit"><wicket:message key="zoom.fullFit"/></option>
+ <option value="pageWidth"><wicket:message key="zoom.pageWidth"/></option>
<option value="custom">120%</option>
<option value="0.50">50%</option>
<option value="0.75">75%</option>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
index 675f1e2..5872cd2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
@@ -382,7 +382,7 @@ public class WbPanel extends Panel {
.put("width", wb.getWidth())
.put("height", wb.getHeight())
.put("zoom", wb.getZoom())
- .put("fullFit", wb.isFullFit());
+ .put("zoomMode", wb.getZoomMode());
}
public WbPanel update(IPartialPageRequestHandler handler) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5cc6af4/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 7102df5..aaabbb4 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
@@ -513,7 +513,7 @@ var Wb = function() {
const ACTIVE = 'active';
const BUMPER = 100;
var wb = {id: -1, name: ''}, a, t, z, s, canvases = [], mode, slide = 0, width = 0, height = 0
- , zoom = 1., fullFit = true, role = null, extraProps = ['uid', 'fileId', 'fileType', 'count', 'slide'];
+ , zoom = 1., zoomMode = 'fullFit', role = null, extraProps = ['uid', 'fileId', 'fileType', 'count', 'slide'];
function getBtn(m) {
return !!t ? t.find(".om-icon." + (m || mode)) : null;
@@ -749,24 +749,25 @@ var Wb = function() {
_updateZoomPanel();
z.find('.zoom-out').click(function() {
wb.zoom -= .2;
- wb.fullFit = false;
+ wb.zoomMode = 'zoom';
_setSize();
});
z.find('.zoom-in').click(function() {
wb.zoom += .2;
- wb.fullFit = false;
+ wb.zoomMode = 'zoom';
_setSize();
});
z.find('.zoom').change(function() {
var zzz = $(this).val();
- wb.fullFit = false;
+ wb.zoomMode = 'zoom';
if (isNaN(zzz)) {
switch (zzz) {
- case 'full-fit':
- wb.fullFit = true;
+ case 'fullFit':
+ case 'pageWidth':
+ wb.zoomMode = zzz;
break;
case 'custom':
- wb.zoom = $(this).data('custom-val');
+ wb.zoom = 1. * $(this).data('custom-val');
break;
}
} else {
@@ -1023,17 +1024,25 @@ var Wb = function() {
setHandlers(canvas);
}
function _setSize() {
- if (wb.fullFit) {
- wb.zoom = (a.width() - 10) / wb.width;
- } else {
- var oo = z.find('.zoom').find('option[value="' + wb.zoom.toFixed(2) + '"]');
- if (oo.length == 1) {
- oo.prop('selected', true);
- } else {
- z.find('.zoom').data('custom-val', wb.zoom).find('option[value=custom]')
- .text(100. * wb.zoom.toFixed(2) + '%')
- .prop('selected', true);
+ switch (wb.zoomMode) {
+ case 'fullFit':
+ wb.zoom = Math.min((a.width() - 10) / wb.width, (a.height() - 10) / wb.height);
+ break;
+ case 'pageWidth':
+ wb.zoom = (a.width() - 10) / wb.width;
+ break;
+ default:
+ {
+ var oo = z.find('.zoom').find('option[value="' + wb.zoom.toFixed(2) + '"]');
+ if (oo.length == 1) {
+ oo.prop('selected', true);
+ } else {
+ z.find('.zoom').data('custom-val', wb.zoom).find('option[value=custom]')
+ .text(100. * wb.zoom.toFixed(2) + '%')
+ .prop('selected', true);
+ }
}
+ break;
}
wb.eachCanvas(function(canvas) {
canvas.setWidth(wb.zoom * wb.width).setHeight(wb.zoom * wb.height).setZoom(wb.zoom);
@@ -1081,7 +1090,7 @@ var Wb = function() {
wb.width = wbo.width;
wb.height = wbo.height;
wb.zoom = wbo.zoom;
- wb.fullFit = wbo.fullFit;
+ wb.zoomMode = wbo.zoomMode;
a = $('#' + tid);
addCanvas();
wb.setRole(_role);