diff --git a/Projects/WebGIM/GIM_data/bin/GIM_data.dll b/Projects/WebGIM/GIM_data/bin/GIM_data.dll
index 0659dc7..8e544d8 100644
Binary files a/Projects/WebGIM/GIM_data/bin/GIM_data.dll and b/Projects/WebGIM/GIM_data/bin/GIM_data.dll differ
diff --git a/Projects/WebGIM/GIM_data/bin/SteamWare.dll b/Projects/WebGIM/GIM_data/bin/SteamWare.dll
index c7181a1..473ed17 100644
Binary files a/Projects/WebGIM/GIM_data/bin/SteamWare.dll and b/Projects/WebGIM/GIM_data/bin/SteamWare.dll differ
diff --git a/Projects/WebGIM/GIM_site/AnagTags.aspx b/Projects/WebGIM/GIM_site/AnagTags.aspx
index e083445..9ee82a5 100644
--- a/Projects/WebGIM/GIM_site/AnagTags.aspx
+++ b/Projects/WebGIM/GIM_site/AnagTags.aspx
@@ -16,7 +16,7 @@
<%: traduci("AnagTagsLong") %>
-
diff --git a/Projects/WebGIM/GIM_site/FullPage.master b/Projects/WebGIM/GIM_site/FullPage.master
index a5e354b..2f6dddc 100644
--- a/Projects/WebGIM/GIM_site/FullPage.master
+++ b/Projects/WebGIM/GIM_site/FullPage.master
@@ -48,15 +48,15 @@
<%--Site Scripts--%>
- <%--
- --%>
-
- <%--
- --%>
+
+
+
+
+
diff --git a/Projects/WebGIM/GIM_site/FullPage.master.cs b/Projects/WebGIM/GIM_site/FullPage.master.cs
index 82347ee..af448ff 100644
--- a/Projects/WebGIM/GIM_site/FullPage.master.cs
+++ b/Projects/WebGIM/GIM_site/FullPage.master.cs
@@ -70,6 +70,7 @@ namespace GIM_site
set
{
mod_testata.searchVal = value;
+ uppNavbar.Update();
}
}
diff --git a/Projects/WebGIM/GIM_site/FullPage.master.designer.cs b/Projects/WebGIM/GIM_site/FullPage.master.designer.cs
index f0927ce..b0244cb 100644
--- a/Projects/WebGIM/GIM_site/FullPage.master.designer.cs
+++ b/Projects/WebGIM/GIM_site/FullPage.master.designer.cs
@@ -66,6 +66,15 @@ namespace GIM_site {
///
protected global::System.Web.UI.ScriptManager ScriptManager1;
+ ///
+ /// uppNavbar control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.UpdatePanel uppNavbar;
+
///
/// mod_testata control.
///
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx.cs
index e11eb90..936ba61 100644
--- a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx.cs
+++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx.cs
@@ -16,6 +16,12 @@ namespace GIM_site.WebUserControls
if (!Page.IsPostBack)
{
divDetail.Visible = false;
+ // se c'è in URL ricerca lo acquisisco...
+ if (memLayer.ML.QSS("searchVal") != "")
+ {
+ ods.DataBind();
+ grView.DataBind();
+ }
}
}
protected override void OnInit(EventArgs e)
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Item.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Item.ascx
index 08576fc..8f4325d 100644
--- a/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Item.ascx
+++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Item.ascx
@@ -103,10 +103,10 @@
--%>
<%----%>
-
-
+
+ <%--
<%# traduci("FamigliaDescrizione") %>
-
+ --%>
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_testata.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_testata.ascx.cs
index f391bc2..13c670b 100644
--- a/Projects/WebGIM/GIM_site/WebUserControls/mod_testata.ascx.cs
+++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_testata.ascx.cs
@@ -220,8 +220,8 @@ namespace GIM_site.WebUserControls
}
set
{
- txtSearch.Text = value;
memLayer.ML.setSessionVal("valoreCercato", value);
+ txtSearch.Text = value;
}
}
diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll
index 0659dc7..8e544d8 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 b896ba0..28bd0e2 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 c7181a1..473ed17 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/bin/VersGen.dll b/Projects/WebGIM/GIM_site/bin/VersGen.dll
index 0e35967..c4e9b87 100644
Binary files a/Projects/WebGIM/GIM_site/bin/VersGen.dll and b/Projects/WebGIM/GIM_site/bin/VersGen.dll differ
diff --git a/Projects/WebGIM/VersGen/WebGIM.cs b/Projects/WebGIM/VersGen/WebGIM.cs
index f27ce00..08fda69 100644
--- a/Projects/WebGIM/VersGen/WebGIM.cs
+++ b/Projects/WebGIM/VersGen/WebGIM.cs
@@ -5,7 +5,7 @@
using System.Reflection;
-[assembly: AssemblyVersion("1.6.285.518")]
-[assembly: AssemblyFileVersion("1.6.285.518")]
+[assembly: AssemblyVersion("1.6.288.518")]
+[assembly: AssemblyFileVersion("1.6.288.518")]
[assembly: AssemblyCopyright("Steamware © 2006-2015")]
[assembly: AssemblyCompany("Steamware")]
diff --git a/Projects/WebGIM/VersGen/WebGIM.tt b/Projects/WebGIM/VersGen/WebGIM.tt
index 43de7ae..44828f2 100644
--- a/Projects/WebGIM/VersGen/WebGIM.tt
+++ b/Projects/WebGIM/VersGen/WebGIM.tt
@@ -6,8 +6,8 @@
using System.Reflection;
-[assembly: AssemblyVersion("1.6.285.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("1.6.285.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("1.6.288.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("1.6.288.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2006-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+
diff --git a/Projects/WebGIM/VersGen/bin/Debug/VersGen.dll b/Projects/WebGIM/VersGen/bin/Debug/VersGen.dll
index a5ef99d..c4e9b87 100644
Binary files a/Projects/WebGIM/VersGen/bin/Debug/VersGen.dll and b/Projects/WebGIM/VersGen/bin/Debug/VersGen.dll differ
diff --git a/Projects/WebGIM/VersGen/bin/Release/VersGen.dll b/Projects/WebGIM/VersGen/bin/Release/VersGen.dll
index 0e35967..f77441c 100644
Binary files a/Projects/WebGIM/VersGen/bin/Release/VersGen.dll and b/Projects/WebGIM/VersGen/bin/Release/VersGen.dll differ