Changeset 1945

Timestamp:

05/21/12 14:23:53 (12 years ago)

Author:

herste

Message:

attempt at ticket numer 86

Location:

vlo/trunk/vlo_webapp/src

Files:

• main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.html (modified) (1 diff)
• main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java (modified) (7 diffs)
• test/resources/applicationContext.xml (modified) (1 diff)

vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.html

@@ -19 +19 @@
                 </ul>
             </div>
+            <div>
+                <a wicket:id="feedback" href=""#">[[Feedback]]</a>
+            </div>
         </div>
     </wicket:extend>

vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java

@@ -1 +1 @@
 package eu.clarin.cmdi.vlo.pages;
 
+import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.net.URLEncoder;
 import java.util.Collection;
 import java.util.regex.Pattern;
@@ -9 +11 @@
 import org.apache.wicket.Component;
 import org.apache.wicket.PageParameters;
+import org.apache.wicket.RequestCycle;
 import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
 import org.apache.wicket.extensions.markup.html.basic.SmartLinkMultiLineLabel;
@@ -26 +29 @@
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.ResourceModel;
+import org.apache.wicket.protocol.http.RequestUtils;
 import org.apache.wicket.protocol.http.WicketURLDecoder;
 import org.apache.wicket.protocol.http.WicketURLEncoder;
@@ -41 +45 @@
     private final static Logger LOG = LoggerFactory.getLogger(ShowResultPage.class);
     public static final String PARAM_DOC_ID = "docId";
+    public static final String feedbackfromURL = "http://www.clarin.eu/node/3502?url=";
 
     @SuppressWarnings("serial")
@@ -75 +80 @@
             setResponsePage(new ResultNotFoundPage(parameters));
         }
-
+        String thisURL = RequestUtils.toAbsolutePath(RequestCycle.get().urlFor(this).toString());
+        try {
+            thisURL = URLEncoder.encode(thisURL,"UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            LOG.error(e.toString());
+        }
+        add(new ExternalLink("feedback", feedbackfromURL+thisURL, "Give Feedback"));
     }
 
@@ -124 +135 @@
             public void populateItem(Item<ICellPopulator<DocumentAttribute>> cellItem, String componentId, IModel<DocumentAttribute> rowModel) {
                 DocumentAttribute attribute = rowModel.getObject();
-                
+
                 if (attribute.getField().equals(FacetConstants.FIELD_LANGUAGE)) {
                     cellItem.add(new SmartLinkMultiLineLabel(componentId, attribute.getValue()) {
-                        
+
                         @Override
                         protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) {
@@ -136 +147 @@
                 } else if(attribute.getField().equals(FacetConstants.FIELD_LANGUAGES)) {
                     cellItem.add(new SmartLinkMultiLineLabel(componentId, attribute.getValue()) {
-                        
+
                         @Override
                         protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) {

vlo/trunk/vlo_webapp/src/test/resources/applicationContext.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
     <!--