Changeset 2346

Timestamp:

11/12/12 09:50:10 (12 years ago)

Author:

teckart

Message:

Change position and look of feedback link ("report an error")

Location:

vlo/trunk/vlo_webapp/src/main

Files:

• java/eu/clarin/cmdi/vlo/pages/ShowResultPage.html (modified) (2 diffs)
• java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java (modified) (6 diffs)
• webapp/Images/feedback.png (added)

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

@@ -6 +6 @@
         <div class="endgame"><br>
             <div><a wicket:id="backLink" href="#"><wicket:message key="backToResult">[back]</wicket:message></a>&nbsp;|&nbsp;<a wicket:id="openBrowserLink"></a>
+            <a wicket:id="feedbackLink" style="float:right;" href="#"><img wicket:id="feedbackImage" height="32" width="32"/></a>
                 <p />
             </div>
@@ -19 +20 @@
                 </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

@@ -12 +12 @@
 import org.apache.wicket.PageParameters;
 import org.apache.wicket.RequestCycle;
+import org.apache.wicket.behavior.SimpleAttributeModifier;
 import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
 import org.apache.wicket.extensions.markup.html.basic.SmartLinkMultiLineLabel;
@@ -23 +24 @@
 import org.apache.wicket.markup.MarkupStream;
 import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.image.Image;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.markup.html.link.ExternalLink;
@@ -32 +34 @@
 import org.apache.wicket.protocol.http.WicketURLDecoder;
 import org.apache.wicket.protocol.http.WicketURLEncoder;
+import org.apache.wicket.resource.ContextRelativeResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -46 +49 @@
     public static final String PARAM_DOC_ID = "docId";
     public static final String feedbackfromURL = "http://www.clarin.eu/node/3502?url=";
+    
+    private final static ImageResource FEEDBACK_IMAGE = new ImageResource(new ContextRelativeResource("Images/feedback.png"), "Report an Error");
 
     @SuppressWarnings("serial")
@@ -81 +86 @@
         }
 
-        String thisURL = RequestUtils.toAbsolutePath(RequestCycle.get().urlFor(ShowResultPage.class, parameters).toString());
-        try {
-            thisURL = URLEncoder.encode(thisURL,"UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            LOG.error(e.toString());
-        }
-        add(new ExternalLink("feedback", feedbackfromURL+thisURL, "Give Feedback"));
+        // add feedback link
+        addFeedbackLink(parameters);
     }
 
@@ -199 +199 @@
         }
     }
+    
+    private void addFeedbackLink(final PageParameters parameters) {
+        String thisURL = RequestUtils.toAbsolutePath(RequestCycle.get().urlFor(ShowResultPage.class, parameters).toString());
+        try {
+            thisURL = URLEncoder.encode(thisURL,"UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            LOG.error(e.toString());
+        }
+        
+        Image resourceImg = new Image("feedbackImage", FEEDBACK_IMAGE.getResource());
+        String title = "Report an error";
+        resourceImg.add(new SimpleAttributeModifier("title", title));
+        resourceImg.add(new SimpleAttributeModifier("alt", title));
+        String href = getHref(feedbackfromURL+thisURL);
+        String name = feedbackfromURL+thisURL;
+        ExternalLink link = new ExternalLink("feedbackLink", href);
+        link.add(resourceImg);
+        link.add(new Label("feedbackLabel", name));
+        add(link);
+    }
 
     public static BookmarkablePageLink<ShowResultPage> createBookMarkableLink(String linkId, SearchPageQuery query, String docId) {