Completata migrazione BRUTALE pagine (ora vanno fatte funzionare le componenti AjaxControlTollkit...)

Projects/WebGIM/GIM_site/Bootstrap.Master.cs

@@ -21,7 +21,7 @@ namespace GIM_site
             }
             mod_testata.eh_nuovaRicerca += Mod_testata_eh_nuovaRicerca;
         }
-
+        
         private void Mod_testata_eh_nuovaRicerca(object sender, EventArgs e)
         {
             if (eh_Search_Submit != null)

Projects/WebGIM/GIM_site/GIM_site.csproj

@@ -332,7 +332,6 @@
     <Content Include="fonts\fontawesome-webfont.svg" />
     <Content Include="fonts\glyphicons-halflings-regular.svg" />
     <Content Include="forceUser.aspx" />
-    <Content Include="gestAnagrTbl.aspx" />
     <Content Include="gestioneCausali.aspx" />
     <Content Include="gestUtentiGIM.aspx" />
     <Content Include="Global.asax" />
@@ -941,48 +940,6 @@
     <Compile Include="ViewSwitcher.ascx.designer.cs">
       <DependentUpon>ViewSwitcher.ascx</DependentUpon>
     </Compile>
-    <Compile Include="WebMasterPages\Ajax.master.cs">
-      <DependentUpon>Ajax.master</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="WebMasterPages\Ajax.master.designer.cs">
-      <DependentUpon>Ajax.master</DependentUpon>
-    </Compile>
-    <Compile Include="WebMasterPages\AjaxSearch.master.cs">
-      <DependentUpon>AjaxSearch.master</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="WebMasterPages\AjaxSearch.master.designer.cs">
-      <DependentUpon>AjaxSearch.master</DependentUpon>
-    </Compile>
-    <Compile Include="WebMasterPages\AjaxSearchEmpty.master.cs">
-      <DependentUpon>AjaxSearchEmpty.master</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="WebMasterPages\AjaxSearchEmpty.master.designer.cs">
-      <DependentUpon>AjaxSearchEmpty.master</DependentUpon>
-    </Compile>
-    <Compile Include="WebMasterPages\AjaxSimple.master.cs">
-      <DependentUpon>AjaxSimple.master</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="WebMasterPages\AjaxSimple.master.designer.cs">
-      <DependentUpon>AjaxSimple.master</DependentUpon>
-    </Compile>
-    <Compile Include="WebMasterPages\AjaxSimpleUpload.master.cs">
-      <DependentUpon>AjaxSimpleUpload.master</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="WebMasterPages\AjaxSimpleUpload.master.designer.cs">
-      <DependentUpon>AjaxSimpleUpload.master</DependentUpon>
-    </Compile>
-    <Compile Include="WebMasterPages\AjaxTitle.master.cs">
-      <DependentUpon>AjaxTitle.master</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="WebMasterPages\AjaxTitle.master.designer.cs">
-      <DependentUpon>AjaxTitle.master</DependentUpon>
-    </Compile>
     <Compile Include="anagAmbitiGuasto.aspx.cs">
       <DependentUpon>anagAmbitiGuasto.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -1081,13 +1038,6 @@
     <Compile Include="forceUser.aspx.designer.cs">
       <DependentUpon>forceUser.aspx</DependentUpon>
     </Compile>
-    <Compile Include="gestAnagrTbl.aspx.cs">
-      <DependentUpon>gestAnagrTbl.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="gestAnagrTbl.aspx.designer.cs">
-      <DependentUpon>gestAnagrTbl.aspx</DependentUpon>
-    </Compile>
     <Compile Include="gestioneCausali.aspx.cs">
       <DependentUpon>gestioneCausali.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -1137,13 +1087,6 @@
     <Compile Include="macchine.aspx.designer.cs">
       <DependentUpon>macchine.aspx</DependentUpon>
     </Compile>
-    <Compile Include="WebMasterPages\MasterAjax.master.cs">
-      <DependentUpon>MasterAjax.master</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="WebMasterPages\MasterAjax.master.designer.cs">
-      <DependentUpon>MasterAjax.master</DependentUpon>
-    </Compile>
     <Compile Include="menu.aspx.cs">
       <DependentUpon>menu.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -1575,12 +1518,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="images\mtzProg.png" />
-    <Content Include="WebMasterPages\Ajax.master" />
-    <Content Include="WebMasterPages\AjaxSearch.master" />
-    <Content Include="WebMasterPages\AjaxSearchEmpty.master" />
-    <Content Include="WebMasterPages\AjaxSimple.master" />
-    <Content Include="WebMasterPages\AjaxSimpleUpload.master" />
-    <Content Include="WebMasterPages\AjaxTitle.master" />
     <Content Include="images\apply.png" />
     <Content Include="images\apply_l.png" />
     <Content Include="images\apply_m.png" />
@@ -1688,7 +1625,6 @@
     <Content Include="images\wt_delete.gif" />
     <Content Include="images\wt_ko.gif" />
     <Content Include="images\wt_ok.gif" />
-    <Content Include="WebMasterPages\MasterAjax.master" />
     <Content Include="WebUserControls\mod_anagAmbitiGuasto.ascx" />
     <Content Include="WebUserControls\mod_anagLocazioni.ascx" />
     <Content Include="WebUserControls\mod_anagOpMtz.ascx" />
@@ -1793,6 +1729,7 @@
     <Folder Include="help\EN\teximg\" />
     <Folder Include="help\IT\files\" />
     <Folder Include="help\IT\teximg\" />
+    <Folder Include="WebMasterPages\" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Reports\EN\MacchineReparti.rdlc">

Projects/WebGIM/GIM_site/Web.config

@@ -98,7 +98,7 @@
     <add key="doShrinkFolder" value="true" />
     <add key="_logMaxMb" value="30" />
     <add key="_allowForceUser" value="true" />
-    <add key="_safePages" value="chLang#jumper#unauthorized#allegati#forceUser#login#test#istruzioni" />
+    <add key="_safePages" value="chLang#jumper#unauthorized#allegati#forceUser#login#test#istruzioni#login" />
     <add key="_commonPages" value="menu" />
     <add key="startPage" value="default" />
     <add key="_titoloPagina" value="GIM" />

Projects/WebGIM/GIM_site/WebUserControls/mod_login.ascx.cs

@@ -77,8 +77,8 @@ public partial class mod_login : ApplicationUserControl
                 }
                 else
                 {
-                    lblMessage.Text = String.Format("{0}<br>There are some problems instatiating user: {1}/{2}", user_std.UtSn.Traduci("AccessFail"), dom_user[0], dom_user[1]);
-                    SteamWare.logger.lg.scriviLog(String.Format("Accesso fallito, problemi ad istanziare l'utente {0}/{1}", dom_user[0], dom_user[1]), SteamWare.tipoLog.ERROR);
+                    lblMessage.Text = String.Format("{0}<br>There are some problems instantiating user: {1}/{2}", user_std.UtSn.Traduci("AccessFail"), dom_user[0], dom_user[1]);
+                    SteamWare.logger.lg.scriviLog(String.Format("Accesso fallito, problemi ad instanziare l'utente {0}/{1}", dom_user[0], dom_user[1]), SteamWare.tipoLog.ERROR);
                     if (Login_Error != null)
                     {
                         Login_Error(this, new EventArgs());

Projects/WebGIM/GIM_site/WebUserControls/mod_testata.ascx.cs

@@ -24,8 +24,13 @@ namespace GIM_site.WebUserControls
                 // se l'utente NON c'è torno a login...
                 if (!user_std.UtSn.isAuth)
                 {
-                    Session["nextPage"] = Request.Url.LocalPath.Split('/').Last();
-                    Response.Redirect("login.aspx");
+                    string nextPage = Request.Url.LocalPath.Split('/').Last();
+                    // solo SE non sono già su login (x evitare loop...)
+                    if (nextPage != "login")
+                    {
+                        Session["nextPage"] = nextPage;
+                        Response.Redirect("login");
+                    }
                 }
                 else
                 {

Projects/WebGIM/GIM_site/bin/GIM_site.dll.config

@@ -98,7 +98,7 @@
     <add key="doShrinkFolder" value="true" />
     <add key="_logMaxMb" value="30" />
     <add key="_allowForceUser" value="true" />
-    <add key="_safePages" value="chLang#jumper#unauthorized#allegati#forceUser#login#test#istruzioni" />
+    <add key="_safePages" value="chLang#jumper#unauthorized#allegati#forceUser#login#test#istruzioni#login" />
     <add key="_commonPages" value="menu" />
     <add key="startPage" value="default" />
     <add key="_titoloPagina" value="GIM" />

Projects/WebGIM/GIM_site/dettaglioIntervento.aspx

@@ -1,9 +1,25 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxTitle.master" AutoEventWireup="true" Inherits="dettaglioIntervento" Codebehind="dettaglioIntervento.aspx.cs" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" Inherits="dettaglioIntervento" CodeBehind="dettaglioIntervento.aspx.cs" %>
 
 <%@ Register Src="~/WebUserControls/mod_dettaglioIntervento.ascx" TagName="mod_dettaglioIntervento"
     TagPrefix="uc2" %>
 <%@ Register Src="~/WebUserControls/mod_fixCal.ascx" TagName="mod_fixCal" TagPrefix="uc3" %>
-<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
-    <uc2:mod_dettaglioIntervento ID="mod_dettaglioIntervento1" runat="server" />
-    <uc3:mod_fixCal ID="mod_fixCal1" runat="server" />
+
+<asp:Content ID="Content2" ContentPlaceHolderID="HeadContent" runat="server">
+</asp:Content>
+<asp:Content runat="server" ID="FeaturedContent" ContentPlaceHolderID="FeaturedContent">
+</asp:Content>
+<asp:Content ID="Content4" ContentPlaceHolderID="MCon" runat="server">
+    <div class="container">
+        <div class="row panel panel-default" style="margin: 4px 8px;">
+            <div class="panel-heading">
+                <div class="row" style="margin: 2px 4px;">
+                    <h3 class="panel-title"><%: traduci("DettInterventoLong") %></h3>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <uc2:mod_dettaglioIntervento ID="mod_dettaglioIntervento1" runat="server" />
+                <uc3:mod_fixCal ID="mod_fixCal1" runat="server" />
+            </div>
+        </div>
+    </div>
 </asp:Content>

Projects/WebGIM/GIM_site/dettaglioIntervento.aspx.cs

@@ -3,8 +3,9 @@ using System.Collections.Generic;
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
+using SteamWare;
 
-public partial class dettaglioIntervento : System.Web.UI.Page
+public partial class dettaglioIntervento : UserPage
 {
     protected void Page_Load(object sender, EventArgs e)
     {

Projects/WebGIM/GIM_site/dettaglioIntervento.aspx.designer.cs

@@ -1,10 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     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.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 

Projects/WebGIM/GIM_site/elencoRichieste.aspx

@@ -1,12 +1,26 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" Inherits="elencoRichieste" Codebehind="elencoRichieste.aspx.cs" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.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"
-    TagPrefix="uc2" %>
-    <%@ Register Src="~/WebUserControls/mod_fixCal.ascx" tagname="mod_fixCal" tagprefix="uc3" %>
+<%@ Register Src="~/WebUserControls/mod_dettaglioIntervento.ascx" TagName="mod_dettaglioIntervento" TagPrefix="uc2" %>
+<%@ Register Src="~/WebUserControls/mod_fixCal.ascx" TagName="mod_fixCal" TagPrefix="uc3" %>
 <%@ Register Src="~/WebUserControls/mod_filtraMtzProg.ascx" TagPrefix="uc1" TagName="mod_filtraMtzProg" %>
 
-<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
-    <uc1:mod_filtraMtzProg runat="server" ID="mod_filtraMtzProg" />
-    <uc1:mod_elencoRichieste ID="mod_elencoRichieste1" runat="server" />   
+<asp:Content ID="Content2" ContentPlaceHolderID="HeadContent" runat="server">
+</asp:Content>
+<asp:Content runat="server" ID="FeaturedContent" ContentPlaceHolderID="FeaturedContent">
+</asp:Content>
+<asp:Content ID="Content4" ContentPlaceHolderID="MCon" runat="server">
+    <div class="container">
+        <div class="row panel panel-default" style="margin: 4px 8px;">
+            <div class="panel-heading">
+                <div class="row" style="margin: 2px 4px;">
+                    <h3 class="panel-title"><%: traduci("ElencoRichiesteLong") %></h3>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <uc1:mod_filtraMtzProg runat="server" ID="mod_filtraMtzProg" />
+                <uc1:mod_elencoRichieste ID="mod_elencoRichieste1" runat="server" />
+            </div>
+        </div>
+    </div>
 </asp:Content>

Projects/WebGIM/GIM_site/elencoRichieste.aspx.cs

@@ -3,14 +3,15 @@ using System.Collections.Generic;
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
+using SteamWare;
 
-public partial class elencoRichieste : System.Web.UI.Page
+public partial class elencoRichieste : UserPage
 {
     protected void Page_Load(object sender, EventArgs e)
     {
         mod_filtraMtzProg.eh_newFiltroSel += new EventHandler(mod_filtraMtzProg1_eh_newFiltroSel);
         mod_elencoRichieste1.eh_selValore += new EventHandler(mod_elencoRichieste1_eh_selValore);
-        ((AjaxSearch)Master).eh_Search_Submit += elencoRichieste_eh_Search_Submit;
+        ((GIM_site.FullPage)Master).eh_Search_Submit += elencoRichieste_eh_Search_Submit;
     }
 
     /// <summary>

Projects/WebGIM/GIM_site/famiglieMacchine.aspx

@@ -1,8 +1,23 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxTitle.master" AutoEventWireup="true" Inherits="famiglieMacchine" Codebehind="famiglieMacchine.aspx.cs" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" Inherits="famiglieMacchine" CodeBehind="famiglieMacchine.aspx.cs" %>
 
-<%@ Register Src="~/WebUserControls/mod_famiglieMacchine.ascx" tagname="mod_famiglieMacchine" tagprefix="uc1" %>
+<%@ Register Src="~/WebUserControls/mod_famiglieMacchine.ascx" TagName="mod_famiglieMacchine" TagPrefix="uc1" %>
 
-<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
-    <uc1:mod_famiglieMacchine ID="mod_famiglieMacchine1" runat="server" />
+<asp:Content ID="Content2" ContentPlaceHolderID="HeadContent" runat="server">
+</asp:Content>
+<asp:Content runat="server" ID="FeaturedContent" ContentPlaceHolderID="FeaturedContent">
+</asp:Content>
+<asp:Content ID="Content4" ContentPlaceHolderID="MCon" runat="server">
+    <div class="container">
+        <div class="row panel panel-default" style="margin: 4px 8px;">
+            <div class="panel-heading">
+                <div class="row" style="margin: 2px 4px;">
+                    <h3 class="panel-title"><%: traduci("AnagAmbitiGuastoLong") %></h3>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <uc1:mod_famiglieMacchine ID="mod_famiglieMacchine1" runat="server" />
+            </div>
+        </div>
+    </div>
 </asp:Content>
 

Projects/WebGIM/GIM_site/famiglieMacchine.aspx.cs

@@ -3,8 +3,9 @@ using System.Collections.Generic;
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
+using SteamWare;
 
-public partial class famiglieMacchine : System.Web.UI.Page
+public partial class famiglieMacchine : UserPage
 {
     protected void Page_Load(object sender, EventArgs e)
     {

Projects/WebGIM/GIM_site/famiglieMacchine.aspx.designer.cs

@@ -1,10 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     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.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 

Projects/WebGIM/GIM_site/gestUtentiGIM.aspx

@@ -1,8 +1,24 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" Inherits="gestUtentiGIM" Codebehind="gestUtentiGIM.aspx.cs" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" Inherits="gestUtentiGIM" CodeBehind="gestUtentiGIM.aspx.cs" %>
 
-<%@ Register Src="~/WebUserControls/mod_gestUtentiGIM.ascx" tagname="mod_gestUtentiGIM" tagprefix="uc1" %>
+<%@ Register Src="~/WebUserControls/mod_gestUtentiGIM.ascx" TagName="mod_gestUtentiGIM" TagPrefix="uc1" %>
 
-<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
-    <uc1:mod_gestUtentiGIM ID="mod_gestUtentiGIM1" runat="server" />
+<asp:Content ID="Content2" ContentPlaceHolderID="HeadContent" runat="server">
+</asp:Content>
+<asp:Content runat="server" ID="FeaturedContent" ContentPlaceHolderID="FeaturedContent">
+</asp:Content>
+<asp:Content ID="Content4" ContentPlaceHolderID="MCon" runat="server">
+    <div class="container">
+        <div class="row panel panel-default" style="margin: 4px 8px;">
+            <div class="panel-heading">
+                <div class="row" style="margin: 2px 4px;">
+                    <h3 class="panel-title"><%: traduci("GestioneUtentiLong") %></h3>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <uc1:mod_gestUtentiGIM ID="mod_gestUtentiGIM1" runat="server" />
+            </div>
+        </div>
+    </div>
 </asp:Content>
 
+

Projects/WebGIM/GIM_site/gestUtentiGIM.aspx.cs

@@ -3,8 +3,9 @@ using System.Collections.Generic;
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
+using SteamWare;
 
-public partial class gestUtentiGIM : System.Web.UI.Page
+public partial class gestUtentiGIM : UserPage
 {
     protected void Page_Load(object sender, EventArgs e)
     {

Projects/WebGIM/GIM_site/gestUtentiGIM.aspx.designer.cs

@@ -1,10 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     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.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 

Projects/WebGIM/GIM_site/gestioneCausali.aspx

@@ -1,8 +1,24 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxTitle.master" AutoEventWireup="true" Inherits="gestioneCausali" Codebehind="gestioneCausali.aspx.cs" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" Inherits="gestioneCausali" CodeBehind="gestioneCausali.aspx.cs" %>
 
-<%@ Register Src="~/WebUserControls/mod_gestCausali.ascx" tagname="mod_gestCausali" tagprefix="uc1" %>
+<%@ Register Src="~/WebUserControls/mod_gestCausali.ascx" TagName="mod_gestCausali" TagPrefix="uc1" %>
 
-<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
-    <uc1:mod_gestCausali ID="mod_gestCausali1" runat="server" />
+<asp:Content ID="Content2" ContentPlaceHolderID="HeadContent" runat="server">
+</asp:Content>
+<asp:Content runat="server" ID="FeaturedContent" ContentPlaceHolderID="FeaturedContent">
+</asp:Content>
+<asp:Content ID="Content4" ContentPlaceHolderID="MCon" runat="server">
+    <div class="container">
+        <div class="row panel panel-default" style="margin: 4px 8px;">
+            <div class="panel-heading">
+                <div class="row" style="margin: 2px 4px;">
+                    <h3 class="panel-title"><%: traduci("GestioneCausaliLong") %></h3>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <uc1:mod_gestCausali ID="mod_gestCausali1" runat="server" />
+            </div>
+        </div>
+    </div>
 </asp:Content>
 
+

Projects/WebGIM/GIM_site/gestioneCausali.aspx.cs

@@ -3,8 +3,9 @@ using System.Collections.Generic;
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
+using SteamWare;
 
-public partial class gestioneCausali : System.Web.UI.Page
+public partial class gestioneCausali : UserPage
 {
     protected void Page_Load(object sender, EventArgs e)
     {

Projects/WebGIM/GIM_site/gestioneCausali.aspx.designer.cs

@@ -1,10 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     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.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 

Projects/WebGIM/GIM_site/help.aspx

@@ -1,7 +1,22 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxTitle.master" AutoEventWireup="true" Inherits="help" Codebehind="help.aspx.cs" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" Inherits="help" CodeBehind="help.aspx.cs" %>
 
-<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
-    <h2>
-        <asp:HyperLink runat="server" ID="lnkHelp" Target="_blank" />
-    </h2>
+<asp:Content ID="Content2" ContentPlaceHolderID="HeadContent" runat="server">
+</asp:Content>
+<asp:Content runat="server" ID="FeaturedContent" ContentPlaceHolderID="FeaturedContent">
+</asp:Content>
+<asp:Content ID="Content4" ContentPlaceHolderID="MCon" runat="server">
+    <div class="container">
+        <div class="row panel panel-default" style="margin: 4px 8px;">
+            <div class="panel-heading">
+                <div class="row" style="margin: 2px 4px;">
+                    <h3 class="panel-title"><%: traduci("HelpLong") %></h3>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <h2>
+                    <asp:HyperLink runat="server" ID="lnkHelp" Target="_blank" />
+                </h2>
+            </div>
+        </div>
+    </div>
 </asp:Content>

Projects/WebGIM/GIM_site/help.aspx.cs

@@ -5,17 +5,8 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 using SteamWare;
 
-public partial class help : System.Web.UI.Page
+public partial class help : UserPage
 {
-    /// <summary>
-    /// wrapper traduzione
-    /// </summary>
-    /// <param name="lemma"></param>
-    /// <returns></returns>
-    public string traduci(object lemma)
-    {
-        return user_std.UtSn.Traduci(lemma.ToString());
-    }
     protected void Page_Load(object sender, EventArgs e)
     {
         lnkHelp.Text = traduci("ApriManualeHelp");

Projects/WebGIM/GIM_site/impianti.aspx

@@ -1,10 +1,27 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" Inherits="impianti" Codebehind="impianti.aspx.cs" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.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" %>
 <%@ Register Src="~/WebUserControls/mod_fixCal.ascx" TagName="mod_fixCal" TagPrefix="uc3" %>
-<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
-    <uc1:mod_impianti ID="mod_impianti1" runat="server" />
-    <uc2:mod_macchine ID="mod_macchine1" runat="server" Visible="false" />
-    <uc3:mod_fixCal ID="mod_fixCal1" runat="server" />
+
+<asp:Content ID="Content2" ContentPlaceHolderID="HeadContent" runat="server">
 </asp:Content>
+<asp:Content runat="server" ID="FeaturedContent" ContentPlaceHolderID="FeaturedContent">
+</asp:Content>
+<asp:Content ID="Content4" ContentPlaceHolderID="MCon" runat="server">
+    <div class="container">
+        <div class="row panel panel-default" style="margin: 4px 8px;">
+            <div class="panel-heading">
+                <div class="row" style="margin: 2px 4px;">
+                    <h3 class="panel-title"><%: traduci("GestImpiantiLong") %></h3>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <uc1:mod_impianti ID="mod_impianti1" runat="server" />
+                <uc2:mod_macchine ID="mod_macchine1" runat="server" Visible="false" />
+                <uc3:mod_fixCal ID="mod_fixCal1" runat="server" />
+            </div>
+        </div>
+    </div>
+</asp:Content>
+

Projects/WebGIM/GIM_site/impianti.aspx.cs

@@ -5,7 +5,7 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 using SteamWare;
 
-public partial class impianti : System.Web.UI.Page
+public partial class impianti : UserPage
 {
     protected void Page_Load(object sender, EventArgs e)
     {

Projects/WebGIM/GIM_site/insertRichiesta.aspx

@@ -1,11 +1,27 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Ajax.master" AutoEventWireup="true" Inherits="insertRichiesta" Codebehind="insertRichiesta.aspx.cs" %>
-<%@ MasterType  virtualPath="~/WebMasterPages/Ajax.master"%>
-<%@ Register Src="~/WebUserControls/mod_insertRichiesta.ascx" tagname="mod_insertRichiesta" tagprefix="uc1" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" Inherits="insertRichiesta" CodeBehind="insertRichiesta.aspx.cs" %>
 
-<%@ Register Src="~/WebUserControls/mod_fixCal.ascx" tagname="mod_fixCal" tagprefix="uc2" %>
+<%--<%@ MasterType VirtualPath="~/FullPage.master" %>--%>
+<%@ Register Src="~/WebUserControls/mod_insertRichiesta.ascx" TagName="mod_insertRichiesta" TagPrefix="uc1" %>
 
-<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
-    <uc1:mod_insertRichiesta ID="mod_insertRichiesta1" runat="server" causaliVisibili="true" />
-    <uc2:mod_fixCal ID="mod_fixCal1" runat="server" />
+<%@ Register Src="~/WebUserControls/mod_fixCal.ascx" TagName="mod_fixCal" TagPrefix="uc2" %>
+
+<asp:Content ID="Content2" ContentPlaceHolderID="HeadContent" runat="server">
+</asp:Content>
+<asp:Content runat="server" ID="FeaturedContent" ContentPlaceHolderID="FeaturedContent">
+</asp:Content>
+<asp:Content ID="Content4" ContentPlaceHolderID="MCon" runat="server">
+    <div class="container-flow">
+        <div class="row panel panel-default" style="margin: 4px 8px;">
+            <div class="panel-heading">
+                <div class="row" style="margin: 2px 4px;">
+                    <h3 class="panel-title"><%: traduci("AnagAmbitiGuastoLong") %></h3>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <uc1:mod_insertRichiesta ID="mod_insertRichiesta1" runat="server" causaliVisibili="true" />
+                <uc2:mod_fixCal ID="mod_fixCal1" runat="server" />
+            </div>
+        </div>
+    </div>
 </asp:Content>
 

Projects/WebGIM/GIM_site/insertRichiesta.aspx.cs

@@ -3,34 +3,11 @@ using System.Collections.Generic;
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
+using SteamWare;
 
-public partial class insertRichiesta : System.Web.UI.Page
+public partial class insertRichiesta : UserPage
 {
     protected void Page_Load(object sender, EventArgs e)
-    {
-        mod_insertRichiesta1.eh_newReq += new EventHandler(mod_insertRichiesta1_eh_newReq);
-        mod_insertRichiesta1.eh_done += new EventHandler(mod_insertRichiesta1_eh_done);
-        if (!Page.IsPostBack)
-        {
-            Master.sxMenuVisible = true;
-        }
-    }
-    /// <summary>
-    /// metto visibilità pannello laterale
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    void mod_insertRichiesta1_eh_done(object sender, EventArgs e)
-    {
-        Master.sxMenuVisible = true;
-    }
-    /// <summary>
-    /// tolgo visibilità menù sx
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    void mod_insertRichiesta1_eh_newReq(object sender, EventArgs e)
-    {
-        Master.sxMenuVisible = false;
+    { 
     }
 }

Projects/WebGIM/GIM_site/insertRichiesta.aspx.designer.cs

@@ -1,10 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     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.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -30,15 +29,5 @@ public partial class insertRichiesta {
     /// </remarks>
     protected global::mod_fixCal mod_fixCal1;
     
-    /// <summary>
-    /// Master property.
-    /// </summary>
-    /// <remarks>
-    /// Auto-generated property.
-    /// </remarks>
-    public new Ajax Master {
-        get {
-            return ((Ajax)(base.Master));
-        }
-    }
+   
 }

Projects/WebGIM/GIM_site/login.aspx

@@ -1,9 +1,25 @@
-<%@ Page Language="C#" MasterPageFile="~/WebMasterPages/MasterAjax.master" AutoEventWireup="true"
-    Inherits="login" Title="Login" Codebehind="login.aspx.cs" %>
+<%@ Page Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true"
+    Inherits="login" Title="Login" CodeBehind="login.aspx.cs" %>
 
 <%@ Register Src="~/WebUserControls/mod_login.ascx" TagName="mod_login" TagPrefix="uc1" %>
-<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
-    <div class="centerAll">
-        <uc1:mod_login ID="Mod_login1" runat="server" />
+
+<asp:Content ID="Content2" ContentPlaceHolderID="HeadContent" runat="server">
+</asp:Content>
+<asp:Content runat="server" ID="FeaturedContent" ContentPlaceHolderID="FeaturedContent">
+</asp:Content>
+<asp:Content ID="Content4" ContentPlaceHolderID="MCon" runat="server">
+    <div class="container">
+        <div class="row panel panel-default" style="margin: 4px 8px;">
+            <div class="panel-heading">
+                <div class="row" style="margin: 2px 4px;">
+                    <h3 class="panel-title">LOGIN</h3>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <div class="centerAll">
+                    <uc1:mod_login ID="Mod_login1" runat="server" />
+                </div>
+            </div>
+        </div>
     </div>
 </asp:Content>

Projects/WebGIM/GIM_site/login.aspx.cs

@@ -18,7 +18,7 @@ public partial class login : System.Web.UI.Page
             string pagina = SteamWare.memLayer.ML.StringSessionObj("nextPage");
             if (pagina == "")
             {
-                pagina = "menu.aspx";
+                pagina = "menu";
             }
             return pagina;
         }
@@ -38,7 +38,7 @@ public partial class login : System.Web.UI.Page
 
     void Mod_login1_Login_Error(object sender, EventArgs e)
     {
-        Response.Redirect("./unauthorized.aspx");
+        Response.Redirect("./unauthorized");
     }
 
     void Mod_login1_Login_ok(object sender, EventArgs e)

Projects/WebGIM/GIM_site/login.aspx.designer.cs

@@ -1,10 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     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.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 

Projects/WebGIM/GIM_site/macchine.aspx

@@ -1,10 +1,24 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" Inherits="macchine" Codebehind="macchine.aspx.cs" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" Inherits="macchine" CodeBehind="macchine.aspx.cs" %>
 
-<%@ Register Src="~/WebUserControls/mod_macchine.ascx" tagname="mod_macchine" tagprefix="uc1" %>
+<%@ Register Src="~/WebUserControls/mod_macchine.ascx" TagName="mod_macchine" TagPrefix="uc1" %>
 <%@ Register Src="~/WebUserControls/mod_fixCal.ascx" TagName="mod_fixCal" TagPrefix="uc3" %>
 
-<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
-    <uc1:mod_macchine ID="mod_macchine1" runat="server" />
-    <uc3:mod_fixCal ID="mod_fixCal1" runat="server" />
+<asp:Content ID="Content2" ContentPlaceHolderID="HeadContent" runat="server">
+</asp:Content>
+<asp:Content runat="server" ID="FeaturedContent" ContentPlaceHolderID="FeaturedContent">
+</asp:Content>
+<asp:Content ID="Content4" ContentPlaceHolderID="MCon" runat="server">
+    <div class="container">
+        <div class="row panel panel-default" style="margin: 4px 8px;">
+            <div class="panel-heading">
+                <div class="row" style="margin: 2px 4px;">
+                    <h3 class="panel-title"><%: traduci("MacchineLong") %></h3>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <uc1:mod_macchine ID="mod_macchine1" runat="server" />
+                <uc3:mod_fixCal ID="mod_fixCal1" runat="server" />
+            </div>
+        </div>
+    </div>
 </asp:Content>
-

Projects/WebGIM/GIM_site/macchine.aspx.cs

@@ -3,8 +3,9 @@ using System.Collections.Generic;
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
+using SteamWare;
 
-public partial class macchine : System.Web.UI.Page
+public partial class macchine : UserPage
 {
     protected void Page_Load(object sender, EventArgs e)
     {

Projects/WebGIM/GIM_site/macchine.aspx.designer.cs

@@ -1,10 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     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.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 

Projects/WebGIM/GIM_site/mtzProg.aspx

@@ -1,37 +1,44 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" Inherits="mtzProg" Codebehind="mtzProg.aspx.cs" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.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" %>
 <%@ Register Src="~/WebUserControls/mod_dettMtzProg.ascx" TagName="mod_dettMtzProg" TagPrefix="uc2" %>
 <%@ Register Src="~/WebUserControls/mod_fixCal.ascx" TagName="mod_fixCal" TagPrefix="uc3" %>
-<%@ Register Src="~/WebUserControls/mod_mtzPrevPending.ascx" tagname="mod_mtzPrevPending" tagprefix="uc4" %>
-<%@ Register src="~/WebUserControls/mod_filtraMtzProg.ascx" tagname="mod_filtraMtzProg" tagprefix="uc5" %>
-<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
-    <uc5:mod_filtraMtzProg ID="mod_filtraMtzProg1" runat="server" />
-    <cc1:TabContainer ID="TabContainer1" runat="server" ActiveTabIndex="0">
-        <cc1:TabPanel runat="server" HeaderText="Programmazione Intervento" ID="TabProgrammaMtz">
-            <ContentTemplate>
-                <uc2:mod_dettMtzProg ID="mod_dettMtzProg1" runat="server" Visible="False" />
+<%@ Register Src="~/WebUserControls/mod_mtzPrevPending.ascx" TagName="mod_mtzPrevPending" TagPrefix="uc4" %>
+<%@ Register Src="~/WebUserControls/mod_filtraMtzProg.ascx" TagName="mod_filtraMtzProg" TagPrefix="uc5" %>
 
 
-                <uc1:mod_elencoMtzProg ID="mod_elencoMtzProg1" runat="server" />
 
-
-                <uc3:mod_fixCal ID="mod_fixCal1" runat="server" />
-
-
-            
-</ContentTemplate>
-        
-
-</cc1:TabPanel>
-        <cc1:TabPanel runat="server" HeaderText="Interventi in scadenza" ID="TabScadenzeMtz">
-            <ContentTemplate>
-                <uc4:mod_mtzPrevPending ID="mod_mtzPrevPending1" runat="server" />
-            
-</ContentTemplate>
-        
-
-</cc1:TabPanel>
-    </cc1:TabContainer>
+<asp:Content ID="Content2" ContentPlaceHolderID="HeadContent" runat="server">
 </asp:Content>
+<asp:Content runat="server" ID="FeaturedContent" ContentPlaceHolderID="FeaturedContent">
+</asp:Content>
+<asp:Content ID="Content4" ContentPlaceHolderID="MCon" runat="server">
+    <div class="container">
+        <div class="row panel panel-default" style="margin: 4px 8px;">
+            <div class="panel-heading">
+                <div class="row" style="margin: 2px 4px;">
+                    <h3 class="panel-title"><%: traduci("MtzProgLong") %></h3>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <uc5:mod_filtraMtzProg ID="mod_filtraMtzProg1" runat="server" />
+                <cc1:TabContainer ID="TabContainer1" runat="server" ActiveTabIndex="0">
+                    <cc1:TabPanel runat="server" HeaderText="Programmazione Intervento" ID="TabProgrammaMtz">
+                        <ContentTemplate>
+                            <uc2:mod_dettMtzProg ID="mod_dettMtzProg1" runat="server" Visible="False" />
+                            <uc1:mod_elencoMtzProg ID="mod_elencoMtzProg1" runat="server" />
+                            <uc3:mod_fixCal ID="mod_fixCal1" runat="server" />
+                        </ContentTemplate>
+                    </cc1:TabPanel>
+                    <cc1:TabPanel runat="server" HeaderText="Interventi in scadenza" ID="TabScadenzeMtz">
+                        <ContentTemplate>
+                            <uc4:mod_mtzPrevPending ID="mod_mtzPrevPending1" runat="server" />
+                        </ContentTemplate>
+                    </cc1:TabPanel>
+                </cc1:TabContainer>
+            </div>
+        </div>
+    </div>
+</asp:Content>
+

Projects/WebGIM/GIM_site/sql/GIM_1.5_to_1.6.sql

@@ -123,4 +123,8 @@ exec voc.stp_insNewLemma 'chLangLong', 'Seleziona Lingua'
 UPDATE vocabolario SET traduzione = 'Language Selection' WHERE lemma = 'chLangLong' AND Lingua = 'EN'
 exec voc.stp_insNewLemma 'VocabolarioLong', 'Traduzione Interfaccia'
 UPDATE vocabolario SET traduzione = 'Interface translation' WHERE lemma = 'VocabolarioLong' AND Lingua = 'EN'
+exec voc.stp_insNewLemma 'MacchineLong', 'Gestione Anagrafica Macchine'
+UPDATE vocabolario SET traduzione = 'Machine List Management' WHERE lemma = 'MacchineLong' AND Lingua = 'EN'
+exec voc.stp_insNewLemma 'DettInterventoLong', 'Dettaglio Intervento'
+UPDATE vocabolario SET traduzione = 'Event Detail' WHERE lemma = 'DettInterventoLong' AND Lingua = 'EN'