gCubeSystem
/
vmereports-manager-portlet
Archived
16
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ADDED SUPPORT FOR RICH TEXT INPUT in VME DB Case 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@97806 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2014-06-25 16:33:07 +00:00
parent f436cf7b57
commit c3878362c3
4 changed files with 82 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.classpath
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/reports-4.9.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<classpathentry kind="src" output="target/reports-4.9.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
@ -31,5 +31,5 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/reports-4.9.0-SNAPSHOT/WEB-INF/classes"/>
<classpathentry kind="output" path="target/reports-4.9.1-SNAPSHOT/WEB-INF/classes"/>
</classpath>

2
.settings/com.google.gdt.eclipse.core.prefs
View File

@ -2,6 +2,6 @@
<<<<<<<=.mine
>>>>>>>=.r71295
eclipse.preferences.version=1
lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.9.0-SNAPSHOT
lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.9.1-SNAPSHOT
warSrcDir=src/main/webapp
warSrcDirIsOutput=false

2
pom.xml
View File

@ -12,7 +12,7 @@
<groupId>org.gcube.portlets.user</groupId>
<artifactId>reports</artifactId>
<packaging>war</packaging>
<version>4.9.0-SNAPSHOT</version>
<version>4.9.1-SNAPSHOT</version>
<name>gCube Reports Manager</name>
<description>
gCube Reports Portlet.

31
src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/RichTextToolbar.java
View File

@ -122,11 +122,11 @@ public class RichTextToolbar extends Composite {
} else if (sender == removeLink) {
extended.removeLink();
}
// else if (sender == ol) {
// extended.insertOrderedList();
// } else if (sender == ul) {
// extended.insertUnorderedList();
// }
else if (sender == ol) {
extended.insertOrderedList();
} else if (sender == ul) {
extended.insertUnorderedList();
}
else if (sender == foreColorButton) {
commands.get("pickColor").execute();
}
@ -189,8 +189,8 @@ public class RichTextToolbar extends Composite {
private PushButton open_report;
private PushButton importing;
// private PushButton ol;
// private PushButton ul;
private PushButton ol;
private PushButton ul;
private PushButton insertImage;
private PushButton createLink;
private PushButton removeLink;
@ -263,21 +263,20 @@ public class RichTextToolbar extends Composite {
topPanel.add(saveDB = createPushButton(images.db_save(), "Commit current in VME-DB")); //TODO:
}
if (! isVme) {
topPanel.add(new HTML("&nbsp;"));
fonts = createFontList();
fonts.setPixelSize(150, 18);
topPanel.add(fonts);
topPanel.add(new HTML("&nbsp;"));
topPanel.add(fontSizes = createFontSizes());
}
// We only use these listeners for updating status, so don't hook them up
// unless at least basic editing is supported.
richText.addKeyUpHandler(listener);
richText.addClickHandler(listener);
}
if (! isVme) {
if (basic != null) {
topPanel.add(bold = createToggleButton(images.bold(), strings.bold()));
@ -306,8 +305,8 @@ public class RichTextToolbar extends Composite {
if (extended != null) {
// topPanel.add(ol = createPushButton(images.ol(), strings.ol()));
// topPanel.add(ul = createPushButton(images.ul(), strings.ul()));
topPanel.add(ol = createPushButton(images.ol(), strings.ol()));
topPanel.add(ul = createPushButton(images.ul(), strings.ul()));
//TODO: To be re-enabled in the future
// topPanel.add(insertImage = createPushButton(images.insertImage(),
// strings.insertImage()));
@ -326,7 +325,7 @@ public class RichTextToolbar extends Composite {
// topPanel.add(foreColors = createColorList("Color"));
// foreColors.setStyleName("listbox");
}
}
}
private ListBox createFontList() {
@ -410,7 +409,6 @@ public class RichTextToolbar extends Composite {
* @param enable true to enable the widget, false to disable it
*/
public void setEnabled(boolean enable) {
if (! isVME) {
bold.setEnabled(enable);
italic.setEnabled(enable);
underline.setEnabled(enable);
@ -422,8 +420,8 @@ public class RichTextToolbar extends Composite {
subscript.setEnabled(enable);
foreColorButton.setEnabled(enable);
// insertImage.setEnabled(enable);
// ol.setEnabled(enable);
// ul.setEnabled(enable);
ol.setEnabled(enable);
ul.setEnabled(enable);
createLink.setEnabled(enable);
removeLink.setEnabled(enable);
removeFormat.setEnabled(enable);
@ -431,7 +429,6 @@ public class RichTextToolbar extends Composite {
fonts.setEnabled(enable);
fontSizes.setEnabled(enable);
}
}
public void enableCommands(boolean enable) {
open_report.setEnabled(enable);