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 2014/06/25 14:32:40 UTC
svn commit: r1605371 - in /openmeetings:
branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/
trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/
Author: solomax
Date: Wed Jun 25 12:32:39 2014
New Revision: 1605371
URL: http://svn.apache.org/r1605371
Log:
Custom app name was not displayed while using invitation links
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/SwfPage.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/SwfPage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.java
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/SwfPage.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/SwfPage.html?rev=1605371&r1=1605370&r2=1605371&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/SwfPage.html (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/SwfPage.html Wed Jun 25 12:32:39 2014
@@ -25,7 +25,6 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7">
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
- <title wicket:id="titleAppName"></title>
<style type="text/css">
html,body { /* http://www.quirksmode.org/css/100percheight.html */
height: 100%;
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/SwfPage.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/SwfPage.java?rev=1605371&r1=1605370&r2=1605371&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/SwfPage.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/SwfPage.java Wed Jun 25 12:32:39 2014
@@ -22,19 +22,21 @@ import static org.apache.openmeetings.we
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.web.user.rooms.RoomPanel;
-import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.mapper.parameter.PageParameters;
public class SwfPage extends BaseNotInitedPage {
- private static final long serialVersionUID = 6492618860620779445L;
+ private static final long serialVersionUID = 1L;
public SwfPage() {
this(new PageParameters());
}
public SwfPage(PageParameters pp) {
- add(new Label("titleAppName", getBean(ConfigurationDao.class).getAppName()));
add(new RoomPanel("room", pp));
}
-
+
+ @Override
+ protected String getApplicationName() {
+ return getBean(ConfigurationDao.class).getAppName();
+ }
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.html?rev=1605371&r1=1605370&r2=1605371&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.html Wed Jun 25 12:32:39 2014
@@ -25,7 +25,6 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7">
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
- <title wicket:id="titleAppName"></title>
<style type="text/css">
html,body { /* http://www.quirksmode.org/css/100percheight.html */
height: 100%;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.java?rev=1605371&r1=1605370&r2=1605371&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.java Wed Jun 25 12:32:39 2014
@@ -33,8 +33,11 @@ public class SwfPage extends BaseNotInit
}
public SwfPage(PageParameters pp) {
- add(new Label("titleAppName", getBean(ConfigurationDao.class).getAppName()));
add(new SwfPanel("room", pp));
}
-
+
+ @Override
+ protected String getApplicationName() {
+ return getBean(ConfigurationDao.class).getAppName();
+ }
}