Changeset 5467

Timestamp:

07/09/14 15:08:44 (10 years ago)

Author:

Twan Goosen

Message:

keywords: hidden fields, labels and remove links. no custom keywords through VLO interface

Location:

vlo/branches/vlo-3.1-vcr/vlo-web-app/src/main

Files:

• java/eu/clarin/cmdi/vlo/JavaScriptResources.java (modified) (3 diffs)
• java/eu/clarin/cmdi/vlo/VloWicketApplication.java (modified) (1 diff)
• java/eu/clarin/cmdi/vlo/wicket/pages/VirtualCollectionSubmissionPage.html (modified) (2 diffs)
• java/eu/clarin/cmdi/vlo/wicket/pages/VirtualCollectionSubmissionPage.java (modified) (5 diffs)
• js/eu/clarin/cmdi/vlo/wicket/pages/vlo-vcr-submission.js (deleted)
• less/eu/clarin/cmdi/vlo/wicket/pages/inc/vlo-common.less (modified) (1 diff)
• less/eu/clarin/cmdi/vlo/wicket/pages/inc/vlo-vcr-submit.less (added)

vlo/branches/vlo-3.1-vcr/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/JavaScriptResources.java

@@ -18 +18 @@
 
 import eu.clarin.cmdi.vlo.wicket.pages.RecordPage;
-import eu.clarin.cmdi.vlo.wicket.pages.VirtualCollectionSubmissionPage;
 import eu.clarin.cmdi.vlo.wicket.pages.VloBasePage;
 import org.apache.wicket.request.resource.JavaScriptResourceReference;
@@ -32 +31 @@
     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 VCR = new JavaScriptResourceReference(VirtualCollectionSubmissionPage.class, "vlo-vcr-submission.js");
 
     public static JavaScriptResourceReference getVloFrontJS() {
@@ -45 +43 @@
         return JQUERY_WATERMARK;
     }
-    
+
     public static JavaScriptResourceReference getHighlightJS() {
         return HIGHLIGHT;
     }
 
-    public static JavaScriptResourceReference getVloVcrSubmissonJS() {
-        return VCR;
-    }
-    
-    
-
 }

vlo/branches/vlo-3.1-vcr/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/VloWicketApplication.java

@@ -81 +81 @@
                 JavaScriptResources.getVloFrontJS(),
                 JavaScriptResources.getVloHeaderJS(),
-                JavaScriptResources.getJQueryWatermarkJS(),
-                JavaScriptResources.getVloVcrSubmissonJS()
+                JavaScriptResources.getJQueryWatermarkJS()
         );
     }

vlo/branches/vlo-3.1-vcr/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/VirtualCollectionSubmissionPage.html

@@ -40 +40 @@
                     to the Virtual Collection Registry first.
                 </p>
-                
+
                 <hr />
 
@@ -55 +55 @@
                     <div>
                         <label for="keywords">Keywords</label>
-                        <fieldset wicket:id="keywords" id="keywords">
-                            <div id="keywordswrapper">
-                                <p class="keywordwrapper" wicket:id="keyword">
-                                    <input wicket:id="keywordField" type="text" name="keyword" value="keyword" />
-                                    <a href="#" class="removekeyword">Remove</a>
-                                </p>
-                            </div>
-                            <p>
-                                <a href="#" id="addkeyword">Add a keyword</a>
-                            </p>
-                        </fieldset>
+                        <ul wicket:id="keywords" id="keywords">
+                            <li class="keywordwrapper" wicket:id="keyword">
+                                <input wicket:id="keywordField" type="hidden" name="keyword" value="keyword" />
+                                <span wicket:id="keywordValue">[keyword]</span>
+                                <a wicket:id="remove" class="removekeyword"><span>[Remove]</span></a>
+                            </li>
+                        </ul>
                     </div>
 

vlo/branches/vlo-3.1-vcr/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/VirtualCollectionSubmissionPage.java

@@ -18 +18 @@
 
 import eu.clarin.cmdi.vlo.FacetConstants;
-import eu.clarin.cmdi.vlo.JavaScriptResources;
 import eu.clarin.cmdi.vlo.pojo.FacetSelection;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
@@ -27 +26 @@
 import org.apache.solr.common.SolrDocument;
 import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
@@ -47 +46 @@
 public class VirtualCollectionSubmissionPage extends VloBasePage<QueryFacetsSelection> {
 
-    private final String vcrSubmitEndpoint = "http://catalog-clarin.esc.rzg.mpg.de/vcr/service/submit";
+    private final String vcrSubmitEndpoint = "http://localhost:8080/VirtualCollectionRegistry/service/submit";
 
     public VirtualCollectionSubmissionPage(IModel<QueryFacetsSelection> model) {
@@ -91 +90 @@
         keywords.setOutputMarkupId(true);
         form.add(keywords);
-        
+
         final ArrayList<String> keywordsList = new ArrayList<String>();
+        if (model.getObject().getQuery() != null) {
+            keywordsList.add(model.getObject().getQuery());
+        }
         for (FacetSelection selection : model.getObject().getSelection().values()) {
             for (String value : selection.getValues()) {
@@ -104 +106 @@
             @Override
             protected void populateItem(final ListItem<String> item) {
+                // add hidden field for keyword
                 final WebMarkupContainer keywordField = new WebMarkupContainer("keywordField");
                 keywordField.add(new AttributeModifier("value", item.getModel()));
                 item.add(keywordField);
 
-//                item.add(new AjaxLink("remove") {
-//
-//                    @Override
-//                    public void onClick(AjaxRequestTarget target) {
-//                        keywordsModel.getObject().remove(item.getModelObject());
-//                        target.add(keywords);
-//                    }
-//                });
+                // add label for keyword
+                item.add(new Label("keywordValue", item.getModel()));
+
+                // add remove link for keyword
+                item.add(new AjaxLink("remove") {
+
+                    @Override
+                    public void onClick(AjaxRequestTarget target) {
+                        keywordsModel.getObject().remove(item.getModelObject());
+                        target.add(keywords);
+                    }
+                });
             }
         });
-//        keywords.add(new AjaxLink("add") {
-//            
-//            @Override
-//            public void onClick(AjaxRequestTarget target) {
-//                keywordsModel.getObject().add("");
-//                target.add(keywords);
-//            }
-//        });
 
         add(new Label("itemCount", new PropertyModel<Long>(provider, "size")));
     }
 
-    @Override
-    public void renderHead(IHeaderResponse response) {
-        super.renderHead(response);
-        response.render(JavaScriptHeaderItem.forReference(JavaScriptResources.getVloVcrSubmissonJS()));
-    }
-    
-    
-
 }

vlo/branches/vlo-3.1-vcr/vlo-web-app/src/main/less/eu/clarin/cmdi/vlo/wicket/pages/inc/vlo-common.less

@@ -40 +40 @@
 /* styles for record details */
 @import "vlo-record";
+
+/* styles for VCR submission form */
+@import "vlo-vcr-submit";