[jira] [Resolved] (OPENMEETINGS-2452) Actions->Show SipDialer no close button/blocking UI
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2452?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik resolved OPENMEETINGS-2452. Fix Version/s: 5.1.0 Resolution: Fixed > Actions->Show SipDialer no close button/blocking UI > --- > > Key: OPENMEETINGS-2452 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2452 > Project: Openmeetings > Issue Type: Bug > Components: VoIP/SIP >Affects Versions: 5.0.1 >Reporter: Uwe Simon >Assignee: Maxim Solodovnik >Priority: Critical > Fix For: 5.1.0 > > Attachments: Bildschirmfoto von 2020-09-23 13-23-45.png > > > When opening the SipDialer via Actions->Show SipDialer The numberpad an an > loutput fild are shown. There is no "Close" button and the UI is blocked. The > only "way out" is a browser refresh. Looks like all buttons are missing > (dialer button?) !Bildschirmfoto von 2020-09-23 13-23-45.png! -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2452) Actions->Show SipDialer no close button/blocking UI
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2452?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17202238#comment-17202238 ] ASF subversion and git services commented on OPENMEETINGS-2452: --- Commit 0ca5029d032fff2d2c36ec6a3e2b1e42e5754f15 in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=0ca5029 ] [OPENMEETINGS-2452] sip dialog is fixed > Actions->Show SipDialer no close button/blocking UI > --- > > Key: OPENMEETINGS-2452 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2452 > Project: Openmeetings > Issue Type: Bug > Components: VoIP/SIP >Affects Versions: 5.0.1 >Reporter: Uwe Simon >Assignee: Maxim Solodovnik >Priority: Critical > Fix For: 5.1.0 > > Attachments: Bildschirmfoto von 2020-09-23 13-23-45.png > > > When opening the SipDialer via Actions->Show SipDialer The numberpad an an > loutput fild are shown. There is no "Close" button and the UI is blocked. The > only "way out" is a browser refresh. Looks like all buttons are missing > (dialer button?) !Bildschirmfoto von 2020-09-23 13-23-45.png! -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2455) (5.1.0) Library versions need to be updated
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2455?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17202237#comment-17202237 ] ASF subversion and git services commented on OPENMEETINGS-2455: --- Commit c9876cda52a26a73559c0ba88378018d42ab9897 in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=c9876cd ] [OPENMEETINGS-2455] commons-dbcp, mockito > (5.1.0) Library versions need to be updated > --- > > Key: OPENMEETINGS-2455 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2455 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 5.1.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 5.1.0 > > > Library versions need to be updated -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch master updated: [OPENMEETINGS-2452] sip dialog is fixed
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 0ca5029 [OPENMEETINGS-2452] sip dialog is fixed
0ca5029 is described below
commit 0ca5029d032fff2d2c36ec6a3e2b1e42e5754f15
Author: Maxim Solodovnik
AuthorDate: Fri Sep 25 22:16:50 2020 +0700
[OPENMEETINGS-2452] sip dialog is fixed
---
.../web/room/menu/SipDialerDialog.html | 26 +++
.../org/apache/openmeetings/web/room/raw-room.js | 87 --
2 files changed, 62 insertions(+), 51 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.html
index 2b4b38d..63a9d25 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.html
@@ -20,34 +20,34 @@
-->
http://wicket.apache.org";>
-
+
- ←
+ ←
- 7
- 8
- 9
+ 7
+ 8
+ 9
- 4
- 5
- 6
+ 4
+ 5
+ 6
- 1
- 2
- 3
+ 1
+ 2
+ 3
- 0
+ 0
-
+
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
index 3f21532..025f98a 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
@@ -157,8 +157,11 @@ var Room = (function() {
Wicket.Event.subscribe("/websocket/error", _close);
$(window).on('keydown.openmeetings', _preventKeydown);
$(window).on('keyup.openmeetings', _keyHandler);
+ $(window).on('keydown.om-sip', _sipKeyDown);
+ $(window).on('keyup.om-sip', _sipKeyUp);
$(document).click(_mouseHandler);
_addNoSleep();
+ _initSip();
}
function _addNoSleep() {
_removeNoSleep();
@@ -188,6 +191,8 @@ var Room = (function() {
$('.ui-dialog.user-video').remove();
$(window).off('keyup.openmeetings');
$(window).off('keydown.openmeetings');
+ $(window).off('keydown.om-sip');
+ $(window).off('keyup.om-sip');
$(document).off('click', _mouseHandler);
sb = undefined;
Sharer.close();
@@ -460,6 +465,50 @@ var Room = (function() {
}
VideoManager.update(c)
}
+ function __addSipText(v) {
+ const txt = $('.sip-number');
+ txt.val(txt.val() + v);
+ }
+ function __eraseSipText() {
+ const txt = $('.sip-number')
+ , t = txt.val();
+ if (!!t) {
+ txt.val(t.substring(0, t.length - 1));
+ }
+ }
+ function _initSip() {
+ $('.sip .button-row button').off().click(function() {
+ __addSipText($(this).data('value'));
+ });
+ $('#sip-dialer-btn-erase').off().click(__eraseSipText);
+ }
+ function _sipGetKey(evt) {
+ let k = -1;
+ if (evt.keyCode > 47 && evt.keyCode < 58) {
+ k = evt.keyCode - 48;
+ }
+ if (evt.keyCode > 95 && evt.keyCode < 106) {
+ k = evt.keyCode - 96;
+ }
+ return k;
+ }
+ function _sipKeyDown(evt) {
+ const k = _sipGetKey(evt);
+ if (k > 0) {
+ $('#sip-dialer-btn-' + k).addClass('bg-warning');
+ }
+ }
+ function _sipKeyUp(evt) {
+ if (evt.key === 'Backspace') {
+ __eraseSipText();
+ } else {
+ const k = _sipGetKey(evt);
+ if (k > 0) {
+
[openmeetings] branch master updated: [OPENMEETINGS-2455] commons-dbcp, mockito
This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git The following commit(s) were added to refs/heads/master by this push: new c9876cd [OPENMEETINGS-2455] commons-dbcp, mockito c9876cd is described below commit c9876cda52a26a73559c0ba88378018d42ab9897 Author: Maxim Solodovnik AuthorDate: Fri Sep 25 22:16:08 2020 +0700 [OPENMEETINGS-2455] commons-dbcp, mockito --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 358ea59..2364b10 100644 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,7 @@ 1.6.2 3.1.2 3.8.0 - 2.7.0 + 2.8.0 2.8.1 42.2.16 1.4 @@ -113,7 +113,7 @@ 9.4.31.v20200723 test 1.66 - 3.5.11 + 3.5.13 2.3.2 6.14.0
[jira] [Created] (OPENMEETINGS-2455) (5.1.0) Library versions need to be updated
Maxim Solodovnik created OPENMEETINGS-2455: -- Summary: (5.1.0) Library versions need to be updated Key: OPENMEETINGS-2455 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2455 Project: Openmeetings Issue Type: Task Components: Builds Affects Versions: 5.1.0 Reporter: Maxim Solodovnik Assignee: Maxim Solodovnik Fix For: 5.1.0 Library versions need to be updated -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2453) Time Zone is not implemented on recordings date/time
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2453?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17202085#comment-17202085 ] ASF subversion and git services commented on OPENMEETINGS-2453: --- Commit a75ef5c50f2c2dcfbb556a767af1bb33b8fb1023 in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=a75ef5c ] [OPENMEETINGS-2453] file is downloaded using it's UI name > Time Zone is not implemented on recordings date/time > > > Key: OPENMEETINGS-2453 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2453 > Project: Openmeetings > Issue Type: Bug > Components: Recordings, UI >Affects Versions: 5.0.1, 5.0.0 >Reporter: Ali Alhaidary >Assignee: Maxim Solodovnik >Priority: Minor > Fix For: 5.1.0 > > > Time Zone is not implemented on recordings date/time, as it always shows it > UTC. Also the word "Recording" is not translated. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch master updated: [OPENMEETINGS-2453] file is downloaded using it's UI name
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new a75ef5c [OPENMEETINGS-2453] file is downloaded using it's UI name
a75ef5c is described below
commit a75ef5c50f2c2dcfbb556a767af1bb33b8fb1023
Author: Maxim Solodovnik
AuthorDate: Fri Sep 25 18:47:36 2020 +0700
[OPENMEETINGS-2453] file is downloaded using it's UI name
---
.../java/org/apache/openmeetings/web/common/tree/FileTreePanel.java | 4
1 file changed, 4 insertions(+)
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 9dcce65..4b5f821 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
@@ -44,6 +44,7 @@ import org.apache.openmeetings.db.entity.file.BaseFileItem;
import org.apache.openmeetings.db.entity.file.BaseFileItem.Type;
import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.db.entity.record.Recording;
+import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.web.common.NameDialog;
import org.apache.openmeetings.web.common.confirmation.ConfirmableAjaxBorder;
import org.apache.openmeetings.web.common.confirmation.ConfirmationDialog;
@@ -98,6 +99,7 @@ public abstract class FileTreePanel extends Panel {
private BaseFileItem lastSelected = null;
private Map selected = new HashMap<>();
private File dwnldFile;
+ private String dwnldName;
final AjaxDownloadBehavior downloader = new AjaxDownloadBehavior(new
IResource() {
private static final long serialVersionUID = 1L;
@@ -110,6 +112,7 @@ public abstract class FileTreePanel extends Panel {
protected ResourceResponse
createResourceResponse(Attributes attr, Path path) {
ResourceResponse response =
super.createResourceResponse(attr, path);
response.setCacheDuration(ZERO);
+ response.setFileName(dwnldName);
return response;
}
}.respond(attributes);
@@ -290,6 +293,7 @@ public abstract class FileTreePanel extends Panel {
? fi.getOriginal() :
fi.getFile(ext);
if (f != null && f.exists()) {
dwnldFile = f;
+ dwnldName = fi.getName() + "." +
OmFileHelper.getFileExt(f.getName());
downloader.initiate(target);
}
}
[jira] [Resolved] (OPENMEETINGS-2454) Login from Moodle seems to be broken
[
https://issues.apache.org/jira/browse/OPENMEETINGS-2454?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Maxim Solodovnik resolved OPENMEETINGS-2454.
Fix Version/s: (was: 5.1.0)
Resolution: Workaround
This is NOT OM bug
Session Cookie is not being stored due to increased security
the following setting should be added even to global {{conf/context.xml}} or to
local {{webapps/openmeetings/META-INF/context.xml}}
{code}
{code}
> Login from Moodle seems to be broken
>
>
> Key: OPENMEETINGS-2454
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2454
> Project: Openmeetings
> Issue Type: Bug
> Components: Plugins, SOAP/REST API
>Affects Versions: 5.0.1
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
>Priority: Critical
>
> Login from Moodle seems to be broken
> Invalid hash is reported
> not sure what is wrong yet
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2454) Login from Moodle seems to be broken
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2454?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17202004#comment-17202004 ] ASF subversion and git services commented on OPENMEETINGS-2454: --- Commit 4ffe8c41cb527d8cd30d450c2e24dacd55a223ca in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=4ffe8c4 ] [OPENMEETINGS-2454] Additional logging is removed > Login from Moodle seems to be broken > > > Key: OPENMEETINGS-2454 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2454 > Project: Openmeetings > Issue Type: Bug > Components: Plugins, SOAP/REST API >Affects Versions: 5.0.1 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Critical > Fix For: 5.1.0 > > > Login from Moodle seems to be broken > Invalid hash is reported > not sure what is wrong yet -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch master updated: [OPENMEETINGS-2454] Additional logging is removed
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 4ffe8c4 [OPENMEETINGS-2454] Additional logging is removed
4ffe8c4 is described below
commit 4ffe8c41cb527d8cd30d450c2e24dacd55a223ca
Author: Maxim Solodovnik
AuthorDate: Fri Sep 25 15:48:48 2020 +0700
[OPENMEETINGS-2454] Additional logging is removed
---
.../src/main/java/org/apache/openmeetings/web/app/WebSession.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
index 31cd253..2a312bf 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
@@ -146,7 +146,6 @@ public class WebSession extends
AbstractAuthenticatedWebSession implements IWebS
@Override
public void invalidate() {
- log.debug("[{}] invalidating session", getId());
cm.invalidate(userId, getId());
super.invalidate();
userId = null;
@@ -221,7 +220,7 @@ public class WebSession extends
AbstractAuthenticatedWebSession implements IWebS
}
public void checkHashes(StringValue secure, StringValue invitation) {
- log.debug("[{} ? {}] checkHashes, secure: '{}', invitation:
'{}'", getId(), isTemporary(), secure, invitation);
+ log.debug("checkHashes, secure: '{}', invitation: '{}'",
secure, invitation);
try {
log.debug("checkHashes, has soap in session ? '{}'",
(soap != null));
if (!secure.isEmpty() && (soap == null ||
!soap.getHash().equals(secure.toString( {
[openmeetings] branch master updated: [OPENMEETINGS-2454] Additional logging is added
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new c49625c [OPENMEETINGS-2454] Additional logging is added
c49625c is described below
commit c49625c9bc2ca89b10a8383aa299c8ecde67fe16
Author: Maxim Solodovnik
AuthorDate: Fri Sep 25 15:05:15 2020 +0700
[OPENMEETINGS-2454] Additional logging is added
---
.../src/main/java/org/apache/openmeetings/web/app/WebSession.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
index 2a312bf..31cd253 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
@@ -146,6 +146,7 @@ public class WebSession extends
AbstractAuthenticatedWebSession implements IWebS
@Override
public void invalidate() {
+ log.debug("[{}] invalidating session", getId());
cm.invalidate(userId, getId());
super.invalidate();
userId = null;
@@ -220,7 +221,7 @@ public class WebSession extends
AbstractAuthenticatedWebSession implements IWebS
}
public void checkHashes(StringValue secure, StringValue invitation) {
- log.debug("checkHashes, secure: '{}', invitation: '{}'",
secure, invitation);
+ log.debug("[{} ? {}] checkHashes, secure: '{}', invitation:
'{}'", getId(), isTemporary(), secure, invitation);
try {
log.debug("checkHashes, has soap in session ? '{}'",
(soap != null));
if (!secure.isEmpty() && (soap == null ||
!soap.getHash().equals(secure.toString( {
[jira] [Commented] (OPENMEETINGS-2454) Login from Moodle seems to be broken
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2454?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17201986#comment-17201986 ] ASF subversion and git services commented on OPENMEETINGS-2454: --- Commit c49625c9bc2ca89b10a8383aa299c8ecde67fe16 in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=c49625c ] [OPENMEETINGS-2454] Additional logging is added > Login from Moodle seems to be broken > > > Key: OPENMEETINGS-2454 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2454 > Project: Openmeetings > Issue Type: Bug > Components: Plugins, SOAP/REST API >Affects Versions: 5.0.1 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Critical > Fix For: 5.1.0 > > > Login from Moodle seems to be broken > Invalid hash is reported > not sure what is wrong yet -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Updated] (OPENMEETINGS-2454) Login from Moodle seems to be broken
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2454?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik updated OPENMEETINGS-2454: --- Priority: Critical (was: Major) > Login from Moodle seems to be broken > > > Key: OPENMEETINGS-2454 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2454 > Project: Openmeetings > Issue Type: Bug > Components: Plugins, SOAP/REST API >Affects Versions: 5.0.1 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Critical > Fix For: 5.1.0 > > > Login from Moodle seems to be broken > Invalid hash is reported > not sure what is wrong yet -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Created] (OPENMEETINGS-2454) Login from Moodle seems to be broken
Maxim Solodovnik created OPENMEETINGS-2454: -- Summary: Login from Moodle seems to be broken Key: OPENMEETINGS-2454 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2454 Project: Openmeetings Issue Type: Bug Components: Plugins, SOAP/REST API Affects Versions: 5.0.1 Reporter: Maxim Solodovnik Assignee: Maxim Solodovnik Fix For: 5.1.0 Login from Moodle seems to be broken Invalid hash is reported not sure what is wrong yet -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2363) Rework Conference Room UI-Dialogs to use Bootstrap style
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2363?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17201979#comment-17201979 ] ASF subversion and git services commented on OPENMEETINGS-2363: --- Commit 61a9f1428c89a38aaca017f6a6d3c1c02af468a7 in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=61a9f14 ] [OPENMEETINGS-2363] initial attempt to re-style dialogs and buttons > Rework Conference Room UI-Dialogs to use Bootstrap style > > > Key: OPENMEETINGS-2363 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2363 > Project: Openmeetings > Issue Type: Improvement > Components: UI >Reporter: Sebastian Wagner >Assignee: Sebastian Wagner >Priority: Major > Fix For: 5.1.0 > > > As discussed, those UI-Dialogs should be moved to Bootstrap style. For Dialog > maybe and for the buttons inside of it. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch master updated: [OPENMEETINGS-2363] initial attempt to re-style dialogs and buttons
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 61a9f14 [OPENMEETINGS-2363] initial attempt to re-style dialogs and
buttons
61a9f14 is described below
commit 61a9f1428c89a38aaca017f6a6d3c1c02af468a7
Author: Maxim Solodovnik
AuthorDate: Fri Sep 25 14:46:25 2020 +0700
[OPENMEETINGS-2363] initial attempt to re-style dialogs and buttons
---
.../web/common/OmAjaxClientInfoBehavior.java | 4 +-
.../org/apache/openmeetings/web/common/main.js | 22 +---
.../pages/install/InstallWizard$ParamsStep3.html | 12 +--
.../pages/install/InstallWizard$ParamsStep4.html | 8 +-
.../web/pages/install/InstallWizard.java | 10 +-
.../org/apache/openmeetings/web/room/raw-room.js | 12 +++
.../org/apache/openmeetings/web/room/raw-sharer.js | 4 +-
.../apache/openmeetings/web/user/chat/Chat.java| 15 ++-
.../openmeetings/web/user/rooms/RoomListPanel.html | 2 +-
.../openmeetings/web/user/rooms/RoomListPanel.java | 115 +++--
.../openmeetings/web/util/OmTooltipBehavior.java | 34 ++
11 files changed, 139 insertions(+), 99 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmAjaxClientInfoBehavior.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmAjaxClientInfoBehavior.java
index 0c81c78..7af38e5 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmAjaxClientInfoBehavior.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmAjaxClientInfoBehavior.java
@@ -44,9 +44,7 @@ public class OmAjaxClientInfoBehavior extends
AjaxClientInfoBehavior {
@Override
public List getDependencies() {
- List list = super.getDependencies();
-
list.add(JavaScriptHeaderItem.forReference(BrowserInfoForm.JS));
- return list;
+ return
List.of(JavaScriptHeaderItem.forReference(BrowserInfoForm.JS));
}
};
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 aa453a7..b8778d5 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
@@ -29,25 +29,6 @@ var OmUtil = (function() {
function _init(_options) {
options = _options;
}
- function _confirmDlg(_id, okHandler) {
- const confirm = $('#' + _id);
- confirm.dialog({
- modal: true
- , buttons: [{
- text: confirm.data('btn-ok'),
- click: function() {
- okHandler();
- $(this).dialog('close');
- }
- }, {
- text: confirm.data('btn-cancel'),
- click: function() {
- $(this).dialog('close');
- }
- }]
- });
- return confirm;
- }
function _tmpl(tmplId, newId) {
return $(tmplId).clone().attr('id', newId || '');
}
@@ -85,7 +66,6 @@ var OmUtil = (function() {
}
self.init = _init;
- self.confirmDlg = _confirmDlg;
self.tmpl = _tmpl;
self.debugEnabled = _debugEnabled;
self.enableDebug = function() {
@@ -135,7 +115,7 @@ Wicket.BrowserInfo.collectExtraInfo = function(info) {
//Fix to move the close icon on top of the .ui-dialog-titlebar cause otherwise
// touch-events are broken and you won't be able to close the dialog
function fixJQueryUIDialogTouch (dialog) {
-
dialog.parent().find('.ui-dialog-titlebar-close').appendTo(dialog.parent());
+
dialog.parent().find('.ui-dialog-titlebar-close').appendTo(dialog.parent());
}
function showBusyIndicator() {
$('#busy-indicator').show();
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 a97695c..3e65ebf 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
@@ -25,40 +25,40 @@
-
+
