[jira] [Updated] (OPENMEETINGS-1750) WB toolbar icon size should be reduced
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1750?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik updated OPENMEETINGS-1750: --- Description: WB toolbar icon size should be reduced to -20x20px- 25x25px to better fit WB (was: WB toolbar icon size should be reduced to 20x20px to better fit WB) > WB toolbar icon size should be reduced > -- > > Key: OPENMEETINGS-1750 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1750 > Project: Openmeetings > Issue Type: Improvement > Components: HTML5/WhiteBoard >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Minor > Fix For: 4.0.1 > > > WB toolbar icon size should be reduced to -20x20px- 25x25px to better fit WB -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (OPENMEETINGS-1750) WB toolbar icon size should be reduced
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1750?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16248583#comment-16248583 ] ASF subversion and git services commented on OPENMEETINGS-1750: --- Commit f042e33aaf96b6e887fb7f946c976fd4b7269b40 in openmeetings's branch refs/heads/master from [~solomax] [ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=f042e33 ] [OPENMEETINGS-1750] icons resized to be 25x25 > WB toolbar icon size should be reduced > -- > > Key: OPENMEETINGS-1750 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1750 > Project: Openmeetings > Issue Type: Improvement > Components: HTML5/WhiteBoard >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Minor > Fix For: 4.0.1 > > > WB toolbar icon size should be reduced to 20x20px to better fit WB -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (OPENMEETINGS-1750) WB toolbar icon size should be reduced
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1750?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16248582#comment-16248582 ] ASF subversion and git services commented on OPENMEETINGS-1750: --- Commit c9837c3b2d51b6eec45660a76820fddea07c98f9 in openmeetings's branch refs/heads/4.0.x from [~solomax] [ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=c9837c3 ] [OPENMEETINGS-1750] icons resized to be 25x25 > WB toolbar icon size should be reduced > -- > > Key: OPENMEETINGS-1750 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1750 > Project: Openmeetings > Issue Type: Improvement > Components: HTML5/WhiteBoard >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Minor > Fix For: 4.0.1 > > > WB toolbar icon size should be reduced to 20x20px to better fit WB -- This message was sent by Atlassian JIRA (v6.4.14#64029)
openmeetings git commit: [OPENMEETINGS-1750] icons resized to be 25x25
Repository: openmeetings Updated Branches: refs/heads/master abb51357f -> f042e33aa [OPENMEETINGS-1750] icons resized to be 25x25 Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/f042e33a Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/f042e33a Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/f042e33a Branch: refs/heads/master Commit: f042e33aaf96b6e887fb7f946c976fd4b7269b40 Parents: abb5135 Author: Maxim SolodovnikAuthored: Sat Nov 11 23:29:34 2017 +0700 Committer: Maxim Solodovnik Committed: Sat Nov 11 23:30:40 2017 +0700 -- openmeetings-web/src/main/webapp/css/wb.css | 26 1 file changed, 13 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f042e33a/openmeetings-web/src/main/webapp/css/wb.css -- diff --git a/openmeetings-web/src/main/webapp/css/wb.css b/openmeetings-web/src/main/webapp/css/wb.css index 1662744..9ef758d 100644 --- a/openmeetings-web/src/main/webapp/css/wb.css +++ b/openmeetings-web/src/main/webapp/css/wb.css @@ -54,35 +54,35 @@ background: repeating-linear-gradient(-45deg, transparent, transparent 3px, gray 3px, gray 5px); } .room.wb.area .tools.vertical .bumper { - width: 24px; + width: 31px; height: 11px; } .room.wb.area .tools.horisontal .bumper { width: 11px; - height: 24px; + height: 31px; } .room.wb.area .tools.vertical { - width: 26px; - height: 373px; + width: 31px; + height: 448px; } .room.wb.area .tools.readonly.vertical { - width: 26px; - height: 37px; + width: 31px; + height: 42px; } .room.wb.area .tools.horisontal { - width: 373px; - height: 26px; + width: 448px; + height: 31px; } .room.wb.area .tools.readonly.horisontal { - width: 37px; - height: 26px; + width: 42px; + height: 31px; } .room.wb.area .tools .om-icon.big { float: left; vertical-align: top; - width: 22px; - height: 22px; - background-size: 20px; + width: 27px; + height: 27px; + background-size: 25px; } .room.wb.area .tools .om-icon.big.active { background-color: whitesmoke;
openmeetings git commit: [OPENMEETINGS-1750] icons resized to be 25x25
Repository: openmeetings Updated Branches: refs/heads/4.0.x e70c38a3c -> c9837c3b2 [OPENMEETINGS-1750] icons resized to be 25x25 Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/c9837c3b Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/c9837c3b Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/c9837c3b Branch: refs/heads/4.0.x Commit: c9837c3b2d51b6eec45660a76820fddea07c98f9 Parents: e70c38a Author: Maxim SolodovnikAuthored: Sat Nov 11 23:29:34 2017 +0700 Committer: Maxim Solodovnik Committed: Sat Nov 11 23:29:34 2017 +0700 -- openmeetings-web/src/main/webapp/css/wb.css | 26 1 file changed, 13 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9837c3b/openmeetings-web/src/main/webapp/css/wb.css -- diff --git a/openmeetings-web/src/main/webapp/css/wb.css b/openmeetings-web/src/main/webapp/css/wb.css index 1662744..9ef758d 100644 --- a/openmeetings-web/src/main/webapp/css/wb.css +++ b/openmeetings-web/src/main/webapp/css/wb.css @@ -54,35 +54,35 @@ background: repeating-linear-gradient(-45deg, transparent, transparent 3px, gray 3px, gray 5px); } .room.wb.area .tools.vertical .bumper { - width: 24px; + width: 31px; height: 11px; } .room.wb.area .tools.horisontal .bumper { width: 11px; - height: 24px; + height: 31px; } .room.wb.area .tools.vertical { - width: 26px; - height: 373px; + width: 31px; + height: 448px; } .room.wb.area .tools.readonly.vertical { - width: 26px; - height: 37px; + width: 31px; + height: 42px; } .room.wb.area .tools.horisontal { - width: 373px; - height: 26px; + width: 448px; + height: 31px; } .room.wb.area .tools.readonly.horisontal { - width: 37px; - height: 26px; + width: 42px; + height: 31px; } .room.wb.area .tools .om-icon.big { float: left; vertical-align: top; - width: 22px; - height: 22px; - background-size: 20px; + width: 27px; + height: 27px; + background-size: 25px; } .room.wb.area .tools .om-icon.big.active { background-color: whitesmoke;
[jira] [Commented] (OPENMEETINGS-1748) Chat should refactored so it can be opened and not overlap WB
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1748?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16248576#comment-16248576 ] ASF subversion and git services commented on OPENMEETINGS-1748: --- Commit abb51357f54e3cb8df533aec8c009e630ee1490d in openmeetings's branch refs/heads/master from [~solomax] [ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=abb5135 ] [OPENMEETINGS-1748] rtl is fixed, titles are added > Chat should refactored so it can be opened and not overlap WB > - > > Key: OPENMEETINGS-1748 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1748 > Project: Openmeetings > Issue Type: Improvement > Components: HTML5/Chat, HTML5/Room >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 4.0.1 > > > Chat should refactored so it can be opened and not overlap WB > Global Chat need to be double-checked -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Resolved] (OPENMEETINGS-1748) Chat should refactored so it can be opened and not overlap WB
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1748?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik resolved OPENMEETINGS-1748. Resolution: Fixed > Chat should refactored so it can be opened and not overlap WB > - > > Key: OPENMEETINGS-1748 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1748 > Project: Openmeetings > Issue Type: Improvement > Components: HTML5/Chat, HTML5/Room >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 4.0.1 > > > Chat should refactored so it can be opened and not overlap WB > Global Chat need to be double-checked -- This message was sent by Atlassian JIRA (v6.4.14#64029)
openmeetings git commit: [OPENMEETINGS-1748] rtl is fixed, titles are added
Repository: openmeetings Updated Branches: refs/heads/master 139ec0536 -> abb51357f [OPENMEETINGS-1748] rtl is fixed, titles are added Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/abb51357 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/abb51357 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/abb51357 Branch: refs/heads/master Commit: abb51357f54e3cb8df533aec8c009e630ee1490d Parents: 139ec05 Author: Maxim SolodovnikAuthored: Sat Nov 11 23:21:37 2017 +0700 Committer: Maxim Solodovnik Committed: Sat Nov 11 23:22:12 2017 +0700 -- .../web/app/Application.properties.xml | 2 ++ .../web/app/Application_ar.properties.xml | 2 ++ .../web/app/Application_bg.properties.xml | 2 ++ .../web/app/Application_ca.properties.xml | 2 ++ .../web/app/Application_cs.properties.xml | 2 ++ .../web/app/Application_da.properties.xml | 2 ++ .../web/app/Application_de.properties.xml | 2 ++ .../web/app/Application_el.properties.xml | 2 ++ .../web/app/Application_es.properties.xml | 2 ++ .../web/app/Application_fa.properties.xml | 2 ++ .../web/app/Application_fi.properties.xml | 2 ++ .../web/app/Application_fr.properties.xml | 2 ++ .../web/app/Application_gl.properties.xml | 2 ++ .../web/app/Application_he.properties.xml | 2 ++ .../web/app/Application_hu.properties.xml | 2 ++ .../web/app/Application_id.properties.xml | 2 ++ .../web/app/Application_it.properties.xml | 2 ++ .../web/app/Application_ja.properties.xml | 2 ++ .../web/app/Application_ko.properties.xml | 2 ++ .../web/app/Application_nl.properties.xml | 2 ++ .../web/app/Application_pl.properties.xml | 2 ++ .../web/app/Application_pt.properties.xml | 2 ++ .../web/app/Application_pt_BR.properties.xml| 2 ++ .../web/app/Application_ru.properties.xml | 2 ++ .../web/app/Application_sk.properties.xml | 2 ++ .../web/app/Application_sv.properties.xml | 2 ++ .../web/app/Application_th.properties.xml | 2 ++ .../web/app/Application_tr.properties.xml | 2 ++ .../web/app/Application_uk.properties.xml | 2 ++ .../web/app/Application_zh_CN.properties.xml| 2 ++ .../web/app/Application_zh_TW.properties.xml| 2 ++ .../org/apache/openmeetings/web/room/room.js| 22 + .../openmeetings/web/room/wb/interview-area.js | 4 ++-- .../apache/openmeetings/web/room/wb/wb-area.js | 4 ++-- .../openmeetings/web/user/chat/ChatPanel.html | 7 +++--- .../apache/openmeetings/web/user/chat/chat.js | 25 openmeetings-web/src/main/webapp/css/chat.css | 2 +- .../src/main/webapp/css/general-rtl.css | 6 +++-- openmeetings-web/src/main/webapp/css/room.css | 4 ++-- 39 files changed, 109 insertions(+), 27 deletions(-) -- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/abb51357/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml -- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml index 0e53f4b..49781fa 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml @@ -984,4 +984,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details + + http://git-wip-us.apache.org/repos/asf/openmeetings/blob/abb51357/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml -- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml index 7b13173..323e58e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml @@ -984,4 +984,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details + + http://git-wip-us.apache.org/repos/asf/openmeetings/blob/abb51357/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml -- diff --git
[jira] [Commented] (OPENMEETINGS-1748) Chat should refactored so it can be opened and not overlap WB
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1748?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16248574#comment-16248574 ] ASF subversion and git services commented on OPENMEETINGS-1748: --- Commit e70c38a3ce6d2104973a1c487d8e5200141536c1 in openmeetings's branch refs/heads/4.0.x from [~solomax] [ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=e70c38a ] [OPENMEETINGS-1748] rtl is fixed, titles are added > Chat should refactored so it can be opened and not overlap WB > - > > Key: OPENMEETINGS-1748 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1748 > Project: Openmeetings > Issue Type: Improvement > Components: HTML5/Chat, HTML5/Room >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 4.0.1 > > > Chat should refactored so it can be opened and not overlap WB > Global Chat need to be double-checked -- This message was sent by Atlassian JIRA (v6.4.14#64029)
openmeetings git commit: [OPENMEETINGS-1748] chat open is fixed
Repository: openmeetings Updated Branches: refs/heads/master faa455b13 -> 139ec0536 [OPENMEETINGS-1748] chat open is fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/139ec053 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/139ec053 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/139ec053 Branch: refs/heads/master Commit: 139ec0536651225b9ebc7d83c6f2ec688c3f7abd Parents: faa455b Author: Maxim SolodovnikAuthored: Sat Nov 11 20:02:33 2017 +0700 Committer: Maxim Solodovnik Committed: Sat Nov 11 20:03:01 2017 +0700 -- .../java/org/apache/openmeetings/web/user/chat/chat.js | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/139ec053/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js -- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js index 445e2cd..965da9d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js @@ -242,10 +242,8 @@ var Chat = function() { } } function _setOpened() { - _open(function() { - p.addClass('opened').off('mouseenter mouseleave'); - Room.setSize(); - }); + p.addClass('opened').off('mouseenter mouseleave'); + Room.setSize(); } function _open(handler) { if (isClosed()) { @@ -319,7 +317,11 @@ var Chat = function() { , addTab: _addTab , addMessage: _addMessage , open: _open - , setOpened: _setOpened + , setOpened: function() { + _open(function() { + _setOpened(); + }); + } , close: _close , toggle: _toggle , emtClick: _emtClick
[jira] [Commented] (OPENMEETINGS-1748) Chat should refactored so it can be opened and not overlap WB
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1748?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16248511#comment-16248511 ] ASF subversion and git services commented on OPENMEETINGS-1748: --- Commit 405ecc3f737d30e2af8f59c5ea8419aac57d30e4 in openmeetings's branch refs/heads/4.0.x from [~solomax] [ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=405ecc3 ] [OPENMEETINGS-1748] chat open is fixed > Chat should refactored so it can be opened and not overlap WB > - > > Key: OPENMEETINGS-1748 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1748 > Project: Openmeetings > Issue Type: Improvement > Components: HTML5/Chat, HTML5/Room >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 4.0.1 > > > Chat should refactored so it can be opened and not overlap WB > Global Chat need to be double-checked -- This message was sent by Atlassian JIRA (v6.4.14#64029)
openmeetings git commit: [OPENMEETINGS-1748] chat open is fixed
Repository: openmeetings Updated Branches: refs/heads/4.0.x ab817fdfa -> 405ecc3f7 [OPENMEETINGS-1748] chat open is fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/405ecc3f Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/405ecc3f Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/405ecc3f Branch: refs/heads/4.0.x Commit: 405ecc3f737d30e2af8f59c5ea8419aac57d30e4 Parents: ab817fd Author: Maxim SolodovnikAuthored: Sat Nov 11 20:02:33 2017 +0700 Committer: Maxim Solodovnik Committed: Sat Nov 11 20:02:33 2017 +0700 -- .../java/org/apache/openmeetings/web/user/chat/chat.js | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/405ecc3f/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js -- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js index 445e2cd..965da9d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js @@ -242,10 +242,8 @@ var Chat = function() { } } function _setOpened() { - _open(function() { - p.addClass('opened').off('mouseenter mouseleave'); - Room.setSize(); - }); + p.addClass('opened').off('mouseenter mouseleave'); + Room.setSize(); } function _open(handler) { if (isClosed()) { @@ -319,7 +317,11 @@ var Chat = function() { , addTab: _addTab , addMessage: _addMessage , open: _open - , setOpened: _setOpened + , setOpened: function() { + _open(function() { + _setOpened(); + }); + } , close: _close , toggle: _toggle , emtClick: _emtClick
[jira] [Commented] (OPENMEETINGS-1748) Chat should refactored so it can be opened and not overlap WB
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1748?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16248396#comment-16248396 ] ASF subversion and git services commented on OPENMEETINGS-1748: --- Commit faa455b1373c75c287c938414df5d485011cec1e in openmeetings's branch refs/heads/master from [~solomax] [ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=faa455b ] [OPENMEETINGS-1748] chat can be visible without overlapping > Chat should refactored so it can be opened and not overlap WB > - > > Key: OPENMEETINGS-1748 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1748 > Project: Openmeetings > Issue Type: Improvement > Components: HTML5/Chat, HTML5/Room >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 4.0.1 > > > Chat should refactored so it can be opened and not overlap WB > Global Chat need to be double-checked -- This message was sent by Atlassian JIRA (v6.4.14#64029)
openmeetings git commit: [OPENMEETINGS-1748] chat can be visible without overlapping
Repository: openmeetings Updated Branches: refs/heads/master 802f55cbf -> faa455b13 [OPENMEETINGS-1748] chat can be visible without overlapping Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/faa455b1 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/faa455b1 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/faa455b1 Branch: refs/heads/master Commit: faa455b1373c75c287c938414df5d485011cec1e Parents: 802f55c Author: Maxim SolodovnikAuthored: Sat Nov 11 15:50:48 2017 +0700 Committer: Maxim Solodovnik Committed: Sat Nov 11 15:51:19 2017 +0700 -- .../openmeetings/web/common/MainPanel.html | 2 +- .../org/apache/openmeetings/web/room/room.js| 6 +- .../openmeetings/web/user/chat/ChatPanel.html | 2 +- .../openmeetings/web/user/chat/ChatPanel.java | 18 +-- .../apache/openmeetings/web/user/chat/chat.js | 149 ++- openmeetings-web/src/main/webapp/css/chat.css | 11 +- 6 files changed, 129 insertions(+), 59 deletions(-) -- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/faa455b1/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html -- 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 dc2dfa2..a0f8232 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 @@ -53,7 +53,7 @@ - + http://git-wip-us.apache.org/repos/asf/openmeetings/blob/faa455b1/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js -- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js index b6ec7fb..3283807 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js @@ -561,12 +561,13 @@ var VideoManager = (function() { })(); var Room = (function() { const self = {}; - let options, menuHeight; + let options, menuHeight, chat; function _init(_options) { options = _options; window.WbArea = options.interview ? InterviewWbArea() : DrawWbArea(); const menu = $('.room.box .room.menu'); + chat = $('#chatPanel'); menuHeight = menu.length === 0 ? 0 : menu.height(); VideoManager.init(); Activities.init(); @@ -629,8 +630,9 @@ var Room = (function() { } else { holder.removeClass('big').addClass('small'); } + Chat.setHeight(h); if (typeof WbArea !== 'undefined') { - WbArea.resize(sb.width() + 5, w, h); + WbArea.resize(sb.width() + 5, w - chat.width(), h); } } function _reload() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/faa455b1/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html -- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html index 53ed9d4..9f9118e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html @@ -21,7 +21,7 @@ http://wicket.apache.org;> - + http://git-wip-us.apache.org/repos/asf/openmeetings/blob/faa455b1/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java -- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java index 70bab82..6c2f905 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java @@ -48,14 +48,14 @@ public class ChatPanel extends Panel {
openmeetings git commit: [OPENMEETINGS-1748] chat can be visible without overlapping
Repository: openmeetings Updated Branches: refs/heads/4.0.x 21577e475 -> ab817fdfa [OPENMEETINGS-1748] chat can be visible without overlapping Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/ab817fdf Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/ab817fdf Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/ab817fdf Branch: refs/heads/4.0.x Commit: ab817fdfaa40a1175c66ae75e84bfa848911986b Parents: 21577e4 Author: Maxim SolodovnikAuthored: Sat Nov 11 15:50:48 2017 +0700 Committer: Maxim Solodovnik Committed: Sat Nov 11 15:50:48 2017 +0700 -- .../openmeetings/web/common/MainPanel.html | 2 +- .../org/apache/openmeetings/web/room/room.js| 6 +- .../openmeetings/web/user/chat/ChatPanel.html | 2 +- .../openmeetings/web/user/chat/ChatPanel.java | 18 +-- .../apache/openmeetings/web/user/chat/chat.js | 149 ++- openmeetings-web/src/main/webapp/css/chat.css | 11 +- 6 files changed, 129 insertions(+), 59 deletions(-) -- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ab817fdf/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html -- 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 dc2dfa2..a0f8232 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 @@ -53,7 +53,7 @@ - + http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ab817fdf/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js -- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js index b6ec7fb..3283807 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js @@ -561,12 +561,13 @@ var VideoManager = (function() { })(); var Room = (function() { const self = {}; - let options, menuHeight; + let options, menuHeight, chat; function _init(_options) { options = _options; window.WbArea = options.interview ? InterviewWbArea() : DrawWbArea(); const menu = $('.room.box .room.menu'); + chat = $('#chatPanel'); menuHeight = menu.length === 0 ? 0 : menu.height(); VideoManager.init(); Activities.init(); @@ -629,8 +630,9 @@ var Room = (function() { } else { holder.removeClass('big').addClass('small'); } + Chat.setHeight(h); if (typeof WbArea !== 'undefined') { - WbArea.resize(sb.width() + 5, w, h); + WbArea.resize(sb.width() + 5, w - chat.width(), h); } } function _reload() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ab817fdf/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html -- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html index 53ed9d4..9f9118e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html @@ -21,7 +21,7 @@ http://wicket.apache.org;> - + http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ab817fdf/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java -- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java index 70bab82..6c2f905 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java @@ -48,14 +48,14 @@ public class ChatPanel extends Panel {