Author: solomax
Date: Wed Nov 12 08:33:58 2014
New Revision: 1638713
URL: http://svn.apache.org/r1638713
Log:
[OPENMEETINGS-1117] RTL support is improved
Added:
openmeetings/branches/3.0.x/src/main/webapp/css/jquery.ui.menubar-rtl.css
openmeetings/branches/3.0.x/src/main/webapp/css/theme-rtl.css
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/jquery.ui.menubar-rtl.css
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme-rtl.css
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/MenuPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/BasePage.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/FieldLanguage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
Added: openmeetings/branches/3.0.x/src/main/webapp/css/jquery.ui.menubar-rtl.css
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/css/jquery.ui.menubar-rtl.css?rev=1638713&view=auto
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/css/jquery.ui.menubar-rtl.css
(added)
+++ openmeetings/branches/3.0.x/src/main/webapp/css/jquery.ui.menubar-rtl.css
Wed Nov 12 08:33:58 2014
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+.ui-menubar {
+ padding: 0px !important;
+}
+.ui-menubar-item {
+ float: right !important;
+}
+.ui-menubar .ui-button {
+ float: right !important;
+}
+.ui-menubar .ui-button .ui-button-text .ui-icon {
+ float: left !important;
+}
Added: 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=1638713&view=auto
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/css/theme-rtl.css (added)
+++ openmeetings/branches/3.0.x/src/main/webapp/css/theme-rtl.css Wed Nov 12
08:33:58 2014
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#header {
+ padding-left: initial !important;
+ padding-right: 150px;
+ background-position: right center;
+}
+#topLinks {
+ right: initial !important;
+ left: 10px;
+}
+
+#topLinks span {
+ border-right: none !important;
+ border-left: 1px solid black;
+}
+
+#topLinks span:last-child {
+ border-left: none;
+}
+#busy_indicator {
+ float: left !important;
+}
+#chatPanel {
+ 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/common/MenuPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/MenuPanel.java?rev=1638713&r1=1638712&r2=1638713&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/MenuPanel.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/MenuPanel.java
Wed Nov 12 08:33:58 2014
@@ -21,6 +21,7 @@ package org.apache.openmeetings.web.comm
import org.apache.openmeetings.db.dao.basic.NavigationDao;
import org.apache.openmeetings.db.entity.basic.Naviglobal;
import org.apache.openmeetings.db.entity.basic.Navimain;
+import org.apache.openmeetings.db.entity.label.FieldLanguage;
import org.apache.openmeetings.util.AuthLevelUtil;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
@@ -30,6 +31,8 @@ import org.apache.openmeetings.web.util.
import org.apache.openmeetings.web.util.OmUrlFragment.MenuParams;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
@@ -82,4 +85,13 @@ public class MenuPanel extends BasePanel
}
}.setReuseItems(true));
}
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ FieldLanguage lang = WebSession.getLanguageObj();
+ if (Boolean.TRUE.equals(lang.getRtl())) {
+
response.render(CssHeaderItem.forUrl("css/jquery.ui.menubar-rtl.css"));
+ }
+ }
}
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/BasePage.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/BasePage.java?rev=1638713&r1=1638712&r2=1638713&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/BasePage.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/BasePage.java
Wed Nov 12 08:33:58 2014
@@ -23,10 +23,12 @@ import java.util.Map;
import org.apache.openmeetings.db.entity.label.FieldLanguage;
import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.HeaderPanel;
import org.apache.openmeetings.web.util.OmUrlFragment;
import org.apache.openmeetings.web.util.OmUrlFragment.AreaKeys;
import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.PriorityHeaderItem;
@@ -78,5 +80,10 @@ public abstract class BasePage extends A
public void renderHead(IHeaderResponse response) {
response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forReference(Application.get().getJavaScriptLibrarySettings().getJQueryReference())));
super.renderHead(response);
+
+ FieldLanguage lang = WebSession.getLanguageObj();
+ if (Boolean.TRUE.equals(lang.getRtl())) {
+
response.render(CssHeaderItem.forUrl("css/theme-rtl.css"));
+ }
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/FieldLanguage.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/FieldLanguage.java?rev=1638713&r1=1638712&r2=1638713&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/FieldLanguage.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/FieldLanguage.java
Wed Nov 12 08:33:58 2014
@@ -65,7 +65,7 @@ public class FieldLanguage implements ID
private boolean deleted;
@Column(name="rtl")
- private Boolean rtl;
+ private boolean rtl;
@Column(name="code")
private String code;
@@ -102,17 +102,17 @@ public class FieldLanguage implements ID
this.updatetime = updatetime;
}
- public boolean getDeleted() {
+ public boolean isDeleted() {
return deleted;
}
public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
- public Boolean getRtl() {
+ public boolean isRtl() {
return rtl;
}
- public void setRtl(Boolean rtl) {
+ public void setRtl(boolean rtl) {
this.rtl = rtl;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java?rev=1638713&r1=1638712&r2=1638713&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
Wed Nov 12 08:33:58 2014
@@ -20,10 +20,14 @@ package org.apache.openmeetings.web.comm
import java.util.List;
+import org.apache.openmeetings.db.entity.label.FieldLanguage;
+import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.BasePanel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListItem;
@@ -94,4 +98,13 @@ public class MenuPanel extends BasePanel
});
add(new MenuFunctionsBehavior(menuContainer.getMarkupId(), id));
}
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ FieldLanguage lang = WebSession.getLanguageObj();
+ if (lang.isRtl()) {
+
response.render(CssHeaderItem.forUrl("css/jquery.ui.menubar-rtl.css"));
+ }
+ }
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java?rev=1638713&r1=1638712&r2=1638713&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java
Wed Nov 12 08:33:58 2014
@@ -37,7 +37,7 @@ public abstract class BaseInitedPage ext
}
@Override
- protected Boolean isRtl() {
- return WebSession.getLanguageObj().getRtl();
+ protected boolean isRtl() {
+ return WebSession.getLanguageObj().isRtl();
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java?rev=1638713&r1=1638712&r2=1638713&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java
Wed Nov 12 08:33:58 2014
@@ -38,7 +38,7 @@ public abstract class BaseNotInitedPage
}
@Override
- protected Boolean isRtl() {
+ protected boolean isRtl() {
return false;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java?rev=1638713&r1=1638712&r2=1638713&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
Wed Nov 12 08:33:58 2014
@@ -26,6 +26,7 @@ import org.apache.openmeetings.web.commo
import org.apache.openmeetings.web.util.OmUrlFragment;
import org.apache.openmeetings.web.util.OmUrlFragment.AreaKeys;
import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.PriorityHeaderItem;
@@ -40,7 +41,7 @@ public abstract class BasePage extends A
private final Map<String, String> options;
private final HeaderPanel header;
- protected abstract Boolean isRtl();
+ protected abstract boolean isRtl();
protected abstract String getLanguageCode();
protected abstract String getApplicationName();
@@ -54,7 +55,7 @@ public abstract class BasePage extends A
add(new TransparentWebMarkupContainer("html")
.add(new AttributeModifier("xml:lang", code))
.add(new AttributeModifier("lang", code))
- .add(new AttributeModifier("dir", Boolean.TRUE.equals(isRtl())
? "rtl" : "ltr")));
+ .add(new AttributeModifier("dir", isRtl() ? "rtl" : "ltr")));
add(new Label("pageTitle", appName));
add(header = new HeaderPanel("header", appName));
}
@@ -82,5 +83,8 @@ public abstract class BasePage extends A
public void renderHead(IHeaderResponse response) {
response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forReference(Application.get().getJavaScriptLibrarySettings().getJQueryReference())));
super.renderHead(response);
+ if (isRtl()) {
+
response.render(CssHeaderItem.forUrl("css/theme-rtl.css"));
+ }
}
}
Added:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/jquery.ui.menubar-rtl.css
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/jquery.ui.menubar-rtl.css?rev=1638713&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/jquery.ui.menubar-rtl.css
(added)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/jquery.ui.menubar-rtl.css
Wed Nov 12 08:33:58 2014
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+.ui-menubar {
+ padding: 0px !important;
+}
+.ui-menubar-item {
+ float: right !important;
+}
+.ui-menubar .ui-button {
+ float: right !important;
+}
+.ui-menubar .ui-button .ui-button-text .ui-icon {
+ float: left !important;
+}
Added:
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=1638713&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme-rtl.css
(added)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme-rtl.css
Wed Nov 12 08:33:58 2014
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#header {
+ padding-left: initial !important;
+ padding-right: 150px;
+ background-position: right center;
+}
+#topLinks {
+ right: initial !important;
+ left: 10px;
+}
+
+#topLinks span {
+ border-right: none !important;
+ border-left: 1px solid black;
+}
+
+#topLinks span:last-child {
+ border-left: none;
+}
+#busy_indicator {
+ float: left !important;
+}
+#chatPanel {
+ 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;
+}
