- ![]()
+ {GetResource("spinner.svg")}
{template_toolbar(renderBody)}
diff --git a/FastReport.Core.Web/Templates/outline.cs b/FastReport.Core.Web/Templates/outline.cs
index 3b2d5b1e..be7f3f42 100644
--- a/FastReport.Core.Web/Templates/outline.cs
+++ b/FastReport.Core.Web/Templates/outline.cs
@@ -39,9 +39,7 @@ void BuildOutline(StringBuilder sb, XmlItem xml, bool top)
{
for (int i = 0; i < xml.Count; i++)
{
- var opened = false;
- if (top && xml.Count == 1) // open if there is only one node on top
- opened = true;
+ var opened = top && xml.Count == 1;
var styleShow = opened ? @"style=""display:none""" : @"style=""display:block""";
var styleHide = opened ? @"style=""display:block""" : @"style=""display:none""";
@@ -56,8 +54,8 @@ void BuildOutline(StringBuilder sb, XmlItem xml, bool top)
string caret;
if (hasChildren)
{
- caret = $@"");
sb.Append(caret);
- sb.Append($@"![]()
");
+ sb.Append($@"![]()
");
sb.Append($@"{HttpUtility.HtmlEncode(text)}");
sb.Append($@"
");
diff --git a/FastReport.Core.Web/Templates/style.cs b/FastReport.Core.Web/Templates/style.cs
index 604b1949..db147858 100644
--- a/FastReport.Core.Web/Templates/style.cs
+++ b/FastReport.Core.Web/Templates/style.cs
@@ -116,13 +116,16 @@ string template_style() => $@"
border-radius:{Toolbar.ToolbarRoundness}px;
background-color: #00000000;
position: relative;
+ align-items: center;
+ display: flex;
}}
.{template_FR}-toolbar-item:hover {{
background-color: {ColorTranslator.ToHtml(Toolbar.Color)};
}}
-.{template_FR}-toolbar-item > img {{
+
+.{template_FR}-toolbar-item > svg {{
height: calc({Toolbar.Height}px * 0.5);
padding-top: calc({Toolbar.Height}px * 0.15);
padding-bottom: calc({Toolbar.Height}px * 0.15);
@@ -133,10 +136,9 @@ string template_style() => $@"
filter:invert({Toolbar.ColorIcon});
margin-left: 10px;
margin-right: 10px;
- margin-top: 5px;
}}
-.{template_FR}-toolbar-item:hover > img {{
+.{template_FR}-toolbar-item:hover > svg {{
opacity: 0.5;
}}
@@ -144,7 +146,7 @@ string template_style() => $@"
background-color: transparent;
}}
-.{template_FR}-toolbar-notbutton:hover > img {{
+.{template_FR}-toolbar-notbutton:hover > svg {{
opacity: 1;
}}
@@ -354,7 +356,7 @@ TOOLBAR DROPDOWN
font: {Toolbar.Exports.UserFontSettingsStyle} 12px {Toolbar.Exports.UserFontSettingsFamily};
font-size: 11px;
overflow: hidden;
- background: #ffffff url(/_fr/resources.getResource?resourceName=select-arrow.svg&contentType=image%2Fsvg%2Bxml) no-repeat;
+ background: #ffffff url('data:image/svg+xml;base64,{GerResourceBase64("select-arrow.svg")}') no-repeat;
background-position: calc(100% - 10px) center;
-moz-appearance:none; /* Firefox */
-webkit-appearance:none; /* Safari and Chrome */
@@ -514,7 +516,7 @@ @keyframes shake {{
}}
.{template_FR}-container .activeButton {{
- background: url(/_fr/resources.getResource?resourceName=button-active.svg&contentType=image%2Fsvg%2Bxml) no-repeat;
+ background: url('data:image/svg+xml;base64,{GerResourceBase64("button-active.svg")}') no-repeat;
background-position: 0px center;
vertical-align: middle;
}}
@@ -587,19 +589,18 @@ @keyframes shake {{
TOOLBAR NAVIGATION
*************************/
-.{template_FR}-toolbar-narrow > img {{
+.{template_FR}-toolbar-narrow > svg {{
transform: rotate({Toolbar.ToolbarNarrow}deg);
padding-left: 0px;
padding-right: 0px;
height: calc({Toolbar.Height}px * 0.35);
padding-top: 9px;
- margin: 5px 10px 0px;
}}
.{template_FR}-toolbar-slash{{
}}
-.{template_FR}-toolbar-slash > img {{
+.{template_FR}-toolbar-slash > svg {{
margin-left: 0px;
margin-right: 0px;
height: calc({Toolbar.Height}px * 0.35);
@@ -647,7 +648,7 @@ TOOLBAR NAVIGATION
z-index: 10;
}}
-.{template_FR}-spinner img {{
+.{template_FR}-spinner svg {{
width: 90px;
height: 90px;
left: calc(50%-50px);
@@ -736,7 +737,7 @@ TOOLBAR NAVIGATION
margin-right: 6px;
}}
-.{template_FR}-tabs .{template_FR}-tab-close img{{
+.{template_FR}-tabs .{template_FR}-tab-close svg{{
border-radius: 10px;
}}
@@ -752,20 +753,20 @@ TOOLBAR NAVIGATION
cursor: default;
}}
-.{template_FR}-tabs .{template_FR}-tab a img {{
+.{template_FR}-tabs .{template_FR}-tab a svg {{
height: 13px;
opacity: 0;
}}
-.{template_FR}-tabs .{template_FR}-tab.active a img {{
+.{template_FR}-tabs .{template_FR}-tab.active a svg {{
opacity: 0.5;
}}
-.{template_FR}-tabs .{template_FR}-tab:hover a img {{
+.{template_FR}-tabs .{template_FR}-tab:hover a svg {{
opacity: 0.5;
}}
-.{template_FR}-tabs .{template_FR}-tab a img:hover {{
+.{template_FR}-tabs .{template_FR}-tab a svg:hover {{
opacity: 1;
background-color: #f1f1f1;
cursor: pointer;
@@ -783,7 +784,7 @@ TOOLBAR NAVIGATION
opacity: 0.5;
}}
.datetimepicker > input[type=""date""]{{
- background: url(""{template_resource_url("date-picker.svg", "image/svg+xml")}"") no-repeat;
+ background: url('data:image/svg+xml;base64,{GerResourceBase64("date-picker.svg")}') no-repeat;
background-size: 10px;
background-position: right 5px center;
background-origin: content-box, content-box;
@@ -944,7 +945,7 @@ EMAIL EXPORT
overflow: hidden;
-moz-appearance:none; /* Firefox */
-webkit-appearance:none; /* Safari and Chrome */
- background: #ffffff url(/_fr/resources.getResource?resourceName=select-arrow.svg&contentType=image%2Fsvg%2Bxml) no-repeat;
+ background: #ffffff url('data:image/svg+xml;base64,{GerResourceBase64("select-arrow.svg")}') no-repeat;
background-position: calc(100% - 10px) center;
margin - left: 10px;
width: 244px;
diff --git a/FastReport.Core.Web/Templates/tabs.cs b/FastReport.Core.Web/Templates/tabs.cs
index e879ba08..10a02bdd 100644
--- a/FastReport.Core.Web/Templates/tabs.cs
+++ b/FastReport.Core.Web/Templates/tabs.cs
@@ -38,7 +38,7 @@ string template_tabs()
if (tab.Closeable)
sb.Append($@"
-
- ![]()
+ var toolbarExportItem = $@"
+ {GetResource("save.svg")}
"
;
- var toolbarPrintItem = $@" "
+ (exports.ShowPreparedReport ? $@"{localization.preparedTxt}" : "")
#if !OPENSOURCE
+ (exports.ShowPdfExport ? $@"{localization.pdfTxt}":"")
- + (exports.EnableSettings && exports.ShowPdfExport ? $@"" : "")
+ + (exports.EnableSettings && exports.ShowPdfExport ? $@"" : "")
+ (exports.ShowExcel2007Export ? $@"{localization.excel2007Txt}" : "")
- + (exports.EnableSettings && exports.ShowExcel2007Export ? $@"" : "")
+ + (exports.EnableSettings && exports.ShowExcel2007Export ? $@"" : "")
+ (exports.ShowWord2007Export ? $@"{localization.word2007Txt}" : "")
- + (exports.EnableSettings && exports.ShowWord2007Export ? $@"" : "")
+ + (exports.EnableSettings && exports.ShowWord2007Export ? $@"" : "")
+ (exports.ShowPowerPoint2007Export ? $@"{localization.powerPoint2007Txt}" : "")
- + (exports.EnableSettings && exports.ShowPowerPoint2007Export ? $@"" : "")
+ + (exports.EnableSettings && exports.ShowPowerPoint2007Export ? $@"" : "")
+ (exports.ShowTextExport ? $@"{localization.textTxt}" : "")
+ (exports.ShowRtfExport ? $@"{localization.rtfTxt}" : "")
- + (exports.EnableSettings && exports.ShowRtfExport ? $@"" : "")
+ + (exports.EnableSettings && exports.ShowRtfExport ? $@"" : "")
+ (exports.ShowXpsExport ? $@"{localization.xpsTxt}" : "")
+ (exports.ShowOdsExport ? $@"{localization.odsTxt}" : "")
- + (exports.EnableSettings && exports.ShowOdsExport ? $@"" : "")
+ + (exports.EnableSettings && exports.ShowOdsExport ? $@"" : "")
+ (exports.ShowOdtExport ? $@"{localization.odtTxt}" : "")
- + (exports.EnableSettings && exports.ShowOdtExport ? $@"" : "")
+ + (exports.EnableSettings && exports.ShowOdtExport ? $@"" : "")
+ (exports.ShowXmlExcelExport ? $@"{localization.xmlTxt}" : "")
- + (exports.EnableSettings && exports.ShowXmlExcelExport ? $@"" : "")
+ + (exports.EnableSettings && exports.ShowXmlExcelExport ? $@"" : "")
+ (exports.ShowDbfExport ? $@"{localization.dbfTxt}" : "")
+ (exports.ShowCsvExport ? $@"{localization.csvTxt}" : "")
+ (exports.ShowSvgExport ? $@"{localization.svgTxt}" : "")
- + (exports.EnableSettings && exports.ShowSvgExport? $@"" : "")
+ + (exports.EnableSettings && exports.ShowSvgExport? $@"" : "")
+ (exports.ShowMhtExport ? $@"{localization.mhtTxt}" : "")
+ (exports.ShowExcel97Export ? $@"{localization.excel97Txt}" : "")
+ (exports.ShowEmailExport ? $@"{localization.emailTxt}" : "")
+ (exports.ShowHpglExport ? $@"{localization.hpglTxt}" : "")
+ (exports.ShowHTMLExport ? $@"{localization.htmlTxt}" : "")
- + (exports.EnableSettings && exports.ShowHTMLExport ? $@"" : "")
- //(exports.ShowImageExport? $@"{localization.imageTxt}" : "") + (exports.EnableSettings && exports.ShowImageExport ? $@"" : "") +
+ + (exports.EnableSettings && exports.ShowHTMLExport ? $@"" : "")
+ //(exports.ShowImageExport? $@"{localization.imageTxt}" : "") + (exports.EnableSettings && exports.ShowImageExport ? $@"" : "") +
+ (exports.ShowJsonExport ? $@"{localization.jsonTxt}" : "")
+ (exports.ShowDxfExport ? $@"{localization.dxfTxt}" : "")
+ (exports.ShowLaTeXExport ? $@"{localization.latexTxt}" : "")
@@ -63,8 +63,8 @@ string template_toolbar(bool renderBody)
#endif
+ "
- ![]()
+ var toolbarPrintItem = $@"
+ {GetResource("print.svg")}
net6.0
9.0
-
+
- $(TargetFrameworks);net462
+ $(TargetFrameworks);net462;net6.0-windows
@@ -30,8 +30,8 @@
FastReport
FastReport
- FastReport Open Source provides a free report generator for .NET/.NET Core/.NET Framework. You can use the FastReport Open Source in MVC, Web API, console applications.
- FastReport is written in C# and it is compatible with .NET Standard 2.0 and higher. Extendable FastReport architecture allows creating your own objects, export filters, wizards, and DB engines.
+ FastReport Open Source provides a free report generator for .NET/.NET Framework. You can use the FastReport Open Source in MVC, Web API, console applications.
+ FastReport is written in C# and it is compatible with .NET Framework 4.6.2, .NET 6 and higher. Extendable FastReport architecture allows creating your own objects, export filters, wizards, and DB engines.
- FastReport is a band-oriented report generator. There are 13 types of bands available: Report Title, Report Summary, Page Header, Page Footer, Column Header, Column Footer, Data Header, Data, Data Footer, Group Header, Group Footer, Child, and Overlay. In addition, sub-reports are fully supported.
- A wide range of band types allows creating any kind of report: list, master-detail, group, multi-column, master-detail-detail and many more.
- Wide range of available report objects: text, picture, line, shape, barcode, matrix, table, checkbox.
diff --git a/FastReport/Resources/en.xml b/FastReport/Resources/en.xml
index 1d968074..3c1025ee 100644
--- a/FastReport/Resources/en.xml
+++ b/FastReport/Resources/en.xml
@@ -2491,6 +2491,9 @@
+
diff --git a/Localization/Russian.frl b/Localization/Russian.frl
index 482e0caa..e87b1675 100644
--- a/Localization/Russian.frl
+++ b/Localization/Russian.frl
@@ -2290,6 +2290,9 @@
+
diff --git a/UsedPackages.version b/UsedPackages.version
index ebdafb95..10d0c7b4 100644
--- a/UsedPackages.version
+++ b/UsedPackages.version
@@ -2,19 +2,16 @@
-
+
- 2024.1.9
- 2024.1.9
- 2024.1.9
- 2024.1.9
+ 2024.2.0
2.88.6
2.88.6
[11.0.6,)
- 2024.1.9
+ 2024.2.0
[4.0.1,)
[4.0.1,)
@@ -24,18 +21,14 @@
4.7.0
-
+
-
-
- 2024.1.9
-
- 2024.1.9
-
- 2024.1.7
-
- 2024.1.7
-
+
+
+ 2024.2.0
+
+ 2024.2.0
+
\ No newline at end of file
" +
(Toolbar.PrintInHtml ? $@"{localization.printFromBrowserTxt}
@@ -87,7 +87,7 @@ string template_toolbar(bool renderBody)
diff --git a/FastReport.OpenSource/FastReport.OpenSource.csproj b/FastReport.OpenSource/FastReport.OpenSource.csproj
index 78081f32..7be01e8f 100644
--- a/FastReport.OpenSource/FastReport.OpenSource.csproj
+++ b/FastReport.OpenSource/FastReport.OpenSource.csproj
@@ -4,9 +4,9 @@
{(showRefreshButton ? $@"
" : "")}" + $@"
{(Toolbar.ShowFirstButton ? $@"
- ![]()
+ {GetResource("reload.svg")}
" : "")}
{(exports.Show ? $"{toolbarExportItem}" : "")}
@@ -95,8 +95,8 @@ string template_toolbar(bool renderBody)
{(Toolbar.ShowPrint ? $"{toolbarPrintItem}" : "")}
-{(Toolbar.ShowZoomButton ? $@"
- ![]()
+{(Toolbar.ShowZoomButton ? $@"
+ {GetResource("magnifier.svg")}
{(currentZoom == 200 ? selectedZoom1 : selectedZoom2)}200%
@@ -109,11 +109,11 @@ string template_toolbar(bool renderBody)
- ![]()
+ {GetResource("angle-double-left.svg")}
" : "")}
{(Toolbar.ShowPrevButton ? $@"
- ![]()
+ {GetResource("angle-left.svg")}
" : "")}
@@ -121,7 +121,7 @@ string template_toolbar(bool renderBody)
- ![]()
+ {GetResource("slash.svg")}
@@ -129,11 +129,11 @@ string template_toolbar(bool renderBody)
{(Toolbar.ShowNextButton ? $@"
- ![]()
+ {GetResource("angle-right.svg")}
" : "")}
{(Toolbar.ShowLastButton ? $@"
- ![]()
+ {GetResource("angle-double-right.svg")}
" : "")}
{customButtons}