Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MAG' into ADM

Browse Source
This commit is contained in:
Samuele E. Locatelli
2021-02-01 15:40:28 +01:00
parent c6eea9451d a2bc0e4573
commit 2a60dc10e9
15 changed files with 88 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1386']) {
withEnv(['NEXT_BUILD_NUMBER=1388']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-ADM/WebUserControls/cmp_planStats.ascx.cs
+2 -2
View File
@@ -155,8 +155,8 @@ namespace MP_ADM.WebUserControls
protected void lbtForceReload_Click(object sender, EventArgs e)
{
// chiamo stored x importazione...
DataLayerObj.taArcaGiac.stp_IMP_All_Import_Process(null, 365, 31, null);
DataLayerObj.taArcaGiac.stp_IMP_All_Ordini_Process(null, 365, 31, "ALL", false);
DataLayerObj.taArcaGiac.stp_IMP_All_Import_Process(null, null, null, null);
DataLayerObj.taArcaGiac.stp_IMP_All_Ordini_Process(null, null, null, null, null);
}
protected void lbtToggle_Click(object sender, EventArgs e)
MP-LAND/App_Start/BundleConfig.cs
+28 -21
View File
@@ -2,30 +2,37 @@
namespace MP
{
public class BundleConfig
{
// For more information on bundling, visit http://go.microsoft.com/fwlink/?LinkId=301862
public static void RegisterBundles(BundleCollection bundles)
public class BundleConfig
{
bundles.Add(new ScriptBundle("~/bundles/jquery").Include(
"~/Scripts/jquery-{version}.js"));
#region Public Methods
bundles.Add(new ScriptBundle("~/bundles/jqueryval").Include(
"~/Scripts/jquery.validate*"));
// For more information on bundling, visit http://go.microsoft.com/fwlink/?LinkId=301862
public static void RegisterBundles(BundleCollection bundles)
{
bundles.Add(new ScriptBundle("~/bundles/jquery").Include(
"~/Scripts/jquery-{version}.js"));
// Use the development version of Modernizr to develop with and learn from. Then, when you're
// ready for production, use the build tool at http://modernizr.com to pick only the tests you need.
bundles.Add(new ScriptBundle("~/bundles/modernizr").Include(
"~/Scripts/modernizr-*"));
bundles.Add(new ScriptBundle("~/bundles/jqueryval").Include(
"~/Scripts/jquery.validate*"));
bundles.Add(new ScriptBundle("~/bundles/bootstrap").Include(
"~/Scripts/bootstrap.js",
"~/Scripts/respond.js"));
// Use the development version of Modernizr to develop with and learn from. Then, when you're
// ready for production, use the build tool at http://modernizr.com to pick only the tests you need.
bundles.Add(new ScriptBundle("~/bundles/modernizr").Include(
"~/Scripts/modernizr-*"));
bundles.Add(new StyleBundle("~/Content/css").Include(
"~/Content/bootstrap.css",
"~/Content/font-awesome.css",
"~/Content/Site.css"));
bundles.Add(new ScriptBundle("~/bundles/bootstrap").Include(
"~/Scripts/bootstrap.js",
"~/Scripts/respond.js"));
bundles.Add(new StyleBundle("~/Content/bootstrap").Include(
"~/Content/bootstrap.css"));
bundles.Add(new StyleBundle("~/Content/css").Include(
"~/Content/font-awesome.css",
"~/Content/fonts.css",
"~/Content/Site.css"));
}
#endregion Public Methods
}
}
}
}
MP-LAND/Content/Site.css
+3 -3
View File
@@ -1,4 +1,4 @@
@import "font.css";
/*@import "font.css";*/
body {
padding-top: 50px;
padding-bottom: 20px;
@@ -9,8 +9,8 @@ body {
padding-left: 15px;
padding-right: 15px;
}
/* Override the default bootstrap behavior where horizontal description lists
will truncate terms that are too long to fit in the left column
/* Override the default bootstrap behavior where horizontal description lists
will truncate terms that are too long to fit in the left column
*/
.dl-horizontal dt {
white-space: normal;
MP-LAND/Content/Site.less
+14 -15
View File
@@ -1,7 +1,6 @@
@import "font.css";
/*@import "font.css";*/
body
{
body {
padding-top: 50px;
padding-bottom: 20px;
font-family: "Roboto Condensed";
@@ -13,8 +12,8 @@ body
padding-right: 15px;
}
/* Override the default bootstrap behavior where horizontal description lists
will truncate terms that are too long to fit in the left column
/* Override the default bootstrap behavior where horizontal description lists
will truncate terms that are too long to fit in the left column
*/
.dl-horizontal dt {
white-space: normal;
@@ -40,19 +39,19 @@ textarea {
}
.userCard {
display: block;
page-break-before: auto;
page-break-inside: avoid;
page-break-after: auto;
display: block;
page-break-before: auto;
page-break-inside: avoid;
page-break-after: auto;
}
@page{
margin: 1cm;
@page {
margin: 1cm;
}
@media print {
.userCard {
display: block;
page-break-before: always;
}
.userCard {
display: block;
page-break-before: always;
}
}
MP-LAND/Content/Site.min.css
Vendored
+1 -1
View File
@@ -1 +1 @@
@import"font.css";body{padding-top:50px;padding-bottom:20px;font-family:"Roboto Condensed";}.body-content{padding-left:15px;padding-right:15px;}.dl-horizontal dt{white-space:normal;}input,select,textarea{max-width:280px;}.fullWidth{width:100%;}.text-white{color:#fff;}.text-gray{color:#696969;}.userCard{display:block;page-break-before:auto;page-break-inside:avoid;page-break-after:auto;}@page{margin:1cm;}@media print{.userCard{display:block;page-break-before:always;}}
body{padding-top:50px;padding-bottom:20px;font-family:"Roboto Condensed";}.body-content{padding-left:15px;padding-right:15px;}.dl-horizontal dt{white-space:normal;}input,select,textarea{max-width:280px;}.fullWidth{width:100%;}.text-white{color:#fff;}.text-gray{color:#696969;}.userCard{display:block;page-break-before:auto;page-break-inside:avoid;page-break-after:auto;}@page{margin:1cm;}@media print{.userCard{display:block;page-break-before:always;}}
MP-LAND/Content/fonts.css
+4 -4
View File
@@ -2,23 +2,23 @@
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
src: url('OpenSans.woff') format('woff');
src: url('../fonts/OpenSans.woff') format('woff');
}
@font-face {
font-family: 'Open Sans Condensed';
font-style: normal;
font-weight: 300;
src: url('OpenSansCondensed.woff') format('woff');
src: url('../fonts/OpenSansCondensed.woff') format('woff');
}
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: url('Roboto.woff2') format('woff2');
src: url('../fonts/Roboto.woff2') format('woff2');
}
@font-face {
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 300;
src: url('RobotoCondensed.woff2') format('woff2');
src: url('../fonts/RobotoCondensed.woff2') format('woff2');
}
MP-LAND/Content/fonts.less
+17 -17
View File
@@ -1,27 +1,27 @@
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
src: url('OpenSans.woff') format('woff');
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
src: url('../fonts/OpenSans.woff') format('woff');
}
@font-face {
font-family: 'Open Sans Condensed';
font-style: normal;
font-weight: 300;
src: url('OpenSansCondensed.woff') format('woff');
font-family: 'Open Sans Condensed';
font-style: normal;
font-weight: 300;
src: url('../fonts/OpenSansCondensed.woff') format('woff');
}
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: url('Roboto.woff2') format('woff2');
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: url('../fonts/Roboto.woff2') format('woff2');
}
@font-face {
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 300;
src: url('RobotoCondensed.woff2') format('woff2');
}
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 300;
src: url('../fonts/RobotoCondensed.woff2') format('woff2');
}
MP-LAND/Content/fonts.min.css
Vendored
+1 -1
View File
@@ -1 +1 @@
@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url('OpenSans.woff') format('woff');}@font-face{font-family:'Open Sans Condensed';font-style:normal;font-weight:300;src:url('OpenSansCondensed.woff') format('woff');}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;src:url('Roboto.woff2') format('woff2');}@font-face{font-family:'Roboto Condensed';font-style:normal;font-weight:300;src:url('RobotoCondensed.woff2') format('woff2');}
@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url('../fonts/OpenSans.woff') format('woff');}@font-face{font-family:'Open Sans Condensed';font-style:normal;font-weight:300;src:url('../fonts/OpenSansCondensed.woff') format('woff');}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;src:url('../fonts/Roboto.woff2') format('woff2');}@font-face{font-family:'Roboto Condensed';font-style:normal;font-weight:300;src:url('../fonts/RobotoCondensed.woff2') format('woff2');}
MP-LAND/MP-LAND.csproj
+15 -5
View File
@@ -322,7 +322,9 @@
<Content Include="Content\Site.min.css">
<DependentUpon>Site.css</DependentUpon>
</Content>
<Content Include="favicon.ico" />
<Content Include="favicon.ico">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="fonts\fontawesome-webfont.svg" />
<Content Include="images\LogoMapoFull.png" />
<Content Include="images\LogoSteamware.png" />
@@ -366,10 +368,18 @@
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
<Content Include="Content\fonts.less" />
<Content Include="Content\Roboto.woff2" />
<Content Include="Content\RobotoCondensed.woff2" />
<Content Include="Content\OpenSansCondensed.woff" />
<Content Include="Content\OpenSans.woff" />
<Content Include="fonts\Roboto.woff2">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="fonts\RobotoCondensed.woff2">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="fonts\OpenSansCondensed.woff">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="fonts\OpenSans.woff">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="Scripts\jquery-3.4.1.intellisense.js" />
<None Include="Scripts\jquery-3.5.1-vsdoc.js" />
<Content Include="Scripts\jquery-3.5.1.js" />
MP-LAND/Views/Shared/_Layout.cshtml
+2
View File
@@ -2,8 +2,10 @@
<html>
<head>
<meta charset="utf-8" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>@ViewBag.Title - MP LAND</title>
@Styles.Render("~/Content/bootstrap")
@Styles.Render("~/Content/css")
@Scripts.Render("~/bundles/modernizr")
</head>
MP-LAND/Content/OpenSans.woff → MP-LAND/fonts/OpenSans.woff
View File
MP-LAND/Content/OpenSansCondensed.woff → MP-LAND/fonts/OpenSansCondensed.woff
View File
MP-LAND/Content/Roboto.woff2 → MP-LAND/fonts/Roboto.woff2
View File
MP-LAND/Content/RobotoCondensed.woff2 → MP-LAND/fonts/RobotoCondensed.woff2
View File