Author: dward
Date: 2007-09-28 17:13:18 +0200 (Fri, 28 Sep 2007)
New Revision: 5168
Modified:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/columns/InstructionalTypeColumn.java
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/columns/TitleColumn.java
Log:
- CURRIKI-960, CURRIKI-882
- Description in tooltip now truncated to 335 chars
- Use values for ICT column instead of display values
Modified:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/columns/InstructionalTypeColumn.java
===================================================================
---
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/columns/InstructionalTypeColumn.java
2007-09-28 14:06:14 UTC (rev 5167)
+++
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/columns/InstructionalTypeColumn.java
2007-09-28 15:13:18 UTC (rev 5168)
@@ -60,22 +60,32 @@
public Widget getDisplayWidget(Document value)
{
- String name = getDisplayString(value);
+ String name = "";
FlowPanel ret = new FlowPanel();
- if (name.indexOf("#--#") != -1){
- name = "Multiple:";
+ if (value.getObject(Constants.ASSET_CLASS) != null){
+ value.use(Constants.ASSET_CLASS);
+ if (value.get(Constants.ASSET_INSTRUCTIONAL_COMPONENT_PROPERTY) !=
null){
+ name =
String.valueOf(value.getValue(Constants.ASSET_INSTRUCTIONAL_COMPONENT_PROPERTY));
+ }
}
- if (name.length() > 0){
- String icon = name.replaceAll(":.*", "");
- name = name.replaceFirst(icon+":", "");
- if (icon.length() > 0) {
+ if (name.indexOf("#--#") != -1){
+ Image img = new Image(Constants.ICON_PATH+"ICTIcon-Multiple.gif");
+ ret.add(img);
+ ret.add(new
Label(Main.getTranslation("search.results.col.ict.multiple")));
+ } else if (name.length() > 0){
+ String icon = name.replaceFirst("_.*", "");
+ if ((icon.length() > 0) && !icon.equals(name)){
+ String iconTitle =
Main.getTranslation("search.selector.ict."+icon);
+ icon = icon.toUpperCase().substring(0, 1)+icon.substring(1);
Image img = new
Image(Constants.ICON_PATH+"ICTIcon-"+icon+".gif");
- img.setTitle(icon);
+ img.setTitle(iconTitle);
ret.add(img);
+
+ name =
Main.getTranslation("search.selector.ict."+name.replaceFirst("_", "."));
+ ret.add(new Label(name));
}
- ret.add(new Label(name));
}
return ret;
Modified:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/columns/TitleColumn.java
===================================================================
---
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/columns/TitleColumn.java
2007-09-28 14:06:14 UTC (rev 5167)
+++
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/columns/TitleColumn.java
2007-09-28 15:13:18 UTC (rev 5168)
@@ -40,6 +40,7 @@
public class TitleColumn extends ResultsColumn implements Viewer
{
protected int maxLength = 78;
+ protected int maxDescLength = 78;
protected Viewer viewer;
protected ResourceAdder wizard;
protected ClickListener cancelListener = null;
@@ -121,6 +122,9 @@
if (value.get(Constants.ASSET_DESCRIPTION_PROPERTY) != null){
desc = value.get(Constants.ASSET_DESCRIPTION_PROPERTY);
+ if (desc.length() > maxDescLength){
+ desc = desc.substring(0, (maxDescLength-1))+"...";
+ }
}
}
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
