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 2012/12/20 15:58:04 UTC
svn commit: r1424503 - in
/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web:
app/ components/ components/admin/ components/admin/backup/
components/admin/configurations/ components/admin/groups/
components/admin/labels/ compone...
Author: solomax
Date: Thu Dec 20 14:58:03 2012
New Revision: 1424503
URL: http://svn.apache.org/viewvc?rev=1424503&view=rev
Log:
Wicket: RTL is added;
code cleanup
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/HeaderPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseFormPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPagingNavigator.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/PagedEntityListPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupUsersPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/ChatPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.html
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java?rev=1424503&r1=1424502&r2=1424503&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java Thu Dec 20 14:58:03 2012
@@ -24,12 +24,14 @@ import java.util.Calendar;
import java.util.TimeZone;
import org.apache.openmeetings.data.basic.AuthLevelmanagement;
+import org.apache.openmeetings.data.basic.FieldLanguageDaoImpl;
import org.apache.openmeetings.data.basic.Fieldmanagment;
import org.apache.openmeetings.data.basic.Sessionmanagement;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.data.user.Usermanagement;
import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
+import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.apache.wicket.authroles.authentication.AbstractAuthenticatedWebSession;
import org.apache.wicket.authroles.authorization.strategies.role.Roles;
@@ -115,6 +117,10 @@ public class WebSession extends Abstract
}
}
+ public static FieldLanguage getLanguageObj() {
+ return Application.getBean(FieldLanguageDaoImpl.class).getFieldLanguageById(getLanguage());
+ }
+
public static String getSid() {
return get().SID;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/HeaderPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/HeaderPanel.html?rev=1424503&r1=1424502&r2=1424503&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/HeaderPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/HeaderPanel.html Thu Dec 20 14:58:03 2012
@@ -18,8 +18,7 @@
under the License.
-->
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd" lang="en">
+<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<div id="header">
<span id="logo"></span><span wicket:id="appName"></span>
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.html?rev=1424503&r1=1424502&r2=1424503&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.html Thu Dec 20 14:58:03 2012
@@ -18,8 +18,7 @@
under the License.
-->
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd" lang="en">
+<html xmlns:wicket="http://wicket.apache.org">
<wicket:head>
<link media="screen" type="text/css" rel="stylesheet" href="css/jquery.ui.menubar.css"/>
</wicket:head>
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseFormPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseFormPanel.html?rev=1424503&r1=1424502&r2=1424503&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseFormPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseFormPanel.html Thu Dec 20 14:58:03 2012
@@ -18,9 +18,7 @@
under the License.
-->
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd"
- lang="en">
+<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<div class="formSaveBar">
<div class="formSaveButton">
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPagingNavigator.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPagingNavigator.html?rev=1424503&r1=1424502&r2=1424503&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPagingNavigator.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPagingNavigator.html Thu Dec 20 14:58:03 2012
@@ -16,15 +16,13 @@
limitations under the License.
-->
<html xmlns:wicket="http://wicket.apache.org">
-<body>
-<wicket:panel>
- <a wicket:id="first" class="first"></a>
- <a wicket:id="prev" class="prev"></a>
- <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="#"><span wicket:id="pageNumber">5</span></a>
- </span>
- <a wicket:id="next" class="next"></a>
- <a wicket:id="last" class="last"></a>
-</wicket:panel>
-</body>
+ <wicket:panel>
+ <a wicket:id="first" class="first"></a>
+ <a wicket:id="prev" class="prev"></a>
+ <span wicket:id="navigation" class="goto">
+ <a wicket:id="pageLink" href="#"><span wicket:id="pageNumber">5</span></a>
+ </span>
+ <a wicket:id="next" class="next"></a>
+ <a wicket:id="last" class="last"></a>
+ </wicket:panel>
</html>
\ No newline at end of file
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/PagedEntityListPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/PagedEntityListPanel.html?rev=1424503&r1=1424502&r2=1424503&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/PagedEntityListPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/PagedEntityListPanel.html Thu Dec 20 14:58:03 2012
@@ -18,8 +18,7 @@
under the License.
-->
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd" lang="en">
+<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<form wicket:id="pagingForm" class="pagedEntityListPanel">
<select wicket:id="entitiesPerPage"></select>
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.html?rev=1424503&r1=1424502&r2=1424503&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.html Thu Dec 20 14:58:03 2012
@@ -18,8 +18,7 @@
under the License.
-->
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd" lang="en">
+<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<div>
<span wicket:id="uploadFeedback"/>
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html?rev=1424503&r1=1424502&r2=1424503&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html Thu Dec 20 14:58:03 2012
@@ -18,8 +18,7 @@
under the License.
-->
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd" lang="en">
+<html xmlns:wicket="http://wicket.apache.org">
<wicket:head>
<script type="text/javascript">
function omConfigPanelInit() {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupUsersPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupUsersPanel.html?rev=1424503&r1=1424502&r2=1424503&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupUsersPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupUsersPanel.html Thu Dec 20 14:58:03 2012
@@ -18,8 +18,7 @@
under the License.
-->
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd" lang="en">
+<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<div class="usergroupspanel">
<span wicket:id="navigator">[dataview navigator]</span>
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html?rev=1424503&r1=1424502&r2=1424503&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html Thu Dec 20 14:58:03 2012
@@ -18,8 +18,7 @@
under the License.
-->
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd" lang="en">
+<html xmlns:wicket="http://wicket.apache.org">
<wicket:head>
<script type="text/javascript">
function groupsInit() {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html?rev=1424503&r1=1424502&r2=1424503&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html Thu Dec 20 14:58:03 2012
@@ -18,8 +18,7 @@
under the License.
-->
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd" lang="en">
+<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<script type="text/javascript">
function labelsInit() {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html?rev=1424503&r1=1424502&r2=1424503&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html Thu Dec 20 14:58:03 2012
@@ -18,8 +18,7 @@
under the License.
-->
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd" lang="en">
+<html xmlns:wicket="http://wicket.apache.org">
<wicket:head>
<script type="text/javascript">
function omLdapPanelInit() {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html?rev=1424503&r1=1424502&r2=1424503&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html Thu Dec 20 14:58:03 2012
@@ -18,8 +18,7 @@
under the License.
-->
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd" lang="en">
+<html xmlns:wicket="http://wicket.apache.org">
<wicket:head>
<script type="text/javascript">
function omRoomPanelInit() {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html?rev=1424503&r1=1424502&r2=1424503&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html Thu Dec 20 14:58:03 2012
@@ -18,8 +18,7 @@
under the License.
-->
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd" lang="en">
+<html xmlns:wicket="http://wicket.apache.org">
<wicket:head>
<script type="text/javascript">
function omServerPanelInit() {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.html?rev=1424503&r1=1424502&r2=1424503&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.html Thu Dec 20 14:58:03 2012
@@ -18,8 +18,7 @@
under the License.
-->
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd" lang="en">
+<html xmlns:wicket="http://wicket.apache.org">
<wicket:head>
<script type="text/javascript">
function omUserPanelInit() {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/ChatPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/ChatPanel.html?rev=1424503&r1=1424502&r2=1424503&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/ChatPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/ChatPanel.html Thu Dec 20 14:58:03 2012
@@ -18,12 +18,14 @@
under the License.
-->
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd" lang="en">
+<html xmlns:wicket="http://wicket.apache.org">
<wicket:head>
<script type="text/javascript">
function toggleChat() {
var chat = $('#chat');
+ $('#chat #controlBlock #control')
+ .removeClass('ui-icon-carat-1-' + (chat.height() < 20 ? 'n' : 's'))
+ .addClass('ui-icon-carat-1-' + (chat.height() < 20 ? 's' : 'n'));
chat.animate({ height: chat.height() < 20 ? "300px" : "16px" }, 1000);
}
Wicket.Event.subscribe("/websocket/message", function(jqEvent, message) {
@@ -32,15 +34,6 @@
</script>
</wicket:head>
<wicket:panel>
- <!-- script type="text/javascript">
- alert("AAAA");
- Wicket.Event.subscribe("/websocket/message", function(jqEvent, message) {
- $('#messageArea').append('<div>' + message + '</div>');
- // do something with the message.
- // it may be a text or a binary message depending on what you pushed from the server side
- });
- </script -->
- <!-- "ui-icon ui-icon-carat-1-n sort-icon", "ui-icon ui-icon-carat-1-s sort-icon" -->
<div id="chat">
<div id="controlBlock" onclick="toggleChat();"><div id="control" class="ui-icon ui-icon-carat-1-n sort-icon"></div></div>
<div wicket:id="messages"></div>
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.html?rev=1424503&r1=1424502&r2=1424503&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.html Thu Dec 20 14:58:03 2012
@@ -18,8 +18,7 @@
under the License.
-->
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd" lang="en">
+<html xmlns:wicket="http://wicket.apache.org">
<wicket:head>
<link media="screen" type="text/css" rel="stylesheet" href='css/fullcalendar.css' />
<!-- link media="print" type="text/css" rel="stylesheet" href='css/fullcalendar.print.css' /--> <!-- FIXME incorrectly rendered -->
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.html?rev=1424503&r1=1424502&r2=1424503&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.html Thu Dec 20 14:58:03 2012
@@ -18,8 +18,7 @@
under the License.
-->
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd" lang="en">
+<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<div wicket:id="title"></div>
</wicket:panel>
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html?rev=1424503&r1=1424502&r2=1424503&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html Thu Dec 20 14:58:03 2012
@@ -18,8 +18,7 @@
under the License.
-->
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd" lang="en">
+<html xmlns:wicket="http://wicket.apache.org" wicket:id="html">
<head>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon"/>
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java?rev=1424503&r1=1424502&r2=1424503&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java Thu Dec 20 14:58:03 2012
@@ -19,10 +19,14 @@
package org.apache.openmeetings.web.pages;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
+import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.components.HeaderPanel;
+import org.apache.wicket.AttributeModifier;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.html.TransparentWebMarkupContainer;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
@@ -31,6 +35,13 @@ public abstract class BasePage extends W
public BasePage() {
String appName = Application.getBean(ConfigurationDao.class).getAppName();
+
+ FieldLanguage lang = WebSession.getLanguageObj();
+ String code = lang.getCode();
+ add(new TransparentWebMarkupContainer("html")
+ .add(new AttributeModifier("xml:lang", code))
+ .add(new AttributeModifier("lang", code))
+ .add(new AttributeModifier("dir", Boolean.TRUE.equals(lang.getRtl()) ? "rtl" : "ltr")));
add(new Label("pageTitle", appName));
add(new HeaderPanel("header", appName));
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.html?rev=1424503&r1=1424502&r2=1424503&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.html Thu Dec 20 14:58:03 2012
@@ -18,8 +18,7 @@
under the License.
-->
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd" lang="en">
+<html xmlns:wicket="http://wicket.apache.org">
<wicket:head>
<link media="screen" type="text/css" rel="stylesheet" href="css/theme.css"/>
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.html?rev=1424503&r1=1424502&r2=1424503&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.html Thu Dec 20 14:58:03 2012
@@ -17,10 +17,9 @@
specific language governing permissions and limitations
under the License.
---><html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd" lang="en">
+-->
+<html xmlns:wicket="http://wicket.apache.org">
<wicket:head>
- <!-- script type="text/javascript" src="js/jquery-ui-1.9.0.custom.min.js"></script-->
<link media="screen" type="text/css" rel="stylesheet" href="css/theme.css"/>
<link media="screen" type="text/css" rel="stylesheet" href="css/jquery-ui-1.9.0.custom.min.css"/>
<style>