From 11fca34f89746daa278f008f3e7aece497ce0fc3 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Fri, 10 Jan 2020 18:47:43 +0100
Subject: [PATCH] Initial commit per gestione vocabolario

---
 AppData/AppData.csproj                        |   1 +
 AppData/selDataVoc.cs                         |  60 ++++++
 NKC_WF/WebUserControls/cmp_menuTop.ascx       |  42 ++--
 NKC_WF/WebUserControls/cmp_menuTop.ascx.cs    |  52 ++++-
 .../cmp_menuTop.ascx.designer.cs              |  93 +++++----
 NKC_WF/WebUserControls/mod_lemmiVocab.ascx    |  95 +++++----
 NKC_WF/WebUserControls/mod_vocabolario.ascx   | 180 +++++++++---------
 NKC_WF/site/MachineUnload.aspx                |   2 +-
 NKC_WF/site/UpdateVoc.aspx.cs                 |   2 +-
 NKC_WF/site/vocabolario.aspx                  |  10 +-
 NKC_WF/site/vocabolario.aspx.cs               |   2 +-
 11 files changed, 342 insertions(+), 197 deletions(-)
 create mode 100644 AppData/selDataVoc.cs

diff --git a/AppData/AppData.csproj b/AppData/AppData.csproj
index 1d8e623..ebec613 100644
--- a/AppData/AppData.csproj
+++ b/AppData/AppData.csproj
@@ -181,6 +181,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
     <Compile Include="reportPrinter.cs" />
+    <Compile Include="selDataVoc.cs" />
     <Compile Include="SyncLib.cs" />
     <Compile Include="Utils.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/AppData/selDataVoc.cs b/AppData/selDataVoc.cs
new file mode 100644
index 0000000..f0d2631
--- /dev/null
+++ b/AppData/selDataVoc.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AppData
+{
+  /// <summary>
+  /// Classe gestione metodi di accesso ai dati embeddati
+  /// </summary>
+  public class selDataVoc
+  {
+    /// <summary>
+    /// classe accesso tabelle selettori
+    /// </summary>
+    public selDataVoc()
+    {
+    }
+
+    /// <summary>
+    /// tabella vocabolario
+    /// </summary>
+    /// <returns></returns>
+    public SteamWare.DataLayer_generic.VocabolarioDataTable getVocabolario()
+    {
+      return SteamWare.DataWrap.DW.taVocabolario.GetData();
+    }
+    /// <summary>
+    /// tabella lingue
+    /// </summary>
+    /// <returns></returns>
+    public SteamWare.DataLayer_generic.LingueDataTable getLingue()
+    {
+      return SteamWare.DataWrap.DW.taLingue.GetData();
+    }
+
+
+    /// <summary>
+    /// faccio update del lemma indicato...
+    /// </summary>
+    /// <param name="Traduzione"></param>
+    /// <param name="Original_Lingua"></param>
+    /// <param name="Original_Lemma"></param>
+    public void updateLemmaVoc(string Traduzione, string Original_Lingua, string Original_Lemma)
+    {
+      SteamWare.DataWrap.DW.taVocabolario.UpdateQuery(Traduzione, Original_Lingua, Original_Lemma);
+    }
+    /// <summary>
+    /// cancella il lemma indicato
+    /// </summary>
+    /// <param name="Original_Lingua"></param>
+    /// <param name="Original_Lemma"></param>
+    public void deleteLemmaVoc(string Original_Lingua, string Original_Lemma)
+    {
+      SteamWare.DataWrap.DW.taVocabolario.DeleteQuery(Original_Lingua, Original_Lemma);
+    }
+
+  }
+}
diff --git a/NKC_WF/WebUserControls/cmp_menuTop.ascx b/NKC_WF/WebUserControls/cmp_menuTop.ascx
index 4fc8f8f..472f502 100644
--- a/NKC_WF/WebUserControls/cmp_menuTop.ascx
+++ b/NKC_WF/WebUserControls/cmp_menuTop.ascx
@@ -1,35 +1,51 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_menuTop.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_menuTop" %>
 
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark text-light">
-  <a class="navbar-brand" href="#">Sauder NKC <i class="fa fa-object-group" aria-hidden="true"></i></a>
+  <asp:LinkButton runat="server" ID="lbnUpdate" Text="---" OnClick="lbnUpdate_Click" CssClass="navbar-brand" ToolTip="Update + HOME">Sauder NKC <i class="fa fa-object-group" aria-hidden="true"></i></asp:LinkButton>
+  <%--<a class="navbar-brand" href="#">Sauder NKC <i class="fa fa-object-group" aria-hidden="true"></i></a>--%>
   <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
   </button>
 
   <div class="collapse navbar-collapse" id="navbarSupportedContent">
     <ul class="navbar-nav mr-auto">
