Changeset 4879

Timestamp:

04/02/14 13:05:57 (10 years ago)

Author:

Twan Goosen

Message:

added resources to expanded search result item view

Location:

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

Files:

• java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemExpandedPanel.html (modified) (1 diff)
• java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemExpandedPanel.java (modified) (4 diffs)
• java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemExpandedPanel.properties (added)
• webapp/style/vlo-search.css (modified) (1 diff)

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

@@ -31 +31 @@
                 <p class="moredocumentproperties"><a wicket:id="recordLink">More</a></p>
                 <h3>Resources</h3>
-                <ul>
-                    <li class="writtenresource"><a href="">http://dspace.library.uu.nl/bitstream/1874/235456/1/Bachelorscriptie+Rene+Witteveen+3375005.docx</a></li>
-                    <li class="audioresource"><a href="">http://corpus1.mpi.nl/qfs1/media-archive/dobes_data/Ache/Documentaci_n_-_Documentation/Comunidades_-_Communities/Cerro_Moroti/Media/002-djawu_klluu-2011-09-01.wav</a></li>
-                    <li class="annotationresource"><a href="">http://corpus1.mpi.nl/qfs1/media-archive/dobes_data/Ache/Documentaci_n_-_Documentation/Comunidades_-_Communities/Cerro_Moroti/Annotations/002-djawu_klluu-2011-09-01.eaf</a></li>
+                <ul class="searchresultresources">
+                    <li wicket:id="resource">
+                        <a wicket:id="resourceLink" href="">
+                            <wicket:container wicket:id="resourceName"></wicket:container>
+                        </a>
+                    </li>
                 </ul>
             </div>

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

@@ -20 +20 @@
 import eu.clarin.cmdi.vlo.pojo.SearchContext;
 import eu.clarin.cmdi.vlo.service.FieldFilter;
+import eu.clarin.cmdi.vlo.service.ResourceStringConverter;
+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.ResourceInfoModel;
+import eu.clarin.cmdi.vlo.wicket.model.SolrFieldModel;
 import eu.clarin.cmdi.vlo.wicket.panels.record.FieldsTablePanel;
 import eu.clarin.cmdi.vlo.wicket.provider.DocumentFieldsProvider;
+import java.util.List;
 import org.apache.solr.common.SolrDocument;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.ExternalLink;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.markup.html.panel.GenericPanel;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.model.StringResourceModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 
@@ -37 +50 @@
     @SpringBean(name = "basicPropertiesFilter") //TODO: make separate filter for properties in search result items
     private FieldFilter basicPropertiesFilter;
-    private final IModel<SearchContext> selectionModel;
+    @SpringBean
+    ResourceStringConverter resourceStringConverter;
 
     public SearchResultItemExpandedPanel(String id, IModel<SolrDocument> documentModel, IModel<SearchContext> selectionModel) {
         super(id, documentModel);
-        this.selectionModel = selectionModel;
 
         // add untruncated description
@@ -47 +60 @@
         add(new RecordPageLink("recordLink", documentModel, selectionModel));
 
+        // table with some basic properties
         add(new FieldsTablePanel("documentProperties", new DocumentFieldsProvider(documentModel, basicPropertiesFilter)));
-        
-        //TODO: Add resource list
+
+        createResourcesList("resource");
+    }
+
+    private void createResourcesList(String id) {
+        // list of resources in this record
+        // TODO: limit number of resources shown here?
+        final SolrFieldModel<String> resourceModel = new SolrFieldModel<String>(getModel(), FacetConstants.FIELD_RESOURCE);
+        final IModel<List<String>> resourceListModel = new CollectionListModel<String>(resourceModel);
+        add(new ListView<String>(id, resourceListModel) {
+
+            @Override
+            protected void populateItem(ListItem<String> item) {
+                // get resource string converted into a ResourceInfo model
+                final ResourceInfoModel resourceInfoModel = new ResourceInfoModel(resourceStringConverter, item.getModel());
+
+                // add a link to the resource with the file name as its label
+                final ExternalLink resourceLink = new ExternalLink("resourceLink", new PropertyModel(resourceInfoModel, "href"));
+                resourceLink.add(new Label("resourceName", new PropertyModel(resourceInfoModel, "fileName")));
+
+                // add a tooltip showing resource type and mime type
+                final StringResourceModel tooltipModel
+                        = new StringResourceModel("resource.tooltip", SearchResultItemExpandedPanel.this, resourceModel,
+                                new Object[]{
+                                    new PropertyModel(resourceInfoModel, "resourceType"),
+                                    new PropertyModel(resourceInfoModel, "mimeType")});
+                resourceLink.add(new AttributeAppender("title", tooltipModel));
+
+                // sets the css class depending on the resource type
+                item.add(new ResourceTypeCssBehaviour(resourceInfoModel));
+
+                // add to list
+                item.add(resourceLink);
+            }
+        });
     }
 
@@ -55 +102 @@
     public void detachModels() {
         super.detachModels();
-        // not passed to super
-        selectionModel.detach();
     }
 

vlo/branches/vlo-3.0/vlo-web-app/src/main/webapp/style/vlo-search.css

@@ -154 +154 @@
     font-weight: bold;
 }
+
+.searchresultresources li {
+    list-style: none;
+    background-repeat: no-repeat;
+    background-size: 1em;
+    padding-left: 1.5em;
+}
+
+.searchresultresources li.writtenresource {
+    background-image: url('document-256.png'); /* icon from icons8.com */
+}
+
+.searchresultresources li.audioresource {
+    background-image: url('audio-file-3-256.png'); /* icon from icons8.com */
+}
+
+.searchresultresources li.videoresource {
+    background-image: url('video-file-3-256.png'); /* icon from icons8.com */
+}
+
+.searchresultresources li.imageresource {
+    background-image: url('image-file-256.png'); /* icon from icons8.com */
+}
+
+.searchresultresources li.annotationresource {
+    background-image: url('document-256.png'); /* icon from icons8.com */
+}