svn commit: r1560924 - in /openmeetings/trunk/singlewebapp/src: main/webapp/css/ main/webapp/languages/ web/java/org/apache/openmeetings/web/pages/auth/

Fri, 24 Jan 2014 01:03:22 -0800 

Author: solomax
Date: Fri Jan 24 09:02:07 2014
New Revision: 1560924

URL: http://svn.apache.org/r1560924
Log:
Default application fonts are added; 'After registration' message is corrected; 
Register form is cleaned up on subsequent open;

Modified:
    openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/arabic.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/bulgarian.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/catalan.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese 
simplified.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese 
traditional.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/czech.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/danish.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/deutsch 
(studIP).xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/deutsch.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/dutch.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/english.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/finnish.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/french.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/galician.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/greek.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/hebrew.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/hungarian.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/indonesian.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/italian.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/japanese.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/korean.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/persian.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/polish.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/portugues 
brazil.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/portugues.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/russian.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/slovak.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/spanish.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/swedish.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/thai.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/turkish.xml
    openmeetings/trunk/singlewebapp/src/main/webapp/languages/ukrainian.xml
    
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css Fri Jan 24 
09:02:07 2014
@@ -19,6 +19,7 @@
 html, body {
        height: 100%;
        margin: 0;
+       font-family: Arial, Helvetica, sans-serif;
 }
 #header {
        font-size: 28px;

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/arabic.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/arabic.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/arabic.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/arabic.xml Fri 
Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: 
openmeetings/trunk/singlewebapp/src/main/webapp/languages/bulgarian.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/bulgarian.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/bulgarian.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/bulgarian.xml Fri 
Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/catalan.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/catalan.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/catalan.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/catalan.xml Fri 
Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese 
simplified.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese%20simplified.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese 
simplified.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese 
simplified.xml Fri Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese 
traditional.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese%20traditional.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese 
traditional.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese 
traditional.xml Fri Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/czech.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/czech.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/czech.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/czech.xml Fri Jan 
24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/danish.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/danish.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/danish.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/danish.xml Fri 
Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/deutsch 
(studIP).xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/deutsch%20%28studIP%29.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/deutsch 
(studIP).xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/deutsch 
(studIP).xml Fri Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/deutsch.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/deutsch.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/deutsch.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/deutsch.xml Fri 
Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/dutch.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/dutch.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/dutch.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/dutch.xml Fri Jan 
24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/english.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/english.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/english.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/english.xml Fri 
Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/finnish.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/finnish.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/finnish.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/finnish.xml Fri 
Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/french.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/french.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/french.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/french.xml Fri 
Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/galician.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/galician.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/galician.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/galician.xml Fri 
Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/greek.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/greek.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/greek.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/greek.xml Fri Jan 
24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/hebrew.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/hebrew.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/hebrew.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/hebrew.xml Fri 
Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: 
openmeetings/trunk/singlewebapp/src/main/webapp/languages/hungarian.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/hungarian.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/hungarian.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/hungarian.xml Fri 
Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: 
openmeetings/trunk/singlewebapp/src/main/webapp/languages/indonesian.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/indonesian.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/indonesian.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/indonesian.xml 
Fri Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/italian.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/italian.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/italian.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/italian.xml Fri 
Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/japanese.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/japanese.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/japanese.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/japanese.xml Fri 
Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/korean.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/korean.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/korean.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/korean.xml Fri 
Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/persian.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/persian.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/persian.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/persian.xml Fri 
Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/polish.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/polish.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/polish.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/polish.xml Fri 
Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/portugues 
brazil.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/portugues%20brazil.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/portugues 
brazil.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/portugues 
brazil.xml Fri Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: 
openmeetings/trunk/singlewebapp/src/main/webapp/languages/portugues.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/portugues.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/portugues.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/portugues.xml Fri 
Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/russian.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/russian.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/russian.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/russian.xml Fri 
Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Показать</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Ваш аккаунт создан. Письмо с 
подтверждение было выслано. Теперь вы 
можете войти под своим именем.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/slovak.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/slovak.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/slovak.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/slovak.xml Fri 
Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/spanish.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/spanish.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/spanish.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/spanish.xml Fri 
Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/swedish.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/swedish.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/swedish.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/swedish.xml Fri 
Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/thai.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/thai.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/thai.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/thai.xml Fri Jan 
24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/turkish.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/turkish.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/turkish.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/turkish.xml Fri 
Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: 
openmeetings/trunk/singlewebapp/src/main/webapp/languages/ukrainian.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/ukrainian.xml?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/ukrainian.xml 
(original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/ukrainian.xml Fri 
Jan 24 09:02:07 2014
@@ -4796,4 +4796,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1590" name="dashboard.display">
     <value>Display</value>
   </string>
+  <string id="1591" name="register.confirmation.sent">
+    <value>Your account has been created. Confirmation email has been sent. 
You can now login.</value>
+  </string>
 </language>

Modified: 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1560924&r1=1560923&r2=1560924&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
 Fri Jan 24 09:02:07 2014
@@ -77,7 +77,7 @@ public class RegisterDialog extends Abst
        private FeedbackPanel feedback = new FeedbackPanel("feedback");
        private final IModel<String> tzModel = 
Model.of(WebSession.get().getTimeZoneByBrowserLocale(0));
        private final DropDownChoice<String> tzDropDown = new 
DropDownChoice<String>("tz", tzModel, getAvailableTimezones());
-       private Form<String> form;
+       private RegisterForm form;
        private SignInDialog s;
     private String firstName;
     private String lastName;
@@ -94,11 +94,10 @@ public class RegisterDialog extends Abst
        public RegisterDialog(String id) {
                super(id, WebSession.getString(113));
                add(form = new RegisterForm("form"));
-               lang = WebSession.get().getLanguageByBrowserLocale();
-               state = WebSession.get().getCountryByBrowserLocale();
+               form.setOutputMarkupId(true);
                tzDropDown.setOutputMarkupId(true);
                
-               confirmRegistration = new MessageDialog("confirmRegistration", 
WebSession.getString(235), WebSession.getString(674), DialogButtons.OK, 
DialogIcon.INFO){
+               confirmRegistration = new MessageDialog("confirmRegistration", 
WebSession.getString(235), WebSession.getString(674), DialogButtons.OK, 
DialogIcon.INFO) {
                        private static final long serialVersionUID = 1L;
 
                        @Override
@@ -108,16 +107,13 @@ public class RegisterDialog extends Abst
                                behavior.setOption("closeOnEscape", false);
                        }
                        
-                       public void onOpen(AjaxRequestTarget target) {
-                               this.setTitle(Model.of(sendConfirmation && 
sendEmailAtRegister ? WebSession.getString(674) : WebSession.getString(236)));
-                       }
-                       
                        public void onClose(AjaxRequestTarget target, 
DialogButton button) {
                                s.open(target);
                        }
                };
                add(confirmRegistration);
-}
+               reset();
+       }
 
        @Override
        public void onConfigure(JQueryBehavior behavior) {
@@ -145,12 +141,32 @@ public class RegisterDialog extends Abst
                return Arrays.asList(registerBtn, cancelBtn);
        }
 
