Changeset 4663
- Timestamp:
- 03/10/14 12:50:26 (10 years ago)
- Location:
- vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket
- Files:
-
- 1 added
- 1 deleted
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/AllFacetValuesPanel.html
r4662 r4663 24 24 <body> 25 25 <wicket:panel> 26 27 <div><a wicket:id="cancel" href="" id="facetvaluescancel">Cancel</a></div>28 <h2 wicket:id="title">Resource type</h2>29 26 <p>All values in this facet</p> 30 27 <p>Sort by <select><option>name</option><option>count</option></select></p> -
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/AllFacetValuesPanel.java
r4662 r4663 17 17 package eu.clarin.cmdi.vlo.wicket.panels; 18 18 19 import eu.clarin.cmdi.vlo.wicket.components.SolrFieldNameLabel;20 19 import eu.clarin.cmdi.vlo.wicket.provider.FacetFieldValuesProvider; 21 20 import java.util.Collection; … … 24 23 import org.apache.wicket.ajax.AjaxRequestTarget; 25 24 import org.apache.wicket.ajax.markup.html.AjaxFallbackLink; 26 import org.apache.wicket.markup.html.WebMarkupContainer;27 25 import org.apache.wicket.markup.html.basic.Label; 28 26 import org.apache.wicket.markup.html.link.Link; … … 32 30 import org.apache.wicket.model.CompoundPropertyModel; 33 31 import org.apache.wicket.model.IModel; 34 import org.apache.wicket.model.PropertyModel;35 32 36 33 /** … … 42 39 public AllFacetValuesPanel(String id, IModel<FacetField> model) { 43 40 super(id, model); 44 45 add(new AjaxFallbackLink("cancel") {46 47 @Override48 public void onClick(AjaxRequestTarget target) {49 onCanceled(target);50 }51 });52 53 // add title54 add(new SolrFieldNameLabel("title", new PropertyModel<String>(model, "name")));55 41 56 42 // provider that extracts values and counts from FacetField … … 86 72 } 87 73 88 protected abstract void onCanceled(AjaxRequestTarget target);89 90 74 /** 91 75 * Callback triggered when values have been selected on this facet -
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/FacetValuesPanel.html
r4662 r4663 25 25 <wicket:panel> 26 26 <h1><a href="#"><wicket:container wicket:id="title">[TITLE]</wicket:container></a></h1> 27 <div wicket:id="allValues" class="allFacetValues">[ALL VALUES]</div> 27 28 <div class="sbilinks facetvalues"> 28 29 <ul> … … 36 37 </form> 37 38 --> 38 <div wicket:id="allValuesContainer">39 <div wicket:id="allValues" class="allFacetValues">[ALL VALUES]</div>40 </div>41 39 </wicket:panel> 42 40 </body> -
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/FacetValuesPanel.java
r4662 r4663 17 17 package eu.clarin.cmdi.vlo.wicket.panels; 18 18 19 import eu.clarin.cmdi.vlo.wicket. components.SolrFieldNameLabel;19 import eu.clarin.cmdi.vlo.wicket.model.SolrFieldNameModel; 20 20 import eu.clarin.cmdi.vlo.wicket.provider.FacetFieldValuesProvider; 21 21 import java.util.Collection; … … 25 25 import org.apache.wicket.ajax.AjaxRequestTarget; 26 26 import org.apache.wicket.ajax.markup.html.AjaxFallbackLink; 27 import org.apache.wicket. markup.html.WebMarkupContainer;27 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow; 28 28 import org.apache.wicket.markup.html.basic.Label; 29 29 import org.apache.wicket.markup.html.link.Link; … … 33 33 import org.apache.wicket.model.CompoundPropertyModel; 34 34 import org.apache.wicket.model.IModel; 35 import org.apache.wicket.model.PropertyModel;36 35 37 36 /** … … 44 43 private final int maxNumberOfFacetsToShow = 10; //TODO: get from config 45 44 46 private final WebMarkupContainer allValuesContainer;45 private final ModalWindow valuesWindow; 47 46 48 47 public FacetValuesPanel(String id, final IModel<FacetField> model) { … … 50 49 51 50 // add title 52 add(new SolrFieldNameLabel("title", new PropertyModel<String>(model, "name")));51 add(new Label("title", new SolrFieldNameModel(model, "name"))); 53 52 54 53 // provider that extracts values and counts from FacetField … … 62 61 }); 63 62 64 allValuesContainer = createAllValuesPanel("allValuesContainer");65 add( allValuesContainer);63 valuesWindow = createAllValuesWindow("allValues"); 64 add(valuesWindow); 66 65 add(createAllValuesLink("allFacetValuesLink")); 67 66 } … … 91 90 } 92 91 93 private WebMarkupContainer createAllValuesPanel(final String id) { 94 final WebMarkupContainer container = new WebMarkupContainer(id); 95 container.setOutputMarkupId(true); 96 WebMarkupContainer allValuesPlaceholder = createPlaceHolder("allValues"); 97 container.add(allValuesPlaceholder); 98 return container; 92 private ModalWindow createAllValuesWindow(String id) { 93 final ModalWindow window = new ModalWindow(id) { 94 95 @Override 96 public IModel<String> getTitle() { 97 return new SolrFieldNameModel(getModel(), "name"); 98 } 99 100 }; 101 102 final AllFacetValuesPanel allValuesPanel = new AllFacetValuesPanel(window.getContentId(), getModel()) { 103 104 @Override 105 protected void onValuesSelected(String facet, Collection<String> values, AjaxRequestTarget target) { 106 window.close(target); 107 FacetValuesPanel.this.onValuesSelected(facet, values, target); 108 } 109 }; 110 window.addOrReplace(allValuesPanel); 111 return window; 99 112 } 100 113 … … 104 117 @Override 105 118 public void onClick(AjaxRequestTarget target) { 106 final IModel<FacetField> model = FacetValuesPanel.this.getModel(); 107 final AllFacetValuesPanel allValuesPanel = new AllFacetValuesPanel("allValues", model) { 108 109 @Override 110 protected void onCanceled(AjaxRequestTarget target) { 111 hideAllValuesPanel(); 112 if (target != null) { 113 target.add(allValuesContainer); 114 } 115 } 116 117 @Override 118 protected void onValuesSelected(String facet, Collection<String> values, AjaxRequestTarget target) { 119 hideAllValuesPanel(); 120 onValuesSelected(facet, values, target); 121 } 122 }; 123 allValuesContainer.addOrReplace(allValuesPanel); 124 if (target != null) { 125 target.add(allValuesContainer); 126 } 127 } 128 129 private void hideAllValuesPanel() { 130 allValuesContainer.addOrReplace(createPlaceHolder("allValues")); 119 //TODO: No-javascript alternative (i.e. when target==null) 120 valuesWindow.show(target); 131 121 } 132 122 }; 133 123 return link; 134 }135 136 private WebMarkupContainer createPlaceHolder(final String id) {137 final WebMarkupContainer placeholder = new WebMarkupContainer(id);138 placeholder.setVisible(false);139 return placeholder;140 124 } 141 125 -
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/FieldsTablePanel.java
r4661 r4663 18 18 19 19 import eu.clarin.cmdi.vlo.pojo.DocumentField; 20 import eu.clarin.cmdi.vlo.wicket. components.SolrFieldNameLabel;20 import eu.clarin.cmdi.vlo.wicket.model.SolrFieldNameModel; 21 21 import org.apache.wicket.markup.html.basic.Label; 22 22 import org.apache.wicket.markup.html.list.ListItem; … … 42 42 protected void populateItem(Item<DocumentField> item) { 43 43 final IModel<DocumentField> fieldModel = item.getModel(); 44 item.add(new SolrFieldNameLabel("fieldName", new PropertyModel(fieldModel, "fieldName")));44 item.add(new Label("fieldName", new SolrFieldNameModel(new PropertyModel(fieldModel, "fieldName")))); 45 45 item.add(new ListView("values", new PropertyModel(fieldModel, "values")) { 46 46
Note: See TracChangeset
for help on using the changeset viewer.