diff --git a/Jenkinsfile b/Jenkinsfile index b276fdb5..53cb9d7f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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' diff --git a/MP-ADM/WebUserControls/cmp_planStats.ascx.cs b/MP-ADM/WebUserControls/cmp_planStats.ascx.cs index 9b5901e4..19a4703b 100644 --- a/MP-ADM/WebUserControls/cmp_planStats.ascx.cs +++ b/MP-ADM/WebUserControls/cmp_planStats.ascx.cs @@ -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) diff --git a/MP-LAND/App_Start/BundleConfig.cs b/MP-LAND/App_Start/BundleConfig.cs index 5bdb148b..d70f264a 100644 --- a/MP-LAND/App_Start/BundleConfig.cs +++ b/MP-LAND/App_Start/BundleConfig.cs @@ -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 } - } -} +} \ No newline at end of file diff --git a/MP-LAND/Content/Site.css b/MP-LAND/Content/Site.css index 911c6a9e..df8d2bf9 100644 --- a/MP-LAND/Content/Site.css +++ b/MP-LAND/Content/Site.css @@ -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; diff --git a/MP-LAND/Content/Site.less b/MP-LAND/Content/Site.less index 9634d554..02551921 100644 --- a/MP-LAND/Content/Site.less +++ b/MP-LAND/Content/Site.less @@ -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; + } } \ No newline at end of file diff --git a/MP-LAND/Content/Site.min.css b/MP-LAND/Content/Site.min.css index c407019b..c20abe5c 100644 --- a/MP-LAND/Content/Site.min.css +++ b/MP-LAND/Content/Site.min.css @@ -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;}} \ No newline at end of file +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;}} \ No newline at end of file diff --git a/MP-LAND/Content/fonts.css b/MP-LAND/Content/fonts.css index 77b5c234..8c53b13f 100644 --- a/MP-LAND/Content/fonts.css +++ b/MP-LAND/Content/fonts.css @@ -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'); } \ No newline at end of file diff --git a/MP-LAND/Content/fonts.less b/MP-LAND/Content/fonts.less index 1679aa26..bd8299b1 100644 --- a/MP-LAND/Content/fonts.less +++ b/MP-LAND/Content/fonts.less @@ -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'); +} \ No newline at end of file diff --git a/MP-LAND/Content/fonts.min.css b/MP-LAND/Content/fonts.min.css index 8b107467..223a8378 100644 --- a/MP-LAND/Content/fonts.min.css +++ b/MP-LAND/Content/fonts.min.css @@ -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');} \ No newline at end of file +@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');} \ No newline at end of file diff --git a/MP-LAND/MP-LAND.csproj b/MP-LAND/MP-LAND.csproj index b801e672..6f190a17 100644 --- a/MP-LAND/MP-LAND.csproj +++ b/MP-LAND/MP-LAND.csproj @@ -322,7 +322,9 @@ Site.css - + + Always + @@ -366,10 +368,18 @@ - - - - + + Always + + + Always + + + Always + + + Always + diff --git a/MP-LAND/Views/Shared/_Layout.cshtml b/MP-LAND/Views/Shared/_Layout.cshtml index 966d1417..5c93e0af 100644 --- a/MP-LAND/Views/Shared/_Layout.cshtml +++ b/MP-LAND/Views/Shared/_Layout.cshtml @@ -2,8 +2,10 @@ + @ViewBag.Title - MP LAND + @Styles.Render("~/Content/bootstrap") @Styles.Render("~/Content/css") @Scripts.Render("~/bundles/modernizr") diff --git a/MP-LAND/Content/OpenSans.woff b/MP-LAND/fonts/OpenSans.woff similarity index 100% rename from MP-LAND/Content/OpenSans.woff rename to MP-LAND/fonts/OpenSans.woff diff --git a/MP-LAND/Content/OpenSansCondensed.woff b/MP-LAND/fonts/OpenSansCondensed.woff similarity index 100% rename from MP-LAND/Content/OpenSansCondensed.woff rename to MP-LAND/fonts/OpenSansCondensed.woff diff --git a/MP-LAND/Content/Roboto.woff2 b/MP-LAND/fonts/Roboto.woff2 similarity index 100% rename from MP-LAND/Content/Roboto.woff2 rename to MP-LAND/fonts/Roboto.woff2 diff --git a/MP-LAND/Content/RobotoCondensed.woff2 b/MP-LAND/fonts/RobotoCondensed.woff2 similarity index 100% rename from MP-LAND/Content/RobotoCondensed.woff2 rename to MP-LAND/fonts/RobotoCondensed.woff2