From 75a29694364ebd4ad4a49ddf276d17ed38121a8e Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 15 Mar 2017 17:21:45 +0100 Subject: [PATCH] =?UTF-8?q?fix=20men=C3=B9=20testata=20x=20link=20diretti?= =?UTF-8?q?=20+=20fix=20vocabolario?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- XPS/Bootstrap.Master | 10 +++++---- XPS/Content/Style.css | 5 +++-- XPS/Content/Style.less | 6 +++-- XPS/Content/Style.min.css | 2 +- XPS/Web.config | 1 + .../mod_scadenziarioCommesse.ascx | 3 +-- XPS/WebUserControls/mod_testata.ascx | 22 ++++++++++++++----- XPS/WebUserControls/mod_testata.ascx.cs | 13 +++++++++++ .../mod_testata.ascx.designer.cs | 9 -------- XPS/scadenziarioCommesse.aspx | 2 -- XPS_data/selData.cs | 3 ++- 11 files changed, 48 insertions(+), 28 deletions(-) diff --git a/XPS/Bootstrap.Master b/XPS/Bootstrap.Master index 713a52b..bbd4df4 100644 --- a/XPS/Bootstrap.Master +++ b/XPS/Bootstrap.Master @@ -45,11 +45,11 @@ <%--Site Scripts--%> - - \ No newline at end of file + diff --git a/XPS/WebUserControls/mod_testata.ascx.cs b/XPS/WebUserControls/mod_testata.ascx.cs index a1948a2..882ace5 100644 --- a/XPS/WebUserControls/mod_testata.ascx.cs +++ b/XPS/WebUserControls/mod_testata.ascx.cs @@ -259,5 +259,18 @@ namespace XPS.WebUserControls } public event EventHandler eh_nuovaRicerca; + + public string checkPag(object currPag) + { + string answ = ""; + + try + { + if (nomePag == currPag.ToString()) answ = "active"; + } + catch + { } + return answ; + } } } \ 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 20e196a..42a9964 100644 --- a/XPS/WebUserControls/mod_testata.ascx.designer.cs +++ b/XPS/WebUserControls/mod_testata.ascx.designer.cs @@ -39,15 +39,6 @@ namespace XPS.WebUserControls { /// protected global::System.Web.UI.WebControls.HyperLink hlHome; - /// - /// lbnUpdate control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton lbnUpdate; - /// /// lbnUpdate2 control. /// diff --git a/XPS/scadenziarioCommesse.aspx b/XPS/scadenziarioCommesse.aspx index fc5d98b..7f1f45a 100644 --- a/XPS/scadenziarioCommesse.aspx +++ b/XPS/scadenziarioCommesse.aspx @@ -13,8 +13,6 @@
-
-
diff --git a/XPS_data/selData.cs b/XPS_data/selData.cs index 638d9ba..6dacb61 100644 --- a/XPS_data/selData.cs +++ b/XPS_data/selData.cs @@ -36,7 +36,8 @@ public class selData : selettori /// public void updateLemmaVoc(string Traduzione, string Original_Lingua, string Original_Lemma) { - SteamWare.DataWrap.DW.taVocabolario.UpdateQuery(Traduzione, Original_Lingua, Original_Lemma); + //SteamWare.DataWrap.DW.taVocabolario.UpdateQuery(Traduzione, Original_Lingua, Original_Lemma); + DataWrap.DW.taVocabolario.upsertLemma(Original_Lingua, Original_Lemma, Traduzione); } /// /// cancella il lemma indicato