You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/04/26 19:38:21 UTC
svn commit: r1330985 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/languages/ WebContent/openmeetings/
WebContent/openmeetings/public/themes/basic-theme/whiteboard/
WebContent/src/base/ WebContent/src/base/components/lps/ WebContent/src/m...
Author: sebawagner
Date: Thu Apr 26 17:38:19 2012
New Revision: 1330985
URL: http://svn.apache.org/viewvc?rev=1330985&view=rev
Log:
Fixes:
OPENMEETINGS-26 Whiteboard error "arrow tool" dragging from right to left in any angle.
OPENMEETINGS-46 Updated German lang file
OPENMEETINGS-216 UI problem
OPENMEETINGS-223 Hardly anybody knows that you can double click to re-edit the text
OPENMEETINGS-225 If object on whiteboard of type "freedraw" ("paint") is dragged/moved, the object is gone when you re-enter the room
OPENMEETINGS-230 Error in the field name on the form "Add external"
OPENMEETINGS-233 Font styles in propertyPanel are getting disabled.
+ modify some timezone names to be unique
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/whiteboard/text_signature.png (with props)
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/languages.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/timezones.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/fillColorChoose.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/lineColorChoose.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/logoutConfirm.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawLetter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawArrow.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/helper/boundingBoxAll.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/propertypanel/propertyPanelLetterButton.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/whiteboardBarMenu.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx
incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/conference/whiteboard/WhiteboardManagement.java
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml Thu Apr 26 17:38:19 2012
@@ -4409,4 +4409,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml Thu Apr 26 17:38:19 2012
@@ -4407,4 +4407,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml Thu Apr 26 17:38:19 2012
@@ -4408,4 +4408,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20simplified.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml Thu Apr 26 17:38:19 2012
@@ -4408,4 +4408,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20traditional.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml Thu Apr 26 17:38:19 2012
@@ -4420,4 +4420,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml Thu Apr 26 17:38:19 2012
@@ -4408,4 +4408,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml Thu Apr 26 17:38:19 2012
@@ -4407,4 +4407,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch%20%28studIP%29.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Thu Apr 26 17:38:19 2012
@@ -4408,4 +4408,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml Thu Apr 26 17:38:19 2012
@@ -5756,38 +5756,50 @@ see http://incubator.apache.org/openmeet
</string>
<string id="1433" name="exclusive_audio_action">
- <value>Mir exklusives Rederecht geben (alternativ: klick auf Video Pod oder F12)</value>
+ <value>Mir exklusives Rederecht geben (alternativ: klick auf Video Pod
+ oder F12)</value>
</string>
+
<string id="1434" name="micro is on">
- <value>Microphone is on!</value>
+ <value>Mikrofon ist an</value>
</string>
+
<string id="1435" name="micro is off">
- <value>Microphone is muted</value>
+ <value>Mikrofon ist abgeschaltet</value>
</string>
+
<string id="1436" name="hide_chat">
- <value>Hide chat</value>
+ <value>Chat verbergen</value>
</string>
+
<string id="1437" name="hide_activities_and_actions">
- <value>Hide activities</value>
+ <value>Aktivitäten verbergen</value>
</string>
+
<string id="1438" name="hide_files_explorer">
- <value>Hide files explorer</value>
+ <value>Dateiverwaltung verbergen</value>
</string>
+
<string id="1439" name="hide_actions_menu">
- <value>Hide actions menu</value>
+ <value>Aktionenmenu verbergen</value>
</string>
+
<string id="1440" name="hide_screen_sharing">
- <value>Hide screen sharing</value>
+ <value>Screen Sharing verbergen</value>
</string>
+
<string id="1441" name="hide_whiteboard">
- <value>Hide whiteboard</value>
+ <value>Whiteboard verbergen</value>
</string>
+
<string id="1442" name="show microphone status">
- <value>Show micro status in video</value>
+ <value>Mikrofonstatus in Video anzeigen</value>
</string>
+
<string id="1443" name="layout_options">
- <value>Layout options</value>
+ <value>Layout Optionen</value>
</string>
+
<string id="1444" name="calendar new button">
<value>New Event</value>
</string>
@@ -5842,4 +5854,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml Thu Apr 26 17:38:19 2012
@@ -4404,4 +4404,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml Thu Apr 26 17:38:19 2012
@@ -5854,4 +5854,7 @@ see http://incubator.apache.org/openmeet
<string id="1462" name="file explorer">
<value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
</string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml Thu Apr 26 17:38:19 2012
@@ -4407,4 +4407,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml Thu Apr 26 17:38:19 2012
@@ -4408,4 +4408,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml Thu Apr 26 17:38:19 2012
@@ -4408,4 +4408,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml Thu Apr 26 17:38:19 2012
@@ -4408,4 +4408,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml Thu Apr 26 17:38:19 2012
@@ -4408,4 +4408,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml Thu Apr 26 17:38:19 2012
@@ -4408,4 +4408,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml Thu Apr 26 17:38:19 2012
@@ -4408,4 +4408,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml Thu Apr 26 17:38:19 2012
@@ -4408,4 +4408,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml Thu Apr 26 17:38:19 2012
@@ -4359,4 +4359,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml Thu Apr 26 17:38:19 2012
@@ -4408,4 +4408,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/languages.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/languages.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/languages.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/languages.xml Thu Apr 26 17:38:19 2012
@@ -21,7 +21,7 @@
<language>
<lang id="1" rightToLeft="false" code="en">english</lang>
<lang id="2" rightToLeft="false" code="de">deutsch</lang>
- <lang id="3" rightToLeft="false" code="de">deutsch (studIP)</lang>
+ <lang id="3" rightToLeft="false" code="de-StudIP">deutsch (studIP)</lang>
<lang id="4" rightToLeft="false" code="fr">french</lang>
<lang id="5" rightToLeft="false" code="it">italian</lang>
<lang id="6" rightToLeft="false" code="pt">portugues</lang>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml Thu Apr 26 17:38:19 2012
@@ -4408,4 +4408,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml Thu Apr 26 17:38:19 2012
@@ -4481,4 +4481,10 @@ transmitowania gÅosu i obrazu wideo.<
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues%20brazil.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml Thu Apr 26 17:38:19 2012
@@ -4414,4 +4414,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml Thu Apr 26 17:38:19 2012
@@ -4408,4 +4408,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml Thu Apr 26 17:38:19 2012
@@ -4408,4 +4408,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml Thu Apr 26 17:38:19 2012
@@ -4408,4 +4408,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml Thu Apr 26 17:38:19 2012
@@ -4416,4 +4416,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml Thu Apr 26 17:38:19 2012
@@ -4408,4 +4408,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Thu Apr 26 17:38:19 2012
@@ -4408,4 +4408,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/timezones.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/timezones.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/timezones.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/timezones.xml Thu Apr 26 17:38:19 2012
@@ -47,13 +47,13 @@
For updating the JRE runtime with different tz-file, see:
http://www.oracle.com/technetwork/java/javase/timezones-137583.html
-->
- <timezone orderId="1" name="Etc/GMT+12" label="New Zealand" iCal="Pacific/Auckland" />
+ <timezone orderId="1" name="Etc/GMT+12 (New Zealand)" label="New Zealand" iCal="Pacific/Auckland" />
<timezone orderId="1" name="Etc/GMT+12" label="Kiribati (Gilbert Islands), Fiji, Russia (Kamchatka Krai)" iCal="Pacific/Fiji" />
<timezone orderId="2" name="Etc/GMT+11" label="Vladivostok, Kamchatka, Solomon Islands, New Caledonia" iCal="Asia/Vladivostok" />
- <timezone orderId="3" name="Etc/GMT+10" label="Australia (NSW,Sydney,Tasmania), Yakutsk" iCal="Australia/Sydney" />
- <timezone orderId="3" name="Etc/GMT+10" label="Russia (Zabaykalsky Krai), Papua New Guinea, Australia (Queensland)" iCal="Australia/Queensland" />
+ <timezone orderId="3" name="Etc/GMT+10 (Australia/NSW)" label="Australia (NSW,Sydney,Tasmania), Yakutsk" iCal="Australia/Sydney" />
+ <timezone orderId="3" name="Etc/GMT+10 (Australia/Queensland)" label="Russia (Zabaykalsky Krai), Papua New Guinea, Australia (Queensland)" iCal="Australia/Queensland" />
<timezone orderId="3" name="Etc/GMT+10" label="Lord Howe Island - Australia GMT+10:30" iCal="Australia/Lord_Howe" />
- <timezone orderId="4" name="Etc/GMT+9" label="Japan/Korea Standard Time, Irkutsk, East Timor" iCal="Asia/Tokyo" />
+ <timezone orderId="4" name="Etc/GMT+9 (Japan)" label="Japan/Korea Standard Time, Irkutsk, East Timor" iCal="Asia/Tokyo" />
<timezone orderId="4" name="Etc/GMT+9 (Australia-North)" label="Australia (Nothern Territory,Darwin) GMT+9:30" iCal="Australia/Darwin" />
<timezone orderId="4" name="Etc/GMT+9 (Australia-South)" label="Australia (Southern Territory,Adelaide) GMT+9:30" iCal="Australia/Adelaide" />
<timezone orderId="5" name="Etc/GMT+8" label="China Standard Time, Krasnoyarsk, Philippines, Singapore" iCal="Asia/Singapore" />
@@ -70,26 +70,26 @@
<timezone orderId="15" name="Etc/GMT+1" label="France, Germany, Spain, Italy" iCal="Europe/Berlin" />
<timezone orderId="15" name="Etc/GMT+1 (North Africa)" label="Angola, Cameroon, Nigeria, Tunisia" iCal="Africa/Tunis" />
<timezone orderId="16" name="Etc/GMT" label="Iceland, United Kingdom, Ireland" iCal="Europe/London" />
- <timezone orderId="16" name="Etc/GMT" label="Côte d'Ivoire, Faroe Islands, Ghana, Iceland, Senegal" iCal="Africa/Dakar" />
+ <timezone orderId="16" name="Etc/GMT (North Africa)" label="Côte d'Ivoire, Faroe Islands, Ghana, Iceland, Senegal" iCal="Africa/Dakar" />
<timezone orderId="17" name="Etc/GMT-1" label="Azores, Cape Verde" iCal="Atlantic/Cape_Verde" />
<timezone orderId="18" name="Etc/GMT-2" label="Fernando de Noronha" iCal="America/Noronha" />
- <timezone orderId="19" name="Etc/GMT-3" label="Brazil (BrasÃlia, Rio de Janeiro, São Paulo), most of Greenland, Uruguay" iCal="America/Sao_Paulo" />
+ <timezone orderId="19" name="Etc/GMT-3 (Brazil)" label="Brazil (BrasÃlia, Rio de Janeiro, São Paulo), most of Greenland, Uruguay" iCal="America/Sao_Paulo" />
<timezone orderId="19" name="Etc/GMT-3" label="Argentina, Paraguay" iCal="America/Buenos_Aires" />
- <timezone orderId="19" name="Etc/GMT-3" label="Canada GMT+3:30" iCal="CNT" />
+ <timezone orderId="19" name="Etc/GMT-3:30" label="Canada GMT+3:30" iCal="CNT" />
<timezone orderId="20" name="Etc/GMT-4" label="Nova Scotia, Dominican Republic, Puerto Rico, Santiago" iCal="America/Santiago" />
- <timezone orderId="20" name="Etc/GMT-4" label="Venezuela GMT+4:30" iCal="America/Caracas" />
- <timezone orderId="21" name="Etc/GMT-5" label="Ottawa, Toronto, Montreal, Boston, New York" iCal="America/New_York" />
+ <timezone orderId="20" name="Etc/GMT-4:30" label="Venezuela GMT+4:30" iCal="America/Caracas" />
+ <timezone orderId="21" name="Etc/GMT-5 (New York)" label="Ottawa, Toronto, Montreal, Boston, New York" iCal="America/New_York" />
<timezone orderId="21" name="Etc/GMT-5" label="Colombia, Cuba, Ecuador, Haiti, Jamaica, Panama, Peru" iCal="America/Jamaica" />
- <timezone orderId="22" name="Etc/GMT-5(Panama)" label="Panama Port-au-Prince" iCal="America/Panama" />
- <timezone orderId="23" name="Etc/GMT-6(Chicago)" label="Chicago, Dallas" iCal="America/Chicago" />
+ <timezone orderId="22" name="Etc/GMT-5 (Panama)" label="Panama Port-au-Prince" iCal="America/Panama" />
+ <timezone orderId="23" name="Etc/GMT-6 (Chicago)" label="Chicago, Dallas" iCal="America/Chicago" />
<timezone orderId="24" name="Etc/GMT-6" label="Costa Rica , El Salvador, Guatemala, Honduras" iCal="America/El_Salvador" />
- <timezone orderId="24" name="Etc/GMT-6" label="Canada (Manitoba), United States (Illinois, most of Texas)" iCal="America/Chicago" />
- <timezone orderId="25" name="Etc/GMT-7(Phoenix)" label="Alberta, Colorado, Phoenix" iCal="America/Phoenix" />
- <timezone orderId="26" name="Etc/GMT-7" label="Canada (Alberta), Mexico (Chihuahua), USA (Colorado)" iCal="America/Denver" />
+ <timezone orderId="24" name="Etc/GMT-6 (Illinois)" label="Canada (Manitoba), United States (Illinois, most of Texas)" iCal="America/Chicago" />
+ <timezone orderId="25" name="Etc/GMT-7 (Phoenix)" label="Alberta, Colorado, Phoenix" iCal="America/Phoenix" />
+ <timezone orderId="26" name="Etc/GMT-7 (Colorado)" label="Canada (Alberta), Mexico (Chihuahua), USA (Colorado)" iCal="America/Denver" />
<timezone orderId="26" name="Etc/GMT-7" label="Canada (northeastern British Columbia), Mexico (Sonora), USA (Arizona)" iCal="America/Phoenix" />
<timezone orderId="27" name="Etc/GMT-8" label="Vancouver, Portland, Las Vegas, California" iCal="America/Los_Angeles" />
<timezone orderId="28" name="Etc/GMT-9" label="Anchorage, Fairbanks, Juneau" iCal="America/Juneau" />
- <timezone orderId="28" name="Etc/GMT-9" label="United States (most of Alaska)" iCal="US/Alaska" />
+ <timezone orderId="28" name="Etc/GMT-9 (Alaska)" label="United States (most of Alaska)" iCal="US/Alaska" />
<timezone orderId="29" name="Etc/GMT-10" label="Hawaii" iCal="Pacific/Honolulu" />
<timezone orderId="30" name="Etc/GMT-11" label="Samoa" iCal="Pacific/Apia" />
</timezones>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml Thu Apr 26 17:38:19 2012
@@ -4407,4 +4407,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml Thu Apr 26 17:38:19 2012
@@ -4408,4 +4408,10 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</value>
+ </string>
+ <string id="1463" name="whiteboard">
+ <value>Edit text</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml Thu Apr 26 17:38:19 2012
@@ -196,8 +196,13 @@
<resource name="bounding_box_delete_item_rsc"
description="Toolbar Icon"
license="APL Author sebawagner"
- src="public/themes/basic-theme/general/cancel_icon_small.png" />
-
+ src="public/themes/basic-theme/general/cancel_icon_small.png" />
+
+ <resource name="bounding_box_textedit_item_rsc"
+ description="Toolbar Icon"
+ license="APL Author sebawagner"
+ src="public/themes/basic-theme/whiteboard/text_signature.png" />
+
<!-- document Tools -->
<resource name="doc_next"
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/whiteboard/text_signature.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/whiteboard/text_signature.png?rev=1330985&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/whiteboard/text_signature.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/fillColorChoose.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/fillColorChoose.lzx?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/fillColorChoose.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/fillColorChoose.lzx Thu Apr 26 17:38:19 2012
@@ -63,8 +63,8 @@
this.rgt.setAttribute('opacity',0.3);
this.rgt.setAttribute('enabled',false);
this.colorIsEnabled = false;
- this.rgt._lock.setAttribute("visibility","visible");
- this.rgt._lock_open.setAttribute("visibility","hidden");
+ this.rgt_b._lock.setAttribute("visibility","visible");
+ this.rgt_b._lock_open.setAttribute("visibility","hidden");
} else {
this._currentcolor.setAttribute('clickable',true);
this._currentcolor.setAttribute('opacity',1);
@@ -72,8 +72,8 @@
this.rgt.setAttribute('enabled',true);
this.onselectedColor.sendEvent(this.selectedColor);
this.colorIsEnabled = true;
- this.rgt._lock.setAttribute("visibility","hidden");
- this.rgt._lock_open.setAttribute("visibility","visible");
+ this.rgt_b._lock.setAttribute("visibility","hidden");
+ this.rgt_b._lock_open.setAttribute("visibility","visible");
}
</method>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/lineColorChoose.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/lineColorChoose.lzx?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/lineColorChoose.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/lineColorChoose.lzx Thu Apr 26 17:38:19 2012
@@ -65,8 +65,8 @@
this.rgt.setAttribute('opacity',0.3);
this.rgt.setAttribute('enabled',false);
this.colorIsEnabled = false;
- this.rgt._lock.setAttribute("visibility","visible");
- this.rgt._lock_open.setAttribute("visibility","hidden");
+ this.rgt_b._lock.setAttribute("visibility","visible");
+ this.rgt_b._lock_open.setAttribute("visibility","hidden");
} else {
this._currentcolor.setAttribute('clickable',true);
this._currentcolor.setAttribute('opacity',1);
@@ -74,8 +74,8 @@
this.rgt.setAttribute('enabled',true);
this.onselectedColor.sendEvent(this.selectedColor);
this.colorIsEnabled = true;
- this.rgt._lock.setAttribute("visibility","hidden");
- this.rgt._lock_open.setAttribute("visibility","visible");
+ this.rgt_b._lock.setAttribute("visibility","hidden");
+ this.rgt_b._lock_open.setAttribute("visibility","visible");
}
</method>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/logoutConfirm.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/logoutConfirm.lzx?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/logoutConfirm.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/logoutConfirm.lzx Thu Apr 26 17:38:19 2012
@@ -21,13 +21,13 @@
<library>
<class name="logoutConfirm" extends="labelExplorerBox" labelid="633"
- docking="true" resizeable="false" closable="false" width="270" x="${ canvas.width / 2 - 145 }" y="${ canvas.height / 2 - 120}" height="80">
+ docking="true" resizeable="false" closable="false" width="270" x="${ canvas.width / 2 - 145 }" y="${ canvas.height / 2 - 120}" height="100">
<attribute name="objectsToClean" type="expression"/>
- <labelText fontstyle="bold" y="25" labelid="634" x="10" width="270" />
+ <labelText fontstyle="bold" y="25" labelid="634" x="10" width="270" multiline="true" />
- <simpleLabelButton name="ok" x="20" y="50" labelid="54" width="120" height="20">
+ <simpleLabelButton name="ok" x="20" y="70" labelid="54" width="120" height="20">
<handler name="onclick">
if (!clearStageContent(objectsToClean))
{
@@ -40,11 +40,9 @@
</handler>
</simpleLabelButton>
- <simpleLabelButton name="cancel" x="140" y="50" labelid="55" width="120" height="20">
+ <simpleLabelButton name="cancel" x="140" y="70" labelid="55" width="120" height="20">
<handler name="onclick">
-
this.parent.close();
-
</handler>
</simpleLabelButton>
</class>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawLetter.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawLetter.lzx?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawLetter.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawLetter.lzx Thu Apr 26 17:38:19 2012
@@ -21,6 +21,9 @@
<library>
<class name="whiteBoardTextField" extends="text" >
+ <handler name="prepareForDelete" args="tRef">
+ //Nothing
+ </handler>
<attribute name="typeOfObject" value="text" type="string" />
<method name="setTextEncoded" args="tString">
<![CDATA[
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawArrow.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawArrow.lzx?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawArrow.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawArrow.lzx Thu Apr 26 17:38:19 2012
@@ -58,14 +58,14 @@
<method name="endDrawarrowline">
<![CDATA[
- //Debug.write("endDrawarrowline",this.startx,this.starty,this.endx,this.endy);
+ //if ($debug) Debug.write("endDrawarrowline",this.startx,this.starty,this.endx,this.endy);
var tempName = this.currentlayer.name;
//Debug.write("tempName: ",tempName);
this.currentlayer.destroy();
//GetBounds of that Object
- var minx = this.width+2;
- var miny = this.height+2;
+ var minx = this.width+2000;
+ var miny = this.height+2000;
var maxx = -2;
var maxy = -2;
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/helper/boundingBoxAll.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/helper/boundingBoxAll.lzx?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/helper/boundingBoxAll.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/helper/boundingBoxAll.lzx Thu Apr 26 17:38:19 2012
@@ -141,6 +141,10 @@
lz.Focus.setFocus(this, false);
+ if (this.objRef.typeOfObject == "text") {
+ this._editText.setAttribute("visibility","visible");
+ }
+
//FIXME - Add Ellipse, Line and Free Draw Tool to it
if (this.objRef.name.indexOf('rectangle') >= 0){
if ($debug) Debug.write("this.objRef._innerRect ",this.objRef._innerRect);
@@ -422,14 +426,13 @@
onmouseover="parent.applyScrollbarToObject()"
onmouseout="parent.removeScrollbarToObject()"
onmousedown="parent._applyDragstateFromThis()"
- onmouseup="parent._removeDragstateFromThis()">
- <handler name="oninit">
- var newMenu = new LzContextMenu();
- newMenu.hideBuiltInItems();
- var item1 = newMenu.makeMenuItem('remove Item', new LzDelegate(this.parent, "__LZRemoveItem"));
- newMenu.addItem(item1);
- this.setContextMenu(newMenu);
- </handler>
+ onmouseup="parent._removeDragstateFromThis()">
+
+ <contextmenu>
+ <contextmenuitem caption="$once{ canvas.getLabelName(80) }"
+ onselect="parent.parent.parent.__LZRemoveItem()" />
+ </contextmenu>
+
<handler name="ondblclick">
//Debug.write("ondblclick: ",this.parent.objRef.typeOfObject);
@@ -445,15 +448,43 @@
this.parent.objRef.height);
}
</handler>
+
<handler name="onmouseover">
if (this.parent.objRef.typeOfObject != "swf") {
lz.Cursor.setCursorGlobal("arrow_draw_panel_cursor");
}
+ </handler>
+
+ <handler name="onmouseout">
+ lz.Cursor.unlock();
+ </handler>
+
+
+ </view>
+
+ <image src="$once{ canvas.getThemeImage('bounding_box_textedit_item_rsc') }" y="2" width="16" height="16" stretches="both"
+ name="_editText" visibility="hidden" x="${ parent.width-this.width-parent.innerInsetScrollbars-18 }" >
+ <handler name="onclick">
+ this.parent.whiteboardRef
+ .editTextByValues(this.parent.objRef,
+ this.parent.objRef.name,
+ this.parent.objRef.text,
+ this.parent.x,
+ this.parent.y,
+ this.parent.objRef.width,
+ this.parent.objRef.height);
+ </handler>
+ <handler name="onmouseover">
+ lz.Cursor.restoreCursor();
+ lz.Cursor.showHandCursor(true);
</handler>
<handler name="onmouseout">
+ lz.Cursor.showHandCursor(false);
lz.Cursor.unlock();
- </handler>
- </view>
+ </handler>
+
+ <labelTooltip labelid="1463" />
+ </image>
<image src="$once{ canvas.getThemeImage('bounding_box_delete_item_rsc') }" y="2" width="16" height="16"
x="${ parent.width-this.width-parent.innerInsetScrollbars-2 }" stretches="both">
@@ -490,8 +521,7 @@
<view name="_gripperNoResize" visibility="hidden"
resource="_boundingBoxPointerURNoGripper" x="${ parent.width-this.width }" y="${ parent.height-this.height }" />
<view resource="_boundingBoxPointerUL" x="0" y="${ parent.height-this.height }" />
-
-</class>
+</class>
</library>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/propertypanel/propertyPanelLetterButton.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/propertypanel/propertyPanelLetterButton.lzx?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/propertypanel/propertyPanelLetterButton.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/propertypanel/propertyPanelLetterButton.lzx Thu Apr 26 17:38:19 2012
@@ -58,7 +58,7 @@
<view x="2" y="2" resource="$once{ parent.itemResourceName }" />
<view name="_clickEnabled" width="$once{ parent.width }" height="$once{ parent.height }"
- visibility="${ (parent.enabled) ? 'visible' : 'hidden' }"
+ visibility="${ (parent.enabled) ? 'hidden' : 'visible' }"
opacity="0.5" bgcolor="0xFFFFFF" clickable="true" showhandcursor="false" />
<labelTooltip x="2" y="2" labelid="$once{ parent.labelid }" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/whiteboardBarMenu.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/whiteboardBarMenu.lzx?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/whiteboardBarMenu.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/whiteboardBarMenu.lzx Thu Apr 26 17:38:19 2012
@@ -87,9 +87,8 @@
<![CDATA[
if (this.currentBtn != null){
this.currentBtn.isactive=false;
- ////if ($debug) //Debug.write("sendActiveWindow1: ",this.currentBtn);
- this.currentBtn._minimizebtn_mo.setAttribute('visibility','hidden');
- this.currentBtn._minimizebtn_dn.setAttribute('visibility','hidden');
+ if (this.currentBtn._minimizebtn_mo != null) this.currentBtn._minimizebtn_mo.setAttribute('visibility','hidden');
+ if (this.currentBtn._minimizebtn_dn != null) this.currentBtn._minimizebtn_dn.setAttribute('visibility','hidden');
}
this.currentBtn = btn;
this.currentBtn.objRef.setAttribute("visibility","visible");
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx Thu Apr 26 17:38:19 2012
@@ -67,7 +67,7 @@
parent._langAndCountry._town.setAttribute("text","<u>" + value.adresses.town + "</u>");
}
if (value.omTimeZone != null) {
- parent._langAndCountry._timeZone.setAttribute("text","<u>" + value.omTimeZone.ical + "</u>");
+ parent._langAndCountry._timeZone.setAttribute("text","<u>" + value.omTimeZone.jname + "</u>");
}
if (value.pictureuri==null || value.pictureuri.length==0){
@@ -166,13 +166,18 @@
</labelText>
</view>
- <simpleLabelButton y="60" labelid="377" x="240" width="120" height="20">
- <labelTooltip labelid="377" />
+ <labelText y="60" labelid="377" x="140" width="180" fgcolor="0x0000CC">
+ <handler name="oninit">
+ <![CDATA[
+ if($debug) Debug.write("dashboard/getNumberUnreadMessages: ",value);
+ this.setAttribute("text","<u>..."+canvas.getLabelName(377)+"</u>");
+ ]]>
+ </handler>
<handler name="onclick">
canvas.userSettingsModuleOpt = "userProfile";
quicklinkAct("userSettingsModule");
</handler>
- </simpleLabelButton>
+ </labelText>
<labelText fontstyle="bold" x="2" y="140" labelid="281" width="200"/>
Modified: incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/install_step1_EN.vm Thu Apr 26 17:38:19 2012
@@ -66,14 +66,12 @@ form.cmxform label { color: #333; }
form.cmxform fieldset {
border: none;
border-top: 1px solid #C9DCA6;
- background: url(../images/cmxform-fieldset.gif) left bottom repeat-x;
}
form.cmxform fieldset fieldset { background: none; }
form.cmxform fieldset li {
padding: 5px 10px 7px;
- background: url(../images/cmxform-divider.gif) left bottom repeat-x;
}
form.cmxform fieldset {
@@ -274,28 +272,28 @@ function checkEmail()
<input name="swftools_path" id="swftools_path" size="27" title="Enter the path to swftools for example C:/swftools (Windows) or leave blank if swftools is a known to your system path" type="text" />
<p><i>You can test if swftools is installed into system path by opening a shell or cmd-prompt and type pdf2swf<br/>
If this shows a list of options leave this field blank otherwise you have to specify the path to pdf2swf on your system<br/>
- see also <a href="http://code.google.com/p/openmeetings/wiki/ConvertersInstallation" target="_blank">ConvertersInstallation</a></i></p>
+ see also <a href="http://incubator.apache.org/openmeetings/installation.html" target="_blank">Installation</a></i></p>
</li>
<li>
<label for="imagemagick_path">ImageMagick Path</label>
<input name="imagemagick_path" id="imagemagick_path" size="27" title="Enter the path to ImageMagick, leave blank if ImageMagick is successfully installed to system-path" type="text" />
- <p><i>see also <a href="http://code.google.com/p/openmeetings/wiki/ConvertersInstallation" target="_blank">ConvertersInstallation</a></i></p>
+ <p><i>see also <a href="http://incubator.apache.org/openmeetings/installation.html" target="_blank">Installation</a></i></p>
</li>
<li>
<label for="ffmpeg_path">FFMPEG Path</label>
<input name="ffmpeg_path" id="ffmpeg_path" size="27" title="Enter the path to FFMPEG, leave blank if FFMPEG is successfully installed to system-path" type="text" />
- <p><i>see also <a href="http://code.google.com/p/openmeetings/wiki/ConvertersInstallation" target="_blank">ConvertersInstallation</a></i></p>
+ <p><i>see also <a href="http://incubator.apache.org/openmeetings/installation.html" target="_blank">Installation</a></i></p>
</li>
<li>
<label for="sox_path">SoX Path</label>
<input name="sox_path" id="sox_path" size="27" title="Enter the path to SoX, leave blank if SoX is successfully installed to system-path" type="text" />
- <p><i>see also <a href="http://code.google.com/p/openmeetings/wiki/ConvertersInstallation" target="_blank">ConvertersInstallation</a></i></p>
+ <p><i>see also <a href="http://incubator.apache.org/openmeetings/installation.html" target="_blank">Installation</a></i></p>
</li>
<li>
<label for="jod_path">JOD Path</label>
<input name="jod_path" id="jod_path" size="27" value="./jodconverter-core-3.0-beta-4/lib"
title="The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar" type="text" />
- <p><i>see also <a href="http://code.google.com/p/openmeetings/wiki/ConvertersInstallation" target="_blank">ConvertersInstallation</a></i></p>
+ <p><i>see also <a href="http://incubator.apache.org/openmeetings/installation.html" target="_blank">Installation</a></i></p>
</li>
<li>
<label for="office_path">OpenOffice/LibreOffice Path for jodconverter</label>
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/conference/whiteboard/WhiteboardManagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/conference/whiteboard/WhiteboardManagement.java?rev=1330985&r1=1330984&r2=1330985&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/conference/whiteboard/WhiteboardManagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/conference/whiteboard/WhiteboardManagement.java Thu Apr 26 17:38:19 2012
@@ -478,6 +478,9 @@ public class WhiteboardManagement {
// List roomItem = roomList.get(objectOID);
List currentObject = whiteboardObject.getRoomItems().get(
objectOID);
+ if (actionObject.get(0).equals("paint")) {
+ actionObject.set(1, currentObject.get(1));
+ }
whiteboardObject.getRoomItems().put(objectOID, actionObject);
Map roomList = whiteboardObject.getRoomItems();