Author: solomax
Date: Thu Jul 19 03:40:47 2012
New Revision: 1363215
URL: http://svn.apache.org/viewvc?rev=1363215&view=rev
Log:
OPENMEETINGS-356 is fixed
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/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/turkish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/logoutConfirm.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Navimanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Navimain.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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
Thu Jul 19 03:40:47 2012
@@ -4552,4 +4552,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
Thu Jul 19 03:40:47 2012
@@ -4550,4 +4550,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
Thu Jul 19 03:40:47 2012
@@ -4551,4 +4551,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
simplified.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
simplified.xml Thu Jul 19 03:40:47 2012
@@ -4551,4 +4551,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
traditional.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
traditional.xml Thu Jul 19 03:40:47 2012
@@ -4563,4 +4563,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
Thu Jul 19 03:40:47 2012
@@ -4551,4 +4551,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
Thu Jul 19 03:40:47 2012
@@ -4550,4 +4550,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
(studIP).xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
(studIP).xml Thu Jul 19 03:40:47 2012
@@ -4551,4 +4551,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
Thu Jul 19 03:40:47 2012
@@ -6018,4 +6018,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
Thu Jul 19 03:40:47 2012
@@ -4547,4 +4547,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
Thu Jul 19 03:40:47 2012
@@ -5994,4 +5994,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
Thu Jul 19 03:40:47 2012
@@ -4550,4 +4550,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
Thu Jul 19 03:40:47 2012
@@ -4551,4 +4551,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
Thu Jul 19 03:40:47 2012
@@ -4551,4 +4551,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
Thu Jul 19 03:40:47 2012
@@ -4551,4 +4551,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
Thu Jul 19 03:40:47 2012
@@ -4551,4 +4551,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
Thu Jul 19 03:40:47 2012
@@ -4551,4 +4551,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
Thu Jul 19 03:40:47 2012
@@ -4551,4 +4551,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
Thu Jul 19 03:40:47 2012
@@ -4551,4 +4551,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
Thu Jul 19 03:40:47 2012
@@ -4550,4 +4550,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
Thu Jul 19 03:40:47 2012
@@ -4551,4 +4551,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml?rev=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
Thu Jul 19 03:40:47 2012
@@ -4551,4 +4551,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
Thu Jul 19 03:40:47 2012
@@ -4624,4 +4624,13 @@ transmitowania gÅosu i obrazu wideo.<
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
brazil.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
brazil.xml Thu Jul 19 03:40:47 2012
@@ -4552,4 +4552,13 @@ Details
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
Thu Jul 19 03:40:47 2012
@@ -4551,4 +4551,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
Thu Jul 19 03:40:47 2012
@@ -4551,4 +4551,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
Thu Jul 19 03:40:47 2012
@@ -4551,4 +4551,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
Thu Jul 19 03:40:47 2012
@@ -4559,4 +4559,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
Thu Jul 19 03:40:47 2012
@@ -4551,4 +4551,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Thu
Jul 19 03:40:47 2012
@@ -4551,4 +4551,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml?rev=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
Thu Jul 19 03:40:47 2012
@@ -4550,4 +4550,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
Thu Jul 19 03:40:47 2012
@@ -4551,4 +4551,13 @@ see http://incubator.apache.org/openmeet
  8) start OM<br/>
