You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/04/23 10:32:07 UTC
svn commit: r1470846 - in /openmeetings/trunk/singlewebapp:
WebContent/languages/ src/org/apache/openmeetings/web/app/
src/org/apache/openmeetings/web/components/
src/org/apache/openmeetings/web/components/user/dashboard/
src/org/apache/openmeetings/we...
Author: solomax
Date: Tue Apr 23 08:32:05 2013
New Revision: 1470846
URL: http://svn.apache.org/r1470846
Log:
[OPENMEETINGS-612]: Welcome widget is added
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidget.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetDescriptor.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.java
Modified:
openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/UserPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/PrivateRoomsWidget.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/PrivateRoomsWidgetDescriptor.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/PrivateRoomsWidgetView.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/RoomsSelectorPanel.java
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20simplified.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20traditional.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch%20%28studIP%29.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/english.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/english.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/french.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/french.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/portugues%20brazil.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>СоÑ
Ñанение даннÑÑ
, подождиÑе пожалÑйÑÑа.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml Tue Apr 23 08:32:05 2013
@@ -4661,4 +4661,10 @@ see http://openmeetings.apache.org/Langu
<string id="1545" name="content_is_saving">
<value>Content is Saving, Please wait.</value>
</string>
+ <string id="1546" name="widget_welcome">
+ <value>Welcome</value>
+ </string>
+ <string id="1547" name="widget_welcome_desc">
+ <value>Widget displaying basic user info and support links</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java Tue Apr 23 08:32:05 2013
@@ -20,6 +20,7 @@ package org.apache.openmeetings.web.app;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.web.components.user.dashboard.PrivateRoomsWidgetDescriptor;
+import org.apache.openmeetings.web.components.user.dashboard.WelcomeWidgetDescriptor;
import org.apache.openmeetings.web.pages.MainPage;
import org.apache.openmeetings.web.pages.NotInitedPage;
import org.apache.openmeetings.web.pages.auth.SignInPage;
@@ -43,7 +44,6 @@ import org.springframework.web.context.s
import ro.fortsoft.wicket.dashboard.Dashboard;
import ro.fortsoft.wicket.dashboard.DefaultDashboard;
-import ro.fortsoft.wicket.dashboard.Widget;
import ro.fortsoft.wicket.dashboard.WidgetFactory;
import ro.fortsoft.wicket.dashboard.WidgetRegistry;
import ro.fortsoft.wicket.dashboard.web.DashboardContext;
@@ -78,6 +78,7 @@ public class Application extends Authent
dashboardContext = new DashboardContext();
WidgetRegistry widgetRegistry = dashboardContext.getWidgetRegistry();
widgetRegistry.registerWidget(new PrivateRoomsWidgetDescriptor());
+ widgetRegistry.registerWidget(new WelcomeWidgetDescriptor());
// add dashboard context injector
DashboardContextInjector dashboardContextInjector = new DashboardContextInjector(dashboardContext);
getComponentInstantiationListeners().add(dashboardContextInjector);
@@ -146,8 +147,8 @@ public class Application extends Authent
dashboard = new DefaultDashboard("default", "Default");
}
WidgetFactory widgetFactory = dashboardContext.getWidgetFactory();
- Widget widget = widgetFactory.createWidget(new PrivateRoomsWidgetDescriptor());
dashboard.getWidgets().clear(); //FIXME hack somehow Dashboard loaded with 7! PrivateRoomsWidgets
- dashboard.addWidget(widget);
+ dashboard.addWidget(widgetFactory.createWidget(new WelcomeWidgetDescriptor()));
+ dashboard.addWidget(widgetFactory.createWidget(new PrivateRoomsWidgetDescriptor()));
}
}
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java Tue Apr 23 08:32:05 2013
@@ -107,7 +107,8 @@ public class WebSession extends Abstract
public static String getString(long id) {
FieldManager fieldManager = Application.getBean(FieldManager.class);
- return fieldManager.getString(id, getLanguage());
+ String s = fieldManager.getString(id, getLanguage());
+ return s == null ? "[Missing]" : s;
}
public static long getLanguage() {
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/UserPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/UserPanel.java?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/UserPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/UserPanel.java Tue Apr 23 08:32:05 2013
@@ -18,6 +18,14 @@
*/
package org.apache.openmeetings.web.components;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.openmeetings.data.conference.RoomManager;
+import org.apache.openmeetings.data.conference.dao.RoomDao;
+import org.apache.openmeetings.persistence.beans.room.Room;
+import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
@AuthorizeInstantiation("USER")
@@ -27,4 +35,23 @@ public abstract class UserPanel extends
public UserPanel(String id) {
super(id);
}
+
+ //FIXME need to be handled somehow differently
+ public static List<Room> getMyRooms() {
+ List<Room> result = new ArrayList<Room>();
+ Room r1 = new Room();
+ r1.setIspublic(true);
+ r1.setName(WebSession.getString(1306L));
+ //FIXME need to be DAO !!!!
+ r1.setRoomtype(Application.getBean(RoomManager.class).getRoomTypesById(1L));
+ result.add(r1);
+ Room r2 = new Room();
+ r2.setIspublic(true); //TODO weird
+ r2.setName(WebSession.getString(1307L));
+ //FIXME need to be DAO !!!!
+ r2.setRoomtype(Application.getBean(RoomManager.class).getRoomTypesById(3L));
+ result.add(r2);
+ result.addAll(Application.getBean(RoomDao.class).getAppointedRoomsByUser(WebSession.getUserId()));
+ return result;
+ }
}
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/PrivateRoomsWidget.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/PrivateRoomsWidget.java?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/PrivateRoomsWidget.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/PrivateRoomsWidget.java Tue Apr 23 08:32:05 2013
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.openmeetings.web.components.user.dashboard;
import org.apache.openmeetings.web.app.WebSession;
@@ -12,12 +30,8 @@ public class PrivateRoomsWidget extends
private static final long serialVersionUID = 1769428980617610979L;
public PrivateRoomsWidget(String id) {
- this();
- setId(id);
- }
-
- public PrivateRoomsWidget() {
super();
+ setId(id);
title = WebSession.getString(781L);
location = new WidgetLocation(0, 1);
}
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/PrivateRoomsWidgetDescriptor.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/PrivateRoomsWidgetDescriptor.java?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/PrivateRoomsWidgetDescriptor.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/PrivateRoomsWidgetDescriptor.java Tue Apr 23 08:32:05 2013
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.openmeetings.web.components.user.dashboard;
import org.apache.openmeetings.web.app.WebSession;
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/PrivateRoomsWidgetView.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/PrivateRoomsWidgetView.java?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/PrivateRoomsWidgetView.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/PrivateRoomsWidgetView.java Tue Apr 23 08:32:05 2013
@@ -1,8 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.openmeetings.web.components.user.dashboard;
-import org.apache.openmeetings.data.conference.dao.RoomDao;
-import org.apache.openmeetings.web.app.Application;
-import org.apache.openmeetings.web.app.WebSession;
+import static org.apache.openmeetings.web.components.UserPanel.getMyRooms;
+
import org.apache.openmeetings.web.components.user.rooms.RoomsPanel;
import org.apache.wicket.model.Model;
@@ -15,8 +32,6 @@ public class PrivateRoomsWidgetView exte
public PrivateRoomsWidgetView(String id, Model<Widget> model) {
super(id, model);
- //FIXME 2 !!!! fake rooms;
- //FIXME need to be generalized with RoomsSelectorPanel
- add(new RoomsPanel("rooms", Application.getBean(RoomDao.class).getAppointedRoomsByUser(WebSession.getUserId())));
+ add(new RoomsPanel("rooms", getMyRooms()));
}
}
Added: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidget.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidget.java?rev=1470846&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidget.java (added)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidget.java Tue Apr 23 08:32:05 2013
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.components.user.dashboard;
+
+import org.apache.openmeetings.web.app.WebSession;
+import org.apache.wicket.model.Model;
+
+import ro.fortsoft.wicket.dashboard.AbstractWidget;
+import ro.fortsoft.wicket.dashboard.Widget;
+import ro.fortsoft.wicket.dashboard.WidgetLocation;
+import ro.fortsoft.wicket.dashboard.web.WidgetView;
+
+public class WelcomeWidget extends AbstractWidget {
+ private static final long serialVersionUID = 8866852061674736808L;
+
+ public WelcomeWidget(String id) {
+ super();
+ setId(id);
+ title = WebSession.getString(1546L);
+ location = new WidgetLocation(0, 0);
+ }
+
+ public WidgetView createView(String viewId) {
+ return new WelcomeWidgetView(viewId, new Model<Widget>(this));
+ }
+}
Added: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetDescriptor.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetDescriptor.java?rev=1470846&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetDescriptor.java (added)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetDescriptor.java Tue Apr 23 08:32:05 2013
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.components.user.dashboard;
+
+import org.apache.openmeetings.web.app.WebSession;
+
+import ro.fortsoft.wicket.dashboard.WidgetDescriptor;
+
+public class WelcomeWidgetDescriptor implements WidgetDescriptor {
+ private static final long serialVersionUID = 7835392425157215242L;
+
+ public String getName() {
+ return WebSession.getString(1546L);
+ }
+
+ public String getProvider() {
+ return "Apache Openmeetings";
+ }
+
+ public String getDescription() {
+ return WebSession.getString(1547L);
+ }
+
+ public String getWidgetClassName() {
+ return WelcomeWidget.class.getName();
+ }
+
+}
Added: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.html?rev=1470846&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.html (added)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.html Tue Apr 23 08:32:05 2013
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<html xmlns:wicket="http://wicket.apache.org">
+ <wicket:panel>
+ <table>
+ <tr>
+ <td><div wicket:id="img"></div></td>
+ <td>
+ <wicket:ommessage key="376"/> <span wicket:id="firstname"></span> <span wicket:id="lastname"></span><br/> <wicket:ommessage key="376"/> <span wicket:id="firstname"></span> <span wicket:id="lastname"></span><br/> <wicket:ommessage key="376"/> <span wicket:id="firstname"></span> <span wicket:id="lastname"></span><br/> <wicket:ommessage key="376"/> <span wicket:id="firstname"></span> <span wicket:id="lastname"></span><br/> <wicket:ommessage key="376"/> <span wicket:id="firstname"></span> <span wicket:id="lastname"></span><br/>
+ <wicket:ommessage key="1143"/> <span wicket:id="tz"></span><br/>
+ <wicket:ommessage key="378"/> <span wicket:id="unread"></span><br/>
+ <a wicket:id="editProfile"><wicket:ommessage key="377"/></a>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <h3><wicket:ommessage key="281"/></h3>
+ <wicket:ommessage key="286"/><br/>
+ <wicket:ommessage key="287"/><br/>
+ <wicket:ommessage key="1527"/><br/>
+ </td>
+ </tr>
+ </table>
+ </wicket:panel>
+</html>
\ No newline at end of file
Added: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.java?rev=1470846&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.java (added)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.java Tue Apr 23 08:32:05 2013
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.components.user.dashboard;
+
+import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.app.WebSession;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.model.Model;
+
+import ro.fortsoft.wicket.dashboard.Widget;
+import ro.fortsoft.wicket.dashboard.web.WidgetView;
+
+public class WelcomeWidgetView extends WidgetView {
+ private static final long serialVersionUID = -6257866996099503210L;
+
+ public WelcomeWidgetView(String id, Model<Widget> model) {
+ super(id, model);
+
+ User u = Application.getBean(UsersDao.class).get(WebSession.getUserId());
+ add(new WebMarkupContainer("img"));//FIXME
+ //FIXME this need to be aligned according to Locale
+ add(new Label("firstname", Model.of(u.getFirstname())));
+ add(new Label("lastname", Model.of(u.getLastname())));
+ add(new Label("tz", Model.of(u.getOmTimeZone().getIcal())));
+ add(new Label("unread", Model.of("0")));//FIXME need to have valid number + link
+ add(new AjaxLink<Void>("editProfile") {
+ private static final long serialVersionUID = -1847619557485964386L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ //FIXME should have action
+ }
+ });
+ }
+}
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/RoomsSelectorPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/RoomsSelectorPanel.java?rev=1470846&r1=1470845&r2=1470846&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/RoomsSelectorPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/RoomsSelectorPanel.java Tue Apr 23 08:32:05 2013
@@ -37,8 +37,7 @@ public class RoomsSelectorPanel extends
case myTabButton:
title = 781L;
desc = 782L;
- //FIXME 2 !!!! fake rooms;
- add(new RoomsPanel("rooms", roomDao.getAppointedRoomsByUser(WebSession.getUserId())));
+ add(new RoomsPanel("rooms", getMyRooms()));
break;
case privateTabButton:
title = 779L;