Index: ModifyTemplateItemsProducer.java =================================================================== --- ModifyTemplateItemsProducer.java (revision 65978) +++ ModifyTemplateItemsProducer.java (working copy) @@ -294,10 +294,18 @@ } UIMessage.make(itemBranch, "item-classification", itemLabelKey); - if (templateItem.getScaleDisplaySetting() != null) { - String scaleDisplaySettingLabel = " - " + templateItem.getScaleDisplaySetting(); - UIOutput.make(itemBranch, "scale-display", scaleDisplaySettingLabel); + //miriam ev + String itemScaledLabelKey = EvalToolConstants.UNKNOWN_KEY; + if (templateItem.getScaleDisplaySetting() != null) { + for (int j = 0; j < EvalToolConstants.SCALE_DISPLAY_SETTING_VALUES.length; j++) { + if (templateItem.getScaleDisplaySetting().equals(EvalToolConstants.SCALE_DISPLAY_SETTING_VALUES[j])) { + itemScaledLabelKey = EvalToolConstants.SCALE_DISPLAY_SETTING_LABELS_PROPS[j]; + break; + } } + + } UIMessage.make(itemBranch, "scale-display", itemScaledLabelKey); + UIInternalLink.make(itemBranch, "preview-row-item", UIMessage.make("general.command.preview"), new ItemViewParameters(PreviewItemProducer.VIEW_ID, (Long) null, templateItem.getId()) ); @@ -367,14 +375,18 @@ } UIMessage.make(itemBranch, "item-resultssharing", resultsSharingMessage); } - + + + //miriam ev if ( EvalConstants.ITEM_TYPE_SCALED.equals(templateItem.getItem().getClassification()) && - templateItem.getItem().getScale() != null ) { - // only show the scale type of this is a scaled item - UIMessage.make(itemBranch, "item-scale-type-title", "modifytemplate.item.scale.type.title"); - UIOutput.make(itemBranch, "scale-type", templateItem.getItem().getScale().getTitle()); - } - + templateItem.getItem().getScale() != null ) { + // only show the scale type of this is a scaled item + UIMessage.make(itemBranch, "item-scale-type-title", "modifytemplate.item.scale.type.title"); + UIOutput.make(itemBranch, "scale-type", templateItem.getItem().getScale().getTitle()); + } + + + // display item options boolean showOptions = false; if ( templateItem.getUsesNA() != null