--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/CapabilitiesPanel.java	Mon Nov 21 12:00:48 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/CapabilitiesPanel.java	Mon Nov 21 18:15:44 2011 +0000
@@ -1,17 +1,23 @@
 package de.intevation.flys.client.client.ui.map;
 
+import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Grid;
 
+import com.smartgwt.client.types.Overflow;
 import com.smartgwt.client.widgets.Label;
 import com.smartgwt.client.widgets.layout.HLayout;
 import com.smartgwt.client.widgets.layout.Layout;
 import com.smartgwt.client.widgets.layout.VLayout;
 
 import de.intevation.flys.client.shared.model.Capabilities;
+import de.intevation.flys.client.shared.model.ContactInformation;
+import de.intevation.flys.client.client.FLYSConstants;
 
 
 public class CapabilitiesPanel extends VLayout {
 
+    protected FLYSConstants MSG = GWT.create(FLYSConstants.class);
+
     protected Capabilities capabilites;
 
 
@@ -24,55 +30,48 @@
 
 
     protected void initLayout() {
-        setMargin(10);
+        setMargin(5);
+        setOverflow(Overflow.AUTO);
         initContent();
     }
 
 
     protected void initContent() {
-        Grid grid = new Grid(5, 2);
+        Grid grid = new Grid(10, 2);
         grid.setCellPadding(10);
 
-        grid.setText(0, 0, "Titel:");
-        grid.setText(0, 1, "TODO:");
-        grid.setText(1, 0, "URL:");
-        grid.setText(1, 1, "TODO");
-        grid.setText(2, 0, "Nutzungsbedingungen:");
+        grid.setText(0, 0, MSG.capabilitiesTitle() + ":");
+        grid.setText(0, 1, capabilites.getTitle());
+        grid.setText(1, 0, MSG.capabilitiesURL() + ":");
+        grid.setText(1, 1, capabilites.getOnlineResource());
+        grid.setText(2, 0, MSG.capabilitiesAccessConstraints() + ":");
         grid.setText(2, 1, capabilites.getAccessConstraints());
-        grid.setText(3, 0, "Gebühren:");
+        grid.setText(3, 0, MSG.capabilitiesFees() + ":");
         grid.setText(3, 1, capabilites.getFees());
-        grid.setText(4, 0, "Weitere Informationen:");
-        grid.setText(4, 1, "TODO");
 
-        Label title = new Label("Bitte beachten Sie folgende Informationen des WMS-Dienstes:");
+        ContactInformation ci = capabilites.getContactInformation();
+        grid.setText(4, 0, MSG.capabilitiesContactInformation() + ":");
+        grid.setText(4, 1, ci.getPerson());
+        grid.setText(5, 0, "");
+        grid.setText(5, 1, ci.getOrganization());
+        grid.setText(6, 0, "");
+        grid.setText(6, 1, ci.getAddress());
+        grid.setText(7, 0, "");
+        grid.setText(7, 1, ci.getPostcode() + " " + ci.getCity());
+        grid.setText(8, 0, "");
+        grid.setText(8, 1, MSG.capabilitiesEmail() + ": " + ci.getEmail());
+        grid.setText(9, 0, "");
+        grid.setText(9, 1, MSG.capabilitiesPhone() + ": " + ci.getPhone());
+
+        Label title = new Label(MSG.capabilitiesHint());
         title.setHeight(25);
+        title.setStyleName("capabilities-info-title");
 
         addMember(title);
         addMember(grid);
     }
 
 
-    //private void initLayout() {
-    //    Label title   = new Label("Titel:");
-    //    Label url     = new Label("URL:");
-    //    Label access  = new Label("Nutzungsbedingungen:");
-    //    Label fees    = new Label("Gebühren:");
-    //    Label contact = new Label("Weitere Informationen:");
-
-    //    Label titleContent   = new Label("TODO");
-    //    Label urlContent     = new Label("TODO");
-    //    Label accessContent  = new Label(capabilites.getAccessConstraints());
-    //    Label feesContent    = new Label(capabilites.getFees());
-    //    Label contactContent = new Label("TODO");
-
-    //    addMember(createRow(title, titleContent));
-    //    addMember(createRow(url, urlContent));
-    //    addMember(createRow(access, accessContent));
-    //    addMember(createRow(fees, feesContent));
-    //    addMember(createRow(contact, contactContent));
-    //}
-
-
     protected Layout createRow(Label title, Label content) {
         title.setWidth(100);