Author: solomax
Date: Tue Jan 17 08:21:44 2017
New Revision: 1779148
URL: http://svn.apache.org/viewvc?rev=1779148&view=rev
Log:
[OPENMEETINGS-895] better look'n'feel for file tree; code clean-up
Added:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/folder_open.png
(with props)
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/folder_open.png
(with props)
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.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/common/tree/FileTreePanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/chart_pie.png
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/chart_pie_error.png
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/film.png
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/film_error.png
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/film_processing.png
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/folder.png
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/house_link.png
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/layout.png
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/layout_error.png
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/page.png
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/page_error.png
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/picture.png
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/picture_error.png
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/script_error.png
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/world_link.png
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme.css
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.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/common/tree/FileTreePanel.java
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/chart_pie.png
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/chart_pie_error.png
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/film.png
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/film_error.png
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/film_processing.png
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/folder.png
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/house_link.png
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/layout.png
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/layout_error.png
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/page.png
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/page_error.png
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/picture.png
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/picture_error.png
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/script_error.png
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/world_link.png
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemPanel.html?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemPanel.html
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemPanel.html
Tue Jan 17 08:21:44 2017
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java
Tue Jan 17 08:21:44 2017
@@ -34,6 +34,7 @@ import org.apache.wicket.model.Model;
public class FileItemTree extends DefaultNestedTree<FileItem> {
private static final long serialVersionUID = 1L;
private final FileTreePanel treePanel;
+ private final static String CSS_CLASS_FILE = "file ";
public FileItemTree(String id, FileTreePanel treePanel,
ITreeProvider<FileItem> tp) {
super(id, tp);
@@ -77,62 +78,62 @@ public class FileItemTree extends Defaul
}
}
- private String getItemStyle(FileItem f, String def) {
- String style;
+ private String getItemStyle(FileItem f, boolean open) {
+ StringBuilder style = new StringBuilder("big
om-icon ");
if (f.getId() == null) {
- style = f.getHash().indexOf("my") > -1
? "my file om-icon" : "public file om-icon";
+
style.append(CSS_CLASS_FILE).append(f.getHash().indexOf("my") > -1 ? "my" :
"public");
} else {
- String _style, addStyle = f.exists() ?
"" : "broken";
+ if (!f.exists()) {
+ style.append("broken ");
+ }
switch(f.getType()) {
case Folder:
- _style = def;
+
style.append(CSS_CLASS_FILE).append(open ? "folder-open " : "folder ");
break;
case Image:
- _style = "image file
om-icon";
+
style.append(CSS_CLASS_FILE).append("image ");
break;
case PollChart:
- _style = "chart file
om-icon";
+
style.append(CSS_CLASS_FILE).append("chart ");
break;
case WmlFile:
- _style = "wml file
om-icon";
+
style.append(CSS_CLASS_FILE).append("wml ");
break;
case Video:
case Recording:
{
- _style = "recording
om-icon";
+ style.append("recording
");
if (f instanceof
Recording) {
Status st =
((Recording)f).getStatus();
if
(Status.RECORDING == st || Status.CONVERTING == st) {
-
addStyle = "processing";
+
style.append("processing");
}
}
}
break;
case Presentation:
- _style = "doc file
om-icon";
+
style.append(CSS_CLASS_FILE).append("doc ");
break;
default:
- _style = "file om-icon";
break;
}
- style = String.format("%s %s",
addStyle, _style);
}
- return style;
+ return style.toString();
}
@Override
protected String getOtherStyleClass(FileItem r) {
- return getItemStyle(r,
super.getOtherStyleClass(r));
+ return getItemStyle(r, false);
}
@Override
protected String getOpenStyleClass() {
- return getItemStyle(getModelObject(),
super.getOpenStyleClass());
+ return getItemStyle(getModelObject(), true);
}
@Override
protected String getClosedStyleClass() {
- return getItemStyle(getModelObject(),
super.getClosedStyleClass());
+ return getItemStyle(getModelObject(), false);
}
@Override
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=1779148&r1=1779147&r2=1779148&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 08:21:44 2017
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -30,10 +30,10 @@
</script>
<div class="file tree item drop area">
<div class="icons clear trash-toolbar"
wicket:id="trash-toolbar" wicket:message="title:705">
- <span wicket:id="upload" class="add om-icon align-left
clickable" wicket:message="title:702"></span>
- <span wicket:id="create" class="folder-create om-icon
align-left clickable" wicket:message="title:703"></span>
- <span wicket:id="refresh" class="refresh om-icon
align-left clickable" wicket:message="title:704"></span>
- <span wicket:id="trash" class="trash om-icon
align-right clickable"></span>
+ <span wicket:id="upload" class="add om-icon big
align-left clickable" wicket:message="title:702"></span>
+ <span wicket:id="create" class="folder-create big
om-icon align-left clickable" wicket:message="title:703"></span>
+ <span wicket:id="refresh" class="refresh om-icon big
align-left clickable" wicket:message="title:704"></span>
+ <span wicket:id="trash" class="trash om-icon big
align-right clickable"></span>
<div class="clear"></div>
</div>
<div wicket:id="tree-container" class="trees">
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
Tue Jan 17 08:21:44 2017
@@ -77,6 +77,14 @@ public abstract class FileTreePanel exte
final FileItemTree tree;
final AjaxSplitButton download = new AjaxSplitButton("download", new
ArrayList<IMenuItem>());
private final Form<Void> form = new Form<Void>("form");
+ private final AddFolderDialog addFolder = new
AddFolderDialog("addFolder", Application.getString(712)) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target) {
+ createFolder(target, getModelObject());
+ }
+ };
public FileTreePanel(String id, Long roomId) {
super(id);
@@ -86,18 +94,10 @@ public abstract class FileTreePanel exte
form.add(download.setVisible(false).setOutputMarkupPlaceholderTag(true).setDefaultModelObject(newDownloadMenuList()));
add(form.add(downloader));
}
-
+
@Override
protected void onInitialize() {
super.onInitialize();
- final AddFolderDialog addFolder = new
AddFolderDialog("addFolder", Application.getString(712)) {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void onSubmit(AjaxRequestTarget target) {
- createFolder(target, getModelObject());
- }
- };
form.add(addFolder);
Droppable<FileItem> trashToolbar = new
Droppable<FileItem>("trash-toolbar") {
private static final long serialVersionUID = 1L;
@@ -108,7 +108,7 @@ public abstract class FileTreePanel exte
behavior.setOption("hoverClass",
Options.asString("ui-state-hover trash-toolbar-hover"));
behavior.setOption("accept",
Options.asString(".recorditem, .fileitem"));
}
-
+
@Override
public JQueryBehavior newWidgetBehavior(String
selector) {
return new DroppableBehavior(selector, this) {
@@ -139,7 +139,7 @@ public abstract class FileTreePanel exte
}
};
}
-
+
@Override
public void onDrop(AjaxRequestTarget target, Component
component) {
Object o = component.getDefaultModelObject();
@@ -176,27 +176,27 @@ public abstract class FileTreePanel exte
super.onEvent(target);
}
}
-
+
@Override
protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
delete(selected.getObject(), target);
}
});
-
+
form.add(trees.add(tree).setOutputMarkupId(true));
updateSizes();
form.add(sizes.add(new Label("homeSize", homeSize), new
Label("publicSize", publicSize)).setOutputMarkupId(true));
form.add(errorsDialog);
}
-
+
protected String getContainment() {
return ".file.item.drop.area";
}
-
+
protected Component getUpload(String id) {
return new WebMarkupContainer(id).setVisible(false);
}
-
+
void delete(FileItem f, IPartialPageRequestHandler handler) {
long id = f.getId();
if (id > 0) {
@@ -208,15 +208,12 @@ public abstract class FileTreePanel exte
}
update(handler);
}
-
+
protected abstract void update(AjaxRequestTarget target, FileItem f);
protected void createFolder(AjaxRequestTarget target, String name) {
FileItem p = selected.getObject();
boolean isRecording = p instanceof Recording;
- if (Type.Folder != p.getType()) {
-
- }
FileItem f = isRecording ? new Recording() : new
FileExplorerItem();
f.setName(name);
f.setInsertedBy(getUserId());
@@ -236,7 +233,7 @@ public abstract class FileTreePanel exte
}
public abstract void updateSizes();
-
+
public FileItem getSelected() {
return selected.getObject();
}
@@ -255,7 +252,7 @@ public abstract class FileTreePanel exte
}
}
}
-
+
public void setSelected(FileItem fi, AjaxRequestTarget target) {
FileItem _prev = selected.getObject();
updateNode(target, _prev);
@@ -265,7 +262,7 @@ public abstract class FileTreePanel exte
selected.setObject(fi);
updateNode(target, fi);
}
-
+
@Override
protected void onDetach() {
selected.detach();
@@ -273,20 +270,20 @@ public abstract class FileTreePanel exte
publicSize.detach();
super.onDetach();
}
-
+
private List<IMenuItem> newDownloadMenuList() {
List<IMenuItem> list = new ArrayList<>();
//original
list.add(new MenuItem(getString("files.download.original"),
JQueryIcon.ARROWTHICKSTOP_1_S) {
private static final long serialVersionUID = 1L;
-
+
@Override
public boolean isEnabled() {
File f = selected.getObject().getFile();
return f != null && f.exists();
}
-
+
@Override
public void onClick(AjaxRequestTarget target) {
File f = selected.getObject().getFile();
@@ -298,13 +295,13 @@ public abstract class FileTreePanel exte
//pdf
list.add(new MenuItem(getString("files.download.pdf"),
JQueryIcon.ARROWTHICKSTOP_1_S) {
private static final long serialVersionUID = 1L;
-
+
@Override
public boolean isEnabled() {
File f =
selected.getObject().getFile(EXTENSION_PDF);
return f != null && f.exists();
}
-
+
@Override
public void onClick(AjaxRequestTarget target) {
File f =
selected.getObject().getFile(EXTENSION_PDF);
@@ -316,13 +313,13 @@ public abstract class FileTreePanel exte
//jpg
list.add(new MenuItem(getString("files.download.jpg"),
JQueryIcon.ARROWTHICKSTOP_1_S) {
private static final long serialVersionUID = 1L;
-
+
@Override
public boolean isEnabled() {
File f =
selected.getObject().getFile(EXTENSION_JPG);
return f != null && f.exists();
}
-
+
@Override
public void onClick(AjaxRequestTarget target) {
File f =
selected.getObject().getFile(EXTENSION_JPG);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/chart_pie.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/chart_pie.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/chart_pie_error.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/chart_pie_error.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/film.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/film.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/film_error.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/film_error.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/film_processing.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/film_processing.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/folder.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/folder.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Added:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/folder_open.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/folder_open.png?rev=1779148&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/folder_open.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/house_link.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/house_link.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/layout.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/layout.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/layout_error.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/layout_error.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/page.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/page.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/page_error.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/page_error.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/picture.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/picture.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/picture_error.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/picture_error.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/script_error.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/script_error.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/world_link.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/world_link.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
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=1779148&r1=1779147&r2=1779148&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 08:21:44 2017
@@ -350,7 +350,7 @@ html, body {
background-image: url(images/film_processing.png);
}
.file.om-icon, .recording.om-icon {
- padding-left: 18px;
+ padding-left: 34px;
}
.my.file.om-icon {
background-image: url(images/house_link.png);
@@ -382,6 +382,15 @@ html, body {
.broken.doc.file.om-icon {
background-image: url(images/page_error.png);
}
+.folder.file.om-icon {
+ background-image: url(images/folder.png);
+}
+.folder-open.file.om-icon {
+ background-image: url(images/folder_open.png);
+}
+.chart.file.om-icon {
+ background-image: url(images/chart_pie.png);
+}
.invite.om-icon {
background-image: url(images/connect.png);
}
@@ -406,8 +415,12 @@ html, body {
white-space: nowrap;
overflow: hidden;
}
+.file.item .name {
+ padding-top: 10px;
+}
.file.item .errors {
position: absolute;
+ top: 10px;
right: 0px;
background-image: url(images/script_error.png);
width: 16px;
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemPanel.html?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemPanel.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemPanel.html
Tue Jan 17 08:21:44 2017
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java
Tue Jan 17 08:21:44 2017
@@ -34,6 +34,7 @@ import org.apache.wicket.model.Model;
public class FileItemTree extends DefaultNestedTree<FileItem> {
private static final long serialVersionUID = 1L;
private final FileTreePanel treePanel;
+ private final static String CSS_CLASS_FILE = "file ";
public FileItemTree(String id, FileTreePanel treePanel,
ITreeProvider<FileItem> tp) {
super(id, tp);
@@ -77,62 +78,62 @@ public class FileItemTree extends Defaul
}
}
- private String getItemStyle(FileItem f, String def) {
- String style;
+ private String getItemStyle(FileItem f, boolean open) {
+ StringBuilder style = new StringBuilder("big
om-icon ");
if (f.getId() == null) {
- style = f.getHash().indexOf("my") > -1
? "my file om-icon" : "public file om-icon";
+
style.append(CSS_CLASS_FILE).append(f.getHash().indexOf("my") > -1 ? "my" :
"public");
} else {
- String _style, addStyle = f.exists() ?
"" : "broken";
+ if (!f.exists()) {
+ style.append("broken ");
+ }
switch(f.getType()) {
case Folder:
- _style = def;
+
style.append(CSS_CLASS_FILE).append(open ? "folder-open " : "folder ");
break;
case Image:
- _style = "image file
om-icon";
+
style.append(CSS_CLASS_FILE).append("image ");
break;
case PollChart:
- _style = "chart file
om-icon";
+
style.append(CSS_CLASS_FILE).append("chart ");
break;
case WmlFile:
- _style = "wml file
om-icon";
+
style.append(CSS_CLASS_FILE).append("wml ");
break;
case Video:
case Recording:
{
- _style = "recording
om-icon";
+ style.append("recording
");
if (f instanceof
Recording) {
Status st =
((Recording)f).getStatus();
if
(Status.RECORDING == st || Status.CONVERTING == st) {
-
addStyle = "processing";
+
style.append("processing");
}
}
}
break;
case Presentation:
- _style = "doc file
om-icon";
+
style.append(CSS_CLASS_FILE).append("doc ");
break;
default:
- _style = "file om-icon";
break;
}
- style = String.format("%s %s",
addStyle, _style);
}
- return style;
+ return style.toString();
}
@Override
protected String getOtherStyleClass(FileItem r) {
- return getItemStyle(r,
super.getOtherStyleClass(r));
+ return getItemStyle(r, false);
}
@Override
protected String getOpenStyleClass() {
- return getItemStyle(getModelObject(),
super.getOpenStyleClass());
+ return getItemStyle(getModelObject(), true);
}
@Override
protected String getClosedStyleClass() {
- return getItemStyle(getModelObject(),
super.getClosedStyleClass());
+ return getItemStyle(getModelObject(), false);
}
@Override
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=1779148&r1=1779147&r2=1779148&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 08:21:44 2017
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -30,10 +30,10 @@
</script>
<div class="file tree item drop area">
<div class="icons clear trash-toolbar"
wicket:id="trash-toolbar" wicket:message="title:705">
- <span wicket:id="upload" class="add om-icon align-left
clickable" wicket:message="title:702"></span>
- <span wicket:id="create" class="folder-create om-icon
align-left clickable" wicket:message="title:703"></span>
- <span wicket:id="refresh" class="refresh om-icon
align-left clickable" wicket:message="title:704"></span>
- <span wicket:id="trash" class="trash om-icon
align-right clickable"></span>
+ <span wicket:id="upload" class="add om-icon big
align-left clickable" wicket:message="title:702"></span>
+ <span wicket:id="create" class="folder-create big
om-icon align-left clickable" wicket:message="title:703"></span>
+ <span wicket:id="refresh" class="refresh om-icon big
align-left clickable" wicket:message="title:704"></span>
+ <span wicket:id="trash" class="trash om-icon big
align-right clickable"></span>
<div class="clear"></div>
</div>
<div wicket:id="tree-container" class="trees">
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
Tue Jan 17 08:21:44 2017
@@ -77,6 +77,14 @@ public abstract class FileTreePanel exte
final FileItemTree tree;
final AjaxSplitButton download = new AjaxSplitButton("download", new
ArrayList<IMenuItem>());
private final Form<Void> form = new Form<Void>("form");
+ private final AddFolderDialog addFolder = new
AddFolderDialog("addFolder", Application.getString(712)) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target) {
+ createFolder(target, getModelObject());
+ }
+ };
public FileTreePanel(String id, Long roomId) {
super(id);
@@ -86,18 +94,10 @@ public abstract class FileTreePanel exte
form.add(download.setVisible(false).setOutputMarkupPlaceholderTag(true).setDefaultModelObject(newDownloadMenuList()));
add(form.add(downloader));
}
-
+
@Override
protected void onInitialize() {
super.onInitialize();
- final AddFolderDialog addFolder = new
AddFolderDialog("addFolder", Application.getString(712)) {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void onSubmit(AjaxRequestTarget target) {
- createFolder(target, getModelObject());
- }
- };
form.add(addFolder);
Droppable<FileItem> trashToolbar = new
Droppable<FileItem>("trash-toolbar") {
private static final long serialVersionUID = 1L;
@@ -108,7 +108,7 @@ public abstract class FileTreePanel exte
behavior.setOption("hoverClass",
Options.asString("ui-state-hover trash-toolbar-hover"));
behavior.setOption("accept",
Options.asString(".recorditem, .fileitem"));
}
-
+
@Override
public JQueryBehavior newWidgetBehavior(String
selector) {
return new DroppableBehavior(selector, this) {
@@ -139,7 +139,7 @@ public abstract class FileTreePanel exte
}
};
}
-
+
@Override
public void onDrop(AjaxRequestTarget target, Component
component) {
Object o = component.getDefaultModelObject();
@@ -176,27 +176,27 @@ public abstract class FileTreePanel exte
super.onEvent(target);
}
}
-
+
@Override
protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
delete(selected.getObject(), target);
}
});
-
+
form.add(trees.add(tree).setOutputMarkupId(true));
updateSizes();
form.add(sizes.add(new Label("homeSize", homeSize), new
Label("publicSize", publicSize)).setOutputMarkupId(true));
form.add(errorsDialog);
}
-
+
protected String getContainment() {
return ".file.item.drop.area";
}
-
+
protected Component getUpload(String id) {
return new WebMarkupContainer(id).setVisible(false);
}
-
+
void delete(FileItem f, IPartialPageRequestHandler handler) {
long id = f.getId();
if (id > 0) {
@@ -208,15 +208,12 @@ public abstract class FileTreePanel exte
}
update(handler);
}
-
+
protected abstract void update(AjaxRequestTarget target, FileItem f);
protected void createFolder(AjaxRequestTarget target, String name) {
FileItem p = selected.getObject();
boolean isRecording = p instanceof Recording;
- if (Type.Folder != p.getType()) {
-
- }
FileItem f = isRecording ? new Recording() : new
FileExplorerItem();
f.setName(name);
f.setInsertedBy(getUserId());
@@ -236,7 +233,7 @@ public abstract class FileTreePanel exte
}
public abstract void updateSizes();
-
+
public FileItem getSelected() {
return selected.getObject();
}
@@ -255,7 +252,7 @@ public abstract class FileTreePanel exte
}
}
}
-
+
public void setSelected(FileItem fi, AjaxRequestTarget target) {
FileItem _prev = selected.getObject();
updateNode(target, _prev);
@@ -265,7 +262,7 @@ public abstract class FileTreePanel exte
selected.setObject(fi);
updateNode(target, fi);
}
-
+
@Override
protected void onDetach() {
selected.detach();
@@ -273,20 +270,20 @@ public abstract class FileTreePanel exte
publicSize.detach();
super.onDetach();
}
-
+
private List<IMenuItem> newDownloadMenuList() {
List<IMenuItem> list = new ArrayList<>();
//original
list.add(new MenuItem(getString("files.download.original"),
JQueryIcon.ARROWTHICKSTOP_1_S) {
private static final long serialVersionUID = 1L;
-
+
@Override
public boolean isEnabled() {
File f = selected.getObject().getFile();
return f != null && f.exists();
}
-
+
@Override
public void onClick(AjaxRequestTarget target) {
File f = selected.getObject().getFile();
@@ -298,13 +295,13 @@ public abstract class FileTreePanel exte
//pdf
list.add(new MenuItem(getString("files.download.pdf"),
JQueryIcon.ARROWTHICKSTOP_1_S) {
private static final long serialVersionUID = 1L;
-
+
@Override
public boolean isEnabled() {
File f =
selected.getObject().getFile(EXTENSION_PDF);
return f != null && f.exists();
}
-
+
@Override
public void onClick(AjaxRequestTarget target) {
File f =
selected.getObject().getFile(EXTENSION_PDF);
@@ -316,13 +313,13 @@ public abstract class FileTreePanel exte
//jpg
list.add(new MenuItem(getString("files.download.jpg"),
JQueryIcon.ARROWTHICKSTOP_1_S) {
private static final long serialVersionUID = 1L;
-
+
@Override
public boolean isEnabled() {
File f =
selected.getObject().getFile(EXTENSION_JPG);
return f != null && f.exists();
}
-
+
@Override
public void onClick(AjaxRequestTarget target) {
File f =
selected.getObject().getFile(EXTENSION_JPG);
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/chart_pie.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/chart_pie.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/chart_pie_error.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/chart_pie_error.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/film.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/film.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/film_error.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/film_error.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/film_processing.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/film_processing.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/folder.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/folder.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Added:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/folder_open.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/folder_open.png?rev=1779148&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/folder_open.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/house_link.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/house_link.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/layout.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/layout.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/layout_error.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/layout_error.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/page.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/page.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/page_error.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/page_error.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/picture.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/picture.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/picture_error.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/picture_error.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/script_error.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/script_error.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/world_link.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/world_link.png?rev=1779148&r1=1779147&r2=1779148&view=diff
==============================================================================
Binary files - no diff available.
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=1779148&r1=1779147&r2=1779148&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 08:21:44 2017
@@ -350,7 +350,7 @@ html, body {
background-image: url(images/film_processing.png);
}
.file.om-icon, .recording.om-icon {
- padding-left: 18px;
+ padding-left: 34px;
}
.my.file.om-icon {
background-image: url(images/house_link.png);
@@ -382,6 +382,15 @@ html, body {
.broken.doc.file.om-icon {
background-image: url(images/page_error.png);
}
+.folder.file.om-icon {
+ background-image: url(images/folder.png);
+}
+.folder-open.file.om-icon {
+ background-image: url(images/folder_open.png);
+}
+.chart.file.om-icon {
+ background-image: url(images/chart_pie.png);
+}
.invite.om-icon {
background-image: url(images/connect.png);
}
@@ -406,8 +415,12 @@ html, body {
white-space: nowrap;
overflow: hidden;
}
+.file.item .name {
+ padding-top: 10px;
+}
.file.item .errors {
position: absolute;
+ top: 10px;
right: 0px;
background-image: url(images/script_error.png);
width: 16px;
