Merge branch 'master' of http://jperez@192.168.10.111:8383/SIG.git
This commit is contained in:
@@ -80,7 +80,6 @@
|
||||
</asp:UpdatePanel>
|
||||
</td>
|
||||
<td>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -94,11 +93,10 @@
|
||||
<tr align="left" runat="server" id="TrCompuesto" visible="false">
|
||||
<td class="text-right"><b>Compuesto:</b></td>
|
||||
<td>
|
||||
<asp:TextBox ID="TxtCompuesto" AutoPostBack="True" runat="server" CssClass="form-control input-sm select2me" Width="400px"></asp:TextBox>
|
||||
<asp:TextBox ID="TxtCompuesto" runat="server" CssClass="form-control input-sm select2me" Width="400px"></asp:TextBox>
|
||||
</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td colspan="4" style="text-align: center;">
|
||||
<asp:Button ID="BtnBuscar" runat="server" Text="Buscar" class="btn btn-primary" />
|
||||
|
||||
@@ -185,14 +185,12 @@
|
||||
</div>
|
||||
</ContentTemplate>
|
||||
</asp:UpdatePanel>
|
||||
|
||||
<br />
|
||||
|
||||
|
||||
<div class="row col-md-12" align="right">
|
||||
<input type="text" id="TxtBusqueda" class="form-control input-sm" onkeyup="<%= String.Format("FiltrarTabla('TxtBusqueda','{0}')", GvM.ClientID) %>" style="display: inline-block; margin-right: -20px; width: 150px;" />
|
||||
<a href="javascript:;" onclick="<%= String.Format("FiltrarTabla('TxtBusqueda','{0}')", GvM.ClientID) %>" style="margin-top: -3px;" class="btn btn-circle btn-sm label-info"><i class="icon-magnifier"></i></a>
|
||||
</div>
|
||||
<br />
|
||||
|
||||
<asp:UpdatePanel ID="UpEncabezado" runat="server" UpdateMode="Conditional">
|
||||
<ContentTemplate>
|
||||
<div id="dvCa" style="width:100%;visibility:hidden;top:40px">
|
||||
|
||||
Reference in New Issue
Block a user