Changeset 4991

Timestamp:

04/16/14 13:20:32 (10 years ago)

Author:

Twan Goosen

Message:

Limited number of resources shown in expanded search result item; it exceeded, a link to the record page is shown with a label telling the number of resources not shown

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) (6 diffs)
• java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemExpandedPanel.properties (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/search/SearchResultItemExpandedPanel.html

@@ -38 +38 @@
                             </a>
                         </li>
+                        <wicket:enclosure child="more">
+                            <li class="moreresources">
+                                <a wicket:id="more"><wicket:container wicket:id="moreLabel">99 more resources...</wicket:container></a>
+                            </li>
+                        </wicket:enclosure>
                     </ul>
                 </wicket:container>

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

@@ -32 +32 @@
 import java.util.List;
 import org.apache.solr.common.SolrDocument;
-import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.behavior.AttributeAppender;
@@ -39 +38 @@
 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.list.PageableListView;
 import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
@@ -52 +52 @@
 public class SearchResultItemExpandedPanel extends GenericPanel<SolrDocument> {
 
+    private static final int MAX_RESOURCES_TO_SHOW = 10;
+    
     @SpringBean(name = "searchResultPropertiesFilter")
     private FieldFilter propertiesFilter;
@@ -59 +61 @@
     ResourceStringConverter resolvingResourceStringConverter;
 
-    public SearchResultItemExpandedPanel(String id, IModel<SolrDocument> documentModel, IModel<SearchContext> selectionModel) {
+    public SearchResultItemExpandedPanel(String id, final IModel<SolrDocument> documentModel, final IModel<SearchContext> selectionModel) {
         super(id, documentModel);
 
@@ -69 +71 @@
         add(new FieldsTablePanel("documentProperties", new DocumentFieldsProvider(documentModel, propertiesFilter)));
 
+        // add a container for the resources (only visible if there are actual resources)
+        add(createResourcesView("resources", documentModel, selectionModel));
+    }
+
+    private WebMarkupContainer createResourcesView(String id, final IModel<SolrDocument> documentModel, final IModel<SearchContext> selectionModel) {
         final SolrFieldModel<String> resourceModel = new SolrFieldModel<String>(getModel(), FacetConstants.FIELD_RESOURCE);
-
-        // add a container for the resources (only visible if there are actual resources)
-        add(new WebMarkupContainer("resources") {
-            {
-                add(createResourcesList("resource", resourceModel));
-            }
-
+        // create a container for the list view that is only visible if there actually are resources
+        final WebMarkupContainer container = new WebMarkupContainer(id) {
             @Override
             protected void onConfigure() {
@@ -83 +85 @@
             }
 
-        });
+        };
+
+        final PageableListView resourcesView = createResourcesList("resource", resourceModel);
+        container.add(resourcesView);
+
+        // create a link to the record page that is only visible when there are more resources than shown
+        final RecordPageLink moreLink = new RecordPageLink("more", documentModel, selectionModel) {
+
+            @Override
+            protected void onConfigure() {
+                super.onConfigure();
+                setVisible(resourcesView.getPageCount() > 1);
+            }
+
+        };
+        // add a record page link that shows the number of resources not shown
+        moreLink.add(new Label("moreLabel", new StringResourceModel("resources.more", new AbstractReadOnlyModel<Integer>() {
+
+            @Override
+            public Integer getObject() {
+                return resourceModel.getObject().size() - MAX_RESOURCES_TO_SHOW;
+            }
+
+        }, "more...")));
+        container.add(moreLink);
+        
+        return container;
     }
 
-    private Component createResourcesList(String id, SolrFieldModel<String> resourceModel) {
+    private PageableListView createResourcesList(String id, SolrFieldModel<String> resourceModel) {
         // list of resources in this record
-        // TODO: limit number of resources shown here?
         final IModel<List<String>> resourceListModel = new CollectionListModel<String>(resourceModel);
-        return new ListView<String>(id, resourceListModel) {
+        // use a a pageable view so that the number of resources actually shown is limited
+        return new PageableListView<String>(id, resourceListModel, MAX_RESOURCES_TO_SHOW) {
 
             @Override

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

@@ -14 +14 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+# ${} = number of additional resources
+resources.more=${} more resources...
 # {0} = resource type, {1} = mime type
 resource.tooltip={0} ({1})

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

@@ -175 +175 @@
 }
 
+.searchresultresources li.moreresources {
+    /* 'N more resources' link (has no icon) */
+    padding-left: .5em;
+}
+
 .searchresultresources li.writtenresource {
     background-image: url('document-256.png'); /* icon from icons8.com */