diff --git a/XPS/AnagraficaMappe.aspx b/XPS/AnagraficaMappe.aspx index 1b0a7a2..7ff48fb 100644 --- a/XPS/AnagraficaMappe.aspx +++ b/XPS/AnagraficaMappe.aspx @@ -1,9 +1,18 @@ -<%@ Page Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" Inherits="AnagraficaMappe" Title="Untitled Page" Codebehind="AnagraficaMappe.aspx.cs" %> +<%@ Page Language="C#" MasterPageFile="~/Bootstrap.master" AutoEventWireup="true" Inherits="AnagraficaMappe" Title="Untitled Page" CodeBehind="AnagraficaMappe.aspx.cs" %> <%@ Register Src="WebUserControls/mod_anagraficaMappe.ascx" TagName="mod_anagraficaMappe" TagPrefix="uc1" %> - - - - + +
+
+
+
+

<%: traduci("AnagraficaMappe") %>

+
+
+
+ +
+
+
diff --git a/XPS/AnagraficaMappe.aspx.cs b/XPS/AnagraficaMappe.aspx.cs index 810cc9b..cdaed6f 100644 --- a/XPS/AnagraficaMappe.aspx.cs +++ b/XPS/AnagraficaMappe.aspx.cs @@ -8,8 +8,9 @@ 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 AnagraficaMappe : Flesk.Accelerator.Page //System.Web.UI.Page +public partial class AnagraficaMappe : UserPage { protected void Page_Load(object sender, EventArgs e) { diff --git a/XPS/Bootstrap.Master b/XPS/Bootstrap.Master index 7c8df5f..31380f6 100644 --- a/XPS/Bootstrap.Master +++ b/XPS/Bootstrap.Master @@ -1,4 +1,4 @@ -<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Bootstrap.master.cs" Inherits="GMW.Bootstrap" %> +<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Bootstrap.master.cs" Inherits="XPS.Bootstrap" %> <%@ Register Src="~/WebUserControls/mod_testata.ascx" TagPrefix="uc1" TagName="mod_testata" %> @@ -9,17 +9,17 @@ - + - GMW - <%: Page.Title %> + XPS - <%: Page.Title %> - <%: Scripts.Render("~/bundles/modernizr") %> - <%: Scripts.Render("~/bundles/jquery") %> - <%: Scripts.Render("~/bundles/jqueryui") %> - <%: Scripts.Render("~/bundles/bootSwitch") %> + <%: System.Web.Optimization.Scripts.Render("~/bundles/modernizr") %> + <%: System.Web.Optimization.Scripts.Render("~/bundles/jquery") %> + <%: System.Web.Optimization.Scripts.Render("~/bundles/jqueryui") %> + <%: System.Web.Optimization.Scripts.Render("~/bundles/bootSwitch") %> @@ -80,13 +80,13 @@ <%: DateTime.Now %> | - <%: GMW_data.MagClass.magazzino.CodSoggCurrUser %> + <%: SteamWare.devicesAuthProxy.stObj.CognomeNome%>

- GMW + <%: SteamWare.memLayer.ML.CRS("CodModulo") %> | - 2010-<%: DateTime.Now.Year %> © + 2010-<%: DateTime.Now.Year %>©

