diff --git a/Jenkinsfile b/Jenkinsfile index 047f1774..c095cfad 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=706']) { + withEnv(['NEXT_BUILD_NUMBER=707']) { // 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/WebMasterPages/Bootstrap.Master b/MP-Tablet/WebMasterPages/Bootstrap.Master index 159fdc6d..4fa5bc4e 100644 --- a/MP-Tablet/WebMasterPages/Bootstrap.Master +++ b/MP-Tablet/WebMasterPages/Bootstrap.Master @@ -2,8 +2,6 @@ <%@ Register Src="~/WebUserControls/mod_title.ascx" TagPrefix="uc1" TagName="mod_title" %> <%@ Register Src="~/WebUserControls/mod_footer.ascx" TagPrefix="uc1" TagName="mod_footer" %> -<%@ Register Src="~/WebUserControls/mod_slideMenu.ascx" TagPrefix="uc1" TagName="mod_slideMenu" %> - @@ -48,12 +46,7 @@ <%--Site Scripts--%> - - - - - - +
diff --git a/MP-Tablet/WebMasterPages/Bootstrap.Master.designer.cs b/MP-Tablet/WebMasterPages/Bootstrap.Master.designer.cs index e49ec0d9..f0d022f5 100644 --- a/MP-Tablet/WebMasterPages/Bootstrap.Master.designer.cs +++ b/MP-Tablet/WebMasterPages/Bootstrap.Master.designer.cs @@ -66,15 +66,6 @@ namespace WebMasterPages { /// protected global::System.Web.UI.ScriptManager ScriptManager1; - /// - /// Controllo uppNavbar. - /// - /// - /// 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 uppNavbar; - /// /// Controllo mod_title. /// @@ -84,15 +75,6 @@ namespace WebMasterPages { /// protected global::MoonProTablet.WebUserControls.mod_title mod_title; - /// - /// Controllo mod_slideMenu. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::MoonProTablet.WebUserControls.mod_slideMenu mod_slideMenu; - /// /// Controllo uppContainer. /// diff --git a/MP-Tablet/WebUserControls/mod_elencoControlli.ascx b/MP-Tablet/WebUserControls/mod_elencoControlli.ascx index 228b4b7a..ae7fa52e 100644 --- a/MP-Tablet/WebUserControls/mod_elencoControlli.ascx +++ b/MP-Tablet/WebUserControls/mod_elencoControlli.ascx @@ -4,29 +4,33 @@
- + - +
-
- +
+
+ Art: + +
+
+ ODL: + +
-
- +
+
<%-- --%>
+
+<%-- --%>
-
- ODL: -
-
- Art: -
-
- +
+ Nota: +
diff --git a/MP-Tablet/WebUserControls/mod_title.ascx b/MP-Tablet/WebUserControls/mod_title.ascx index 53507629..73cfee54 100644 --- a/MP-Tablet/WebUserControls/mod_title.ascx +++ b/MP-Tablet/WebUserControls/mod_title.ascx @@ -1,4 +1,5 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_title.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_title" %> +<%@ Register Src="~/WebUserControls/mod_slideMenu.ascx" TagPrefix="uc1" TagName="mod_slideMenu" %>
 
- + diff --git a/MP-Tablet/WebUserControls/mod_title.ascx.cs b/MP-Tablet/WebUserControls/mod_title.ascx.cs index f3eae10c..b662647a 100644 --- a/MP-Tablet/WebUserControls/mod_title.ascx.cs +++ b/MP-Tablet/WebUserControls/mod_title.ascx.cs @@ -140,7 +140,7 @@ namespace MoonProTablet.WebUserControls } } /// - /// URLK stringa di UPDATE... + /// URL stringa di UPDATE... /// protected string updateUrl { diff --git a/MP-Tablet/WebUserControls/mod_title.ascx.designer.cs b/MP-Tablet/WebUserControls/mod_title.ascx.designer.cs index 3a526cf0..3831fa1f 100644 --- a/MP-Tablet/WebUserControls/mod_title.ascx.designer.cs +++ b/MP-Tablet/WebUserControls/mod_title.ascx.designer.cs @@ -20,5 +20,14 @@ namespace MoonProTablet.WebUserControls { /// 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 mod_slideMenu. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MoonProTablet.WebUserControls.mod_slideMenu mod_slideMenu; } }