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 ee2d056 [OPENMEETINGS-2165] admin looks much better, initial work on
tree
ee2d056 is described below
commit ee2d056ed0f24ddf31ccb814e9fb836bf0a838cd
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Sun Feb 9 23:58:01 2020 +0700
[OPENMEETINGS-2165] admin looks much better, initial work on tree
---
.../openmeetings/web/admin/backup/BackupPanel.html | 4 +-
.../web/admin/configurations/ConfigsPanel.html | 4 +-
.../openmeetings/web/admin/email/EmailPanel.html | 44 +++--
.../web/admin/groups/GroupUsersPanel.html | 10 +-
.../web/admin/groups/GroupUsersPanel.java | 31 ++--
.../openmeetings/web/admin/groups/GroupsPanel.html | 39 +++--
.../openmeetings/web/admin/labels/LangPanel.html | 4 +-
.../openmeetings/web/admin/ldaps/LdapsPanel.html | 46 +++--
.../openmeetings/web/admin/oauth/OAuthForm.java | 40 ++---
.../openmeetings/web/admin/oauth/OAuthPanel.html | 65 ++++---
.../openmeetings/web/admin/rooms/RoomForm.java | 102 +++++------
.../openmeetings/web/admin/rooms/RoomsPanel.html | 190 +++++++++++++--------
.../openmeetings/web/admin/users/UserForm.html | 13 +-
.../web/app/Application.properties.xml | 1 +
.../web/app/Application_ar.properties.xml | 1 +
.../web/app/Application_bg.properties.xml | 1 +
.../web/app/Application_bn.properties.xml | 1 +
.../web/app/Application_ca.properties.xml | 1 +
.../web/app/Application_cs.properties.xml | 1 +
.../web/app/Application_da.properties.xml | 1 +
.../web/app/Application_de.properties.xml | 1 +
.../web/app/Application_el.properties.xml | 1 +
.../web/app/Application_es.properties.xml | 1 +
.../web/app/Application_fa.properties.xml | 1 +
.../web/app/Application_fi.properties.xml | 1 +
.../web/app/Application_fr.properties.xml | 1 +
.../web/app/Application_gl.properties.xml | 1 +
.../web/app/Application_he.properties.xml | 1 +
.../web/app/Application_hu.properties.xml | 1 +
.../web/app/Application_in.properties.xml | 1 +
.../web/app/Application_it.properties.xml | 1 +
.../web/app/Application_ja.properties.xml | 1 +
.../web/app/Application_ko.properties.xml | 1 +
.../web/app/Application_nl.properties.xml | 1 +
.../web/app/Application_pl.properties.xml | 1 +
.../web/app/Application_pt.properties.xml | 1 +
.../web/app/Application_pt_BR.properties.xml | 1 +
.../web/app/Application_ru.properties.xml | 1 +
.../web/app/Application_sk.properties.xml | 1 +
.../web/app/Application_sv.properties.xml | 1 +
.../web/app/Application_th.properties.xml | 1 +
.../web/app/Application_tr.properties.xml | 1 +
.../web/app/Application_uk.properties.xml | 1 +
.../web/app/Application_zh_CN.properties.xml | 1 +
.../web/app/Application_zh_TW.properties.xml | 1 +
.../web/common/tree/FileTreePanel.html | 14 +-
.../web/common/tree/FileTreePanel.java | 9 +-
.../openmeetings/web/common/tree/filetree.js | 2 +-
.../web/pages/install/InstallWizard$DbStep.html | 2 +-
.../pages/install/InstallWizard$ParamsStep1.html | 4 +-
.../pages/install/InstallWizard$ParamsStep2.html | 2 +-
.../pages/install/InstallWizard$ParamsStep3.html | 2 +-
.../pages/install/InstallWizard$ParamsStep4.html | 4 +-
.../web/user/profile/InvitationsPanel.html | 4 +-
.../web/user/profile/MessagesContactsPanel.html | 2 +-
.../web/user/profile/UserProfilePanel.html | 8 +-
.../web/user/record/RecordingsPanel.html | 2 +-
.../src/main/webapp/css/raw-general.css | 22 ++-
openmeetings-web/src/main/webapp/css/raw-room.css | 46 +----
openmeetings-web/src/main/webapp/css/raw-tree.css | 25 ++-
.../src/main/webapp/css/raw-variables.css | 2 +-
61 files changed, 445 insertions(+), 329 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
index 95cfa17..d78d23c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
@@ -23,8 +23,8 @@
<wicket:panel>
<div wicket:id="feedback"></div>
<form wicket:id="backupUpload" class="adminForm adminBackupForm
container">
- <fieldset class="ui-widget-content">
- <legend class="ui-widget-header"><wicket:message
key="1066" /></legend>
+ <fieldset>
+ <legend><wicket:message key="1066" /></legend>
<div class="formelement">
<div><i class="fas fa-info-circle
m-1"></i><wicket:message key="1065" /></div>
</div>
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 8054a67..af0cc96 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
@@ -44,8 +44,8 @@
<form wicket:id="form" class="adminForm">
<div class="actions" wicket:id="buttons"></div>
<div class="scrollcontent" id="adminForm">
- <fieldset class="ui-widget-content">
- <legend
class="ui-widget-header"><wicket:message key="266" /></legend>
+ <fieldset>
+ <legend><wicket:message key="266"
/></legend>
<div class="formelement">
<label wicket:for="type"
class="col-3 text-right"><wicket:message key="45" /></label>
<select class="custom-select
col-8" wicket:id="type"></select>
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 7167c49..c34ceec 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
@@ -48,17 +48,41 @@
</div>
</div>
<div class="scrollcontent" id="adminForm">
- <fieldset class="ui-widget-content">
- <legend
class="ui-widget-header"><wicket:message key="admin.email.group.label"
/></legend>
+ <fieldset>
+ <legend><wicket:message
key="admin.email.group.label" /></legend>
<div class="formelement">
- <label><wicket:message
key="996" /></label><span class="input" wicket:id="status"></span>
- <label><wicket:message
key="admin.email.recipients" /></label><span class="input"
wicket:id="recipients"></span>
- <label><wicket:message
key="215" /></label><span class="input" wicket:id="subject"></span>
- <label><wicket:message
key="admin.email.body" /></label><span class="input" wicket:id="body"></span>
- <label><wicket:message
key="1110" /></label><span class="input" wicket:id="inserted"></span>
- <label><wicket:message
key="1112" /></label><span class="input" wicket:id="updated"></span>
- <label><wicket:message
key="admin.email.errorCount" /></label><span class="input"
wicket:id="errorCount"></span>
- <label><wicket:message
key="admin.email.lastError" /></label><span class="input"
wicket:id="lastError"></span>
+ <div>
+ <label class="col-3
text-right"><wicket:message key="996" /></label>
+ <span class="col-8"
wicket:id="status"></span>
+ </div>
+ <div>
+ <label class="col-3
text-right"><wicket:message key="admin.email.recipients" /></label>
+ <span class="col-8"
wicket:id="recipients"></span>
+ </div>
+ <div>
+ <label class="col-3
text-right"><wicket:message key="215" /></label>
+ <span class="col-8"
wicket:id="subject"></span>
+ </div>
+ <div>
+ <label class="col-3
text-right"><wicket:message key="admin.email.body" /></label>
+ <div class="col-8
d-inline-block" wicket:id="body"></div>
+ </div>
+ <div>
+ <label class="col-3
text-right"><wicket:message key="1110" /></label>
+ <span class="col-8"
wicket:id="inserted"></span>
+ </div>
+ <div>
+ <label class="col-3
text-right"><wicket:message key="1112" /></label>
+ <span class="col-8"
wicket:id="updated"></span>
+ </div>
+ <div>
+ <label class="col-3
text-right"><wicket:message key="admin.email.errorCount" /></label>
+ <span class="col-8"
wicket:id="errorCount"></span>
+ </div>
+ <div>
+ <label class="col-3
text-right"><wicket:message key="admin.email.lastError" /></label>
+ <div class="col-8
d-inline-block text-pre" wicket:id="lastError"></div>
+ </div>
</div>
<button wicket:id="reset"
class="align-right mr-3"><wicket:message
key="admin.email.reset.status"/></button>
</fieldset>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
index 7f5a26d..0eb0142 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
@@ -22,9 +22,9 @@
<wicket:panel>
<div class="usergroupspanel">
<div class="adminNav" wicket:id="navigator">[dataview
navigator]</div>
- <table class="list-table small">
+ <table class="list-table small table-striped table-hover">
<thead>
- <tr class="ui-widget-header">
+ <tr>
<th class="col-1"
wicket:message="title:98"><wicket:message key="98" /></th>
<th class="col-10" ><wicket:message
key="177" /></th>
<th class="col-1"><wicket:message
key="275" /></th>
@@ -33,11 +33,9 @@
<tbody>
<tr wicket:id="userList"
class="ui-widget-content">
<td class="col-1"><input
type="checkbox" wicket:id="isModerator"/></td>
- <td class="col-10"><div
class="col-wrapper"><span wicket:id="label"></span></div></td>
+ <td class="col-10"><div
class="col-wrapper"><span wicket:id="new"/><span
wicket:id="label"></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="deleteUserBtn"
wicket:message="title:274">
- <span
class="ui-button-icon ui-icon ui-icon-closethick"></span>
- </div>
+ <button
wicket:id="deleteUserBtn" wicket:message="title:274" class="btn-sm p-0 pl-2
pr-2"></button>
</td>
</tr>
</tbody>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
index ae62611..8f5c39c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
@@ -18,8 +18,6 @@
*/
package org.apache.openmeetings.web.admin.groups;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS;
-
import java.util.ArrayList;
import java.util.List;
@@ -30,17 +28,23 @@ import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
-import org.apache.openmeetings.web.common.confirmation.ConfirmableAjaxBorder;
import org.apache.openmeetings.web.data.SearchableDataProvider;
-import org.apache.wicket.AttributeModifier;
+import org.apache.openmeetings.web.util.CallbackFunctionHelper;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
+import de.agilecoders.wicket.core.markup.html.bootstrap.badge.BadgeBehavior;
+import de.agilecoders.wicket.core.markup.html.bootstrap.badge.BootstrapBadge;
+import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink;
+import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
+import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5IconType;
+
public class GroupUsersPanel extends Panel {
private static final long serialVersionUID = 1L;
private long groupId;
@@ -71,21 +75,12 @@ public class GroupUsersPanel extends Panel {
}));
User u = grpUser.getUser();
Label label = new Label("label", u == null ? ""
: GroupForm.formatUser(u));
- if (grpUser.getId() == null) {
-
label.add(AttributeModifier.append(ATTR_CLASS, "newItem"));
- }
item.add(label);
- item.add(new
ConfirmableAjaxBorder("deleteUserBtn", getString("80"), getString("833")) {
+ BootstrapAjaxLink<String> del = new
BootstrapAjaxLink<>("deleteUserBtn", Buttons.Type.Outline_Danger) {
private static final long
serialVersionUID = 1L;
@Override
- protected void onInitialize() {
- super.onInitialize();
- form.setMultiPart(true);//need
to be multipart due to parent form is multipart
- }
-
- @Override
- protected void
onSubmit(AjaxRequestTarget target) {
+ public void onClick(AjaxRequestTarget
target) {
if (grpUser.getId() == null) {
users2add.remove(grpUser);
} else {
@@ -95,7 +90,11 @@ public class GroupUsersPanel extends Panel {
}
target.add(GroupUsersPanel.this);
}
- });
+ };
+ del.setIconType(FontAwesome5IconType.times_s)
+
.add(CallbackFunctionHelper.newOkCancelDangerConfirm(this, getString("833")));
+ item.add(del);
+ item.add(new BootstrapBadge("new", new
ResourceModel("lbl.new"),
BadgeBehavior.Type.Warning).setVisible((grpUser.getId() == null)));
}
};
add(dataView).setOutputMarkupId(true);
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 9040fe5..65ffecd 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
@@ -42,43 +42,56 @@
<form wicket:id="form" class="adminForm">
<div class="actions" wicket:id="buttons"></div>
<div class="scrollcontent" id="adminForm">
- <fieldset class="ui-widget-content">
- <legend
class="ui-widget-header"><wicket:message key="161" /></legend>
+ <fieldset>
+ <legend><wicket:message key="161"
/></legend>
<div class="formelement">
- <label
wicket:for="name"><wicket:message key="165" /></label><input type="text"
wicket:id="name" />
+ <label wicket:for="name"
class="col-3 text-right"><wicket:message key="165" /></label>
+ <input type="text"
wicket:id="name" class="col-8"/>
</div>
<div class="formelement">
- <label><wicket:message
key="admin.group.form.logo" /></label><div wicket:id="logo" class="input group
logo"></div>
+ <label class="col-3
text-right"><wicket:message key="admin.group.form.logo" /></label>
+ <div wicket:id="logo"
class="input group logo col-3 d-inline-block"></div>
</div>
<div class="formelement">
- <label
wicket:for="tag"><wicket:message key="admin.group.form.tag" /></label><input
type="text" wicket:id="tag" />
+ <label wicket:for="tag"
class="col-3 text-right"><wicket:message key="admin.group.form.tag" /></label>
+ <input type="text"
wicket:id="tag" class="col-8"/>
</div>
<div class="formelement">
- <label
wicket:for="user2add"><strong><wicket:message key="178" /></strong></label><div
class="om-select2"><select wicket:id="user2add" class="input"></select></div>
+ <label wicket:for="user2add"
class="col-3 text-right"><strong><wicket:message key="178" /></strong></label>
+ <div class="om-select2 p-0
d-inline-block col-8"><select wicket:id="user2add" class="input
w-100"></select></div>
</div>
<div class="formelement">
<div wicket:id="users"></div>
</div>
<div class="formelement">
- <label
wicket:for="restricted"><wicket:message key="restricted.group.files"
/></label><input type="checkbox" wicket:id="restricted" />
+ <label wicket:for="restricted"
class="col-3 text-right"><wicket:message key="restricted.group.files" /></label>
+ <input type="checkbox"
wicket:id="restricted" />
</div>
<div class="formelement">
- <label
wicket:for="limited"><wicket:message key="admin.group.form.limited"
/></label><input type="checkbox" wicket:id="limited" />
+ <label wicket:for="limited"
class="col-3 text-right"><wicket:message key="admin.group.form.limited"
/></label>
+ <input type="checkbox"
wicket:id="limited" />
</div>
<div class="formelement d-none">
- <label
wicket:for="maxFilesSize"><wicket:message key="admin.group.form.maxFilesSize"
/></label><input type="number" wicket:id="maxFilesSize" /><wicket:message
key="network.test.mb"/>
+ <label
wicket:for="maxFilesSize" class="col-3 text-right"><wicket:message
key="admin.group.form.maxFilesSize" /></label>
+ <input type="number"
wicket:id="maxFilesSize" class="col-8"/><wicket:message key="network.test.mb"/>
</div>
<div class="formelement d-none">
- <label
wicket:for="maxRecordingsSize"><wicket:message
key="admin.group.form.maxRecordingsSize" /></label><input type="number"
wicket:id="maxRecordingsSize" /><wicket:message key="network.test.mb"/>
+ <label
wicket:for="maxRecordingsSize" class="col-3 text-right"><wicket:message
key="admin.group.form.maxRecordingsSize" /></label>
+ <input type="number"
wicket:id="maxRecordingsSize" class="col-8"/><wicket:message
key="network.test.mb"/>
</div>
<div class="formelement d-none">
- <label
wicket:for="maxRooms"><wicket:message key="admin.group.form.maxRooms"
/></label><input type="number" wicket:id="maxRooms" />
+ <label wicket:for="maxRooms"
class="col-3 text-right"><wicket:message key="admin.group.form.maxRooms"
/></label>
+ <input type="number"
wicket:id="maxRooms" class="col-8"/>
</div>
<div class="formelement">
- <label
wicket:for="recordingTtl"><wicket:message key="admin.group.form.recordingTtl"
/></label><input type="number" wicket:id="recordingTtl" /><wicket:message
key="admin.group.form.days"/>
+ <label
wicket:for="recordingTtl" class="col-3 text-right"><wicket:message
key="admin.group.form.recordingTtl" /></label>
+ <input type="number"
wicket:id="recordingTtl" class="col-7"/>
+ <div class="col-1
d-inline-block"><wicket:message key="admin.group.form.days"/></div>
</div>
<div class="formelement">
- <label
wicket:for="reminderDays"><wicket:message key="admin.group.form.reminderDays"
/></label><input type="number" wicket:id="reminderDays" /><wicket:message
key="admin.group.form.days"/>
+ <label
wicket:for="reminderDays" class="col-3 text-right"><wicket:message
key="admin.group.form.reminderDays" /></label>
+ <input type="number"
wicket:id="reminderDays" class="col-7"/>
+ <div class="col-1
d-inline-block"><wicket:message key="admin.group.form.days"/></div>
</div>
</fieldset>
<div class="bottom-bumper"></div>
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 2242030..e275aa9 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
@@ -73,8 +73,8 @@
<form wicket:id="form" class="adminForm">
<div class="actions" wicket:id="buttons"></div>
<div class="scrollcontent" id="adminForm">
- <fieldset class="ui-widget-content">
- <legend
class="ui-widget-header"><wicket:message key="353" /></legend>
+ <fieldset>
+ <legend><wicket:message key="353"
/></legend>
<div class="formelement">
<label wicket:for="key"
class="col-3 text-right"><wicket:message key="165" /></label>
<input type="text"
wicket:id="key" class="col-8"/>
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 5c1b4f6..33bfc3c 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
@@ -44,41 +44,55 @@
<form wicket:id="form" class="adminForm">
<div wicket:id="buttons"></div>
<div class="scrollcontent" id="adminForm">
- <fieldset class="ui-widget-content">
- <legend
class="ui-widget-header"><wicket:message key="1107" /></legend>
+ <fieldset>
+ <legend><wicket:message key="1107"
/></legend>
<div class="formelement">
- <label
wicket:for="name"><wicket:message key="165" /></label><input type="text"
wicket:id="name"/>
+ <label wicket:for="name"
class="col-3 text-right"><wicket:message key="165" /></label>
+ <input type="text"
wicket:id="name" class="col-8"/>
</div>
<div class="formelement">
- <label
wicket:for="active"><wicket:message key="1109" /></label><input type="checkbox"
class="formcheckbox" wicket:id="active"/>
+ <label wicket:for="active"
class="col-3 text-right"><wicket:message key="1109" /></label>
+ <input type="checkbox"
class="formcheckbox" wicket:id="active"/>
</div>
<div class="formelement">
- <label><wicket:message
key="1110" /></label><span wicket:id="inserted"/>
+ <label class="col-3
text-right"><wicket:message key="1110" /></label>
+ <span wicket:id="inserted"
class="col-8"/>
</div>
<div class="formelement">
- <label><wicket:message
key="1111" /></label><span wicket:id="insertedby.login"/>
+ <label class="col-3
text-right"><wicket:message key="1111" /></label>
+ <span
wicket:id="insertedby.login" class="col-8"/>
</div>
<div class="formelement">
- <label><wicket:message
key="1112" /></label><span wicket:id="updated"/>
+ <label class="col-3
text-right"><wicket:message key="1112" /></label>
+ <span wicket:id="updated"
class="col-8"/>
</div>
<div class="formelement">
- <label><wicket:message
key="269" /></label><span wicket:id="updatedby.login"/>
+ <label class="col-3
text-right"><wicket:message key="269" /></label>
+ <span
wicket:id="updatedby.login" class="col-8"/>
</div>
<div class="formelement">
- <div><i class="fas
fa-info-circle m-1"></i><wicket:message key="1114" /></div>
- <br/>
- <label
wicket:for="configFileName"><wicket:message key="1115" /></label><input
type="text" wicket:id="configFileName"/>
+ <div>
+ <div class="col-3
d-inline-block"></div>
+ <div class="col-8
d-inline-block"><i class="fas fa-info-circle m-1"></i><wicket:message
key="1114" /></div>
+ </div>
+ <label
wicket:for="configFileName" class="col-3 text-right"><wicket:message key="1115"
/></label>
+ <input type="text"
wicket:id="configFileName" class="col-8"/>
</div>
<div class="formelement">
- <div><i class="fas
fa-info-circle m-1"></i><wicket:message key="1116" /></div>
- <br/>
- <label
wicket:for="addDomainToUserName"><wicket:message key="1117" /></label><input
type="checkbox" class="formcheckbox" wicket:id="addDomainToUserName"/>
+ <div>
+ <div class="col-3
d-inline-block"></div>
+ <div class="col-8
d-inline-block"><i class="fas fa-info-circle m-1"></i><wicket:message
key="1116" /></div>
+ </div>
+ <label
wicket:for="addDomainToUserName" class="col-3 text-right"><wicket:message
key="1117" /></label>
+ <input type="checkbox"
class="formcheckbox" wicket:id="addDomainToUserName"/>
</div>
<div class="formelement">
- <label
wicket:for="domain"><wicket:message key="1118" /></label><input type="text"
wicket:id="domain"/>
+ <label wicket:for="domain"
class="col-3 text-right"><wicket:message key="1118" /></label>
+ <input type="text"
wicket:id="domain" class="col-8"/>
</div>
<div class="formelement">
- <label
wicket:for="comment"><wicket:message key="196" /></label><textarea
wicket:id="comment"/>
+ <label wicket:for="comment"
class="col-3 text-right"><wicket:message key="196" /></label>
+ <textarea wicket:id="comment"
class="col-8"/>
</div>
</fieldset>
<div class="bottom-bumper"></div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
index b4c81fe..844d9e5 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
@@ -32,7 +32,7 @@ import org.apache.openmeetings.db.entity.server.OAuthServer;
import org.apache.openmeetings.db.entity.server.OAuthServer.RequestInfoMethod;
import org.apache.openmeetings.db.entity.server.OAuthServer.RequestTokenMethod;
import org.apache.openmeetings.web.admin.AdminBaseForm;
-import org.apache.openmeetings.web.common.confirmation.ConfirmableAjaxBorder;
+import org.apache.openmeetings.web.util.CallbackFunctionHelper;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -52,8 +52,10 @@ import org.apache.wicket.model.util.ListModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.wicket.util.string.Strings;
-import com.googlecode.wicket.jquery.ui.JQueryIcon;
-import com.googlecode.wicket.jquery.ui.form.button.AjaxButton;
+import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxButton;
+import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink;
+import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
+import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5IconType;
public class OAuthForm extends AdminBaseForm<OAuthServer> {
private static final long serialVersionUID = 1L;
@@ -66,19 +68,22 @@ public class OAuthForm extends AdminBaseForm<OAuthServer> {
@Override
protected void populateItem(final ListItem<Map.Entry<String,
String>> item) {
final Map.Entry<String, String> entry =
item.getModelObject();
+ BootstrapAjaxLink<String> del = new
BootstrapAjaxLink<>("delete", Buttons.Type.Outline_Danger) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ OAuthServer s =
OAuthForm.this.getModelObject();
+ s.getMapping().remove(entry.getKey());
+ updateMapping();
+ target.add(attrsContainer);
+ }
+ };
+ del.setIconType(FontAwesome5IconType.times_s)
+
.add(CallbackFunctionHelper.newOkCancelDangerConfirm(this, getString("833")));
item.add(new Label("key", Model.of(entry.getKey())))
.add(new Label("value",
Model.of(entry.getValue())))
- .add(new ConfirmableAjaxBorder("delete",
getString("80"), getString("833")) {
- private static final long
serialVersionUID = 1L;
-
- @Override
- protected void
onSubmit(AjaxRequestTarget target) {
- OAuthServer s =
OAuthForm.this.getModelObject();
-
s.getMapping().remove(entry.getKey());
- updateMapping();
- target.add(attrsContainer);
- }
- });
+ .add(del);
}
};
@@ -109,7 +114,7 @@ public class OAuthForm extends AdminBaseForm<OAuthServer> {
final TextField<String> omAttr = new TextField<>("omAttr",
Model.of(""));
final TextField<String> oauthAttr = new
TextField<>("oauthAttr", Model.of(""));
add(mappingForm.add(omAttr, oauthAttr
- , new AjaxButton("addMapping") {
+ , new BootstrapAjaxButton("addMapping", new
ResourceModel("1261"), mappingForm, Buttons.Type.Outline_Primary) {
private static final long
serialVersionUID = 1L;
@Override
@@ -122,11 +127,6 @@ public class OAuthForm extends AdminBaseForm<OAuthServer> {
updateMapping();
target.add(attrsContainer,
mappingForm);
}
-
- @Override
- protected String getIcon() {
- return JQueryIcon.PLUSTHICK;
- }
}).setOutputMarkupId(true));
add(attrsContainer.add(updateMapping()).setOutputMarkupId(true));
super.onInitialize();
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 bec2605..3422d06 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
@@ -42,62 +42,77 @@
<form wicket:id="form" class="adminForm">
<div class="actions" wicket:id="buttons"></div>
<div class="scrollcontent" id="adminForm">
- <fieldset class="ui-widget-content">
- <legend
class="ui-widget-header"><wicket:message key="1581" /></legend>
+ <fieldset>
+ <legend><wicket:message
key="1581"/></legend>
<div class="formelement">
- <label
wicket:for="isEnabled"><wicket:message key="1109" /></label><input
type="checkbox" class="formcheckbox" wicket:id="isEnabled"/>
+ <label wicket:for="isEnabled"
class="col-3 text-right"><wicket:message key="1109"/></label>
+ <input type="checkbox"
class="formcheckbox" wicket:id="isEnabled"/>
</div>
<div class="formelement">
- <label
wicket:for="name"><wicket:message key="165" /></label><input type="text"
wicket:id="name"/>
+ <label wicket:for="name"
class="col-3 text-right"><wicket:message key="165"/></label>
+ <input type="text"
wicket:id="name" class="col-8"/>
</div>
<div class="formelement">
- <label
wicket:for="iconUrl"><wicket:message key="1575" /></label><input type="text"
wicket:id="iconUrl"/>
+ <label wicket:for="iconUrl"
class="col-3 text-right"><wicket:message key="1575"/></label>
+ <input type="text"
wicket:id="iconUrl" class="col-8"/>
</div>
<div class="formelement">
- <label
wicket:for="clientId"><wicket:message key="1576" /></label><input type="text"
wicket:id="clientId"/>
+ <label wicket:for="clientId"
class="col-3 text-right"><wicket:message key="1576"/></label>
+ <input type="text"
wicket:id="clientId" class="col-8"/>
</div>
<div class="formelement">
- <label
wicket:for="clientSecret"><wicket:message key="1577" /></label><input
type="text" wicket:id="clientSecret"/>
+ <label
wicket:for="clientSecret" class="col-3 text-right"><wicket:message
key="1577"/></label>
+ <input type="text"
wicket:id="clientSecret" class="col-8"/>
</div>
<div class="formelement">
- <label
wicket:for="redirectUri"><wicket:message key="1587" /></label><input
type="text" readonly="readonly" wicket:id="redirectUri"/>
+ <label wicket:for="redirectUri"
class="col-3 text-right"><wicket:message key="1587"/></label>
+ <input type="text"
readonly="readonly" wicket:id="redirectUri" class="col-8"/>
</div>
<div class="formelement">
- <label
wicket:for="requestKeyUrl"><wicket:message key="1578" /></label><input
type="text" wicket:id="requestKeyUrl"/>
+ <label
wicket:for="requestKeyUrl" class="col-3 text-right"><wicket:message
key="1578"/></label>
+ <input type="text"
wicket:id="requestKeyUrl" class="col-8"/>
</div>
<div class="formelement">
- <label
wicket:for="requestTokenMethod"><wicket:message
key="admin.oauth.req.token.method"/></label><select
wicket:id="requestTokenMethod"></select>
+ <label
wicket:for="requestTokenMethod" class="col-3 text-right"><wicket:message
key="admin.oauth.req.token.method"/></label>
+ <select
wicket:id="requestTokenMethod" class="custom-select col-8"></select>
</div>
<div class="formelement">
- <label
wicket:for="requestTokenUrl"><wicket:message key="1579" /></label><input
type="text" wicket:id="requestTokenUrl"/>
+ <label
wicket:for="requestTokenUrl" class="col-3 text-right"><wicket:message
key="1579"/></label>
+ <input type="text"
wicket:id="requestTokenUrl" class="col-8"/>
</div>
<div class="formelement">
- <label
wicket:for="requestTokenAttributes"><wicket:message key="1586" /></label><input
type="text" wicket:id="requestTokenAttributes"/>
+ <label
wicket:for="requestTokenAttributes" class="col-3 text-right"><wicket:message
key="1586"/></label>
+ <input type="text"
wicket:id="requestTokenAttributes" class="col-8"/>
</div>
<div class="formelement">
- <label
wicket:for="requestInfoMethod"><wicket:message
key="admin.oauth.req.info.method"/></label><select
wicket:id="requestInfoMethod"></select>
+ <label
wicket:for="requestInfoMethod" class="col-3 text-right"><wicket:message
key="admin.oauth.req.info.method"/></label>
+ <select
wicket:id="requestInfoMethod" class="custom-select col-8"></select>
</div>
<div class="formelement">
- <label
wicket:for="requestInfoUrl"><wicket:message key="1580" /></label><input
type="text" wicket:id="requestInfoUrl"/>
+ <label
wicket:for="requestInfoUrl" class="col-3 text-right"><wicket:message
key="1580"/></label>
+ <input type="text"
wicket:id="requestInfoUrl" class="col-8"/>
</div>
</fieldset>
<!-- Attribute mapping -->
- <fieldset class="ui-widget-content">
- <legend
class="ui-widget-header"><wicket:message key="admin.oauth.user.mapping"
/></legend>
+ <fieldset>
+ <legend><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"/>
+ <label
wicket:for="omAttr" class="col-3 text-right"><wicket:message
key="admin.oauth.attr.om" /></label>
+ <input type="text"
wicket:id="omAttr" class="col-8"/>
</div>
<div class="formelement">
- <label
wicket:for="oauthAttr"><wicket:message key="admin.oauth.attr.oauth" /></label>
- <input type="text"
class="input" wicket:id="oauthAttr"/>
+ <label
wicket:for="oauthAttr" class="col-3 text-right"><wicket:message
key="admin.oauth.attr.oauth" /></label>
+ <input type="text"
wicket:id="oauthAttr" class="col-8"/>
+ </div>
+ <div class="col-3
d-inline-block"></div>
+ <div class="col-8
d-inline-block">
+ <button type="button"
wicket:id="addMapping"></button>
</div>
- <button type="button"
wicket:id="addMapping"><wicket:message key="1261"/></button>
</div>
- <table class="list-table small">
+ <table class="list-table small
table-striped table-hover">
<thead>
- <tr
class="ui-widget-header">
+ <tr>
<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>
@@ -108,9 +123,7 @@
<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>
+ <button
wicket:id="delete" wicket:message="title:80" class="btn-sm p-0 pl-2
pr-2"></button>
</td>
</tr>
</tbody>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
index c23fcb0..5e1a0eb 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
@@ -19,7 +19,6 @@
package org.apache.openmeetings.web.admin.rooms;
import static org.apache.openmeetings.db.util.AuthLevelUtil.hasGroupAdminLevel;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS;
import static
org.apache.openmeetings.web.admin.AdminUserChoiceProvider.PAGE_SIZE;
import static org.apache.openmeetings.web.app.Application.kickUser;
import static org.apache.openmeetings.web.app.WebSession.getRights;
@@ -49,10 +48,9 @@ import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.admin.AdminBaseForm;
import org.apache.openmeetings.web.admin.AdminUserChoiceProvider;
import org.apache.openmeetings.web.app.ClientManager;
-import org.apache.openmeetings.web.common.confirmation.ConfirmableAjaxBorder;
+import org.apache.openmeetings.web.util.CallbackFunctionHelper;
import org.apache.openmeetings.web.util.RestrictiveChoiceProvider;
import org.apache.openmeetings.web.util.RoomTypeDropDown;
-import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
@@ -80,8 +78,12 @@ import org.wicketstuff.select2.Response;
import org.wicketstuff.select2.Select2Choice;
import org.wicketstuff.select2.Select2MultiChoice;
-import com.googlecode.wicket.jquery.ui.JQueryIcon;
-import com.googlecode.wicket.jquery.ui.form.button.AjaxButton;
+import de.agilecoders.wicket.core.markup.html.bootstrap.badge.BadgeBehavior;
+import de.agilecoders.wicket.core.markup.html.bootstrap.badge.BootstrapBadge;
+import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxButton;
+import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink;
+import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
+import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5IconType;
public class RoomForm extends AdminBaseForm<Room> {
private static final long serialVersionUID = 1L;
@@ -98,17 +100,20 @@ public class RoomForm extends AdminBaseForm<Room> {
@Override
protected void populateItem(final ListItem<Client> item) {
Client c = item.getModelObject();
+ BootstrapAjaxLink<String> del = new
BootstrapAjaxLink<>("clientDelete", Buttons.Type.Outline_Danger) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ kickUser(item.getModelObject());
+ updateClients(target);
+ }
+ };
+ del.setIconType(FontAwesome5IconType.times_s)
+
.add(CallbackFunctionHelper.newOkCancelDangerConfirm(this, getString("833")));
item.add(new Label("clientId", "" + c.getUserId()))
.add(new Label("clientLogin", "" +
c.getUser().getLogin()))
- .add(new ConfirmableAjaxBorder("clientDelete",
getString("80"), getString("833")) {
- private static final long
serialVersionUID = 1L;
-
- @Override
- protected void
onSubmit(AjaxRequestTarget target) {
- kickUser(item.getModelObject());
- updateClients(target);
- }
- });
+ .add(del);
}
};
private IModel<User> moderator2add = Model.of((User)null);
@@ -142,10 +147,12 @@ public class RoomForm extends AdminBaseForm<Room> {
DROPDOWN_NUMBER_OF_PARTICIPANTS, //
new ChoiceRenderer<Long>() {
private static final long
serialVersionUID = 1L;
+
@Override
public Object getDisplayValue(Long id) {
return id;
}
+
@Override
public String getIdValue(Long id, int
index) {
return "" + id;
@@ -301,22 +308,23 @@ public class RoomForm extends AdminBaseForm<Room> {
protected void populateItem(final
ListItem<RoomModerator> item) {
RoomModerator moderator = item.getModelObject();
Label name = new Label("uName",
moderator.getUser().getDisplayName());
- if (moderator.getId() == null) {
-
name.add(AttributeModifier.append(ATTR_CLASS, "newItem"));
- }
+ BootstrapAjaxLink<String> del = new
BootstrapAjaxLink<>("delete", Buttons.Type.Outline_Danger) {
+ private static final long
serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget
target) {
+
RoomForm.this.getModelObject().getModerators().remove(item.getIndex());
+ target.add(moderatorContainer);
+ }
+ };
+ del.setIconType(FontAwesome5IconType.times_s)
+
.add(CallbackFunctionHelper.newOkCancelDangerConfirm(this, getString("833")));
item.add(new CheckBox("superModerator", new
PropertyModel<Boolean>(moderator, "superModerator")))
.add(new Label("userId",
String.valueOf(moderator.getUser().getId())))
.add(name)
.add(new Label("email",
moderator.getUser().getAddress().getEmail()))
- .add(new
ConfirmableAjaxBorder("delete", getString("80"), getString("833")) {
- private static final long
serialVersionUID = 1L;
-
- @Override
- protected void
onSubmit(AjaxRequestTarget target) {
-
RoomForm.this.getModelObject().getModerators().remove(item.getIndex());
-
target.add(moderatorContainer);
- }
- });
+ .add(del)
+ .add(new BootstrapBadge("new", new
ResourceModel("lbl.new"),
BadgeBehavior.Type.Warning).setVisible((moderator.getId() == null)));
}
}).setOutputMarkupId(true));
@@ -357,7 +365,7 @@ public class RoomForm extends AdminBaseForm<Room> {
return new String[] {"number"};
}
})
- .add(new AjaxButton("addFiles") {
+ .add(new BootstrapAjaxButton("addFiles", new
ResourceModel("1261"), filesForm, Buttons.Type.Outline_Primary) {
private static final long serialVersionUID = 1L;
@Override
@@ -371,11 +379,6 @@ public class RoomForm extends AdminBaseForm<Room> {
}
target.add(filesContainer, filesForm);
}
-
- @Override
- protected String getIcon() {
- return JQueryIcon.PLUSTHICK;
- }
}).setOutputMarkupId(true)
);
add(filesContainer.add(new ListView<RoomFile>("files") {
@@ -384,24 +387,27 @@ public class RoomForm extends AdminBaseForm<Room> {
@Override
protected void populateItem(final ListItem<RoomFile>
item) {
final RoomFile rf = item.getModelObject();
- item.add(new Label("name", new
PropertyModel<>(rf.getFile(), "name")))
- .add(new Label("wbIdx", new
PropertyModel<>(rf, "wbIdx")))
- .add(new
ConfirmableAjaxBorder("delete", getString("80"), getString("833")) {
- private static final long
serialVersionUID = 1L;
-
- @Override
- protected void
onSubmit(AjaxRequestTarget target) {
- Room r =
RoomForm.this.getModelObject();
- for (Iterator<RoomFile>
iter = r.getFiles().iterator(); iter.hasNext();) {
- RoomFile _rf =
iter.next();
- if
(_rf.getFile().getId().equals(rf.getFile().getId())) {
-
iter.remove();
- break;
- }
+ BootstrapAjaxLink<String> del = new
BootstrapAjaxLink<>("delete", Buttons.Type.Outline_Danger) {
+ private static final long
serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget
target) {
+ Room r =
RoomForm.this.getModelObject();
+ for (Iterator<RoomFile> iter =
r.getFiles().iterator(); iter.hasNext();) {
+ RoomFile _rf =
iter.next();
+ if
(_rf.getFile().getId().equals(rf.getFile().getId())) {
+ iter.remove();
+ break;
}
-
target.add(filesContainer);
}
- });
+ target.add(filesContainer);
+ }
+ };
+ del.setIconType(FontAwesome5IconType.times_s)
+
.add(CallbackFunctionHelper.newOkCancelDangerConfirm(this, getString("833")));
+ item.add(new Label("name", new
PropertyModel<>(rf.getFile(), "name")))
+ .add(new Label("wbIdx", new
PropertyModel<>(rf, "wbIdx")))
+ .add(del);
}
}).setOutputMarkupId(true));
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 7d96379..cc1c9bb 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
@@ -46,111 +46,146 @@
<div class="scrollcontent" id="adminForm">
<!-- General -->
- <fieldset class="ui-widget-content">
- <legend
class="ui-widget-header"><wicket:message key="187" /></legend>
+ <fieldset>
+ <legend><wicket:message key="187"
/></legend>
<div class="formelement">
- <label
wicket:for="name"><wicket:message key="165" /></label><input type="text"
wicket:id="name" />
+ <label wicket:for="name"
class="col-3 text-right"><wicket:message key="165" /></label>
+ <input type="text"
wicket:id="name" class="col-8"/>
</div>
<div class="formelement">
- <label
wicket:for="capacity"><wicket:message key="482" /></label><select
wicket:id="capacity"/>
+ <label wicket:for="capacity"
class="col-3 text-right"><wicket:message key="482" /></label>
+ <select wicket:id="capacity"
class="custom-select col-8"/>
</div>
<div class="formelement">
- <label
wicket:for="type"><wicket:message key="45" /></label><select wicket:id="type"/>
+ <label wicket:for="type"
class="col-3 text-right"><wicket:message key="45" /></label>
+ <select wicket:id="type"
class="custom-select col-8"/>
</div>
<div class="formelement">
- <label
wicket:for="comment"><wicket:message key="196" /></label><textarea
wicket:id="comment"/>
+ <label wicket:for="comment"
class="col-3 text-right"><wicket:message key="196" /></label>
+ <textarea wicket:id="comment"
class="col-8"/>
</div>
<div class="formelement">
- <label
wicket:for="appointment"><wicket:message key="620" /></label><input
type="checkbox" class="formcheckbox" wicket:id="appointment" />
+ <label wicket:for="appointment"
class="col-3 text-right"><wicket:message key="620" /></label>
+ <input type="checkbox"
class="formcheckbox" wicket:id="appointment" />
</div>
</fieldset>
<!-- Groups -->
- <fieldset class="ui-widget-content">
- <legend
class="ui-widget-header"><wicket:message key="126" /></legend>
+ <fieldset>
+ <legend><wicket:message key="126"
/></legend>
<div class="formelement">
- <label
wicket:for="ispublic"><wicket:message key="190" /></label><input
type="checkbox" class="formcheckbox" wicket:id="ispublic" />
+ <label wicket:for="ispublic"
class="col-3 text-right"><wicket:message key="190" /></label>
+ <input type="checkbox"
class="formcheckbox" wicket:id="ispublic" />
</div>
<div class="formelement">
- <i class="fas fa-info-circle
m-1"></i><wicket:message key="828" />
- <label
wicket:for="groups"><wicket:message key="126" /></label><div
class="om-select2"><select class="input" wicket:id="groups"></select></div>
+ <div class="col-3
d-inline-block"></div>
+ <div class="col-8
d-inline-block">
+ <i class="fas
fa-info-circle m-1"></i><wicket:message key="828" />
+ </div>
+ <label wicket:for="groups"
class="col-3 text-right"><wicket:message key="126" /></label>
+ <div class="om-select2 p-0
d-inline-block col-8"><select class="input w-100"
wicket:id="groups"></select></div>
</div>
</fieldset>
<!-- Limitations -->
- <fieldset class="ui-widget-content">
- <legend
class="ui-widget-header"><wicket:message key="830" /></legend>
+ <fieldset>
+ <legend><wicket:message key="830"
/></legend>
<div class="formelement">
- <label
wicket:for="isDemoRoom"><wicket:message key="636" /></label><input
type="checkbox" class="formcheckbox" wicket:id="isDemoRoom" />
+ <label wicket:for="isDemoRoom"
class="col-3 text-right"><wicket:message key="636" /></label>
+ <input type="checkbox"
class="formcheckbox" wicket:id="isDemoRoom" />
</div>
<div class="formelement">
- <label
wicket:for="demoTime"><wicket:message key="637" /></label><input type="text"
wicket:id="demoTime" />
+ <label wicket:for="demoTime"
class="col-3 text-right"><wicket:message key="637" /></label>
+ <input type="text"
wicket:id="demoTime" class="col-8"/>
</div>
</fieldset>
<!-- Rights -->
- <fieldset class="ui-widget-content">
- <legend
class="ui-widget-header"><wicket:message key="881" /></legend>
+ <fieldset>
+ <legend><wicket:message key="881"
/></legend>
<div class="formelement">
- <i class="fas fa-info-circle
m-1"></i><wicket:message key="880" />
- <label
wicket:for="allowUserQuestions"><wicket:message key="879" /></label><input
type="checkbox" class="formcheckbox" wicket:id="allowUserQuestions" />
+ <div class="col-3
d-inline-block"></div>
+ <div class="col-8
d-inline-block">
+ <i class="fas
fa-info-circle m-1"></i><wicket:message key="880" />
+ </div>
+ <label
wicket:for="allowUserQuestions" class="col-3 text-right"><wicket:message
key="879" /></label>
+ <input type="checkbox"
class="formcheckbox" wicket:id="allowUserQuestions" />
</div>
<div class="formelement">
- <i class="fas fa-info-circle
m-1"></i><wicket:message key="1077" />
- <label
wicket:for="audioOnly"><wicket:message key="1076" /></label><input
type="checkbox" class="formcheckbox" wicket:id="audioOnly" />
+ <div class="col-3
d-inline-block"></div>
+ <div class="col-8
d-inline-block">
+ <i class="fas
fa-info-circle m-1"></i><wicket:message key="1077" />
+ </div>
+ <label wicket:for="audioOnly"
class="col-3 text-right"><wicket:message key="1076" /></label>
+ <input type="checkbox"
class="formcheckbox" wicket:id="audioOnly" />
</div>
<div class="formelement">
- <i class="fas fa-info-circle
m-1"></i><wicket:message key="1101" />
- <label
wicket:for="closed"><wicket:message key="1099" /></label><input type="checkbox"
class="formcheckbox" wicket:id="closed" />
+ <div class="col-3
d-inline-block"></div>
+ <div class="col-8
d-inline-block">
+ <i class="fas
fa-info-circle m-1"></i><wicket:message key="1101" />
+ </div>
+ <label wicket:for="closed"
class="col-3 text-right"><wicket:message key="1099" /></label>
+ <input type="checkbox"
class="formcheckbox" wicket:id="closed" />
</div>
<div class="formelement">
- <label
wicket:for="redirectURL"><wicket:message key="1100" /></label><input
type="text" wicket:id="redirectURL" />
+ <label wicket:for="redirectURL"
class="col-3 text-right"><wicket:message key="1100" /></label>
+ <input type="text"
wicket:id="redirectURL" class="col-8"/>
</div>
<div class="formelement">
- <i class="fas fa-info-circle
m-1"></i><wicket:message key="1102" />
- <br/>
- <label
wicket:for="waitRecording"><wicket:message key="1356" /></label><input
type="checkbox" class="formcheckbox" wicket:id="waitRecording" />
+ <div class="col-3
d-inline-block"></div>
+ <div class="col-8
d-inline-block">
+ <i class="fas
fa-info-circle m-1"></i><wicket:message key="1102" />
+ </div>
+ <label
wicket:for="waitRecording" class="col-3 text-right"><wicket:message key="1356"
/></label>
+ <input type="checkbox"
class="formcheckbox" wicket:id="waitRecording" />
</div>
<div class="formelement">
- <label
wicket:for="allowRecording"><wicket:message key="1355" /></label><input
type="checkbox" class="formcheckbox" wicket:id="allowRecording" />
+ <label
wicket:for="allowRecording" class="col-3 text-right"><wicket:message key="1355"
/></label>
+ <input type="checkbox"
class="formcheckbox" wicket:id="allowRecording" />
</div>
<div class="formelement">
- <label
wicket:for="chatModerated"><wicket:message key="1513" /></label><input
type="checkbox" class="formcheckbox" wicket:id="chatModerated" />
+ <label
wicket:for="chatModerated" class="col-3 text-right"><wicket:message key="1513"
/></label>
+ <input type="checkbox"
class="formcheckbox" wicket:id="chatModerated" />
</div>
</fieldset>
<!-- Room Layout options -->
- <fieldset class="ui-widget-content">
- <legend
class="ui-widget-header"><wicket:message key="1443" /></legend>
+ <fieldset>
+ <legend><wicket:message key="1443"
/></legend>
<div class="formelement">
- <label
wicket:for="hiddenElements"><wicket:message key="admin.room.hidden.elements"
/></label>
- <div class="om-select2"><select
class="input" wicket:id="hiddenElements"></select></div>
+ <label
wicket:for="hiddenElements" class="col-3 text-right"><wicket:message
key="admin.room.hidden.elements" /></label>
+ <div class="om-select2 p-0
d-inline-block col-8"><select class="input w-100"
wicket:id="hiddenElements"></select></div>
</div>
<div class="formelement">
- <label
wicket:for="chatOpened"><wicket:message key="1515" /></label><input
type="checkbox" class="formcheckbox" wicket:id="chatOpened" />
+ <label wicket:for="chatOpened"
class="col-3 text-right"><wicket:message key="1515" /></label>
+ <input type="checkbox"
class="formcheckbox" wicket:id="chatOpened" />
</div>
<div class="formelement">
- <label
wicket:for="filesOpened"><wicket:message key="1516" /></label><input
type="checkbox" class="formcheckbox" wicket:id="filesOpened" />
+ <label wicket:for="filesOpened"
class="col-3 text-right"><wicket:message key="1516" /></label>
+ <input type="checkbox"
class="formcheckbox" wicket:id="filesOpened" />
</div>
</fieldset>
<!-- Room files -->
- <fieldset class="ui-widget-content">
- <legend
class="ui-widget-header"><wicket:message key="245" /></legend>
+ <fieldset>
+ <legend><wicket:message key="245"
/></legend>
<div wicket:id="filesForm">
<div class="formelement">
- <label
wicket:for="files2add"><wicket:message key="245" /></label>
- <div
class="om-select2"><select class="input" wicket:id="files2add"></select></div>
+ <label
wicket:for="files2add" class="col-3 text-right"><wicket:message key="245"
/></label>
+ <div class="om-select2
p-0 d-inline-block col-8"><select class="input w-100"
wicket:id="files2add"></select></div>
</div>
<div class="formelement">
- <label
wicket:for="wbidx"><wicket:message key="615" /></label>
- <input type="number"
class="input" wicket:id="wbidx"/>
+ <label
wicket:for="wbidx" class="col-3 text-right"><wicket:message key="615" /></label>
+ <input type="number"
wicket:id="wbidx" class="col-8"/>
+ </div>
+ <div class="col-3
d-inline-block"></div>
+ <div class="col-8
d-inline-block">
+ <button type="button"
wicket:id="addFiles"></button>
</div>
- <button type="button"
wicket:id="addFiles"><wicket:message key="1261"/></button>
</div>
- <table class="list-table small">
+ <table class="list-table small
table-striped table-hover">
<thead>
- <tr
class="ui-widget-header">
+ <tr>
<th
class="col-9"><wicket:message key="165" /></th>
<th
class="col-2"><wicket:message key="615" /></th>
<th
class="col-1"><wicket:message key=275 /></th>
@@ -161,9 +196,7 @@
<td
class="col-9"><div class="col-wrapper w-auto"><span
wicket:id="name"></span></div></td>
<td
class="col-2"><span wicket:id="wbIdx"></span></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>
+ <button
wicket:id="delete" wicket:message="title:80" class="btn-sm p-0 pl-2
pr-2"></button>
</td>
</tr>
</tbody>
@@ -171,11 +204,11 @@
</fieldset>
<!-- Users in this Room -->
- <fieldset class="ui-widget-content">
- <legend
class="ui-widget-header"><wicket:message key="407" /></legend>
- <table class="list-table small">
+ <fieldset>
+ <legend><wicket:message key="407"
/></legend>
+ <table class="list-table small
table-striped table-hover">
<thead>
- <tr
class="ui-widget-header">
+ <tr>
<th
class="col-1"><wicket:message key="188" /></th>
<th
class="col-10"><wicket:message key="108" /></th>
<th
class="col-1"><wicket:message key="275" /></th>
@@ -186,9 +219,7 @@
<td
class="col-1"><div class="col-wrapper"><span
wicket:id="clientId"></span></div></td>
<td
class="col-10"><div class="col-wrapper"><span
wicket:id="clientLogin"></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="clientDelete" wicket:message="title:603">
-
<span class="ui-button-icon ui-icon ui-icon-closethick"></span>
- </div>
+ <button
wicket:id="clientDelete" wicket:message="title:603" class="btn-sm p-0 pl-2
pr-2"></button>
</td>
</tr>
</tbody>
@@ -196,23 +227,32 @@
</fieldset>
<!-- Default moderators -->
- <fieldset class="ui-widget-content">
- <legend
class="ui-widget-header"><wicket:message key="816" /></legend>
+ <fieldset>
+ <legend><wicket:message key="816"
/></legend>
<div class="formelement">
- <i class="fas fa-info-circle
m-1"></i><wicket:message key="823" />
- <label
wicket:for="moderated"><wicket:message key="640" /></label><input
type="checkbox" class="formcheckbox" wicket:id="moderated" />
+ <div class="col-3
d-inline-block"></div>
+ <div class="col-8
d-inline-block">
+ <i class="fas
fa-info-circle m-1"></i><wicket:message key="823" />
+ </div>
+ <label wicket:for="moderated"
class="col-3 text-right"><wicket:message key="640" /></label>
+ <input type="checkbox"
class="formcheckbox" wicket:id="moderated" />
</div>
<div class="formelement">
- <i class="fas fa-info-circle
m-1"></i><wicket:message key="admin.room.wait-moderator.info" />
- <label
wicket:for="waitModerator"><wicket:message
key="admin.room.wait-moderator.label" /></label><input type="checkbox"
class="formcheckbox" wicket:id="waitModerator" />
+ <div class="col-3
d-inline-block"></div>
+ <div class="col-8
d-inline-block">
+ <i class="fas
fa-info-circle m-1"></i><wicket:message key="admin.room.wait-moderator.info" />
+ </div>
+ <label
wicket:for="waitModerator" class="col-3 text-right"><wicket:message
key="admin.room.wait-moderator.label" /></label>
+ <input type="checkbox"
class="formcheckbox" wicket:id="waitModerator" />
</div>
<div class="formelement">
- <label
wicket:for="moderator2add"><wicket:message key="816" /></label><div
class="om-select2"><select wicket:id="moderator2add"
class="input"></select></div>
+ <label
wicket:for="moderator2add" class="col-3 text-right"><wicket:message key="816"
/></label>
+ <div class="om-select2 p-0
d-inline-block col-8"><select wicket:id="moderator2add" class="input
w-100"></select></div>
</div>
<div class="formelement"
wicket:id="moderatorContainer">
- <table class="list-table small">
+ <table class="list-table small
table-striped table-hover">
<thead>
- <tr
class="ui-widget-header">
+ <tr>
<th
class="col-1 overflow-hidden" wicket:message="title:817"><wicket:message
key="817" /></th>
<th
class="col-1"><wicket:message key="188" /></th>
<th
class="col-4"><wicket:message key="165" /></th>
@@ -224,12 +264,10 @@
<tr
wicket:id="moderators">
<td
class="col-1"><div class="col-wrapper"><input type="checkbox"
wicket:id="superModerator"/></div></td>
<td
class="col-1"><div class="col-wrapper"><span
wicket:id="userId"></span></div></td>
- <td
class="col-4"><div class="col-wrapper"><span
wicket:id="uName"></span></div></td>
+ <td
class="col-4"><div class="col-wrapper"><span wicket:id="new"/><span
wicket:id="uName"></span></div></td>
<td
class="col-5"><div class="col-wrapper overflow-hidden"><span
wicket:id="email"></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>
+
<button wicket:id="delete" wicket:message="title:80" class="btn-sm p-0 pl-2
pr-2"></button>
</td>
</tr>
</tbody>
@@ -237,22 +275,26 @@
</div>
</fieldset>
<!--SIP Settings -->
- <fieldset class="ui-widget-content">
- <legend
class="ui-widget-header"><wicket:message key="1001" /></legend>
+ <fieldset>
+ <legend><wicket:message key="1001"
/></legend>
<div class="formelement">
<i class="fas fa-info-circle
m-1"></i><wicket:message key="1002" />
</div>
<div class="formelement">
- <label
wicket:for="confno"><wicket:message key="1003" /></label><input type="text"
wicket:id="confno" />
+ <label wicket:for="confno"
class="col-3 text-right"><wicket:message key="1003" /></label>
+ <input type="text"
wicket:id="confno" class="col-8"/>
</div>
<div class="formelement">
- <label
wicket:for="pin"><wicket:message key="1004" /></label><input type="text"
wicket:id="pin" />
+ <label wicket:for="pin"
class="col-3 text-right"><wicket:message key="1004" /></label>
+ <input type="text"
wicket:id="pin" class="col-8"/>
</div>
<div class="formelement">
- <label
wicket:for="ownerId"><wicket:message key="1308" /></label><input type="text"
wicket:id="ownerId" />
+ <label wicket:for="ownerId"
class="col-3 text-right"><wicket:message key="1308" /></label>
+ <input type="text"
wicket:id="ownerId" class="col-8"/>
</div>
<div class="formelement">
- <label
wicket:for="sipEnabled"><wicket:message key="1538" /></label><input
type="checkbox" class="formcheckbox" wicket:id="sipEnabled" />
+ <label wicket:for="sipEnabled"
class="col-3 text-right"><wicket:message key="1538" /></label>
+ <input type="checkbox"
class="formcheckbox" wicket:id="sipEnabled" />
</div>
</fieldset>
<div class="bottom-bumper"></div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
index 6dc8001..6119143 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
@@ -22,8 +22,8 @@
<wicket:panel>
<div class="actions" wicket:id="buttons"></div>
<div class="scrollcontent" wicket:id="adminForm" id="adminForm">
- <fieldset class="ui-widget-content">
- <legend class="ui-widget-header">
+ <fieldset>
+ <legend>
<wicket:message key="143" />
</legend>
<div class="formelement">
@@ -49,7 +49,10 @@
<label class="col-3 text-right"><wicket:message
key="1112" /></label><span wicket:id="updated" class="col-8"/>
</div>
<div class="formelement">
- <div><i class="fas fa-info-circle
m-1"></i><wicket:message key="1149" /></div>
+ <div class="col-3 d-inline-block"></div>
+ <div class="col-8 d-inline-block">
+ <i class="fas fa-info-circle
m-1"></i><wicket:message key="1149" />
+ </div>
<label wicket:for="forceTimeZoneCheck"
class="col-3 text-right"><wicket:message key="1148" /></label>
<input class="formcheckbox" type="checkbox"
wicket:id="forceTimeZoneCheck"/>
</div>
@@ -58,8 +61,8 @@
<div class="om-select2 p-0 d-inline-block
col-8"><select class="input w-100" wicket:id="rights"></select></div>
</div>
</fieldset>
- <fieldset class="ui-widget-content">
- <legend class="ui-widget-header">
+ <fieldset>
+ <legend>
<wicket:message key="1159" />
</legend>
<form wicket:id="comunity"></form>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
index 97d75f0..10d31b8 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
index 4597925..6e18473 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
index 1a660a0..2e2f008 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
index 7049781..8936a3a 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
index fdd34e6..11fee8d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
index 8175597..e0649e8 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
index c45f675..a3b6c9b 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
index 2b34ad3..554dee3 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
@@ -1009,4 +1009,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
index 0801186..20da748 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
index e0d9985..a10ee07 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
@@ -1002,4 +1002,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
index 30a1010..9992b24 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
@@ -996,4 +996,5 @@ target="_blank">Custom Crypt Mechanism</a>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
index 265d023..24632ee 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
index 88257a2..3653b3a 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
index 082344b..220ec95 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
index 97d75f0..10d31b8 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
index 9a6d425..5455670 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
@@ -992,4 +992,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml
index 84e5911..858af2e 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
index ef9e57a..1d15225 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
@@ -1005,4 +1005,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
index 47bb83c..c0940ba 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
index 326b1ef..a2dd1a1 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
index 27f2ff0..2ee404c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
index 7350030..c3af5f3 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
index 8785fd4..ea2a38f 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
index c492d43..d9ed34b 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
index 6a0e023..926bac5 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Ждать
модератора]]></entry>
<entry key="wait-moderator.title"><![CDATA[Пожалуйста подождите
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[новый]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
index 1277d82..1ee65e4 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
index 2af6e09..a1c27b0 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
index fea3a92..7666c5a 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
index 1541d6c..335de01 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
index 7709e15..78e37fb 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
@@ -1003,4 +1003,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
index 2b88ada..2780515 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
index c7d8b49..15de706 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
@@ -1004,4 +1004,5 @@ see https://openmeetings.apache.org/LanguageEditor.html
for Details
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait
moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient
...]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
+ <entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
index 8702054..6012b37 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
@@ -22,12 +22,18 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<form wicket:id="form" class="h-100">
- <div class="file tree item drop area">
+ <div class="file-tree item drop area">
<div class="icons clear trash-toolbar"
wicket:id="trash-toolbar" wicket:message="title:705">
<span wicket:id="upload"
wicket:message="title:702"></span>
- <span wicket:id="create"
wicket:message="title:703"></span>
- <span wicket:id="refresh" class="refresh om-icon big
align-left clickable" wicket:message="title:lbl.refresh"></span>
- <span wicket:id="trash"></span>
+ <span wicket:id="create" wicket:message="title:703">
+ <i class="fas fa-folder-plus"></i>
+ </span>
+ <span wicket:id="refresh" class="om-icon big align-left
clickable" wicket:message="title:lbl.refresh">
+ <i class="fas fa-sync-alt"></i>
+ </span>
+ <span wicket:id="trash">
+ <i class="fas fa-trash-alt"></i>
+ </span>
<div class="clear"></div>
</div>
<div wicket:id="tree-container" class="trees">
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
index 310469e..2e5a3ac 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
@@ -79,9 +79,6 @@ public abstract class FileTreePanel extends Panel {
private static final String ALIGN_LEFT_CLASS = " align-left";
private static final String ALIGN_RIGHT_CLASS = " align-right";
private static final String BASE_CLASS = " om-icon big clickable";
- private static final String UPLOAD_CLASS = "add" + BASE_CLASS +
ALIGN_LEFT_CLASS;
- private static final String CREATE_DIR_CLASS = "folder-create" +
BASE_CLASS + ALIGN_LEFT_CLASS;
- private static final String TRASH_CLASS = "trash" + BASE_CLASS +
ALIGN_RIGHT_CLASS;
private static final String DISABLED_CLASS = " disabled";
final WebMarkupContainer trees = new
WebMarkupContainer("tree-container");
private final WebMarkupContainer sizes = new
WebMarkupContainer("sizes");
@@ -281,10 +278,10 @@ public abstract class FileTreePanel extends Panel {
this.readOnly = readOnly;
tree.refreshRoots(!readOnly);
createDir.setEnabled(!readOnly);
- createDir.add(AttributeModifier.replace(ATTR_CLASS, new
StringBuilder(CREATE_DIR_CLASS).append(readOnly ? DISABLED_CLASS : "")));
+ createDir.add(AttributeModifier.replace(ATTR_CLASS,
BASE_CLASS + ALIGN_LEFT_CLASS + (readOnly ? DISABLED_CLASS : "")));
upload.setEnabled(!readOnly);
- upload.add(AttributeModifier.replace(ATTR_CLASS, new
StringBuilder(UPLOAD_CLASS).append(readOnly ? DISABLED_CLASS : "")));
- trashBorder.add(AttributeModifier.replace(ATTR_CLASS,
new StringBuilder(TRASH_CLASS).append(readOnly ? DISABLED_CLASS : "")));
+ upload.add(AttributeModifier.replace(ATTR_CLASS,
BASE_CLASS + ALIGN_LEFT_CLASS + (readOnly ? DISABLED_CLASS : "")));
+ trashBorder.add(AttributeModifier.replace(ATTR_CLASS,
BASE_CLASS + ALIGN_RIGHT_CLASS + (readOnly ? DISABLED_CLASS : "")));
if (handler != null) {
handler.add(createDir, upload, trashBorder);
update(handler);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js
index 3b1d555..d7694c7 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js
@@ -9,6 +9,6 @@ function dragHelper() {
return c.append(h);
}
function treeRevert(dropped) {
- $('.file.tree .trees')[0].scrollTop = $(this).parent()[0].offsetTop -
32;
+ $('.file-tree .trees')[0].scrollTop = $(this).parent()[0].offsetTop -
32;
return !dropped || (!!dropped.context &&
$(dropped.context).hasClass('wb', 'room'));
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$DbStep.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$DbStep.html
index 433e7f3..7a2a6e4 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$DbStep.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$DbStep.html
@@ -22,7 +22,7 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<fieldset class="ui-widget-content" id="userData">
- <legend class="ui-widget-header"><wicket:message
key="install.wizard.db.step.field.title"/></legend>
+ <legend><wicket:message
key="install.wizard.db.step.field.title"/></legend>
<div wicket:id="note"></div>
<form class="adminForm" wicket:id="form">
<div class="formelement">
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html
index 868a11e..1c70b00 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html
@@ -22,7 +22,7 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<fieldset class="ui-widget-content" id="userData">
- <legend class="ui-widget-header"><wicket:message
key="install.wizard.params.step1.userdata"/></legend>
+ <legend><wicket:message
key="install.wizard.params.step1.userdata"/></legend>
<ul class="paramList">
<li><label wicket:for="username"><wicket:message
key="install.wizard.params.step1.username"/></label>
<input wicket:id="username"
wicket:message="title:install.wizard.params.step1.username.title" type="text" />
@@ -39,7 +39,7 @@
</ul>
</fieldset>
<fieldset class="ui-widget-content" id="userGroupa">
- <legend class="ui-widget-header"><wicket:message
key="install.wizard.params.step1.groupdata"/></legend>
+ <legend><wicket:message
key="install.wizard.params.step1.groupdata"/></legend>
<ul class="paramList">
<li><label wicket:for="group"><wicket:message
key="install.wizard.params.step1.group"/></label>
<input wicket:id="group"
wicket:message="title:install.wizard.params.step1.group.title" type="text"
/></li>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html
index 6bfbe17..9e8d228 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html
@@ -22,7 +22,7 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<fieldset class="ui-widget-content" id="userConf">
- <legend class="ui-widget-header"><wicket:message
key="install.wizard.params.step2.configuration"/></legend>
+ <legend><wicket:message
key="install.wizard.params.step2.configuration"/></legend>
<ul class="paramList">
<li><label
wicket:for="allowFrontendRegister"><wicket:message
key="install.wizard.params.step2.allowFrontendRegister"/></label>
<div class="onoffswitch">
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
index e93f63e..fa29e07 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
@@ -22,7 +22,7 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<fieldset class="ui-widget-content" id="userConf1">
- <legend class="ui-widget-header"><wicket:message
key="install.wizard.params.step3.converters"/></legend>
+ <legend><wicket:message
key="install.wizard.params.step3.converters"/></legend>
<ul class="paramList">
<li><label wicket:for="docDpi"><wicket:message
key="install.wizard.params.step3.docDpi"/>
<span class="info-title"
wicket:message="title:install.wizard.params.step3.docDpi.text,alt:install.wizard.params.step3.docDpi.text"></span>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep4.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep4.html
index 2b01c88..b2f9976 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep4.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep4.html
@@ -22,7 +22,7 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<fieldset class="ui-widget-content" id="userConf2">
- <legend class="ui-widget-header"><wicket:message
key="install.wizard.params.step4.crypt"/></legend>
+ <legend><wicket:message
key="install.wizard.params.step4.crypt"/></legend>
<ul class="paramList">
<li>
<label
wicket:for="cryptClassName"><wicket:message
key="install.wizard.params.step4.cryptClassName"/>
@@ -34,7 +34,7 @@
</ul>
</fieldset>
<fieldset class="ui-widget-content" id="sip">
- <legend class="ui-widget-header"><wicket:message
key="install.wizard.params.step4.sip"/></legend>
+ <legend><wicket:message
key="install.wizard.params.step4.sip"/></legend>
<ul class="paramList">
<li>
<label wicket:for="sipEnable"><wicket:message
key="install.wizard.params.step4.sipEnable"/>
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 b09ef7d..9d0658f 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
@@ -49,8 +49,8 @@
</div>
</div>
<div class="scrollcontent" id="adminForm">
- <fieldset class="ui-widget-content">
- <legend
class="ui-widget-header"><wicket:message key="profile.invitation" /></legend>
+ <fieldset>
+ <legend><wicket:message
key="profile.invitation" /></legend>
<div class="formelement">
<label><wicket:message
key="188" /></label><span class="input" wicket:id="id"></span>
<label><wicket:message
key="526" /></label><span class="input" wicket:id="valid"></span>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
index 971a4ad..3b5e1d9 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
@@ -43,7 +43,7 @@
<div class="adminNav"
wicket:id="navigator"></div>
<table id="messagesTable"
class="list-table small full-width">
<thead>
- <tr
class="ui-widget-header">
+ <tr>
<th
class="col-1"><span wicket:id="orderById"></span><wicket:message
key="1205"/></th>
<th
class="col-6"><span wicket:id="orderByFrom"></span><wicket:message
key="1202"/></th>
<th
class="col-3"><span wicket:id="orderBySubject"></span><wicket:message
key="215"/></th>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
index 100e8e1..15e0545 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
@@ -42,8 +42,8 @@
</tr>
</table>
<div>
- <fieldset class="ui-widget-content">
- <legend
class="ui-widget-header"><wicket:message key="1166"/></legend>
+ <fieldset>
+ <legend><wicket:message
key="1166"/></legend>
<table>
<tr>
<td><wicket:message
key="1162"/></td>
@@ -57,8 +57,8 @@
</fieldset>
</div>
<div>
- <fieldset class="ui-widget-content">
- <legend
class="ui-widget-header"><wicket:message key="1167"/></legend>
+ <fieldset>
+ <legend><wicket:message
key="1167"/></legend>
<table wicket:id="address">
<tr>
<td><wicket:message
key="607" /></td>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html
index f1be7b7..67f33d7 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html
@@ -21,7 +21,7 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<div class="recording-panel">
- <div class="file tree container">
+ <div class="file tree">
<div class="tree-panel" wicket:id="tree"></div>
<div class="info" wicket:id="info"></div>
</div>
diff --git a/openmeetings-web/src/main/webapp/css/raw-general.css
b/openmeetings-web/src/main/webapp/css/raw-general.css
index cf6221b..436de78 100644
--- a/openmeetings-web/src/main/webapp/css/raw-general.css
+++ b/openmeetings-web/src/main/webapp/css/raw-general.css
@@ -200,7 +200,7 @@ html, body {
#feedcontainer {
overflow: auto;
}
-#feeds .card .card-body {
+#feeds .card .card-body, .text-pre {
white-space: pre;
}
.align-left {
@@ -224,11 +224,13 @@ html, body {
display: inline-block !important;
}
.om-icon.big {
- background-size: 32px;
- background-position: 1px 1px !important;
width: 34px;
height: 34px;
}
+.om-icon.big i {
+ font-size: 2.5em;
+ color: var(--secondary);
+}
.cross.om-icon {
background-image: url(images/cross.png);
}
@@ -415,24 +417,21 @@ select.messages.selector {
display: flex;
height: 100%;
}
-.recording-panel .file.tree.container {
+.recording-panel .file-tree {
width: 325px;
height: 100%;
}
-.recording-panel .file.tree.container .tree-panel {
+.recording-panel .file-tree .tree-panel {
height: calc(100% - var(--info-height));
}
-.recording-panel .file.tree.container .info {
+.recording-panel .file-tree .info {
height: var(--info-height);
}
-.recording-panel .file.tree.container .tree-panel form
- , .recording-panel .file.tree.container .tree-panel form .file.tree
+.recording-panel .file-tree .tree-panel form
+ , .recording-panel .file-tree .tree-panel form .file.tree
{
height: 100%;
}
-.recording-panel .file.tree.container .tree-panel form .file.tree{
- height: 100%;
-}
.recording-panel .video {
width: 100%;
display: inline-block;
@@ -557,7 +556,6 @@ select.messages.selector {
display: flex;
flex-flow: column;
width: 100%;
- max-width: 518px;
min-width: 518px;
height: calc(100% - var(--nav-height) - var(--lbl-nav-height) -
var(--buffer-size));
}
diff --git a/openmeetings-web/src/main/webapp/css/raw-room.css
b/openmeetings-web/src/main/webapp/css/raw-room.css
index 3cfcab0..9041164 100644
--- a/openmeetings-web/src/main/webapp/css/raw-room.css
+++ b/openmeetings-web/src/main/webapp/css/raw-room.css
@@ -314,12 +314,8 @@ ul.settings-menu {
.room-block.small .sidebar .tab.om-icon.big .label {
display: none;
}
-.room-block.small .sidebar .tab.om-icon.big .badge {
- margin-left: -20px;
- margin-top: 15px;
-}
-.room-block.small .sidebar .file.tree .file.item .name
- , .room-block.small .sidebar .file.tree .file.item .name span
+.room-block.small .sidebar .file-tree .file.item .name
+ , .room-block.small .sidebar .file-tree .file.item .name span
{
width: 40px;
}
@@ -329,25 +325,6 @@ ul.settings-menu {
.room-block .sidebar .tab.om-icon.big.file {
background-image: url(images/folder_explore.png);
}
-.ui-state-active .badge {
- color: #337ab7;
- background-color: #fff;
-}
-
-.badge {
- display: inline-block;
- min-width: 10px;
- padding: 3px 7px;
- font-size: 12px;
- font-weight: 700;
- line-height: 1;
- color: #fff;
- text-align: center;
- white-space: nowrap;
- vertical-align: middle;
- background-color: #777;
- border-radius: 10px;
-}
/************ VIDEO **************/
.ui-dialog.video, .ui-dialog.video .ui-dialog-titlebar, .ui-dialog.video
.ui-dialog-content {
padding: 0;
@@ -552,11 +529,6 @@ ul.settings-menu {
#quick-vote .control.con {
background-image: url(images/cancel.png);
}
-#quick-vote .control .badge {
- position: absolute;
- right: 0;
- bottom: 0;
-}
.main.room.interview #quick-vote {
z-index: 100;
right: 10px;
@@ -632,23 +604,23 @@ ul.settings-menu {
.room-block.big .sidebar .user-list .user.name {
display: block;
}
- .room-block .sidebar .file.tree .file.item .name
- , .room-block .sidebar .file.tree .file.item .name span
+ .room-block .sidebar .file-tree .file.item .name
+ , .room-block .sidebar .file-tree .file.item .name span
{
width: 40px;
}
- .room-block.big .sidebar .file.tree .file.item .name
- , .room-block.big .sidebar .file.tree .file.item .name span
+ .room-block.big .sidebar .file-tree .file.item .name
+ , .room-block.big .sidebar .file-tree .file.item .name span
{
width: 255px;
}
- .room-block .sidebar .file.tree .file.item .name span {
+ .room-block .sidebar .file-tree .file.item .name span {
padding: 0;
}
- .room-block .sidebar .file.tree .file.item {
+ .room-block .sidebar .file-tree .file.item {
width: 80px;
}
- .room-block.big .sidebar .file.tree .file.item {
+ .room-block.big .sidebar .file-tree .file.item {
width: auto;
}
}
diff --git a/openmeetings-web/src/main/webapp/css/raw-tree.css
b/openmeetings-web/src/main/webapp/css/raw-tree.css
index f2fbfc5..999b5cd 100644
--- a/openmeetings-web/src/main/webapp/css/raw-tree.css
+++ b/openmeetings-web/src/main/webapp/css/raw-tree.css
@@ -1,31 +1,29 @@
/* Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 */
-.file.tree.container {
+.file-tree {
vertical-align: top;
border: 1px solid #ccc;
border-radius: 5px;
max-width: 350px;
-}
-.file.tree {
height: 100%;
width: 100%;
display: inline-block;
}
-.file.tree .trees {
+.file-tree .trees {
height: calc(100% - var(--tree-header-height) -
var(--tree-footer-height));
overflow-x: hidden;
overflow-y: auto;
}
-.file.tree .trees #tree-anchor {
+.file-tree .trees #tree-anchor {
height: 2px;
width: 2px;
}
-.file.tree .footer {
+.file-tree .footer {
height: var(--tree-footer-height);
}
-.file.tree .footer .sizes {
+.file-tree .footer .sizes {
display: inline-block;
}
-.file.tree .footer .sizes .size {
+.file-tree .footer .sizes .size {
padding-left: 5px;
}
.trash-toolbar {
@@ -40,23 +38,23 @@
.trash-toolbar-hover {
color: inherit;
}
-.file.tree .info .details {
+.file-tree .info .details {
width: 100%;
display: table;
}
-.file.tree .info .row {
+.file-tree .info .row {
display: table-row;
}
-.file.tree .info .row .label, .file.tree .info .row .value {
+.file-tree .info .row .label, .file-tree .info .row .value {
display: table-cell;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
-.file.tree .info .row .label {
+.file-tree .info .row .label {
max-width: 50px;
}
-.file.tree .info .row .value {
+.file-tree .info .row .value {
max-width: 270px;
}
.trees .om-icon {
@@ -71,6 +69,7 @@
.trees .tree-node {
white-space: nowrap;
}
+
.refresh.om-icon {
background-image: url(images/refresh.png);
}
diff --git a/openmeetings-web/src/main/webapp/css/raw-variables.css
b/openmeetings-web/src/main/webapp/css/raw-variables.css
index 10ea9fb..bad1738 100644
--- a/openmeetings-web/src/main/webapp/css/raw-variables.css
+++ b/openmeetings-web/src/main/webapp/css/raw-variables.css
@@ -36,7 +36,7 @@ body.no-menu {
.recording-panel {
--info-height: 115px;
}
-.file.tree {
+.file-tree {
--tree-header-height: 36px;
--tree-footer-height: 40px;
}
