Author: solomax
Date: Tue Jan 17 09:58:13 2017
New Revision: 1779158
URL: http://svn.apache.org/viewvc?rev=1779158&view=rev
Log:
[OPENMEETINGS-895] file tree fixes, code clean-up
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme.css
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java?rev=1779158&r1=1779157&r2=1779158&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java
Tue Jan 17 09:58:13 2017
@@ -60,12 +60,14 @@ public class WhiteboardManager {
// log.debug(actionObject);
// log.debug(actionObject.size()-1);
//
log.debug(actionObject.get(actionObject.size()-1));
- String objectType =
actionObject.get(0).toString();
- if (!objectType.equals("pointerWhiteBoard")) {
- String objectOID =
actionObject.get(actionObject.size() - 1).toString();
- log.debug("objectOID: " + objectOID);
- whiteboardObject.add(objectOID,
actionObject);
-
wbListManagerById.setWhiteBoardObjectListRoomObjAndWhiteboardId(roomId,
whiteboardObject, whiteBoardId);
+ if (actionObject != null &&
!actionObject.isEmpty()) {
+ String objectType =
actionObject.get(0).toString();
+ if
(!objectType.equals("pointerWhiteBoard")) {
+ String objectOID =
actionObject.get(actionObject.size() - 1).toString();
+ log.debug("objectOID: " +
objectOID);
+ whiteboardObject.add(objectOID,
actionObject);
+
wbListManagerById.setWhiteBoardObjectListRoomObjAndWhiteboardId(roomId,
whiteboardObject, whiteBoardId);
+ }
}
} else if (action.equals("clear")) {
WhiteboardObject whiteboardObject =
wbListManagerById.getWhiteBoardObjectListByRoomIdAndWhiteboard(roomId,
whiteBoardId);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html?rev=1779158&r1=1779157&r2=1779158&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
Tue Jan 17 09:58:13 2017
@@ -23,8 +23,7 @@
<form wicket:id="form">
<script type="text/javascript">
function treeRevert(dropped) {
- $('#tree-anchor').get(0).scrollIntoView();
- this.parent().parent().get(0).scrollIntoView();
+ $('.file.tree .trees')[0].scrollTop =
$(this).parent()[0].offsetTop - 32;
return !dropped || (!!dropped && !!dropped.context &&
$(dropped.context).hasClass('wb', 'room'));
}
</script>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java?rev=1779158&r1=1779157&r2=1779158&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
Tue Jan 17 09:58:13 2017
@@ -200,11 +200,11 @@ public class RoomMenuPanel extends Panel
Room r = room.getRoom();
setVisible(!r.isHidden(RoomElement.TopBar));
add((menuPanel = new MenuPanel("menu",
getMenu())).setVisible(isVisible()));
- add(askBtn);
- add((roomName = new Label("roomName",
r.getName())).setOutputMarkupId(true));
+
add(askBtn.setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true));
+ add((roomName = new Label("roomName",
r.getName())).setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true));
String tag = getGroup().getTag();
add(logo, new Label("tag",
tag).setVisible(!Strings.isEmpty(tag)));
- add(shareBtn = new StartSharingButton("share",
room.getClient()));
+ add((shareBtn = new StartSharingButton("share",
room.getClient())).setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true));
RoomInvitationForm rif = new RoomInvitationForm("form",
room.getRoom().getId());
add(invite = new InvitationDialog("invite", rif));
rif.setDialog(invite);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html?rev=1779158&r1=1779157&r2=1779158&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
Tue Jan 17 09:58:13 2017
@@ -21,7 +21,7 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<div class="tabs" wicket:id="tabs"></div>
-
+
<wicket:fragment wicket:id="user-panel">
<div wicket:id="icons" class="user header"></div>
<div class="user list clear">
@@ -31,7 +31,7 @@
</div>
<script>setHeight();</script>
</wicket:fragment>
-
+
<wicket:fragment wicket:id="file-panel">
<div class="file list" wicket:id="tree"></div>
</wicket:fragment>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java?rev=1779158&r1=1779157&r2=1779158&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
Tue Jan 17 09:58:13 2017
@@ -81,7 +81,7 @@ public class RoomSidebar extends Panel {
private final UploadDialog upload;
private final RoomFilePanel roomFiles;
private final SelfIconsPanel selfRights;
- private final ConfirmableAjaxBorder confirmKick;
+ private ConfirmableAjaxBorder confirmKick;
private boolean showFiles;
private boolean avInited = false;
private int selectedIdx = 0;
@@ -258,7 +258,7 @@ public class RoomSidebar extends Panel {
return new FileFragment(containerId,
"file-panel");
}
};
- add(tabs = new TabbedPanel("tabs", newTabModel()) {
+ add((tabs = new TabbedPanel("tabs", newTabModel()) {
private static final long serialVersionUID = 1L;
@Override
@@ -271,10 +271,16 @@ public class RoomSidebar extends Panel {
public void onActivate(AjaxRequestTarget target, int
index, ITab tab) {
selectedIdx = index;
}
- });
+ }).setOutputMarkupId(true));
roomFiles = new RoomFilePanel("tree", room);
selfRights = new SelfIconsPanel("icons", room.getClient(),
room, true);
add(upload = new UploadDialog("upload", room, roomFiles));
+ add(toggleRight, toggleActivity, roomAction, avSettings);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
add(confirmKick = new ConfirmableAjaxBorder("confirm-kick",
getString("603"), getString("605")) {
private static final long serialVersionUID = 1L;
@@ -283,7 +289,6 @@ public class RoomSidebar extends Panel {
room.kickUser(target, kickedClient);
}
});
- add(toggleRight, toggleActivity, roomAction, avSettings);
}
private TabListModel newTabModel() {
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme.css?rev=1779158&r1=1779157&r2=1779158&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme.css
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme.css
Tue Jan 17 09:58:13 2017
@@ -420,11 +420,11 @@ html, body {
}
.file.item .errors {
position: absolute;
- top: 10px;
+ top: 0px;
right: 0px;
background-image: url(images/script_error.png);
- width: 16px;
- height: 16px;
+ width: 32px;
+ height: 32px;
background-repeat: no-repeat;
}
.dialog.errors {
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java?rev=1779158&r1=1779157&r2=1779158&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java
Tue Jan 17 09:58:13 2017
@@ -60,12 +60,14 @@ public class WhiteboardManager {
// log.debug(actionObject);
// log.debug(actionObject.size()-1);
//
log.debug(actionObject.get(actionObject.size()-1));
- String objectType =
actionObject.get(0).toString();
- if (!objectType.equals("pointerWhiteBoard")) {
- String objectOID =
actionObject.get(actionObject.size() - 1).toString();
- log.debug("objectOID: " + objectOID);
- whiteboardObject.add(objectOID,
actionObject);
-
wbListManagerById.setWhiteBoardObjectListRoomObjAndWhiteboardId(roomId,
whiteboardObject, whiteBoardId);
+ if (actionObject != null &&
!actionObject.isEmpty()) {
+ String objectType =
actionObject.get(0).toString();
+ if
(!objectType.equals("pointerWhiteBoard")) {
+ String objectOID =
actionObject.get(actionObject.size() - 1).toString();
+ log.debug("objectOID: " +
objectOID);
+ whiteboardObject.add(objectOID,
actionObject);
+
wbListManagerById.setWhiteBoardObjectListRoomObjAndWhiteboardId(roomId,
whiteboardObject, whiteBoardId);
+ }
}
} else if (action.equals("clear")) {
WhiteboardObject whiteboardObject =
wbListManagerById.getWhiteBoardObjectListByRoomIdAndWhiteboard(roomId,
whiteBoardId);
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html?rev=1779158&r1=1779157&r2=1779158&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
Tue Jan 17 09:58:13 2017
@@ -23,8 +23,7 @@
<form wicket:id="form">
<script type="text/javascript">
function treeRevert(dropped) {
- $('#tree-anchor').get(0).scrollIntoView();
- this.parent().parent().get(0).scrollIntoView();
+ $('.file.tree .trees')[0].scrollTop =
$(this).parent()[0].offsetTop - 32;
return !dropped || (!!dropped && !!dropped.context &&
$(dropped.context).hasClass('wb', 'room'));
}
</script>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java?rev=1779158&r1=1779157&r2=1779158&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
Tue Jan 17 09:58:13 2017
@@ -200,11 +200,11 @@ public class RoomMenuPanel extends Panel
Room r = room.getRoom();
setVisible(!r.isHidden(RoomElement.TopBar));
add((menuPanel = new MenuPanel("menu",
getMenu())).setVisible(isVisible()));
- add(askBtn);
- add((roomName = new Label("roomName",
r.getName())).setOutputMarkupId(true));
+
add(askBtn.setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true));
+ add((roomName = new Label("roomName",
r.getName())).setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true));
String tag = getGroup().getTag();
add(logo, new Label("tag",
tag).setVisible(!Strings.isEmpty(tag)));
- add(shareBtn = new StartSharingButton("share",
room.getClient()));
+ add((shareBtn = new StartSharingButton("share",
room.getClient())).setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true));
RoomInvitationForm rif = new RoomInvitationForm("form",
room.getRoom().getId());
add(invite = new InvitationDialog("invite", rif));
rif.setDialog(invite);
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html?rev=1779158&r1=1779157&r2=1779158&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
Tue Jan 17 09:58:13 2017
@@ -21,7 +21,7 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<div class="tabs" wicket:id="tabs"></div>
-
+
<wicket:fragment wicket:id="user-panel">
<div wicket:id="icons" class="user header"></div>
<div class="user list clear">
@@ -31,7 +31,7 @@
</div>
<script>setHeight();</script>
</wicket:fragment>
-
+
<wicket:fragment wicket:id="file-panel">
<div class="file list" wicket:id="tree"></div>
</wicket:fragment>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java?rev=1779158&r1=1779157&r2=1779158&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
Tue Jan 17 09:58:13 2017
@@ -81,7 +81,7 @@ public class RoomSidebar extends Panel {
private final UploadDialog upload;
private final RoomFilePanel roomFiles;
private final SelfIconsPanel selfRights;
- private final ConfirmableAjaxBorder confirmKick;
+ private ConfirmableAjaxBorder confirmKick;
private boolean showFiles;
private boolean avInited = false;
private int selectedIdx = 0;
@@ -258,7 +258,7 @@ public class RoomSidebar extends Panel {
return new FileFragment(containerId,
"file-panel");
}
};
- add(tabs = new TabbedPanel("tabs", newTabModel()) {
+ add((tabs = new TabbedPanel("tabs", newTabModel()) {
private static final long serialVersionUID = 1L;
@Override
@@ -271,10 +271,16 @@ public class RoomSidebar extends Panel {
public void onActivate(AjaxRequestTarget target, int
index, ITab tab) {
selectedIdx = index;
}
- });
+ }).setOutputMarkupId(true));
roomFiles = new RoomFilePanel("tree", room);
selfRights = new SelfIconsPanel("icons", room.getClient(),
room, true);
add(upload = new UploadDialog("upload", room, roomFiles));
+ add(toggleRight, toggleActivity, roomAction, avSettings);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
add(confirmKick = new ConfirmableAjaxBorder("confirm-kick",
getString("603"), getString("605")) {
private static final long serialVersionUID = 1L;
@@ -283,7 +289,6 @@ public class RoomSidebar extends Panel {
room.kickUser(target, kickedClient);
}
});
- add(toggleRight, toggleActivity, roomAction, avSettings);
}
private TabListModel newTabModel() {
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css?rev=1779158&r1=1779157&r2=1779158&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
Tue Jan 17 09:58:13 2017
@@ -420,11 +420,11 @@ html, body {
}
.file.item .errors {
position: absolute;
- top: 10px;
+ top: 0px;
right: 0px;
background-image: url(images/script_error.png);
- width: 16px;
- height: 16px;
+ width: 32px;
+ height: 32px;
background-repeat: no-repeat;
}
.dialog.errors {
