Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare the index.jsp for 4.14 and renew the styling #1329 #1330

Merged
merged 2 commits into from
Jun 12, 2023
Merged

Prepare the index.jsp for 4.14 and renew the styling #1329 #1330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b3b32a
Prepare the index.jsp for 4.14 and renew the styling #1329
speckyspooky Jun 11, 2023
2785fd5
Changed build.properties and the buidl.xml (OSGI) to handle the new
speckyspooky Jun 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion build/birt-packages/birt-runtime-osgi/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
<fileset dir="${PRODUCT_DIR}/configuration"/>
</copy>
<copy file="./config.ini" todir="${ENGINE_DIR}/platform/configuration" overwrite="true"/>
<copy file="${ROOT_DIR}/viewer/org.eclipse.birt.report.viewer/birt/test.rptdesign" tofile="${ENGINE_DIR}/samples/hello_world.rptdesign"/>
<copy file="${ROOT_DIR}/viewer/org.eclipse.birt.report.viewer/birt/example_simple.rptdesign" tofile="${ENGINE_DIR}/samples/hello_world.rptdesign"/>
<copy file="${ROOT_DIR}/viewer/org.eclipse.birt.report.viewer/birt/example_chart.rptdesign" tofile="${ENGINE_DIR}/samples/hello_world_chart.rptdesign"/>
<copy file="${ROOT_DIR}/build/org.eclipse.birt.releng.birtbuilder/extras/genReport.sh" todir="${ENGINE_DIR}"/>
<copy file="${ROOT_DIR}/build/org.eclipse.birt.releng.birtbuilder/extras/genReport.bat" todir="${ENGINE_DIR}"/>
</target>
Expand Down
1,845 changes: 1,845 additions & 0 deletions viewer/org.eclipse.birt.report.viewer/birt/example_chart.rptdesign
View file
Open in desktop

Large diffs are not rendered by default.

499 changes: 499 additions & 0 deletions viewer/org.eclipse.birt.report.viewer/birt/example_simple.rptdesign
View file
Open in desktop

Large diffs are not rendered by default.

224 changes: 143 additions & 81 deletions viewer/org.eclipse.birt.report.viewer/birt/index.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,92 +1,154 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML>
<HEAD>
<TITLE>Eclipse BIRT Home</TITLE>
<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
<LINK href="styles/iv/index.css" type=text/css rel=stylesheet>
<LINK href="http://www.eclipse.org/images/eclipse.ico" type=image/x-icon rel="shortcut icon">
<STYLE>
.warningMessage { color:red; }
</STYLE>
<!DOCTYPE HTML PUBLIC "-//W3C//Dtd HTML 4.0 transitional//EN">
<html>
<head>
<title>Eclipse BIRT Home</title>
<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
<link href="styles/iv/index.css" type=text/css rel=stylesheet>
<link href="https://eclipse-birt.github.io/birt-website/img/BIRT-Icon.ico" type=image/x-icon rel="shortcut icon">
<!--<link href="http://www.eclipse.org/images/eclipse.ico" type=image/x-icon rel="shortcut icon">-->
<style>
.warningMessage {
color: red;
}

.main_font {
font-family: Arial, sans-serif;
}

.info_group {
margin-top: 8px;
padding: 6px 8px 6px 20px;
background-color: #ddd;
color: #5c5c5c;
font-weight: bold;
}

.li {
padding: 4px;
}

.li-label {
display: inline-block;
min-width: 148px;
}

.installed_message {
border: 1px solid gray;
border-radius: 2px;
font-weight: bold;
font-size: 14pt;
color: #5c5c5c;
background-color: white;
margin: 36px 0px 36px 0px;
padding: 16px;

}
</style>
<%
String javaVersion = System.getProperty("java.version");
String viewerVersion = "4.13.0";
String engineVersion = "4.13.0";
String viewerVersion = "4.14.0";
String engineVersion = "4.14.0";

String javaVersion = System.getProperty("java.version");
String javaVendor = System.getProperty("java.vendor");
String javaHome = System.getProperty("java.home");