+       public void reset() {
+           firstName = null;
+           lastName = null;
+           login = null;
+           password = null;
+           form.confirmPassword.setModelObject(null);
+           email = null;
+               lang = WebSession.get().getLanguageByBrowserLocale();
+               state = WebSession.get().getCountryByBrowserLocale();
+       }
+       
        public void onOpen(AjaxRequestTarget target) {
                String baseURL = getBaseUrl();
                sendEmailAtRegister = 1 == 
getBean(ConfigurationDao.class).getConfValue("sendEmailAtRegister", 
Integer.class, "0");
                sendConfirmation = baseURL != null
                                && !baseURL.isEmpty()
                                && 1 == 
getBean(ConfigurationDao.class).getConfValue("sendEmailWithVerficationCode", 
Integer.class, "0");
+               long messageCode = 236;
+               if (sendConfirmation && sendEmailAtRegister) {
+                       messageCode = 674;
+               } else if (sendConfirmation) {
+                       messageCode = 1591;
+               }
+               
confirmRegistration.setModelObject(WebSession.getString(messageCode));
+               reset();
+               target.add(form);
        }
        
        public void onClose(AjaxRequestTarget target, DialogButton button) {
@@ -167,7 +183,7 @@ public class RegisterDialog extends Abst
        }
 
        @Override
-       public Form<String> getForm() {
+       public Form<Void> getForm() {
                return form;
        }
 
@@ -205,14 +221,16 @@ public class RegisterDialog extends Abst
 
        }
        
-       class RegisterForm extends StatelessForm<String> {
+       class RegisterForm extends StatelessForm<Void> {
                private static final long serialVersionUID = 
1701373326213602431L;
-           private PasswordTextField confirmPassword;
+               private PasswordTextField confirmPassword;
                private PasswordTextField passwordField;
                private RequiredTextField<String> emailField;
                private RequiredTextField<String> loginField;
                private RequiredTextField<String> firstNameField;
                private RequiredTextField<String> lastNameField;
+               private DropDownChoice<FieldLanguage> langField;
+               private DropDownChoice<State> stateField;
 
                public RegisterForm(String id) {
                        super(id);
@@ -233,18 +251,19 @@ public class RegisterDialog extends Abst
                        add(emailField = new RequiredTextField<String>("email", 
new PropertyModel<String>(RegisterDialog.this, "email")));
                        
emailField.setLabel(Model.of(WebSession.getString(119)));
                        
emailField.add(RfcCompliantEmailAddressValidator.getInstance());
-                       add(new DropDownChoice<FieldLanguage>("lang"
+                       add(langField = new DropDownChoice<FieldLanguage>("lang"
                                        , new 
PropertyModel<FieldLanguage>(RegisterDialog.this, "lang")
                                        , 
getBean(FieldLanguageDao.class).getLanguages()
                                        , new 
ChoiceRenderer<FieldLanguage>("name", "language_id"))
-                               
.setRequired(true).setLabel(Model.of(WebSession.getString(111))));
+                               );
+                       
langField.setRequired(true).setLabel(Model.of(WebSession.getString(111)));
                        
add(tzDropDown.setRequired(true).setLabel(Model.of(WebSession.getString(1143))));
-                       add(new DropDownChoice<State>("state"
+                       add(stateField = new DropDownChoice<State>("state"
                                        , new 
PropertyModel<State>(RegisterDialog.this, "state")
                                        , getBean(StateDao.class).getStates()
                                        , new ChoiceRenderer<State>("name", 
"state_id"))
-                               
.setRequired(true).setLabel(Model.of(WebSession.getString(120))));
-                       
+                               );
+                       
stateField.setRequired(true).setLabel(Model.of(WebSession.getString(120)));
                        add(new AjaxButton("submit") { //FAKE button so 
"submit-on-enter" works as expected
                                private static final long serialVersionUID = 
-3612671587183668912L;

Reply via email to