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 02b9e5c [OPENMEETINGS-2165] inline styles are removed, menu is
converted
02b9e5c is described below
commit 02b9e5c606d97990389365aa861fa36d68d92c8e
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Sun Feb 2 01:36:22 2020 +0700
[OPENMEETINGS-2165] inline styles are removed, menu is converted
---
.../openmeetings/web/admin/AdminActionsPanel.html | 2 +-
.../openmeetings/web/admin/backup/BackupPanel.html | 2 +-
.../web/admin/connection/ConnectionsPanel.html | 4 +-
.../openmeetings/web/admin/email/EmailPanel.html | 4 +-
.../openmeetings/web/admin/groups/GroupsPanel.html | 8 +-
.../openmeetings/web/admin/labels/LangPanel.html | 6 +-
.../openmeetings/web/admin/rooms/RoomsPanel.html | 8 +-
.../web/admin/users/PasswordDialog.html | 2 +-
.../openmeetings/web/common/ComunityUserForm.html | 6 +-
.../web/common/ConfirmableAjaxBorder.html | 2 +-
.../openmeetings/web/common/GeneralUserForm.html | 14 +--
.../openmeetings/web/common/InvitationForm.html | 4 +-
.../apache/openmeetings/web/common/MainPanel.html | 10 --
.../apache/openmeetings/web/common/MainPanel.java | 17 +--
.../apache/openmeetings/web/common/NameDialog.html | 2 +-
.../web/common/UploadableImagePanel.html | 12 +--
.../org/apache/openmeetings/web/common/main.js | 6 ++
.../openmeetings/web/common/menu/MenuPanel.html | 2 +-
.../openmeetings/web/common/menu/MenuPanel.java | 32 +-----
.../openmeetings/web/common/menu/OmMenuItem.java | 83 ++++++++++++---
.../openmeetings/web/common/menu/RoomMenuItem.java | 6 +-
.../web/common/tree/ConvertingErrorsDialog.html | 2 +-
.../web/common/tree/FileTreePanel.html | 2 +-
.../apache/openmeetings/web/pages/PrivacyPage.html | 38 +------
.../web/pages/auth/ForgetPasswordDialog.html | 10 +-
.../web/pages/auth/ForgetPasswordDialog.java | 17 +--
.../web/pages/auth/RegisterDialog.html | 36 ++++++-
.../web/pages/auth/RegisterDialog.java | 9 +-
.../web/pages/install/CongratulationsPanel.html | 12 +--
.../web/pages/install/InstallWizard$DbStep.html | 2 +-
.../pages/install/InstallWizard$InstallStep.html | 2 +-
.../web/pages/install/InstallWizardPage.html | 26 -----
.../openmeetings/web/room/EventDetailDialog.html | 2 +-
.../apache/openmeetings/web/room/RoomPanel.html | 6 +-
.../openmeetings/web/room/VideoSettings.html | 2 +-
.../web/room/activities/ActivitiesPanel.html | 2 +-
.../openmeetings/web/room/menu/ActionsSubMenu.java | 41 ++++----
.../openmeetings/web/room/menu/PollsSubMenu.java | 20 ++--
.../openmeetings/web/room/menu/RoomMenuPanel.html | 4 +-
.../openmeetings/web/room/menu/RoomMenuPanel.java | 25 +++--
.../web/room/poll/CreatePollDialog.html | 4 +-
.../web/room/poll/PollResultsDialog.html | 8 +-
.../openmeetings/web/room/poll/VoteDialog.html | 2 +-
.../web/room/sidebar/UploadDialog.html | 14 +--
.../apache/openmeetings/web/room/wb/WbPanel.html | 18 ++--
.../web/user/InviteUserMessageDialog.html | 2 +-
.../openmeetings/web/user/MessageDialog.html | 13 +--
.../apache/openmeetings/web/user/chat/Chat.html | 2 +-
.../openmeetings/web/user/chat/ChatToolbar.html | 29 ++----
.../web/user/profile/EditProfileForm.html | 8 +-
.../web/user/profile/MessagesContactsPanel.html | 22 ++--
.../web/user/profile/UserProfilePanel.html | 2 +-
.../web/user/profile/UserSearchPanel.html | 8 +-
.../openmeetings/web/user/rooms/RoomsPanel.html | 16 +--
openmeetings-web/src/main/webapp/css/raw-chat.css | 33 ++++++
.../src/main/webapp/css/raw-general.css | 115 ++++++++++++++-------
openmeetings-web/src/main/webapp/css/raw-tree.css | 4 +
57 files changed, 433 insertions(+), 357 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminActionsPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminActionsPanel.html
index 7220304..d1633a2 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminActionsPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminActionsPanel.html
@@ -31,6 +31,6 @@
<span class="ui-button-icon ui-icon
ui-icon-circle-check"></span>
</div>
<span wicket:id="newRecord"></span>
- <form wicket:id="form" style="display: inline;"></form>
+ <form wicket:id="form" class="d-inline"></form>
</wicket:extend>
</html>
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 161264b..0a65c97 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
@@ -39,7 +39,7 @@
<!-- Perform Download -->
<div wicket:id="download"
class="btn"><wicket:message key="1066"/></div>
<!-- Perform Upload -->
- <div class="fileinput fileinput-new"
data-provides="fileinput" style="margin: 0; display: inline-block;">
+ <div class="fileinput fileinput-new d-inline
m-0" data-provides="fileinput">
<span class="btn btn-file ui-button
ui-widget ui-state-default ui-corner-all ui-button-text-only"><span
class="ui-button-text"><wicket:message key="1536"/></span><input
class="uploadFileField" wicket:id="fileInput" type="file"/></span>
</div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
index ce8a837..5a4d23a 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
@@ -30,7 +30,7 @@
<th class="col-2"><wicket:message
key="108" /></th>
<th class="col-2"><wicket:message
key="601" /></th>
<th class="col-2"><wicket:message
key="602" /></th>
- <th class="col-2" style="padding: 0
16px;"><wicket:message key="603" /></th>
+ <th class="col-2 pl-3
pr-3"><wicket:message key="603" /></th>
<th class="col-2"><wicket:message
key="1500" /></th>
</tr>
</thead>
@@ -48,7 +48,7 @@
</div>
<div class="adminPanelColumnForm" id="adminForm">
<div class="scrollcontent">
- <table wicket:id="details" style="width: 100%;">
+ <table wicket:id="details" class="w-100">
<tr wicket:id="line"><td
wicket:id="name"></td><td wicket:id="value"></td></tr>
</table>
<div class="bottom-bumper"></div>
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 6bd08a7..8de6099 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
@@ -58,9 +58,9 @@
<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 style="white-space: pre;"
class="input" wicket:id="lastError"></span>
+ <label><wicket:message
key="admin.email.lastError" /></label><span class="input"
wicket:id="lastError"></span>
</div>
- <button wicket:id="reset" style="float:
right; margin-right: 20px;"><wicket:message
key="admin.email.reset.status"/></button>
+ <button wicket:id="reset"
class="align-right mr-3"><wicket:message
key="admin.email.reset.status"/></button>
</fieldset>
<div class="bottom-bumper"></div>
</div>
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 9477fd2..7e9397e 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
@@ -54,7 +54,7 @@
<label
wicket:for="tag"><wicket:message key="admin.group.form.tag" /></label><input
type="text" wicket:id="tag" />
</div>
<div class="formelement">
- <label wicket:for="user2add"
style="font-weight: bold;"><wicket:message key="178" /></label><div
class="om-select2"><select wicket:id="user2add" class="input"></select></div>
+ <label
wicket:for="user2add"><strong><wicket:message key="178" /></strong></label><div
class="om-select2"><select wicket:id="user2add" class="input"></select></div>
</div>
<div class="formelement">
<div wicket:id="users"></div>
@@ -65,13 +65,13 @@
<div class="formelement">
<label
wicket:for="limited"><wicket:message key="admin.group.form.limited"
/></label><input type="checkbox" wicket:id="limited" />
</div>
- <div class="formelement"
style="display:none">
+ <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"/>
</div>
- <div class="formelement"
style="display:none">
+ <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"/>
</div>
- <div class="formelement"
style="display:none">
+ <div class="formelement d-none">
<label
wicket:for="maxRooms"><wicket:message key="admin.group.form.maxRooms"
/></label><input type="number" wicket:id="maxRooms" />
</div>
<div class="formelement">
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 c1f2b99..3e0ef41 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
@@ -35,10 +35,10 @@
<div wicket:id="feedback"></div>
<div class="adminPanelColumnTable label">
<div class="lblNav">
- <div class="ui-button ui-widget ui-corner-all
ui-button-icon-only" style="margin-top: -1.5em;" wicket:id="addLangBtn"
wicket:message="title:362">
+ <div class="ui-button ui-widget ui-corner-all
ui-button-icon-only mt-n2" wicket:id="addLangBtn" wicket:message="title:362">
<span class="ui-button-icon ui-icon
ui-icon-plusthick"></span>
</div>
- <div class="ui-button ui-widget ui-corner-all
ui-button-icon-only ui-state-error" style="margin-top: -1.5em;"
wicket:id="deleteLangBtn" wicket:message="title:363">
+ <div class="ui-button ui-widget ui-corner-all
ui-button-icon-only ui-state-error mt-n2" wicket:id="deleteLangBtn"
wicket:message="title:363">
<span class="ui-button-icon ui-icon
ui-icon-closethick"></span>
</div>
<form wicket:id="langForm" class="addLanguagePanel">
@@ -51,7 +51,7 @@
<span
wicket:id="export" class="btn"><wicket:message key="360"/></span>
</td>
<td>
- <div class="fileupload
fileupload-new" data-provides="fileupload" style="margin: 0;">
+ <div class="fileupload
fileupload-new m-0" data-provides="fileupload">
<span
class="btn btn-file ui-button ui-widget ui-state-default ui-corner-all
ui-button-text-only"><span class="ui-button-text"><wicket:message
key="387"/></span><input type="file" accept="text/xml"
wicket:id="fileInput"/></span>
</div>
<span
wicket:id="progress">[progressbar]</span>
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 65bc1e4..e66bb78 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
@@ -58,7 +58,7 @@
<label
wicket:for="type"><wicket:message key="45" /></label><select wicket:id="type"/>
</div>
<div class="formelement">
- <label
wicket:for="comment"><wicket:message key="196" /></label><textarea
style="width: 200px; height: 100px;" wicket:id="comment"/>
+ <label
wicket:for="comment"><wicket:message key="196" /></label><textarea
wicket:id="comment"/>
</div>
<div class="formelement">
<label
wicket:for="appointment"><wicket:message key="620" /></label><input
type="checkbox" class="formcheckbox" wicket:id="appointment" />
@@ -158,7 +158,7 @@
</thead>
<tbody
wicket:id="filesContainer">
<tr wicket:id="files">
- <td
class="col-9"><div class="col-wrapper" style="width: auto"><span
wicket:id="name"></span></div></td>
+ <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">
@@ -213,7 +213,7 @@
<table class="list-table small">
<thead>
<tr
class="ui-widget-header">
- <th
class="col-1" style="overflow: hidden;"
wicket:message="title:817"><wicket:message key="817" /></th>
+ <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>
<th
class="col-5"><wicket:message key="510" /></th>
@@ -225,7 +225,7 @@
<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-5"><div class="col-wrapper" style="overflow: hidden;"><span
wicket:id="email"></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>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.html
index 42b6054..0d3f592 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.html
@@ -22,7 +22,7 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<form wicket:id="form">
- <label style="padding: 0 20px;"
wicket:for="password"><wicket:message key="current.password"/></label><input
type="password" wicket:id="password"/>
+ <label class="pl-4 pr-4" wicket:for="password"><wicket:message
key="current.password"/></label><input type="password" wicket:id="password"/>
<div wicket:id="feedback"></div>
</form>
</wicket:panel>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.html
index fbc95b3..e5b4bce 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.html
@@ -24,15 +24,15 @@
<div class="formelementradiobox">
<div wicket:id="community_settings">
<div>
- <input wicket:id="everybody" type="radio"
/><label style="width: 250px" wicket:for="everybody"><wicket:message
key="1160"/></label>
+ <input wicket:id="everybody" type="radio"
/><label wicket:for="everybody"><wicket:message key="1160"/></label>
<div class="clear"></div>
</div>
<div>
- <input wicket:id="contact" type="radio"
/><label style="width: 250px" wicket:for="contact"><wicket:message
key="1168"/></label>
+ <input wicket:id="contact" type="radio"
/><label wicket:for="contact"><wicket:message key="1168"/></label>
<div class="clear"></div>
</div>
<div>
- <input wicket:id="nobody" type="radio" /><label
style="width: 250px" wicket:for="nobody"><wicket:message key="1169"/></label>
+ <input wicket:id="nobody" type="radio" /><label
wicket:for="nobody"><wicket:message key="1169"/></label>
<div class="clear"></div>
</div>
</div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.html
index cd272e4..2526366 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.html
@@ -22,6 +22,6 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:border>
<wicket:body/>
- <form wicket:id="form" style="display: inline;"><div
wicket:id="dialog"></div></form>
+ <form wicket:id="form" class="d-inline"><div
wicket:id="dialog"></div></form>
</wicket:border>
</html>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
index 248f6b2..3c2c7ce 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
@@ -26,8 +26,8 @@
</div>
<div class="formelement">
<label wicket:for="firstname"><wicket:message key="135"
/></label><select
- wicket:id="salutation" style="width: 60px;" /><input
type="text"
- wicket:id="firstname" style="width: 216px;" />
+ wicket:id="salutation"/><input type="text"
+ wicket:id="firstname"/>
</div>
<div class="formelement">
<label wicket:for="lastname"><wicket:message key="136"
/></label><input type="text" wicket:id="lastname" />
@@ -45,17 +45,17 @@
<label wicket:for="address.phone"><wicket:message key="607"
/></label><input type="text" wicket:id="address.phone" />
</div>
<div class="formelement">
- <label wicket:for="age"><wicket:message key="138"
/></label><input type="text" class="date time picker" wicket:id="age"
style="width: 258px;" />
+ <label wicket:for="age"><wicket:message key="138"
/></label><input type="text" class="date time picker" wicket:id="age"/>
</div>
<div class="formelement">
<label wicket:for="address.street"><wicket:message key="139"
/></label><input type="text"
- wicket:id="address.street" style="width: 244px;" />
<input
- type="text" wicket:id="address.additionalname"
style="width: 30px;" />
+ wicket:id="address.street"/> <input
+ type="text" wicket:id="address.additionalname"/>
</div>
<div class="formelement">
<label wicket:for="address.town"><wicket:message key="140"
/></label><input type="text"
- wicket:id="address.zip" style="width: 60px;" /> <input
type="text"
- wicket:id="address.town" style="width: 214px;" />
+ wicket:id="address.zip"/> <input type="text"
+ wicket:id="address.town"/>
</div>
<div class="formelement">
<label wicket:for="address.country"><wicket:message key="141"
/></label><select wicket:id="address.country" />
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.html
index 173c696..d06505f 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.html
@@ -29,7 +29,7 @@
<wicket:child/>
<div>
<div class="column label"><label
wicket:for="message"><wicket:message key="217" /></label></div>
- <div class="column data"><textarea wicket:id="message"
style="width: 280px; height: 70px;"></textarea></div>
+ <div class="column data"><textarea wicket:id="message"
class="message"></textarea></div>
</div>
<div>
<input wicket:id="passwordProtected"
type="checkbox"/> <label
@@ -66,7 +66,7 @@
<div class="column data"><select
wicket:id="language"/></div>
</div>
<div>
- <input wicket:id="url" type="text" readonly="readonly"
style="width: 100%;"/>
+ <input wicket:id="url" type="text" readonly="readonly"
class="w-100"/>
</div>
</div>
<span wicket:id="feedback"></span>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
index a2af2bf..4e27465 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
@@ -19,16 +19,6 @@
-->
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org";>
-<wicket:head>
- <script type="text/javascript">
- function showBusyIndicator() {
- $('#busy-indicator').show();
- }
- function hideBusyIndicator() {
- $('#busy-indicator').hide();
- }
- </script>
-</wicket:head>
<wicket:panel>
<div wicket:id="topControls">
<div wicket:id="topLinks"><span
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
index ff56285..df72525 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
@@ -90,7 +90,8 @@ import org.wicketstuff.urlfragment.UrlFragment;
import com.github.openjson.JSONObject;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
-import com.googlecode.wicket.jquery.ui.widget.menu.IMenuItem;
+
+import
de.agilecoders.wicket.core.markup.html.bootstrap.navbar.INavbarComponent;
public class MainPanel extends Panel {
private static final long serialVersionUID = 1L;
@@ -306,7 +307,7 @@ public class MainPanel extends Panel {
super.onInitialize();
}
- private IMenuItem getSubItem(String lbl, String title, MenuActions
action, MenuParams param) {
+ private OmMenuItem getSubItem(String lbl, String title, MenuActions
action, MenuParams param) {
return new MainMenuItem(lbl, title, action, param) {
private static final long serialVersionUID = 1L;
@@ -317,18 +318,18 @@ public class MainPanel extends Panel {
};
}
- private List<IMenuItem> getMainMenu() {
- List<IMenuItem> mmenu = new ArrayList<>();
+ private List<INavbarComponent> getMainMenu() {
+ List<INavbarComponent> mmenu = new ArrayList<>();
{
// Dashboard Menu Points
- List<IMenuItem> l = new ArrayList<>();
+ List<INavbarComponent> l = new ArrayList<>();
l.add(getSubItem("290", "1450",
MenuActions.dashboardModuleStartScreen, null));
l.add(getSubItem("291", "1451",
MenuActions.dashboardModuleCalendar, null));
mmenu.add(new OmMenuItem(getString("124"), l));
}
{
// Conference Menu Points
- List<IMenuItem> l = new ArrayList<>();
+ List<INavbarComponent> l = new ArrayList<>();
l.add(getSubItem("777", "1506",
MenuActions.conferenceModuleRoomList, MenuParams.publicTabButton));
l.add(getSubItem("779", "1507",
MenuActions.conferenceModuleRoomList, MenuParams.privateTabButton));
if (cfgDao.getBool(CONFIG_MYROOMS_ENABLED, true)) {
@@ -353,7 +354,7 @@ public class MainPanel extends Panel {
}
{
// Recording Menu Points
- List<IMenuItem> l = new ArrayList<>();
+ List<INavbarComponent> l = new ArrayList<>();
l.add(getSubItem("395", "1452",
MenuActions.recordModule, null));
mmenu.add(new OmMenuItem(getString("395"), l));
}
@@ -361,7 +362,7 @@ public class MainPanel extends Panel {
boolean isAdmin = hasAdminLevel(r);
if (isAdmin || hasGroupAdminLevel(r)) {
// Administration Menu Points
- List<IMenuItem> l = new ArrayList<>();
+ List<INavbarComponent> l = new ArrayList<>();
l.add(getSubItem("125", "1454",
MenuActions.adminModuleUser, null));
if (isAdmin) {
l.add(getSubItem("597", "1455",
MenuActions.adminModuleConnections, null));
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.html
index fb8ec81..94f4a88 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.html
@@ -22,7 +22,7 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<form wicket:id="form">
- <label style="padding: 0 20px;"
wicket:id="label"></label><input type="text" wicket:id="title"/>
+ <label class="pl-4 pr-4" wicket:id="label"></label><input
type="text" wicket:id="title"/>
<div wicket:id="feedback"></div>
<input type="submit" wicket:id="submit"
class="invisible-form-component"/>
</form>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.html
index 3a06a71..5e9a3bf 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.html
@@ -21,13 +21,13 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:extend>
- <span class="ui-button-icon ui-icon ui-corner-all ui-icon-closethick
remove clickable"
- wicket:id="remove"></span>
- <form wicket:id="form"><div
- class="fileinput fileinput-new" data-provides="fileinput"
style="margin: 0;"><div
+ <button type="button" class="btn btn-xs btn-secondary remove"
wicket:id="remove">
+ <span aria-hidden="true">×</span>
+ </button>
+ <form wicket:id="form" class="img-upload"><div
+ class="fileinput fileinput-new m-0"
data-provides="fileinput"><div
class="fileinput-preview" data-trigger="fileinput"><img
wicket:id="img"/></div><div><span
- class="btn btn-file ui-button ui-widget ui-state-default
ui-corner-all ui-button-text-only"
- style="width: 120px;"><span
class="ui-button-text"><wicket:message key="379"/></span><input
+ class="btn btn-file btn btn-xs btn-primary"><wicket:message
key="379"/><input
type="file" accept="image/*"
wicket:id="image"/></span></div></div><span
wicket:id="progress">[progressbar]</span></form>
</wicket:extend>
</html>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js
index efb0f00..3f008cd 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js
@@ -121,6 +121,12 @@ Wicket.BrowserInfo.collectExtraInfo = function(info) {
info.codebase = l.origin + l.pathname;
info.settings = Settings.load();
};
+function showBusyIndicator() {
+ $('#busy-indicator').show();
+}
+function hideBusyIndicator() {
+ $('#busy-indicator').hide();
+}
(function() {
// https://github.com/inexorabletash/polyfill/blob/master/LICENSE.md
// Licensed MIT
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html
index 7e3d78f..dd0bd9c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html
@@ -21,6 +21,6 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
- <div wicket:id="menu" class="ui-widget-header"></div>
+ <div wicket:id="menu"></div>
</wicket:panel>
</html>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
index 0dd9374..72b2dd1 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
@@ -18,20 +18,13 @@
*/
package org.apache.openmeetings.web.common.menu;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_TITLE;
-
import java.util.List;
-import org.apache.wicket.AttributeModifier;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.util.string.Strings;
-import com.googlecode.wicket.jquery.core.Options;
-import com.googlecode.wicket.jquery.ui.widget.menu.IMenuItem;
-import com.googlecode.wicket.jquery.ui.widget.menu.Menu;
+import
de.agilecoders.wicket.core.markup.html.bootstrap.navbar.INavbarComponent;
+import de.agilecoders.wicket.core.markup.html.bootstrap.navbar.Navbar;
/**
* Loads the menu items into the main area
@@ -42,28 +35,11 @@ import com.googlecode.wicket.jquery.ui.widget.menu.Menu;
public class MenuPanel extends Panel {
private static final long serialVersionUID = 1L;
- public MenuPanel(String id, List<IMenuItem> menus) {
+ public MenuPanel(String id, List<INavbarComponent> menus) {
super(id);
setOutputMarkupPlaceholderTag(true);
setMarkupId(id);
- add(new Menu("menu", menus, new Options().set("icons", "{
submenu: 'ui-icon-triangle-1-s' }")
- .set("position", "{ my: 'left top', at:
'left bottom'}"))
- {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void addMenuItem(ListItem<IMenuItem> item,
IMenuItem menuItem) {
- super.addMenuItem(item, menuItem);
- OmMenuItem m = (OmMenuItem)menuItem;
- item.add(AttributeModifier.append(ATTR_CLASS,
m.isTop() ? "top" : "sub"));
- if (!Strings.isEmpty(m.getDesc())) {
-
item.add(AttributeModifier.append(ATTR_TITLE, m.getDesc()));
- }
- if (!Strings.isEmpty(m.getIcon())) {
-
item.add(AttributeModifier.append(ATTR_CLASS, m.getIcon()));
- }
- }
- });
+ add(new Navbar("menu").addComponents(menus));
}
public void update(IPartialPageRequestHandler target) {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/OmMenuItem.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/OmMenuItem.java
index d415bbc..fdd08e7 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/OmMenuItem.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/OmMenuItem.java
@@ -18,26 +18,48 @@
*/
package org.apache.openmeetings.web.common.menu;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_TITLE;
+
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.link.AbstractLink;
+import org.apache.wicket.model.Model;
-import com.googlecode.wicket.jquery.ui.widget.menu.IMenuItem;
-import com.googlecode.wicket.jquery.ui.widget.menu.MenuItem;
+import de.agilecoders.wicket.core.markup.html.bootstrap.image.IconType;
+import
de.agilecoders.wicket.core.markup.html.bootstrap.navbar.INavbarComponent;
+import
de.agilecoders.wicket.core.markup.html.bootstrap.navbar.Navbar.ComponentPosition;
+import de.agilecoders.wicket.core.markup.html.bootstrap.navbar.NavbarAjaxLink;
+import
de.agilecoders.wicket.core.markup.html.bootstrap.navbar.NavbarDropDownButton;
-public class OmMenuItem extends MenuItem {
+public class OmMenuItem implements INavbarComponent {
private static final long serialVersionUID = 1L;
+
+ private String title;
private String desc;
- private boolean top;
+ private IconType icon;
+ private List<INavbarComponent> items = new ArrayList<>(0);
+ private boolean visible = true;
- public OmMenuItem(String title, List<IMenuItem> items) {
- super(title, items);
- setTop(true);
+ public OmMenuItem(String title, List<INavbarComponent> items) {
+ this.title = title;
+ this.items = items;
}
public OmMenuItem(String title, String desc) {
- super(title);
+ this.title = title;
this.desc = desc;
}
+ public OmMenuItem add(INavbarComponent item) {
+ items.add(item);
+ return this;
+ }
+
public String getDesc() {
return desc;
}
@@ -46,12 +68,47 @@ public class OmMenuItem extends MenuItem {
this.desc = desc;
}
- public boolean isTop() {
- return top;
+ public void setIcon(IconType icon) {
+ this.icon = icon;
}
- public OmMenuItem setTop(boolean top) {
- this.top = top;
- return this;
+ public void setVisible(boolean visible) {
+ this.visible = visible;
+ }
+
+ @Override
+ public AbstractLink create(String markupId) {
+ AbstractLink item;
+ if (items.isEmpty()) {
+ item = new NavbarAjaxLink<String>(markupId,
Model.of(title)) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ OmMenuItem.this.onClick(target);
+ }
+ }.setIconType(icon);
+ item.add(AttributeModifier.append(ATTR_CLASS,
"nav-link"));
+ } else {
+ item = new NavbarDropDownButton(Model.of(title),
Model.of(icon)) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected List<AbstractLink>
newSubMenuButtons(String markupId) {
+ return items.stream().map(mItem ->
((OmMenuItem)mItem).create(markupId)).collect(Collectors.toList());
+ }
+ };
+ }
+ item.add(AttributeModifier.append(ATTR_TITLE, desc));
+ item.setVisible(visible);
+ return item;
+ }
+
+ @Override
+ public ComponentPosition getPosition() {
+ return ComponentPosition.LEFT; //FIXME TODO
+ }
+
+ public void onClick(AjaxRequestTarget target) {
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java
index ad8549c..3ecb400 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.web.common.menu;
+import de.agilecoders.wicket.core.markup.html.bootstrap.image.IconType;
+
public class RoomMenuItem extends OmMenuItem {
private static final long serialVersionUID = 1L;
@@ -25,13 +27,13 @@ public class RoomMenuItem extends OmMenuItem {
super(name, desc);
}
- public RoomMenuItem(String name, String desc, String icon) {
+ public RoomMenuItem(String name, String desc, IconType icon) {
super(name, desc);
setIcon(icon);
}
public RoomMenuItem(String name, String desc, boolean enabled) {
super(name, desc);
- setEnabled(enabled);
+ setVisible(enabled);
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.html
index aef0806..e44024b 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.html
@@ -23,7 +23,7 @@
<wicket:panel>
<div wicket:id="container" class="dialog errors">
<h3 wicket:id="message"></h3>
- <table style="width: 100%">
+ <table class="w-100">
<tr>
<th><wicket:message key="1593"/></th>
<th><wicket:message key="1594"/></th>
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 473a657..fa0fe84 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
@@ -31,7 +31,7 @@
<div class="clear"></div>
</div>
<div wicket:id="tree-container" class="trees">
- <div id="tree-anchor" style="height: 2px; width:
2px;"></div>
+ <div id="tree-anchor"></div>
<div wicket:id="tree"></div>
</div>
<div class="footer">
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/PrivacyPage.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/PrivacyPage.html
index e401571..33a419c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/PrivacyPage.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/PrivacyPage.html
@@ -24,45 +24,9 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
<link rel="shortcut icon" href="public/favicon.ico"
type="image/x-icon"/>
<title>OpenMeetings Privacy Statement</title>
- <style>
- h2 {
- font-size: 30px;
- font-weight: 300;
- margin: 10px 0;
- color: #333;
- }
- h3 {
- color: #325d72;
- font-weight: 700;
- font-size: 24px;
- margin: 1.5em 0 1em;
- border-bottom: 1px solid #ddd;
- }
- h4 {
- color: #333;
- font-weight: 700;
- font-size: 1.2em;
- margin: 1em 0;
- }
- h5 {
- color: #325D72;
- font-weight: 700;
- font-size: 1em;
- margin: 1em 0;
- }
- p {
- margin: 1em 0;
- }
- .main {
- max-width: 800px;
- padding: 20px;
- border: 1px solid #cccccc;
- border-radius: 10px;
- }
- </style>
</head>
<body>
- <div class="main">
+ <div class="main privacy">
<h2>OpenMeetings Privacy Statement</h2>
<p>Effective date: May 25, 2018</p>
<p>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html
index a9d11d2..6ea923c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html
@@ -36,9 +36,13 @@
</div>
</div>
</div>
- <div class="row form-group no-gutters">
- <div class="col-6"><label wicket:for="name"><span
wicket:id="label"></span></label></div>
- <div class="col-5"><input wicket:id="name" type="text"
value=""/></div>
+ <div class="form-group no-gutters">
+ <div class="input-group">
+ <div class="input-group-prepend">
+ <span class="input-group-text"><i
wicket:id="label" class="fa fa-lock"></i></span>
+ </div>
+ <input wicket:id="name" class="form-control"
type="text" value=""/>
+ </div>
</div>
<div class="row form-group no-gutters">
<div class="col-12 centered" wicket:id="captcha"></div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
index f5d1570..1814d4b 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
@@ -31,16 +31,18 @@ import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.service.mail.template.ResetPasswordTemplate;
import org.apache.openmeetings.web.common.Captcha;
import org.apache.openmeetings.web.pages.ResetPage;
+import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import
org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator;
-import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.Radio;
import org.apache.wicket.markup.html.form.RadioGroup;
import org.apache.wicket.markup.html.form.RequiredTextField;
+import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.request.cycle.RequestCycle;
@@ -66,7 +68,7 @@ public class ForgetPasswordDialog extends Modal<String> {
private final IValidator<String> emailValidator =
RfcCompliantEmailAddressValidator.getInstance();
private final RequiredTextField<String> name = new
RequiredTextField<>("name", Model.of((String)null));
private final RadioGroup<Type> rg = new RadioGroup<>("type",
Model.of(Type.email));
- private final Label label = new Label("label", Model.of(""));
+ private final WebMarkupContainer label = new
WebMarkupContainer("label");
private final Captcha captcha = new Captcha("captcha");
private ForgetPasswordForm form = new ForgetPasswordForm("form");
private SignInDialog s;
@@ -111,9 +113,12 @@ public class ForgetPasswordDialog extends Modal<String> {
}
private void updateLabel(IPartialPageRequestHandler handler) {
- String lbl = getString(rg.getModelObject() == Type.email ?
"315" : "316");
- name.setLabel(Model.of(lbl));
- label.setDefaultModelObject(lbl);
+ IModel<String> lbl = new ResourceModel(rg.getModelObject() ==
Type.email ? "315" : "316");
+ name.setLabel(lbl);
+ name.add(AttributeModifier.replace("type", rg.getModelObject()
== Type.email ? "email" : "text"));
+ name.add(AttributeModifier.replace("title", lbl));
+ name.add(AttributeModifier.replace("placeholder", lbl));
+ label.add(AttributeModifier.replace("class",
rg.getModelObject() == Type.email ? "fa fa-at" : "fa fa-user"));
if (handler != null) {
handler.add(name, label);
}
@@ -202,7 +207,7 @@ public class ForgetPasswordDialog extends Modal<String> {
protected void onInitialize() {
super.onInitialize();
add(feedback.setOutputMarkupId(true));
-
add(label.setDefaultModelObject(getString("315")).setOutputMarkupId(true));
+ add(label.setOutputMarkupId(true));
add(name.setOutputMarkupId(true));
add(captcha);
add(rg.add(new Radio<>("email", Model.of(Type.email)))
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
index ee087a1..ffd3435 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
@@ -27,12 +27,40 @@
<div class="col-6"><input wicket:id="lastName"
type="text" wicket:message="placeholder:136" value=""/></div>
</div>
<div class="row form-group no-gutters">
- <div class="col-6"><input wicket:id="login" type="text"
wicket:message="placeholder:114" value=""/></div>
- <div class="col-6"><input wicket:id="email" type="text"
wicket:message="placeholder:119" value=""/></div>
+ <div class="col-6">
+ <div class="input-group">
+ <div class="input-group-prepend">
+ <span
class="input-group-text"><i class="fa fa-user"></i></span>
+ </div>
+ <input wicket:id="login" type="text"
wicket:message="placeholder:114" value=""/>
+ </div>
+ </div>
+ <div class="col-6">
+ <div class="input-group">
+ <div class="input-group-prepend">
+ <span
class="input-group-text"><i class="fa fa-at"></i></span>
+ </div>
+ <input wicket:id="email" type="email"
wicket:message="placeholder:119" value=""/>
+ </div>
+ </div>
</div>
<div class="row form-group no-gutters">
- <div class="col-6"><input wicket:id="password"
type="password" wicket:message="placeholder:110" value=""/></div>
- <div class="col-6"><input wicket:id="confirmPassword"
type="password" wicket:message="placeholder:116" value=""/></div>
+ <div class="col-6">
+ <div class="input-group">
+ <div class="input-group-prepend">
+ <span
class="input-group-text"><i class="fa fa-lock"></i></span>
+ </div>
+ <input wicket:id="password"
type="password" wicket:message="placeholder:110" value=""/>
+ </div>
+ </div>
+ <div class="col-6">
+ <div class="input-group">
+ <div class="input-group-prepend">
+ <span
class="input-group-text"><i class="fa fa-lock"></i></span>
+ </div>
+ <input wicket:id="confirmPassword"
type="password" wicket:message="placeholder:116" value=""/>
+ </div>
+ </div>
</div>
<div class="row form-group no-gutters">
<div class="col-12 centered" wicket:id="captcha"></div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
index 95a986b..4f267d0 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
@@ -182,7 +182,14 @@ public class RegisterDialog extends Modal<String> {
add(loginField = new RequiredTextField<>("login", new
PropertyModel<String>(RegisterDialog.this, "login")));
add(passwordField = new PasswordTextField("password",
new PropertyModel<String>(RegisterDialog.this, "password")));
add(confirmPassword = new
PasswordTextField("confirmPassword", new
Model<String>()).setResetPassword(true));
- add(emailField = new RequiredTextField<>("email", new
PropertyModel<String>(RegisterDialog.this, "email")));
+ add(emailField = new RequiredTextField<>("email", new
PropertyModel<String>(RegisterDialog.this, "email")) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected String[] getInputTypes() {
+ return new String[] {"email"};
+ }
+ });
add(captcha = new Captcha("captcha"));
firstNameField.setLabel(new ResourceModel("117"));
lastNameField.setLabel(new ResourceModel("136"));
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/CongratulationsPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/CongratulationsPanel.html
index fd44951..5adab57 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/CongratulationsPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/CongratulationsPanel.html
@@ -22,22 +22,22 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<h2>
- <a wicket:id="url" style="color: blue;"><wicket:message
key="install.wizard.congrats.enter"/></a>
+ <a wicket:id="url"><wicket:message
key="install.wizard.congrats.enter"/></a>
</h2>
- <div wicket:id="restartPanel" style="font-size: x-large; padding: 20px;
color: red;"><wicket:message key="install.wizard.congrats.restart"/></div>
+ <div wicket:id="restartPanel"><wicket:message
key="install.wizard.congrats.restart"/></div>
<br />
<br />
- <strong> <span style="font-size: 1.4em"><wicket:message
key="install.wizard.congrats.mail"/></span></strong>
+ <strong> <span><wicket:message
key="install.wizard.congrats.mail"/></span></strong>
<br />
<br />
- <span style="font-size: 1.3em"><a
href="https://openmeetings.apache.org/mailing-lists.html";
+ <span><a href="https://openmeetings.apache.org/mailing-lists.html";
target="_blank" rel="noopener
noreferrer">https://openmeetings.apache.org/mailing-lists.html</a></span>
<br />
<br />
- <strong> <span style="font-size: 1.4em"><wicket:message
key="install.wizard.congrats.commercial"/></span></strong>
+ <strong> <span><wicket:message
key="install.wizard.congrats.commercial"/></span></strong>
<br />
<br />
- <span style="font-size: 1.3em"><a rel="noopener noreferrer"
+ <span><a rel="noopener noreferrer"
href="https://openmeetings.apache.org/commercial-support.html";
target="_blank">https://openmeetings.apache.org/commercial-support.html</a></span>
<br />
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 cba60bb..433e7f3 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
@@ -43,7 +43,7 @@
<div wicket:enclosure="password" class="formelement">
<label wicket:for="password"><wicket:message
key="install.wizard.db.step.pass" /></label> <input type="text"
wicket:id="password"/>
</div>
- <div class="formelement" style="max-width:860px;">
+ <div class="formelement">
<button class="align-right"
wicket:id="check"><wicket:message key="install.wizard.db.step.check"/></button>
</div>
</form>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$InstallStep.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$InstallStep.html
index ac983ac..a986b75 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$InstallStep.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$InstallStep.html
@@ -22,7 +22,7 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<p wicket:id="desc"></p>
- <div wicket:id="container" style="margin: 20px;">
+ <div wicket:id="container" class="m-3">
<div wicket:id="progress"><!-- div><span
wicket:id="value"></span>%</div--></div>
<div wicket:id="status"></div>
</div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.html
index c29c9ee..da2f711 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.html
@@ -20,32 +20,6 @@
-->
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org";>
-<wicket:head>
- <style type="text/css">
- .abstractWizard .adminForm div.formelement {
- max-width: 600px;
- }
- .abstractWizard .adminForm label {
- width: 240px;
- }
- .abstractWizard ul.paramList {
- list-style-type: none;
- }
- .abstractWizard ul.paramList li {
- padding-top: 5px;
- }
- .abstractWizard ul.paramList label {
- width: 350px;
- display: inline-block;
- }
- .abstractWizard input, .abstractWizard select {
- width: 280px;
- }
- .abstractWizard input[type=checkbox], .abstractWizard
input[type=radio] {
- width: auto;
- }
- </style>
-</wicket:head>
<wicket:extend>
<div>
<div wicket:id="wizard"></div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.html
index 1d00240..31c0ad4 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.html
@@ -21,7 +21,7 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
- <table style="width: 100%">
+ <table class="w-100">
<tr>
<td><wicket:message key="165"/></td>
<td wicket:id="title"></td>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
index d174c87..f4c6a72 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
@@ -71,14 +71,14 @@
</ul>
</div>
<div id="muteothers-confirm"
wicket:message="title:ulist.right.muteothers.grant, data-btn-ok:54,
data-btn-cancel:lbl.cancel">
- <div style="padding: 4px;" class="ui-state-highlight
ui-corner-all">
- <span class="ui-icon ui-icon-alert"
style="float:left; margin:12px 12px 20px 0;"></span><wicket:message
key="ulist.user.muteothers.confirm"/>
+ <div class="ui-state-highlight ui-corner-all p-1">
+ <span class="ui-icon ui-icon-alert align-left
mr-2 mt-2 mb-3 ml-0"></span><wicket:message
key="ulist.user.muteothers.confirm"/>
</div>
<br/>
<input id="muteothers-confirm-dont-show"
type="checkbox"/><label for="muteothers-confirm-dont-show"><wicket:message
key="64"/></label>
</div>
<div id="clipboard-dialog"
wicket:message="title:1121,data-btn-ok:54">
- <p><span class="ui-icon ui-icon-alert"
style="float:left; margin:12px 12px 20px 0;"></span><span
class="text"></span></p>
+ <p><span class="ui-icon ui-icon-alert align-left mr-2
mt-2 mb-3 ml-0"></span><span class="text"></span></p>
</div>
<div id="quick-vote-template">
<div class="close clickable"><wicket:message
key="85"/></div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
index 7d193a4..6b4258d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
@@ -80,7 +80,7 @@
</div>
</div>
<div>
- <span style="padding: 5px;">
+ <span class="p-2">
<span class="ui-icon ui-icon-info"></span>
</span>
<wicket:message key="765"/>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html
index af00faa..4ec7eac 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html
@@ -35,7 +35,7 @@
<div class="actions"></div>
<div class="activities"></div>
</div>
- <div style="display: none">
+ <div class="d-none">
<div id="activity-stub" class="activity item ui-helper-clearfix
ui-corner-all">
<span class="activity-close ui-icon ui-icon-close
ui-corner-all clickable" wicket:message="title:85"></span>
<span class="activity-accept ui-icon ui-icon-check
ui-corner-all clickable" wicket:message="title:1360"></span>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/ActionsSubMenu.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/ActionsSubMenu.java
index f54f119..c5d4fd0 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/ActionsSubMenu.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/ActionsSubMenu.java
@@ -144,17 +144,18 @@ public class ActionsSubMenu implements Serializable {
}
RoomMenuItem getMenu() {
- actionsMenu.setTop(true);
- actionsMenu.getItems().add(inviteMenuItem);
- actionsMenu.getItems().add(shareMenuItem);
- actionsMenu.getItems().add(applyModerMenuItem);
- actionsMenu.getItems().add(applyWbMenuItem);
- actionsMenu.getItems().add(applyAvMenuItem);
- actionsMenu.getItems().add(sipDialerMenuItem);
+ actionsMenu
+ .add(inviteMenuItem)
+ .add(shareMenuItem)
+ .add(applyModerMenuItem)
+ .add(applyWbMenuItem)
+ .add(applyAvMenuItem)
+ .add(sipDialerMenuItem);
if (Room.Type.interview != room.getRoom().getType()) {
- actionsMenu.getItems().add(downloadPngMenuItem);
- actionsMenu.getItems().add(downloadPdfMenuItem);
- actionsMenu.getItems().add(resetWb);
+ actionsMenu
+ .add(downloadPngMenuItem)
+ .add(downloadPdfMenuItem)
+ .add(resetWb);
}
return actionsMenu;
}
@@ -165,17 +166,17 @@ public class ActionsSubMenu implements Serializable {
}
final Room r = room.getRoom();
boolean isInterview = Room.Type.interview == r.getType();
- downloadPngMenuItem.setEnabled(!isInterview);
- downloadPdfMenuItem.setEnabled(!isInterview);
- actionsMenu.setEnabled(moder || r.isAllowUserQuestions());
- inviteMenuItem.setEnabled(notExternalUser && moder);
+ downloadPngMenuItem.setVisible(!isInterview);
+ downloadPdfMenuItem.setVisible(!isInterview);
+ actionsMenu.setVisible(moder || r.isAllowUserQuestions());
+ inviteMenuItem.setVisible(notExternalUser && moder);
boolean shareVisible = room.screenShareAllowed();
- shareMenuItem.setEnabled(shareVisible);
- applyModerMenuItem.setEnabled(!moder);
-
applyWbMenuItem.setEnabled(!room.getClient().hasRight(Room.Right.whiteBoard));
-
applyAvMenuItem.setEnabled(!room.getClient().hasRight(Room.Right.audio) ||
!room.getClient().hasRight(Room.Right.video));
- sipDialerMenuItem.setEnabled(r.isSipEnabled() &&
isSipEnabled());
- resetWb.setEnabled(moder);
+ shareMenuItem.setVisible(shareVisible);
+ applyModerMenuItem.setVisible(!moder);
+
applyWbMenuItem.setVisible(!room.getClient().hasRight(Room.Right.whiteBoard));
+
applyAvMenuItem.setVisible(!room.getClient().hasRight(Room.Right.audio) ||
!room.getClient().hasRight(Room.Right.video));
+ sipDialerMenuItem.setVisible(r.isSipEnabled() &&
isSipEnabled());
+ resetWb.setVisible(moder);
}
private static void download(AjaxRequestTarget target, String type) {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/PollsSubMenu.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/PollsSubMenu.java
index 6978996..80879ab 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/PollsSubMenu.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/PollsSubMenu.java
@@ -147,11 +147,11 @@ public class PollsSubMenu implements Serializable {
}
RoomMenuItem getMenu() {
- pollsMenu.setTop(true);
- pollsMenu.getItems().add(pollQuickMenuItem);
- pollsMenu.getItems().add(pollCreateMenuItem);
- pollsMenu.getItems().add(pollResultMenuItem);
- pollsMenu.getItems().add(pollVoteMenuItem);
+ pollsMenu
+ .add(pollQuickMenuItem)
+ .add(pollCreateMenuItem)
+ .add(pollResultMenuItem)
+ .add(pollVoteMenuItem);
return pollsMenu;
}
@@ -160,11 +160,11 @@ public class PollsSubMenu implements Serializable {
return;
}
boolean pollExists = pollDao.hasPoll(r.getId());
- pollsMenu.setEnabled(moder || r.isAllowUserQuestions());
-
pollQuickMenuItem.setEnabled(room.getClient().hasRight(Room.Right.presenter) &&
!qpollManager.isStarted(r.getId()));
- pollCreateMenuItem.setEnabled(moder);
- pollVoteMenuItem.setEnabled(pollExists && notExternalUser &&
pollDao.notVoted(r.getId(), getUserId()));
- pollResultMenuItem.setEnabled(pollExists ||
!pollDao.getArchived(r.getId()).isEmpty());
+ pollsMenu.setVisible(moder || r.isAllowUserQuestions());
+
pollQuickMenuItem.setVisible(room.getClient().hasRight(Room.Right.presenter) &&
!qpollManager.isStarted(r.getId()));
+ pollCreateMenuItem.setVisible(moder);
+ pollVoteMenuItem.setVisible(pollExists && notExternalUser &&
pollDao.notVoted(r.getId(), getUserId()));
+ pollResultMenuItem.setVisible(pollExists ||
!pollDao.getArchived(r.getId()).isEmpty());
}
public void updatePoll(IPartialPageRequestHandler handler, Long
createdBy) {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
index 1724dcc..445428f 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
@@ -23,8 +23,8 @@
<wicket:panel>
<div wicket:id="menu"></div>
<div class="details">
- <span class="icon shared ui-button ui-corner-all ui-widget"
wicket:message="data-user:692, data-text:850, data-view:848"
- role="button" style="display: none;"></span>
+ <span class="icon shared ui-button ui-corner-all ui-widget
d-none" wicket:message="data-user:692, data-text:850, data-view:848"
+ role="button"></span>
<span wicket:id="ask" class="icon ask"></span>
<span wicket:id="share" class="icon share"
wicket:message="title:732" onclick="Sharer.open();"></span>
<span wicket:id="roomName" class="room name"></span>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
index 51ddc6a..1a3e1e6 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
@@ -54,6 +54,7 @@ import org.apache.openmeetings.web.room.RoomPanel;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
@@ -64,7 +65,10 @@ import org.apache.wicket.util.string.Strings;
import com.github.openjson.JSONObject;
import com.googlecode.wicket.jquery.ui.form.button.Button;
-import com.googlecode.wicket.jquery.ui.widget.menu.IMenuItem;
+
+import
de.agilecoders.wicket.core.markup.html.bootstrap.navbar.INavbarComponent;
+import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5CssReference;
+import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5IconType;
public class RoomMenuPanel extends Panel {
private static final long serialVersionUID = 1L;
@@ -136,7 +140,7 @@ public class RoomMenuPanel extends Panel {
@Override
protected void onInitialize() {
- exitMenuItem = new RoomMenuItem(getString("308"),
getString("309"), "exit") {
+ exitMenuItem = new RoomMenuItem(getString("308"),
getString("309"), FontAwesome5IconType.sign_out_alt_s) {
private static final long serialVersionUID = 1L;
@Override
@@ -175,15 +179,16 @@ public class RoomMenuPanel extends Panel {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
+
response.render(CssHeaderItem.forReference(FontAwesome5CssReference.instance()));
pollsSubMenu.renderHead(response);
}
- private List<IMenuItem> getMenu() {
- List<IMenuItem> menu = new ArrayList<>();
- exitMenuItem.setEnabled(false);
- menu.add(exitMenuItem.setTop(true));
+ private List<INavbarComponent> getMenu() {
+ List<INavbarComponent> menu = new ArrayList<>();
+ exitMenuItem.setVisible(false);
+ menu.add(exitMenuItem);
- filesMenu.getItems().add(new RoomMenuItem(getString("15"),
getString("1479")) {
+ filesMenu.add(new RoomMenuItem(getString("15"),
getString("1479")) {
private static final long serialVersionUID = 1L;
@Override
@@ -191,7 +196,7 @@ public class RoomMenuPanel extends Panel {
room.getSidebar().showUpload(target);
}
});
- menu.add(filesMenu.setTop(true));
+ menu.add(filesMenu);
if (actionsSubMenu.isVisible()) {
menu.add(actionsSubMenu.getMenu());
@@ -210,8 +215,8 @@ public class RoomMenuPanel extends Panel {
boolean isInterview = Room.Type.interview == r.getType();
User u = room.getClient().getUser();
boolean notExternalUser = u.getType() != User.Type.contact;
- exitMenuItem.setEnabled(notExternalUser);
- filesMenu.setEnabled(!isInterview &&
room.getSidebar().isShowFiles());
+ exitMenuItem.setVisible(notExternalUser);
+ filesMenu.setVisible(!isInterview &&
room.getSidebar().isShowFiles());
boolean moder = room.getClient().hasRight(Room.Right.moderator);
actionsSubMenu.update(moder, notExternalUser);
pollsSubMenu.update(moder, notExternalUser, r);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.html
index 0670d74..2f4e057 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.html
@@ -32,14 +32,14 @@
</tr>
<tr>
<td><label
wicket:for="question"><wicket:message key="20" /></label></td>
- <td><textarea wicket:id="question"
style="width: 280px; height: 70px;"></textarea></td>
+ <td><textarea
wicket:id="question"></textarea></td>
</tr>
<tr>
<td><label wicket:for="type"><wicket:message
key="21" /></label></td>
<td><select wicket:id="type"/></td>
</tr>
<tr>
- <td colspan="2" style="color:
red;"><wicket:message key="23" /></td>
+ <td colspan="2"><wicket:message key="23" /></td>
</tr>
</table>
<div wicket:id="feedback"></div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.html
index f3460c5..26fc35f 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.html
@@ -22,15 +22,15 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<form wicket:id="selForm">
- <table style="width: 100%">
+ <table class="w-100">
<tr>
<td><wicket:message key="1412"/></td>
- <td><select style="width: 230px"
wicket:id="polls"></select></td>
+ <td><select wicket:id="polls"></select></td>
</tr>
</table>
</form>
<form wicket:id="dispForm">
- <table style="width: 100%">
+ <table class="w-100">
<tr>
<td colspan="2"><span
wicket:id="name"></span> <wicket:message key="36"/></td>
</tr>
@@ -39,7 +39,7 @@
</tr>
<tr>
<td><wicket:message key="39"/> (<span
wicket:id="count"></span>)</td>
- <td><select style="width: 280px"
wicket:id="chartType"></select></td>
+ <td><select wicket:id="chartType"></select></td>
</tr>
<tr>
<td><wicket:message key="40"/></td>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.html
index db396d3..48b38e0 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.html
@@ -31,7 +31,7 @@
</tr>
<tr>
<td><wicket:message key="33" /></td>
- <td style="height: 50px;">
+ <td>
<div wicket:id="typeBool">
<div wicket:id="answer">
<input type="radio"
wicket:id="true"/><label wicket:for="true"><wicket:message key="34"
/></label><br/>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.html
index ade93e5..aeeea96 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.html
@@ -22,19 +22,19 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<form wicket:id="form">
- <div style="margin-bottom: 30px;"><wicket:message
key="594"/></div>
- <div class="fileinput fileinput-new" data-provides="fileinput"
style="margin: 0;">
- <div style="display: block;"
class="fileinput-filename"></div>
- <span class="btn btn-file ui-button ui-widget
ui-state-default ui-corner-all ui-button-text-only" style="width: 120px;">
- <span class="ui-button-text"><wicket:message
key="596"/></span>
+ <div class="mb-4"><wicket:message key="594"/></div>
+ <div class="fileinput fileinput-new m-0"
data-provides="fileinput">
+ <div class="fileinput-filename d-block"></div>
+ <span class="btn btn-file">
+ <span><wicket:message key="596"/></span>
<input type="file" multiple="multiple"
wicket:id="file"/>
</span>
</div>
<div wicket:id="feedback" class="error"></div>
<span wicket:id="progress">[progressbar]</span>
- <div style="margin-top: 30px;">
+ <div class="mt-3">
<input wicket:id="to-wb" type="checkbox"/><label
wicket:for="to-wb"><wicket:message key="1312"/></label>
- <div style="margin-left: 30px;" wicket:id="clean-block">
+ <div class="ml-3" wicket:id="clean-block">
<input wicket:id="clean-wb"
type="checkbox"/><label wicket:for="clean-wb"><wicket:message key="62"/></label>
</div>
</div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
index 29f9535..efa3473 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
@@ -44,7 +44,7 @@
<span class="ui-button-icon-space"> </span>
<wicket:message key="85"/>
</button>
- <div id="wb-area-texts" class="btn-group texts" style="float:
left;">
+ <div id="wb-area-texts" class="btn-group texts align-left">
<a class="dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</a>
@@ -55,7 +55,7 @@
</li>
</ul>
</div>
- <div id="wb-area-drawings" class="btn-group drawings"
style="float: left;">
+ <div id="wb-area-drawings" class="btn-group drawings
align-left">
<a class="dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</a>
@@ -71,7 +71,7 @@
</li>
</ul>
</div>
- <div id="wb-area-cliparts" class="btn-group cliparts"
style="float: left;">
+ <div id="wb-area-cliparts" class="btn-group cliparts
align-left">
<a class="dropdown-toggle" data-toggle="dropdown"
wicket:message="title:1323">
<span class="caret"></span>
</a>
@@ -120,7 +120,7 @@
<option value="3.00">300%</option>
<option value="4.00">400%</option>
</select>
- <div class="btn-group btn-group-xs block
settings-group" role="group" aria-label="..." style="display: none;">
+ <div class="btn-group btn-group-xs block settings-group
d-none" role="group" aria-label="...">
<button type="button" class="btn btn-default
settings" wicket:message="title:lbl.settings.whiteboard">
<span class="ui-icon
ui-icon-gear"></span>
</button>
@@ -157,7 +157,7 @@
<div class="block input"><input
class="wb-dim-x" type="text" maxlength="4" readonly="readonly"/></div>
<div class="block lbl"
wicket:message="title:550"><wicket:message key="549"/></div>
<div class="block input"><input
class="wb-dim-w" type="text" maxlength="4" readonly="readonly"/></div>
- <div class="block input" style="width:
2em;"><input class="wb-prop-color" type="color" value="#ff6600"
wicket:message="title:424"/></div>
+ <div class="block input"><input
class="wb-prop-color" type="color" value="#ff6600"
wicket:message="title:424"/></div>
<div class="block but"><button
class="wb-prop-lock-color" wicket:message="title:426"> </button></div>
<div class="block input"><input
class="wb-prop-width" type="number" min="1" max="100" value="2"
wicket:message="title:429"/></div>
<div class="block but"><button
class="wb-prop-i" wicket:message="title:86">I</button></div>
@@ -167,7 +167,7 @@
<div class="block input"><input
class="wb-dim-y" type="text" maxlength="4" readonly="readonly"/></div>
<div class="block lbl"
wicket:message="title:552"><wicket:message key="551"/></div>
<div class="block input"><input
class="wb-dim-h" type="text" maxlength="4" readonly="readonly"/></div>
- <div class="block input" style="width:
2em;"><input class="wb-prop-fill" type="color" value="#ffff33"
wicket:message="title:427"/></div>
+ <div class="block input"><input
class="wb-prop-fill" type="color" value="#ffff33"
wicket:message="title:427"/></div>
<div class="block but"><button
class="wb-prop-lock-fill" wicket:message="title:428"> </button></div>
<div class="block input"><input
class="wb-prop-opacity" type="number" min="1" max="100" value="100"
wicket:message="title:553"/></div>
<div class="block but"><button
class="wb-prop-b" wicket:message="title:87">B</button></div>
@@ -203,11 +203,11 @@
<div class="om-tbl">
<div class="om-tbl-row">
<div
class="om-tbl-cell"><wicket:message key="740"/></div>
- <div class="om-tbl-cell"><input
class="wbs-width" type="number" min="100" style="width: 100px;"/></div>
+ <div class="om-tbl-cell"><input
class="wbs-width" type="number" min="100"/></div>
</div>
<div class="om-tbl-row">
<div
class="om-tbl-cell"><wicket:message key="741"/></div>
- <div class="om-tbl-cell"><input
class="wbs-height" type="number" min="100" style="width: 100px;"/></div>
+ <div class="om-tbl-cell"><input
class="wbs-height" type="number" min="100"/></div>
</div>
</div>
</div>
@@ -216,7 +216,7 @@
<div><wicket:message key="download.image.steps"/></div>
</div>
</div>
- <ul id="wb-rename-menu" style="position: absolute; display: none;">
+ <ul id="wb-rename-menu" class="d-none position-absolute">
<li class="wb-rename"><div><span class="ui-icon
ui-icon-pencil"></span><wicket:message key="711"/></div></li>
</ul>
<div wicket:id="filename"></div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.html
index 64d4289..1ef5788 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.html
@@ -22,7 +22,7 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<form wicket:id="form">
- <textarea wicket:id="message" style="width: 100%; height:
100px;"></textarea>
+ <textarea wicket:id="message" class="w-100"></textarea>
<div>
<input type="checkbox" wicket:id="enterRoom" /><label
wicket:for="enterRoom"><wicket:message key="1134"/></label>
</div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html
index 52deb76..6ccd8e5 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html
@@ -20,16 +20,9 @@
-->
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org";>
-<wicket:head>
- <style type="text/css">
- .ui-autocomplete {
- z-index: 999 !important;
- }
- </style>
-</wicket:head>
<wicket:panel>
<form wicket:id="form">
- <table style="width: 100%;">
+ <table class="w-100 private-message">
<tr>
<td colspan="2" wicket:id="feedback"></td>
</tr>
@@ -52,9 +45,9 @@
</tr>
<tr wicket:id="roomParamsBlock">
<td colspan="2" wicket:id="roomParams">
- <table style="width: 100%">
+ <table class="w-100">
<tr>
- <td style="width:
70px;">
+ <td>
<table>
<tr>
<td><wicket:message key="45"/></td>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
index 8df1554..9dfa633 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
@@ -26,7 +26,7 @@
</div>
<form wicket:id="sendForm">
<div wicket:id="toolbarContainer" class="tool-container"></div>
- <div style="position: relative;">
+ <div class="chat-msg-container">
<div id="chatMessage" wicket:id="chatMessage"></div>
<div class="send" wicket:id="send"
wicket:message="title:218">↵</div>
<input type="hidden" wicket:id="activeTab"
id="activeChatTab"/>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
index c1a266f..f088fbd 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
@@ -20,21 +20,8 @@
-->
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org";>
-<wicket:head>
- <style>
- .emt {
- font-size: 10pt;
- }
- .chat.btn{
- font-weight: bold;
- }
- .chat.dropdown-menu {
- left: -50px;
- }
- </style>
-</wicket:head>
<wicket:panel>
- <div wicket:id="toolbar" class="btn-toolbar" data-role="editor-toolbar">
+ <div wicket:id="toolbar" class="btn-toolbar chat-toolbar"
data-role="editor-toolbar">
<div class="btn-group dropup">
<a id="emoticons" class="chat btn btn-default emt
dropdown-toggle" data-toggle="dropdown" title="Emoticons"></a>
<ul class="chat dropdown-menu" >
@@ -47,9 +34,9 @@
<div class="btn-group dropup">
<a id="fontSize" class="chat btn btn-default
dropdown-toggle" data-toggle="dropdown" title="Font Size"> A <strong
class="caret"></strong></a>
<ul class="dropdown-menu">
- <li><a data-edit="fontSize 5"><span
style="font-size: x-large;">Huge</span></a></li>
- <li><a data-edit="fontSize 3"><span
style="font-size: small;">Normal</span></a></li>
- <li><a data-edit="fontSize 1"><span
style="font-size: x-small;">Small</span></a></li>
+ <li><a data-edit="fontSize 5"><span
class="font-huge">Huge</span></a></li>
+ <li><a data-edit="fontSize 3"><span
class="font-small">Normal</span></a></li>
+ <li><a data-edit="fontSize 1"><span
class="font-tiny">Small</span></a></li>
</ul>
</div>
<div class="btn-group dropup">
@@ -58,10 +45,10 @@
<strong class="caret"></strong>
</a>
<ul class="dropdown-menu btns-only">
- <li><a class="chat-btn chat-tool-icon btn
btn-default" id="bold" data-edit="bold" title="Bold (Ctrl/Cmd+B)"
style="font-weight: bold;"> B </a></li>
- <li><a class="chat-btn chat-tool-icon btn
btn-default" id="italic" data-edit="italic" title="Italic (Ctrl/Cmd+I)"
style="font-style: italic;"> I </a></li>
- <li><a class="chat-btn chat-tool-icon btn
btn-default" id="strikethrough" data-edit="strikethrough" title="Strikethrough"
style="text-decoration: line-through;"> S </a></li>
- <li><a class="chat-btn chat-tool-icon btn
btn-default" id="underline" data-edit="underline" title="Underline
(Ctrl/Cmd+U)" style="text-decoration: underline;"> U </a></li>
+ <li><a class="chat-btn chat-tool-icon btn
btn-default bold" id="bold" data-edit="bold" title="Bold (Ctrl/Cmd+B)"> B
</a></li>
+ <li><a class="chat-btn chat-tool-icon btn
btn-default italic" id="italic" data-edit="italic" title="Italic (Ctrl/Cmd+I)">
I </a></li>
+ <li><a class="chat-btn chat-tool-icon btn
btn-default strike" id="strikethrough" data-edit="strikethrough"
title="Strikethrough"> S </a></li>
+ <li><a class="chat-btn chat-tool-icon btn
btn-default under" id="underline" data-edit="underline" title="Underline
(Ctrl/Cmd+U)"> U </a></li>
</ul>
</div>
<div class="btn-group dropup">
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.html
index 1d0282d..48f4112 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.html
@@ -22,15 +22,15 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<div class="actions" wicket:id="buttons"></div>
- <div style="height: calc(100% - 50px); overflow-y: auto;">
- <table style="width: 100%; height: 100%">
+ <div class="profile-edit-form overflow-y-auto">
+ <table class="w-100 h-100">
<tr>
<td rowspan="2">
<fieldset class="ui-widget-content">
<legend
class="ui-widget-header">
<wicket:message
key="143" />
</legend>
- <button type="button"
wicket:id="changePwd" id="changePwd" style="margin-left:
180px;"><wicket:message key="327"/></button>
+ <button type="button"
wicket:id="changePwd" id="changePwd"><wicket:message key="327"/></button>
<div class="formelement"
wicket:enclosure="passwd">
<label
wicket:for="passwd"><wicket:message key="current.password" /></label><input
type="password" wicket:id="passwd" />
</div>
@@ -53,7 +53,7 @@
</tr>
</table>
</div>
- <div style="text-align: center; padding-top: 10px;">
+ <div class="pt-2 text-center">
<a wicket:id="link" target="_blank"><wicket:message
key="register.privacy.statement"/></a>
</div>
</wicket:panel>
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 0fdad82..2eb4bb7 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
@@ -22,7 +22,7 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<!-- TODO design should be changed in the future -->
- <div style="height: 100%; overflow-y: auto;">
+ <div class="h-100 overflow-y-auto">
<table class="messages">
<tr>
<td class="side left">
@@ -69,23 +69,23 @@
<select
wicket:id="msgMove"></select>
</div>
<div wicket:id="selectedMessage">
- <table style="width: 100%">
+ <table class="w-100">
<tr>
- <td
style="width: 10px; padding-right: 20px;"><wicket:message key="1202"/></td>
+ <td
class="pr-4"><wicket:message key="1202"/></td>
<td
wicket:id="from"></td>
</tr>
<tr>
- <td
style="width: 10px; padding-right: 20px;"><wicket:message key="1210"/></td>
+ <td
class="pr-4"><wicket:message key="1210"/></td>
<td
wicket:id="to"></td>
</tr>
<tr>
- <td
style="width: 10px; padding-right: 20px;"><wicket:message key="1211"/></td>
+ <td
class="pr-4"><wicket:message key="1211"/></td>
<td
wicket:id="subj"></td>
</tr>
</table>
- <div style="background-color:
white;min-height: 300px;" wicket:id="body"></div>
+ <div wicket:id="body"></div>
<div wicket:id="roomContainer">
- <table style="width:
100%">
+ <table class="w-100">
<tr>
<td>
<button class="ui-button ui-widget ui-state-default ui-corner-all
ui-button-text-only" wicket:id="enter">
@@ -93,8 +93,8 @@
</button>
</td>
<td>
-
<div style="display: inline-block; width: 300px;"><wicket:message key="570"
/></div><span wicket:id="start"></span><br/>
-
<div style="display: inline-block; width: 300px;"><wicket:message key="571"
/></div><span wicket:id="end"></span>
+
<div class="d-inline-block"><wicket:message key="570" /></div><span
wicket:id="start"></span><br/>
+
<div class="d-inline-block"><wicket:message key="571" /></div><span
wicket:id="end"></span>
</td>
</tr>
</table>
@@ -104,13 +104,13 @@
<td class="side right" wicket:id="contacts">
<div><strong><wicket:message
key="1189"/> (<span wicket:id="pendingContacts"></span>)</strong></div>
<div><strong><wicket:message
key="1188"/> (<span wicket:id="allContacts"></span>)</strong></div>
- <table style="width: 100%">
+ <table class="w-100">
<tr>
<th><wicket:message
key="165"/></th>
<th><wicket:message
key="635"/></th>
</tr>
<tr wicket:id="users">
- <td><div
wicket:id="name" style="overflow-x: hidden;"></div></td>
+ <td><div
wicket:id="name" class="overflow-x-hidden"></div></td>
<td><div
wicket:id="accept" class="tick om-icon clickable" wicket:message="title:1190"
></div><div
wicket:id="decline" class="cross om-icon clickable" wicket:message="title:1191"
></div><div
wicket:id="view" class="user om-icon clickable" wicket:message="title:1236"
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 5f36e96..100e8e1 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
@@ -21,7 +21,7 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
- <div style="height: 100%; overflow-y: auto;">
+ <div class="h-100 overflow-y-auto">
<div wicket:id="info-panel" class="user info panel">
<table>
<tr>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
index 1450f8a..152030c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
@@ -22,8 +22,8 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<!-- TODO move styles into CSS -->
- <div style="height: 100%; display: flex;">
- <div style="width: 200px;">
+ <div class="d-flex h-100">
+ <div>
<form wicket:id="form">
<div><wicket:message key="1179"/></div>
<input type="text" wicket:id="text"/><br/>
@@ -35,7 +35,7 @@
<button wicket:id="submit"
type="button"><wicket:message key="714"/></button>
</form>
</div>
- <div wicket:id="container" style="height: 100%; padding-left:
10px;">
+ <div wicket:id="container" class="pl-3 h-100">
<div><strong><wicket:message
key="1184"/></strong> <div class="adminNav"
wicket:id="navigator"></div></div>
<table id="searchUsersTable" class="list-table">
<thead>
@@ -53,7 +53,7 @@
<td class="col-2"
wicket:id="tz"></td>
<td class="col-2"
wicket:id="offer"></td>
<td class="col-3"
wicket:id="search"></td>
- <td class="col-2"
style="white-space: nowrap;"><div wicket:id="add" class="add om-icon clickable"
wicket:message="title:1186"
+ <td class="col-2
text-nowrap"><div wicket:id="add" class="add om-icon clickable"
wicket:message="title:1186"
></div><div
wicket:id="message" class="new-email om-icon clickable"
wicket:message="title:1253"
></div><div
wicket:id="view" class="user om-icon clickable" wicket:message="title:1236"
></div><div
wicket:id="invite" class="invite om-icon clickable"
wicket:message="title:1131"></div></td>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
index a0701a4..6b5574d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
@@ -25,16 +25,16 @@
<div wicket:id="list"></div>
</div>
<!-- Users in this Room -->
- <div class="ui-widget-content" wicket:id="details"
style="vertical-align: top; padding: 10px;">
- <div class="formelement" style="font-style: italic;">
- <label><wicket:message key="404" /></label>
+ <div class="ui-widget-content p-3" wicket:id="details">
+ <div class="formelement">
+ <label><i><wicket:message key="404" /></i></label>
</div>
<div class="formelement">
- <label style="font-weight: bold;"><wicket:message
key="406" /></label>
+ <label><strong><wicket:message key="406"
/></strong></label>
<span wicket:id="roomName"></span> #<span
wicket:id="roomId"></span>
</div>
<div class="formelement">
- <label style="font-weight: bold;"><wicket:message
key="196" /></label>
+ <label><strong><wicket:message key="196"
/></strong></label>
<span wicket:id="roomComment"></span>
</div>
<div class="formelement">
@@ -44,9 +44,9 @@
<table class="list-table full-width">
<tbody wicket:id="clientsContainer">
<tr wicket:id="clients">
- <td style="width: 50px;"><img
wicket:id="clientImage" style="min-width: 50px; height:50px" /></td>
- <td style="width: 350px;
height:50px">
- <div style="width:
350px; height:50px"><span wicket:id="clientLogin"></span> <wicket:message
key="408"/> <span wicket:id="from"></span></div>
+ <td><img
wicket:id="clientImage"/></td>
+ <td>
+ <div ><span
wicket:id="clientLogin"></span> <wicket:message key="408"/> <span
wicket:id="from"></span></div>
</td>
</tr>
</tbody>
diff --git a/openmeetings-web/src/main/webapp/css/raw-chat.css
b/openmeetings-web/src/main/webapp/css/raw-chat.css
index 9d946a7..84c6b51 100644
--- a/openmeetings-web/src/main/webapp/css/raw-chat.css
+++ b/openmeetings-web/src/main/webapp/css/raw-chat.css
@@ -182,3 +182,36 @@ ul.dropdown-menu.btns-only, ul.dropdown-menu.btns-only li {
ul.dropdown-menu.btns-only li .chat-btn {
float: none !important;
}
+.emt {
+ font-size: 10pt;
+}
+.chat.btn{
+ font-weight: bold;
+}
+.chat.dropdown-menu {
+ left: -50px;
+}
+.chat-msg-container {
+ position: relative;
+}
+.chat-toolbar .font-huge {
+ font-size: x-large;
+}
+.chat-toolbar .font-small {
+ font-size: small;
+}
+.chat-toolbar .font-tiny {
+ font-size: small;
+}
+.chat-toolbar .chat-btn.bold {
+ font-weight: bold;
+}
+.chat-toolbar .chat-btn.bold {
+ font-style: italic;
+}
+.chat-toolbar .chat-btn.strike {
+ text-decoration: line-through;
+}
+.chat-toolbar .chat-btn.under {
+ text-decoration: underline;
+}
diff --git a/openmeetings-web/src/main/webapp/css/raw-general.css
b/openmeetings-web/src/main/webapp/css/raw-general.css
index d734e6a..9afef55 100644
--- a/openmeetings-web/src/main/webapp/css/raw-general.css
+++ b/openmeetings-web/src/main/webapp/css/raw-general.css
@@ -537,7 +537,13 @@ select.messages.selector {
margin: 10px;
max-width: 900px;
}
-.user.info.panel legend {
+.overflow-y-auto {
+ overflow-y: auto;
+}
+.overflow-x-hidden {
+ overflow-y: hidden;
+}
+..user.info.panel legend {
font-style: italic;
text-align: right;
}
@@ -577,7 +583,7 @@ form .input {
padding-right: 0.2em;
padding-left: 0.2em;
}
-.profile .ui-button-icon.ui-icon.ui-icon-closethick.remove {
+.profile .remove {
position: absolute;
right: 5px;
top: 5px;
@@ -613,42 +619,6 @@ form .input {
width: 75%;
vertical-align: middle;
}
-.col-1 {
- width: 8.3333%;
-}
-.col-2 {
- width: 16.6666%;
-}
-.col-3 {
- width: 24.9999%;
-}
-.col-4 {
- width: 33.3332%;
-}
-.col-5 {
- width: 41.6665%;
-}
-.col-6 {
- width: 49.9998%;
-}
-.col-7 {
- width: 58.3331%;
-}
-.col-8 {
- width: 66.6664%;
-}
-.col-9 {
- width: 74.9997%;
-}
-.col-10 {
- width: 83.333%;
-}
-.col-11 {
- width: 91.6663%;
-}
-.col-12 {
- width: 100%;
-}
.col-wrapper {
word-wrap: break-word;
}
@@ -771,3 +741,72 @@ form .input {
.installer-less-important {
font-size: 1.1em;
}
+.main.privacy {
+ max-width: 800px;
+ padding: 20px;
+ border: 1px solid #cccccc;
+ border-radius: 10px;
+}
+.main.privacy h2 {
+ font-size: 30px;
+ font-weight: 300;
+ margin: 10px 0;
+ color: #333;
+}
+.main.privacy h3 {
+ color: #325d72;
+ font-weight: 700;
+ font-size: 24px;
+ margin: 1.5em 0 1em;
+ border-bottom: 1px solid #ddd;
+}
+.main.privacy h4 {
+ color: #333;
+ font-weight: 700;
+ font-size: 1.2em;
+ margin: 1em 0;
+}
+.main.privacy h5 {
+ color: #325D72;
+ font-weight: 700;
+ font-size: 1em;
+ margin: 1em 0;
+}
+.main.privacy p {
+ margin: 1em 0;
+}
+.private-message .ui-autocomplete {
+ z-index: 999 !important;
+}
+.abstractWizard .adminForm div.formelement {
+ max-width: 600px;
+}
+.abstractWizard .adminForm label {
+ width: 240px;
+}
+.abstractWizard ul.paramList {
+ list-style-type: none;
+}
+.abstractWizard ul.paramList li {
+ padding-top: 5px;
+}
+.abstractWizard ul.paramList label {
+ width: 350px;
+ display: inline-block;
+}
+.abstractWizard input, .abstractWizard select {
+ width: 280px;
+}
+.abstractWizard input[type=checkbox], .abstractWizard input[type=radio] {
+ width: auto;
+}
+.invitation .message {
+ width: 280px;
+ height: 70px;
+}
+.img-upload .btn.btn-file {
+ width: 120px;
+}
+.profile-edit-form {
+ height: calc(100% - 50px);
+}
diff --git a/openmeetings-web/src/main/webapp/css/raw-tree.css
b/openmeetings-web/src/main/webapp/css/raw-tree.css
index f7d1fb9..f2fbfc5 100644
--- a/openmeetings-web/src/main/webapp/css/raw-tree.css
+++ b/openmeetings-web/src/main/webapp/css/raw-tree.css
@@ -15,6 +15,10 @@
overflow-x: hidden;
overflow-y: auto;
}
+.file.tree .trees #tree-anchor {
+ height: 2px;
+ width: 2px;
+}
.file.tree .footer {
height: var(--tree-footer-height);
}
