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 2020/04/21 15:11:35 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2289] admin
columns are equal width
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 1231557 [OPENMEETINGS-2289] admin columns are equal width
1231557 is described below
commit 12315578e1b5e45d75caf789ac4f89ee9f329560
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Tue Apr 21 22:11:18 2020 +0700
[OPENMEETINGS-2289] admin columns are equal width
---
.../main/java/org/apache/openmeetings/web/admin/AdminBasePanel.html | 2 +-
.../apache/openmeetings/web/admin/configurations/ConfigsPanel.html | 4 ++--
.../apache/openmeetings/web/admin/connection/ConnectionsPanel.html | 4 ++--
.../main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html | 4 ++--
.../java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html | 4 ++--
.../main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html | 4 ++--
.../main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html | 4 ++--
.../main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html | 4 ++--
.../main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html | 4 ++--
.../main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html | 4 ++--
openmeetings-web/src/main/webapp/css/raw-admin.css | 2 +-
11 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.html
index d2e367e..4a03e3c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.html
@@ -21,7 +21,7 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
- <div class="adminPanel">
+ <div class="adminPanel row nogutter">
<wicket:child/>
</div>
</wicket:panel>
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 e79b139..a34bc28 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
@@ -21,7 +21,7 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
- <div class="adminPanelColumnTable">
+ <div class="adminPanelColumnTable col-6">
<div class="adminNav" wicket:id="navigator">[dataview navigator]</div>
<table class="list-table table-striped table-hover">
<thead>
@@ -40,7 +40,7 @@
</tbody>
</table>
</div>
- <div class="adminPanelColumnForm">
+ <div class="adminPanelColumnForm col-6">
<form wicket:id="form" class="adminForm">
<div class="actions" wicket:id="buttons"></div>
<div class="scrollcontent" id="adminForm">
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 10f0e10..6989638 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
@@ -21,7 +21,7 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
- <div class="adminPanelColumnTable">
+ <div class="adminPanelColumnTable col-6">
<div class="adminNav" wicket:id="navigator">[dataview navigator]</div>
<table class="list-table table-striped table-hover">
<thead>
@@ -46,7 +46,7 @@
</tbody>
</table>
</div>
- <div class="adminPanelColumnForm" id="adminForm">
+ <div class="adminPanelColumnForm col-6" id="adminForm">
<div class="scrollcontent">
<table wicket:id="details" class="w-100">
<tr wicket:id="line"><td wicket:id="name"></td><td wicket:id="value"></td></tr>
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 09fc08d..6c53e74 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
@@ -21,7 +21,7 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
- <div class="adminPanelColumnTable">
+ <div class="adminPanelColumnTable col-6">
<div class="adminNav" wicket:id="navigator">[dataview navigator]</div>
<table class="list-table table-striped table-hover">
<thead>
@@ -40,7 +40,7 @@
</tbody>
</table>
</div>
- <div class="adminPanelColumnForm">
+ <div class="adminPanelColumnForm col-6">
<form wicket:id="form" class="adminForm">
<div class="actions">
<div class="btn btn-outline-warning btn-sm" wicket:id="btn-delete" wicket:message="title:157">
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 65ffecd..f4eb4dc 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
@@ -21,7 +21,7 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
- <div class="adminPanelColumnTable">
+ <div class="adminPanelColumnTable col-6">
<div class="adminNav" wicket:id="navigator">[dataview navigator]</div>
<table class="list-table table-striped table-hover">
<thead>
@@ -38,7 +38,7 @@
</tbody>
</table>
</div>
- <div class="adminPanelColumnForm">
+ <div class="adminPanelColumnForm col-6">
<form wicket:id="form" class="adminForm">
<div class="actions" wicket:id="buttons"></div>
<div class="scrollcontent" id="adminForm">
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 ea92b1e..7b24017 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
@@ -22,7 +22,7 @@
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
<div wicket:id="feedback" class="feedback"></div>
- <div class="adminPanelColumnTable label">
+ <div class="adminPanelColumnTable label col-6">
<form wicket:id="langForm" class="addLanguagePanel">
<div class="input-group input-group-sm">
<div class="input-group-prepend">
@@ -57,7 +57,7 @@
</tbody>
</table>
</div>
- <div class="adminPanelColumnForm">
+ <div class="adminPanelColumnForm col-6">
<form wicket:id="form" class="adminForm">
<div class="actions" wicket:id="buttons"></div>
<div class="scrollcontent" id="adminForm">
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 1c14d62..479f70c 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
@@ -21,7 +21,7 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
- <div class="adminPanelColumnTable">
+ <div class="adminPanelColumnTable col-6">
<div class="adminNav" wicket:id="navigator">[dataview navigator]</div>
<table class="list-table table-striped table-hover">
<thead>
@@ -40,7 +40,7 @@
</tbody>
</table>
</div>
- <div class="adminPanelColumnForm">
+ <div class="adminPanelColumnForm col-6">
<form wicket:id="form" class="adminForm">
<div wicket:id="buttons"></div>
<div class="scrollcontent" id="adminForm">
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 3422d06..bb73780 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
@@ -21,7 +21,7 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
- <div class="adminPanelColumnTable">
+ <div class="adminPanelColumnTable col-6">
<div class="adminNav" wicket:id="navigator">[dataview navigator]</div>
<table class="list-table table-striped table-hover">
<thead>
@@ -38,7 +38,7 @@
</tbody>
</table>
</div>
- <div class="adminPanelColumnForm">
+ <div class="adminPanelColumnForm col-6">
<form wicket:id="form" class="adminForm">
<div class="actions" wicket:id="buttons"></div>
<div class="scrollcontent" id="adminForm">
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 e354752..8669574 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
@@ -21,7 +21,7 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
- <div class="adminPanelColumnTable rooms">
+ <div class="adminPanelColumnTable rooms col-6">
<div class="adminNav" wicket:id="navigator">[dataview navigator]</div>
<table class="list-table table-striped table-hover">
<thead>
@@ -40,7 +40,7 @@
</tbody>
</table>
</div>
- <div class="adminPanelColumnForm">
+ <div class="adminPanelColumnForm col-6">
<form wicket:id="form" class="adminForm">
<div class="actions" wicket:id="buttons"></div>
<div class="scrollcontent" id="adminForm">
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 4625c9e..ef56e1b 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
@@ -21,7 +21,7 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
- <div class="adminPanelColumnTable">
+ <div class="adminPanelColumnTable col-6">
<div class="adminNav" wicket:id="navigator">[dataview navigator]</div>
<table class="list-table table-striped table-hover">
<thead>
@@ -58,7 +58,7 @@
</tbody>
</table>
</div>
- <div class="adminPanelColumnForm">
+ <div class="adminPanelColumnForm col-6">
<form wicket:id="form" class="adminForm"/>
<div wicket:id="adminPass"></div>
</div>
diff --git a/openmeetings-web/src/main/webapp/css/raw-admin.css b/openmeetings-web/src/main/webapp/css/raw-admin.css
index 5f7e222..f6bf89c 100644
--- a/openmeetings-web/src/main/webapp/css/raw-admin.css
+++ b/openmeetings-web/src/main/webapp/css/raw-admin.css
@@ -21,7 +21,7 @@
display: inline-block;
vertical-align: top;
height: 100%;
- width: var(--list-width);
+ min-width: var(--list-width);
}
.adminPanelColumnTable.label .lblNav {
height: var(--lbl-nav-height);