diff --git a/Jenkinsfile b/Jenkinsfile index 6dcb81f7..2581ccfb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=665']) { + withEnv(['NEXT_BUILD_NUMBER=670']) { // env.versionNumber = VersionNumber(versionNumberString : '4.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '4.9.${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/HDTV.aspx b/MP-Tablet/HDTV.aspx deleted file mode 100644 index 5d22ccbc..00000000 --- a/MP-Tablet/HDTV.aspx +++ /dev/null @@ -1,6 +0,0 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/jQueryMobile.Master" AutoEventWireup="true" CodeBehind="HDTV.aspx.cs" Inherits="MoonProTablet.HDTV" %> - - - - contenuto 1920 x 1080 (circa) tipo mappa stato ma "rivisto" x avere 3 righe da 8 colonne - diff --git a/MP-Tablet/HDTV.aspx.cs b/MP-Tablet/HDTV.aspx.cs deleted file mode 100644 index fcf43cf3..00000000 --- a/MP-Tablet/HDTV.aspx.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; - -namespace MoonProTablet -{ - public partial class HDTV : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/MP-Tablet/HDTV.aspx.designer.cs b/MP-Tablet/HDTV.aspx.designer.cs deleted file mode 100644 index e024757f..00000000 --- a/MP-Tablet/HDTV.aspx.designer.cs +++ /dev/null @@ -1,17 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace MoonProTablet -{ - - - public partial class HDTV - { - } -} diff --git a/MP-Tablet/MP-Tablet.csproj b/MP-Tablet/MP-Tablet.csproj index 4776b9f0..043fdb64 100644 --- a/MP-Tablet/MP-Tablet.csproj +++ b/MP-Tablet/MP-Tablet.csproj @@ -218,7 +218,6 @@ - @@ -406,6 +405,7 @@ + @@ -522,13 +522,6 @@ Global.asax - - HDTV.aspx - ASPXCodeBehind - - - HDTV.aspx - Logout.aspx ASPXCodeBehind @@ -572,6 +565,13 @@ StoricoTC.aspx + + Test.aspx + ASPXCodeBehind + + + Test.aspx + Turni.aspx ASPXCodeBehind diff --git a/MP-Tablet/MappaStato.aspx b/MP-Tablet/MappaStato.aspx index 0adcf3b7..6eeee6ea 100644 --- a/MP-Tablet/MappaStato.aspx +++ b/MP-Tablet/MappaStato.aspx @@ -1,6 +1,6 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Bootstrap.Master" AutoEventWireup="true" CodeBehind="MappaStato.aspx.cs" Inherits="MoonProTablet.MappaStato" %> -<%@ Register Src="WebUserControls/mod_mappaStato.ascx" TagName="mod_mappaStato" TagPrefix="uc1" %> +<%@ Register Src="~/WebUserControls/mod_mappaStato.ascx" TagName="mod_mappaStato" TagPrefix="uc1" %>
diff --git a/MP-Tablet/RepProd_GG.aspx b/MP-Tablet/RepProd_GG.aspx index 16da44b9..b1b91411 100644 --- a/MP-Tablet/RepProd_GG.aspx +++ b/MP-Tablet/RepProd_GG.aspx @@ -1,9 +1,7 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/jQueryMobile.Master" AutoEventWireup="true" CodeBehind="RepProd_GG.aspx.cs" Inherits="MoonProTablet.RepProd_GG" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Bootstrap.Master" AutoEventWireup="true" CodeBehind="RepProd_GG.aspx.cs" Inherits="MoonProTablet.RepProd_GG" %> <%@ Register Src="~/WebUserControls/mod_RepProd_GG.ascx" TagPrefix="uc1" TagName="mod_RepProd_GG" %> - -
diff --git a/MP-Tablet/RepProd_GG.aspx.designer.cs b/MP-Tablet/RepProd_GG.aspx.designer.cs index 64436198..abc319d9 100644 --- a/MP-Tablet/RepProd_GG.aspx.designer.cs +++ b/MP-Tablet/RepProd_GG.aspx.designer.cs @@ -1,24 +1,23 @@ //------------------------------------------------------------------------------ -// -// This code was generated by a tool. +// +// Codice generato da uno strumento. // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ -namespace MoonProTablet -{ - - +namespace MoonProTablet { + + public partial class RepProd_GG { /// - /// mod_RepProd_GG control. + /// Controllo mod_RepProd_GG. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::MoonProTablet.WebUserControls.mod_RepProd_GG mod_RepProd_GG; } diff --git a/MP-Tablet/Test.aspx b/MP-Tablet/Test.aspx new file mode 100644 index 00000000..10c69b27 --- /dev/null +++ b/MP-Tablet/Test.aspx @@ -0,0 +1,27 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Test.aspx.cs" Inherits="MoonProTablet.Test" %> + + + + + + + + + +
+
+ ...more info + +
+ Questa funzione permette di inserire un devices tra quelli gestiti tramite la AuthKey personale (da richiedere all'admin se non nota). +
+ + + +
+ Lorem ipsum dolor text.... +
+
+
+ + diff --git a/MP-Tablet/Test.aspx.cs b/MP-Tablet/Test.aspx.cs new file mode 100644 index 00000000..4ada9b65 --- /dev/null +++ b/MP-Tablet/Test.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace MoonProTablet +{ + public partial class Test : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/MP-Tablet/Test.aspx.designer.cs b/MP-Tablet/Test.aspx.designer.cs new file mode 100644 index 00000000..3a575c18 --- /dev/null +++ b/MP-Tablet/Test.aspx.designer.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace MoonProTablet { + + + public partial class Test { + + /// + /// Controllo form1. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + } +} diff --git a/MP-Tablet/WebMasterPages/jQueryMobile.Master b/MP-Tablet/WebMasterPages/jQueryMobile.Master deleted file mode 100644 index db085f05..00000000 --- a/MP-Tablet/WebMasterPages/jQueryMobile.Master +++ /dev/null @@ -1,69 +0,0 @@ -<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="jQueryMobile.master.cs" Inherits="MoonProTablet.WebMasterPages.jQueryMobile" %> - -<%@ Register Src="~/WebUserControls/mod_title.ascx" TagName="mod_title" TagPrefix="uc1" %> -<%@ Register Src="~/WebUserControls/mod_footer.ascx" TagName="mod_footer" TagPrefix="uc2" %> - - - - <%----%> - - <asp:ContentPlaceHolder ID="TitleContent" runat="server" /> - - - <%: Scripts.Render("~/bundles/modernizr") %> - <%: Scripts.Render("~/bundles/jquery") %> - <%: Scripts.Render("~/bundles/jquerymobile") %> - - - - <%----%> - - - <%-- - --%> - - - -
- <%-- - --%> - - - <%--Framework Scripts--%> - - - - - - - - - - - <%--Site Scripts--%> - - -
-
- -
-
- - -
-
- -
-
-
- - diff --git a/MP-Tablet/WebMasterPages/jQueryMobile.Master.cs b/MP-Tablet/WebMasterPages/jQueryMobile.Master.cs deleted file mode 100644 index 639cc9f6..00000000 --- a/MP-Tablet/WebMasterPages/jQueryMobile.Master.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; - -namespace MoonProTablet.WebMasterPages -{ - public partial class jQueryMobile : System.Web.UI.MasterPage - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/MP-Tablet/WebMasterPages/jQueryMobileNoCookie.Master b/MP-Tablet/WebMasterPages/jQueryMobileNoCookie.Master deleted file mode 100644 index 44ca30cf..00000000 --- a/MP-Tablet/WebMasterPages/jQueryMobileNoCookie.Master +++ /dev/null @@ -1,46 +0,0 @@ -<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="jQueryMobileNoCookie.master.cs" Inherits="MoonProTablet.WebMasterPages.jQueryMobileNoCookie" %> - -<%@ Register Src="../WebUserControls/mod_footer.ascx" TagName="mod_footer" TagPrefix="uc1" %> - - - - - - <asp:ContentPlaceHolder ID="TitleContent" runat="server" /> - - <%--dopo 60 sec ricarica la default--%> - - - <%: Scripts.Render("~/bundles/modernizr") %> - <%: Scripts.Render("~/bundles/jquery") %> - <%: Scripts.Render("~/bundles/jquerymobile") %> - - - - - - - - -
-
-
-

Registrazione Device -

-
-
- - -
-
- Device non riconosciuto -
-
-
- - diff --git a/MP-Tablet/WebMasterPages/jQueryMobileNoCookie.Master.cs b/MP-Tablet/WebMasterPages/jQueryMobileNoCookie.Master.cs deleted file mode 100644 index 07d38d31..00000000 --- a/MP-Tablet/WebMasterPages/jQueryMobileNoCookie.Master.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; - -namespace MoonProTablet.WebMasterPages -{ - public partial class jQueryMobileNoCookie : System.Web.UI.MasterPage - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/MP-Tablet/WebMasterPages/jQueryMobileNoCookie.Master.designer.cs b/MP-Tablet/WebMasterPages/jQueryMobileNoCookie.Master.designer.cs deleted file mode 100644 index 95eb8b4a..00000000 --- a/MP-Tablet/WebMasterPages/jQueryMobileNoCookie.Master.designer.cs +++ /dev/null @@ -1,70 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace MoonProTablet.WebMasterPages -{ - - - public partial class jQueryMobileNoCookie { - - /// - /// Head1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlHead Head1; - - /// - /// TitleContent control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ContentPlaceHolder TitleContent; - - /// - /// PlaceHolder1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1; - - /// - /// Bundlereference1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference Bundlereference1; - - /// - /// form1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - - /// - /// MainContent control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent; - } -} diff --git a/MP-Tablet/WebUserControls/mod_enrollByAuthKey.ascx b/MP-Tablet/WebUserControls/mod_enrollByAuthKey.ascx index 5ac89669..2b71f80b 100644 --- a/MP-Tablet/WebUserControls/mod_enrollByAuthKey.ascx +++ b/MP-Tablet/WebUserControls/mod_enrollByAuthKey.ascx @@ -1,35 +1,45 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_enrollByAuthKey.ascx.cs" - Inherits="MoonProTablet.WebUserControls.mod_enrollByAuthKey" %> -

- Registrazione Con AuthKey Personale

- - - - - -
- - -
- -
-
- + Inherits="MoonProTablet.WebUserControls.mod_enrollByAuthKey" %> + +
+
+

Registrazione Dispositivo

+
+
+ + + + +
+
+ + +
+
+ +
+
+ +
+
+ +
+
+ ...more info + +
+ Questa funzione permette di inserire un devices tra quelli gestiti tramite la AuthKey personale (da richiedere all'admin se non nota).
-
- -
-
-
-
-

- Spiegazione

- Questa funzione permette di inserire un devices tra quelli gestiti tramite la AuthKey - personale (da richiedere all'admin se non nota). + + Collapsible + +
+ Lorem ipsum dolor text....
+
diff --git a/MP-Tablet/WebUserControls/mod_enrollByAuthKey.ascx.designer.cs b/MP-Tablet/WebUserControls/mod_enrollByAuthKey.ascx.designer.cs deleted file mode 100644 index f8c05db8..00000000 --- a/MP-Tablet/WebUserControls/mod_enrollByAuthKey.ascx.designer.cs +++ /dev/null @@ -1,70 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace MoonProTablet.WebUserControls -{ - - - public partial class mod_enrollByAuthKey { - - /// - /// ddlIdxDipendente control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.DropDownList ddlIdxDipendente; - - /// - /// odsOperatori control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ObjectDataSource odsOperatori; - - /// - /// txtUserAuthKey control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox txtUserAuthKey; - - /// - /// lblWarning control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblWarning; - - /// - /// btnConferma control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button btnConferma; - - /// - /// btnAnnulla control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button btnAnnulla; - } -} diff --git a/MP-Tablet/WebUserControls/mod_regNewDevice.ascx b/MP-Tablet/WebUserControls/mod_regNewDevice.ascx index 18b64715..024b6df0 100644 --- a/MP-Tablet/WebUserControls/mod_regNewDevice.ascx +++ b/MP-Tablet/WebUserControls/mod_regNewDevice.ascx @@ -1,11 +1,11 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_regNewDevice.ascx.cs" - Inherits="MoonProTablet.WebUserControls.mod_regNewDevice" %> -<%@ Register Src="mod_enrollByAuthKey.ascx" TagName="mod_enrollByAuthKey" TagPrefix="uc1" %> -<%@ Register Src="mod_enrollByJumperAuthKey.ascx" TagName="mod_enrollByJumperAuthKey" - TagPrefix="uc2" %> -
-
- -
+ Inherits="MoonProTablet.WebUserControls.mod_regNewDevice" %> +<%@ Register Src="~/WebUserControls/mod_enrollByAuthKey.ascx" TagPrefix="uc2" TagName="mod_enrollByAuthKey" %> +<%@ Register Src="~/WebUserControls/mod_enrollByJumperAuthKey.ascx" TagPrefix="uc1" TagName="mod_enrollByJumperAuthKey" %> + +
+
+ + +
- diff --git a/MP-Tablet/WebUserControls/mod_regNewDevice.ascx.cs b/MP-Tablet/WebUserControls/mod_regNewDevice.ascx.cs index cd8ae882..c6c92b54 100644 --- a/MP-Tablet/WebUserControls/mod_regNewDevice.ascx.cs +++ b/MP-Tablet/WebUserControls/mod_regNewDevice.ascx.cs @@ -2,20 +2,20 @@ namespace MoonProTablet.WebUserControls { - public partial class mod_regNewDevice : System.Web.UI.UserControl + public partial class mod_regNewDevice : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) { - protected void Page_Load(object sender, EventArgs e) - { - /************************************************************************* - * REGISTRAZIONE nuovi devices - * - * ci sono tre modalità - * - idxDipendente + authKey (manuale) - * - con richiesta reset ed invio authKey (generazione pwd casuale da email dipendente + dataora in MD5, INSERENDO EMAIL e cercando se esista...) - * - con "rimbalzo" su ~/jumper.aspx?UserAuthkey={0}&idxDipendente={1}... poi messe in session x cui autosetup - * - * ***********************************************************************/ - } - + /************************************************************************* + * REGISTRAZIONE nuovi devices + * + * ci sono tre modalità + * - idxDipendente + authKey (manuale) + * - con richiesta reset ed invio authKey (generazione pwd casuale da email dipendente + dataora in MD5, INSERENDO EMAIL e cercando se esista...) + * - con "rimbalzo" su ~/jumper.aspx?UserAuthkey={0}&idxDipendente={1}... poi messe in session x cui autosetup + * + * ***********************************************************************/ } + + } } \ No newline at end of file diff --git a/MP-Tablet/WebUserControls/mod_regNewDevice.ascx.designer.cs b/MP-Tablet/WebUserControls/mod_regNewDevice.ascx.designer.cs index 03d187c6..aceb0978 100644 --- a/MP-Tablet/WebUserControls/mod_regNewDevice.ascx.designer.cs +++ b/MP-Tablet/WebUserControls/mod_regNewDevice.ascx.designer.cs @@ -1,34 +1,33 @@ //------------------------------------------------------------------------------ -// -// This code was generated by a tool. +// +// Codice generato da uno strumento. // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ -namespace MoonProTablet.WebUserControls -{ - - +namespace MoonProTablet.WebUserControls { + + public partial class mod_regNewDevice { /// - /// mod_enrollByAuthKey1 control. + /// Controllo mod_enrollByAuthKey. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::MoonProTablet.WebUserControls.mod_enrollByAuthKey mod_enrollByAuthKey1; + protected global::MoonProTablet.WebUserControls.mod_enrollByAuthKey mod_enrollByAuthKey; /// - /// mod_enrollByJumperAuthKey1 control. + /// Controllo mod_enrollByJumperAuthKey. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::MoonProTablet.WebUserControls.mod_enrollByJumperAuthKey mod_enrollByJumperAuthKey1; + protected global::MoonProTablet.WebUserControls.mod_enrollByJumperAuthKey mod_enrollByJumperAuthKey; } } diff --git a/MP-Tablet/WebUserControls/mod_title.ascx b/MP-Tablet/WebUserControls/mod_title.ascx index c81dc914..f6d3e0e8 100644 --- a/MP-Tablet/WebUserControls/mod_title.ascx +++ b/MP-Tablet/WebUserControls/mod_title.ascx @@ -32,6 +32,3 @@
- - - diff --git a/MP-Tablet/WebUserControls/mod_title.ascx.cs b/MP-Tablet/WebUserControls/mod_title.ascx.cs index 0181788c..b9cb5f6a 100644 --- a/MP-Tablet/WebUserControls/mod_title.ascx.cs +++ b/MP-Tablet/WebUserControls/mod_title.ascx.cs @@ -137,14 +137,6 @@ namespace MoonProTablet.WebUserControls } } /// - /// evento timer - /// - /// - /// - protected void Timer1_Tick(object sender, EventArgs e) - { - } - /// /// Path locale dove scaricare gli installer /// protected string localDownloadPath diff --git a/MP-Tablet/WebUserControls/mod_title.ascx.designer.cs b/MP-Tablet/WebUserControls/mod_title.ascx.designer.cs index b2409bf0..bbce3894 100644 --- a/MP-Tablet/WebUserControls/mod_title.ascx.designer.cs +++ b/MP-Tablet/WebUserControls/mod_title.ascx.designer.cs @@ -56,14 +56,5 @@ 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.Label lblIpData; - - /// - /// Controllo Timer1. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.Timer Timer1; } } diff --git a/MP-Tablet/fixODL.aspx b/MP-Tablet/fixODL.aspx index 1473d2c1..f38f3381 100644 --- a/MP-Tablet/fixODL.aspx +++ b/MP-Tablet/fixODL.aspx @@ -1,69 +1,69 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/jQueryMobile.Master" AutoEventWireup="true" CodeBehind="fixODL.aspx.cs" Inherits="MoonProTablet.fixODL" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Bootstrap.Master" AutoEventWireup="true" CodeBehind="fixODL.aspx.cs" Inherits="MoonProTablet.fixODL" %> -<%@ Register Src="WebUserControls/mod_dettMacchina.ascx" TagName="mod_dettMacchina" TagPrefix="uc1" %> +<%@ Register Src="~/WebUserControls/mod_dettMacchina.ascx" TagName="mod_dettMacchina" TagPrefix="uc1" %> - - - -
-
-

Riassegnazione ODL

- Ultimi ODL lavorati: +
+ +
+
+

Riassegnazione ODL

+ Ultimi ODL lavorati: +
+
+ Imposta ODL +
-
- Imposta ODL -
-
-
-
- - - - - - - - <%----%> - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
+ + + + + + + + <%----%> + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
- - - + + + +
diff --git a/MP-Tablet/regNewDevice.aspx b/MP-Tablet/regNewDevice.aspx index 2a67352f..a1885ea5 100644 --- a/MP-Tablet/regNewDevice.aspx +++ b/MP-Tablet/regNewDevice.aspx @@ -1,7 +1,6 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/jQueryMobileNoCookie.Master" AutoEventWireup="true" CodeBehind="regNewDevice.aspx.cs" Inherits="MoonProTablet.regNewDevice" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Bootstrap.Master" AutoEventWireup="true" CodeBehind="regNewDevice.aspx.cs" Inherits="MoonProTablet.regNewDevice" %> <%@ Register src="WebUserControls/mod_regNewDevice.ascx" tagname="mod_regNewDevice" tagprefix="uc1" %> - - + diff --git a/MP-Tablet/regNewDevice.aspx.designer.cs b/MP-Tablet/regNewDevice.aspx.designer.cs index bc34fbab..eb46b986 100644 --- a/MP-Tablet/regNewDevice.aspx.designer.cs +++ b/MP-Tablet/regNewDevice.aspx.designer.cs @@ -1,24 +1,23 @@ //------------------------------------------------------------------------------ -// -// This code was generated by a tool. +// +// Codice generato da uno strumento. // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ -namespace MoonProTablet -{ - - +namespace MoonProTablet { + + public partial class regNewDevice { /// - /// mod_regNewDevice1 control. + /// Controllo mod_regNewDevice1. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::MoonProTablet.WebUserControls.mod_regNewDevice mod_regNewDevice1; }