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 2017/01/17 11:02:09 UTC
svn commit: r1779168 - in /openmeetings/application:
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/
branches/3.2.x/openmeetings-web/src/main/webapp/css/
trunk/openmeetings-web/src/main/java/org/apache/openmeeting...
Author: solomax
Date: Tue Jan 17 11:02:09 2017
New Revision: 1779168
URL: http://svn.apache.org/viewvc?rev=1779168&view=rev
Log:
[OPENMEETINGS-895] css/code clean-up
Modified:
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/theme.css
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/theme.css
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=1779168&r1=1779167&r2=1779168&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 11:02:09 2017
@@ -40,7 +40,7 @@
<div wicket:id="tree"></div>
</div>
<span wicket:id="download" wicket:message="title:867"></span>
- <div class="sizes" wicket:id="sizes">
+ <div wicket:id="sizes" class="sizes">
<table>
<tr>
<td><wicket:message key="923"/></td>
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=1779168&r1=1779167&r2=1779168&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 11:02:09 2017
@@ -91,7 +91,7 @@ public abstract class FileTreePanel exte
OmTreeProvider tp = new OmTreeProvider(roomId);
setSelected(tp.getRoot(), null);
form.add(tree = new FileItemTree("tree", this, tp));
- form.add(download.setVisible(false).setOutputMarkupPlaceholderTag(true).setDefaultModelObject(newDownloadMenuList()));
+ form.add(download.setVisible(false).setOutputMarkupPlaceholderTag(true));
add(form.add(downloader));
}
@@ -99,6 +99,7 @@ public abstract class FileTreePanel exte
protected void onInitialize() {
super.onInitialize();
form.add(addFolder);
+ download.setDefaultModelObject(newDownloadMenuList());
Droppable<FileItem> trashToolbar = new Droppable<FileItem>("trash-toolbar") {
private static final long serialVersionUID = 1L;
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=1779168&r1=1779167&r2=1779168&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 11:02:09 2017
@@ -485,6 +485,7 @@ table.messages td.main {
padding-left: 25px;
background-repeat: no-repeat !important;
background-position: 5px 3px !important;
+ background-size: 16px 16px !important;
padding-top: 2px;
display: block;
text-align:left;
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=1779168&r1=1779167&r2=1779168&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 11:02:09 2017
@@ -40,7 +40,7 @@
<div wicket:id="tree"></div>
</div>
<span wicket:id="download" wicket:message="title:867"></span>
- <div class="sizes" wicket:id="sizes">
+ <div wicket:id="sizes" class="sizes">
<table>
<tr>
<td><wicket:message key="923"/></td>
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=1779168&r1=1779167&r2=1779168&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 11:02:09 2017
@@ -91,7 +91,7 @@ public abstract class FileTreePanel exte
OmTreeProvider tp = new OmTreeProvider(roomId);
setSelected(tp.getRoot(), null);
form.add(tree = new FileItemTree("tree", this, tp));
- form.add(download.setVisible(false).setOutputMarkupPlaceholderTag(true).setDefaultModelObject(newDownloadMenuList()));
+ form.add(download.setVisible(false).setOutputMarkupPlaceholderTag(true));
add(form.add(downloader));
}
@@ -99,6 +99,7 @@ public abstract class FileTreePanel exte
protected void onInitialize() {
super.onInitialize();
form.add(addFolder);
+ download.setDefaultModelObject(newDownloadMenuList());
Droppable<FileItem> trashToolbar = new Droppable<FileItem>("trash-toolbar") {
private static final long serialVersionUID = 1L;
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=1779168&r1=1779167&r2=1779168&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 11:02:09 2017
@@ -485,6 +485,7 @@ table.messages td.main {
padding-left: 25px;
background-repeat: no-repeat !important;
background-position: 5px 3px !important;
+ background-size: 16px 16px !important;
padding-top: 2px;
display: block;
text-align:left;