Changeset 5471

Timestamp:

07/10/14 07:28:41 (10 years ago)

Author:

Twan Goosen

Message:

Finetuning of layout
Refactoring for readability in vcr submit page class

Location:

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

Files:

• java/eu/clarin/cmdi/vlo/wicket/pages/VirtualCollectionSubmissionPage.html (modified) (1 diff)
• java/eu/clarin/cmdi/vlo/wicket/pages/VirtualCollectionSubmissionPage.java (modified) (5 diffs)
• java/eu/clarin/cmdi/vlo/wicket/panels/search/AdvancedSearchOptionsPanel.html (modified) (1 diff)
• less/eu/clarin/cmdi/vlo/wicket/pages/inc/vlo-facets.less (modified) (1 diff)

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

@@ -53 +53 @@
                     </p>
 
-                    <div>
-                        <label for="keywords">Keywords</label>
-                        <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>
+                    <wicket:enclosure child="keywords">
+                        <div>
+                            <label for="keywords">Keywords:</label>
+                            <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>
+                    </wicket:enclosure>
 
                     <wicket:container wicket:id="metadataUris">

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

@@ -50 +50 @@
     @SpringBean
     private VloConfig vloConfig;
+    private final SolrDocumentProvider documentProvider;
 
     public VirtualCollectionSubmissionPage(IModel<QueryFacetsSelection> model) {
         super(model);
+        this.documentProvider = new SolrDocumentProvider(getModel());
 
+        // add a label with the number of URI's for the description
+        add(new Label("itemCount", new PropertyModel<Long>(documentProvider, "size")));
+
+        // the form is a container, not a wicket Form because it submits to an
+        // external service
         final WebMarkupContainer form = new WebMarkupContainer("vcrForm");
+        // <form action="...">
         form.add(new AttributeModifier("action", Model.of(vloConfig.getVcrSubmitEndpoint())));
+        // collection name input
+        form.add(createCollectionNameField("collectionName"));
+        // hidden URI fields 
+        form.add(createURIs("metadataUris"));
+        // keyword list with remove options
+        form.add(addKeywords(model, "keywords"));
+
         add(form);
+    }
 
+    private WebMarkupContainer createCollectionNameField(String id) {
         final IModel<String> nameModel = new AbstractReadOnlyModel<String>() {
 
@@ -70 +87 @@
             }
         };
+        final WebMarkupContainer collectionName = new WebMarkupContainer(id);
+        collectionName.add(new AttributeModifier("value", nameModel));
+        return collectionName;
+    }
 
-        final WebMarkupContainer collectionName = new WebMarkupContainer("collectionName");
-        collectionName.add(new AttributeModifier("value", nameModel));
-        form.add(collectionName);
-
-        final SolrDocumentProvider provider = new SolrDocumentProvider(getModel());
-        form.add(new DataView<SolrDocument>("metadataUris", provider) {
+    private DataView<SolrDocument> createURIs(String id) {
+        return new DataView<SolrDocument>(id, documentProvider) {
 
             @Override
@@ -89 +106 @@
                 item.add(mdUri);
             }
-        });
+        };
+    }
 
-        final WebMarkupContainer keywords = new WebMarkupContainer("keywords");
-        keywords.setOutputMarkupId(true);
-        form.add(keywords);
-
+    private WebMarkupContainer addKeywords(IModel<QueryFacetsSelection> model, String id) {
+        //create initial keywords list
         final ArrayList<String> keywordsList = new ArrayList<String>();
         if (model.getObject().getQuery() != null) {
@@ -105 +121 @@
         }
 
+        // create updatable keywords container
+        final WebMarkupContainer keywords = new WebMarkupContainer(id) {
+
+            @Override
+            protected void onConfigure() {
+                // hide keywords section if none are set
+                setVisible(!keywordsList.isEmpty());
+            }
+
+        };
+        keywords.setOutputMarkupId(true);
+
+        // create keywords list
         final IModel<List<String>> keywordsModel = new ListModel<String>(keywordsList);
         keywords.add(new ListView<String>("keyword", keywordsModel) {
@@ -130 +159 @@
         });
 
-        add(new Label("itemCount", new PropertyModel<Long>(provider, "size")));
+        return keywords;
     }
 

vlo/branches/vlo-3.1-vcr/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/AdvancedSearchOptionsPanel.html

@@ -34 +34 @@
                     <input type="submit" value="Apply" class="nonjsfallback" />
                 </form>
-                <a wicket:id="vcrSubmitTrigger" target="_blank">Create virtual collection from search results</a>
+                <a class="actionlink" wicket:id="vcrSubmitTrigger" target="_blank">Create virtual collection from search results</a>
             </div>
         </wicket:extend>

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

@@ -148 +148 @@
 .facet.collapsedfacet a.collapsefacet {
     display:  none;
+}
+
+.facet a.actionlink {
+    margin-left: 7px;
+    padding-left: 14px;
+    display: block;
 }