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

Fix buttons icons, vers 2100+

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-02-23 10:04:56 +01:00
parent bcee147661
commit f4b02e6c3b
6 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW/POST_Finiti_OUT.aspx
+36 -36
View File
@@ -10,43 +10,43 @@
<asp:Content ID="Content2" ContentPlaceHolderID="FeaturedContent" runat="server">
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="MCon" runat="server">
<div class="row" style="background-color: #dedede;">
<div class="col-12 text-center" style="font-size: 2em;">
<asp:DropDownList runat="server" ID="dlSelCodBlocco" AutoPostBack="True" OnSelectedIndexChanged="dlSelCodBlocco_SelectedIndexChanged" DataSourceID="odsFamLinea" DataTextField="label" DataValueField="value">
</asp:DropDownList>
<asp:ObjectDataSource runat="server" ID="odsFamLinea" OldValuesParameterFormatString="original_{0}" SelectMethod="getByConditio" TypeName="GMW_data.DS_UtilityTableAdapters.v_selFamLineaTableAdapter">
<SelectParameters>
<asp:Parameter DefaultValue="FIO" Name="conditio" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
<div class="row" style="background-color: #dedede;">
<div class="col-12 text-center" style="font-size: 2em;">
<asp:DropDownList runat="server" ID="dlSelCodBlocco" AutoPostBack="True" OnSelectedIndexChanged="dlSelCodBlocco_SelectedIndexChanged" DataSourceID="odsFamLinea" DataTextField="label" DataValueField="value">
</asp:DropDownList>
<asp:ObjectDataSource runat="server" ID="odsFamLinea" OldValuesParameterFormatString="original_{0}" SelectMethod="getByConditio" TypeName="GMW_data.DS_UtilityTableAdapters.v_selFamLineaTableAdapter">
<SelectParameters>
<asp:Parameter DefaultValue="FIO" Name="conditio" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
<uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" urlNT="POST_Finiti_IN" urlDT="POST_Finiti_OUT" tipoInOut="O" CodFamLinea="FIO" resetPostByBlocco="false" cssNormal="btn btn-default btn-lg" cssSelected="btn btn-primary btn-lg active" showSelNtDt="true" lemmaSx="Ingresso" lemmaDx="Uscita" cssBtnSx="fa fa-download" cssBtnDx="fa fa-upload" />
<asp:Panel runat="server" ID="pnlAll" CssClass="stileAttesa">
<div class="container-fluid">
<asp:Panel ID="pnlSAO" runat="server" ScrollBars="None" CssClass="nav sidebar ombra" BackColor="#696969">
<div style="float: left; height: 100%; min-height: 300px; min-width: 240px; margin: -15px;">
<div style="background-color: #696969; margin: 4px;">
<uc2:mod_storicoAzioniOperatore ID="mod_storicoAzioniOperatore1" runat="server" showDelete="false" />
</div>
</div>
</asp:Panel>
<div class="row">
<div class="col-12">
<div class="msgBoxBarcode">
<div class="message">
<asp:Label runat="server" ID="lblMessaggi" Text=".." />
</div>
<div class="warning">
<asp:Label runat="server" ID="lblWarning" Text="" />
</div>
</div>
</div>
<div class="col-12">
<uc1:mod_PostFinMultOUT runat="server" ID="mod_PostFinMultOUT" />
</div>
</div>
</div>
<uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" urlNT="POST_Finiti_IN" urlDT="POST_Finiti_OUT" tipoInOut="O" CodFamLinea="FIO" resetPostByBlocco="false" cssNormal="btn btn-default btn-lg" cssSelected="btn btn-primary btn-lg active" showSelNtDt="true" lemmaSx="Ingresso" lemmaDx="Uscita" cssBtnSx="fa fa-download" cssBtnDx="fa fa-upload" />
<asp:Panel runat="server" ID="pnlAll" CssClass="stileAttesa">
<div class="container-fluid">
<asp:Panel ID="pnlSAO" runat="server" ScrollBars="None" CssClass="nav sidebar ombra" BackColor="#696969">
<div style="float: left; height: 100%; min-height: 300px; min-width: 240px; margin: -15px;">
<div style="background-color: #696969; margin: 4px;">
<uc2:mod_storicoAzioniOperatore ID="mod_storicoAzioniOperatore1" runat="server" showDelete="false" />
</div>
</div>
</asp:Panel>
</asp:Panel>
<div class="row">
<div class="col-12">
<div class="msgBoxBarcode">
<div class="message">
<asp:Label runat="server" ID="lblMessaggi" Text=".." />
</div>
<div class="warning">
<asp:Label runat="server" ID="lblWarning" Text="" />
</div>
</div>
</div>
<div class="col-12">
<uc1:mod_PostFinMultOUT runat="server" ID="mod_PostFinMultOUT" />
</div>
</div>
</div>
</asp:Panel>
</asp:Content>
GMW/WebUserControls/mod_PostRX_DT.ascx
+1 -1
View File
@@ -30,7 +30,7 @@
<Columns>
<asp:TemplateField ShowHeader="False">
<ItemTemplate>
<asp:LinkButton ID="LinkButton1" runat="server" CausesValidation="False" CommandName="Select" CssClass="text-success"><i class="fa-search-plus btn-lg"></i></asp:LinkButton>
<asp:LinkButton ID="LinkButton1" runat="server" CausesValidation="False" CommandName="Select" CssClass="text-success"><i class="fa fa-search-plus btn-lg"></i></asp:LinkButton>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Particolare" SortExpression="Particolare">
GMW/WebUserControls/mod_postRX_DT_LIST.ascx
+1 -1
View File
@@ -31,7 +31,7 @@
<asp:LinkButton ID="btnReset" runat="server" OnClick="btnReset_Click" CssClass="btn btn-default btn-sm"><i class="fa fa-refresh"></i> <%: traduci("Reset") %></asp:LinkButton>
</HeaderTemplate>
<ItemTemplate>
<asp:LinkButton ID="lbSelect" runat="server" CausesValidation="False" CommandName="Select" CssClass="text-success"><i class="fa-search-plus btn-lg"></i></asp:LinkButton>
<asp:LinkButton ID="lbSelect" runat="server" CausesValidation="False" CommandName="Select" CssClass="text-success"><i class="fa fa-search-plus btn-lg"></i></asp:LinkButton>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="FormatoDtmx" SortExpression="FormatoDtmx">
GMW/WebUserControls/mod_storicoAzioniOperatore.ascx
+1 -1
View File
@@ -29,7 +29,7 @@
</div>
</HeaderTemplate>
<ItemTemplate>
<asp:LinkButton ID="lbSelect" runat="server" CausesValidation="False" CommandName="Select" CssClass="btn btn-default btn-sm"><i class="fa-search-plus"></i></asp:LinkButton>
<asp:LinkButton ID="lbSelect" runat="server" CausesValidation="False" CommandName="Select" CssClass="btn btn-default btn-sm"><i class="fa fa-search-plus"></i></asp:LinkButton>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Data Ora" SortExpression="DataOra">
GMW/WebUserControls/mod_testata.ascx
+1 -1
View File
@@ -19,7 +19,7 @@
<asp:Label runat="server" ID="lblMatr" Text='<%# usrAuthText %>' />
</asp:HyperLink></li>
<li class="text-light nav-item">
<asp:LinkButton runat="server" ID="lbnUpdate" Text="---" OnClick="lbnUpdate_Click" ToolTip="Update" CssClass="text-light"> <%: nomePag %>&nbsp;<i class="fa-lg <%: cssIconPag %>"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbnUpdate" Text="---" OnClick="lbnUpdate_Click" ToolTip="Update" CssClass="text-light"> <%: nomePag %>&nbsp;<i class="<%: cssIconPag %>"></i></asp:LinkButton>
</li>
</ul>
</div>
Jenkinsfile
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=2097']) {
withEnv(['NEXT_BUILD_NUMBER=2100']) {
// impiego numero di build del SINGOLO RAMO
// env.versionNumber = VersionNumber(versionNumberString : '4.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
// forzo numero di build x tutti rami uguali