String osName = System.getProperty("os.name");
String osVersion = System.getProperty("os.version");
String osArch = System.getProperty("os.arch");
%>
</HEAD>
<BODY>
<style>

</style>
</head>
<body class="main_font">
<!-- Page banner -->
<TABLE class=banner-area cellSpacing=0 cellPadding=0 width="100%" border=0>
<TBODY>
<TR>
<TD width=115><a href="http://www.eclipse.org/">
<IMG src="webcontent/birt/images/EclipseBannerPic.jpg" alt="Eclipse Logo" width="115" height="50" border=0></a>
</TD>
<TD>
<IMG src="webcontent/birt/images/gradient.jpg" alt="gradient banner" width="300" height="50" border=0>
</TD>
<TD vAlign=center align=right width=250>
<a class="birt" href="http://www.eclipse.org/birt">
<table class="main_font" style="width:100%; border:0; background-image:url('webcontent/birt/images/Breadcrumbs-large-bg.jpg'); background-size:100%; padding-left:12px;">
<tbody>
<tr>
<td width=120>
<a href="http://www.eclipse.org/">
<img src="webcontent/birt/images/EclipseBannerPic.jpg" alt="Eclipse Logo" style="margin-left:-14px; vertical-align:middle; width:120px; border:0;">
</a>
</td>
<td>
<span style="margin-left:20px; font-weight:bold; font-size:16pt; color:white;">BIRT Viewer Installation</span>
</td>
<td vAlign=center align=right width=250>
<a class="birt" href="http://www.eclipse.org/birt" target="blank">
<!-- Temporary BIRT header -->
<SPAN style="PADDING-RIGHT: 10px; FONT-WEIGHT: bold; FONT-SIZE: 20px; COLOR: #e8e8ff; FONT-FAMILY: arial, sans-serif">
BIRT
</SPAN>
<div style="text-align:right; padding-right:10px; font-weight:bold; font-size:20px; color:#e8e8ff;">
<img src="webcontent/birt/images/BIRT-Logo.png" alt="BIT Logo" style="margin-right:12px; height:48px; margin-top:8px; margin-bottom:8px; background-color: white;border: 4px solid white; border-radius: 4px;">
</div>
</a>
</TD>
</TR>
</TBODY>
</TABLE>
<!-- Table with menu & content -->
<TABLE cellSpacing=0 cols=2 cellPadding=0 border=0 width="100%">
<TBODY>
<TR>
<TD class=content style="PADDING-RIGHT: 10px; PADDING-LEFT: 10px; PADDING-BOTTOM: 10px; PADDING-TOP: 10px" >
</td>
</tr>
</tbody>
</table>
<!-- table with menu & content -->
<table class="main_font" style="padding:0px; width:100%; border:0;"> <!--cellSpacing=0 cols=2 cellPadding=0 border=0 width="100%">-->
<tbody>
<tr>
<td class="content" style="padding:10px;" >
<!-- Page title -->
<TABLE cellSpacing=0 cellPadding=0 width="100%" border=0>
<TBODY>
<TR>
<TD vAlign=top>
<span class="indextop">BIRT viewer has been installed.</span><p>&nbsp;
</TD>
<TD class=jump style="PADDING-LEFT: 10px" align=right rowSpan=2>
<IMG src="webcontent/birt/images/Idea.jpg" alt="Idea" width="120" height="86">
</TD>
</TR>
<TR>
<TD>&nbsp;</TD>
</TR>
</TBODY>
</TABLE>
<div class="installed_message"><img src="webcontent/birt/images/BIRT-Icon-large.png" alt="BIT Logo" style="vertical-align:middle; border:0; margin-right:12px; height:48px;">BIRT viewer has been installed.</div>
<!-- Content area -->
<p>Thank you for your choosing BIRT (Business Intelligence Reporting Tool).</p>
<p>Viewer Version : <%= viewerVersion %></p>
<p>Engine Version: <%= engineVersion %></p>
<%
String javaVersionMessage = javaVersion;

