Author: solomax
Date: Fri Nov 14 11:16:55 2014
New Revision: 1639607
URL: http://svn.apache.org/r1639607
Log:
[OPENMEETINGS-1117] RTL hacks are removed from dashboard
Modified:
openmeetings/branches/3.0.x/ivy.xml
openmeetings/branches/3.0.x/src/main/webapp/css/theme-rtl.css
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/Application.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme-rtl.css
Modified: openmeetings/branches/3.0.x/ivy.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/ivy.xml?rev=1639607&r1=1639606&r2=1639607&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/ivy.xml (original)
+++ openmeetings/branches/3.0.x/ivy.xml Fri Nov 14 11:16:55 2014
@@ -277,7 +277,7 @@
<dependency org="com.googlecode.wicket-jquery-ui"
name="wicket-kendo-ui-theme-default" rev="6.17.0" conf="openmeetings->*"
transitive="false">
<include type="jar" />
</dependency>
- <dependency org="ro.fortsoft.wicket.dashboard"
name="wicket-dashboard-core" rev="0.10" conf="openmeetings->*"
transitive="false">
+ <dependency org="ro.fortsoft.wicket.dashboard"
name="wicket-dashboard-core" rev="0.12.0" conf="openmeetings->*"
transitive="false">
<include type="jar" />
</dependency>
<dependency org="com.google.code.gson" name="gson" rev="2.2.4"
conf="openmeetings->*" transitive="false">
Modified: openmeetings/branches/3.0.x/src/main/webapp/css/theme-rtl.css
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/css/theme-rtl.css?rev=1639607&r1=1639606&r2=1639607&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/css/theme-rtl.css (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/css/theme-rtl.css Fri Nov 14
11:16:55 2014
@@ -41,17 +41,3 @@
right: initial !important;
left: 10px;
}
-
-/* Dashboard, need to be moved to the component*/
-.column {
- float: right !important;
-}
-.dragbox-toggle {
- float: right !important;
-}
-.dragbox-title {
- float: right !important;
-}
-.dragbox-actions {
- float: left !important;
-}
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/Application.java?rev=1639607&r1=1639606&r2=1639607&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/Application.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/Application.java
Fri Nov 14 11:16:55 2014
@@ -110,7 +110,7 @@ public class Application extends Authent
// register some widgets
dashboardContext = new DashboardContext();
- dashboardContext.setDashboardPersiter(new
UserDashboardPersister());
+ dashboardContext.setDashboardPersister(new
UserDashboardPersister());
WidgetRegistry widgetRegistry =
dashboardContext.getWidgetRegistry();
widgetRegistry.registerWidget(new MyRoomsWidgetDescriptor());
widgetRegistry.registerWidget(new WelcomeWidgetDescriptor());
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java?rev=1639607&r1=1639606&r2=1639607&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java
Fri Nov 14 11:16:55 2014
@@ -442,7 +442,7 @@ public class WebSession extends Abstract
private void initDashboard() {
DashboardContext dashboardContext = getDashboardContext();
- dashboard =
(UserDashboard)dashboardContext.getDashboardPersiter().load();
+ dashboard =
(UserDashboard)dashboardContext.getDashboardPersister().load();
boolean existMyRoomWidget = false, existRssWidget = false;
ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
boolean confShowMyRooms = 1 ==
cfgDao.getConfValue(CONFIG_DASHBOARD_SHOW_MYROOMS_KEY, Integer.class, "0");
@@ -494,7 +494,7 @@ public class WebSession extends Abstract
}
}
if (save) {
- dashboardContext.getDashboardPersiter().save(dashboard);
+
dashboardContext.getDashboardPersister().save(dashboard);
}
}
}
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java?rev=1639607&r1=1639606&r2=1639607&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java
Fri Nov 14 11:16:55 2014
@@ -31,6 +31,6 @@ public class OmDashboardPanel extends Us
public OmDashboardPanel(String id) {
super(id);
- add(new DashboardPanel("dashboard", new
Model<Dashboard>(WebSession.getDashboard())));
+ add(new DashboardPanel("dashboard", new
Model<Dashboard>(WebSession.getDashboard())).setRtlModel(Model.of(WebSession.getLanguageObj().getRtl())));
}
}
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java?rev=1639607&r1=1639606&r2=1639607&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java
Fri Nov 14 11:16:55 2014
@@ -72,7 +72,7 @@ public class WidgetsPanel extends Panel
if (w == null && b) {
d.addWidget(dashboardContext.getWidgetFactory().createWidget(wd));
}
-
dashboardContext.getDashboardPersiter().save(d);
+
dashboardContext.getDashboardPersister().save(d);
}
});
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml?rev=1639607&r1=1639606&r2=1639607&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml Fri Nov 14
11:16:55 2014
@@ -30,7 +30,7 @@
<name>Openmeetings Web</name>
<description>TODO</description>
<properties>
-
<wicket-dashboard.version>0.11.0+wicket-7</wicket-dashboard.version>
+
<wicket-dashboard.version>0.12.0+wicket-7</wicket-dashboard.version>
<commons-io.version>2.4</commons-io.version>
<commons-fileupload.version>1.3</commons-fileupload.version>
<mysql.version>5.1.30</mysql.version>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1639607&r1=1639606&r2=1639607&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
Fri Nov 14 11:16:55 2014
@@ -127,7 +127,7 @@ public class Application extends Authent
// register some widgets
dashboardContext = new DashboardContext();
- dashboardContext.setDashboardPersiter(new
UserDashboardPersister());
+ dashboardContext.setDashboardPersister(new
UserDashboardPersister());
WidgetRegistry widgetRegistry =
dashboardContext.getWidgetRegistry();
widgetRegistry.registerWidget(new MyRoomsWidgetDescriptor());
widgetRegistry.registerWidget(new WelcomeWidgetDescriptor());
@@ -382,8 +382,8 @@ public class Application extends Authent
if (i.getInvitee().getType() == Type.contact) {
link += "?invitationHash=" + i.getHash();
- if (i.getInvitee().getLanguage_id() > 0) {
- link += "&language=" +
i.getInvitee().getLanguage_id().toString();
+ if (i.getInvitee().getLanguageId() > 0) {
+ link += "&language=" +
i.getInvitee().getLanguageId().toString();
}
} else {
link =
getRoomUrlFragment(i.getRoom().getId()).getLink();
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java?rev=1639607&r1=1639606&r2=1639607&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
Fri Nov 14 11:16:55 2014
@@ -236,7 +236,7 @@ public class WebSession extends Abstract
private void setUser(User u) {
userId = u.getId();
rights = Collections.unmodifiableSet(u.getRights());
- languageId = u.getLanguage_id();
+ languageId = u.getLanguageId();
externalType = u.getExternalUserType();
tz = getBean(TimezoneUtil.class).getTimeZone(u);
ISO8601FORMAT.setTimeZone(tz);
@@ -301,7 +301,7 @@ public class WebSession extends Abstract
WebSession session = get();
if (session.languageId < 0) {
if (session.isSignedIn()) {
- session.languageId =
getBean(UserDao.class).get(session.userId).getLanguage_id();
+ session.languageId =
getBean(UserDao.class).get(session.userId).getLanguageId();
} else {
session.languageId =
getBean(ConfigurationDao.class).getConfValue(CONFIG_DEFAUT_LANG_KEY,
Long.class, "1");
}
@@ -443,7 +443,7 @@ public class WebSession extends Abstract
private void initDashboard() {
DashboardContext dashboardContext = getDashboardContext();
- dashboard =
(UserDashboard)dashboardContext.getDashboardPersiter().load();
+ dashboard =
(UserDashboard)dashboardContext.getDashboardPersister().load();
boolean existMyRoomWidget = false, existRssWidget = false;
ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
boolean showMyRoomConfValue = 1 ==
cfgDao.getConfValue(CONFIG_DASHBOARD_SHOW_MYROOMS_KEY, Integer.class, "0");
@@ -495,7 +495,7 @@ public class WebSession extends Abstract
}
}
if (save) {
- dashboardContext.getDashboardPersiter().save(dashboard);
+
dashboardContext.getDashboardPersister().save(dashboard);
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java?rev=1639607&r1=1639606&r2=1639607&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java
Fri Nov 14 11:16:55 2014
@@ -31,6 +31,6 @@ public class OmDashboardPanel extends Us
public OmDashboardPanel(String id) {
super(id);
- add(new DashboardPanel("dashboard", new
Model<Dashboard>(WebSession.getDashboard())));
+ add(new DashboardPanel("dashboard", new
Model<Dashboard>(WebSession.getDashboard())).setRtlModel(Model.of(WebSession.getLanguageObj().isRtl())));
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java?rev=1639607&r1=1639606&r2=1639607&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java
Fri Nov 14 11:16:55 2014
@@ -72,7 +72,7 @@ public class WidgetsPanel extends Panel
if (w == null && b) {
d.addWidget(dashboardContext.getWidgetFactory().createWidget(wd));
}
-
dashboardContext.getDashboardPersiter().save(d);
+
dashboardContext.getDashboardPersister().save(d);
}
});
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme-rtl.css
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme-rtl.css?rev=1639607&r1=1639606&r2=1639607&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme-rtl.css
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme-rtl.css
Fri Nov 14 11:16:55 2014
@@ -41,17 +41,3 @@
right: initial !important;
left: 10px;
}
-
-/* Dashboard, need to be moved to the component*/
-.column {
- float: right !important;
-}
-.dragbox-toggle {
- float: right !important;
-}
-.dragbox-title {
- float: right !important;
-}
-.dragbox-actions {
- float: left !important;
-}