-      <li class="nav-item active">
+      <asp:Repeater ID="menu" runat="server" DataSourceID="XmlMenu">
+        <ItemTemplate>
+          <li class="nav-item dropdown">
+            <a href='<%# XPath("@url").ToString().Replace("~/","") %>' class="nav-link dropdown-toggle text-light bg-dark" data-toggle="dropdown">
+              <i class='<%# XPath("@description")%>'></i>
+              <%# XPath("@title")%>
+              <b class="caret"></b>
+            </a>
+            <div class="dropdown-menu">
+              <asp:Repeater ID="voci" runat="server" DataSource='<%# XPathSelect("voce") %>'>
+                <ItemTemplate>
+                  <a href='<%# XPath("@url").ToString().Replace("~/","")%>' class="dropdown-item py-0">
+                    <i class='<%# XPath("@description")%>'></i>
+                    <%# XPath("@title")%>
+                  </a>
+                </ItemTemplate>
+              </asp:Repeater>
+            </div>
+          </li>
+        </ItemTemplate>
+        <SeparatorTemplate>
+        </SeparatorTemplate>
+      </asp:Repeater>
+      <asp:XmlDataSource ID="XmlMenu" runat="server" EnableCaching="true" CacheDuration="5"></asp:XmlDataSource>
+      <%--<li class="nav-item active">
         <a class="nav-link" href="Default">Home <span class="sr-only">(current)</span></a>
-      </li>
+      </li>--%>
       <li class="nav-item">
         <a class="nav-link" href="About">Informazioni</a>
       </li>
       <li class="nav-item">
         <a class="nav-link" href="Contact">Contatto</a>
       </li>
-      <li class="nav-item dropdown">
-        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Dropdown
-        </a>
-        <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-          <a class="dropdown-item" href="#">Action</a>
-          <a class="dropdown-item" href="#">Another action</a>
-          <div class="dropdown-divider"></div>
-          <a class="dropdown-item" href="#">Something else here</a>
-        </div>
-      </li>
       <li class="nav-item">
         <a class="nav-link" href="DevUtils">DEV Utils</a>
       </li>
+
     </ul>
     <div runat="server" id="divSearch" class="form-inline my-2 my-lg-0">
       <asp:TextBox runat="server" ID="txtSearch" class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search" OnTextChanged="txtSearch_TextChanged" />
diff --git a/NKC_WF/WebUserControls/cmp_menuTop.ascx.cs b/NKC_WF/WebUserControls/cmp_menuTop.ascx.cs
index d52a5bd..94ea88f 100644
--- a/NKC_WF/WebUserControls/cmp_menuTop.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_menuTop.ascx.cs
@@ -16,6 +16,7 @@ namespace NKC_WF.WebUserControls
       if (!Page.IsPostBack)
       {
         searchVal = "";
+        updateTreeMenu();
       }
     }
     /// <summary>
@@ -70,7 +71,56 @@ namespace NKC_WF.WebUserControls
         txtSearch.Text = value.Trim();
       }
     }
-
+    /// <summary>
+    /// aggiornamento del menù
+    /// </summary>
+    private void updateTreeMenu()
+    {
+      try
+      {
+        if (string.IsNullOrEmpty(user_std.UtSn.mappaSito))
+        {
+          Response.Redirect("Default", false);
+        }
+        XmlMenu.Data = user_std.UtSn.mappaSito;
+        XmlMenu.XPath = "mainMenu/menu";
+        XmlMenu.DataBind();
+      }
+      catch
+      {
+        Response.Redirect(user_std.pagCorrente, false);
+      }
+    }
+    /// <summary>
+    /// click su pagina corrente, fa update!
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    protected void lbnUpdate_Click(object sender, EventArgs e)
+    {
+      doDataUpdate(true);
+    }
+    /// <summary>
+    /// effettua un update completo dei valori in sessione
+    /// </summary>
+    private void doDataUpdate(bool doFullReset)
+    {
+      if (doFullReset)
+      {
+        // aggiorno vocabolario
+        DataWrap.DW.resetVocabolario();
+        // reset dati in cache x DbConfig...
+        memLayer.ML.resetAppConf();
+        // svuoto session e cache per rileggere i dati da Db
+        Session.RemoveAll();
+        memLayer.ML.setSessionVal("nextPage", user_std.pagCorrente);
+        Response.Redirect("login");
+      }
+      else
+      {
+        Response.Redirect(user_std.pagCorrente);
+      }
+    }
     protected void lbtSearch_Click(object sender, EventArgs e)
     {
       doSearch();
diff --git a/NKC_WF/WebUserControls/cmp_menuTop.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_menuTop.ascx.designer.cs
index 88d7144..895e6d3 100644
--- a/NKC_WF/WebUserControls/cmp_menuTop.ascx.designer.cs
+++ b/NKC_WF/WebUserControls/cmp_menuTop.ascx.designer.cs
@@ -7,36 +7,65 @@
 // </generato automaticamente>
 //------------------------------------------------------------------------------
 
-namespace NKC_WF.WebUserControls {
-    
-    
-    public partial class cmp_menuTop {
-        
-        /// <summary>
-        /// Controllo divSearch.
-        /// </summary>
-        /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSearch;
-        
-        /// <summary>
-        /// Controllo txtSearch.
-        /// </summary>
-        /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox txtSearch;
-        
-        /// <summary>
-        /// Controllo lbtSearch.
-        /// </summary>
-        /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.LinkButton lbtSearch;
-    }
+namespace NKC_WF.WebUserControls
+{
+
+
+  public partial class cmp_menuTop
+  {
+
+    /// <summary>
+    /// Controllo lbnUpdate.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::System.Web.UI.WebControls.LinkButton lbnUpdate;
+
+    /// <summary>
+    /// Controllo menu.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::System.Web.UI.WebControls.Repeater menu;
+
+    /// <summary>
+    /// Controllo XmlMenu.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::System.Web.UI.WebControls.XmlDataSource XmlMenu;
+
+    /// <summary>
+    /// Controllo divSearch.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSearch;
+
+    /// <summary>
+    /// Controllo txtSearch.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::System.Web.UI.WebControls.TextBox txtSearch;
+
+    /// <summary>
+    /// Controllo lbtSearch.
+    /// </summary>
+    /// <remarks>
+    /// Campo generato automaticamente.
+    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+    /// </remarks>
+    protected global::System.Web.UI.WebControls.LinkButton lbtSearch;
+  }
 }
diff --git a/NKC_WF/WebUserControls/mod_lemmiVocab.ascx b/NKC_WF/WebUserControls/mod_lemmiVocab.ascx
index 5134e08..e5b282d 100644
--- a/NKC_WF/WebUserControls/mod_lemmiVocab.ascx
+++ b/NKC_WF/WebUserControls/mod_lemmiVocab.ascx
@@ -1,55 +1,48 @@
 <%@ Control Language="C#" AutoEventWireup="true" Inherits="NKC_WF.WebUserControls.mod_lemmiVocab" CodeBehind="mod_lemmiVocab.ascx.cs" %>
 
 <div class="row" style="font-size: 8pt;">
-    <div class="col-sm-12">
-        <asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False"
-            DataKeyNames="Lingua,Lemma" DataSourceID="ods" OnDataBound="grView_DataBound">
-           <RowStyle CssClass="ctrRowStyle" />
-            <AlternatingRowStyle CssClass="ctrAltRowStyle" />
-            <EditRowStyle CssClass="ctrEditRowStyle" />
-            <SelectedRowStyle CssClass="ctrSelRowStyle" />
-            <FooterStyle CssClass="ctrFooter" />
-            <PagerStyle CssClass="ctrHeaderPager" ForeColor="White" HorizontalAlign="Center" />
-            <HeaderStyle CssClass="ctrHeaderPager" ForeColor="White" Font-Bold="True" />
-            <EmptyDataRowStyle CssClass="ctrRowStyle" />
-            <EmptyDataTemplate>
-                <asp:Label runat="server" ID="lblNoRecord" Text='<%# traduci("noRecord") %>' />
-            </EmptyDataTemplate>
-            <Columns>
-                <asp:TemplateField HeaderText="Lingua" SortExpression="Lingua">
-                    <EditItemTemplate>
-                        <asp:Label ID="TextBox0" runat="server" Text='<%# Eval("Lingua") %>' />
-                    </EditItemTemplate>
-                    <ItemTemplate>
-                        <asp:Label ID="Label1" runat="server" Text='<%# Bind("Lingua") %>' />
-                    </ItemTemplate>
-                </asp:TemplateField>
-                <asp:TemplateField HeaderText="Lemma" SortExpression="Lemma" Visible="false">
-                    <EditItemTemplate>
-                        <asp:Label ID="TextBox2" runat="server" Text='<%# Eval("Lemma") %>' />
-                    </EditItemTemplate>
-                    <ItemTemplate>
-                        <asp:Label ID="Label3" runat="server" Text='<%# Bind("Lemma") %>' />
-                    </ItemTemplate>
-                </asp:TemplateField>
-                <asp:TemplateField HeaderText="Traduzione" SortExpression="Traduzione">
-                    <EditItemTemplate>
-                        <asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("Traduzione") %>' Width="500px"
-                            TextMode="MultiLine"></asp:TextBox>
-                    </EditItemTemplate>
-                    <ItemTemplate>
-                        <asp:Label ID="Label2" runat="server" Text='<%# Bind("Traduzione") %>' />
-                    </ItemTemplate>
-                </asp:TemplateField>
-            </Columns>
-        </asp:GridView>
-        <asp:Label ID="lblNumRec" runat="server" CssClass="didascalia" />
-        <asp:ObjectDataSource ID="ods" runat="server" SelectMethod="getVocabolario" TypeName="NKC_WF_data.selDataVoc"
-            OldValuesParameterFormatString="original_{0}"
-            FilterExpression="Lemma LIKE '%{0}%'">
-            <FilterParameters>
-                <asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="lemma_sel" />
-            </FilterParameters>
-        </asp:ObjectDataSource>
-    </div>
+  <div class="col-sm-12">
+    <asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False"
+      DataKeyNames="Lingua,Lemma" DataSourceID="ods" OnDataBound="grView_DataBound" CssClass="table table-striped table-sm">
+      <SelectedRowStyle CssClass="info" />
+      <EmptyDataTemplate>
+        <asp:Label runat="server" ID="lblNoRecord" Text='<%# traduci("noRecord") %>' />
+      </EmptyDataTemplate>
+      <Columns>
+        <asp:TemplateField HeaderText="Lingua" SortExpression="Lingua">
+          <EditItemTemplate>
+            <asp:Label ID="TextBox0" runat="server" Text='<%# Eval("Lingua") %>' />
+          </EditItemTemplate>
+          <ItemTemplate>
+            <asp:Label ID="Label1" runat="server" Text='<%# Bind("Lingua") %>' />
+          </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="Lemma" SortExpression="Lemma" Visible="false">
+          <EditItemTemplate>
+            <asp:Label ID="TextBox2" runat="server" Text='<%# Eval("Lemma") %>' />
+          </EditItemTemplate>
+          <ItemTemplate>
+            <asp:Label ID="Label3" runat="server" Text='<%# Bind("Lemma") %>' />
+          </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="Traduzione" SortExpression="Traduzione">
+          <EditItemTemplate>
+            <asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("Traduzione") %>' Width="500px"
+              TextMode="MultiLine"></asp:TextBox>
+          </EditItemTemplate>
+          <ItemTemplate>
+            <asp:Label ID="Label2" runat="server" Text='<%# Bind("Traduzione") %>' />
+          </ItemTemplate>
+        </asp:TemplateField>
+      </Columns>
+    </asp:GridView>
+    <asp:Label ID="lblNumRec" runat="server" CssClass="didascalia" />
+    <asp:ObjectDataSource ID="ods" runat="server" SelectMethod="getVocabolario" TypeName="AppData.selDataVoc"
+      OldValuesParameterFormatString="original_{0}"
+      FilterExpression="Lemma LIKE '%{0}%'">
+      <FilterParameters>
+        <asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="lemma_sel" />
+      </FilterParameters>
+    </asp:ObjectDataSource>
+  </div>
 </div>
diff --git a/NKC_WF/WebUserControls/mod_vocabolario.ascx b/NKC_WF/WebUserControls/mod_vocabolario.ascx
index 638aa0c..b21aef0 100644
--- a/NKC_WF/WebUserControls/mod_vocabolario.ascx
+++ b/NKC_WF/WebUserControls/mod_vocabolario.ascx
@@ -1,96 +1,92 @@
 <%@ Control Language="C#" AutoEventWireup="true"
-    Inherits="NKC_WF.WebUserControls.mod_vocabolario" CodeBehind="mod_vocabolario.ascx.cs" %>
+  Inherits="NKC_WF.WebUserControls.mod_vocabolario" CodeBehind="mod_vocabolario.ascx.cs" %>
 
 <div class="row" style="font-size: 8pt;">
-    <div class="col-sm-12">
-        <asp:Button ID="btnNewLemma" runat="server" OnClick="btnNewLemma_Click" CssClass="btn btn-success btn-sm" />
-        <asp:TextBox ID="txtNewLemma" runat="server" placeholder="inserire lemma" />
-    </div>
-    <div class="col-sm-12">
-        <asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False"
-            DataKeyNames="Lingua,Lemma" DataSourceID="ods" OnDataBound="grView_DataBound"
-            OnSelectedIndexChanged="grView_SelectedIndexChanged" OnRowEditing="grView_RowEditing">
-            <RowStyle CssClass="ctrRowStyle" />
-            <AlternatingRowStyle CssClass="ctrAltRowStyle" />
-            <EditRowStyle CssClass="ctrEditRowStyle" />
-            <SelectedRowStyle CssClass="ctrSelRowStyle" />
-            <FooterStyle CssClass="ctrFooter" />
-            <PagerStyle CssClass="ctrHeaderPager" ForeColor="White" HorizontalAlign="Center" />
-            <HeaderStyle CssClass="ctrHeaderPager" ForeColor="White" Font-Bold="True" />
-            <EmptyDataRowStyle CssClass="ctrRowStyle" />
-            <EmptyDataTemplate>
-                <asp:Label runat="server" ID="lblNoRecord" Text='<%# traduci("noRecord") %>' />
-            </EmptyDataTemplate>
-            <Columns>
-                <asp:TemplateField ShowHeader="False">
-                    <EditItemTemplate>
-                        <asp:ImageButton ID="imgUpdate" runat="server" CausesValidation="False" CommandName="Update"
-                            ToolTip='<%# traduci("Update")%>' ImageUrl='<%# imgPath(SteamWare.tipoImg.conferma, SteamWare.dimImg.small) %>' />
-                        <asp:ImageButton ID="imgCancel" runat="server" CausesValidation="False" CommandName="Cancel"
-                            ToolTip='<%# traduci("Cancel") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.annulla, SteamWare.dimImg.small) %>' />
-                    </EditItemTemplate>
-                    <HeaderTemplate>
-                        <asp:LinkButton ID="lbtReset" runat="server" OnClick="btnReset_Click" CssClass="btn btn-default btn-sm" Visible="true"><i class="fa fa-refresh"></i> <%: traduci("Reset") %></asp:LinkButton>
-                    </HeaderTemplate>
-                    <ItemTemplate>
-                        <asp:ImageButton ID="imgSelect" runat="server" CausesValidation="False" CommandName="Select"
-                            ToolTip='<%# traduci("Select") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.seleziona, SteamWare.dimImg.small) %>' />
-                        <asp:ImageButton ID="imgEdit" runat="server" CausesValidation="False" CommandName="Edit"
-                            ToolTip='<%# traduci("Edit") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.modifica, SteamWare.dimImg.small) %>' />
-                    </ItemTemplate>
-                </asp:TemplateField>
-                <asp:TemplateField HeaderText="Lingua" SortExpression="Lingua">
-                    <EditItemTemplate>
-                        <asp:Label ID="TextBox0" runat="server" Text='<%# Eval("Lingua") %>' />
-                    </EditItemTemplate>
-                    <ItemTemplate>
-                        <asp:Label ID="Label1" runat="server" Text='<%# Bind("Lingua") %>' />
-                    </ItemTemplate>
-                </asp:TemplateField>
-                <asp:TemplateField HeaderText="Lemma" SortExpression="Lemma">
-                    <EditItemTemplate>
-                        <asp:Label ID="TextBox2" runat="server" Text='<%# Eval("Lemma") %>' />
-                    </EditItemTemplate>
-                    <ItemTemplate>
-                        <asp:Label ID="Label3" runat="server" Text='<%# Bind("Lemma") %>' />
-                    </ItemTemplate>
-                </asp:TemplateField>
-                <asp:TemplateField HeaderText="Traduzione" SortExpression="Traduzione">
-                    <EditItemTemplate>
-                        <asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("Traduzione") %>' Width="500px"
-                            TextMode="MultiLine" Height="8em"></asp:TextBox>
-                    </EditItemTemplate>
-                    <ItemTemplate>
-                        <asp:Label ID="Label2" runat="server" Text='<%# Bind("Traduzione") %>' />
-                    </ItemTemplate>
-                </asp:TemplateField>
-                <asp:TemplateField ShowHeader="False">
-                    <EditItemTemplate>
-                    </EditItemTemplate>
-                    <ItemTemplate>
-                        <asp:ImageButton ID="imgDelete" runat="server" CausesValidation="False" CommandName="Delete"
-                            ToolTip='<%# traduci("Delete") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.elimina, SteamWare.dimImg.small) %>' OnClientClick='<%# SteamWare.jsUtils.getCBE("confermaDel") %>' />
-                    </ItemTemplate>
-                </asp:TemplateField>
-            </Columns>
-        </asp:GridView>
-        <asp:Label ID="lblNumRec" runat="server" CssClass="didascalia" />
-        <asp:ObjectDataSource ID="ods" runat="server" SelectMethod="getVocabolario" TypeName="NKC_WF_data.selDataVoc"
-            UpdateMethod="updateLemmaVoc" DeleteMethod="deleteLemmaVoc" OldValuesParameterFormatString="Original_{0}"
-            FilterExpression="Traduzione LIKE '%{0}%' OR Lemma LIKE '%{0}%' "
-            OnUpdated="ods_Updated">
-            <UpdateParameters>
-                <asp:Parameter Name="Traduzione" Type="String" />
-                <asp:Parameter Name="Original_Lingua" Type="String" />
-                <asp:Parameter Name="Original_Lemma" Type="String" />
-            </UpdateParameters>
-            <FilterParameters>
-                <asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="valoreCercato" />
-            </FilterParameters>
-            <DeleteParameters>
-                <asp:Parameter Name="Original_Lingua" Type="String" />
-                <asp:Parameter Name="Original_Lemma" Type="String" />
-            </DeleteParameters>
-        </asp:ObjectDataSource>
-    </div>
+  <div class="col-sm-12">
+    <asp:Button ID="btnNewLemma" runat="server" OnClick="btnNewLemma_Click" CssClass="btn btn-success btn-sm" />
+    <asp:TextBox ID="txtNewLemma" runat="server" placeholder="inserire lemma" />
+  </div>
+  <div class="col-sm-12">
+    <asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False"
+      DataKeyNames="Lingua,Lemma" DataSourceID="ods" OnDataBound="grView_DataBound"
+      OnSelectedIndexChanged="grView_SelectedIndexChanged" OnRowEditing="grView_RowEditing" CssClass="table table-striped table-sm">
+      <HeaderStyle CssClass="default" />
+      <PagerStyle CssClass="active GridPager" />
+      <PagerSettings Mode="NumericFirstLast" />
+      <SelectedRowStyle CssClass="table-info" />
+      <EmptyDataTemplate>
+        <asp:Label runat="server" ID="lblNoRecord" Text='<%# traduci("noRecord") %>' />
+      </EmptyDataTemplate>
+      <Columns>
+        <asp:TemplateField ShowHeader="False">
+          <EditItemTemplate>
+            <asp:LinkButton runat="server" ID="lbtUpdate" CausesValidation="False" CommandName="Update"
+              ToolTip='<%# traduci("Update")%>' CssClass="btn btn-success btn-sm" ><i class="fa fa-check-circle-o" aria-hidden="true"></i></asp:LinkButton>
+            <asp:LinkButton runat="server" ID="lbtCancel" CausesValidation="False" CommandName="Cancel"
+              ToolTip='<%# traduci("Cancel") %>' CssClass="btn btn-warning btn-sm" ><i class="fa fa-ban" aria-hidden="true"></i></asp:LinkButton>
+          </EditItemTemplate>
+          <HeaderTemplate>
+            <asp:LinkButton ID="lbtReset" runat="server" OnClick="btnReset_Click" CssClass="btn btn-warning btn-sm" Visible="true"><i class="fa fa-refresh"></i> <%: traduci("Reset") %></asp:LinkButton>
+          </HeaderTemplate>
+          <ItemTemplate>
+            <asp:LinkButton runat="server" ID="lbtSelect" CausesValidation="False" CommandName="Select"
+              ToolTip='<%# traduci("Select") %>' CssClass="btn btn-sm btn-info"><i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton>
+            <asp:LinkButton runat="server" ID="lbtEdit" CausesValidation="False" CommandName="Edit"
+              ToolTip='<%# traduci("Edit") %>' CssClass="btn btn-sm btn-primary"><i class="fa fa-pencil" aria-hidden="true"></i></asp:LinkButton> 
+          </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="Lingua" SortExpression="Lingua">
+          <EditItemTemplate>
+            <asp:Label ID="TextBox0" runat="server" Text='<%# Eval("Lingua") %>' />
+          </EditItemTemplate>
+          <ItemTemplate>
+            <asp:Label ID="Label1" runat="server" Text='<%# Eval("Lingua") %>' />
+          </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="Lemma" SortExpression="Lemma">
+          <EditItemTemplate>
+            <asp:Label ID="TextBox2" runat="server" Text='<%# Eval("Lemma") %>' />
+          </EditItemTemplate>
+          <ItemTemplate>
+            <asp:Label ID="Label3" runat="server" Text='<%# Eval("Lemma") %>' />
+          </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="Traduzione" SortExpression="Traduzione">
+          <EditItemTemplate>
+            <asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("Traduzione") %>' CssClass="form-control form-control-sm"
+              TextMode="MultiLine" Height="8em"></asp:TextBox>
+          </EditItemTemplate>
+          <ItemTemplate>
+            <asp:Label ID="Label2" runat="server" Text='<%# Eval("Traduzione") %>' />
+          </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField ShowHeader="False">
+          <EditItemTemplate>
+          </EditItemTemplate>
+          <ItemTemplate>
+            <asp:LinkButton runat="server" ID="lbtDelete" CausesValidation="False" CommandName="Delete"
+              ToolTip='<%# traduci("Delete") %>' OnClientClick='<%# SteamWare.jsUtils.getCBE("confermaDel") %>' CssClass="btn btn-sm btn-danger"><i class="fa fa-trash" aria-hidden="true"></i></asp:LinkButton>
+          </ItemTemplate>
+        </asp:TemplateField>
+      </Columns>
+    </asp:GridView>
+    <asp:Label ID="lblNumRec" runat="server" CssClass="didascalia" />
+    <asp:ObjectDataSource ID="ods" runat="server" SelectMethod="getVocabolario" TypeName="AppData.selDataVoc"
+      UpdateMethod="updateLemmaVoc" DeleteMethod="deleteLemmaVoc" OldValuesParameterFormatString="Original_{0}"
+      FilterExpression="Traduzione LIKE '%{0}%' OR Lemma LIKE '%{0}%' "
+      OnUpdated="ods_Updated">
+      <UpdateParameters>
+        <asp:Parameter Name="Traduzione" Type="String" />
+        <asp:Parameter Name="Original_Lingua" Type="String" />
+        <asp:Parameter Name="Original_Lemma" Type="String" />
+      </UpdateParameters>
+      <FilterParameters>
+        <asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="valoreCercato" />
+      </FilterParameters>
+      <DeleteParameters>
+        <asp:Parameter Name="Original_Lingua" Type="String" />
+        <asp:Parameter Name="Original_Lemma" Type="String" />
+      </DeleteParameters>
+    </asp:ObjectDataSource>
+  </div>
 </div>
diff --git a/NKC_WF/site/MachineUnload.aspx b/NKC_WF/site/MachineUnload.aspx
index 3daefd9..3f4aeed 100644
--- a/NKC_WF/site/MachineUnload.aspx
+++ b/NKC_WF/site/MachineUnload.aspx
@@ -14,7 +14,7 @@
     </ContentTemplate>
   </asp:UpdatePanel>--%>
   <div id="uplTavola">
-    <link href="api/getMUCss" rel="stylesheet" id="dynCss" />
+    <link href="../api/getMUCss" rel="stylesheet" id="dynCss" />
   </div>
   <script type="text/javascript">
     lastVal = 0;
diff --git a/NKC_WF/site/UpdateVoc.aspx.cs b/NKC_WF/site/UpdateVoc.aspx.cs
index d9b6c01..cc970af 100644
--- a/NKC_WF/site/UpdateVoc.aspx.cs
+++ b/NKC_WF/site/UpdateVoc.aspx.cs
@@ -12,7 +12,7 @@ namespace NKC_WF
       // reset dati in cache x DbConfig...
       memLayer.ML.resetAppConf();
       // torno a menu...
-      Response.Redirect(user_std.pagPrecedente);
+      Response.Redirect("default");
     }
   }
 }
\ No newline at end of file
diff --git a/NKC_WF/site/vocabolario.aspx b/NKC_WF/site/vocabolario.aspx
index 2db3627..8eca11e 100644
--- a/NKC_WF/site/vocabolario.aspx
+++ b/NKC_WF/site/vocabolario.aspx
@@ -14,12 +14,12 @@
   <div class="container-fluid" style="background-color: #cdcdcd; padding-top: 2px; padding-bottom: 2px;">
     <div class="container">
       <div class="row">
-        <div class="col-sm-2">
+        <div class="col-2">
         </div>
-        <div class="col-sm-8 text-center">
+        <div class="col-8 text-center">
           <uc4:mod_ricercaGenerica runat="server" ID="mod_ricercaGenerica" />
         </div>
-        <div class="col-sm-2 text-right">
+        <div class="col-2 text-right">
           <uc3:mod_righePag runat="server" ID="mod_righePag" />
         </div>
       </div>
@@ -28,10 +28,10 @@
   <div class="container-fluid" style="padding-top: 2px; padding-bottom: 2px;">
     <div class="container">
       <div class="row">
-        <div class="col-sm-8">
+        <div class="col-8">
           <uc2:mod_vocabolario runat="server" id="mod_vocabolario" />
         </div>
-        <div class="col-sm-4">
+        <div class="col-4 pt-4">
           <uc2:mod_lemmiVocab runat="server" id="mod_lemmiVocab" />
         </div>
       </div>
diff --git a/NKC_WF/site/vocabolario.aspx.cs b/NKC_WF/site/vocabolario.aspx.cs
index 08eb897..ee7059d 100644
--- a/NKC_WF/site/vocabolario.aspx.cs
+++ b/NKC_WF/site/vocabolario.aspx.cs
@@ -10,7 +10,7 @@ namespace NKC_WF
       base.OnInit(e);
       if (!Page.IsPostBack)
       {
-        mod_righePag.numRowPag = 25;
+        mod_righePag.numRowPag = 10;
         mod_vocabolario.pageSize = mod_righePag.numRowPag;
       }
       // imposto controlli eventi