Changeset 4993

Timestamp:

04/16/14 14:27:56 (10 years ago)

Author:

Twan Goosen

Message:

improved display of multiple field values (mainly descriptions) in record page

Location:

vlo/branches/vlo-3.0/vlo-web-app/src/main

Files:

• java/eu/clarin/cmdi/vlo/wicket/panels/record/FieldsTablePanel.java (modified) (4 diffs)
• resources/eu/clarin/cmdi/vlo/wicket/pages/colour.css (modified) (3 diffs)
• resources/eu/clarin/cmdi/vlo/wicket/pages/vlo-record.css (modified) (1 diff)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/FieldsTablePanel.java

@@ -19 +19 @@
 import eu.clarin.cmdi.vlo.pojo.DocumentField;
 import eu.clarin.cmdi.vlo.wicket.model.SolrFieldNameModel;
+import java.util.List;
+import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.list.ListItem;
@@ -26 +28 @@
 import org.apache.wicket.markup.repeater.data.DataView;
 import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
@@ -43 +46 @@
                 final IModel<DocumentField> fieldModel = item.getModel();
                 item.add(new Label("fieldName", new SolrFieldNameModel(new PropertyModel(fieldModel, "fieldName"))));
-                item.add(new ListView("values", new PropertyModel(fieldModel, "values")) {
+                final PropertyModel<List> valuesModel = new PropertyModel<List>(fieldModel, "values");
+                item.add(new ListView("values", valuesModel) {
 
                     @Override
@@ -50 +54 @@
                     }
                 });
+                
+                // if field has multiple values, set 'multiple' class on markup element
+                item.add(new AttributeModifier("class", new AbstractReadOnlyModel<String>() {
+
+                    @Override
+                    public String getObject() {
+                        if (valuesModel.getObject().size() > 1) {
+                            return "multiplevalues";
+                        } else {
+                            return null;
+                        }
+                    }
+                }));
             }
         });

vlo/branches/vlo-3.0/vlo-web-app/src/main/resources/eu/clarin/cmdi/vlo/wicket/pages/colour.css

@@ -81 +81 @@
 { 
     /*background: transparent url(arrow.png) no-repeat left center;*/
-  color: #555;
+    color: #555;
 } 
 
@@ -87 +87 @@
 {
     /*background: transparent url(arrow_select.png) no-repeat left center;*/
-  color: #936851;
-  text-decoration: underline;
+    color: #936851;
+    text-decoration: underline;
 } 
 
@@ -107 +107 @@
 }
 
-li.searchresultitem:nth-child(even) {
+li.searchresultitem:nth-child(even), .recorddetailstable tr:nth-child(even) {
     background: #ccd6e8;
 }

vlo/branches/vlo-3.0/vlo-web-app/src/main/resources/eu/clarin/cmdi/vlo/wicket/pages/vlo-record.css

@@ -108 +108 @@
 }
 
+.multiplevalues ul.attributeValues li {
+    padding-bottom: .3em;
+    padding-top: .3em;
+    border-top: 1px solid #999;
+}
+
+.multiplevalues ul.attributeValues li:nth-child(1) {
+    border-top: none;
+}
 
 a.recordfacetselect span, a.recordattributeinfo span {