diff --git a/Projects/WebGIM/GIM_data/bin/GIM_data.dll b/Projects/WebGIM/GIM_data/bin/GIM_data.dll index a3d4864..b37ac88 100644 Binary files a/Projects/WebGIM/GIM_data/bin/GIM_data.dll and b/Projects/WebGIM/GIM_data/bin/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_data/bin/SteamWare.dll b/Projects/WebGIM/GIM_data/bin/SteamWare.dll index 47ee469..06f64a3 100644 Binary files a/Projects/WebGIM/GIM_data/bin/SteamWare.dll and b/Projects/WebGIM/GIM_data/bin/SteamWare.dll differ diff --git a/Projects/WebGIM/GIM_data/reportExporter.cs b/Projects/WebGIM/GIM_data/reportExporter.cs index 7131779..a90d765 100644 --- a/Projects/WebGIM/GIM_data/reportExporter.cs +++ b/Projects/WebGIM/GIM_data/reportExporter.cs @@ -104,7 +104,7 @@ public class reportExporter switch (tipoReport) { case reportRichiesto.ElencoMacchine: - report.ReportPath = @".\MacchineReparti.rdlc"; + report.ReportPath = @"~\Reports\MacchineReparti.rdlc"; report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport))); deviceInfo = "" + " PDF" + @@ -134,7 +134,7 @@ public class reportExporter switch (tipoReport) { case reportRichiesto.RichiestaIntervento: - report.ReportPath = @".\RichiestaIntervento.rdlc"; + report.ReportPath = @"~\Reports\RichiestaIntervento.rdlc"; report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, parametro))); // OCCHIO!!! va messa sorgente dati CORRETTA deviceInfo = "" + " PDF" + @@ -163,7 +163,7 @@ public class reportExporter switch (tipoReport) { case reportRichiesto.ElencoInterventi: - report.ReportPath = @".\ReportInterventi.rdlc"; + report.ReportPath = @"~\Reports\ReportInterventi.rdlc"; report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, periodoAnalizzato, username))); deviceInfo = "" + " PDF" + @@ -176,7 +176,7 @@ public class reportExporter ""; break; case reportRichiesto.MTBF_MTTR: - report.ReportPath = @".\Report_MTBF_MTTR.rdlc"; + report.ReportPath = @"~\Reports\Report_MTBF_MTTR.rdlc"; report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, periodoAnalizzato, username))); deviceInfo = "" + " PDF" + diff --git a/Projects/WebGIM/GIM_data/reportPrinter.cs b/Projects/WebGIM/GIM_data/reportPrinter.cs index f06b277..578f7f0 100644 --- a/Projects/WebGIM/GIM_data/reportPrinter.cs +++ b/Projects/WebGIM/GIM_data/reportPrinter.cs @@ -149,7 +149,7 @@ public class reportPrinter switch (tipoReport) { case reportRichiesto.ElencoMacchine: - report.ReportPath = @".\MacchineReparti.rdlc"; + report.ReportPath = @"~\Reports\MacchineReparti.rdlc"; report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, parametro))); deviceInfo = "" + " EMF" + @@ -162,7 +162,7 @@ public class reportPrinter ""; break; case reportRichiesto.RichiestaIntervento: - report.ReportPath = @".\RichiestaIntervento.rdlc"; + report.ReportPath = @"~\Reports\RichiestaIntervento.rdlc"; report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, parametro))); deviceInfo = "" + " EMF" + @@ -192,7 +192,7 @@ public class reportPrinter switch (tipoReport) { case reportRichiesto.ElencoInterventi: - report.ReportPath = @".\ReportInterventi.rdlc"; + report.ReportPath = @"~\Reports\ReportInterventi.rdlc"; report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, periodoAnalizzato, username))); deviceInfo = "" + " EMF" + @@ -205,7 +205,7 @@ public class reportPrinter ""; break; case reportRichiesto.MTBF_MTTR: - report.ReportPath = @".\Report_MTBF_MTTR.rdlc"; + report.ReportPath = @"~\Reports\Report_MTBF_MTTR.rdlc"; report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, periodoAnalizzato, username))); deviceInfo = "" + " EMF" + diff --git a/Projects/WebGIM/GIM_site/AnagOperatoriMtz.aspx b/Projects/WebGIM/GIM_site/AnagOperatoriMtz.aspx index 1f7974c..4c1502e 100644 --- a/Projects/WebGIM/GIM_site/AnagOperatoriMtz.aspx +++ b/Projects/WebGIM/GIM_site/AnagOperatoriMtz.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true" Inherits="AnagOperatoriMtz" Codebehind="AnagOperatoriMtz.aspx.cs" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" Inherits="AnagOperatoriMtz" Codebehind="AnagOperatoriMtz.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_anagOpMtz.ascx" tagname="mod_anagOpMtz" tagprefix="uc1" %> diff --git a/Projects/WebGIM/GIM_site/ExcelExportMtzPrevPending.aspx b/Projects/WebGIM/GIM_site/ExcelExportMtzPrevPending.aspx index c071073..5fb2d28 100644 --- a/Projects/WebGIM/GIM_site/ExcelExportMtzPrevPending.aspx +++ b/Projects/WebGIM/GIM_site/ExcelExportMtzPrevPending.aspx @@ -33,7 +33,7 @@ - diff --git a/Projects/WebGIM/GIM_site/GIM_site.csproj b/Projects/WebGIM/GIM_site/GIM_site.csproj index f07b109..3ce3cff 100644 --- a/Projects/WebGIM/GIM_site/GIM_site.csproj +++ b/Projects/WebGIM/GIM_site/GIM_site.csproj @@ -101,46 +101,46 @@ adminDB.aspx - + Ajax.master ASPXCodeBehind - + Ajax.master - + AjaxSearch.master ASPXCodeBehind - + AjaxSearch.master - + AjaxSearchEmpty.master ASPXCodeBehind - + AjaxSearchEmpty.master - + AjaxSimple.master ASPXCodeBehind - + AjaxSimple.master - + AjaxSimpleUpload.master ASPXCodeBehind - + AjaxSimpleUpload.master - + AjaxTitle.master ASPXCodeBehind - + AjaxTitle.master @@ -297,11 +297,11 @@ macchine.aspx - + MasterAjax.master ASPXCodeBehind - + MasterAjax.master @@ -657,12 +657,12 @@ - - - - - - + + + + + + @@ -946,7 +946,7 @@ - + @@ -992,10 +992,10 @@ - - - - + + + + @@ -1023,7 +1023,6 @@ - diff --git a/Projects/WebGIM/GIM_site/MacchineReparti.rdlc b/Projects/WebGIM/GIM_site/Reports/MacchineReparti.rdlc similarity index 100% rename from Projects/WebGIM/GIM_site/MacchineReparti.rdlc rename to Projects/WebGIM/GIM_site/Reports/MacchineReparti.rdlc diff --git a/Projects/WebGIM/GIM_site/ReportInterventi.rdlc b/Projects/WebGIM/GIM_site/Reports/ReportInterventi.rdlc similarity index 100% rename from Projects/WebGIM/GIM_site/ReportInterventi.rdlc rename to Projects/WebGIM/GIM_site/Reports/ReportInterventi.rdlc diff --git a/Projects/WebGIM/GIM_site/Report_MTBF_MTTR.rdlc b/Projects/WebGIM/GIM_site/Reports/Report_MTBF_MTTR.rdlc similarity index 100% rename from Projects/WebGIM/GIM_site/Report_MTBF_MTTR.rdlc rename to Projects/WebGIM/GIM_site/Reports/Report_MTBF_MTTR.rdlc diff --git a/Projects/WebGIM/GIM_site/RichiestaIntervento.rdlc b/Projects/WebGIM/GIM_site/Reports/RichiestaIntervento.rdlc similarity index 100% rename from Projects/WebGIM/GIM_site/RichiestaIntervento.rdlc rename to Projects/WebGIM/GIM_site/Reports/RichiestaIntervento.rdlc diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/Ajax.master b/Projects/WebGIM/GIM_site/WebMasterPages/Ajax.master new file mode 100644 index 0000000..6da714d --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebMasterPages/Ajax.master @@ -0,0 +1,67 @@ +<%@ Master Language="C#" AutoEventWireup="True" Inherits="Ajax" Codebehind="Ajax.master.cs" %> + +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> +<%@ Register Src="~/WebUserControls/mod_menuTop.ascx" TagName="mod_menuTop" TagPrefix="uc1" %> +<%@ Register Src="~/WebUserControls/mod_menuSx.ascx" TagName="mod_menuSx" TagPrefix="uc2" %> +<%@ Register Src="~/WebUserControls/mod_menuBottom.ascx" TagName="mod_menuBottom" TagPrefix="uc5" %> + + + + + + + + + +
+ + + + + + + + + + + + + +
+
+ + + + + +
+
+ + + + + + +
+ + +
+ + + + +
+ + +
+
+ + +
+
+ +
+
+ + diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/Ajax.master.cs b/Projects/WebGIM/GIM_site/WebMasterPages/Ajax.master.cs new file mode 100644 index 0000000..ff0d248 --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebMasterPages/Ajax.master.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections.Generic; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +public partial class Ajax : System.Web.UI.MasterPage +{ + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + Page.Title = SteamWare.memLayer.ML.confReadString("_titoloPagina"); + } + + protected override void OnInit(EventArgs e) + { + base.OnInit(e); + Mod_menuTop1.eh_toggleMenuSx += new EventHandler(Mod_menuTop1_eh_toggleMenuSx); + Mod_menuTop1.eh_reqUpdateMenu += new EventHandler(Mod_menuTop1_eh_reqUpdateMenu); + } + + void Mod_menuTop1_eh_reqUpdateMenu(object sender, EventArgs e) + { + // chiamo update del menu sx... + Mod_menuSx1.forzaUpdateMenu(); + } + + void Mod_menuTop1_eh_toggleMenuSx(object sender, EventArgs e) + { + // cambio stato visualizzaizone menù laterale... + Mod_menuSx1.Visible = !Mod_menuSx1.Visible; + } + + protected override void OnUnload(EventArgs e) + { + base.OnUnload(e); + // svuoto tutti gli event handler inseriti... + Mod_menuTop1.eh_toggleMenuSx -= new EventHandler(Mod_menuTop1_eh_toggleMenuSx); + Mod_menuTop1.eh_reqUpdateMenu -= new EventHandler(Mod_menuTop1_eh_reqUpdateMenu); + } + /// + /// determina visibilità menù sx... + /// + public bool sxMenuVisible + { + get + { + return Mod_menuSx1.Visible; + } + set + { + Mod_menuSx1.Visible = value; + } + } +} diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/Ajax.master.designer.cs b/Projects/WebGIM/GIM_site/WebMasterPages/Ajax.master.designer.cs new file mode 100644 index 0000000..d9bcf9a --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebMasterPages/Ajax.master.designer.cs @@ -0,0 +1,104 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.4927 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + + + +public partial class Ajax { + + /// + /// 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; + + /// + /// 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; + + /// + /// sm control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::AjaxControlToolkit.ToolkitScriptManager sm; + + /// + /// UpdatePanel1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel UpdatePanel1; + + /// + /// Mod_menuTop1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_menuTop Mod_menuTop1; + + /// + /// UpdatePanel2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel UpdatePanel2; + + /// + /// Mod_menuSx1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_menuSx Mod_menuSx1; + + /// + /// updPanelPagina control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel updPanelPagina; + + /// + /// ContentPlaceHolder1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder ContentPlaceHolder1; + + /// + /// Mod_menuBottom1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_menuBottom Mod_menuBottom1; +} diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearch.master b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearch.master new file mode 100644 index 0000000..05c33ed --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearch.master @@ -0,0 +1,80 @@ +<%@ Master Language="C#" AutoEventWireup="True" Inherits="AjaxSearch" Codebehind="AjaxSearch.master.cs" %> + +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> +<%@ Register Src="~/WebUserControls/mod_menuTop.ascx" TagName="mod_menuTop" TagPrefix="uc1" %> +<%@ Register Src="~/WebUserControls/mod_menuSx.ascx" TagName="mod_menuSx" TagPrefix="uc2" %> +<%@ Register Src="~/WebUserControls/mod_pageTitleAndSearch.ascx" TagName="mod_pageTitleAndSearch" + TagPrefix="uc3" %> +<%@ Register Src="~/WebUserControls/mod_ricercaGenerica.ascx" TagName="mod_ricercaGenerica" + TagPrefix="uc4" %> +<%@ Register Src="~/WebUserControls/mod_menuBottom.ascx" TagName="mod_menuBottom" + TagPrefix="uc5" %> + + + + + + + + + +
+ + + + + + + + + + + + + +
+
+ + + + + +
+
+ + + + + + +
+ + +
+ + + + + + + + +
+ + + +
+ + +
+
+ + +
+
+ +
+
+ + diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearch.master.cs b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearch.master.cs new file mode 100644 index 0000000..4c3de9b --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearch.master.cs @@ -0,0 +1,48 @@ +using System; +using System.Data; +using System.Configuration; +using System.Collections; +using System.Web; +using System.Web.Security; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.Web.UI.WebControls.WebParts; +using System.Web.UI.HtmlControls; + +public partial class AjaxSearch : System.Web.UI.MasterPage +{ + + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + Page.Title = SteamWare.memLayer.ML.confReadString("_titoloPagina"); + } + + protected override void OnInit(EventArgs e) + { + base.OnInit(e); + Mod_menuTop1.eh_toggleMenuSx += new EventHandler(Mod_menuTop1_eh_toggleMenuSx); + Mod_menuTop1.eh_reqUpdateMenu += new EventHandler(Mod_menuTop1_eh_reqUpdateMenu); + } + + void Mod_menuTop1_eh_reqUpdateMenu(object sender, EventArgs e) + { + // chiamo update del menu sx... + Mod_menuSx1.forzaUpdateMenu(); + } + + void Mod_menuTop1_eh_toggleMenuSx(object sender, EventArgs e) + { + // cambio stato visualizzaizone menù laterale... + Mod_menuSx1.Visible = !Mod_menuSx1.Visible; + } + + protected override void OnUnload(EventArgs e) + { + base.OnUnload(e); + // svuoto tutti gli event handler inseriti... + Mod_menuTop1.eh_toggleMenuSx -= new EventHandler(Mod_menuTop1_eh_toggleMenuSx); + Mod_menuTop1.eh_reqUpdateMenu -= new EventHandler(Mod_menuTop1_eh_reqUpdateMenu); + + } +} diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearch.master.designer.cs b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearch.master.designer.cs new file mode 100644 index 0000000..2b17bef --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearch.master.designer.cs @@ -0,0 +1,122 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.4927 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + + + +public partial class AjaxSearch { + + /// + /// 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; + + /// + /// 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; + + /// + /// sm control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::AjaxControlToolkit.ToolkitScriptManager sm; + + /// + /// UpdatePanel1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel UpdatePanel1; + + /// + /// Mod_menuTop1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_menuTop Mod_menuTop1; + + /// + /// UpdatePanel2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel UpdatePanel2; + + /// + /// Mod_menuSx1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_menuSx Mod_menuSx1; + + /// + /// updPanelPagina control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel updPanelPagina; + + /// + /// Mod_pageTitleAndSearch1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_pageTitleAndSearch Mod_pageTitleAndSearch1; + + /// + /// Mod_ricercaGenerica1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_ricercaGenerica Mod_ricercaGenerica1; + + /// + /// ContentPlaceHolder1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder ContentPlaceHolder1; + + /// + /// Mod_menuBottom1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_menuBottom Mod_menuBottom1; +} diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearchEmpty.master b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearchEmpty.master new file mode 100644 index 0000000..bb48d9e --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearchEmpty.master @@ -0,0 +1,81 @@ +<%@ Master Language="C#" AutoEventWireup="True" + Inherits="AjaxSearchEmpty" Codebehind="AjaxSearchEmpty.master.cs" %> + +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> +<%@ Register Src="~/WebUserControls/mod_menuTop.ascx" TagName="mod_menuTop" TagPrefix="uc1" %> +<%@ Register Src="~/WebUserControls/mod_menuSx.ascx" TagName="mod_menuSx" TagPrefix="uc2" %> +<%@ Register Src="~/WebUserControls/mod_pageTitleAndSearch.ascx" TagName="mod_pageTitleAndSearch" + TagPrefix="uc3" %> +<%@ Register Src="~/WebUserControls/mod_ricercaGenerica.ascx" TagName="mod_ricercaGenerica" + TagPrefix="uc4" %> +<%@ Register Src="~/WebUserControls/mod_menuBottom.ascx" TagName="mod_menuBottom" + TagPrefix="uc5" %> + + + + + + + + + +
+ + + + + + + + + + + + + +
+
+ + + + + +
+
+ + + + + + +
+ + +
+ + + + + + + + +
+ + + +
+ + +
+
+ + +
+
+ +
+
+ + diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearchEmpty.master.cs b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearchEmpty.master.cs new file mode 100644 index 0000000..d805c95 --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearchEmpty.master.cs @@ -0,0 +1,48 @@ +using System; +using System.Data; +using System.Configuration; +using System.Collections; +using System.Web; +using System.Web.Security; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.Web.UI.WebControls.WebParts; +using System.Web.UI.HtmlControls; + +public partial class AjaxSearchEmpty : System.Web.UI.MasterPage +{ + + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + Page.Title = SteamWare.memLayer.ML.confReadString("_titoloPagina"); + } + + protected override void OnInit(EventArgs e) + { + base.OnInit(e); + Mod_menuTop1.eh_toggleMenuSx += new EventHandler(Mod_menuTop1_eh_toggleMenuSx); + Mod_menuTop1.eh_reqUpdateMenu += new EventHandler(Mod_menuTop1_eh_reqUpdateMenu); + } + + void Mod_menuTop1_eh_reqUpdateMenu(object sender, EventArgs e) + { + // chiamo update del menu sx... + Mod_menuSx1.forzaUpdateMenu(); + } + + void Mod_menuTop1_eh_toggleMenuSx(object sender, EventArgs e) + { + // cambio stato visualizzaizone menù laterale... + Mod_menuSx1.Visible = !Mod_menuSx1.Visible; + } + + protected override void OnUnload(EventArgs e) + { + base.OnUnload(e); + // svuoto tutti gli event handler inseriti... + Mod_menuTop1.eh_toggleMenuSx -= new EventHandler(Mod_menuTop1_eh_toggleMenuSx); + Mod_menuTop1.eh_reqUpdateMenu -= new EventHandler(Mod_menuTop1_eh_reqUpdateMenu); + + } +} diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearchEmpty.master.designer.cs b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearchEmpty.master.designer.cs new file mode 100644 index 0000000..bbf7a6b --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearchEmpty.master.designer.cs @@ -0,0 +1,122 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.4927 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + + + +public partial class AjaxSearchEmpty { + + /// + /// 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; + + /// + /// 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; + + /// + /// sm control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::AjaxControlToolkit.ToolkitScriptManager sm; + + /// + /// UpdatePanel1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel UpdatePanel1; + + /// + /// Mod_menuTop1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_menuTop Mod_menuTop1; + + /// + /// UpdatePanel2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel UpdatePanel2; + + /// + /// Mod_menuSx1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_menuSx Mod_menuSx1; + + /// + /// updPanelPagina control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel updPanelPagina; + + /// + /// Mod_pageTitleAndSearch1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_pageTitleAndSearch Mod_pageTitleAndSearch1; + + /// + /// Mod_ricercaGenerica1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_ricercaGenerica Mod_ricercaGenerica1; + + /// + /// ContentPlaceHolder1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder ContentPlaceHolder1; + + /// + /// Mod_menuBottom1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_menuBottom Mod_menuBottom1; +} diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimple.master b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimple.master new file mode 100644 index 0000000..317f162 --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimple.master @@ -0,0 +1,37 @@ +<%@ Master Language="C#" AutoEventWireup="True" Inherits="AjaxSimple" Codebehind="AjaxSimple.master.cs" %> + +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> +<%@ Register Src="~/WebUserControls/mod_menuBottom.ascx" TagName="mod_menuBottom" TagPrefix="uc1" %> + + + + Simplepage + + + + + +
+ + +
+ + + + + + + +
+
+ + +
+
+ +
+
+
+ + diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimple.master.cs b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimple.master.cs new file mode 100644 index 0000000..adf692f --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimple.master.cs @@ -0,0 +1,20 @@ +using System; +using System.Data; +using System.Configuration; +using System.Collections; +using System.Web; +using System.Web.Security; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.Web.UI.WebControls.WebParts; +using System.Web.UI.HtmlControls; +using SteamWare; + +public partial class AjaxSimple : System.Web.UI.MasterPage +{ + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + Page.Title = SteamWare.memLayer.ML.confReadString("_titoloPagina"); + } +} diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimple.master.designer.cs b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimple.master.designer.cs new file mode 100644 index 0000000..84da962 --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimple.master.designer.cs @@ -0,0 +1,50 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.4927 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + + + +public partial class AjaxSimple { + + /// + /// 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; + + /// + /// ToolkitScriptManager1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::AjaxControlToolkit.ToolkitScriptManager ToolkitScriptManager1; + + /// + /// ContentPlaceHolder1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder ContentPlaceHolder1; + + /// + /// Mod_menuBottom1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_menuBottom Mod_menuBottom1; +} diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimpleUpload.master b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimpleUpload.master new file mode 100644 index 0000000..9552a20 --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimpleUpload.master @@ -0,0 +1,38 @@ +<%@ Master Language="C#" AutoEventWireup="True" + Inherits="AjaxSimpleUpload" Codebehind="AjaxSimpleUpload.master.cs" %> + +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> +<%@ Register Src="~/WebUserControls/mod_menuBottom.ascx" TagName="mod_menuBottom" TagPrefix="uc1" %> + + + + SimplePage + + + + + +
+ + +
+ + + + + + + +
+
+ + +
+
+ +
+
+
+ + diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimpleUpload.master.cs b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimpleUpload.master.cs new file mode 100644 index 0000000..38e0982 --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimpleUpload.master.cs @@ -0,0 +1,20 @@ +using System; +using System.Data; +using System.Configuration; +using System.Collections; +using System.Web; +using System.Web.Security; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.Web.UI.WebControls.WebParts; +using System.Web.UI.HtmlControls; +using SteamWare; + +public partial class AjaxSimpleUpload : System.Web.UI.MasterPage +{ + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + Page.Title = SteamWare.memLayer.ML.confReadString("_titoloPagina"); + } +} diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimpleUpload.master.designer.cs b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimpleUpload.master.designer.cs new file mode 100644 index 0000000..3d0b19a --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimpleUpload.master.designer.cs @@ -0,0 +1,59 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.4927 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + + + +public partial class AjaxSimpleUpload { + + /// + /// 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; + + /// + /// 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; + + /// + /// ToolkitScriptManager1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::AjaxControlToolkit.ToolkitScriptManager ToolkitScriptManager1; + + /// + /// ContentPlaceHolder1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder ContentPlaceHolder1; + + /// + /// Mod_menuBottom1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_menuBottom Mod_menuBottom1; +} diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxTitle.master b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxTitle.master new file mode 100644 index 0000000..bfb603b --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxTitle.master @@ -0,0 +1,76 @@ +<%@ Master Language="C#" AutoEventWireup="True" Inherits="AjaxTitle" Codebehind="AjaxTitle.master.cs" %> + +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> +<%@ Register Src="~/WebUserControls/mod_menuTop.ascx" TagName="mod_menuTop" TagPrefix="uc1" %> +<%@ Register Src="~/WebUserControls/mod_menuSx.ascx" TagName="mod_menuSx" TagPrefix="uc2" %> +<%@ Register Src="~/WebUserControls/mod_pageTitleAndSearch.ascx" TagName="mod_pageTitleAndSearch" TagPrefix="uc3" %> +<%@ Register Src="~/WebUserControls/mod_menuBottom.ascx" TagName="mod_menuBottom" TagPrefix="uc5" %> + + + + + + + + + +
+ + + + + + + + + + + + + +
+
+ + + + + +
+
+ + + + + + +
+ + +
+ + + + + + + + +
+ + +   +
+ + +
+
+ + +
+
+ +
+
+ + diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxTitle.master.cs b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxTitle.master.cs new file mode 100644 index 0000000..011838c --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxTitle.master.cs @@ -0,0 +1,49 @@ +using System; +using System.Data; +using System.Configuration; +using System.Collections; +using System.Web; +using System.Web.Security; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.Web.UI.WebControls.WebParts; +using System.Web.UI.HtmlControls; +using SteamWare; + +public partial class AjaxTitle : System.Web.UI.MasterPage +{ + + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + Page.Title = SteamWare.memLayer.ML.confReadString("_titoloPagina"); + } + + protected override void OnInit(EventArgs e) + { + base.OnInit(e); + Mod_menuTop1.eh_toggleMenuSx += new EventHandler(Mod_menuTop1_eh_toggleMenuSx); + Mod_menuTop1.eh_reqUpdateMenu += new EventHandler(Mod_menuTop1_eh_reqUpdateMenu); + } + + void Mod_menuTop1_eh_reqUpdateMenu(object sender, EventArgs e) + { + // chiamo update del menu sx... + Mod_menuSx1.forzaUpdateMenu(); + } + + void Mod_menuTop1_eh_toggleMenuSx(object sender, EventArgs e) + { + // cambio stato visualizzaizone menù laterale... + Mod_menuSx1.Visible = !Mod_menuSx1.Visible; + } + + protected override void OnUnload(EventArgs e) + { + base.OnUnload(e); + // svuoto tutti gli event handler inseriti... + Mod_menuTop1.eh_toggleMenuSx -= new EventHandler(Mod_menuTop1_eh_toggleMenuSx); + Mod_menuTop1.eh_reqUpdateMenu -= new EventHandler(Mod_menuTop1_eh_reqUpdateMenu); + + } +} diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxTitle.master.designer.cs b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxTitle.master.designer.cs new file mode 100644 index 0000000..2e4d480 --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxTitle.master.designer.cs @@ -0,0 +1,104 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.4927 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + + + +public partial class AjaxTitle { + + /// + /// 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; + + /// + /// sm control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::AjaxControlToolkit.ToolkitScriptManager sm; + + /// + /// UpdatePanel1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel UpdatePanel1; + + /// + /// Mod_menuTop1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_menuTop Mod_menuTop1; + + /// + /// UpdatePanel2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel UpdatePanel2; + + /// + /// Mod_menuSx1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_menuSx Mod_menuSx1; + + /// + /// updPanelPagina control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel updPanelPagina; + + /// + /// Mod_pageTitleAndSearch1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_pageTitleAndSearch Mod_pageTitleAndSearch1; + + /// + /// ContentPlaceHolder1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder ContentPlaceHolder1; + + /// + /// Mod_menuBottom1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_menuBottom Mod_menuBottom1; +} diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/MasterAjax.master b/Projects/WebGIM/GIM_site/WebMasterPages/MasterAjax.master new file mode 100644 index 0000000..a0d8c87 --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebMasterPages/MasterAjax.master @@ -0,0 +1,57 @@ +<%@ Master Language="C#" AutoEventWireup="True" Inherits="MasterAjax" Codebehind="MasterAjax.master.cs" %> + +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> +<%@ Register Src="~/WebUserControls/mod_menuTop.ascx" TagName="mod_menuTop" TagPrefix="uc1" %> +<%@ Register Src="~/WebUserControls/mod_menuSx.ascx" TagName="mod_menuSx" TagPrefix="uc2" %> +<%@ Register Src="~/WebUserControls/mod_menuBottom.ascx" TagName="mod_menuBottom" TagPrefix="uc5" %> + + + + + + + +
+ + + + + + + + + + + + + +
+
+ + + + + +
+
+ + + + + + +
+ + + + + + +
+
+ +
+
+ + diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/MasterAjax.master.cs b/Projects/WebGIM/GIM_site/WebMasterPages/MasterAjax.master.cs new file mode 100644 index 0000000..5a34c14 --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebMasterPages/MasterAjax.master.cs @@ -0,0 +1,49 @@ +using System; +using System.Data; +using System.Configuration; +using System.Collections; +using System.Web; +using System.Web.Security; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.Web.UI.WebControls.WebParts; +using System.Web.UI.HtmlControls; +using SteamWare; + +public partial class MasterAjax : System.Web.UI.MasterPage +{ + + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + Page.Title = SteamWare.memLayer.ML.confReadString("_titoloPagina"); + } + + protected override void OnInit(EventArgs e) + { + base.OnInit(e); + Mod_menuTop1.eh_toggleMenuSx += new EventHandler(Mod_menuTop1_eh_toggleMenuSx); + Mod_menuTop1.eh_reqUpdateMenu += new EventHandler(Mod_menuTop1_eh_reqUpdateMenu); + } + + void Mod_menuTop1_eh_reqUpdateMenu(object sender, EventArgs e) + { + // chiamo update del menu sx... + Mod_menuSx1.forzaUpdateMenu(); + } + + void Mod_menuTop1_eh_toggleMenuSx(object sender, EventArgs e) + { + // cambio stato visualizzaizone menù laterale... + Mod_menuSx1.Visible = !Mod_menuSx1.Visible; + } + + protected override void OnUnload(EventArgs e) + { + base.OnUnload(e); + // svuoto tutti gli event handler inseriti... + Mod_menuTop1.eh_toggleMenuSx -= new EventHandler(Mod_menuTop1_eh_toggleMenuSx); + Mod_menuTop1.eh_reqUpdateMenu -= new EventHandler(Mod_menuTop1_eh_reqUpdateMenu); + + } +} diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/MasterAjax.master.designer.cs b/Projects/WebGIM/GIM_site/WebMasterPages/MasterAjax.master.designer.cs new file mode 100644 index 0000000..f4f3d34 --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebMasterPages/MasterAjax.master.designer.cs @@ -0,0 +1,104 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.4927 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + + + +public partial class MasterAjax { + + /// + /// 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; + + /// + /// 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; + + /// + /// sm control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::AjaxControlToolkit.ToolkitScriptManager sm; + + /// + /// UpdatePanel1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel UpdatePanel1; + + /// + /// Mod_menuTop1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_menuTop Mod_menuTop1; + + /// + /// UpdatePanel2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel UpdatePanel2; + + /// + /// Mod_menuSx1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_menuSx Mod_menuSx1; + + /// + /// updPanelPagina control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel updPanelPagina; + + /// + /// ContentPlaceHolder1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder ContentPlaceHolder1; + + /// + /// Mod_menuBottom1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_menuBottom Mod_menuBottom1; +} diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagAmbitiGuasto.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagAmbitiGuasto.ascx index 968b4f6..29c37cf 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagAmbitiGuasto.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagAmbitiGuasto.ascx @@ -67,7 +67,7 @@ - diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagOpMtz.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagOpMtz.ascx index de6f44e..9131278 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagOpMtz.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagOpMtz.ascx @@ -82,7 +82,7 @@ - diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_aperturaImpianti.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_aperturaImpianti.ascx index 3eb366a..1c0adc6 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_aperturaImpianti.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_aperturaImpianti.ascx @@ -45,7 +45,7 @@ - diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_assegnazioniMacchineImpianti.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_assegnazioniMacchineImpianti.ascx index 9c3346f..57b84ed 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_assegnazioniMacchineImpianti.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_assegnazioniMacchineImpianti.ascx @@ -36,6 +36,6 @@ + SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selImpiantiTableAdapter"> \ No newline at end of file diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_calChiusura.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_calChiusura.ascx index 4833a7b..49e9273 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_calChiusura.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_calChiusura.ascx @@ -75,7 +75,7 @@ - diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx index 7f3a873..1b695cd 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx @@ -29,7 +29,7 @@ SelectionMode="Multiple" DataTextField="label" DataValueField="value" Height="400px" Width="400px" BackColor="#ddeeff" Font-Size="8pt"> + SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selPriorTableAdapter"> @@ -71,7 +71,7 @@ DataTextField="label" DataValueField="value"> + SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selTipoGuastoTableAdapter"> @@ -82,7 +82,7 @@ DataTextField="label" DataValueField="value"> + SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selFreqTableAdapter">
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx index e4380b4..751ee30 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx @@ -96,7 +96,7 @@ SelectedValue='<%# Eval("idxImpianto") %>' Enabled="false"> + SelectMethod="getImpiantiValidi" TypeName="GIM_data.DS_utilityTableAdapters.v_selImpiantiTableAdapter"> @@ -110,14 +110,14 @@ Font-Size="8pt" SelectedValue='<%# Eval("idxMacchina") %>' Enabled="false"> <%-- + SelectMethod="getByConditio" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter"> --%> + SelectMethod="getData" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter"> @@ -208,7 +208,7 @@ DataSourceID="odsStato" DataTextField="label" DataValueField="value" Enabled="false"> + SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selStatoTableAdapter"> @@ -321,7 +321,7 @@ Enabled="false"> + SelectMethod="getImpiantiValidi" TypeName="GIM_data.DS_utilityTableAdapters.v_selImpiantiTableAdapter"> @@ -335,14 +335,14 @@ Enabled="false"> <%-- + SelectMethod="getByConditio" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter"> --%> + SelectMethod="getData" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter"> @@ -433,7 +433,7 @@ DataSourceID="odsStato" DataTextField="label" DataValueField="value"> + SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selStatoTableAdapter"> @@ -542,7 +542,7 @@ SelectedValue='<%# Bind("idxAmbito") %>'> + SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selAmbitiTableAdapter"> @@ -555,7 +555,7 @@ DataValueField="value" Width="400px" BackColor="#cdffcd" Font-Size="8pt" SelectedValue='<%# Bind("idxImpianto") %>'> + SelectMethod="getImpiantiValidi" TypeName="GIM_data.DS_utilityTableAdapters.v_selImpiantiTableAdapter"> @@ -568,14 +568,14 @@ DataValueField="value" Width="400px" BackColor="#cdffcd" Font-Size="8pt" SelectedValue='<%# Bind("idxMacchina") %>'> <%-- + SelectMethod="getByConditio" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter"> --%> + SelectMethod="getData" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter"> @@ -590,7 +590,7 @@ Font-Size="8pt" SelectedValue='<%# Bind("idxCausale") %>'> + SelectMethod="getByConditio" TypeName="GIM_data.DS_utilityTableAdapters.v_selCausaliMacchineTableAdapter"> @@ -614,7 +614,7 @@ + SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selPriorTableAdapter"> @@ -637,7 +637,7 @@ DataSourceID="odsTipo" DataTextField="label" DataValueField="value" SelectedValue='<%# Bind("idxTipo") %>'> + SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selTipoGuastoTableAdapter"> @@ -688,7 +688,7 @@ DataSourceID="odsStato" DataTextField="label" DataValueField="value"> + SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selStatoTableAdapter"> @@ -719,7 +719,7 @@ @@ -735,7 +735,7 @@ diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elFamMacch.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_elFamMacch.ascx index 24a347e..5b34725 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elFamMacch.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elFamMacch.ascx @@ -68,7 +68,7 @@ - diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elMacch2Fam.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_elMacch2Fam.ascx index ffad5c7..ee24078 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elMacch2Fam.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elMacch2Fam.ascx @@ -42,7 +42,7 @@ - diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx index 0f6bbca..c4aba56 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx @@ -12,7 +12,7 @@
+ SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selTipoGuastoTableAdapter">
@@ -23,13 +23,13 @@
+ SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selImpiantiTableAdapter">
+ SelectMethod="getByConditio" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter"> @@ -105,7 +105,7 @@ diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx index c5e8509..ac4fb1c 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx @@ -95,7 +95,7 @@ diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_famiglieMacchine.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_famiglieMacchine.ascx index 6348c81..7e210e8 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_famiglieMacchine.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_famiglieMacchine.ascx @@ -25,7 +25,7 @@ SelectionMode="Multiple" DataTextField="label" DataValueField="value" Height="250px" Width="400px" BackColor="#ddeeff" Font-Size="8pt"> + SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selFamTableAdapter"> @@ -81,7 +81,7 @@ - diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_impianti.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_impianti.ascx index d8c1bd2..63c6d77 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_impianti.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_impianti.ascx @@ -156,7 +156,7 @@ diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_insertRichiesta.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_insertRichiesta.ascx index 2c64e88..3c08c19 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_insertRichiesta.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_insertRichiesta.ascx @@ -33,7 +33,7 @@ DataValueField="value" AutoPostBack="true" OnSelectedIndexChanged="listImpianti_SelectedIndexChanged" Height="600px" Width="204px" BackColor="#ddeeff" Font-Size="8pt"> + SelectMethod="getImpiantiValidi" TypeName="GIM_data.DS_utilityTableAdapters.v_selImpiantiTableAdapter"> + SelectMethod="getByConditio" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter"> @@ -70,7 +70,7 @@ + SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selPriorTableAdapter">
@@ -92,7 +92,7 @@ DataTextField="label" DataValueField="value"> + SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selAmbitiTableAdapter">
@@ -101,7 +101,7 @@ DataTextField="label" DataValueField="value"> + SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selTipoGuastoTableAdapter">
@@ -120,7 +120,7 @@ DataValueField="value" AutoPostBack="true" Height="600px" Width="284px" BackColor="#ddeeff" Font-Size="8pt"> + SelectMethod="getByConditio" TypeName="GIM_data.DS_utilityTableAdapters.v_selCausaliMacchineTableAdapter"> diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_interventoOpMtz.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_interventoOpMtz.ascx index 6b94a9d..b25aea6 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_interventoOpMtz.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_interventoOpMtz.ascx @@ -46,7 +46,7 @@ DataValueField="value" AutoPostBack="true" SelectedValue='<%# Bind("matrOp") %>'> + SelectMethod="getData" TypeName="GIM_data.DS_utilityTableAdapters.v_selOperMtzTableAdapter"> @@ -87,7 +87,7 @@ - diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_macchine.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_macchine.ascx index 3d1ce13..c9683f5 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_macchine.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_macchine.ascx @@ -5,7 +5,7 @@ <%@ Register Src="~/WebUserControls/mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc2" %> + SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selImpiantiTableAdapter"> diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx index 781175c..b3c9999 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx @@ -32,7 +32,7 @@ - diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_periodoAnalisi.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_periodoAnalisi.ascx index 4f996ce..80ef829 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_periodoAnalisi.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_periodoAnalisi.ascx @@ -26,7 +26,7 @@ DataSourceID="odsPeriodi" DataTextField="label" DataValueField="value"> + SelectMethod="getByConditio" TypeName="GIM_data.DS_utilityTableAdapters.v_selPeriodiTradTableAdapter"> diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_priorita.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_priorita.ascx index e815f73..15f32b4 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_priorita.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_priorita.ascx @@ -52,7 +52,7 @@ + TypeName="GIM_data.DS_utilityTableAdapters.v_selSemaforiTableAdapter"> @@ -81,7 +81,7 @@ - diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx index b125892..d387d7e 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx @@ -22,7 +22,7 @@ Width="350px" BackColor="#ddeeff" Font-Size="8pt" OnSelectedIndexChanged="listImpianti_SelectedIndexChanged" OnDataBound="listImpianti_DataBound" /> + SelectMethod="GetData" TypeName="GIM_data.DS_applicazioneTableAdapters.AnagStatiTableAdapter">
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_tipoGuasto.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_tipoGuasto.ascx index 296fa74..a2e577a 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_tipoGuasto.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_tipoGuasto.ascx @@ -66,7 +66,7 @@ - diff --git a/Projects/WebGIM/GIM_site/adminDB.aspx b/Projects/WebGIM/GIM_site/adminDB.aspx index 25bc901..049b65a 100644 --- a/Projects/WebGIM/GIM_site/adminDB.aspx +++ b/Projects/WebGIM/GIM_site/adminDB.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxSimple.master" AutoEventWireup="true" Inherits="adminDB" Codebehind="adminDB.aspx.cs" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSimple.master" AutoEventWireup="true" Inherits="adminDB" Codebehind="adminDB.aspx.cs" %>
diff --git a/Projects/WebGIM/GIM_site/anagAmbitiGuasto.aspx b/Projects/WebGIM/GIM_site/anagAmbitiGuasto.aspx index 4e61668..3a912f4 100644 --- a/Projects/WebGIM/GIM_site/anagAmbitiGuasto.aspx +++ b/Projects/WebGIM/GIM_site/anagAmbitiGuasto.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true" Inherits="anagAmbitiGuasto" Codebehind="anagAmbitiGuasto.aspx.cs" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" Inherits="anagAmbitiGuasto" Codebehind="anagAmbitiGuasto.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_anagAmbitiGuasto.ascx" tagname="mod_anagAmbitiGuasto" tagprefix="uc1" %> diff --git a/Projects/WebGIM/GIM_site/aperturaImpianti.aspx b/Projects/WebGIM/GIM_site/aperturaImpianti.aspx index 2db0dc2..92e5f7d 100644 --- a/Projects/WebGIM/GIM_site/aperturaImpianti.aspx +++ b/Projects/WebGIM/GIM_site/aperturaImpianti.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxTitle.master" AutoEventWireup="true" Inherits="aperturaImpianti" Codebehind="aperturaImpianti.aspx.cs" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxTitle.master" AutoEventWireup="true" Inherits="aperturaImpianti" Codebehind="aperturaImpianti.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_aperturaImpianti.ascx" tagname="mod_aperturaImpianti" tagprefix="uc1" %> diff --git a/Projects/WebGIM/GIM_site/assegnazioniMacchineImpianti.aspx b/Projects/WebGIM/GIM_site/assegnazioniMacchineImpianti.aspx index c2a9709..6dea346 100644 --- a/Projects/WebGIM/GIM_site/assegnazioniMacchineImpianti.aspx +++ b/Projects/WebGIM/GIM_site/assegnazioniMacchineImpianti.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxTitle.master" AutoEventWireup="true" Inherits="assegnazioniMacchineImpianti" Codebehind="assegnazioniMacchineImpianti.aspx.cs" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxTitle.master" AutoEventWireup="true" Inherits="assegnazioniMacchineImpianti" Codebehind="assegnazioniMacchineImpianti.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_assegnazioniMacchineImpianti.ascx" tagname="mod_assegnazioniMacchineImpianti" tagprefix="uc1" %> diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll index a3d4864..b37ac88 100644 Binary files a/Projects/WebGIM/GIM_site/bin/GIM_data.dll and b/Projects/WebGIM/GIM_site/bin/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_site/bin/SteamWare.dll b/Projects/WebGIM/GIM_site/bin/SteamWare.dll index 47ee469..06f64a3 100644 Binary files a/Projects/WebGIM/GIM_site/bin/SteamWare.dll and b/Projects/WebGIM/GIM_site/bin/SteamWare.dll differ diff --git a/Projects/WebGIM/GIM_site/calendChiusura.aspx b/Projects/WebGIM/GIM_site/calendChiusura.aspx index 0d25ab6..567d6e3 100644 --- a/Projects/WebGIM/GIM_site/calendChiusura.aspx +++ b/Projects/WebGIM/GIM_site/calendChiusura.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true" Inherits="calendChiusura" Codebehind="calendChiusura.aspx.cs" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" Inherits="calendChiusura" Codebehind="calendChiusura.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_calChiusura.ascx" tagname="mod_calChiusura" tagprefix="uc1" %> diff --git a/Projects/WebGIM/GIM_site/chLang.aspx b/Projects/WebGIM/GIM_site/chLang.aspx index d3542c1..38e08d2 100644 --- a/Projects/WebGIM/GIM_site/chLang.aspx +++ b/Projects/WebGIM/GIM_site/chLang.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" MasterPageFile="~/MasterAjax.master" AutoEventWireup="true" +<%@ Page Language="C#" MasterPageFile="~/WebMasterPages/MasterAjax.master" AutoEventWireup="true" Inherits="chLang" Title="Untitled Page" Codebehind="chLang.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_chLang.ascx" TagName="mod_chLang" TagPrefix="uc1" %> diff --git a/Projects/WebGIM/GIM_site/dettaglioIntervento.aspx b/Projects/WebGIM/GIM_site/dettaglioIntervento.aspx index f3873d6..6a80ae6 100644 --- a/Projects/WebGIM/GIM_site/dettaglioIntervento.aspx +++ b/Projects/WebGIM/GIM_site/dettaglioIntervento.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxTitle.master" AutoEventWireup="true" Inherits="dettaglioIntervento" Codebehind="dettaglioIntervento.aspx.cs" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxTitle.master" AutoEventWireup="true" Inherits="dettaglioIntervento" Codebehind="dettaglioIntervento.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_dettaglioIntervento.ascx" TagName="mod_dettaglioIntervento" TagPrefix="uc2" %> diff --git a/Projects/WebGIM/GIM_site/elencoRichieste.aspx b/Projects/WebGIM/GIM_site/elencoRichieste.aspx index 4c63a94..70965b6 100644 --- a/Projects/WebGIM/GIM_site/elencoRichieste.aspx +++ b/Projects/WebGIM/GIM_site/elencoRichieste.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true" Inherits="elencoRichieste" Codebehind="elencoRichieste.aspx.cs" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" Inherits="elencoRichieste" Codebehind="elencoRichieste.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_elencoRichieste.ascx" TagName="mod_elencoRichieste" TagPrefix="uc1" %> <%@ Register Src="~/WebUserControls/mod_dettaglioIntervento.ascx" TagName="mod_dettaglioIntervento" diff --git a/Projects/WebGIM/GIM_site/famiglieMacchine.aspx b/Projects/WebGIM/GIM_site/famiglieMacchine.aspx index b6b673e..8f7a190 100644 --- a/Projects/WebGIM/GIM_site/famiglieMacchine.aspx +++ b/Projects/WebGIM/GIM_site/famiglieMacchine.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxTitle.master" AutoEventWireup="true" Inherits="famiglieMacchine" Codebehind="famiglieMacchine.aspx.cs" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxTitle.master" AutoEventWireup="true" Inherits="famiglieMacchine" Codebehind="famiglieMacchine.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_famiglieMacchine.ascx" tagname="mod_famiglieMacchine" tagprefix="uc1" %> diff --git a/Projects/WebGIM/GIM_site/forceUser.aspx b/Projects/WebGIM/GIM_site/forceUser.aspx index de4f380..410ae26 100644 --- a/Projects/WebGIM/GIM_site/forceUser.aspx +++ b/Projects/WebGIM/GIM_site/forceUser.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" MasterPageFile="~/AjaxSimple.master" AutoEventWireup="true" +<%@ Page Language="C#" MasterPageFile="~/WebMasterPages/AjaxSimple.master" AutoEventWireup="true" Inherits="forceUser" Title="Untitled Page" Codebehind="forceUser.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_login.ascx" TagName="mod_login" TagPrefix="uc1" %> diff --git a/Projects/WebGIM/GIM_site/gestAnagrTbl.aspx b/Projects/WebGIM/GIM_site/gestAnagrTbl.aspx index b8aaccc..40b37f1 100644 --- a/Projects/WebGIM/GIM_site/gestAnagrTbl.aspx +++ b/Projects/WebGIM/GIM_site/gestAnagrTbl.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true" Inherits="gestAnagrTbl" Title="Untitled Page" Codebehind="gestAnagrTbl.aspx.cs" %> +<%@ Page Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" Inherits="gestAnagrTbl" Title="Untitled Page" Codebehind="gestAnagrTbl.aspx.cs" %> diff --git a/Projects/WebGIM/GIM_site/gestUtentiGIM.aspx b/Projects/WebGIM/GIM_site/gestUtentiGIM.aspx index bf982b4..9a45866 100644 --- a/Projects/WebGIM/GIM_site/gestUtentiGIM.aspx +++ b/Projects/WebGIM/GIM_site/gestUtentiGIM.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true" Inherits="gestUtentiGIM" Codebehind="gestUtentiGIM.aspx.cs" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" Inherits="gestUtentiGIM" Codebehind="gestUtentiGIM.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_gestUtentiGIM.ascx" tagname="mod_gestUtentiGIM" tagprefix="uc1" %> diff --git a/Projects/WebGIM/GIM_site/gestioneCausali.aspx b/Projects/WebGIM/GIM_site/gestioneCausali.aspx index b94b9a5..8a94aa1 100644 --- a/Projects/WebGIM/GIM_site/gestioneCausali.aspx +++ b/Projects/WebGIM/GIM_site/gestioneCausali.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxTitle.master" AutoEventWireup="true" Inherits="gestioneCausali" Codebehind="gestioneCausali.aspx.cs" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxTitle.master" AutoEventWireup="true" Inherits="gestioneCausali" Codebehind="gestioneCausali.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_gestCausali.ascx" tagname="mod_gestCausali" tagprefix="uc1" %> diff --git a/Projects/WebGIM/GIM_site/help.aspx b/Projects/WebGIM/GIM_site/help.aspx index ca8b9cc..9b13654 100644 --- a/Projects/WebGIM/GIM_site/help.aspx +++ b/Projects/WebGIM/GIM_site/help.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxTitle.master" AutoEventWireup="true" Inherits="help" Codebehind="help.aspx.cs" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxTitle.master" AutoEventWireup="true" Inherits="help" Codebehind="help.aspx.cs" %>

diff --git a/Projects/WebGIM/GIM_site/impianti.aspx b/Projects/WebGIM/GIM_site/impianti.aspx index ba86c19..d6a5b87 100644 --- a/Projects/WebGIM/GIM_site/impianti.aspx +++ b/Projects/WebGIM/GIM_site/impianti.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true" Inherits="impianti" Codebehind="impianti.aspx.cs" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" Inherits="impianti" Codebehind="impianti.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_impianti.ascx" TagName="mod_impianti" TagPrefix="uc1" %> <%@ Register Src="~/WebUserControls/mod_macchine.ascx" TagName="mod_macchine" TagPrefix="uc2" %> diff --git a/Projects/WebGIM/GIM_site/insertRichiesta.aspx b/Projects/WebGIM/GIM_site/insertRichiesta.aspx index c7a804e..e425f8e 100644 --- a/Projects/WebGIM/GIM_site/insertRichiesta.aspx +++ b/Projects/WebGIM/GIM_site/insertRichiesta.aspx @@ -1,5 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Ajax.master" AutoEventWireup="true" Inherits="insertRichiesta" Codebehind="insertRichiesta.aspx.cs" %> -<%@ MasterType virtualPath="~/Ajax.master"%> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Ajax.master" AutoEventWireup="true" Inherits="insertRichiesta" Codebehind="insertRichiesta.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_insertRichiesta.ascx" tagname="mod_insertRichiesta" tagprefix="uc1" %> <%@ Register Src="~/WebUserControls/mod_fixCal.ascx" tagname="mod_fixCal" tagprefix="uc2" %> diff --git a/Projects/WebGIM/GIM_site/insertRichiesta.aspx.designer.cs b/Projects/WebGIM/GIM_site/insertRichiesta.aspx.designer.cs index 05dadcc..102985b 100644 --- a/Projects/WebGIM/GIM_site/insertRichiesta.aspx.designer.cs +++ b/Projects/WebGIM/GIM_site/insertRichiesta.aspx.designer.cs @@ -29,16 +29,4 @@ public partial class insertRichiesta { /// To modify move field declaration from designer file to code-behind file. /// protected global::mod_fixCal mod_fixCal1; - - /// - /// Master property. - /// - /// - /// Auto-generated property. - /// - public new Ajax Master { - get { - return ((Ajax)(base.Master)); - } - } } diff --git a/Projects/WebGIM/GIM_site/login.aspx b/Projects/WebGIM/GIM_site/login.aspx index 366ed62..ff871ae 100644 --- a/Projects/WebGIM/GIM_site/login.aspx +++ b/Projects/WebGIM/GIM_site/login.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" MasterPageFile="~/MasterAjax.master" AutoEventWireup="true" +<%@ Page Language="C#" MasterPageFile="~/WebMasterPages/MasterAjax.master" AutoEventWireup="true" Inherits="login" Title="Login" Codebehind="login.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_login.ascx" TagName="mod_login" TagPrefix="uc1" %> diff --git a/Projects/WebGIM/GIM_site/logs/20100121.txt b/Projects/WebGIM/GIM_site/logs/20100121.txt index f613e84..e3c7c4c 100644 --- a/Projects/WebGIM/GIM_site/logs/20100121.txt +++ b/Projects/WebGIM/GIM_site/logs/20100121.txt @@ -17,3 +17,9 @@ 21/01/2010 17:37:19 [INFO] - Accodata la richiesta di manutenzione (programmata) num 379 21/01/2010 17:38:28 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente 21/01/2010 17:38:44 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente +21/01/2010 18:01:52 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente +21/01/2010 18:13:14 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente +21/01/2010 18:25:07 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente +21/01/2010 18:28:46 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente +21/01/2010 18:33:19 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente +21/01/2010 18:39:05 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente diff --git a/Projects/WebGIM/GIM_site/macchine.aspx b/Projects/WebGIM/GIM_site/macchine.aspx index 29675f1..21af336 100644 --- a/Projects/WebGIM/GIM_site/macchine.aspx +++ b/Projects/WebGIM/GIM_site/macchine.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true" Inherits="macchine" Codebehind="macchine.aspx.cs" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" Inherits="macchine" Codebehind="macchine.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_macchine.ascx" tagname="mod_macchine" tagprefix="uc1" %> <%@ Register Src="~/WebUserControls/mod_fixCal.ascx" TagName="mod_fixCal" TagPrefix="uc3" %> diff --git a/Projects/WebGIM/GIM_site/menu.aspx b/Projects/WebGIM/GIM_site/menu.aspx index b0746f9..74155e9 100644 --- a/Projects/WebGIM/GIM_site/menu.aspx +++ b/Projects/WebGIM/GIM_site/menu.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" MasterPageFile="~/MasterAjax.master" AutoEventWireup="true" Inherits="menu" Title="Untitled Page" Codebehind="menu.aspx.cs" %> +<%@ Page Language="C#" MasterPageFile="~/WebMasterPages/MasterAjax.master" AutoEventWireup="true" Inherits="menu" Title="Untitled Page" Codebehind="menu.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_main_help.ascx" TagName="mod_main_help" TagPrefix="uc2" %> diff --git a/Projects/WebGIM/GIM_site/mtzProg.aspx b/Projects/WebGIM/GIM_site/mtzProg.aspx index afa6617..083c14a 100644 --- a/Projects/WebGIM/GIM_site/mtzProg.aspx +++ b/Projects/WebGIM/GIM_site/mtzProg.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true" Inherits="mtzProg" Codebehind="mtzProg.aspx.cs" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" Inherits="mtzProg" Codebehind="mtzProg.aspx.cs" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> <%@ Register Src="~/WebUserControls/mod_elencoMtzProg.ascx" TagName="mod_elencoMtzProg" TagPrefix="uc1" %> diff --git a/Projects/WebGIM/GIM_site/obj/Debug/GIM_site.csproj.FileListAbsolute.txt b/Projects/WebGIM/GIM_site/obj/Debug/GIM_site.csproj.FileListAbsolute.txt index 2694835..57179df 100644 --- a/Projects/WebGIM/GIM_site/obj/Debug/GIM_site.csproj.FileListAbsolute.txt +++ b/Projects/WebGIM/GIM_site/obj/Debug/GIM_site.csproj.FileListAbsolute.txt @@ -1,33 +1,3 @@ -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\obj\Debug\ResolveAssemblyReference.cache -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\obj\Debug\RdlCompile.cache -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\obj\Debug\RdlCompile.compiled -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\GIM_site.dll -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\GIM_site.pdb -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\AjaxControlToolkit.dll -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\GIM_data.dll -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\SteamWare.dll -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\ICSharpCode.SharpZipLib.dll -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\System.Web.Ajax.dll -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\GIM_data.pdb -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\AjaxControlToolkit.pdb -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\SteamWare.pdb -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\SteamWare.xml -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\System.Web.Ajax.pdb -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\ar\AjaxControlToolkit.resources.dll -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\cs\AjaxControlToolkit.resources.dll -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\de\AjaxControlToolkit.resources.dll -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\es\AjaxControlToolkit.resources.dll -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\fr\AjaxControlToolkit.resources.dll -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\he\AjaxControlToolkit.resources.dll -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\hi\AjaxControlToolkit.resources.dll -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\it\AjaxControlToolkit.resources.dll -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\ja\AjaxControlToolkit.resources.dll -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\ko\AjaxControlToolkit.resources.dll -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\nl\AjaxControlToolkit.resources.dll -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\pt\AjaxControlToolkit.resources.dll -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\ru\AjaxControlToolkit.resources.dll -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\tr-TR\AjaxControlToolkit.resources.dll -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\zh-CHS\AjaxControlToolkit.resources.dll -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\zh-CHT\AjaxControlToolkit.resources.dll -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\obj\Debug\GIM_site.dll -C:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\obj\Debug\GIM_site.pdb +c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\obj\Debug\ResolveAssemblyReference.cache +c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\obj\Debug\RdlCompile.cache +c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\obj\Debug\RdlCompile.compiled diff --git a/Projects/WebGIM/GIM_site/obj/Debug/RdlCompile.cache b/Projects/WebGIM/GIM_site/obj/Debug/RdlCompile.cache index 4798a12..fdf3a0f 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Debug/RdlCompile.cache and b/Projects/WebGIM/GIM_site/obj/Debug/RdlCompile.cache differ diff --git a/Projects/WebGIM/GIM_site/obj/Debug/ResolveAssemblyReference.cache b/Projects/WebGIM/GIM_site/obj/Debug/ResolveAssemblyReference.cache index b9b4045..a1aa38a 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Debug/ResolveAssemblyReference.cache and b/Projects/WebGIM/GIM_site/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/Projects/WebGIM/GIM_site/priorita.aspx b/Projects/WebGIM/GIM_site/priorita.aspx index 8424486..adf05e7 100644 --- a/Projects/WebGIM/GIM_site/priorita.aspx +++ b/Projects/WebGIM/GIM_site/priorita.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true" Inherits="priorita" Codebehind="priorita.aspx.cs" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" Inherits="priorita" Codebehind="priorita.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_priorita.ascx" tagname="mod_priorita" tagprefix="uc1" %> diff --git a/Projects/WebGIM/GIM_site/report_analisi.aspx b/Projects/WebGIM/GIM_site/report_analisi.aspx index 2cbd24d..5af71e1 100644 --- a/Projects/WebGIM/GIM_site/report_analisi.aspx +++ b/Projects/WebGIM/GIM_site/report_analisi.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxTitle.master" AutoEventWireup="true" Inherits="report_analisi" Codebehind="report_analisi.aspx.cs" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxTitle.master" AutoEventWireup="true" Inherits="report_analisi" Codebehind="report_analisi.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_reportInterventi.ascx" TagName="mod_reportInterventi" TagPrefix="uc1" %> diff --git a/Projects/WebGIM/GIM_site/report_impianti.aspx b/Projects/WebGIM/GIM_site/report_impianti.aspx index 59727b3..e6a4447 100644 --- a/Projects/WebGIM/GIM_site/report_impianti.aspx +++ b/Projects/WebGIM/GIM_site/report_impianti.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxTitle.master" AutoEventWireup="true" Inherits="report_impianti" Codebehind="report_impianti.aspx.cs" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxTitle.master" AutoEventWireup="true" Inherits="report_impianti" Codebehind="report_impianti.aspx.cs" %>
diff --git a/Projects/WebGIM/GIM_site/test.aspx b/Projects/WebGIM/GIM_site/test.aspx index 43dbf01..2f63e93 100644 --- a/Projects/WebGIM/GIM_site/test.aspx +++ b/Projects/WebGIM/GIM_site/test.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Ajax.master" AutoEventWireup="true" Inherits="test" Codebehind="test.aspx.cs" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Ajax.master" AutoEventWireup="true" Inherits="test" Codebehind="test.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_periodoAnalisi.ascx" TagName="mod_periodoAnalisi" TagPrefix="uc2" %> diff --git a/Projects/WebGIM/GIM_site/tipoGuasto.aspx b/Projects/WebGIM/GIM_site/tipoGuasto.aspx index 0f745be..74c44fa 100644 --- a/Projects/WebGIM/GIM_site/tipoGuasto.aspx +++ b/Projects/WebGIM/GIM_site/tipoGuasto.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true" Inherits="tipoGuasto" Codebehind="tipoGuasto.aspx.cs" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" Inherits="tipoGuasto" Codebehind="tipoGuasto.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_tipoGuasto.ascx" tagname="mod_tipoGuasto" tagprefix="uc1" %> diff --git a/Projects/WebGIM/GIM_site/unauthorized.aspx b/Projects/WebGIM/GIM_site/unauthorized.aspx index 7b3062b..7043eca 100644 --- a/Projects/WebGIM/GIM_site/unauthorized.aspx +++ b/Projects/WebGIM/GIM_site/unauthorized.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" MasterPageFile="~/AjaxSimple.master" AutoEventWireup="true" Inherits="unauthorized" Title="Untitled Page" Codebehind="unauthorized.aspx.cs" %> +<%@ Page Language="C#" MasterPageFile="~/WebMasterPages/AjaxSimple.master" AutoEventWireup="true" Inherits="unauthorized" Title="Untitled Page" Codebehind="unauthorized.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_unauthorized.ascx" TagName="mod_unauthorized" TagPrefix="uc1" %> diff --git a/Projects/WebGIM/GIM_site/vocabolario.aspx b/Projects/WebGIM/GIM_site/vocabolario.aspx index c799dee..d7a37bc 100644 --- a/Projects/WebGIM/GIM_site/vocabolario.aspx +++ b/Projects/WebGIM/GIM_site/vocabolario.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true" Inherits="vocabolario" Title="Untitled Page" Codebehind="vocabolario.aspx.cs" %> +<%@ Page Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" Inherits="vocabolario" Title="Untitled Page" Codebehind="vocabolario.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_vocabolario.ascx" TagName="mod_vocabolario" TagPrefix="uc1" %> <%@ Register Src="~/WebUserControls/mod_lemmiVocab.ascx" TagName="mod_lemmiVocab" TagPrefix="uc2" %> diff --git a/Projects/WebGIM/WebGIM.sln b/Projects/WebGIM/WebGIM.sln index 3f548cb..67439fb 100644 --- a/Projects/WebGIM/WebGIM.sln +++ b/Projects/WebGIM/WebGIM.sln @@ -1,27 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 -Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "WebGIM", "..\..\WebSites\WebGIM\", "{2613720C-20FA-4679-877F-ED5580A2C212}" - ProjectSection(WebsiteProperties) = preProject - TargetFramework = "2.0" - ProjectReferences = "{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}|SteamWare.dll;" - Debug.AspNetCompiler.VirtualPath = "/WebGIM" - Debug.AspNetCompiler.PhysicalPath = "..\..\WebSites\WebGIM\" - Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\WebGIM\" - Debug.AspNetCompiler.Updateable = "true" - Debug.AspNetCompiler.ForceOverwrite = "true" - Debug.AspNetCompiler.FixedNames = "false" - Debug.AspNetCompiler.Debug = "True" - Release.AspNetCompiler.VirtualPath = "/WebGIM" - Release.AspNetCompiler.PhysicalPath = "..\..\WebSites\WebGIM\" - Release.AspNetCompiler.TargetPath = "PrecompiledWeb\WebGIM\" - Release.AspNetCompiler.Updateable = "true" - Release.AspNetCompiler.ForceOverwrite = "true" - Release.AspNetCompiler.FixedNames = "false" - Release.AspNetCompiler.Debug = "False" - VWDPort = "49631" - EndProjectSection -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamWare", "..\SteamWare\SteamWare.csproj", "{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "IISConsoleVB", "..\IISCustomActionVB\IISConsoleVB\IISConsoleVB.vbproj", "{67AF6121-D250-44E3-9C4E-0FC36599AAE4}" @@ -52,14 +31,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2613720C-20FA-4679-877F-ED5580A2C212}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2613720C-20FA-4679-877F-ED5580A2C212}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2613720C-20FA-4679-877F-ED5580A2C212}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU - {2613720C-20FA-4679-877F-ED5580A2C212}.Deploy|Any CPU.Build.0 = Debug|Any CPU - {2613720C-20FA-4679-877F-ED5580A2C212}.Installer|Any CPU.ActiveCfg = Debug|Any CPU - {2613720C-20FA-4679-877F-ED5580A2C212}.Installer|Any CPU.Build.0 = Debug|Any CPU - {2613720C-20FA-4679-877F-ED5580A2C212}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {2613720C-20FA-4679-877F-ED5580A2C212}.Release|Any CPU.Build.0 = Debug|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.Build.0 = Debug|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Deploy|Any CPU.ActiveCfg = Release|Any CPU