You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/02/14 16:53:09 UTC
[openmeetings] branch master updated: [OPENMEETINGS-1832] file info
display should be 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 c050c7c [OPENMEETINGS-1832] file info display should be fixed
c050c7c is described below
commit c050c7c3eae2bab3a89e0ae25d519461073e3123
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Feb 14 23:52:35 2018 +0700
[OPENMEETINGS-1832] file info display should be fixed
---
.../web/common/tree/FileTreePanel.html | 26 ++++++++++++----------
.../web/common/tree/FileTreePanel.java | 2 +-
.../org/apache/openmeetings/web/room/room-base.js | 2 +-
.../web/room/sidebar/RoomFilePanel.java | 8 +++++++
.../openmeetings/web/room/sidebar/RoomSidebar.java | 3 ++-
5 files changed, 26 insertions(+), 15 deletions(-)
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 758cd48..0dd4dcd 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
@@ -33,18 +33,20 @@
<div id="tree-anchor" style="height: 2px; width: 2px;"></div>
<div wicket:id="tree"></div>
</div>
- <span wicket:id="download" wicket:message="title:867"></span>
- <div wicket:id="sizes" class="sizes">
- <table>
- <tr>
- <td><wicket:message key="923"/></td>
- <td><span wicket:id="homeSize"></span></td>
- </tr>
- <tr>
- <td><wicket:message key="924"/></td>
- <td><span wicket:id="publicSize"></span></td>
- </tr>
- </table>
+ <div class="footer">
+ <span wicket:id="download" wicket:message="title:867"></span>
+ <div wicket:id="sizes" class="sizes">
+ <table>
+ <tr>
+ <td><wicket:message key="923"/></td>
+ <td><span wicket:id="homeSize"></span></td>
+ </tr>
+ <tr>
+ <td><wicket:message key="924"/></td>
+ <td><span wicket:id="publicSize"></span></td>
+ </tr>
+ </table>
+ </div>
</div>
<div wicket:id="errors"></div>
</div>
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 75170ae..78282b2 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
@@ -408,7 +408,7 @@ public abstract class FileTreePanel extends Panel {
selected.put(fi.getHash(), fi);
lastSelected = fi;
}
- updateSelected(target); //all finaly selected are in the update list
+ updateSelected(target); //all finally selected are in the update list
if (target != null) {
target.add(trashBorder, download.setVisible(isDownloadable(lastSelected)));
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room-base.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room-base.js
index 8886af1..a150835 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room-base.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room-base.js
@@ -653,7 +653,7 @@ var Room = (function() {
sb.height(h - ah);
p.height(hh - ah);
$('.user.list', p).height(hh - ulh - ah - $('.user.header', p).height() - 5);
- $('.trees', fl).height(hh - ulh - ah - $('.trash-toolbar', fl).height() - $('.sizes', fl).height() - 5);
+ $('.trees', fl).height(hh - ulh - ah - $('.trash-toolbar', fl).height() - $('.footer', fl).height() - 5);
if (sbW > 255) {
holder.addClass('big').removeClass('small');
} else {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java
index 3a17f10..5a45d93 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java
@@ -81,4 +81,12 @@ public class RoomFilePanel extends FileTreePanel {
}
});
}
+
+ @Override
+ public void select(BaseFileItem fi, AjaxRequestTarget target, boolean shift, boolean ctrl) {
+ super.select(fi, target, shift, ctrl);
+ if (target != null) {
+ target.appendJavaScript("Room.setSize();");
+ }
+ }
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
index 1e1f2d3..8eaf87f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
@@ -64,6 +64,7 @@ import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import com.github.openjson.JSONObject;
+import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.JQueryUIBehavior;
public class RoomSidebar extends Panel {
@@ -265,7 +266,7 @@ public class RoomSidebar extends Panel {
});
add(form.add(confirmTrash), upload = new UploadDialog("upload", room, roomFiles));
updateShowFiles(null);
- add(new JQueryUIBehavior("#room-sidebar-tabs", "tabs"));
+ add(new JQueryUIBehavior("#room-sidebar-tabs", "tabs", new Options("activate", "function(event, ui) {Room.setSize();}")));
add(activities = new ActivitiesPanel("activities", room));
}
--
To stop receiving notification emails like this one, please contact
solomax@apache.org.