Repository: openmeetings Updated Branches: refs/heads/master 17922b6d9 -> d9ec9b3f7
[OPENMEETINGS-1676] basic work on left panel iconizing Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/d9ec9b3f Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/d9ec9b3f Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/d9ec9b3f Branch: refs/heads/master Commit: d9ec9b3f7e4c8185031ac2259b9ccbbe96a3fff7 Parents: 17922b6 Author: Maxim Solodovnik <[email protected]> Authored: Thu Jul 27 16:16:54 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Thu Jul 27 16:23:53 2017 +0700 ---------------------------------------------------------------------- .../web/common/tree/FolderPanel.java | 3 +- .../org/apache/openmeetings/web/room/room.js | 4 +- .../web/room/sidebar/RoomClientPanel.html | 2 +- .../web/room/sidebar/RoomClientPanel.java | 4 +- openmeetings-web/src/main/webapp/css/room.css | 40 ++++++++++++++++++-- 5 files changed, 45 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d9ec9b3f/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java index 7e685a7..3ee055d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java @@ -117,8 +117,9 @@ public class FolderPanel extends Panel { } } }; - drag.add(name.add(AttributeModifier.append("title", r.getName()))); + drag.add(name); add(drop.add(drag).setOutputMarkupId(true)); + add(AttributeModifier.append("title", r.getName())); } private static void moveAll(final FileTreePanel treePanel, AjaxRequestTarget target, FileItem p) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d9ec9b3f/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 c076069..c1fc388 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 @@ -210,7 +210,7 @@ var VideoManager = (function() { })(); function setRoomSizes() { var sb = $(".room.sidebar.left") - , w = $(window).width() - sb.width() - 5 + , w = $(window).width() - sb.width() - 8 , h = $(window).height() - $('#menu').height() , p = sb.find('.tabs'); sb.height(h); @@ -218,7 +218,7 @@ function setRoomSizes() { p.height(hh); $(".user.list", p).height(hh - $("ul", p).height() - $(".user.header", p).height() - 5); if (!!WbArea) { - WbArea.resize(sb.width(), w, h); + WbArea.resize(sb.width() + 5, w, h); } } function roomReload(event, ui) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d9ec9b3f/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html index fe2a7a3..4df4dcd 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html @@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + --> <html xmlns:wicket="http://wicket.apache.org";> <wicket:panel> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d9ec9b3f/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java index f6eeee2..0c269d5 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java @@ -45,7 +45,9 @@ public class RoomClientPanel extends Panel { item.add(AttributeModifier.append("style", String.format("background-image: url(profile/%s);", c.getUserId()))); item.add(AttributeModifier.append("data-userid", c.getUserId())); add(new RefreshIcon("refresh", c, room)); - add(new Label("name", getName(c))); + final String name = getName(c); + add(new Label("name", name)); + item.add(new AttributeModifier("title", name)); WebMarkupContainer actions = new WebMarkupContainer("actions"); actions.add(new KickIcon("kick", c, room)); actions.add(new WebMarkupContainer("privateChat").setVisible(!room.getRoom().isHidden(RoomElement.Chat) && !getUserId().equals(c.getUserId()))); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d9ec9b3f/openmeetings-web/src/main/webapp/css/room.css ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/room.css b/openmeetings-web/src/main/webapp/css/room.css index 2ae24f3..1069a16 100644 --- a/openmeetings-web/src/main/webapp/css/room.css +++ b/openmeetings-web/src/main/webapp/css/room.css @@ -93,6 +93,15 @@ width: 315px; position: absolute; } +.room.sidebar.left .ui-resizable-handle { + width: 4px; + background-color: #f3f3f4; + border: 1px solid #dedee0; +} +.room.sidebar.left .ui-resizable-handle:hover { + background-color: #b6bdca; + border-color: #bebec3; +} .room.wb.area { position: absolute; } @@ -223,14 +232,14 @@ overflow-y: auto; } .room.sidebar.left .user.list .user { - height: 40px; + min-height: 40px; padding-left: 5px; padding-top: 5px; background-size: 40px 40px; background-repeat: no-repeat; background-position: 2px 2px; } -.room.sidebar.left .user.list .user .name { +.room.sidebar.left .user.list .user.name { line-height: 18px; height: 18px; padding: 0; @@ -239,7 +248,7 @@ } .room.sidebar.left .user.list .user .actions { position: relative; - height: 18px; + min-height: 18px; padding: 0; padding-left: 44px; visibility: hidden; @@ -642,3 +651,28 @@ min-height: 30px; overflow: hidden; } +@media screen and (max-width: 1280px) { + .room.sidebar.left { + width: 150px; + min-width: 150px; + } + .room.sidebar.left .tab.om-icon.big { + max-width: 0px; + padding-right: 0; + } + .room.sidebar.left .user.list .user.name { + display: none; + } + .room.sidebar.left .file.tree .file.item .name, .room.sidebar.left .file.tree .file.item .name span { + width: 40px; + } + .room.sidebar.left .file.tree .file.item .name span { + padding: 0; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + } + .room.sidebar.left .file.tree .file.item { + width: 80px; + } +}
