diff --git a/Jenkinsfile b/Jenkinsfile index 96df53f5..7317046f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=688']) { + withEnv(['NEXT_BUILD_NUMBER=689']) { // env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '5.0.${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-Tablet/App_Start/BundleConfig.cs b/MP-Tablet/App_Start/BundleConfig.cs index 95e4c77d..822442a4 100644 --- a/MP-Tablet/App_Start/BundleConfig.cs +++ b/MP-Tablet/App_Start/BundleConfig.cs @@ -37,6 +37,9 @@ namespace MoonProTablet bundles.Add(new ScriptBundle("~/bundles/BrowserWindowSize").Include( "~/Scripts/BrowserWindowSize.js")); + bundles.Add(new ScriptBundle("~/bundles/bootstrap").Include( + "~/Scripts/bootstrap.bundle.js")); + //bundles.Add(new ScriptBundle("~/bundles/jqueryui-i18n").Include( // "~/Scripts/jquery-ui-i18n.min.js")); diff --git a/MP-Tablet/Content/baseStyle.css b/MP-Tablet/Content/baseStyle.css index f8cec78b..3f0961f6 100644 --- a/MP-Tablet/Content/baseStyle.css +++ b/MP-Tablet/Content/baseStyle.css @@ -56,7 +56,7 @@ body .ui-overlay-c { border-bottom-right-radius: 0; } /* END: gestione blocchi base */ -/* gestione sidenav */ +/* ----------- gestione sidenav ----------- */ @media (max-width: 576px) { .modal-dialog.modal-dialog-slideout { width: 80%; @@ -79,6 +79,7 @@ body .ui-overlay-c { .modal-dialog-slideout .modal-content { border: 0; } +/* ----------- END SideNav ----------- */ /* Style page content - use this if you want to push the page content to the right when you open the side navigation */ #main { transition: margin-left 0.5s; diff --git a/MP-Tablet/Content/baseStyle.less b/MP-Tablet/Content/baseStyle.less index 46a10b09..162c0559 100644 --- a/MP-Tablet/Content/baseStyle.less +++ b/MP-Tablet/Content/baseStyle.less @@ -63,7 +63,7 @@ body { } /* END: gestione blocchi base */ -/* gestione sidenav */ +/* ----------- gestione sidenav ----------- */ @media (max-width: 576px) { .modal-dialog.modal-dialog-slideout { width: 80% @@ -90,6 +90,9 @@ body { .modal-dialog-slideout .modal-content { border: 0; } +/* ----------- END SideNav ----------- */ + + /* Style page content - use this if you want to push the page content to the right when you open the side navigation */ #main { diff --git a/MP-Tablet/MP-Tablet.csproj b/MP-Tablet/MP-Tablet.csproj index 95da3d88..86352adc 100644 --- a/MP-Tablet/MP-Tablet.csproj +++ b/MP-Tablet/MP-Tablet.csproj @@ -395,7 +395,6 @@ - diff --git a/MP-Tablet/Test.aspx b/MP-Tablet/Test.aspx index 2f7a1f02..0cb7aebb 100644 --- a/MP-Tablet/Test.aspx +++ b/MP-Tablet/Test.aspx @@ -2,12 +2,6 @@ - - -

PROVA SLIDEOUT

- - - - +

PROVA SLIDEOUT

diff --git a/MP-Tablet/User.aspx b/MP-Tablet/User.aspx index 0473a664..cd8a1380 100644 --- a/MP-Tablet/User.aspx +++ b/MP-Tablet/User.aspx @@ -2,8 +2,6 @@ - -
diff --git a/MP-Tablet/Web.config b/MP-Tablet/Web.config index 8d8b9338..08c43b98 100644 --- a/MP-Tablet/Web.config +++ b/MP-Tablet/Web.config @@ -57,7 +57,7 @@ - + diff --git a/MP-Tablet/WebMasterPages/Bootstrap.Master b/MP-Tablet/WebMasterPages/Bootstrap.Master index f2943dd3..3ce84375 100644 --- a/MP-Tablet/WebMasterPages/Bootstrap.Master +++ b/MP-Tablet/WebMasterPages/Bootstrap.Master @@ -29,54 +29,53 @@
- - - <%--Framework Scripts--%> - - - - - - - - - - - <%--Site Scripts--%> - - - - - - - - - - - - - - - -
- -
-

hello world!

- Area main content da customizzare +
+ + + <%--Framework Scripts--%> + + + + + + + + + + + <%--Site Scripts--%> + + + + + + + + + +
+
+ +
+

hello world!

+ Area main content da customizzare +
+
- -
-
-
- - - - - - +
+ + + + + + + + +
- + <%----%> + <%: Scripts.Render("~/bundles/bootstrap") %> diff --git a/MP-Tablet/WebMasterPages/Bootstrap.Master.designer.cs b/MP-Tablet/WebMasterPages/Bootstrap.Master.designer.cs index 0a6a4686..98967361 100644 --- a/MP-Tablet/WebMasterPages/Bootstrap.Master.designer.cs +++ b/MP-Tablet/WebMasterPages/Bootstrap.Master.designer.cs @@ -84,24 +84,6 @@ namespace WebMasterPages { /// protected global::MoonProTablet.WebUserControls.mod_title mod_title; - /// - /// Controllo uppFeatured. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.UpdatePanel uppFeatured; - - /// - /// Controllo FeaturedContent. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.ContentPlaceHolder FeaturedContent; - /// /// Controllo uppContainer. /// diff --git a/MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master b/MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master index 648df7cf..edf3ea80 100644 --- a/MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master +++ b/MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master @@ -49,8 +49,6 @@ - -
@@ -77,8 +75,9 @@ - + <%----%> + <%: Scripts.Render("~/bundles/bootstrap") %> diff --git a/MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master.designer.cs b/MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master.designer.cs index b4c37f09..67137dbd 100644 --- a/MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master.designer.cs +++ b/MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master.designer.cs @@ -84,15 +84,6 @@ namespace WebMasterPages { /// protected global::MoonProTablet.WebUserControls.mod_title mod_title; - /// - /// Controllo FeaturedContent. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.ContentPlaceHolder FeaturedContent; - /// /// Controllo MainContent. /// diff --git a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx index ff374a85..51cf9f32 100644 --- a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx +++ b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx @@ -1,6 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_dettMacchina.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_dettMacchina" %> <%--Riporto dettaglio singola macchina--%> - +
diff --git a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs index 8fe0ee95..d05c46aa 100644 --- a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs +++ b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs @@ -85,5 +85,19 @@ namespace MoonProTablet.WebUserControls pnlFullDet.Visible = full; pnlLessDet.Visible = !full; } + /// + /// Determina se il refresh (via timer) sia o meno abilitato + /// + public bool refreshEnabled + { + get + { + return dmTimer.Enabled; + } + set + { + dmTimer.Enabled = value; + } + } } } \ No newline at end of file diff --git a/MP-Tablet/WebUserControls/mod_title.ascx b/MP-Tablet/WebUserControls/mod_title.ascx index 4de23089..b1ae126f 100644 --- a/MP-Tablet/WebUserControls/mod_title.ascx +++ b/MP-Tablet/WebUserControls/mod_title.ascx @@ -1,57 +1,90 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_title.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_title" %> -
-
 
-
 
+
 
diff --git a/MP-Tablet/WebUserControls/mod_title.ascx.cs b/MP-Tablet/WebUserControls/mod_title.ascx.cs index 918c0671..d6d212f2 100644 --- a/MP-Tablet/WebUserControls/mod_title.ascx.cs +++ b/MP-Tablet/WebUserControls/mod_title.ascx.cs @@ -2,6 +2,7 @@ using SteamWare; using System; using System.Web; +using System.Web.UI; namespace MoonProTablet.WebUserControls { @@ -32,6 +33,11 @@ namespace MoonProTablet.WebUserControls /// protected void Page_Load(object sender, EventArgs e) { + // prima apertura registro NO popup = refresh enabled + if(!Page.IsPostBack) + { + memLayer.ML.setSessionVal("refreshEnabled", true); + } // se ho user/dominio e matricola in sessione NON controllo coockie if (user_std.UtSn.utente == "" || user_std.UtSn.dominio == "" || DataLayer.MatrOpr == 0) { @@ -193,5 +199,6 @@ namespace MoonProTablet.WebUserControls return devicesAuthProxy.getPage(Request.Url); } } + } } \ No newline at end of file diff --git a/MP-Tablet/WebUserControls/mod_title.ascx.designer.cs b/MP-Tablet/WebUserControls/mod_title.ascx.designer.cs index bbce3894..667f0877 100644 --- a/MP-Tablet/WebUserControls/mod_title.ascx.designer.cs +++ b/MP-Tablet/WebUserControls/mod_title.ascx.designer.cs @@ -12,6 +12,15 @@ namespace MoonProTablet.WebUserControls { public partial class mod_title { + /// + /// Controllo logo. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.Image logo; + /// /// Controllo logoSW. ///