partially updated styles again

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@69309 82a268e6-3cf1-43bd-a215-b396298e98cf

src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateComponent.java

@@ -400,7 +400,8 @@ public class TemplateComponent {
 			ArrayList<SerializableAttribute> values = new ArrayList<SerializableAttribute>();
 			for (CheckBox box : att.getBoxes()) {
 				values.add(new SerializableAttribute(box.getText().trim(), box.getValue()));
-			}
+			}	
+			GWT.log("Attr: " + att.getAttrName());
 			SerializableAttributeArea sat= new SerializableAttributeArea(att.getAttrName().trim(), values);
 			content = sat; 
 			break;

src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateModel.java

@@ -276,7 +276,7 @@ public class TemplateModel {
 		this.templateName = toLoad.getTemplateName(); 
 		this.pageWidth = toLoad.getPageWidth();
 		this.pageHeight = toLoad.getPageHeight();
-		this.currentPage = toLoad.getCurrPage();
+		this.currentPage = 1;
 		this.totalPages = toLoad.getTotalPages();
 		this.marginLeft = toLoad.getMarginLeft();
 		this.marginRight = toLoad.getMarginRight();

src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/AttributeArea.java

@@ -8,6 +8,7 @@ import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.user.client.ui.CheckBox;
 import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.HasHorizontalAlignment;
 import com.google.gwt.user.client.ui.HasVerticalAlignment;
@@ -21,7 +22,7 @@ import com.google.gwt.user.client.ui.HorizontalPanel;
 public class AttributeArea extends Composite {
 
 	private HorizontalPanel myPanel;
-	private HTML attrName;
+	private String attrName;
 	private CheckBox[] boxes;
 
 	/**
@@ -34,10 +35,11 @@ public class AttributeArea extends Composite {
 		myPanel.setPixelSize(width, 20);
 		myPanel.addStyleName("attributeArea");
 
-		attrName = new HTML(getAttributeName(textToDisplay));
-		attrName.getElement().getStyle().setMarginRight(5, Unit.PX);
-		HorizontalPanel boxesPanel = new HorizontalPanel();
-		boxesPanel.add(attrName);
+		attrName = getAttributeName(textToDisplay);
+		HTML attrNameLabel = new HTML(attrName+":");
+		attrNameLabel.getElement().getStyle().setMarginRight(5, Unit.PX);
+		FlowPanel boxesPanel = new FlowPanel();
+		boxesPanel.add(attrNameLabel);
 		myPanel.add(boxesPanel);
 		myPanel.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_LEFT);
 		boxes = getCheckboxes(textToDisplay);
@@ -56,10 +58,11 @@ public class AttributeArea extends Composite {
 		myPanel.setPixelSize(width, 20);
 		myPanel.addStyleName("attributeArea");
 
-		attrName = new HTML(sata.getAttrName(), true);
-		attrName.getElement().getStyle().setMarginRight(5, Unit.PX);
-		HorizontalPanel boxesPanel = new HorizontalPanel();
-		boxesPanel.add(attrName);
+		attrName = sata.getAttrName();
+		HTML attrNameLabel = new HTML(attrName+":");
+		attrNameLabel.getElement().getStyle().setMarginRight(5, Unit.PX);
+		FlowPanel boxesPanel = new FlowPanel();
+		boxesPanel.add(attrNameLabel);
 		myPanel.add(boxesPanel);
 		myPanel.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_LEFT);
 		int values = sata.getValues().size(); 
@@ -132,7 +135,7 @@ public class AttributeArea extends Composite {
 	 * @return
 	 */
 	public String getAttrName() {
-		return attrName.getText();
+		return attrName;
 	}
 	
 	

src/main/resources/org/gcube/portlets/user/reportgenerator/ReportGenerator.gwt.xml

@@ -10,7 +10,7 @@
 	<inherits name='org.gcube.portlets.user.guidedtour.GuidedTour' />
 
 	<!-- To Comment out -->
-	<set-property name="user.agent" value="gecko1_8" />
+<!-- 	<set-property name="user.agent" value="gecko1_8" /> -->
 
 	<inherits name='org.gcube.portlets.user.workspace.lighttree.WorkspacePortletLightTree' />
 

src/main/webapp/ReportGenerator.css

@@ -197,7 +197,7 @@ tableBorder td {
 	border: none;
 	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
 	font-size: 12px;
-	color: Blue;
+	color: #336699;
 }
 
 .attributeValue {
@@ -212,7 +212,7 @@ tableBorder td {
 	font-family: "Courier New", Courier, monospace;
 	font-size: 11px;
 	color: #666;
-	padding: 3px 0px;
+	padding: 3px 25px 0px 0px;
 }
 
 .gridAttribute {
@@ -274,7 +274,7 @@ tableBorder td {
 
 .heading2-label {
 	font-size: 11pt;
-	padding-left: 4px;
+	padding-left: 0px;
 }
 
 .heading3 {
@@ -284,7 +284,7 @@ tableBorder td {
 
 .heading3-label{
 	font-size: 10pt;
-	padding-left: 4px;
+	padding-left: 2px;
 }
 
 .heading4 {
@@ -506,10 +506,7 @@ gwt-MenuBar {
 }
 
 .hasRichTextToolbar {
-	background-color: #FFFFFF;
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	border: 1px inset #3366CC;
+
 }
 
 .gwt-RichTextToolbar {