|
- |
-
-  %>.png)
-
-
- |
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll
index fdc8330..681106a 100644
Binary files a/Projects/WebGIM/GIM_site/bin/GIM_data.dll and b/Projects/WebGIM/GIM_site/bin/GIM_data.dll differ
diff --git a/Projects/WebGIM/GIM_site/bin/GIM_site.dll b/Projects/WebGIM/GIM_site/bin/GIM_site.dll
index eb15a4f..b09ffab 100644
Binary files a/Projects/WebGIM/GIM_site/bin/GIM_site.dll and b/Projects/WebGIM/GIM_site/bin/GIM_site.dll differ
diff --git a/Projects/WebGIM/GIM_site/bin/SteamWare.dll b/Projects/WebGIM/GIM_site/bin/SteamWare.dll
index 3f142cb..449ed93 100644
Binary files a/Projects/WebGIM/GIM_site/bin/SteamWare.dll and b/Projects/WebGIM/GIM_site/bin/SteamWare.dll differ
diff --git a/Projects/WebGIM/GIM_site/elencoRichieste.aspx b/Projects/WebGIM/GIM_site/elencoRichieste.aspx
index 7b1d5de..67571ee 100644
--- a/Projects/WebGIM/GIM_site/elencoRichieste.aspx
+++ b/Projects/WebGIM/GIM_site/elencoRichieste.aspx
@@ -10,7 +10,7 @@
-
+
diff --git a/Projects/WebGIM/GIM_site/gestAnagrTbl.aspx b/Projects/WebGIM/GIM_site/gestAnagrTbl.aspx
deleted file mode 100644
index 40b37f1..0000000
--- a/Projects/WebGIM/GIM_site/gestAnagrTbl.aspx
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ Page Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" Inherits="gestAnagrTbl" Title="Untitled Page" Codebehind="gestAnagrTbl.aspx.cs" %>
-
-
-
diff --git a/Projects/WebGIM/GIM_site/gestAnagrTbl.aspx.cs b/Projects/WebGIM/GIM_site/gestAnagrTbl.aspx.cs
deleted file mode 100644
index b27923e..0000000
--- a/Projects/WebGIM/GIM_site/gestAnagrTbl.aspx.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-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;
-
-public partial class gestAnagrTbl : System.Web.UI.Page
-{
- protected void Page_Load(object sender, EventArgs e)
- {
-
- }
-}
diff --git a/Projects/WebGIM/GIM_site/gestAnagrTbl.aspx.designer.cs b/Projects/WebGIM/GIM_site/gestAnagrTbl.aspx.designer.cs
deleted file mode 100644
index ce0a9a1..0000000
--- a/Projects/WebGIM/GIM_site/gestAnagrTbl.aspx.designer.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// 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.
-//
-//------------------------------------------------------------------------------
-
-
-
-public partial class gestAnagrTbl {
-}
diff --git a/Projects/WebGIM/GIM_site/sql/GIM_1.5_to_1.6.sql b/Projects/WebGIM/GIM_site/sql/GIM_1.5_to_1.6.sql
index 6496425..77f81da 100644
--- a/Projects/WebGIM/GIM_site/sql/GIM_1.5_to_1.6.sql
+++ b/Projects/WebGIM/GIM_site/sql/GIM_1.5_to_1.6.sql
@@ -11,10 +11,11 @@ INSERT INTO FUNZIONE(COD_FUNZIONE, DESCRIZIONE) VALUES ('GIM_MR', 'GIM - Magazzi
INSERT INTO DIRITTI(USER_NAME,COD_CDC,COD_MODULO,COD_FUNZIONE,VALUE) VALUES ('Administrator', 'X999', 'GIM', 'GIM_MR', -1)
-- Permessi
-INSERT INTO Permessi (COD_PERMESSO,URL,GRUPPO,NUMERO,NOME,DESCRIZIONE) VALUES ('ANAG_Locazioni', 'anagLocazioni.aspx', 1, 16, 'ANAG_Locazioni', 'ANAG_LocazioniLong')
-INSERT INTO Permessi (COD_PERMESSO,URL,GRUPPO,NUMERO,NOME,DESCRIZIONE) VALUES ('ADV_MTZ_MagRic', 'magRic.aspx', 3, 4, 'ADV_MTZ_MagRic', 'ADV_MTZ_MagRicLong')
-INSERT INTO Permessi (COD_PERMESSO,URL,GRUPPO,NUMERO,NOME,DESCRIZIONE) VALUES ('ANAG_Tags', 'anagTags.aspx', 1, 17, 'anagTags', 'anagTagsLong')
-INSERT INTO Permessi (COD_PERMESSO,URL,GRUPPO,NUMERO,NOME,DESCRIZIONE) VALUES ('Menu', 'menu.aspx', 0, 1, 'menu', 'menuIcon')
+INSERT INTO Permessi (COD_PERMESSO,URL,GRUPPO,NUMERO,NOME,DESCRIZIONE) VALUES ('ANAG_Locazioni', 'anagLocazioni', 1, 16, 'ANAG_Locazioni', 'ANAG_LocazioniLong')
+INSERT INTO Permessi (COD_PERMESSO,URL,GRUPPO,NUMERO,NOME,DESCRIZIONE) VALUES ('ADV_MTZ_MagRic', 'magRic', 3, 4, 'ADV_MTZ_MagRic', 'ADV_MTZ_MagRicLong')
+INSERT INTO Permessi (COD_PERMESSO,URL,GRUPPO,NUMERO,NOME,DESCRIZIONE) VALUES ('ANAG_Tags', 'anagTags', 1, 17, 'anagTags', 'anagTagsLong')
+INSERT INTO Permessi (COD_PERMESSO,URL,GRUPPO,NUMERO,NOME,DESCRIZIONE) VALUES ('Menu', 'menu', 0, 1, 'menu', 'menuIcon')
+INSERT INTO Permessi (COD_PERMESSO,URL,GRUPPO,NUMERO,NOME,DESCRIZIONE) VALUES ('chLang', 'chLang', 999, 3, 'chLang', 'chLangIcon')
-- Permessi2Funzione
INSERT INTO Permessi2Funzione (COD_PERMESSO,COD_FUNZIONE,[READWRITE]) VALUES ('ANAG_Locazioni', 'GIM_MR', 'S')
@@ -23,6 +24,7 @@ INSERT INTO Permessi2Funzione (COD_PERMESSO,COD_FUNZIONE,[READWRITE]) VALUES ('M
INSERT INTO Permessi2Funzione (COD_PERMESSO,COD_FUNZIONE,[READWRITE]) VALUES ('Menu', 'GIM_SU', 'N')
INSERT INTO Permessi2Funzione (COD_PERMESSO,COD_FUNZIONE,[READWRITE]) VALUES ('Menu', 'GIM_MR', 'N')
INSERT INTO Permessi2Funzione (COD_PERMESSO,COD_FUNZIONE,[READWRITE]) VALUES ('Menu', 'GIM_AppAdmin', 'N')
+INSERT INTO Permessi2Funzione (COD_PERMESSO,COD_FUNZIONE,[READWRITE]) VALUES ('chLang', 'GIM_AppAdmin', 'N')
-- FIX FriendlyURLS + icone FontAwesome nuova grafica
UPDATE permessi SET URL = REPLACE(URL, '.aspx', '')
@@ -105,7 +107,6 @@ exec voc.stp_insNewLemma'AnagTipoRisorsaIcon', 'fa fa-leaf'
exec voc.stp_insNewLemma'EditRicManIcon', 'fa fa-pencil'
exec voc.stp_insNewLemma'reportInterattivoIcon', 'fa fa-star'
exec voc.stp_insNewLemma 'GestOperMtzIcon', 'fa fa-user'
-
UPDATE vocabolario SET traduzione = 'Anagrafiche' WHERE lemma = 'AnagraficheBase' AND Lingua = 'IT'
UPDATE vocabolario SET traduzione = 'Interventions' WHERE lemma = 'RicManArea' AND Lingua = 'IT'
UPDATE vocabolario SET traduzione = 'Interventi' WHERE lemma = 'RicManArea' AND Lingua = 'EN'
@@ -128,4 +129,6 @@ UPDATE vocabolario SET traduzione = 'Machine List Management' WHERE lemma = 'Mac
exec voc.stp_insNewLemma 'DettInterventoLong', 'Dettaglio Intervento'
UPDATE vocabolario SET traduzione = 'Event Detail' WHERE lemma = 'DettInterventoLong' AND Lingua = 'EN'
exec voc.stp_insNewLemma 'adminDB', 'DB Admin'
+exec voc.stp_insNewLemma 'chLang', 'Language'
+exec voc.stp_insNewLemma 'chLangIcon', 'fa fa-globe'
diff --git a/Projects/WebGIM/GIM_site/forceUser.aspx b/Projects/WebGIM/GIM_site/forceUser.aspx
index 7ce2196..41c73dc 100644
--- a/Projects/WebGIM/GIM_site/forceUser.aspx
+++ b/Projects/WebGIM/GIM_site/forceUser.aspx
@@ -1,5 +1,5 @@
<%@ Page Language="C#" MasterPageFile="~/Bootstrap.master" AutoEventWireup="true"
- Inherits="forceUser" Title="Untitled Page" Codebehind="forceUser.aspx.cs" %>
+ Inherits="forceUser" Title="Untitled Page" CodeBehind="forceUser.aspx.cs" %>
<%@ Register Src="~/WebUserControls/mod_login.ascx" TagName="mod_login" TagPrefix="uc1" %>
@@ -19,9 +19,9 @@
-
-
+
+