diff --git a/.classpath b/.classpath index 1426ac3..e679a69 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + @@ -31,5 +31,6 @@ - + + diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs index a1aed63..bf677f3 100644 --- a/.settings/com.google.gdt.eclipse.core.prefs +++ b/.settings/com.google.gdt.eclipse.core.prefs @@ -2,6 +2,6 @@ <<<<<<<=.mine >>>>>>>=.r71295 eclipse.preferences.version=1 -lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.5.0-SNAPSHOT +lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.6.0-SNAPSHOT warSrcDir=src/main/webapp warSrcDirIsOutput=false diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 1fa7eb1..2dc054b 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -5,9 +5,6 @@ - - uses - diff --git a/pom.xml b/pom.xml index 85352af..38c9660 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.gcube.portlets.user reports war - 4.5.0-SNAPSHOT + 4.6.0-SNAPSHOT gCube Reports Portlet gCube Reports Portlet. @@ -147,7 +147,7 @@ org.gcube.portal gcube-reporting-library - [3.0.0-SNAPSHOT, 4.0.0-SNAPSHOT) + [3.4.0-SNAPSHOT, 4.0.0-SNAPSHOT) ${setScope} diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java index d95ba40..8c3cfea 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java @@ -42,6 +42,7 @@ import org.gcube.portlets.user.reportgenerator.client.targets.AttributeMultiSele import org.gcube.portlets.user.reportgenerator.client.targets.AttributeSingleSelection; import org.gcube.portlets.user.reportgenerator.client.targets.BasicTextArea; import org.gcube.portlets.user.reportgenerator.client.targets.ClientImage; +import org.gcube.portlets.user.reportgenerator.client.targets.ClientMasterSequence; import org.gcube.portlets.user.reportgenerator.client.targets.ClientRepeatableSequence; import org.gcube.portlets.user.reportgenerator.client.targets.Coords; import org.gcube.portlets.user.reportgenerator.client.targets.D4sRichTextarea; @@ -940,12 +941,11 @@ public class Presenter { case BODY_NOT_FORMATTED: if (component.isLocked()) { HTML text = (HTML) component.getContent(); + text.addStyleName("readOnlyText"); wp.addComponentToLayout(text, component.isDoubleColLayout()); } else { BasicTextArea textArea = (BasicTextArea) component.getContent(); -// textArea.getMyInstance().setTop(uiY); -// textArea.getMyInstance().setLeft(uiX); wp.addComponentToLayout(textArea, component.isDoubleColLayout()); } @@ -1020,6 +1020,10 @@ public class Presenter { ClientRepeatableSequence rps = (ClientRepeatableSequence) component.getContent(); wp.addComponentToLayout(rps, component.isDoubleColLayout()); break; + case MASTER_SEQUENCE_LIST: + ClientMasterSequence cmSeq = (ClientMasterSequence) component.getContent(); + wp.addComponentToLayout(cmSeq, component.isDoubleColLayout()); + break; case BODY_TABLE_IMAGE: TextTableImage tti = (TextTableImage) component.getContent(); wp.addComponentToLayout(tti, component.isDoubleColLayout()); diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/ToolboxPanel.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/ToolboxPanel.java index a688deb..7336717 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/ToolboxPanel.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/ToolboxPanel.java @@ -29,10 +29,10 @@ public class ToolboxPanel extends SimplePanel { public ToolboxPanel(AppControllerExplorer appController) { this.appController = appController; - AsyncTreePanel tp = appController.getTree(TOOLBOX_WIDTH, TOOLBOX_HEIGHT); - this.tp = tp; - add(tp); - this.appController.hideSharingFacilities(); //sharing disabled we have problems from Reports +// AsyncTreePanel tp = appController.getTree(TOOLBOX_WIDTH, TOOLBOX_HEIGHT); +// this.tp = tp; +// add(tp); +// this.appController.hideSharingFacilities(); //sharing disabled we have problems from Reports } public void showExportedVersion(String id, String fileName) { diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/dialog/ImporterDialog.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/dialog/ImporterDialog.java index 6d80b25..607b2ae 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/dialog/ImporterDialog.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/dialog/ImporterDialog.java @@ -1,17 +1,18 @@ package org.gcube.portlets.user.reportgenerator.client.dialog; import org.gcube.portlets.d4sreporting.common.shared.Model; +import org.gcube.portlets.user.gcubewidgets.client.popup.GCubeDialog; import org.gcube.portlets.user.reportgenerator.client.ReportConstants; import org.gcube.portlets.user.reportgenerator.client.Presenter.Presenter; import org.gcube.portlets.widgets.lighttree.client.Item; import org.gcube.portlets.widgets.lighttree.client.ItemType; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.CheckBox; -import com.google.gwt.user.client.ui.ClickListener; -import com.google.gwt.user.client.ui.DialogBox; import com.google.gwt.user.client.ui.Grid; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.HasHorizontalAlignment; @@ -19,7 +20,6 @@ import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.ListBox; import com.google.gwt.user.client.ui.VerticalPanel; -import com.google.gwt.user.client.ui.Widget; /** * ImporterDialog class is is the Dialog for importing template or report sections @@ -27,7 +27,7 @@ import com.google.gwt.user.client.ui.Widget; * @author Massimiliano Assante, ISTI-CNR - massimiliano.assante@isti.cnr.it * @version October 2009 (1.4) */ -public class ImporterDialog extends DialogBox { +public class ImporterDialog extends GCubeDialog { /** * this layout panel @@ -65,21 +65,32 @@ public class ImporterDialog extends DialogBox { HorizontalPanel buttonsContainer = new HorizontalPanel(); // Add a cancel button at the bottom of the dialog - Button cancelButton = new Button("Close",new ClickListener() { - public void onClick(Widget sender) { hide(); } + Button cancelButton = new Button("Close"); + cancelButton.addClickHandler(new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + hide(); + } }); - Button applyButton = new Button("Import",new ClickListener() { - public void onClick(Widget sender) { + + + Button applyButton = new Button("Import"); + + applyButton.addClickHandler(new ClickHandler() { + + @Override + public void onClick(ClickEvent event) { boolean result = false; - if (lastSection.isChecked()) + if (lastSection.getValue()) result = Window.confirm("You are about to import section " + (listbox.getSelectedIndex()+1) + " as last section in the current document"); else result = Window.confirm("You are about to import section " + (listbox.getSelectedIndex()+1) + " before section " + (listboxCurr.getSelectedIndex()+1) + " of the current document"); if (result) - presenter.importSection(toimportFrom, listbox.getSelectedIndex()+1, listboxCurr.getSelectedIndex()+1, lastSection.isChecked()); + presenter.importSection(toimportFrom, listbox.getSelectedIndex()+1, listboxCurr.getSelectedIndex()+1, lastSection.getValue()); hide(); + } }); @@ -152,14 +163,13 @@ public class ImporterDialog extends DialogBox { listboxCurr.addItem("Section " + i, ""+(i-1)); } - - lastSection.addClickListener(new ClickListener() { - - public void onClick(Widget sender) { - CheckBox cb = (CheckBox) sender; - listboxCurr.setEnabled(! cb.isChecked()); - } + lastSection.addClickHandler(new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + CheckBox cb = (CheckBox) event.getSource(); + listboxCurr.setEnabled(! cb.getValue()); + } }); Grid grid3 = new Grid(2, 2); diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateComponent.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateComponent.java index 277a743..f6c3b5d 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateComponent.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateComponent.java @@ -8,6 +8,7 @@ import java.util.List; import org.gcube.portlets.d4sreporting.common.shared.AttributeArea; import org.gcube.portlets.d4sreporting.common.shared.BasicComponent; import org.gcube.portlets.d4sreporting.common.shared.ComponentType; +import org.gcube.portlets.d4sreporting.common.shared.MasterSequenceList; import org.gcube.portlets.d4sreporting.common.shared.Metadata; import org.gcube.portlets.d4sreporting.common.shared.RepTimeSeries; import org.gcube.portlets.d4sreporting.common.shared.RepeatableSequence; @@ -17,6 +18,7 @@ import org.gcube.portlets.user.reportgenerator.client.targets.AttributeMultiSele import org.gcube.portlets.user.reportgenerator.client.targets.AttributeSingleSelection; import org.gcube.portlets.user.reportgenerator.client.targets.BasicTextArea; import org.gcube.portlets.user.reportgenerator.client.targets.ClientImage; +import org.gcube.portlets.user.reportgenerator.client.targets.ClientMasterSequence; import org.gcube.portlets.user.reportgenerator.client.targets.ClientRepeatableSequence; import org.gcube.portlets.user.reportgenerator.client.targets.D4sRichTextarea; import org.gcube.portlets.user.reportgenerator.client.targets.DropTSListener; @@ -196,14 +198,16 @@ public class TemplateComponent { if (sc.isLocked()) { HTML area = new HTML(); area.setStyleName("report-ui-component"); + area.addStyleName("readOnlyText"); //area.addStyleName(getStyle(sc.getType())); area.getElement().getStyle().setMarginTop(5, Unit.PX); - area.setPixelSize(width, 18); + area.setPixelSize(width-5, 18); area.setText((String) sc.getPossibleContent()); this.content = area; } else { - BasicTextArea bToAdd = new BasicTextArea(sc.getType(), presenter, sc.getX(), sc.getY(), width, 25, getUserComments() != null, showClose); + int changedWidth = width -5; //because of the inner padding + BasicTextArea bToAdd = new BasicTextArea(sc.getType(), presenter, sc.getX(), sc.getY(), changedWidth, 25, getUserComments() != null, showClose); bToAdd.setText((String) sc.getPossibleContent()); this.content = bToAdd; } @@ -358,6 +362,18 @@ public class TemplateComponent { } this.content = tti; break; + case MASTER_SEQUENCE_LIST: + GWT.log("FOUND Master SEQUENCE trying getGroup"); + MasterSequenceList masterSequence = (MasterSequenceList) sc.getPossibleContent(); + + ClientMasterSequence cmSeq = new ClientMasterSequence(presenter, masterSequence); + this.content = cmSeq; + + //GWT.log("getGroup: " + repeatableSequence.toString()); + + //ClientRepeatableSequence rps = new ClientRepeatableSequence(presenter, repeatableSequence); + //this.content = rps; + break; } } /** diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientMasterSequence.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientMasterSequence.java new file mode 100644 index 0000000..eb694ef --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientMasterSequence.java @@ -0,0 +1,66 @@ +package org.gcube.portlets.user.reportgenerator.client.targets; + +import java.util.ArrayList; + +import org.gcube.portlets.d4sreporting.common.shared.MasterSequence; +import org.gcube.portlets.d4sreporting.common.shared.MasterSequenceList; +import org.gcube.portlets.d4sreporting.common.shared.RepeatableSequence; +import org.gcube.portlets.user.reportgenerator.client.Presenter.Presenter; +import org.gcube.portlets.user.reportgenerator.client.model.TemplateComponent; + +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.VerticalPanel; +/** + * + * @author massi + * + */ +public class ClientMasterSequence extends Composite implements ClientSequence { + + protected ArrayList groupedComponents = new ArrayList(); + private VerticalPanel myPanel = new VerticalPanel(); + protected RepeatableSequence repSequence; + + protected RepeatableSequence originalSequence = new RepeatableSequence(); + + /** + * s + * @param p + * @param ms + */ + public ClientMasterSequence(Presenter p, MasterSequenceList msl) { + for (MasterSequence seq : msl.getSequences()) { + if (seq.isSelected()) { + repSequence = seq; + } + } + + SequenceWidget seqW = new SequenceWidget(p, this, repSequence, true, false); + seqW.enableClear(); + myPanel.add(seqW); + + initWidget(myPanel); + } + + + @Override + public ArrayList getGroupedComponents() { + return groupedComponents; + } + + @Override + public boolean add(RepeatableSequence sequence) { + return false; + } + + + @Override + public SequenceWidget remove(SequenceWidget toRemove) { + myPanel.remove(toRemove); + for (TemplateComponent tc : toRemove.getSeqGroupedComponents()) { + groupedComponents.remove(tc); + } + return toRemove; + } + +} diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientRepeatableSequence.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientRepeatableSequence.java index 7ce35e1..4f224bf 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientRepeatableSequence.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientRepeatableSequence.java @@ -5,16 +5,14 @@ import java.util.ArrayList; import org.gcube.portlets.d4sreporting.common.shared.BasicComponent; import org.gcube.portlets.d4sreporting.common.shared.ComponentType; import org.gcube.portlets.d4sreporting.common.shared.RepeatableSequence; -import org.gcube.portlets.user.reportgenerator.client.ReportGenerator; import org.gcube.portlets.user.reportgenerator.client.Presenter.Presenter; import org.gcube.portlets.user.reportgenerator.client.model.TemplateComponent; import com.google.gwt.core.client.GWT; -import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.VerticalPanel; -public class ClientRepeatableSequence extends Composite { +public class ClientRepeatableSequence extends Composite implements ClientSequence { protected ArrayList groupedComponents = new ArrayList(); private VerticalPanel myPanel = new VerticalPanel(); @@ -66,7 +64,10 @@ public class ClientRepeatableSequence extends Composite { } return toReturn; } - + /** + * + * @return + */ private ArrayList getRepeats() { ArrayList toReturn = new ArrayList(); int repeatDelimiterCounter = 2; @@ -107,6 +108,7 @@ public class ClientRepeatableSequence extends Composite { myPanel.add(seqW); } + protected void addNew(RepeatableSequence sRS) { SequenceWidget seqW = new SequenceWidget(p, this, sRS, false, true); myPanel.add(seqW); @@ -121,12 +123,29 @@ public class ClientRepeatableSequence extends Composite { groupedComponents.remove(tc); } } - + + @Override public ArrayList getGroupedComponents() { return groupedComponents; } public void setGroupedComponents(ArrayList groupedComponents) { this.groupedComponents = groupedComponents; + } + + @Override + public boolean add(RepeatableSequence sequence) { + SequenceWidget seqW = new SequenceWidget(p, this, sequence, false, true); + myPanel.add(seqW); + return true; + } + + @Override + public SequenceWidget remove(SequenceWidget toRemove) { + myPanel.remove(toRemove); + for (TemplateComponent tc : toRemove.getSeqGroupedComponents()) { + groupedComponents.remove(tc); + } + return toRemove; } } diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientSequence.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientSequence.java new file mode 100644 index 0000000..b836315 --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientSequence.java @@ -0,0 +1,15 @@ +package org.gcube.portlets.user.reportgenerator.client.targets; + +import java.util.ArrayList; + +import org.gcube.portlets.d4sreporting.common.shared.RepeatableSequence; +import org.gcube.portlets.user.reportgenerator.client.model.TemplateComponent; + +public interface ClientSequence { + + ArrayList getGroupedComponents(); + + boolean add(RepeatableSequence sequence); + + SequenceWidget remove(SequenceWidget toRemove); +} diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/SequenceWidget.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/SequenceWidget.java index 61e13d7..53a7e9f 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/SequenceWidget.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/SequenceWidget.java @@ -15,6 +15,7 @@ import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.HasAlignment; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.VerticalPanel; @@ -25,14 +26,15 @@ public class SequenceWidget extends Composite { private Button addAnotherB = new Button("Add another Entry"); private Button removeThisB = new Button("Remove Entry"); + private Button selectEntryB = new Button("Select New"); private Presenter p; private HorizontalPanel buttonPanel = new HorizontalPanel(); HorizontalPanel buttonsWrapperPanel = new HorizontalPanel(); - private ClientRepeatableSequence owner; + private ClientSequence owner; private RepeatableSequence repSequence; private ArrayList seqGroupedComponents = new ArrayList(); - public SequenceWidget(Presenter p, ClientRepeatableSequence owner, RepeatableSequence repSequence, boolean isFirst, boolean isNew) { + public SequenceWidget(Presenter p, ClientSequence owner, RepeatableSequence repSequence, boolean notRemovable, boolean isNew) { this.p = p; this.owner = owner; this.repSequence = repSequence; @@ -65,7 +67,7 @@ public class SequenceWidget extends Composite { } initWidget(myPanel); - if (isFirst) { + if (notRemovable) { buttonsWrapperPanel.add(addAnotherB); addAnotherB.addClickHandler(new ClickHandler() { @Override @@ -97,10 +99,50 @@ public class SequenceWidget extends Composite { }); } } + + public void enableClear() { + Button clearB = new Button("Clear Association"); + clearB.getElement().getStyle().setWidth(130, Unit.PX); + clearB.getElement().getStyle().setMargin(10, Unit.PX); + clearB.addStyleName("deleteAssociationButton"); + + clearB.addClickHandler(new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + clearAssociation(); + } + }); + + buttonsWrapperPanel.insert(clearB, 0); + + } + + public void clearAssociation() { + + GWT.log("Clearing Association"); + //in the MODEL + for (BasicComponent bc : repSequence.getGroupedComponents()) { + if (bc.getType() == ComponentType.BODY_NOT_FORMATTED) { + bc.setPossibleContent(""); + bc.setMetadata(new ArrayList()); + } + } + //in the VIEW + for (TemplateComponent tc : seqGroupedComponents) { + if (tc.getType() == ComponentType.BODY_NOT_FORMATTED) { + ((HTML) tc.getContent()).setText(""); + } + } + buttonsWrapperPanel.clear(); + selectEntryB.getElement().getStyle().setWidth(130, Unit.PX); + selectEntryB.getElement().getStyle().setMargin(10, Unit.PX); + selectEntryB.addStyleName("deleteAssociationButton"); + buttonsWrapperPanel.add(selectEntryB); + } public void add(TemplateComponent toAdd) { if (toAdd.getType() != ComponentType.REPEAT_SEQUENCE_INNER) { - owner.groupedComponents.add(toAdd); + owner.getGroupedComponents().add(toAdd); seqGroupedComponents.add(toAdd); GWT.log("ToAdd= getType " + toAdd.getType()); myPanel.add(toAdd.getContent()); @@ -116,10 +158,10 @@ public class SequenceWidget extends Composite { } private void addAnother() { - owner.addNew(repSequence); + owner.add(repSequence); } private void removeMe() { - owner.removeSeqWidget(this); + owner.remove(this); } } diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java index 8b0ff81..4512b4f 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java @@ -313,7 +313,7 @@ public class ReportServiceImpl extends RemoteServiceServlet implements ReportSe } _log.info("\n\n** zipToExtract: " + zipToExtract); - + if (bi.getFolderItemType() == FolderItemType.REPORT || bi.getFolderItemType() == FolderItemType.REPORT_TEMPLATE) { if (fromBasket) { diff --git a/src/main/resources/org/gcube/portlets/user/reportgenerator/ReportGenerator.gwt.xml b/src/main/resources/org/gcube/portlets/user/reportgenerator/ReportGenerator.gwt.xml index ddc425c..58b3a07 100644 --- a/src/main/resources/org/gcube/portlets/user/reportgenerator/ReportGenerator.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/reportgenerator/ReportGenerator.gwt.xml @@ -6,7 +6,7 @@ - + diff --git a/src/main/webapp/ReportGenerator.css b/src/main/webapp/ReportGenerator.css index ded59db..917ccdc 100644 --- a/src/main/webapp/ReportGenerator.css +++ b/src/main/webapp/ReportGenerator.css @@ -141,6 +141,20 @@ color: #FFF !important; } +.deleteAssociationButton { + background-image: none !important; + background-repeat: none !important; + background-color: #12B0FA !important; + color: #FFF !important; +} + +.deleteAssociationButton:hover { + background-image: none !important; + background-repeat: none !important; + background-color: #12B0FA !important; + color: #FFF !important; +} + .addEntryButton { background-image: none !important; background-repeat: none !important; @@ -471,16 +485,16 @@ tableBorder td { .title { background-image: url(images/title.png); - font-size: 16pt; + font-size: 18px; } .title-label { - font-size: 16pt; + font-size: 18px; padding-left: 0px; } .title-font { - font-size: 16pt; + font-size: 18px; padding-left: 0px; padding-bottom: 10px; color: #336699; @@ -488,60 +502,73 @@ tableBorder td { .heading1 { background-image: url(images/heading_1.png); - font-size: 12pt; + font-size: 16px; } .heading1-label { - font-size: 12pt; + font-size: 16px; padding-left: 0px; } .heading2 { background-image: url(images/heading_2.png); - font-size: 12pt; + font-size: 15px; } .heading2-label { - font-size: 15pt; + font-size: 15px; padding-left: 0px } .heading3 { background-image: url(images/heading_3.png); - font-size: 10pt; + font-size: 13px; } .heading3-label { - font-size: 13pt; + font-size: 13px; padding-left: 2px; } .heading4 { background-image: url(images/heading_4.png); - font-size: 10pt; + font-size: 11px; } .heading4-label { - font-size: 12pt; + font-size: 11px; padding-left: 10px; } .heading5 { background-image: url(images/heading_5.png); - font-size: 10pt; + font-size: 10px; } .heading5-label { - font-size: 8pt; + font-size: 10px; padding-left: 25px; } .simpleText { - padding-left: 4px; + padding: 5px 0 0 5px; font-size: 13px; color: black; } +.readOnlyText { + border: 1px solid #CCC !important; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + background-color: white; + margin-top: 5px; + padding: 5px; + + font-size: 13px; + color: #AAA; +} + .bodyArea { background-image: none; }