diff --git a/Jenkinsfile b/Jenkinsfile index 68370ae6..4b6a5fe8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=752']) { + withEnv(['NEXT_BUILD_NUMBER=753']) { // env.versionNumber = VersionNumber(versionNumberString : '5.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '5.2.${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-TAB/images/logoSteamware.png b/MP-TAB/images/logoSteamware.png index aa8155f5..0f58f814 100644 Binary files a/MP-TAB/images/logoSteamware.png and b/MP-TAB/images/logoSteamware.png differ diff --git a/MP/App_Start/BundleConfig.cs b/MP/App_Start/BundleConfig.cs index 281049ff..5bdb148b 100644 --- a/MP/App_Start/BundleConfig.cs +++ b/MP/App_Start/BundleConfig.cs @@ -2,30 +2,30 @@ namespace MP { - public class BundleConfig + public class BundleConfig + { + // For more information on bundling, visit http://go.microsoft.com/fwlink/?LinkId=301862 + public static void RegisterBundles(BundleCollection bundles) { - // 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")); + bundles.Add(new ScriptBundle("~/bundles/jquery").Include( + "~/Scripts/jquery-{version}.js")); - bundles.Add(new ScriptBundle("~/bundles/jqueryval").Include( - "~/Scripts/jquery.validate*")); + bundles.Add(new ScriptBundle("~/bundles/jqueryval").Include( + "~/Scripts/jquery.validate*")); - // 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-*")); + // 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/bootstrap").Include( - "~/Scripts/bootstrap.js", - "~/Scripts/respond.js")); + bundles.Add(new ScriptBundle("~/bundles/bootstrap").Include( + "~/Scripts/bootstrap.js", + "~/Scripts/respond.js")); - bundles.Add(new StyleBundle("~/Content/css").Include( - "~/Content/bootstrap.css", - "~/Content/font-awesome.css", - "~/Content/site.css")); - } + bundles.Add(new StyleBundle("~/Content/css").Include( + "~/Content/bootstrap.css", + "~/Content/font-awesome.css", + "~/Content/Site.css")); } + } } diff --git a/MP/Content/Site.css b/MP/Content/Site.css index aed0019f..9a845588 100644 --- a/MP/Content/Site.css +++ b/MP/Content/Site.css @@ -27,4 +27,19 @@ textarea { } .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/Content/Site.less b/MP/Content/Site.less index d94ffd22..7ed1281c 100644 --- a/MP/Content/Site.less +++ b/MP/Content/Site.less @@ -34,3 +34,21 @@ textarea { .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/Content/Site.min.css b/MP/Content/Site.min.css index aa5c7070..0f36e43d 100644 --- a/MP/Content/Site.min.css +++ b/MP/Content/Site.min.css @@ -1 +1 @@ -body{padding-top:50px;padding-bottom:20px;}.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;} \ No newline at end of file +body{padding-top:50px;padding-bottom:20px;}.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/Views/Home/UserListQR.cshtml b/MP/Views/Home/UserListQR.cshtml index 756245a2..fa49346a 100644 --- a/MP/Views/Home/UserListQR.cshtml +++ b/MP/Views/Home/UserListQR.cshtml @@ -4,7 +4,7 @@