</value>
</string>
+ <string id="1506" name="public_room_tooltip">
+ <value>Rooms common to all user</value>
+ </string>
+ <string id="1507" name="private_room_tooltip">
+ <value>Rooms common to the current user group</value>
+ </string>
+ <string id="1508" name="my_room_tooltip">
+ <value>Rooms of the current user</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx?rev=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx
Thu Jul 19 03:40:47 2012
@@ -25,7 +25,7 @@
var labelObj;
-var tempActionForNavi = '';
+var tempActionForNavi = null;
// Load Labels from List
var labels = new Object();
@@ -101,25 +101,18 @@ function quicklink(action){
function quicklinkAct(action){
// if($debug) Debug.write("FUNC/quicklinkAct",action);
- var t = new Array();
- t.action = action;
- loadContent(t,null,null);
+ loadContent({action: action},null,null);
}
function loadContent(obj,parentobj,preparentobj){
- if($debug) Debug.write("FUNC/loadContent: ",obj.action);
+ if($debug) Debug.write("FUNC/loadContent: ", obj);
- tempActionForNavi = obj.action;
-
- if (obj.action!="logout")
- {
- if (!clearStageContent(obj))
- {
+ if (obj.action!="logout") {
+ tempActionForNavi = {action: obj.action, params: obj.params};
+ if (!clearStageContent()) {
loadContentByTempActionForNavi();
}
- }
- else
- {
+ } else {
new lz.logoutConfirm(canvas,{objectsToClean: obj});
}
@@ -129,28 +122,22 @@ function loadContentByTempActionForNavi(
// if($debug) Debug.write("FUNC/loadContentByTempActionForNavi");
if (canvas.roomJumpId != 0) {
-
canvas.initroomid = canvas.roomJumpId;
canvas.thishib.getRoomById.doCall();
canvas.roomJumpId = 0;
-
} else {
-
if($debug) Debug.write("FUNC/loadContentByString -1-
",tempActionForNavi);
- if($debug) Debug.write("FUNC/loadContentByString -2-
",canvas[tempActionForNavi]);
- if($debug) Debug.write("FUNC/loadContentByString -3-
",lz[canvas[tempActionForNavi]]);
+ if($debug) Debug.write("FUNC/loadContentByString -2-
",canvas[tempActionForNavi.action]);
+ if($debug) Debug.write("FUNC/loadContentByString -3-
",lz[canvas[tempActionForNavi.action]]);
- new lz[canvas[tempActionForNavi]](canvas.main_content._content.inner);
+ new
lz[canvas[tempActionForNavi.action]](canvas.main_content._content.inner,
{params: tempActionForNavi.params});
}
}
-function clearStageContent(obj){
- // if($debug) Debug.write("FUNC/clearStageContent: ",obj);
- //can be called with zero arguments
- //if (arguments.length!=0) obj.parent.parent.clearAllSubItemLists();
-
+function clearStageContent(){
return canvas.main_content._content.clearAll();
}
+
function setLabelObject(labelObjRef){
// if($debug) Debug.write("FUNC/setLabelObject",labelObjRef);
labelObj = labelObjRef;
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=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/logoutConfirm.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/logoutConfirm.lzx
Thu Jul 19 03:40:47 2012
@@ -29,7 +29,7 @@
<simpleLabelButton name="ok" x="20" y="70" labelid="54" width="120"
height="20">
<handler name="onclick">
- if (!clearStageContent(objectsToClean))
+ if (!clearStageContent())
{
canvas._mainbgcontentNavi.navi.destroy();
canvas._mainbgcontentNavi.help.destroy();
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx?rev=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx
Thu Jul 19 03:40:47 2012
@@ -28,7 +28,7 @@
<class name="baseDropDownMenuListItem" extends="view" height="36">
<attribute name="action" value="" type="string" />
-
+ <attribute name="params" value="" type="string" />
<attribute name="isopen" value="false" type="boolean" />
<attribute name="isleaf" value="false" type="boolean" />
<attribute name="list" value="null" />
@@ -152,6 +152,7 @@
isopen:this.list[i].isopen,
isleaf:this.list[i].isleaf,
action:this.list[i].action,
+ params:this.list[i].params,
textToolTip:list[i].tooltip.value
});
}
@@ -268,7 +269,7 @@
list:value[i].mainnavi,
isleaf:value[i].isleaf,
text:value[i].label.value,
- textToolTip:value[i].tooltip.value,
+ textToolTip:value[i].tooltip.value,
action:value[i].action
});
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx?rev=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
Thu Jul 19 03:40:47 2012
@@ -48,85 +48,66 @@
</handler>
</netRemoteCallHib>
- <method name="parseConfiguration" args="cfManagementList">
- <![CDATA[
-
- var tCountVisibleTabs = 0;
- for (var i=0;i<cfManagementList.length;i++) {
-
- var tConfigurationObj = cfManagementList[i];
-
- switch (tConfigurationObj.conf_key) {
- case "dashboard.show.myrooms":
- if (Number(tConfigurationObj.conf_value) == 1) {
- tCountVisibleTabs++;
- } else {
-
this._bottomArea._tabbar.myRoomsTabButton.setAttribute("visibility","hidden");
- }
- break;
- case "dashboard.show.rssfeed":
- if (Number(tConfigurationObj.conf_value) == 1) {
- tCountVisibleTabs++;
- this.getRssFeeds.doCall();
- } else {
-
this._bottomArea._tabbar.rssFeed1TabButton.setAttribute("visibility","hidden");
- }
- break;
- case "dashboard.show.chat":
- if (Number(tConfigurationObj.conf_value) == 1) {
- tCountVisibleTabs++;
- } else {
-
this._bottomArea._tabbar.chatTabButton.setAttribute("visibility","hidden");
- }
- break;
- default:
- if ($debug) Debug.write("Unkown Tab Key
",tConfigurationObj.conf_key);
- break;
- }
-
- }
-
- var tFoundVisibleDefaultTab = false;
- for (var i=0;i<cfManagementList.length;i++) {
-
- var tConfigurationObj = cfManagementList[i];
-
- if (tConfigurationObj.conf_key == "default.dashboard.tab") {
-
- var tIndexNumber = Number(tConfigurationObj.conf_value);
- var tObj = this._bottomArea._tabbar.subviews[tIndexNumber];
-
- if ($debug)
Debug.write("tIndexNumber|tObj",tIndexNumber,tObj);
-
- if (tObj && tObj.visible) {
- tFoundVisibleDefaultTab = true;
- tObj.onclick.sendEvent(null);
- }
-
- }
-
- }
-
- if ($debug)
Debug.write("tFoundVisibleDefaultTab|tCountVisibleTabs",tFoundVisibleDefaultTab,tCountVisibleTabs);
-
- if (!tFoundVisibleDefaultTab && tCountVisibleTabs>0) {
-
- for (var i=0;i<this._bottomArea._tabbar.subviews.length;i++)
{
-
- var tObj = this._bottomArea._tabbar.subviews[i];
- if ($debug) Debug.write("tObj &&
tObj.visible",tObj,tObj.visible);
-
- if (tObj && tObj.visible) {
- tObj.onclick.sendEvent(null);
- break;
- }
- }
- }
-
- this._bottomArea.setAttribute("visibility","visible");
-
- ]]>
- </method>
+ <method name="parseConfiguration" args="cfManagementList">
+ <![CDATA[
+ var tCountVisibleTabs = 0;
+ var tFoundVisibleDefaultTab = false;
+ for (var i=0;i<cfManagementList.length;i++) {
+ var tConfigurationObj = cfManagementList[i];
+
+ switch (tConfigurationObj.conf_key) {
+ case "dashboard.show.myrooms":
+ if
(Number(tConfigurationObj.conf_value) == 1) {
+ tCountVisibleTabs++;
+ } else {
+
this._bottomArea._tabbar.myRoomsTabButton.setAttribute("visibility","hidden");
+ }
+ break;
+ case "dashboard.show.rssfeed":
+ if
(Number(tConfigurationObj.conf_value) == 1) {
+ tCountVisibleTabs++;
+ this.getRssFeeds.doCall();
+ } else {
+
this._bottomArea._tabbar.rssFeed1TabButton.setAttribute("visibility","hidden");
+ }
+ break;
+ case "dashboard.show.chat":
+ if
(Number(tConfigurationObj.conf_value) == 1) {
+ tCountVisibleTabs++;
+ } else {
+
this._bottomArea._tabbar.chatTabButton.setAttribute("visibility","hidden");
+ }
+ break;
+ case "default.dashboard.tab":
+ var tIndexNumber =
Number(tConfigurationObj.conf_value);
+ var tObj =
this._bottomArea._tabbar.subviews[tIndexNumber];
+
+ if ($debug)
Debug.write("tIndexNumber|tObj",tIndexNumber,tObj);
+ if (tObj && tObj.visible) {
+ tFoundVisibleDefaultTab = true;
+ tObj.onclick.sendEvent(null);
+ }
+ break;
+ default:
+ if ($debug) Debug.write("Unkown Tab Key
",tConfigurationObj.conf_key);
+ break;
+ }
+ }
+ if ($debug)
Debug.write("tFoundVisibleDefaultTab|tCountVisibleTabs",tFoundVisibleDefaultTab,tCountVisibleTabs);
+
+ if (!tFoundVisibleDefaultTab && tCountVisibleTabs>0) {
+ for (var
i=0;i<this._bottomArea._tabbar.subviews.length;i++) {
+ var tObj = this._bottomArea._tabbar.subviews[i];
+ if ($debug) Debug.write("tObj &&
tObj.visible",tObj,tObj.visible);
+ if (tObj && tObj.visible) {
+ tObj.onclick.sendEvent(null);
+ break;
+ }
+ }
+ }
+ this._bottomArea.setAttribute("visibility","visible");
+ ]]>
+ </method>
<handler name="ontabcontentleave">
canvas._overallchatcontent = null;
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx?rev=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx
Thu Jul 19 03:40:47 2012
@@ -23,7 +23,8 @@
<class name="allmeetings" extends="baseContentView" height="${
canvas.height-canvas.naviHeight }">
<attribute name="finishedTabsQuantity" type="number" value="0"/>
<attribute name="clickedButton" value="null"/>
-
+ <attribute name="params" value="" type="string" />
+
<method name="updateFinishedTabsQuantity">
this.finishedTabsQuantity = this.finishedTabsQuantity + 1;
@@ -37,7 +38,19 @@
</method>
<handler name="oninit">
+ if ($debug) Debug.write("!!! allmeetings::oninit params = ",
this.params, this._tabbar);
_mainScrollBar.setAttribute("visibility","hidden");
+ switch (this.params) {
+ case "publicTabButton":
+ doSelection(this._tabbar.publicTabButton);
+ break;
+ case "privateTabButton":
+ doSelection(this._tabbar.privateTabButton);
+ break;
+ case "myTabButton":
+ doSelection(this._tabbar.myTabButton);
+ break;
+ }
</handler>
<handler name="ontabcontentleave">
@@ -54,18 +67,22 @@
}
this.refObjItem = objRef;
- if (this.refObjItem.name == "publicTabButton"){
-
this._conferences.PublicMeetings.setAttribute("visibility","visible");
-
this._conferences.PrivateMeetings.setAttribute("visibility","hidden");
-
this._conferences.MyMeetings.setAttribute("visibility","hidden");
- } else if (this.refObjItem.name == "privateTabButton"){
-
this._conferences.PublicMeetings.setAttribute("visibility","hidden");
-
this._conferences.PrivateMeetings.setAttribute("visibility","visible");
-
this._conferences.MyMeetings.setAttribute("visibility","hidden");
- } else if (this.refObjItem.name == "myTabButton"){
-
this._conferences.PublicMeetings.setAttribute("visibility","hidden");
-
this._conferences.PrivateMeetings.setAttribute("visibility","hidden");
-
this._conferences.MyMeetings.setAttribute("visibility","visible");
+ switch (this.refObjItem.name) {
+ case "publicTabButton":
+
this._conferences.PublicMeetings.setAttribute("visibility","visible");
+
this._conferences.PrivateMeetings.setAttribute("visibility","hidden");
+
this._conferences.MyMeetings.setAttribute("visibility","hidden");
+ break;
+ case "privateTabButton":
+
this._conferences.PublicMeetings.setAttribute("visibility","hidden");
+
this._conferences.PrivateMeetings.setAttribute("visibility","visible");
+
this._conferences.MyMeetings.setAttribute("visibility","hidden");
+ break;
+ case "myTabButton":
+
this._conferences.PublicMeetings.setAttribute("visibility","hidden");
+
this._conferences.PrivateMeetings.setAttribute("visibility","hidden");
+
this._conferences.MyMeetings.setAttribute("visibility","visible");
+ break;
}
this.refObjItem.select();
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Navimanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Navimanagement.java?rev=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Navimanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Navimanagement.java
Thu Jul 19 03:40:47 2012
@@ -118,7 +118,7 @@ public class Navimanagement {
}
}
- public void addMainStructure(String action, int naviorder,
+ public void addMainStructure(String action, String params, int
naviorder,
long fieldvalues_id, boolean isleaf, boolean isopen,
long level_id,
String name, long global_id, String deleted,
Long tooltip_fieldvalues_id) {
@@ -129,6 +129,7 @@ public class Navimanagement {
Navimain nm = new Navimain();
nm.setAction(action);
+ nm.setParams(params);
nm.setComment("");
nm.setIcon("");
nm.setFieldvalues_id(fieldvalues_id);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java?rev=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
Thu Jul 19 03:40:47 2012
@@ -110,9 +110,9 @@ public class ImportInitvalues {
*/
navimanagement.addGlobalStructure("home", 1, 124, false, true,
1,
"home", "false", 582L);
- navimanagement.addMainStructure("dashboardModuleStartScreen",
1, 290,
+ navimanagement.addMainStructure("dashboardModuleStartScreen",
null, 1, 290,
true, false, 1, "Dashboard Module", 1, "false",
1450L);
- navimanagement.addMainStructure("dashboardModuleCalendar", 2,
291,
+ navimanagement.addMainStructure("dashboardModuleCalendar",
null, 2, 291,
true, false, 1, "Module Calendar", 1, "false",
1451L);
/*
@@ -121,7 +121,7 @@ public class ImportInitvalues {
navimanagement.addGlobalStructure("record", 2, 395, false,
true, 1,
"record", "false", 583L);
- navimanagement.addMainStructure("recordModule", 1, 395, true,
false, 1,
+ navimanagement.addMainStructure("recordModule", null, 1, 395,
true, false, 1,
"Module Recording Player", 2, "false", 1452L);
/*
@@ -136,10 +136,17 @@ public class ImportInitvalues {
navimanagement.addGlobalStructure("meetings", 3, 792, false,
true, 1,
"List of Conference Rooms Global Navi",
"false", 793L);
- navimanagement.addMainStructure("conferenceModuleRoomList", 1,
792,
+ navimanagement.addMainStructure("conferenceModuleRoomList",
"publicTabButton", 1, 777,
true, false, 1, "List of Conference Rooms Main
Navi", 3,
- "false", 1453L);
+ "false", 1506L);
+ navimanagement.addMainStructure("conferenceModuleRoomList",
"privateTabButton", 1, 779,
+ true, false, 1, "List of Conference Rooms Main
Navi", 3,
+ "false", 1507L);
+
+ navimanagement.addMainStructure("conferenceModuleRoomList",
"myTabButton", 1, 781,
+ true, false, 1, "List of Conference Rooms Main
Navi", 3,
+ "false", 1508L);
/*
* ######################## Event Menu Points
*/
@@ -147,7 +154,7 @@ public class ImportInitvalues {
navimanagement.addGlobalStructure("events", 4, 3, false, true,
1,
"List of Event Rooms Global Navi", "true",
585L);
- navimanagement.addMainStructure("eventModuleRoomList", 1, 3,
true,
+ navimanagement.addMainStructure("eventModuleRoomList", null, 1,
3, true,
false, 1, "List of Event Rooms Main Navi", 4,
"false", null);
/*
@@ -156,10 +163,10 @@ public class ImportInitvalues {
navimanagement.addGlobalStructure("moderate", 5, 649L, false,
true, 2,
"Moderation Menu", "true", 660L);
- navimanagement.addMainStructure("moderatorModuleUser", 1, 650,
true,
+ navimanagement.addMainStructure("moderatorModuleUser", null, 1,
650, true,
false, 1, "Moderate Users", 5, "false", null);
- navimanagement.addMainStructure("moderatorModuleRoom", 1, 651,
true,
+ navimanagement.addMainStructure("moderatorModuleRoom", null, 1,
651, true,
false, 1, "Moderate Rooms", 5, "false", null);
/*
@@ -169,33 +176,33 @@ public class ImportInitvalues {
navimanagement.addGlobalStructure("admin", 6, 6, false, true, 3,
"Administration Menu", "false", 586L);
- navimanagement.addMainStructure("adminModuleUser", 14, 125,
true,
+ navimanagement.addMainStructure("adminModuleUser", null, 14,
125, true,
false, 2, "Administration of Users", 6,
"false", 1454L);
- navimanagement.addMainStructure("adminModuleConnections", 15,
597,
+ navimanagement.addMainStructure("adminModuleConnections", null,
15, 597,
true, false, 3, "Aministration of Connections",
6, "false",
1455L);
- navimanagement.addMainStructure("adminModuleOrg", 16, 127,
true, false,
+ navimanagement.addMainStructure("adminModuleOrg", null, 16,
127, true, false,
3, "Administration of Organizations", 6,
"false", 1456L);
- navimanagement.addMainStructure("adminModuleRoom", 17, 186,
true,
+ navimanagement.addMainStructure("adminModuleRoom", null, 17,
186, true,
false, 3, "Administration of Rooms", 6,
"false", 1457L);
- navimanagement.addMainStructure("adminModuleConfiguration", 18,
263,
+ navimanagement.addMainStructure("adminModuleConfiguration",
null, 18, 263,
true, false, 3, "Administration of
Configuration", 6, "false",
1458L);
- navimanagement.addMainStructure("adminModuleLanguages", 19,
348, true,
+ navimanagement.addMainStructure("adminModuleLanguages", null,
19, 348, true,
false, 3, "Administration of Languages", 6,
"false", 1459L);
- navimanagement.addMainStructure("adminModuleLDAP", 20, 1103,
true,
+ navimanagement.addMainStructure("adminModuleLDAP", null, 20,
1103, true,
false, 3, "Administration of LDAP Configs", 6,
"false", 1460L);
- navimanagement.addMainStructure("adminModuleBackup", 21, 367,
true,
+ navimanagement.addMainStructure("adminModuleBackup", null, 21,
367, true,
false, 3, "Administration of Backups", 6,
"false", 1461L);
- navimanagement.addMainStructure("adminModuleServers", 22, 1498,
true,
+ navimanagement.addMainStructure("adminModuleServers", null, 22,
1498, true,
false, 3, "Administration of Servers", 6,
"false", 1499L);
log.debug("MainMenu ADDED");
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Navimain.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Navimain.java?rev=1363215&r1=1363214&r2=1363215&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Navimain.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Navimain.java
Thu Jul 19 03:40:47 2012
@@ -34,7 +34,6 @@ import org.openmeetings.app.persistence.
@Entity
@Table(name = "navimain")
public class Navimain implements Serializable {
-
private static final long serialVersionUID = 1691787896183701877L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -53,6 +52,8 @@ public class Navimain implements Seriali
private Boolean isopen;
@Column(name="action")
private String action;
+ @Column(name="params")
+ private String params;
@Column(name="updatetime")
private Date updatetime;
@Column(name="starttime")
@@ -74,9 +75,6 @@ public class Navimain implements Seriali
@Column(name="tooltip_fieldvalues_id")
private Long tooltip_fieldvalues_id;
- public Navimain() {
- }
-
public String getAction() {
return action;
}
@@ -203,5 +201,13 @@ public class Navimain implements Seriali
public void setTooltip(Fieldlanguagesvalues tooltip) {
this.tooltip = tooltip;
}
+
+ public String getParams() {
+ return params;
+ }
+
+ public void setParams(String params) {
+ this.params = params;
+ }
}
