Changeset 6685

Timestamp:

10/20/15 07:35:04 (9 years ago)

Author:

Twan Goosen

Message:

Facet/field description popups (via 'title' attribute) in the record page

Location:

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

Files:

• java/eu/clarin/cmdi/vlo/JavaScriptResources.java (modified) (3 diffs)
• java/eu/clarin/cmdi/vlo/wicket/panels/record/FieldsTablePanel.html (modified) (1 diff)
• java/eu/clarin/cmdi/vlo/wicket/panels/record/FieldsTablePanel.java (modified) (5 diffs)
• js/eu/clarin/cmdi/vlo/wicket/pages/vlo-fields-table.js (added)

vlo/branches/vlo-3.3/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");
@@ -71 +73 @@
         return SEARCH_FORM;
     }
+
+    public static ResourceReference getFieldsTableJS() {
+        return FIELDS_TABLE;
+    }
     
-    
-
 }

vlo/branches/vlo-3.3/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/branches/vlo-3.3/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()));
+//    }
 
 }