Changeset 5466

Timestamp:

07/09/14 14:31:20 (10 years ago)

Author:

Twan Goosen

Message:

adding/removing keyword fields through javascript

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) (1 diff)
• java/eu/clarin/cmdi/vlo/wicket/pages/VirtualCollectionSubmissionPage.java (modified) (4 diffs)
• java/eu/clarin/cmdi/vlo/wicket/pages/VloBasePage.java (modified) (1 diff)
• js/eu/clarin/cmdi/vlo/wicket/pages/vlo-vcr-submission.js (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;
@@ -31 +32 @@
     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() {
@@ -48 +50 @@
     }
 
+    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.getJQueryWatermarkJS(),
+                JavaScriptResources.getVloVcrSubmissonJS()
         );
     }

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 />
 
                 <form id="virtualCollectionForm" wicket:id="vcrForm" method="post" name="vcrForm" action="[VCR endpoint]"> 
-                    <fieldset style="border:0px;"> 
-                        <input type="hidden" name="type" value="EXTENSIONAL" />
+                    <input type="hidden" name="type" value="EXTENSIONAL" />
 
+                    <p>
                         <label for="collectionName">
                             Collection name:
                             <input wicket:id="collectionName" type="text" name="name" value="[Collection name]" size="40" />  
                         </label>
+                    </p>
 
-                        <wicket:container wicket:id="metadataUris">
-                            <input wicket:id="metadataUri" type="hidden" name="metadataUri" value="http://md1" />
-                        </wicket:container>
-                    </fieldset> 
+                    <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>
+                    </div>
+
+                    <wicket:container wicket:id="metadataUris">
+                        <input wicket:id="metadataUri" type="hidden" name="metadataUri" value="http://md1" />
+                    </wicket:container>
                     <input type="submit" value="Create collection" />
                 </form> 

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;
 import eu.clarin.cmdi.vlo.wicket.model.SolrFieldStringModel;
 import eu.clarin.cmdi.vlo.wicket.provider.SolrDocumentProvider;
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.solr.common.SolrDocument;
 import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.Component;
-import org.apache.wicket.behavior.Behavior;
 import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.markup.repeater.data.DataView;
@@ -35 +39 @@
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.model.util.ListModel;
 
 /**
@@ -66 +71 @@
         collectionName.add(new AttributeModifier("value", nameModel));
         form.add(collectionName);
-        
+
         final SolrDocumentProvider provider = new SolrDocumentProvider(getModel());
         form.add(new DataView<SolrDocument>("metadataUris", provider) {
@@ -83 +88 @@
         });
 
+        final WebMarkupContainer keywords = new WebMarkupContainer("keywords");
+        keywords.setOutputMarkupId(true);
+        form.add(keywords);
+        
+        final ArrayList<String> keywordsList = new ArrayList<String>();
+        for (FacetSelection selection : model.getObject().getSelection().values()) {
+            for (String value : selection.getValues()) {
+                keywordsList.add(value);
+            }
+        }
+
+        final IModel<List<String>> keywordsModel = new ListModel<String>(keywordsList);
+        keywords.add(new ListView<String>("keyword", keywordsModel) {
+
+            @Override
+            protected void populateItem(final ListItem<String> item) {
+                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);
+//                    }
+//                });
+            }
+        });
+//        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/java/eu/clarin/cmdi/vlo/wicket/pages/VloBasePage.java

@@ -148 +148 @@
     @Override
     public void renderHead(IHeaderResponse response) {
+        // Always include JQuery first
+        response.render(JavaScriptHeaderItem.forReference(getApplication().getJavaScriptLibrarySettings().getJQueryReference()));
         // Include CSS. Exact file will be chosen on basis of current locale and style (theme)
         response.render(CssHeaderItem.forReference(new CssResourceReference(VloBasePage.class, "vlo.css", getLocale(), getStyle(), getVariation())));