Repository: openmeetings Updated Branches: refs/heads/3.3.x 33d84f19f -> bd831dbdc
no jira: room list look is improved Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/bd831dbd Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/bd831dbd Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/bd831dbd Branch: refs/heads/3.3.x Commit: bd831dbdc3c1d5c3689c1595a7a857146dac30f5 Parents: 33d84f1 Author: Maxim Solodovnik <[email protected]> Authored: Tue Sep 12 12:14:22 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Tue Sep 12 12:14:22 2017 +0700 ---------------------------------------------------------------------- .../web/user/rooms/RoomListPanel.html | 24 +++++++++----------- openmeetings-web/src/main/webapp/css/admin.css | 2 +- .../src/main/webapp/css/general.css | 13 ++++++++++- 3 files changed, 24 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bd831dbd/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.html index 3bef8d5..2aef6d1 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.html @@ -20,19 +20,17 @@ --> <html xmlns:wicket="http://wicket.apache.org";> <wicket:panel> - <table class="room-list"> - <tr wicket:id="list" class="room-row"> - <td> - <div wicket:id="roomContainer"> - <div><span wicket:id="roomName">[room name]</span> <span wicket:id="info" class="info-text"> </span></div> - <div> - <wicket:message key="398" /> <span wicket:id="curUsers"></span> / <span - wicket:id="totalUsers"></span> <span wicket:id="refresh"> </span> - </div> + <div class="room-list"> + <div wicket:id="list" class="room-row"> + <div class="container" wicket:id="roomContainer"> + <div><span wicket:id="roomName">[room name]</span> <span wicket:id="info" class="info-text"> </span></div> + <div> + <wicket:message key="398" /> <span wicket:id="curUsers"></span> / <span + wicket:id="totalUsers"></span> <span wicket:id="refresh"> </span> </div> - </td> - <td><button wicket:id="btn"><span wicket:id="label"></span></button></td> - </tr> - </table> + </div> + <button wicket:id="btn"><span wicket:id="label"></span></button> + </div> + </div> </wicket:panel> </html> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bd831dbd/openmeetings-web/src/main/webapp/css/admin.css ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/admin.css b/openmeetings-web/src/main/webapp/css/admin.css index 0f6bf70..12980ab 100644 --- a/openmeetings-web/src/main/webapp/css/admin.css +++ b/openmeetings-web/src/main/webapp/css/admin.css @@ -38,7 +38,7 @@ table.adminListTable tr:nth-child(odd), table.adminListTableSmall tr:nth-child(o opacity: .8; } -table.adminListTable tr:hover, table.adminListTableSmall tr:hover, tr.room-row:hover { +table.adminListTable tr:hover, table.adminListTableSmall tr:hover, .room-row:hover { /*SHOULD BE MANUALLY IN SYNC WITH THEME .ui-state-hover */ border: 1px solid #74b2e2; background: #e4f1fb; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bd831dbd/openmeetings-web/src/main/webapp/css/general.css ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/general.css b/openmeetings-web/src/main/webapp/css/general.css index 84c8be5..a08adb5 100644 --- a/openmeetings-web/src/main/webapp/css/general.css +++ b/openmeetings-web/src/main/webapp/css/general.css @@ -425,10 +425,21 @@ select.messages.selector { } .room-list { border-collapse: collapse; + min-width: 400px; } -.room-row { +.room-list .room-row { background-color: rgb(248, 248, 248); border-bottom: 5px solid white; + padding: 5px; + position: relative; +} +.room-list .room-row .container { + margin-right: 120px; +} +.room-list .room-row button { + position: absolute; + right: 10px; + top: 10px; } .select2-results .user.external, .select2-selection .user.external , .select2-results .user.internal, .select2-selection .user.internal {
