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 2015/02/11 12:55:47 UTC

svn commit: r1658937 - in /openmeetings: branches/3.0.x/src/main/webapp/css/ branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/ trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ trunk/singlewebapp/openmeet...

Author: solomax
Date: Wed Feb 11 11:55:47 2015
New Revision: 1658937

URL: http://svn.apache.org/r1658937
Log:
[OPENMEETINGS-1177] calendar RTL is fixed

Added:
    openmeetings/branches/3.0.x/src/main/webapp/css/calendar-rtl.css
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/calendar-rtl.css
Modified:
    openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/BasePage.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/calendar-rtl.css
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/css/calendar-rtl.css?rev=1658937&view=auto
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/css/calendar-rtl.css (added)
+++ openmeetings/branches/3.0.x/src/main/webapp/css/calendar-rtl.css Wed Feb 11 11:55:47 2015
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+.fc-content {
+	text-align: right;
+	direction: rtl;
+}
+.fc-content-skeleton {
+	direction: rtl;
+}
+.fc-widget-header {
+	direction: rtl;
+}
+.fc-toolbar .fc-left {
+	float: right !important;
+}
+.fc-toolbar .fc-right {
+	float: left !important;
+}
+.fc .fc-toolbar > * > * {
+	float: right !important;
+}

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=1658937&r1=1658936&r2=1658937&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 Feb 11 11:55:47 2015
@@ -40,7 +40,7 @@ import org.apache.wicket.util.string.Str
 import org.wicketstuff.urlfragment.AsyncUrlFragmentAwarePage;
 
 public abstract class BasePage extends AsyncUrlFragmentAwarePage {
-	private static final long serialVersionUID = -6237917782433412496L;
+	private static final long serialVersionUID = 1L;
 	private final Map<String, String> options;
 
 	protected abstract FieldLanguage getLanguage();
@@ -90,6 +90,7 @@ public abstract class BasePage extends A
 		}
 		if (rtl) {
 			response.render(CssHeaderItem.forUrl("css/theme-rtl.css"));
+			response.render(CssHeaderItem.forUrl("css/calendar-rtl.css"));
 		}
 	}
 }

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=1658937&r1=1658936&r2=1658937&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 Feb 11 11:55:47 2015
@@ -85,6 +85,7 @@ public abstract class BasePage extends A
 		super.renderHead(response);
 		if (isRtl()) {
 			response.render(CssHeaderItem.forUrl("css/theme-rtl.css"));
+			response.render(CssHeaderItem.forUrl("css/calendar-rtl.css"));
 		}
 	}
 }

Added: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/calendar-rtl.css
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/calendar-rtl.css?rev=1658937&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/calendar-rtl.css (added)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/calendar-rtl.css Wed Feb 11 11:55:47 2015
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+.fc-content {
+	text-align: right;
+	direction: rtl;
+}
+.fc-content-skeleton {
+	direction: rtl;
+}
+.fc-widget-header {
+	direction: rtl;
+}
+.fc-toolbar .fc-left {
+	float: right !important;
+}
+.fc-toolbar .fc-right {
+	float: left !important;
+}
+.fc .fc-toolbar > * > * {
+	float: right !important;
+}