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 c9feb5a [OPENMEETINGS-2165] initial work on dashboard widgets and
admin
c9feb5a is described below
commit c9feb5aeeed4239e92c427b88610d9f511fd3df0
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Thu Feb 6 20:12:10 2020 +0700
[OPENMEETINGS-2165] initial work on dashboard widgets and admin
---
.../openmeetings/web/admin/AdminActionsPanel.html | 12 ++--
.../openmeetings/web/admin/oauth/OAuthPanel.html | 68 +++++++++++-----------
.../apache/openmeetings/web/app/Application.java | 3 +
.../openmeetings/web/common/FormActionsPanel.html | 14 ++---
.../openmeetings/web/common/OmPagingNavigator.html | 8 +--
.../web/common/PagingNavigatorPanel.html | 2 +-
.../apache/openmeetings/web/user/chat/Chat.html | 2 +-
.../openmeetings/web/user/chat/ChatPanel.html | 6 +-
.../openmeetings/web/user/chat/ChatToolbar.html | 10 ++--
.../apache/openmeetings/web/user/chat/raw-chat.js | 14 ++---
.../web/user/dashboard/StartWidgetView.html | 4 +-
.../web/user/dashboard/StartWidgetView.java | 8 ++-
openmeetings-web/src/main/webapp/css/raw-admin.css | 4 +-
openmeetings-web/src/main/webapp/css/raw-chat.css | 3 -
.../src/main/webapp/css/raw-general-rtl.css | 3 +-
.../src/main/webapp/css/raw-general.css | 41 ++++++++++---
openmeetings-web/src/main/webapp/css/raw-menu.css | 36 +-----------
17 files changed, 116 insertions(+), 122 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminActionsPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminActionsPanel.html
index d1633a2..8ade455 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminActionsPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminActionsPanel.html
@@ -21,14 +21,14 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:extend>
- <div class="ui-button ui-widget ui-corner-all ui-button-icon-only"
wicket:id="btn-new" wicket:message="title:155">
- <span class="ui-button-icon ui-icon
ui-icon-plusthick"></span>
+ <div class="btn btn-outline-primary btn-sm" wicket:id="btn-new"
wicket:message="title:155">
+ <i class="fas fa-plus"></i>
</div>
- <div class="ui-button ui-widget ui-corner-all ui-button-icon-only
ui-state-highlight" wicket:id="btn-delete" wicket:message="title:157">
- <span class="ui-button-icon ui-icon
ui-icon-closethick"></span>
+ <div class="btn btn-outline-warning btn-sm" wicket:id="btn-delete"
wicket:message="title:157">
+ <i class="fas fa-times"></i>
</div>
- <div class="ui-button ui-widget ui-corner-all ui-button-icon-only"
wicket:id="btn-restore" wicket:message="title:admin.restore">
- <span class="ui-button-icon ui-icon
ui-icon-circle-check"></span>
+ <div class="btn btn-outline-success btn-sm" wicket:id="btn-restore"
wicket:message="title:admin.restore">
+ <i class="far fa-check-circle"></i>
</div>
<span wicket:id="newRecord"></span>
<form wicket:id="form" class="d-inline"></form>
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 55c2d38..e7f3e75 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
@@ -80,41 +80,41 @@
<div class="formelement">
<label
wicket:for="requestInfoUrl"><wicket:message key="1580" /></label><input
type="text" wicket:id="requestInfoUrl"/>
</div>
- <!-- Attribute mapping -->
- <fieldset class="ui-widget-content">
- <legend
class="ui-widget-header"><wicket:message key="admin.oauth.user.mapping"
/></legend>
- <div wicket:id="mappingForm">
- <div
class="formelement">
- <label
wicket:for="omAttr"><wicket:message key="admin.oauth.attr.om" /></label>
- <input
type="text" class="input" wicket:id="omAttr"/>
- </div>
- <div
class="formelement">
- <label
wicket:for="oauthAttr"><wicket:message key="admin.oauth.attr.oauth" /></label>
- <input
type="text" class="input" wicket:id="oauthAttr"/>
- </div>
- <button type="button"
wicket:id="addMapping"><wicket:message key="1261"/></button>
+ </fieldset>
+ <!-- Attribute mapping -->
+ <fieldset class="ui-widget-content">
+ <legend
class="ui-widget-header"><wicket:message key="admin.oauth.user.mapping"
/></legend>
+ <div wicket:id="mappingForm">
+ <div class="formelement">
+ <label
wicket:for="omAttr"><wicket:message key="admin.oauth.attr.om" /></label>
+ <input type="text"
class="input" wicket:id="omAttr"/>
</div>
- <table class="list-table small">
- <thead>
- <tr
class="ui-widget-header">
- <th
class="col-7"><wicket:message key="admin.oauth.attr.om" /></th>
- <th
class="col-4"><wicket:message key="admin.oauth.attr.oauth" /></th>
- <th
class="col-1"><wicket:message key=275 /></th>
- </tr>
- </thead>
- <tbody
wicket:id="attrsContainer">
- <tr
wicket:id="mapping">
- <td
class="col-7"><div class="col-wrapper"><span wicket:id="key"></span></div></td>
- <td
class="col-4"><div class="col-wrapper"><span
wicket:id="value"></span></div></td>
- <td
class="col-1">
-
<div class="ui-button ui-widget ui-corner-all ui-button-icon-only
ui-state-error" wicket:id="delete" wicket:message="title:80">
-
<span class="ui-button-icon ui-icon ui-icon-closethick"></span>
-
</div>
- </td>
- </tr>
- </tbody>
- </table>
- </fieldset>
+ <div class="formelement">
+ <label
wicket:for="oauthAttr"><wicket:message key="admin.oauth.attr.oauth" /></label>
+ <input type="text"
class="input" wicket:id="oauthAttr"/>
+ </div>
+ <button type="button"
wicket:id="addMapping"><wicket:message key="1261"/></button>
+ </div>
+ <table class="list-table small">
+ <thead>
+ <tr
class="ui-widget-header">
+ <th
class="col-7"><wicket:message key="admin.oauth.attr.om" /></th>
+ <th
class="col-4"><wicket:message key="admin.oauth.attr.oauth" /></th>
+ <th
class="col-1"><wicket:message key=275 /></th>
+ </tr>
+ </thead>
+ <tbody
wicket:id="attrsContainer">
+ <tr wicket:id="mapping">
+ <td
class="col-7"><div class="col-wrapper"><span wicket:id="key"></span></div></td>
+ <td
class="col-4"><div class="col-wrapper"><span
wicket:id="value"></span></div></td>
+ <td
class="col-1">
+ <div
class="ui-button ui-widget ui-corner-all ui-button-icon-only ui-state-error"
wicket:id="delete" wicket:message="title:80">
+
<span class="ui-button-icon ui-icon ui-icon-closethick"></span>
+ </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
</fieldset>
<div class="bottom-bumper"></div>
</div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index c2fe0c4..4a3a1b7 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -135,6 +135,7 @@ import org.wicketstuff.dashboard.web.DashboardContext;
import org.wicketstuff.dashboard.web.DashboardSettings;
import org.wicketstuff.datastores.hazelcast.HazelcastDataStore;
+import
com.googlecode.wicket.jquery.ui.plugins.wysiwyg.settings.WysiwygLibrarySettings;
import com.hazelcast.config.XmlConfigBuilder;
import com.hazelcast.core.Hazelcast;
import com.hazelcast.core.HazelcastInstance;
@@ -282,6 +283,8 @@ public class Application extends
AuthenticatedWebApplication implements IApplica
final IBootstrapSettings settings = new BootstrapSettings();
settings.setThemeProvider(new
BootswatchThemeProvider(BootswatchTheme.Sandstone));//FIXME TODO new
SingleThemeProvider(new MaterialDesignTheme())
Bootstrap.builder().withBootstrapSettings(settings).install(this);
+ WysiwygLibrarySettings.get().setBootstrapCssReference(null);
+
WysiwygLibrarySettings.get().setBootstrapDropDownJavaScriptReference(null);
// register some widgets
final DashboardContext dashboardContext = getDashboardContext();
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormActionsPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormActionsPanel.html
index b2b99c6..46be9f1 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormActionsPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormActionsPanel.html
@@ -21,16 +21,16 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
- <div class="ui-widget-header">
- <div class="ui-button ui-widget ui-corner-all
ui-button-icon-only" wicket:id="btn-save" wicket:message="title:144">
- <span class="ui-button-icon ui-icon
ui-icon-disk"></span>
+ <div class="bg-white">
+ <div class="btn btn-outline-primary btn-sm"
wicket:id="btn-save" wicket:message="title:144">
+ <i class="fas fa-save"></i>
</div>
- <div class="ui-button ui-widget ui-corner-all
ui-button-icon-only" wicket:id="btn-refresh" wicket:message="title:lbl.refresh">
- <span class="ui-button-icon ui-icon
ui-icon-refresh"></span>
+ <div class="btn btn-outline-primary btn-sm"
wicket:id="btn-refresh" wicket:message="title:lbl.refresh">
+ <i class="fas fa-sync-alt"></i>
</div>
<wicket:child/>
- <div class="ui-button ui-widget ui-corner-all
ui-button-icon-only ui-state-error" wicket:id="btn-purge"
wicket:message="title:admin.purge">
- <span class="ui-button-icon ui-icon
ui-icon-trash"></span>
+ <div class="btn btn-outline-danger btn-sm"
wicket:id="btn-purge" wicket:message="title:admin.purge">
+ <i class="fas fa-trash-alt"></i>
</div>
</div>
<div wicket:id="feedback" class="error adminFormsFeedbackPanel"></div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmPagingNavigator.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmPagingNavigator.html
index 1efb520..a5ac7db 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmPagingNavigator.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmPagingNavigator.html
@@ -18,12 +18,12 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
- <a wicket:id="first" class="goto icon ui-icon ui-icon-seek-first"></a>
- <a wicket:id="prev" class="goto icon ui-icon ui-icon-seek-prev"></a>
+ <a wicket:id="first" class="goto"><i class="fas
fa-angle-double-left"></i></a>
+ <a wicket:id="prev" class="goto"><i class="fas fa-angle-left"></i></a>
<span wicket:id="navigation" class="goto"> <a
wicket:id="pageLink" href="#"><span
wicket:id="pageNumber">5</span></a>
</span>
- <a wicket:id="next" class="goto icon ui-icon ui-icon-seek-next"></a>
- <a wicket:id="last" class="goto icon ui-icon ui-icon-seek-end"></a>
+ <a wicket:id="next" class="goto"><i class="fas fa-angle-right"></i></a>
+ <a wicket:id="last" class="goto"><i class="fas
fa-angle-double-right"></i></a>
</wicket:panel>
</html>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.html
index b2f43de..d8ce878 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.html
@@ -23,7 +23,7 @@
<wicket:panel>
<form wicket:id="pagingForm" class="pagedEntityListPanel">
<select wicket:id="entitiesPerPage"></select> <span
- wicket:id="navigator">[dataview navigator]</span>
+ wicket:id="navigator" class="pagination
pagination-sm">[dataview navigator]</span>
</form>
</wicket:panel>
</html>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
index 9dfa633..05d7dd6 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
@@ -48,7 +48,7 @@
<span id="chat-close-block" class='ui-icon ui-icon-close'
wicket:message="title:85"
role='presentation'></span>
- <div id="chat-msg-area-template" class="messageArea">
+ <div id="chat-msg-area-template" class="messageArea bg-white">
<div class="clear icons actions short">
<div class='user om-icon clickable'
wicket:message="title:1167"
onclick='const
e=$(this).parent();showUserInfo(e.data("userId"));'></div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html
index dbad5c2..39dd871 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html
@@ -20,9 +20,9 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
- <div id="chatPopup" class="ui-state-default">
- <div class="control block clickable ui-widget-header
ui-state-active"
wicket:message="data-ttl-dock:label.dock.panel,data-ttl-undock:label.undock.panel">
- <div class="ui-icon"></div>
+ <div id="chatPopup" class="bg-light">
+ <div class="control block clickable bg-secondary"
wicket:message="data-ttl-dock:label.dock.panel,data-ttl-undock:label.undock.panel">
+ <i class="fas"></i>
<div class="label"><wicket:message key="244"/></div>
</div>
<div wicket:id="chat"></div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
index 553d912..0fcfdf3 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
@@ -22,7 +22,7 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<div wicket:id="toolbar" class="btn-toolbar chat-toolbar"
data-role="editor-toolbar">
- <div class="dropdown">
+ <div class="dropup">
<a id="emoticons" class="chat btn btn-default emt
dropdown-toggle" data-toggle="dropdown" title="Emoticons"></a>
<ul class="chat dropdown-menu" >
<li>
@@ -31,7 +31,7 @@
</li>
</ul>
</div>
- <div class="dropdown">
+ <div class="dropup">
<a id="fontSize" class="chat btn btn-default
dropdown-toggle" data-toggle="dropdown" role="button" title="Font Size"> A </a>
<ul class="dropdown-menu">
<li><a data-edit="fontSize 5"><span
class="font-huge">Huge</span></a></li>
@@ -39,7 +39,7 @@
<li><a data-edit="fontSize 1"><span
class="font-tiny">Small</span></a></li>
</ul>
</div>
- <div class="dropdown">
+ <div class="dropup">
<a id="fontStyle" class="chat btn btn-default
dropdown-toggle" data-toggle="dropdown" title="Font Style">
<i class="fas fa-cog"></i>
</a>
@@ -50,7 +50,7 @@
<li><a class="chat-btn chat-tool-icon btn
btn-default under" id="underline" data-edit="underline" title="Underline
(Ctrl/Cmd+U)"> U </a></li>
</ul>
</div>
- <div class="dropdown">
+ <div class="dropup">
<a id="hyperlink" class="chat btn btn-default
dropdown-toggle" data-toggle="dropdown" title="Hyperlink">
<i class="fas fa-link"></i>
</a>
@@ -59,7 +59,7 @@
<button class="btn btn-default"
type="button"><wicket:message key="1261"/></button>
</div>
</div>
- <div class="dropdown">
+ <div class="dropup">
<a id="actions" class="chat btn btn-default
dropdown-toggle" data-toggle="dropdown" wicket:message="title:635">
<i class="fas fa-bars"></i>
</a>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
index 2d44a72..88cd28e 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
@@ -7,16 +7,16 @@ var Chat = function() {
, closedSizePx = closedSize + "px"
, emoticon = new CSSEmoticon()
, doneTypingInterval = 5000 //time in ms, 5 second for example
- , iconOpen = 'ui-icon-caret-1-n'
- , iconOpenRoom = 'ui-icon-caret-1-' + (Settings.isRtl ? 'e' :
'w')
- , iconClose = 'ui-icon-caret-1-s'
- , iconCloseRoom = 'ui-icon-caret-1-' + (Settings.isRtl ? 'w' :
'e')
+ , iconOpen = 'fa-angle-up'
+ , iconOpenRoom = 'fa-angle-' + (Settings.isRtl ? 'left' :
'right')
+ , iconClose = 'fa-angle-down'
+ , iconCloseRoom = 'fa-angle-' + (Settings.isRtl ? 'right' :
'left')
, SEND_ENTER = 'enter', SEND_CTRL = 'ctrl'
;
let p, pp, ctrl, icon, tabs, openedHeight = "345px", openedWidth =
"300px", allPrefix = "All"
, roomPrefix = "Room ", typingTimer, audio, roomMode = false,
globalWidth = 600
, editor = $('#chatMessage .wysiwyg-editor'), muted = false,
sendOn, DEF_SEND
- , userId;
+ , userId
;
try {
@@ -141,7 +141,7 @@ var Chat = function() {
clearTimeout(p.data('timeout'));
pp = $('#chatPanel, #chatPopup');
ctrl = $('#chatPopup .control.block');
- icon = $('#chatPopup .control.block .ui-icon');
+ icon = $('#chatPopup .control.block i.fas');
editor = $('#chatMessage .wysiwyg-editor');
icon.removeClass(function(index, className) {
return (className.match (/(^|\s)ui-icon-caret-\S+/g) ||
[]).join(' ');
@@ -241,7 +241,7 @@ var Chat = function() {
msg.find('.user-row')
.data('userId', cm.from.id)
.data('actions', cm.actions)
- .css('background-image', 'url(' +
(!!cm.from.img ? cm.from.img : './profile/' + cm.from.id + '?anticache=' +
Date.now()) + ')')
+ //.css('background-image', 'url(' +
(!!cm.from.img ? cm.from.img : './profile/' + cm.from.id + '?anticache=' +
Date.now()) + ')')
.mouseenter(function() {
__hideActions();
__getActions($(this))
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
index 1b90acd..fcdca64 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
@@ -31,8 +31,8 @@
<tr>
<td><div wicket:id="123msg"></div></td>
<td>
- <button wicket:id="start"
type="button"><wicket:message key="788"/></button><br/>
- <button wicket:id="calendar"
type="button"><wicket:message key="291"/></button>
+ <button wicket:id="start"
type="button"></button><br/>
+ <button wicket:id="calendar"
type="button"></button>
</td>
</tr>
</table>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
index 1a503c7..7a35cda 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
@@ -33,12 +33,14 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.Model;
+import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.wicketstuff.dashboard.Widget;
import org.wicketstuff.dashboard.web.WidgetView;
-import com.googlecode.wicket.jquery.ui.form.button.Button;
+import de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapButton;
+import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
public class StartWidgetView extends WidgetView {
private static final long serialVersionUID = 1L;
@@ -57,8 +59,8 @@ public class StartWidgetView extends WidgetView {
add(new WebMarkupContainer("step4").add(new
PublicRoomsEventBehavior()));
add(new Label("123msg",
Application.getString("widget.start.desc")) //Application here is used to
substitute {0}
.setEscapeModelStrings(false));
- add(new Button("start").add(new PublicRoomsEventBehavior()));
- add(new Button("calendar").add(new AjaxEventBehavior(EVT_CLICK)
{
+ add(new BootstrapButton("start", new ResourceModel("788"),
Buttons.Type.Outline_Primary).add(new PublicRoomsEventBehavior()));
+ add(new BootstrapButton("calendar", new ResourceModel("291"),
Buttons.Type.Outline_Primary).add(new AjaxEventBehavior(EVT_CLICK) {
private static final long serialVersionUID = 1L;
@Override
diff --git a/openmeetings-web/src/main/webapp/css/raw-admin.css
b/openmeetings-web/src/main/webapp/css/raw-admin.css
index d2db184..0b98f16 100644
--- a/openmeetings-web/src/main/webapp/css/raw-admin.css
+++ b/openmeetings-web/src/main/webapp/css/raw-admin.css
@@ -34,6 +34,7 @@
}
.adminPanelColumnForm .adminForm .actions {
height: var(--actions-height);
+ padding-top: 5px;
}
.adminPanelColumnTable .list-table .ui-button.ui-widget {
padding: 0;
@@ -43,9 +44,6 @@
vertical-align: top;
overflow-y: auto;
}
-.adminForm .btn {
- width: 280px;
-}
.adminForm .input, .adminForm input, .adminForm input.formcheckbox
,.adminForm textarea, .adminForm select, .adminForm label
{
diff --git a/openmeetings-web/src/main/webapp/css/raw-chat.css
b/openmeetings-web/src/main/webapp/css/raw-chat.css
index 4f11a04..1c8613b 100644
--- a/openmeetings-web/src/main/webapp/css/raw-chat.css
+++ b/openmeetings-web/src/main/webapp/css/raw-chat.css
@@ -172,9 +172,6 @@ html[dir="rtl"] .main.room #chatPanel {
.emt {
font-size: 10pt;
}
-.chat.btn{
- font-weight: bold;
-}
.chat-msg-container {
position: relative;
}
diff --git a/openmeetings-web/src/main/webapp/css/raw-general-rtl.css
b/openmeetings-web/src/main/webapp/css/raw-general-rtl.css
index f2dbedf..980958c 100644
--- a/openmeetings-web/src/main/webapp/css/raw-general-rtl.css
+++ b/openmeetings-web/src/main/webapp/css/raw-general-rtl.css
@@ -80,8 +80,7 @@ html[dir="rtl"] #activities .control.block .label
padding-left: initial !important;
padding-right: 20px !important;
}
-html[dir="rtl"] .btn-toolbar .btn
-, html[dir="rtl"] .btn-toolbar .btn-group
+html[dir="rtl"] .btn-toolbar .btn-group
, html[dir="rtl"] .btn-toolbar .input-group
{
float: right !important;
diff --git a/openmeetings-web/src/main/webapp/css/raw-general.css
b/openmeetings-web/src/main/webapp/css/raw-general.css
index 5122847..d29e78f 100644
--- a/openmeetings-web/src/main/webapp/css/raw-general.css
+++ b/openmeetings-web/src/main/webapp/css/raw-general.css
@@ -118,6 +118,9 @@ html, body {
margin-left: 2px;
display: inline-block;
}
+.pagedEntityListPanel .pagination {
+ display: inline-block;
+}
.searchForm {
display: inline-block;
vertical-align: top;
@@ -574,19 +577,12 @@ form .input {
font-size: 12px;
white-space: nowrap;
}
-.profile .ui-button-text-only .ui-button-text {
- font-size: 12px;
- padding-right: 0.2em;
- padding-left: 0.2em;
-}
.profile .remove {
position: absolute;
right: 5px;
top: 5px;
border: 1px solid #cccc;
-}
-#contents .btn-file>input {
- transform: translate(-30px, 0) scale(1);
+ padding: 0px 7px;
}
.room.list.container {
height: 150px;
@@ -683,6 +679,34 @@ form .input {
overflow-y: auto;
height: 100%;
}
+.dragbox .dragbox-header .dragbox-toggle, .dragbox .dragbox-header
.dragbox-actions .icon {
+ font-family: "Font Awesome 5 Free";
+ font-weight: 900;
+ display: inline-block;
+ font-style: normal;
+ text-rendering: auto;
+ line-height: 1;
+ font-variant: normal;
+ background: none;
+ vertical-align: super;
+ margin: 0;
+}
+.dragbox .dragbox-header .dragbox-actions .icon {
+ vertical-align: middle;
+}
+.dragbox .dragbox-header .dragbox-toggle.expanded::before {
+ content: "\f0d7";
+}
+.dragbox .dragbox-header .dragbox-toggle.collapsed::before {
+ content: "\f0d8";
+}
+.dragbox .dragbox-header .dragbox-actions .icon.refresh::before {
+ content: "\f2f1";
+}
+.dragbox .dragbox-header .dragbox-actions .icon.delete::before {
+ content: "\f00d";
+ color: var(--danger);
+}
.dragbox-content .tableWrapper {
/* room users on dashboard */
width: auto;
@@ -802,6 +826,7 @@ form .input {
}
.img-upload .btn.btn-file {
width: 120px;
+ padding: 0;
}
.profile-edit-form {
height: calc(100% - 50px);
diff --git a/openmeetings-web/src/main/webapp/css/raw-menu.css
b/openmeetings-web/src/main/webapp/css/raw-menu.css
index d6da0de..b1abb55 100644
--- a/openmeetings-web/src/main/webapp/css/raw-menu.css
+++ b/openmeetings-web/src/main/webapp/css/raw-menu.css
@@ -1,37 +1,7 @@
/* Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 */
-#menu .ui-menu:after {
- content: ".";
- display: block;
- clear: both;
- visibility: hidden;
- line-height: 0;
- height: 0;
-}
-#menu .ui-menu .ui-menu-item {
- display: inline-block;
- margin: 0;
- line-height: 1.2em !important;
- padding: .2em 2.1em .2em 1em;
- font-weight: normal;
-}
-#menu .ui-menu .ui-menu-item, #menu .ui-menu .ui-menu-item .ui-state-active {
- font-weight: bold;
-}
-#menu .ui-menu .ui-menu-item.sub {
- width: 280px;
- display: block;
-}
-#menu .ui-menu .ui-menu-item.top {
- border: 0 !important;
-}
-#menu .ui-menu.ui-widget.ui-widget-content.ui-menu-icons {
- border: 0;
-}
-#menu .ui-menu {
- z-index: var(--menu-zindex);
-}
-.recording .ui-menu .ui-menu-item {
- display: block;
+#menu .navbar {
+ padding-top: 0;
+ padding-bottom: 0;
}
.room-block .menu {
height: var(--room-menu-height);
