gCubeSystem
/
vmereports-manager-portlet
Archived
16
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

partially updated styles 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@69304 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2013-02-14 18:17:45 +00:00
parent ab9f9043df
commit 130b4dccbf
6 changed files with 59 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -153,12 +153,14 @@
<groupId>org.gcube.portlets.user</groupId>
<artifactId>home-library</artifactId>
<version>4.3.0-SNAPSHOT</version>
<scope>${setScope}</scope>
</dependency>
<dependency>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>home-library-jcr</artifactId>
<version>1.3.0-SNAPSHOT</version>
<classifier>${setClassifier}</classifier>
<scope>${setScope}</scope>
</dependency>
<dependency>
<groupId>org.gcube.applicationsupportlayer</groupId>

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

@ -204,11 +204,11 @@ public class TemplateComponent {
case HEADING_5:
case TITLE:
if (sc.isLocked()) {
HTML area = new HTML();
area.setStyleName(getStyle(sc.getType()));
area.getElement().getStyle().setMarginLeft(25, Unit.PX);
area.getElement().getStyle().setMarginTop(15, Unit.PX);
area.setPixelSize(width, 25);
HTML area = new HTML();
area.setStyleName("report-ui-component");
area.addStyleName(getStyle(sc.getType()));
area.getElement().getStyle().setMarginTop(5, Unit.PX);
area.setPixelSize(width, 18);
area.setText((String) sc.getPossibleContent());
this.content = area;
}
@ -327,17 +327,17 @@ public class TemplateComponent {
private String getStyle(ComponentType type) {
switch (type) {
case TITLE:
return "titleArea";
return "title-font";
case HEADING_1:
return "headgin1Area";
return "heading1-label";
case HEADING_2:
return "headgin2Area";
return "heading2-label";
case HEADING_3:
return "headgin3Area";
return "heading3-label";
case HEADING_4:
return "headgin4Area";
return "heading4-label";
case HEADING_5:
return "headgin5Area";
return "heading5-label";
default:
return "";
}
@ -379,6 +379,7 @@ public class TemplateComponent {
case TITLE:
if (this.isLocked()) {
content = ((HTML) this.content).getText();
}
else
content = ((BasicTextArea) this.content).getText();

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

@ -35,7 +35,6 @@ public class AttributeArea extends Composite {
myPanel.addStyleName("attributeArea");
attrName = new HTML(getAttributeName(textToDisplay));
attrName.getElement().getStyle().setMarginLeft(25, Unit.PX);
attrName.getElement().getStyle().setMarginRight(5, Unit.PX);
HorizontalPanel boxesPanel = new HorizontalPanel();
boxesPanel.add(attrName);
@ -58,7 +57,6 @@ public class AttributeArea extends Composite {
myPanel.addStyleName("attributeArea");
attrName = new HTML(sata.getAttrName(), true);
attrName.getElement().getStyle().setMarginLeft(25, Unit.PX);
attrName.getElement().getStyle().setMarginRight(5, Unit.PX);
HorizontalPanel boxesPanel = new HorizontalPanel();
boxesPanel.add(attrName);

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

@ -3,10 +3,10 @@
<!-- Inherit the core Web Toolkit stuff. -->
<inherits name='com.google.gwt.user.User' />
<inherits name='org.gcube.portlets.user.workspace.WorkspaceTree' />
<inherits name='org.gcube.portlets.d4sreporting.common.Reporting' />
<inherits name='org.gcube.portlets.user.gcubewidgets.WidgetFactory' />
<!-- inherits name='org.gube.portlets.user.reporting.fimesexporter.Fimesexporter' /-->
<inherits name='org.gcube.portlets.user.workspace.WorkspaceTree' />
<inherits name='org.gcube.portlets.user.guidedtour.GuidedTour' />
<!-- To Comment out -->

54
src/main/webapp/ReportGenerator.css
View File

@ -64,10 +64,13 @@ tableBorder td {
}
.wpFlow {
border: none;
margin-left: 20px;
margin: 10px 5px 5px 20px;
border: 1px solid #e3e8f3;
padding-left: 44px;
background-color: #e3e8f3;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
}
.highlight_background {
@ -190,9 +193,7 @@ tableBorder td {
.attributeArea {
margin-top: 5px;
background-image: url(images/attribute_area.png);
background-repeat: no-repeat;
padding-left: 20px;
padding-left: 0px;
border: none;
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 12px;
@ -208,16 +209,10 @@ tableBorder td {
.instructionArea {
margin-top: 5px;
background-image: url(images/instruction_area.png);
background-repeat: no-repeat;
border: 0px solid gray;
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 12px;
font-family: "Courier New", Courier, monospace;
font-size: 11px;
color: #666;
padding-left: 25px;
padding-top: 3px;
padding: 3px 0px;
}
.gridAttribute {
@ -242,6 +237,9 @@ tableBorder td {
.report-ui-component {
background-repeat: no-repeat;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
color: maroon;
font-family: Verdana;
border: none;
@ -254,31 +252,61 @@ tableBorder td {
font-size: 16pt;
}
.title-label {
font-size: 16pt;
padding-left: 0px;
}
.heading1 {
background-image: url(images/heading_1.png);
font-size: 12pt;
}
.heading1-label {
font-size: 12pt;
padding-left: 0px;
}
.heading2 {
background-image: url(images/heading_2.png);
font-size: 11pt;
}
.heading2-label {
font-size: 11pt;
padding-left: 4px;
}
.heading3 {
background-image: url(images/heading_3.png);
font-size: 10pt;
}
.heading3-label{
font-size: 10pt;
padding-left: 4px;
}
.heading4 {
background-image: url(images/heading_4.png);
font-size: 9pt;
}
.heading5Area {
.heading4-label{
font-size: 9pt;
padding-left: 4px;
}
.heading5 {
background-image: url(images/heading_5.png);
font-size: 8pt;
}
.heading5-label{
font-size: 8pt;
padding-left: 4px;
}
.bodyArea {
background-image: none;
}

5
src/main/webapp/WEB-INF/jsp/ReportGeneratorPortlet_view.jsp
View File

@ -7,6 +7,7 @@
<portlet:defineObjects />
--%>
<link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/OpenBioSamplePortlet.css" />
<script type="text/javascript" language="javascript" src="<%=request.getContextPath()%>/reportgenerator/reportgenerator.nocache.js"></script>
<link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/gxt/css/gxt-all.css" />
<link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/ReportGenerator.css" />
<script type="text/javascript" language="javascript" src="<%=request.getContextPath()%>/reports/reports.nocache.js"></script>
<div id="ReportGeneratorDIV"></div>