Fix bootstrap5
This commit is contained in:
Samuele Locatelli
2024-02-29 15:57:33 +01:00
parent f35d3c8815
commit c3bc2d1cea
12 changed files with 115 additions and 114 deletions
+1 -1
View File
@@ -10,7 +10,7 @@
<Use64BitIISExpress />
<IISExpressSSLPort />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Controller</Controller_SelectedScaffolderCategoryPath>
<WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>
+1 -1
View File
@@ -169,7 +169,7 @@
<asp:HiddenField runat="server" ID="hfIdxDip" />
<asp:HiddenField runat="server" ID="hfData" />
<div class="row">
<div class="col-6 text-right">
<div class="col-6 text-end">
Periodo
</div>
<div class="col-6">
@@ -4,10 +4,10 @@
<div class="col-12">
<h2>Temperatura</h2>
</div>
<div class="col-12 text-right">
<div class="col-12 text-end">
<asp:Label runat="server" ID="lblData"><%: string.Format("{0:yyyy-MM-dd, dddd}", dtRif) %></asp:Label>
</div>
<div class="col-12 text-right py-2">
<div class="col-12 text-end py-2">
<asp:TextBox runat="server" ID="txtTempRil" TextMode="Number" step="0.1" min="30" max="50" class="form-control" />
</div>
<div class="col-6">
@@ -50,7 +50,7 @@
</div>
</div>
<div class="row">
<div class="col-6 text-left small">
<div class="col-6 text-start small">
<asp:DropDownList runat="server" ID="ddlModoTag" AutoPostBack="true" OnSelectedIndexChanged="ddlModoTag_SelectedIndexChanged">
<asp:ListItem Selected="True">elenco</asp:ListItem>
<asp:ListItem>elencoCPF</asp:ListItem>
@@ -58,7 +58,7 @@
<asp:ListItem>standard</asp:ListItem>
</asp:DropDownList>
</div>
<div class="col-6 text-right small">
<div class="col-6 text-end small">
<asp:DropDownList runat="server" ID="ddlPageSize" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<asp:ListItem>5</asp:ListItem>
<asp:ListItem Selected="True">10</asp:ListItem>
@@ -47,7 +47,7 @@
<ItemTemplate>
<asp:LinkButton ID="lnkEdit" runat="server" CausesValidation="False" CommandName="Edit" ToolTip='<%# traduci("Edit") %>' CssClass="noLink" Enabled='<%# enableFull %>'>
<div class="row mx-0">
<div class="col-9 text-left">
<div class="col-9 text-start">
<div class="text-dark">
<b><%# Eval("RagSociale") %></b> | <span style="fon=0.8em;"><%# Eval("nomeProj") %></span>
</div>
@@ -55,8 +55,8 @@
<%# Eval("nomeFase") %>
</div>
</div>
<div class="col-3 text-right text-nowrap px-1 py-0">
<div class="col-12 border border-dark badge badge-pill badge-light">
<div class="col-3 text-end text-nowrap px-1 py-0">
<div class="col-12 border border-dark badge rounded-pill text-bg-light">
<%# Eval("inizio","{0:HH:mm}") %> - <%# Eval("fine","{0:HH:mm}") %>
</div>
<div class="col-12 text-dark px-1 py-0">
@@ -75,9 +75,9 @@
</ItemTemplate>
<EditItemTemplate>
<div class="row text-light">
<div class="col-12 text-left">
<div class="col-12 text-start">
</div>
<div class="col-8 text-left">
<div class="col-8 text-start">
<div>
<label for="ddlProgetto" style="font-size: x-small;">
@@ -94,7 +94,7 @@
</asp:DropDownList>
</div>
</div>
<div class="col-4 text-right">
<div class="col-4 text-end">
<label for="txtSearchFase" style="font-size: x-small;">
<-- Search</label>
<br />
@@ -105,10 +105,10 @@
<div class="col-12">
Periodo
</div>
<div class="col-6 text-left">
<div class="col-6 text-start">
<uc1:mod_dateTime ID="dtInizio" runat="server" valoreDateTime='<%# Bind("inizio") %>' labelData="Inizio" labelOra="Ora" />
</div>
<div class="col-6 text-right">
<div class="col-6 text-end">
<uc1:mod_dateTime ID="dtFine" runat="server" valoreDateTime='<%# Bind("fine") %>' labelData="Fine" labelOra="Ora" />
</div>
</div>
@@ -132,7 +132,7 @@
</EditItemTemplate>
<FooterTemplate>
<div class="row text-light">
<div class="col-8 text-left">
<div class="col-8 text-start">
<div>
<label for="ddlProgetto" style="font-size: x-small;">
Progetto
@@ -150,7 +150,7 @@
</asp:DropDownList>
</div>
</div>
<div class="col-4 text-right">
<div class="col-4 text-end">
<label for="txtSearchFase" style="font-size: x-small;">
<-- Search</label>
<br />
@@ -161,10 +161,10 @@
<div class="col-12">
Periodo
</div>
<div class="col-6 text-left">
<div class="col-6 text-start">
<uc1:mod_dateTime ID="dtInizio" runat="server" valoreDateTime='<%# Bind("inizio") %>' labelData="Inizio" labelOra="Ora" />
</div>
<div class="col-6 text-right">
<div class="col-6 text-end">
<uc1:mod_dateTime ID="dtFine" runat="server" valoreDateTime='<%# Bind("fine") %>' labelData="Fine" labelOra="Ora" />
</div>
</div>
@@ -106,8 +106,8 @@
</EmptyDataTemplate>
<Columns>
<asp:BoundField DataField="Data" HeaderText="Data" ReadOnly="True" SortExpression="Data" DataFormatString="{0:dd/MM/yy, ddd}"
ItemStyle-CssClass="text-nowrap text-left"></asp:BoundField>
<asp:TemplateField ItemStyle-CssClass="text-nowrap text-right" HeaderStyle-CssClass="text-nowrap text-right">
ItemStyle-CssClass="text-nowrap text-start"></asp:BoundField>
<asp:TemplateField ItemStyle-CssClass="text-nowrap text-end" HeaderStyle-CssClass="text-nowrap text-end">
<HeaderTemplate>
<asp:Label ID="lblHead_h_lav" runat="server" CssClass="font-weight-bold" Text="Ore lavorate" />
</HeaderTemplate>
@@ -159,7 +159,7 @@
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField ItemStyle-CssClass="text-nowrap text-right" HeaderStyle-CssClass="text-nowrap text-right">
<asp:TemplateField ItemStyle-CssClass="text-nowrap text-end" HeaderStyle-CssClass="text-nowrap text-end">
<HeaderTemplate>
<b>
<asp:Label ID="lblHead_h_com" runat="server" Text="Ore caricate" /></b>
@@ -172,13 +172,13 @@
</asp:TemplateField>
<asp:TemplateField SortExpression="progetti">
<HeaderTemplate>
<div class="text-right">
<div class="text-end">
<b>
<asp:Label ID="lblHead_progetti" runat="server" Text="Progetti" /></b>
</div>
</HeaderTemplate>
<ItemTemplate>
<div class="text-right textCondens">
<div class="text-end textCondens">
<asp:Label ID="Label1" runat="server" Text='<%# Eval("progetti") %>' CssClass='<%# cssClassProgetti %>' Style="max-width: 20em;" ToolTip='<%# Eval("progetti") %>' />
</div>
</ItemTemplate>
@@ -1,27 +1,27 @@
<%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_menuBottom" CodeBehind="mod_menuBottom.ascx.cs" %>
<% if (false)
{ %>
{ %>
<link href="~/css/Style.css" rel="stylesheet" type="text/css" />
<% } %>
<nav class="navbar fixed-bottom navbar-dark bg-dark text-light small">
<asp:Panel runat="server" ID="pnlCheck">
<div style="padding: 4px; margin: 2px; height: 1.2em;">
<div class="divSx">
<asp:Label ID="lblDateTime" runat="server" Text="..." />
&nbsp;|&nbsp;
<nav class="navbar fixed-bottom navbar-dark bg-dark text-light small py-0">
<asp:Panel runat="server" ID="pnlCheck">
<div class="d-flex justify-content-between" style="height: 1.2em;">
<div class="px-1">
<asp:Label ID="lblDateTime" runat="server" Text="..." />
&nbsp;|&nbsp;
<asp:Label ID="lblInfo" runat="server" Text="-" />
</div>
<div class="divDx">
<asp:HyperLink runat="server" ID="hlInfo" NavigateUrl="~/infoPage">
<asp:Label runat="server" ID="lblApp" Text="." /><asp:Label ID="lblrev" runat="server"> - </asp:Label>
<asp:Label runat="server" ID="lblCopyRight" Text="..." />
&copy; 2006-<%: DateTime.Now.Year %>
</asp:HyperLink>
</div>
<div>
<asp:Label runat="server" ID="lblWarning" CssClass="topMenuMess" Visible="false" />
</div>
</div>
</asp:Panel>
</div>
<div class="px-1">
<asp:Label runat="server" ID="lblWarning" CssClass="topMenuMess" Visible="false" />
</div>
<div class="px-1">
<asp:HyperLink runat="server" ID="hlInfo" NavigateUrl="~/infoPage">
<asp:Label runat="server" ID="lblApp" Text="." /><asp:Label ID="lblrev" runat="server"> - </asp:Label>
<asp:Label runat="server" ID="lblCopyRight" Text="..." />
&copy; 2006-<%: DateTime.Now.Year %>
</asp:HyperLink>
</div>
</div>
</asp:Panel>
</nav>
@@ -28,11 +28,11 @@ public partial class mod_menuBottom : System.Web.UI.UserControl
{ }
if (licenzeGPW.checkLicenze)
{
pnlCheck.CssClass = "btnVerdeGrad ui-corner-all shadowBox";
pnlCheck.CssClass = "btnVerdeGrad ui-corner-all shadowBox w-100";
}
else
{
pnlCheck.CssClass = "btnRossoGrad ui-corner-all shadowBox";
pnlCheck.CssClass = "btnRossoGrad ui-corner-all shadowBox w-100";
lblWarning.Text = "Attenzione: numero licenze superato! MR attiva.";
lblWarning.Visible = true;
}
+59 -58
View File
@@ -1,85 +1,86 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
// <auto-generated>
// This code was generated by a tool.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
public partial class mod_menuBottom {
public partial class mod_menuBottom
{
/// <summary>
/// Controllo pnlCheck.
/// pnlCheck control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Panel pnlCheck;
/// <summary>
/// Controllo lblDateTime.
/// lblDateTime control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblDateTime;
/// <summary>
/// Controllo lblInfo.
/// lblInfo control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblInfo;
/// <summary>
/// Controllo hlInfo.
/// lblWarning control.
/// </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.HyperLink hlInfo;
/// <summary>
/// Controllo lblApp.
/// </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.Label lblApp;
/// <summary>
/// Controllo lblrev.
/// </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.Label lblrev;
/// <summary>
/// Controllo lblCopyRight.
/// </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.Label lblCopyRight;
/// <summary>
/// Controllo lblWarning.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblWarning;
/// <summary>
/// hlInfo control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HyperLink hlInfo;
/// <summary>
/// lblApp control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblApp;
/// <summary>
/// lblrev control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblrev;
/// <summary>
/// lblCopyRight control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblCopyRight;
}
@@ -1,17 +1,17 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_menuBottomFullpage.ascx.cs" Inherits="GPW_Commesse.WebUserControls.mod_menuBottomFullpage" %>
<nav class="navbar bg-dark fixed-bottom small">
<asp:Panel runat="server" ID="pnlCheck" Width="100%">
<div class="row px-2 py-1">
<div class="col-4 text-left">
<nav class="navbar bg-dark fixed-bottom small py-0">
<asp:Panel runat="server" ID="pnlCheck">
<div class="d-flex justify-content-between py-1 w-100" style="height: 1.2em;">
<div class="px-1">
<asp:Label ID="lblDateTime" runat="server" Text="..." />
&nbsp;|&nbsp;
<asp:Label ID="lblInfo" runat="server" Text="-" />
</div>
<div class="col-4 text-center">
<div class="px-1">
<asp:Label runat="server" ID="lblWarning" CssClass="topMenuMess" Visible="false" />
</div>
<div class="col-4 text-right">
<div class="px-1">
<asp:HyperLink runat="server" ID="hlInfo" NavigateUrl="~/GPW">
<asp:Label runat="server" ID="lblApp" Text="." /><asp:Label ID="lblrev" runat="server"> &nbsp;- &nbsp;</asp:Label>
<asp:Label runat="server" ID="lblCopyRight" Text="..." />
@@ -60,11 +60,11 @@ namespace GPW_Commesse.WebUserControls
setClock();
if (licenzeGPW.checkLicenze)
{
pnlCheck.CssClass = "btnVerdeGrad ui-corner-all shadowBox";
pnlCheck.CssClass = "btnVerdeGrad ui-corner-all shadowBox w-100";
}
else
{
pnlCheck.CssClass = "btnRossoGrad ui-corner-all shadowBox";
pnlCheck.CssClass = "btnRossoGrad ui-corner-all shadowBox w-100";
lblWarning.Text = "Attenzione: numero licenze superato! MR attiva.";
lblWarning.Visible = true;
}
@@ -4,7 +4,7 @@
<nav class="navbar navbar-expand-sm fixed-top bg-dark">
<%--<div class="fullPageHeader" style="padding: 2px 4px 2px; background-color: #333; text-align: center; margin: auto; min-height: 32px;">--%>
<div class="row text-light" style="width: 100%;">
<div class="col-3 text-left">
<div class="col-3 text-start">
<div class="d-flex flex-row">
<div class="px-2">
<img src="images/LogoHighResWhite.png" class="img-fluid" width="96" alt="logo" />
@@ -24,7 +24,7 @@
</div>
<div class="col-6 text-center">
<div class="row">
<div class="col-9 text-right">
<div class="col-9 text-end">
<asp:LinkButton runat="server" ID="lbHome" OnClick="lbHome_Click" Visible="false" CssClass="text-light"><i style="font-size: 2em;" class="fa fa-home"></i></asp:LinkButton>
<asp:Label runat="server" ID="lblCurrentPage" Text="..." Font-Size="20pt" />
</div>
@@ -33,7 +33,7 @@
</div>
</div>
</div>
<div class="col-3 text-light text-right">
<div class="col-3 text-light text-end">
<asp:Label runat="server" ID="lblPostazione" ForeColor="#CDCDCD" />
|
<asp:Label runat="server" ID="lblUtente" ForeColor="#CDCDCD" />