@@ -97,7 +97,7 @@ - <%: Scripts.Render("~/bundles/jSteamware") %> + <%: System.Web.Optimization.Scripts.Render("~/bundles/jSteamware") %> diff --git a/XPS/Bootstrap.Master.cs b/XPS/Bootstrap.Master.cs index 7a14825..649f6e7 100644 --- a/XPS/Bootstrap.Master.cs +++ b/XPS/Bootstrap.Master.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using System.Web.Optimization; using SteamWare; namespace XPS diff --git a/XPS/Global.asax.cs b/XPS/Global.asax.cs index d2cac05..f95087e 100644 --- a/XPS/Global.asax.cs +++ b/XPS/Global.asax.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Web; using System.Web.Security; using System.Web.SessionState; +using System.Web.Optimization; using System.Web.Routing; namespace XPS @@ -13,6 +14,8 @@ namespace XPS protected void Application_Start(object sender, EventArgs e) { + // Code that runs on application startup + BundleConfig.RegisterBundles(BundleTable.Bundles); // aggiungo friendlyUrls... RouteConfig.RegisterRoutes(RouteTable.Routes); } diff --git a/XPS/Properties/AssemblyInfo.cs b/XPS/Properties/AssemblyInfo.cs index 97e376f..0541e66 100644 --- a/XPS/Properties/AssemblyInfo.cs +++ b/XPS/Properties/AssemblyInfo.cs @@ -8,9 +8,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("XPS")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] +//[assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("XPS")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2011")] +//[assembly: AssemblyCopyright("Copyright © Microsoft 2011")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +//[assembly: AssemblyVersion("1.0.0.0")] +//[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/XPS/WebUserControls/mod_testata.ascx b/XPS/WebUserControls/mod_testata.ascx index 51d024e..8f49891 100644 --- a/XPS/WebUserControls/mod_testata.ascx +++ b/XPS/WebUserControls/mod_testata.ascx @@ -1,5 +1,10 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_testata.ascx.cs" Inherits="XPS.WebUserControls.mod_testata" %> +<%if (false) + { %> + + +<%} %>
@@ -7,22 +12,28 @@
    • -
  • - - - -
  • +
  • <%: nomePag %> -
    • + +
  • + + +
    • + +
    + Toggle navigation + +
    +
    +
    + + +
    - postazione: <%: SteamWare.memLayer.ML.StringSessionObj("postazione_name") %>
    - stampante: <%: SteamWare.memLayer.ML.StringSessionObj("postazione_printer") %>
    \ No newline at end of file + postazione: <%: SteamWare.memLayer.ML.StringSessionObj("postazione_name") %> + +
    + <%: string.Format("{0} - [{1}]", SteamWare.user_std.UtSn.CognomeNome, SteamWare.user_std.UtSn.lingua) %> +
    + + \ No newline at end of file diff --git a/XPS/WebUserControls/mod_testata.ascx.cs b/XPS/WebUserControls/mod_testata.ascx.cs index 6a28dfc..b9ad227 100644 --- a/XPS/WebUserControls/mod_testata.ascx.cs +++ b/XPS/WebUserControls/mod_testata.ascx.cs @@ -24,11 +24,11 @@ namespace XPS.WebUserControls if (!devicesAuthProxy.stObj.isAuth) { string lastPage = Request.Url.LocalPath.Split('/').Last(); - if (lastPage != "" && lastPage != "login.aspx") + if (lastPage != "" && lastPage != "login") { Session["nextPage"] = lastPage; } - Response.Redirect("login.aspx"); + Response.Redirect("login"); } else { @@ -37,7 +37,6 @@ namespace XPS.WebUserControls } // fix componenti hlHome.DataBind(); - hlUser.DataBind(); } } @@ -48,7 +47,7 @@ namespace XPS.WebUserControls string answ = ""; try { - DataLayer_AnagGen.PermessiRow riga = (DataLayer_AnagGen.PermessiRow)devicesAuthProxy.stObj.permessi.Select(string.Format("URL = '{0}'", devicesAuthProxy.pagCorrente))[0]; + DS_Auth.PermessiRow riga = (DS_Auth.PermessiRow)devicesAuthProxy.stObj.permessi.Select(string.Format("URL = '{0}.aspx' OR URL = '{0}'", devicesAuthProxy.pagCorrente))[0]; answ = traduci(riga.DESCRIZIONE); } catch @@ -60,10 +59,11 @@ namespace XPS.WebUserControls { get { + string answ = ""; try { - DataLayer_AnagGen.PermessiRow riga = (DataLayer_AnagGen.PermessiRow)devicesAuthProxy.stObj.permessi.Select(string.Format("URL = '{0}'", devicesAuthProxy.pagCorrente))[0]; + DS_Auth.PermessiRow riga = (DS_Auth.PermessiRow)devicesAuthProxy.stObj.permessi.Select(string.Format("URL = '{0}.aspx' OR URL = '{0}'", devicesAuthProxy.pagCorrente))[0]; answ = traduci(riga.NOME); } catch @@ -80,7 +80,7 @@ namespace XPS.WebUserControls { if (devicesAuthProxy.stObj.mappaSito == "") { - Response.Redirect("default.aspx"); + Response.Redirect("Default"); } XmlMenu.Data = devicesAuthProxy.stObj.mappaSito; @@ -211,7 +211,7 @@ namespace XPS.WebUserControls // svuoto session e cache per rileggere i dati da Db Session.RemoveAll(); memLayer.ML.setSessionVal("nextPage", devicesAuthProxy.pagCorrente); - Response.Redirect("login.aspx"); + Response.Redirect("login"); } /// /// click su pagina corrente, fa update! @@ -222,13 +222,41 @@ namespace XPS.WebUserControls { doFullDataUpdate(); } - - protected void lbShowNumKey_Click(object sender, EventArgs e) + /// + /// verifica se la pagina abbia abilitato il search + /// + public bool pageHasSearch { get; set; } + /// + /// modifica campo ricerca... + /// + /// + /// + protected void txtSearch_TextChanged(object sender, EventArgs e) { - // cambio valore boolean di visualizzazione tastiera numerica a video... - memLayer.ML.setSessionVal("showNumKey", !memLayer.ML.BoolSessionObj("showNumKey")); - // ricarico - Response.Redirect(devicesAuthProxy.pagCorrente); + // salvo in sessione + memLayer.ML.setSessionVal("valoreCercato", txtSearch.Text.Trim(), true); + // raise dell'evento + if (eh_nuovaRicerca != null) + { + eh_nuovaRicerca(this, new EventArgs()); + } } + /// + /// valore ricerca + /// + public string searchVal + { + get + { + return txtSearch.Text.Trim(); + } + set + { + memLayer.ML.setSessionVal("valoreCercato", value, true); + txtSearch.Text = value; + } + } + + public event EventHandler eh_nuovaRicerca; } } \ No newline at end of file diff --git a/XPS/WebUserControls/mod_testata.ascx.designer.cs b/XPS/WebUserControls/mod_testata.ascx.designer.cs index 3285a81..20e196a 100644 --- a/XPS/WebUserControls/mod_testata.ascx.designer.cs +++ b/XPS/WebUserControls/mod_testata.ascx.designer.cs @@ -12,6 +12,24 @@ namespace XPS.WebUserControls { public partial class mod_testata { + /// + /// BundleReference1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; + + /// + /// BundleReference2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; + /// /// hlHome control. /// @@ -21,24 +39,6 @@ namespace XPS.WebUserControls { /// protected global::System.Web.UI.WebControls.HyperLink hlHome; - /// - /// hlUser control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.HyperLink hlUser; - - /// - /// lblMatr control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblMatr; - /// /// lbnUpdate control. /// @@ -48,6 +48,15 @@ namespace XPS.WebUserControls { /// protected global::System.Web.UI.WebControls.LinkButton lbnUpdate; + /// + /// lbnUpdate2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbnUpdate2; + /// /// itemPlaceholderContainer control. /// @@ -66,15 +75,6 @@ namespace XPS.WebUserControls { /// protected global::System.Web.UI.WebControls.Repeater menu; - /// - /// lbShowNumKey control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton lbShowNumKey; - /// /// XmlMenu control. /// @@ -83,5 +83,23 @@ namespace XPS.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.XmlDataSource XmlMenu; + + /// + /// txtSearch control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtSearch; + + /// + /// hlLang control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink hlLang; } } diff --git a/XPS/XPS.csproj b/XPS/XPS.csproj index 821be95..e52844c 100644 --- a/XPS/XPS.csproj +++ b/XPS/XPS.csproj @@ -161,6 +161,18 @@ + + font.less + + + font.css + + + Style.less + + + Style.css + @@ -203,6 +215,7 @@ + @@ -264,6 +277,7 @@ + @@ -327,6 +341,16 @@ + + + + + + + + + compilerconfig.json + @@ -363,6 +387,9 @@ + + VersGen.cs + AnagraficaEventi.aspx ASPXCodeBehind @@ -384,6 +411,7 @@ AnagraficaStati.aspx + barcode.aspx @@ -1016,6 +1044,7 @@ + 10.0 diff --git a/XPS/menu.aspx b/XPS/menu.aspx index a56705d..e2f7fbb 100644 --- a/XPS/menu.aspx +++ b/XPS/menu.aspx @@ -1,9 +1,19 @@ -<%@ Page Language="C#" MasterPageFile="~/WebMasterPages/MasterAjax.master" AutoEventWireup="true" Inherits="menu" Title="Untitled Page" Codebehind="menu.aspx.cs" %> +<%@ Page Language="C#" MasterPageFile="~/Bootstrap.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" %> - - - + +
    +
    +
    +
    +

    <%: traduci("Menu") %>

    +
    +
    +
    + +
    +
    +
    diff --git a/XPS/menu.aspx.cs b/XPS/menu.aspx.cs index dadee6f..36e0571 100644 --- a/XPS/menu.aspx.cs +++ b/XPS/menu.aspx.cs @@ -1,19 +1,7 @@ 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 menu : Flesk.Accelerator.Page //System.Web.UI.Page +public partial class menu : UserPage //System.Web.UI.Page { - protected override void OnUnload(EventArgs e) - { - base.OnUnload(e); - RemoveViewStateFiles(); - } + } diff --git a/XPS/update.aspx b/XPS/update.aspx index 7b04031..d623981 100644 --- a/XPS/update.aspx +++ b/XPS/update.aspx @@ -1,7 +1,17 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxTitle.master" - AutoEventWireup="true" Inherits="update" CodeBehind="update.aspx.cs" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.master" AutoEventWireup="true" Inherits="update" CodeBehind="update.aspx.cs" %> <%@ Register Src="WebUserControls/mod_update.ascx" TagName="mod_update" TagPrefix="uc1" %> - - + +
    +
    +
    +
    +

    <%: traduci("UpdateAnagrafiche") %>

    +
    +
    +
    + +
    +
    +
    diff --git a/XPS/update.aspx.cs b/XPS/update.aspx.cs index d0862b6..11b8bc8 100644 --- a/XPS/update.aspx.cs +++ b/XPS/update.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 update : Flesk.Accelerator.Page //System.Web.UI.Page +public partial class update : UserPage //System.Web.UI.Page { protected void Page_Load(object sender, EventArgs e) { diff --git a/XPS/update.aspx.designer.cs b/XPS/update.aspx.designer.cs index cbd6953..9c89da5 100644 --- a/XPS/update.aspx.designer.cs +++ b/XPS/update.aspx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4963 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/XPS/vocabolario.aspx b/XPS/vocabolario.aspx index b48be64..37d758d 100644 --- a/XPS/vocabolario.aspx +++ b/XPS/vocabolario.aspx @@ -1,8 +1,19 @@ -<%@ Page Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" Inherits="vocabolario" Title="Untitled Page" Codebehind="vocabolario.aspx.cs" %> +<%@ Page Language="C#" MasterPageFile="~/Bootstrap.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" %> - - - + +
    +
    +
    +
    +

    <%: traduci("Vocabolario") %>

    +
    +
    +
    + + +
    +
    +
    diff --git a/XPS/vocabolario.aspx.cs b/XPS/vocabolario.aspx.cs index cbc7e1d..66f9ef1 100644 --- a/XPS/vocabolario.aspx.cs +++ b/XPS/vocabolario.aspx.cs @@ -10,7 +10,7 @@ using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; using SteamWare; -public partial class vocabolario : Flesk.Accelerator.Page //System.Web.UI.Page +public partial class vocabolario : UserPage { protected override void OnInit(EventArgs e) { diff --git a/XPS/vocabolario.aspx.designer.cs b/XPS/vocabolario.aspx.designer.cs index c72ac09..0404e70 100644 --- a/XPS/vocabolario.aspx.designer.cs +++ b/XPS/vocabolario.aspx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4963 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/XPS_app.sln b/XPS_app.sln index 4e62305..586bb45 100644 --- a/XPS_app.sln +++ b/XPS_app.sln @@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamWare", "..\..\Steamwar EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Equa_Auth", "Equa_Auth\Equa_Auth.csproj", "{BDD58632-ED9F-46DE-ABE9-8B7E228EFA72}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersGen", "VersGen\VersGen.csproj", "{BE594F80-8FC2-45BE-99D1-AEC73F71E41E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -116,6 +118,24 @@ Global {BDD58632-ED9F-46DE-ABE9-8B7E228EFA72}.Release|Any CPU.Build.0 = Release|Any CPU {BDD58632-ED9F-46DE-ABE9-8B7E228EFA72}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {BDD58632-ED9F-46DE-ABE9-8B7E228EFA72}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Debug|.NET.ActiveCfg = Debug|Any CPU + {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Debug|.NET.Build.0 = Debug|Any CPU + {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.EQUA|.NET.ActiveCfg = Release|Any CPU + {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.EQUA|.NET.Build.0 = Release|Any CPU + {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.EQUA|Any CPU.ActiveCfg = Release|Any CPU + {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.EQUA|Any CPU.Build.0 = Release|Any CPU + {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.EQUA|Mixed Platforms.ActiveCfg = Release|Any CPU + {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.EQUA|Mixed Platforms.Build.0 = Release|Any CPU + {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Release|.NET.ActiveCfg = Release|Any CPU + {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Release|.NET.Build.0 = Release|Any CPU + {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Release|Any CPU.Build.0 = Release|Any CPU + {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Release|Mixed Platforms.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE