update vers 234 x WebGIM USA

Projects/WebGIM/GIM_site/Web.config

@@ -104,7 +104,7 @@
     <add key="welcomeApp" value="GIM_welcomeApp" />
     <add key="appName" value="GIM" />
     <add key="mainRev" value="1.3" />
-    <add key="minRev" value="233" />
+    <add key="minRev" value="234" />
     <add key="copyRight" value="SteamWare © 2006" />
     <add key="defaultApp" value="GIM_Appl" />
     <add key="defaultTitle" value="GIM_ShortWelcome" />
@@ -115,6 +115,7 @@
     <add key="exportFormat3" value="./ExportPdf.aspx?tipo={0}&amp;inizio={1}&amp;fine={2}&amp;username={3}" />
     <add key="_smtpCli" value="localhost" />
     <add key="echoLemmi" value="false" />
+    <add key="allowDelete" value="false" />
     <!--stringhe connessione-->
     <add key="PermessiConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=GIM_USA;Persist Security Info=True;User id=sa;Password=keyhammer" />
     <add key="UtenteCdcConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Somas_Anagrafica;Persist Security Info=True;User id=sa;Password=keyhammer" />

Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx

@@ -32,7 +32,7 @@
             <div style="float: right;">
             </div>
             <div style="float: right;">
-                <asp:Label runat="server" ID="lblTxtCerca" Text="Ricerca"></asp:Label>
+                <asp:Label runat="server" ID="lblTxtCerca" ></asp:Label>
                 <asp:TextBox runat="server" ID="txtCercaMacchine" Width="8em" Text="*" OnTextChanged="txtCercaMacchine_TextChanged" />
             </div>
             <div>

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

@@ -26,6 +26,7 @@ public partial class mod_dettMtzProg : System.Web.UI.UserControl
 
     private void traduciObj()
     {
+        lblTxtCerca.Text = traduci("lblTxtCerca");
         lblInsNewIntPro.Text = traduci("lblInsNewIntPro");
         lblDescrMtzPro.Text = traduci("lblDescrMtzPro");
         lblInizioMtzPro.Text = traduci("lblInizioMtzPro");

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

@@ -121,9 +121,13 @@ public partial class mod_elFamMacch : ApplicationUserControl
         if (answ)
         {
             answ = false;
-            if (TA_app.obj.taMacc2Fam.getByFam(Convert.ToInt32(idx)).Rows.Count == 0)
+            // controllo SOLO se è permessa cancellazione globale...
+            if (memLayer.ML.confReadBool("allowDelete"))
             {
-                answ = true;
+                if (TA_app.obj.taMacc2Fam.getByFam(Convert.ToInt32(idx)).Rows.Count == 0)
+                {
+                    answ = true;
+                }
             }
         }
         return answ;

Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx

@@ -8,13 +8,13 @@
 <div style="text-align: right;">
     <asp:HyperLink ID="hlExportExcel" runat="server" Target="_blank" />
 </div>
-<div class="txtMini" style="width: 100%; padding: 2px 4px 2px 4px; background-color: #CDCDCD;
+<div class="txtMini" style="width: 100%; padding: 2px 4px 2px 4px; background-color: #BCDD89;
     margin-right: 10px;">
     <asp:Button ID="btnShowNew" runat="server" OnClick="btnShowNew_Click" />
     <asp:Button ID="btnMassEdit" runat="server" OnClick="btnMassEdit_Click" />
     <asp:UpdatePanel ID="UpdatePanel1" runat="server" UpdateMode="Conditional" RenderMode="Inline">
         <ContentTemplate>
-            <asp:Panel runat="server" ID="pnlMassEdit" Visible="false" BackColor="#CDCDCD" Height="125px">
+            <asp:Panel runat="server" ID="pnlMassEdit" Visible="false" BackColor="#BCDD89" Height="125px">
                 <div class="divSx" style="margin-right: 10px; width: 360px;">
                     <div class="divSx">
                         <div class="divSx" style="width: 180px;">