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 2017/10/09 15:48:01 UTC
openmeetings git commit: [OPENMEETINGS-1719] Room for RTL languages
is partially fixed
Repository: openmeetings
Updated Branches:
refs/heads/master a06a73525 -> fba7dcdbf
[OPENMEETINGS-1719] Room for RTL languages is partially fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/fba7dcdb
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/fba7dcdb
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/fba7dcdb
Branch: refs/heads/master
Commit: fba7dcdbfdf903f6a77654d9b63b1e21f2e7f1db
Parents: a06a735
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Oct 9 22:47:53 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Oct 9 22:47:53 2017 +0700
----------------------------------------------------------------------
.../java/org/apache/openmeetings/web/common/main.js | 2 ++
.../openmeetings/web/pages/BaseInitedPage.java | 2 +-
.../openmeetings/web/pages/BaseNotInitedPage.java | 2 +-
.../org/apache/openmeetings/web/pages/BasePage.java | 4 +++-
.../web/room/sidebar/icon/ClientIcon.java | 7 ++++---
.../web/room/sidebar/icon/RefreshIcon.java | 6 +++++-
.../org/apache/openmeetings/web/room/wb/wb-area.js | 2 +-
openmeetings-web/src/main/webapp/css/general-rtl.css | 15 +++++++++++++++
8 files changed, 32 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fba7dcdb/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js
index a04f3fe..add49b0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js
@@ -1,4 +1,6 @@
/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */
+var isRtl = "rtl" === $('html').attr('dir');
+
Wicket.BrowserInfo.collectExtraInfo = function(info) {
const l = window.location;
info.codebase = l.origin + l.pathname;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fba7dcdb/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java
index fd4fe5e..1bd4a16 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java
@@ -38,7 +38,7 @@ public abstract class BaseInitedPage extends BasePage {
}
@Override
- protected boolean isRtl() {
+ public boolean isRtl() {
return FormatHelper.isRtlLanguage(getLanguageCode());
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fba7dcdb/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java
index 4b1dc21..cf8686a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java
@@ -40,7 +40,7 @@ public abstract class BaseNotInitedPage extends BasePage {
}
@Override
- protected boolean isRtl() {
+ public boolean isRtl() {
boolean rtl = false;
if (Application.isInstalled()) {
rtl = FormatHelper.isRtlLanguage(WebSession.get().getLocale().toString());
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fba7dcdb/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
index b5bd5ad..c56d50c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
@@ -47,6 +47,8 @@ import org.wicketstuff.urlfragment.AsyncUrlFragmentAwarePage;
public abstract class BasePage extends AsyncUrlFragmentAwarePage {
private static final long serialVersionUID = 1L;
+ public static final String ALIGN_LEFT = "align-left ";
+ public static final String ALIGN_RIGHT = "align-right ";
private final Map<String, String> options;
private final HeaderPanel header;
private final WebMarkupContainer loader = new WebMarkupContainer("main-loader");
@@ -67,7 +69,7 @@ public abstract class BasePage extends AsyncUrlFragmentAwarePage {
add(loader.setVisible(isMainPage()).setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true));
}
- protected abstract boolean isRtl();
+ public abstract boolean isRtl();
protected abstract String getLanguageCode();
protected abstract String getApplicationName();
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fba7dcdb/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java
index 13a953f..4eb2a61 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java
@@ -19,9 +19,12 @@
package org.apache.openmeetings.web.room.sidebar.icon;
import static org.apache.openmeetings.web.app.Application.getOnlineClient;
+import static org.apache.openmeetings.web.pages.BasePage.ALIGN_LEFT;
+import static org.apache.openmeetings.web.pages.BasePage.ALIGN_RIGHT;
import static org.apache.openmeetings.web.util.CallbackFunctionHelper.addOnClick;
import org.apache.openmeetings.db.entity.basic.Client;
+import org.apache.openmeetings.web.pages.BasePage;
import org.apache.openmeetings.web.room.RoomPanel;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
@@ -30,8 +33,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
public abstract class ClientIcon extends WebMarkupContainer {
private static final long serialVersionUID = 1L;
protected static final String ICON_CLASS = "ui-icon ";
- protected static final String ALIGN_LEFT = "align-left ";
- protected static final String ALIGN_RIGHT = "align-right ";
protected static final String CLS_CLICKABLE = "clickable ";
protected final RoomPanel room;
protected final boolean self;
@@ -57,7 +58,7 @@ public abstract class ClientIcon extends WebMarkupContainer {
protected abstract String getTitle();
protected String getAlign() {
- return ALIGN_LEFT;
+ return ((BasePage)getPage()).isRtl() ? ALIGN_RIGHT : ALIGN_LEFT;
}
protected abstract boolean isClickable();
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fba7dcdb/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java
index f6cd764..66e5c3d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java
@@ -18,8 +18,12 @@
*/
package org.apache.openmeetings.web.room.sidebar.icon;
+import static org.apache.openmeetings.web.pages.BasePage.ALIGN_LEFT;
+import static org.apache.openmeetings.web.pages.BasePage.ALIGN_RIGHT;
+
import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.db.entity.basic.Client.Activity;
+import org.apache.openmeetings.web.pages.BasePage;
import org.apache.openmeetings.web.room.RoomPanel;
public class RefreshIcon extends ClientIcon {
@@ -37,7 +41,7 @@ public class RefreshIcon extends ClientIcon {
@Override
protected String getAlign() {
- return ALIGN_RIGHT;
+ return ((BasePage)getPage()).isRtl() ? ALIGN_LEFT : ALIGN_RIGHT;
}
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fba7dcdb/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js
index 6ad02f7..960bff9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js
@@ -243,7 +243,7 @@ var WbArea = (function() {
self.resize = function(posX, w, h) {
if (!container || !_inited) return;
const hh = h - 5;
- container.width(w).height(h).css('left', posX + "px");
+ container.width(w).height(h).css('left', (isRtl ? 0 : posX) + "px");
area.width(w).height(hh);
const wbTabs = area.find(".tabs.ui-tabs");
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fba7dcdb/openmeetings-web/src/main/webapp/css/general-rtl.css
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/css/general-rtl.css b/openmeetings-web/src/main/webapp/css/general-rtl.css
index 09d62a0..e640dfb 100644
--- a/openmeetings-web/src/main/webapp/css/general-rtl.css
+++ b/openmeetings-web/src/main/webapp/css/general-rtl.css
@@ -83,6 +83,21 @@ form .input {
.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
float: left !important;
}
+.room.menu.right {
+ right:initial !important;
+ left:0;
+}
+.room.menu.right .icon, .room.menu.right .room.name {
+ float:left !important;
+}
+#activities {
+ right: 10px !important;
+ left: initial !important;
+}
+#activities .control.block .label, #chatPopup .control.block .label {
+ padding-left: initial !important;
+ padding-right: 20px !important;
+}
/**** TODO need to be moved to wicket-jquery-ui **************/
span.css-emoticon {