Changeset 6690

Timestamp:

10/20/15 13:18:13 (9 years ago)

Author:

Twan Goosen

Message:

merged updates from 3.3 branch to trunk

Location:

vlo/trunk

Files:

• . (modified) (1 prop)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/JavaScriptResources.java (modified) (3 diffs)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/HighlightSearchTermBehavior.java (modified) (3 diffs)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/HighlightSearchTermScriptFactory.java (copied) (copied from vlo/branches/vlo-3.3/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/HighlightSearchTermScriptFactory.java)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.html (modified) (1 diff)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.java (modified) (2 diffs)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/FieldsTablePanel.html (modified) (1 diff)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/FieldsTablePanel.java (modified) (5 diffs)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemPanel.java (modified) (5 diffs)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultsPanel.java (modified) (4 diffs)
• vlo-web-app/src/main/js/eu/clarin/cmdi/vlo/wicket/pages/jquery.highlight.js (copied) (copied from vlo/branches/vlo-3.3/vlo-web-app/src/main/js/eu/clarin/cmdi/vlo/wicket/pages/jquery.highlight.js)
• vlo-web-app/src/main/js/eu/clarin/cmdi/vlo/wicket/pages/searchhi.js (deleted)
• vlo-web-app/src/main/js/eu/clarin/cmdi/vlo/wicket/pages/vlo-fields-table.js (copied) (copied from vlo/branches/vlo-3.3/vlo-web-app/src/main/js/eu/clarin/cmdi/vlo/wicket/pages/vlo-fields-table.js)
• vlo-web-app/src/main/less/eu/clarin/cmdi/vlo/wicket/pages/inc/vlo-search.less (modified) (1 diff)

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/JavaScriptResources.java

