This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch csp
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/csp by this push:
new 750a11c [OPENMEETINGS-2165] tables seems to work
750a11c is described below
commit 750a11c974561c9816bcdfe48cf408544dadc5e4
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Thu Feb 6 23:51:49 2020 +0700
[OPENMEETINGS-2165] tables seems to work
---
.../openmeetings/web/admin/AdminBasePanel.java | 2 +-
.../web/admin/configurations/ConfigsPanel.html | 4 +--
.../web/admin/connection/ConnectionsPanel.html | 4 +--
.../openmeetings/web/admin/email/EmailPanel.html | 4 +--
.../openmeetings/web/admin/groups/GroupsPanel.html | 4 +--
.../openmeetings/web/admin/labels/LangPanel.html | 4 +--
.../openmeetings/web/admin/ldaps/LdapsPanel.html | 4 +--
.../openmeetings/web/admin/oauth/OAuthPanel.html | 4 +--
.../openmeetings/web/admin/rooms/RoomsPanel.html | 4 +--
.../openmeetings/web/admin/users/UsersPanel.html | 4 +--
.../apache/openmeetings/web/common/BasePanel.java | 3 +--
.../apache/openmeetings/web/common/MainPanel.java | 3 +--
.../openmeetings/web/common/menu/OmMenuItem.java | 6 ++++-
.../openmeetings/web/pages/BasePage.properties | 6 ++---
.../web/user/profile/InvitationsPanel.html | 4 +--
.../web/user/profile/UserSearchPanel.html | 4 +--
.../src/main/webapp/css/raw-general.css | 29 ++++++++++------------
17 files changed, 46 insertions(+), 47 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.java
index 4a16df1..044b2ae 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.java
@@ -32,7 +32,7 @@ public abstract class AdminBasePanel extends BasePanel {
protected StringBuilder getRowClass(Long id, Long selectedId) {
StringBuilder sb = new StringBuilder(ROW_CLASS);
if (id != null && id.equals(selectedId)) {
- sb.append(" ui-state-default");
+ sb.append(" table-active");
}
return sb;
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
index 6f27562..6833e71 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
@@ -49,9 +49,9 @@
<wicket:extend>
<div class="adminPanelColumnTable">
<div class="adminNav" wicket:id="navigator">[dataview
navigator]</div>
- <table class="list-table">
+ <table class="list-table table-striped table-hover">
<thead>
- <tr class="ui-widget-header">
+ <tr>
<th class="col-1"><span
wicket:id="orderById"></span><wicket:message key="188" /></th>
<th class="col-4"><span
wicket:id="orderByKey"></span><wicket:message key="265" /></th>
<th class="col-7"><span
wicket:id="orderByValue"></span><wicket:message key="271" /></th>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
index 5a4d23a..51f2c88 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
@@ -23,9 +23,9 @@
<wicket:extend>
<div class="adminPanelColumnTable">
<div class="adminNav" wicket:id="navigator">[dataview
navigator]</div>
- <table class="list-table">
+ <table class="list-table table-striped table-hover">
<thead>
- <tr class="ui-widget-header">
+ <tr>
<th class="col-2"><wicket:message
key="45" /></th>
<th class="col-2"><wicket:message
key="108" /></th>
<th class="col-2"><wicket:message
key="601" /></th>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html
index 8de6099..7167c49 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html
@@ -23,9 +23,9 @@
<wicket:extend>
<div class="adminPanelColumnTable">
<div class="adminNav" wicket:id="navigator">[dataview
navigator]</div>
- <table class="list-table">
+ <table class="list-table table-striped table-hover">
<thead>
- <tr class="ui-widget-header">
+ <tr>
<th class="col-1"><span
wicket:id="orderById"></span><wicket:message key="188" /></th>
<th class="col-2"><span
wicket:id="orderByStatus"></span><wicket:message key="996" /></th>
<th class="col-9"><span
wicket:id="orderBySubject"></span><wicket:message key="215" /></th>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
index 7e9397e..9040fe5 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
@@ -23,9 +23,9 @@
<wicket:extend>
<div class="adminPanelColumnTable">
<div class="adminNav" wicket:id="navigator">[dataview
navigator]</div>
- <table class="list-table">
+ <table class="list-table table-striped table-hover">
<thead>
- <tr class="ui-widget-header">
+ <tr>
<th class="col-1"><span
wicket:id="orderById"></span><wicket:message key="188" /></th>
<th class="col-11"><span
wicket:id="orderByName"></span><wicket:message key="165" /></th>
</tr>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html
index 3e0ef41..0b4a985 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html
@@ -61,9 +61,9 @@
</form>
</div>
<div class="adminNav" wicket:id="navigator">[dataview
navigator]</div>
- <table class="list-table">
+ <table class="list-table table-striped table-hover">
<thead>
- <tr class="ui-widget-header">
+ <tr>
<th class="col-6"><span
wicket:id="orderByName"></span><wicket:message key="165" /></th>
<th class="col-6"><span
wicket:id="orderByValue"></span><wicket:message key="271" /></th>
</tr>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
index 3a083d3..259a51d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
@@ -23,9 +23,9 @@
<wicket:extend>
<div class="adminPanelColumnTable">
<div class="adminNav" wicket:id="navigator">[dataview
navigator]</div>
- <table class="list-table">
+ <table class="list-table table-striped table-hover">
<thead>
- <tr class="ui-widget-header">
+ <tr>
<th class="col-1"><span
wicket:id="orderById"></span><wicket:message key="188" /></th>
<th class="col-5"><span
wicket:id="orderByName"></span><wicket:message key="165" /></th>
<th class="col-6"><span
wicket:id="orderByFile"></span><wicket:message key="1106" /></th>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
index e7f3e75..bec2605 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
@@ -23,9 +23,9 @@
<wicket:extend>
<div class="adminPanelColumnTable">
<div class="adminNav" wicket:id="navigator">[dataview
navigator]</div>
- <table class="list-table">
+ <table class="list-table table-striped table-hover">
<thead>
- <tr class="ui-widget-header">
+ <tr>
<th class="col-1"><span
wicket:id="orderById"></span><wicket:message key="188" /></th>
<th class="col-11"><span
wicket:id="orderByName"></span><wicket:message key="165" /></th>
</tr>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
index e66bb78..d702812 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
@@ -23,9 +23,9 @@
<wicket:extend>
<div class="adminPanelColumnTable rooms">
<div class="adminNav" wicket:id="navigator">[dataview
navigator]</div>
- <table class="list-table">
+ <table class="list-table table-striped table-hover">
<thead>
- <tr class="ui-widget-header">
+ <tr>
<th class="col-1"><span
wicket:id="orderById"></span><wicket:message key="188" /></th>
<th class="col-9"><span
wicket:id="orderByName"></span><wicket:message key="165" /></th>
<th class="col-2"><span
wicket:id="orderByPublic"></span><wicket:message key="190" /></th>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html
index 4f48314..afd8a38 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html
@@ -23,9 +23,9 @@
<wicket:extend>
<div class="adminPanelColumnTable">
<div class="adminNav" wicket:id="navigator">[dataview
navigator]</div>
- <table class="list-table">
+ <table class="list-table table-striped table-hover">
<thead>
- <tr class="ui-widget-header">
+ <tr>
<th class="col-1"><span
wicket:id="orderById"></span> <wicket:message key="188" /></th>
<th class="col-3"><span
wicket:id="orderByLogin"></span> <wicket:message key="108" /></th>
<th class="col-4"><span
wicket:id="orderByFirstName"></span> <wicket:message key="117" /></th>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
index 8e9429c..d492d9a 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
@@ -33,8 +33,7 @@ import com.github.openjson.JSONObject;
public abstract class BasePanel extends Panel {
private static final long serialVersionUID = 1L;
public static final String EVT_CLICK = "click";
- protected static final String BASE_ROW_CLASS = "ui-widget-content";
- protected static final String ROW_CLASS = BASE_ROW_CLASS + " clickable";
+ protected static final String ROW_CLASS = "clickable";
public BasePanel(String id) {
super(id);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
index 840eb9a..8f3fd57 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
@@ -95,7 +95,6 @@ import
de.agilecoders.wicket.core.markup.html.bootstrap.navbar.INavbarComponent;
public class MainPanel extends Panel {
private static final long serialVersionUID = 1L;
private static final Logger log =
LoggerFactory.getLogger(MainPanel.class);
- private static final String DELIMITER = " ";
private final WebMarkupContainer EMPTY = new
WebMarkupContainer(CHILD_ID);
private String uid = null;
private MenuPanel menu;
@@ -336,7 +335,7 @@ public class MainPanel extends Panel {
}
List<Room> recent = roomDao.getRecent(getUserId());
if (!recent.isEmpty()) {
- l.add(new OmMenuItem(DELIMITER, (String)null));
+ l.add(new OmMenuItem(null, (String)null));
}
for (Room r : recent) {
final Long roomId = r.getId();
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/OmMenuItem.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/OmMenuItem.java
index fdd08e7..30b166a 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/OmMenuItem.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/OmMenuItem.java
@@ -29,7 +29,9 @@ import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.model.Model;
+import org.apache.wicket.util.string.Strings;
+import
de.agilecoders.wicket.core.markup.html.bootstrap.button.dropdown.MenuDivider;
import de.agilecoders.wicket.core.markup.html.bootstrap.image.IconType;
import
de.agilecoders.wicket.core.markup.html.bootstrap.navbar.INavbarComponent;
import
de.agilecoders.wicket.core.markup.html.bootstrap.navbar.Navbar.ComponentPosition;
@@ -79,7 +81,9 @@ public class OmMenuItem implements INavbarComponent {
@Override
public AbstractLink create(String markupId) {
AbstractLink item;
- if (items.isEmpty()) {
+ if (Strings.isEmpty(title)) {
+ item = new MenuDivider();
+ } else if (items.isEmpty()) {
item = new NavbarAjaxLink<String>(markupId,
Model.of(title)) {
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.properties
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.properties
index fc5907f..e5bbe8b 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.properties
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.properties
@@ -16,6 +16,6 @@
# specific language governing permissions and limitations
# under the License.
#
-OrderByLink.CSS.ascending=ui-icon ui-icon-caret-1-n sort-icon
-OrderByLink.CSS.descending=ui-icon ui-icon-caret-1-s sort-icon
-OrderByLink.CSS.none=ui-icon ui-icon-caret-2-n-s sort-icon
+OrderByLink.CSS.ascending=sort-icon asc
+OrderByLink.CSS.descending=sort-icon desc
+OrderByLink.CSS.none=sort-icon none
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationsPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationsPanel.html
index 660cb5a..b09ef7d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationsPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationsPanel.html
@@ -24,9 +24,9 @@
<div class="adminPanel">
<div class="adminPanelColumnTable">
<div class="adminNav" wicket:id="navigator">[dataview
navigator]</div>
- <table class="list-table">
+ <table class="list-table table-striped table-hover">
<thead>
- <tr class="ui-widget-header">
+ <tr>
<th class="col-1"><span
wicket:id="orderById"></span><wicket:message key="188" /></th>
<th class="col-3"><span
wicket:id="orderByValid"></span><wicket:message key="526" /></th>
<th class="col-8"><span
wicket:id="orderByInvitee"></span><wicket:message key="216" /></th>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
index 152030c..d69301e 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
@@ -37,9 +37,9 @@
</div>
<div wicket:id="container" class="pl-3 h-100">
<div><strong><wicket:message
key="1184"/></strong> <div class="adminNav"
wicket:id="navigator"></div></div>
- <table id="searchUsersTable" class="list-table">
+ <table id="searchUsersTable" class="list-table
table-striped table-hover">
<thead>
- <tr class="ui-widget-header">
+ <tr>
<th
class="col-3"><wicket:message key="165"/></th>
<th
class="col-2"><wicket:message key="1143"/></th>
<th
class="col-2"><wicket:message key="1182"/></th>
diff --git a/openmeetings-web/src/main/webapp/css/raw-general.css
b/openmeetings-web/src/main/webapp/css/raw-general.css
index d29e78f..29a5c67 100644
--- a/openmeetings-web/src/main/webapp/css/raw-general.css
+++ b/openmeetings-web/src/main/webapp/css/raw-general.css
@@ -183,14 +183,6 @@ html, body {
.ui-dialog {
box-shadow: 3px 3px 4px #000;
}
-.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;
@@ -662,13 +654,6 @@ form .input {
.list-table tr.deleted {
background-image: repeating-linear-gradient(-45deg, transparent,
transparent 5px, /* gap */ #cccccc 6px, /* overall width incluing gap */
#cccccc 6px);
}
-.list-table tr:hover, .room-row:hover {
- /*SHOULD BE MANUALLY IN SYNC WITH THEME .ui-state-hover */
- border: 1px solid #74b2e2;
- background-color: #e4f1fb;
- font-weight: normal;
- color: #0070a3;
-}
.tableWrapper {
background-color: #FFFFFF;
border: solid 1px #aacfe4;
@@ -679,7 +664,7 @@ form .input {
overflow-y: auto;
height: 100%;
}
-.dragbox .dragbox-header .dragbox-toggle, .dragbox .dragbox-header
.dragbox-actions .icon {
+.dragbox .dragbox-header .dragbox-toggle, .dragbox .dragbox-header
.dragbox-actions .icon, .sort-icon a {
font-family: "Font Awesome 5 Free";
font-weight: 900;
display: inline-block;
@@ -715,6 +700,18 @@ form .input {
.dragbox-content .rooms-widget {
display: flex;
}
+.sort-icon a {
+ vertical-align: middle;
+}
+.sort-icon.none a::before {
+ content: '\f0dc';
+}
+.sort-icon.desc a::before {
+ content: '\f0dd';
+}
+.sort-icon.asc a::before {
+ content: '\f0de';
+}
.tableWrapper .list-table {
height: 100%;
}
