Author: solomax
Date: Sun Mar 13 09:15:25 2016
New Revision: 1734770
URL: http://svn.apache.org/viewvc?rev=1734770&view=rev
Log:
[OPENMEETINGS-1347] sort works as expected on admin panels
Added:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.properties
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.properties
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/OmOrderByBorder.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css
openmeetings/application/trunk/openmeetings-web/pom.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/OmOrderByBorder.java
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml?rev=1734770&r1=1734769&r2=1734770&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml Sun Mar 13
09:15:25 2016
@@ -387,6 +387,7 @@
<include>**/*.css</include>
<include>**/*.js</include>
<include>**/*.xml</include>
+
<include>**/*.properties</include>
</includes>
</resource>
<resource>
@@ -396,6 +397,7 @@
<include>**/*.css</include>
<include>**/*.js</include>
<include>**/*.xml</include>
+
<include>**/*.properties</include>
</includes>
</resource>
</resources>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/OmOrderByBorder.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/OmOrderByBorder.java?rev=1734770&r1=1734769&r2=1734770&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/OmOrderByBorder.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/OmOrderByBorder.java
Sun Mar 13 09:15:25 2016
@@ -25,16 +25,16 @@ import org.apache.wicket.extensions.ajax
public class OmOrderByBorder<T extends IDataProviderEntity> extends
AjaxFallbackOrderByBorder<String> {
private static final long serialVersionUID = 1L;
private DataViewContainer<T> container;
-
+
public OmOrderByBorder(final String id, final String property,
DataViewContainer<T> container) {
super(id, property, container.view.getDataProvider());
this.container = container;
setOutputMarkupId(true);
}
-
- protected void onSortChanged() {
- container.view.setCurrentPage(0);
- }
+
+ protected void onSortChanged() {
+ container.view.setCurrentPage(0);
+ }
@Override
protected void onAjaxClick(AjaxRequestTarget target) {
Added:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.properties
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.properties?rev=1734770&view=auto
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.properties
(added)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.properties
Sun Mar 13 09:15:25 2016
@@ -0,0 +1,21 @@
+#
+# 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.
+#
+OrderByLink.CSS.ascending=ui-icon ui-icon-carat-1-n sort-icon
+OrderByLink.CSS.descending=ui-icon ui-icon-carat-1-s sort-icon
+OrderByLink.CSS.none=ui-icon ui-icon-carat-2-n-s sort-icon
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css?rev=1734770&r1=1734769&r2=1734770&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css
Sun Mar 13 09:15:25 2016
@@ -168,13 +168,13 @@ html, body {
}
.goto.icon {
- display: inline-block;
- width: 16px;
- height: 16px;
- border: none;
- margin: 0px;
- padding: 0px;
- zoom: 1.2;
+ display: inline-block;
+ width: 16px;
+ height: 16px;
+ border: none;
+ margin: 0px;
+ padding: 0px;
+ zoom: 1.2;
}
.ui-dialog {
@@ -188,12 +188,14 @@ html, body {
Color='#000000' );
box-shadow: 3px 3px 4px #000;
}
-
-.sort-icon {
+.sort-icon, .sort-icon a {
display: inline-block !important;
text-indent: 0px !important;
}
-
+.sort-icon a {
+ width: inherit;
+ height: inherit;
+}
.start_step1, .start_step2, .start_step3, .start_step4 {
padding-left: 30px;
background-position: left top;
Modified: openmeetings/application/trunk/openmeetings-web/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/pom.xml?rev=1734770&r1=1734769&r2=1734770&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/pom.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/pom.xml Sun Mar 13 09:15:25
2016
@@ -387,6 +387,7 @@
<include>**/*.css</include>
<include>**/*.js</include>
<include>**/*.xml</include>
+
<include>**/*.properties</include>
</includes>
</resource>
<resource>
@@ -396,6 +397,7 @@
<include>**/*.css</include>
<include>**/*.js</include>
<include>**/*.xml</include>
+
<include>**/*.properties</include>
</includes>
</resource>
</resources>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/OmOrderByBorder.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/OmOrderByBorder.java?rev=1734770&r1=1734769&r2=1734770&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/OmOrderByBorder.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/OmOrderByBorder.java
Sun Mar 13 09:15:25 2016
@@ -25,16 +25,16 @@ import org.apache.wicket.extensions.ajax
public class OmOrderByBorder<T extends IDataProviderEntity> extends
AjaxFallbackOrderByBorder<String> {
private static final long serialVersionUID = 1L;
private DataViewContainer<T> container;
-
+
public OmOrderByBorder(final String id, final String property,
DataViewContainer<T> container) {
super(id, property, container.view.getDataProvider());
this.container = container;
setOutputMarkupId(true);
}
-
- protected void onSortChanged() {
- container.view.setCurrentPage(0);
- }
+
+ protected void onSortChanged() {
+ container.view.setCurrentPage(0);
+ }
@Override
protected void onAjaxClick(AjaxRequestTarget target) {
Added:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.properties
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.properties?rev=1734770&view=auto
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.properties
(added)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.properties
Sun Mar 13 09:15:25 2016
@@ -0,0 +1,21 @@
+#
+# 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.
+#
+OrderByLink.CSS.ascending=ui-icon ui-icon-carat-1-n sort-icon
+OrderByLink.CSS.descending=ui-icon ui-icon-carat-1-s sort-icon
+OrderByLink.CSS.none=ui-icon ui-icon-carat-2-n-s sort-icon
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css?rev=1734770&r1=1734769&r2=1734770&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
Sun Mar 13 09:15:25 2016
@@ -168,13 +168,13 @@ html, body {
}
.goto.icon {
- display: inline-block;
- width: 16px;
- height: 16px;
- border: none;
- margin: 0px;
- padding: 0px;
- zoom: 1.2;
+ display: inline-block;
+ width: 16px;
+ height: 16px;
+ border: none;
+ margin: 0px;
+ padding: 0px;
+ zoom: 1.2;
}
.ui-dialog {
@@ -188,12 +188,14 @@ html, body {
Color='#000000' );
box-shadow: 3px 3px 4px #000;
}
-
-.sort-icon {
+.sort-icon, .sort-icon a {
display: inline-block !important;
text-indent: 0px !important;
}
-
+.sort-icon a {
+ width: inherit;
+ height: inherit;
+}
.start_step1, .start_step2, .start_step3, .start_step4 {
padding-left: 30px;
background-position: left top;