@@ -21 +21 @@
 import org.apache.wicket.request.resource.CssResourceReference;
 import org.apache.wicket.request.resource.JavaScriptResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
 
 /**
@@ -33 +34 @@
     private final static JavaScriptResourceReference VLO_FACETS = new JavaScriptResourceReference(VloBasePage.class, "vlo-facets.js");
     private final static JavaScriptResourceReference SEARCH_FORM = new JavaScriptResourceReference(VloBasePage.class, "vlo-searchform.js");
+    private final static JavaScriptResourceReference FIELDS_TABLE = new JavaScriptResourceReference(RecordPage.class, "vlo-fields-table.js");
     private final static JavaScriptResourceReference JQUERY_UI = new JavaScriptResourceReference(VloBasePage.class, "jquery-ui-1.11.4.custom/jquery-ui.min.js");
     private final static CssResourceReference JQUERY_UI_CSS = new CssResourceReference(VloBasePage.class, "jquery-ui-1.11.4.custom/jquery-ui.min.css");
     private final static JavaScriptResourceReference JQUERY_WATERMARK = new JavaScriptResourceReference(VloBasePage.class, "jquery.watermark-3.1.4/jquery.watermark.min.js");
-    private final static JavaScriptResourceReference HIGHLIGHT = new JavaScriptResourceReference(RecordPage.class, "searchhi.js");
+    private final static JavaScriptResourceReference HIGHLIGHT = new JavaScriptResourceReference(RecordPage.class, "jquery.highlight.js");
 
     public static JavaScriptResourceReference getVloFrontJS() {
@@ -71 +73 @@
         return SEARCH_FORM;
     }
+
+    public static ResourceReference getFieldsTableJS() {
+        return FIELDS_TABLE;
+    }
     
-    
-
 }

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/HighlightSearchTermBehavior.java

@@ -23 +23 @@
 import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.request.Request;
+import org.apache.wicket.util.string.StringValue;
+import org.apache.wicket.util.string.Strings;
 
 /**
@@ -33 +36 @@
 public class HighlightSearchTermBehavior extends Behavior {
 
-    private static final String HIGHLIGHT_FUNCTION = "searchhi.init()";
+    private final HighlightSearchTermScriptFactory scriptFactory = new HighlightSearchTermScriptFactory();
 
     @Override
@@ -39 +42 @@
         // include highlight script
         response.render(JavaScriptHeaderItem.forReference(JavaScriptResources.getHighlightJS()));
-        // after load, highlight 
-        response.render(OnDomReadyHeaderItem.forScript(HIGHLIGHT_FUNCTION));
+
+        final String words = getWordList(component);
+        if (!Strings.isEmpty(words)) {
+            String selector = getComponentSelector(component.getMarkupId());
+            // after load, highlight 
+            response.render(OnDomReadyHeaderItem.forScript(scriptFactory.createScript(selector, words)));
+        }
+    }
+
+    protected String getComponentSelector(String componentId) {
+        return "#" + componentId;
+    }
+
+    protected String getWordList(Component component) {
+        Request request = component.getPage().getRequestCycle().getRequest();
+        return request.getQueryParameters().getParameterValue(getQueryParam()).toString();
+    }
+
+    protected String getQueryParam() {
+        return "q";
     }
 

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.html

@@ -51 +51 @@
                 <div id="recorddetails">
                     <a wicket:id="landingPageLink" target="_blank" id="recordlandingpage">Show this record in its original context</a>
-                    <wicket:container wicket:id="documentProperties">[PROPERTIES TABLE]</wicket:container>
+                    <div id="recordProperties" wicket:id="documentProperties">[PROPERTIES TABLE]</div>
                 </div>
 

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.java

@@ -130 +130 @@
 
         addComponents();
-        add(new HighlightSearchTermBehavior());
     }
 
@@ -138 +137 @@
 
         final WebMarkupContainer topNavigation = new WebMarkupContainer("topnavigation");
-        topNavigation.setOutputMarkupId(true);
-        add(topNavigation);
-
-        topNavigation.add(new BreadCrumbPanel("breadcrumbs", selectionModel));
-        topNavigation.add(createPermalink("permalink", topNavigation));
+        add(topNavigation
+                .add(new BreadCrumbPanel("breadcrumbs", selectionModel))
+                .add(createPermalink("permalink", topNavigation))
+                .setOutputMarkupId(true)
+        );
 
         // General information section
         add(new SolrFieldLabel("name", getModel(), FacetConstants.FIELD_NAME, getString("recordpage.unnamedrecord")));
         add(createLandingPageLink("landingPageLink"));
-        add(new FieldsTablePanel("documentProperties", new DocumentFieldsProvider(getModel(), basicPropertiesFilter, fieldOrder)));
+        
+        final FieldsTablePanel fieldsTable = new FieldsTablePanel("documentProperties", new DocumentFieldsProvider(getModel(), basicPropertiesFilter, fieldOrder));
+        fieldsTable.add(new HighlightSearchTermBehavior());
+        add(fieldsTable);
 
         // Resources section

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

@@ -28 +28 @@
                     <tr wicket:id="documentField">
                         <td class="attribute">
-                            <div wicket:id="fieldName">Description</div>
+                            <div class="fieldName" wicket:id="fieldName">Description</div>
                         </td><td class="attributeValue">
                             <ul class="attributeValues">

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

@@ -20 +20 @@
 import com.google.common.collect.ImmutableSet;
 import eu.clarin.cmdi.vlo.FacetConstants;
+import eu.clarin.cmdi.vlo.JavaScriptResources;
 import eu.clarin.cmdi.vlo.config.VloConfig;
 import eu.clarin.cmdi.vlo.pojo.DocumentField;
@@ -28 +29 @@
 import eu.clarin.cmdi.vlo.wicket.components.SmartLinkFieldValueLabel;
 import eu.clarin.cmdi.vlo.wicket.model.HandleLinkModel;
+import eu.clarin.cmdi.vlo.wicket.model.SolrFieldDescriptionModel;
 import eu.clarin.cmdi.vlo.wicket.model.SolrFieldNameModel;
 import eu.clarin.cmdi.vlo.wicket.pages.FacetedSearchPage;
@@ -35 +37 @@
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
+import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.extensions.markup.html.basic.SmartLinkMultiLineLabel;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.Link;
@@ -89 +95 @@
                 final PropertyModel<String> fieldNameModel = new PropertyModel<String>(fieldModel, "fieldName");
                 final SolrFieldNameModel friendlyFieldNameModel = new SolrFieldNameModel(fieldNameModel);
-                item.add(new Label("fieldName", friendlyFieldNameModel));
+                final Label fieldName = new Label("fieldName", friendlyFieldNameModel);
+                item.add(fieldName);
+                fieldName.add(new AttributeAppender("title", new SolrFieldDescriptionModel(fieldNameModel)));
                 final PropertyModel<List> valuesModel = new PropertyModel<List>(fieldModel, "values");
                 item.add(new ListView("values", valuesModel) {
@@ -160 +168 @@
         return true;
     }
+    
+//    re-enable for 'fancy' popups for the field descriptions
+//    @Override
+//    public void renderHead(IHeaderResponse response) {
+//        // JQuery UI for tooltips
+//        response.render(CssHeaderItem.forReference(JavaScriptResources.getJQueryUICSS()));
+//        response.render(JavaScriptHeaderItem.forReference(JavaScriptResources.getFieldsTableJS()));
+//    }
 
 }

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemPanel.java

@@ -21 +21 @@
 import eu.clarin.cmdi.vlo.pojo.ExpansionState;
 import eu.clarin.cmdi.vlo.pojo.SearchContext;
+import eu.clarin.cmdi.vlo.wicket.HighlightSearchTermScriptFactory;
 import eu.clarin.cmdi.vlo.wicket.components.RecordPageLink;
 import eu.clarin.cmdi.vlo.wicket.components.SolrFieldLabel;
@@ -35 +36 @@
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
+import org.apache.wicket.util.string.Strings;
 
 /**
@@ -44 +46 @@
     @SpringBean
     private VloConfig config;
-    
+
     private final Panel collapsedDetails;
     private final Panel expandedDetails;
     private final IModel<ExpansionState> expansionStateModel;
+    private final IModel<SearchContext> selectionModel;
 
     /**
@@ -61 +64 @@
         super(id, documentModel);
         this.expansionStateModel = expansionStateModel;
+        this.selectionModel = selectionModel;
 
         final Link recordLink = new RecordPageLink("recordLink", documentModel, selectionModel);
@@ -100 +104 @@
                     // parial update (just this search result item)
                     target.add(SearchResultItemPanel.this);
+
+                    // in case of a query, update highlight matching search terms after collapse/expand
+                    final String query = selectionModel.getObject().getSelection().getQuery();
+                    if (!Strings.isEmpty(query)) {
+                        final HighlightSearchTermScriptFactory scriptFactory = new HighlightSearchTermScriptFactory();
+                        final String selector = "#" + SearchResultItemPanel.this.getMarkupId();
+                        target.appendJavaScript(scriptFactory.createScript(selector, query));
+                    }
                 }
             }

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultsPanel.java

@@ -18 +18 @@
 
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
+import eu.clarin.cmdi.vlo.wicket.HighlightSearchTermBehavior;
+import eu.clarin.cmdi.vlo.wicket.HighlightSearchTermScriptFactory;
 import eu.clarin.cmdi.vlo.wicket.model.SearchContextModel;
 import eu.clarin.cmdi.vlo.wicket.model.SearchResultExpansionStateModel;
@@ -26 +28 @@
 import java.util.Set;
 import org.apache.solr.common.SolrDocument;
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
@@ -41 +45 @@
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.util.string.StringValue;
 
 /**
@@ -93 +98 @@
         //For Ajax updating of search results
         setOutputMarkupId(true);
+        
+        add(new HighlightSearchTermBehavior(){
+
+            @Override
+            protected String getComponentSelector(String componentId) {
+                return ".searchresultitem"; //"h3, .searchresultdescription"
+            }
+
+            @Override
+            protected String getWordList(Component component) {
+                return selectionModel.getObject().getQuery();
+            }
+            
+        });
     }
     

vlo/trunk/vlo-web-app/src/main/less/eu/clarin/cmdi/vlo/wicket/pages/inc/vlo-search.less

@@ -143 +143 @@
 #searchresultitems .searchresultdescription a {
     text-decoration: underline;
+}
+
+.searchresultitem .searchword {
+    font-weight: bold;
 }