Egalware/WebGIM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inserita gestione footer x glimpse da ENVIRONMENT

Browse Source
This commit is contained in:
Samuele E. Locatelli
2017-04-14 18:10:44 +02:00
parent 9de631d8ab
commit 5c3dd452db
15 changed files with 173 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/WebGIM.sqlite
BIN
View File
Binary file not shown.
GIM_site/Bootstrap.Master
+1 -1
View File
@@ -78,7 +78,7 @@
<asp:Timer ID="Timer1" runat="server" Interval="10000" OnTick="Timer1_Tick">
</asp:Timer>
<footer>
<div class="navbar navbar-inverse navbar-fixed-bottom" role="navigation" style="min-height: 24px;">
<div class="navbar navbar-inverse <%: fixFooter %>" role="navigation" style="min-height: 24px;">
<div class="container-fluid">
<p class="navbar-text navbar-left" style="margin-bottom: 0px; margin-top: 0px; margin-left: 0px;">
<asp:Label runat="server" ID="lblDateTime">
GIM_site/Bootstrap.Master.cs
+15 -1
View File
@@ -33,6 +33,20 @@ namespace GIM_site
lblDateTime.Text = DateTime.Now.ToString();
lblUtente.Text = user_std.UtSn.CognomeNome;
}
/// <summary>
/// Sistemaizone footer: se in DEV NON mette sticky in basso (x mostrare glimpse)
/// </summary>
public string fixFooter
{
get
{
string answ = "";
if (memLayer.ML.CRS("Environment") != "Dev")
{
answ = "navbar-fixed-bottom";
}
return answ;
}
}
}
}
GIM_site/Bootstrap.Master.designer.cs
Generated
+59 -60
View File
@@ -1,168 +1,167 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace GIM_site
{
namespace GIM_site {
public partial class Bootstrap {
/// <summary>
/// PlaceHolder1 control.
/// Controllo PlaceHolder1.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.PlaceHolder PlaceHolder1;
/// <summary>
/// BundleReference1 control.
/// Controllo BundleReference1.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// BundleReference2 control.
/// Controllo BundleReference2.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// HeadContent control.
/// Controllo HeadContent.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.ContentPlaceHolder HeadContent;
/// <summary>
/// form1 control.
/// Controllo form1.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.HtmlForm form1;
/// <summary>
/// ScriptManager1 control.
/// Controllo ScriptManager1.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.ScriptManager ScriptManager1;
/// <summary>
/// uppFeatured control.
/// Controllo uppFeatured.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.UpdatePanel uppFeatured;
/// <summary>
/// FeaturedContent control.
/// Controllo FeaturedContent.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.ContentPlaceHolder FeaturedContent;
/// <summary>
/// uppContainer control.
/// Controllo uppContainer.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.UpdatePanel uppContainer;
/// <summary>
/// MCon control.
/// Controllo MCon.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.ContentPlaceHolder MCon;
/// <summary>
/// uppFooter control.
/// Controllo uppFooter.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.UpdatePanel uppFooter;
/// <summary>
/// Timer1 control.
/// Controllo Timer1.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.Timer Timer1;
/// <summary>
/// lblDateTime control.
/// Controllo lblDateTime.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.Label lblDateTime;
/// <summary>
/// lblUtente control.
/// Controllo lblUtente.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.Label lblUtente;
/// <summary>
/// lblVers control.
/// Controllo lblVers.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.Label lblVers;
/// <summary>
/// logoSW control.
/// Controllo logoSW.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.Image logoSW;
/// <summary>
/// PlaceHolder2 control.
/// Controllo PlaceHolder2.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.PlaceHolder PlaceHolder2;
}
GIM_site/FullPage.master
+1 -1
View File
@@ -80,7 +80,7 @@
<asp:Timer ID="Timer1" runat="server" Interval="10000" OnTick="Timer1_Tick">
</asp:Timer>
<footer>
<div class="navbar navbar-inverse navbar-fixed-bottom" role="navigation" style="min-height: 24px;">
<div class="navbar navbar-inverse <%: fixFooter %>" role="navigation" style="min-height: 24px;">
<div class="container-fluid">
<p class="navbar-text navbar-left" style="margin-bottom: 0px; margin-top: 0px; margin-left: 0px;">
<asp:Label runat="server" ID="lblDateTime">
GIM_site/FullPage.master.cs
+15 -1
View File
@@ -69,6 +69,20 @@ namespace GIM_site
uppNavbar.Update();
}
}
/// <summary>
/// Sistemaizone footer: se in DEV NON mette sticky in basso (x mostrare glimpse)
/// </summary>
public string fixFooter
{
get
{
string answ = "";
if (memLayer.ML.CRS("Environment") != "Dev")
{
answ = "navbar-fixed-bottom";
}
return answ;
}
}
}
}
GIM_site/FullPage.master.designer.cs
Generated
+71 -72
View File
@@ -1,204 +1,203 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace GIM_site
{
namespace GIM_site {
public partial class FullPage {
/// <summary>
/// PlaceHolder1 control.
/// Controllo PlaceHolder1.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.PlaceHolder PlaceHolder1;
/// <summary>
/// BundleReference1 control.
/// Controllo BundleReference1.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// BundleReference2 control.
/// Controllo BundleReference2.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// HeadContent control.
/// Controllo HeadContent.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.ContentPlaceHolder HeadContent;
/// <summary>
/// form1 control.
/// Controllo form1.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.HtmlForm form1;
/// <summary>
/// ScriptManager1 control.
/// Controllo ScriptManager1.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.ScriptManager ScriptManager1;
/// <summary>
/// uppNavbar control.
/// Controllo uppNavbar.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.UpdatePanel uppNavbar;
/// <summary>
/// mod_testata control.
/// Controllo mod_testata.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::GIM_site.WebUserControls.mod_testata mod_testata;
/// <summary>
/// uppFeatured control.
/// Controllo uppFeatured.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.UpdatePanel uppFeatured;
/// <summary>
/// FeaturedContent control.
/// Controllo FeaturedContent.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.ContentPlaceHolder FeaturedContent;
/// <summary>
/// divMain control.
/// Controllo divMain.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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 divMain;
/// <summary>
/// uppContainer control.
/// Controllo uppContainer.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.UpdatePanel uppContainer;
/// <summary>
/// MCon control.
/// Controllo MCon.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.ContentPlaceHolder MCon;
/// <summary>
/// MConAlt control.
/// Controllo MConAlt.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.ContentPlaceHolder MConAlt;
/// <summary>
/// uppFooter control.
/// Controllo uppFooter.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.UpdatePanel uppFooter;
/// <summary>
/// Timer1 control.
/// Controllo Timer1.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.Timer Timer1;
/// <summary>
/// lblDateTime control.
/// Controllo lblDateTime.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.Label lblDateTime;
/// <summary>
/// lblUtente control.
/// Controllo lblUtente.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.Label lblUtente;
/// <summary>
/// lblVers control.
/// Controllo lblVers.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.Label lblVers;
/// <summary>
/// logoSW control.
/// Controllo logoSW.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.Image logoSW;
/// <summary>
/// PlaceHolder2 control.
/// Controllo PlaceHolder2.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.PlaceHolder PlaceHolder2;
}
GIM_site/Web.Alumat.config
+1
View File
@@ -2,6 +2,7 @@
<!-- For more information on using web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<appSettings>
<add key="Environment" value="Alumat - PROD" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="enModMag" value="false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="dominio" value="WINLAB" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="_logLevel" value="6" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
GIM_site/Web.AlumatTest.config
+1
View File
@@ -2,6 +2,7 @@
<!-- For more information on using web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<appSettings>
<add key="Environment" value="Alumat - TEST" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="enModMag" value="false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="dominio" value="WINLAB" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="_logLevel" value="6" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
GIM_site/Web.IIS01.config
+1 -1
View File
@@ -4,7 +4,7 @@
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<appSettings>
<add key="Environment" value="SteamWare - IIS01" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="PermessiConnectionString" value="Data Source=Win2012-SQL;Initial Catalog=Somaschini_GIM_ITA_prod;Persist Security Info=True;User id=sa;Password=keyhammer;" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="UtenteCdcConnectionString" value="Data Source=Win2012-SQL;Initial Catalog=Somaschini_GIM_ITA_prod;Persist Security Info=True;User id=sa;Password=keyhammer;" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="VocabolarioConnectionString" value="Data Source=Win2012-SQL;Initial Catalog=Somaschini_GIM_ITA_prod;Persist Security Info=True;User id=sa;Password=keyhammer;" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
GIM_site/Web.IIS02.config
+3
View File
@@ -3,6 +3,9 @@
<!-- For more information on using web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<appSettings>
<add key="Environment" value="SteamWare - IIS02" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
</appSettings>
<!--
In the example below, the "SetAttributes" transform will change the value of
"connectionString" to use "ReleaseSQLServer" only when the "Match" locator
GIM_site/Web.OVH.config
+1
View File
@@ -15,6 +15,7 @@
</connectionStrings>
-->
<appSettings>
<add key="Environment" value="DEMO" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="enModMag" value="true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="showExcelExpRep" value="true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="remoteExcelMode" value="true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
GIM_site/Web.Somaschini.config
+1
View File
@@ -4,6 +4,7 @@
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<appSettings>
<add key="Environment" value="Somaschini" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="enModMag" value="true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="dominio" value="SOMASCHINI" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="_logLevel" value="5" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
GIM_site/Web.config
+3
View File
@@ -89,6 +89,9 @@
</scripting>
</system.web.extensions>-->
<appSettings>
<!--Ambiente applicativo (Dev = mostra glimpse)-->
<add key="Environment" value="Dev" />
<!--Conf base-->
<add key="CodModulo" value="GIM" />
<add key="dominio" value="STEAMWAREWIN" />
<add key="intUpdatePagina_ms" value="120000" />
GIM_site/bin/SteamWare.dll
BIN
View File
Binary file not shown.