// check Java version
String[] versionParts = javaVersion.split("\\.");
int majorVersion = 0;
int minorVersion = 0;
try
{
majorVersion = Integer.parseInt(versionParts[0]);
minorVersion = Integer.parseInt(versionParts[1]);
if ( majorVersion < 1 || ( majorVersion == 1 && minorVersion < 5 ) )
<div style="background-color:#4682b4; color:white; padding:8px 8px 8px 16px; font-weight:bold;">Thank you for your choosing BIRT (Business Intelligence Reporting Tool).</div>
<div>
<%
String javaVersionMessage = javaVersion;

// check Java version
String[] versionParts = javaVersion.split("\\.");
int majorVersion = 0;
int minorVersion = 0;
try
{
javaVersionMessage = "<span class=\"warningMessage\">" + javaVersion + " (WARNING: BIRT " + viewerVersion + " only supports JRE versions >= 1.5)</span>";
majorVersion = Integer.parseInt(versionParts[0]);
minorVersion = Integer.parseInt(versionParts[1]);
if ( majorVersion < 1 || ( majorVersion == 1 && minorVersion < 5 ) )
{
javaVersionMessage = "<span class=\"warningMessage\">" + javaVersion + " (WARNING: BIRT " + viewerVersion + " only supports JRE versions >= 1.5)</span>";
}
}
}
catch (NumberFormatException e)
{

}
%>
<p>JRE version: <%= javaVersionMessage %></p>
<p><a href="<%= request.getContextPath( ) + "/frameset?__report=test.rptdesign&sample=my+parameter" %>">View Example</a>
</TD>
</TR>
</TBODY>
</TABLE>
catch (NumberFormatException e)
{

}
%>
<div class="info_group">BIRT details:</div>
<ul>
<li class="li"><span class="li-label">Viewer Version:</span><span><%= viewerVersion %></span></li>
<li class="li"><span class="li-label">Engine Version:</span><span><%= engineVersion %></span></li>
</ul>
<div class="info_group">Java environment:</div>
<ul>
<li class="li"><span class="li-label">JRE Version:</span><span><%= javaVersionMessage %></span></li>
<li class="li"><span class="li-label">JRE Vendor:</span><span><%= javaVendor %></span></li>
<li class="li"><span class="li-label">Java Home:</span><span><%= javaHome %></span></li>
<li class="li"><span class="li-label">Applicaton Server:</span><span><%= application.getServerInfo() %></span></li>
</ul>
<div class="info_group">OS details:</div>
<ul>
<li class="li"><span class="li-label">OS Name:</span><span><%= osName %></span></li>
<li class="li"><span class="li-label">OS Version:</span><span><%= osVersion %></span></li>
<li class="li"><span class="li-label">OS Architecture:</span><span><%= osArch %></span></li>
</ul>
</div>
<div style="background-color: #4682b4; height:2px;"></div>
<p>
<a href="<%= request.getContextPath( ) + "/frameset?__report=example_simple.rptdesign&paramString=my+parameter&paramInteger=2&paramList=2" %>" target="blank">
<img src="webcontent/birt/images/Link_Icon.png" alt="Link" style="margin-left:24px; margin-right:8px; vertical-align:middle; height:16px;">
<span>View Example 01: Integrated simple report</span>
</a>
<p>
<a href="<%= request.getContextPath( ) + "/frameset?__report=example_chart.rptdesign&paramCust=130" %>" target="blank">
<img src="webcontent/birt/images/Link_Icon.png" alt="Link" style="margin-left:24px; margin-right:8px; vertical-align:middle; height:16px;">
<span>View Example 02: Integrated chart report</span>
</a>
<div style="background-color: #4682b4; height:2px;"></div>
</td>
</tr>
</tbody>
</table>
</BODY>
</HTML>
105 changes: 0 additions & 105 deletions viewer/org.eclipse.birt.report.viewer/birt/test.rptdesign
View file
Open in desktop

This file was deleted.