Changeset 5024

Timestamp:

04/23/14 08:20:33 (10 years ago)

Author:

Twan Goosen

Message:

made links in record descriptions clickable

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)
• java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemExpandedPanel.java (modified) (3 diffs)
• resources/eu/clarin/cmdi/vlo/wicket/pages/vlo-record.css (modified) (1 diff)
• resources/eu/clarin/cmdi/vlo/wicket/pages/vlo-search.css (modified) (1 diff)

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

@@ -30 +30 @@
 import java.util.List;
 import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.extensions.markup.html.basic.SmartLinkLabel;
+import org.apache.wicket.extensions.markup.html.basic.SmartLinkMultiLineLabel;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.Link;
@@ -53 +55 @@
      * contained in the field should be preserved
      */
-    private final static Collection<String> UNESCAPED_VALUE_FIELDS = ImmutableSet.of(FacetConstants.FIELD_LANGUAGES);
+    private final static Collection<String> UNESCAPED_VALUE_FIELDS
+            = ImmutableSet.of(
+                    FacetConstants.FIELD_LANGUAGES
+            );
+
+    /**
+     * List of fields that should be rendered in a
+     * {@link SmartLinkMultiLineLabel}, which detects URLs and turns them into
+     * links
+     */
+    private final static Collection<String> SMART_LINK_FIELDS
+            = ImmutableSet.of(
+                    FacetConstants.FIELD_DESCRIPTION,
+                    FacetConstants.FIELD_LANDINGPAGE
+            );
 
     @SpringBean
@@ -75 +91 @@
                     @Override
                     protected void populateItem(final ListItem fieldValueItem) {
-                        // add a label for the facet value
-                        final Label fieldLabel = new Label("value", fieldValueItem.getModel());
-                        // some selected fields may have HTML that needs to be preserved...
-                        fieldLabel.setEscapeModelStrings(!UNESCAPED_VALUE_FIELDS.contains(fieldNameModel.getObject()));
-                        fieldValueItem.add(fieldLabel);
-
+                        // add a label that holds the field value
+                        fieldValueItem.add(createValueLabel("value", fieldNameModel, fieldValueItem.getModel()));
                         // add a link for selecting the value in the search
                         fieldValueItem.add(createFacetSelectLink("facetSelect", fieldNameModel, fieldValueItem.getModel()));
@@ -100 +112 @@
             }
         });
+    }
+
+    private Label createValueLabel(String id, final IModel<String> facetNameModel, final IModel valueModel) {
+        final String fieldName = facetNameModel.getObject();
+        if (SMART_LINK_FIELDS.contains(fieldName)) {
+            // create label that generates links
+            return new SmartLinkLabel(id, valueModel);
+        } else {
+            // add a label for the facet value
+            final Label fieldLabel = new Label(id, valueModel);
+            // some selected fields may have HTML that needs to be preserved...
+            fieldLabel.setEscapeModelStrings(!UNESCAPED_VALUE_FIELDS.contains(fieldName));
+            return fieldLabel;
+        }
     }
 

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

@@ -23 +23 @@
 import eu.clarin.cmdi.vlo.wicket.ResourceTypeCssBehaviour;
 import eu.clarin.cmdi.vlo.wicket.components.RecordPageLink;
-import eu.clarin.cmdi.vlo.wicket.components.SolrFieldLabel;
 import eu.clarin.cmdi.vlo.wicket.model.CollectionListModel;
 import eu.clarin.cmdi.vlo.wicket.model.HandleLinkModel;
+import eu.clarin.cmdi.vlo.wicket.model.NullFallbackModel;
 import eu.clarin.cmdi.vlo.wicket.model.ResourceInfoModel;
 import eu.clarin.cmdi.vlo.wicket.model.SolrFieldModel;
+import eu.clarin.cmdi.vlo.wicket.model.SolrFieldStringModel;
 import eu.clarin.cmdi.vlo.wicket.panels.record.FieldsTablePanel;
 import eu.clarin.cmdi.vlo.wicket.panels.record.ResourceLinkDetailsPanel;
@@ -34 +35 @@
 import org.apache.solr.common.SolrDocument;
 import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.extensions.markup.html.basic.SmartLinkLabel;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
@@ -66 +67 @@
 
         // add untruncated description
-        add(new SolrFieldLabel("description", documentModel, FacetConstants.FIELD_DESCRIPTION, ""));
+        final NullFallbackModel descriptionModel = new NullFallbackModel(new SolrFieldStringModel(documentModel, FacetConstants.FIELD_DESCRIPTION), "");
+        add(new SmartLinkLabel("description", descriptionModel));
+        
+        // add link to record
         add(new RecordPageLink("recordLink", documentModel, selectionModel));
 

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

@@ -107 +107 @@
     list-style-type: none;
     margin: 0px;
+}
+
+ul.attributeValues li a {
+    text-decoration: underline;
 }
 

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

@@ -112 +112 @@
 }
 
+#searchresultitems .searchresultdescription a {
+    text-decoration: underline;
+}
+
 .searchresultresources {
     width: 70%;