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/02/02 15:14:59 UTC
svn commit: r1563617 - in /openmeetings/branches/3.0.x: docs/
src/install/java/org/apache/openmeetings/installation/
src/util/java/org/apache/openmeetings/util/
src/web/java/org/apache/openmeetings/web/pages/
src/web/java/org/apache/openmeetings/web/ut...
Author: solomax
Date: Sun Feb 2 14:14:59 2014
New Revision: 1563617
URL: http://svn.apache.org/r1563617
Log:
[OPENMEETINGS-904] default.landing.zone is fixed
Modified:
openmeetings/branches/3.0.x/docs/GeneralConfiguration.html
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/MainPage.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/OmUrlFragment.java
openmeetings/branches/3.0.x/xdocs/GeneralConfiguration.xml
openmeetings/branches/3.0.x/xdocs/website.xsd
Modified: openmeetings/branches/3.0.x/docs/GeneralConfiguration.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/docs/GeneralConfiguration.html?rev=1563617&r1=1563616&r2=1563617&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/docs/GeneralConfiguration.html (original)
+++ openmeetings/branches/3.0.x/docs/GeneralConfiguration.html Sun Feb 2 14:14:59 2014
@@ -814,13 +814,14 @@ limitations under the License.
default.landing.zone
</td>
<td bgcolor="#a0ddf0" class="configCell" colspan="" rowspan="" valign="top" align="left" style="color: black; font-size: small; font-family: arial, helvetica, sanserif;">
- dashboard.rooms
+ user/dashboard
</td>
<td bgcolor="#a0ddf0" class="configCell" colspan="" rowspan="" valign="top" align="left" style="color: black; font-size: small; font-family: arial, helvetica, sanserif;">
- Area to be shown to the user after login. Possible values are: dashboard.rooms, dashboard.chat, calendar, rooms.public, rooms.private, rooms.user
+ Area to be shown to the user after login. Possible values are: user/dashboard, user/calendar, user/record, rooms/my, rooms/group, rooms/public, admin/user, admin/connection
+ , admin/group, admin/room, admin/config, admin/lang, admin/ldap, admin/backup, admin/server, admin/oauth2
</td>
<td bgcolor="#a0ddf0" class="configCell" colspan="" rowspan="" valign="top" align="left" style="color: black; font-size: small; font-family: arial, helvetica, sanserif;">
- 2.1.x
+ 2.1.x, <b> values are changed in 3.0.0</b>
</td>
</tr>
<tr>
Modified: openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1563617&r1=1563616&r2=1563617&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/installation/ImportInitvalues.java Sun Feb 2 14:14:59 2014
@@ -22,6 +22,7 @@ import static org.apache.openmeetings.db
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CRYPT_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DASHBOARD_SHOW_MYROOMS_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DASHBOARD_SHOW_RSS_KEY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANDING_ZONE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAUT_LANG_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FRONTEND_REGISTER_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_IGNORE_BAD_SSL;
@@ -523,13 +524,12 @@ public class ImportInitvalues {
null,
"Set inviter's email address as ReplyTo in email invitations (1 == set, 0 == NOT set)");
- configurationDao
- .add(
- "default.landing.zone",
- "dashboard.rooms",
- null,
- "Area to be shown to the user after login. Possible values are: "
- + "dashboard.rooms, dashboard.chat, calendar, rooms.public, rooms.private, rooms.user");
+ configurationDao.add(CONFIG_DEFAULT_LANDING_ZONE,
+ "user/dashboard"
+ , null
+ , "Area to be shown to the user after login. Possible values are: "
+ + "user/dashboard, user/calendar, user/record, rooms/my, rooms/group, rooms/public, admin/user, admin/connection"
+ + ", admin/group, admin/room, admin/config, admin/lang, admin/ldap, admin/backup, admin/server, admin/oauth2");
// oauth2 params
configurationDao
Modified: openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java?rev=1563617&r1=1563616&r2=1563617&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java (original)
+++ openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java Sun Feb 2 14:14:59 2014
@@ -31,6 +31,7 @@ public class OpenmeetingsVariables {
public static final String CONFIG_RSS_FEED1_KEY = "rss_feed1";
public static final String CONFIG_RSS_FEED2_KEY = "rss_feed2";
public static final String CONFIG_IGNORE_BAD_SSL = "oauth2.ignore_bad_ssl";
+ public static final String CONFIG_DEFAULT_LANDING_ZONE = "default.landing.zone";
public static final String WEB_DATE_PATTERN = "dd.MM.yyyy HH:mm:ss"; //FIXME need to be made locale based
public static final String CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY = "redirect.url.for.external.users";
public static String webAppRootKey = null;
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/MainPage.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/MainPage.java?rev=1563617&r1=1563616&r2=1563617&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/MainPage.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/MainPage.java Sun Feb 2 14:14:59 2014
@@ -23,7 +23,6 @@ import static org.apache.openmeetings.we
import static org.apache.openmeetings.web.app.Application.removeOnlineUser;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import static org.apache.openmeetings.web.util.OmUrlFragment.CHILD_ID;
-import static org.apache.openmeetings.web.util.OmUrlFragment.DASHBOARD;
import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_EDIT;
import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_MESSAGES;
import static org.apache.openmeetings.web.util.OmUrlFragment.getPanel;
@@ -140,7 +139,7 @@ public class MainPage extends BaseInited
@Override
protected void onTimer(AjaxRequestTarget target) {
OmUrlFragment area = WebSession.get().getArea();
- updateContents(area == null ? DASHBOARD : area, target);
+ updateContents(area == null ? OmUrlFragment.get() : area, target);
stop(target);
WebSession.get().setArea(null);
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/OmUrlFragment.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/OmUrlFragment.java?rev=1563617&r1=1563616&r2=1563617&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/OmUrlFragment.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/OmUrlFragment.java Sun Feb 2 14:14:59 2014
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.web.util;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANDING_ZONE;
+import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getBaseUrl;
import static org.apache.openmeetings.web.app.WebSession.getLanguage;
import static org.apache.openmeetings.web.app.WebSession.getSid;
@@ -26,6 +28,7 @@ import static org.apache.openmeetings.we
import java.io.Serializable;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.web.admin.backup.BackupPanel;
import org.apache.openmeetings.web.admin.configurations.ConfigsPanel;
import org.apache.openmeetings.web.admin.connection.ConnectionsPanel;
@@ -51,6 +54,7 @@ public class OmUrlFragment implements Se
private String type = "";
public static final String CHILD_ID = "child";
public static final String TYPE_CALENDAR = "calendar";
+ public static final String TYPE_DASHBOARD = "dashboard";
public static final String TYPE_MESSAGES = "messages";
public static final String TYPE_EDIT = "edit";
public static final String TYPE_RECORDINGS = "record";
@@ -66,7 +70,7 @@ public class OmUrlFragment implements Se
public static final String TYPE_BACKUP = "backup";
public static final String TYPE_SERVER = "server";
public static final String TYPE_OAUTH2 = "oauth2";
- public static final OmUrlFragment DASHBOARD = new OmUrlFragment(AreaKeys.user, "");
+ public static final OmUrlFragment DASHBOARD = new OmUrlFragment(AreaKeys.user, TYPE_DASHBOARD);
public static final OmUrlFragment PROFILE_EDIT = new OmUrlFragment(AreaKeys.profile, TYPE_EDIT);
public static final OmUrlFragment PROFILE_MESSAGES = new OmUrlFragment(AreaKeys.profile, TYPE_MESSAGES);
public static final OmUrlFragment CALENDAR = new OmUrlFragment(AreaKeys.user, TYPE_CALENDAR);
@@ -106,6 +110,18 @@ public class OmUrlFragment implements Se
, myTabButton
}
+ public static OmUrlFragment get() {
+ String[] arr = getBean(ConfigurationDao.class).getConfValue(CONFIG_DEFAULT_LANDING_ZONE, String.class, "").split("/");
+ if (arr != null && arr.length == 2) {
+ try {
+ return new OmUrlFragment(AreaKeys.valueOf(arr[0]), arr[1]);
+ } catch (Exception e) {
+ // no-op
+ }
+ }
+ return DASHBOARD;
+ }
+
public OmUrlFragment(AreaKeys area, String type) {
this.setArea(area);
this.setType(type);
@@ -118,6 +134,8 @@ public class OmUrlFragment implements Se
public OmUrlFragment(MenuActions action, MenuParams params) {
switch(action) {
case dashboardModuleStartScreen:
+ setArea(AreaKeys.user);
+ setType(TYPE_DASHBOARD);
break;
case dashboardModuleCalendar:
setArea(AreaKeys.user);
Modified: openmeetings/branches/3.0.x/xdocs/GeneralConfiguration.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/xdocs/GeneralConfiguration.xml?rev=1563617&r1=1563616&r2=1563617&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/xdocs/GeneralConfiguration.xml (original)
+++ openmeetings/branches/3.0.x/xdocs/GeneralConfiguration.xml Sun Feb 2 14:14:59 2014
@@ -102,9 +102,10 @@
</tr>
<tr>
<td class="configCell"> default.landing.zone </td>
- <td class="configCell"> dashboard.rooms </td>
- <td class="configCell"> Area to be shown to the user after login. Possible values are: dashboard.rooms, dashboard.chat, calendar, rooms.public, rooms.private, rooms.user </td>
- <td class="configCell"> 2.1.x </td>
+ <td class="configCell"> user/dashboard </td>
+ <td class="configCell"> Area to be shown to the user after login. Possible values are: user/dashboard, user/calendar, user/record, rooms/my, rooms/group, rooms/public, admin/user, admin/connection
+ , admin/group, admin/room, admin/config, admin/lang, admin/ldap, admin/backup, admin/server, admin/oauth2 </td>
+ <td class="configCell"> 2.1.x, <b> values are changed in 3.0.0</b> </td>
</tr>
<tr>
<td class="configCell"> sms.provider </td>
Modified: openmeetings/branches/3.0.x/xdocs/website.xsd
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/xdocs/website.xsd?rev=1563617&r1=1563616&r2=1563617&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/xdocs/website.xsd (original)
+++ openmeetings/branches/3.0.x/xdocs/website.xsd Sun Feb 2 14:14:59 2014
@@ -146,6 +146,7 @@
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element ref="a"/>
<xs:element ref="p"/>
+ <xs:element ref="b"/>
</xs:choice>
<xs:attribute name="style"/>
<xs:attribute name="class"/>