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

COmpletata integrazione OpAuth

Browse Source 
Rimessa NumKeyb e formattata
This commit is contained in:
Samuele E. Locatelli
2015-09-29 11:30:07 +02:00
parent eb8513aa2c
commit 02515be0bf
19 changed files with 212 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW-RT/bin/GMW-RT.dll
BIN
View File
Binary file not shown.
GMW-RT/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW-RT/bin/SteamWare.dll
BIN
View File
Binary file not shown.
GMW-UT/bin/GMW-UT.dll
BIN
View File
Binary file not shown.
GMW-UT/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW-UT/bin/SteamWare.dll
BIN
View File
Binary file not shown.
GMW/Content/Style.css
+5 -2
View File
@@ -22,10 +22,13 @@
}
.divNumKeyb {
float: right;
background-color: rgba(128, 255, 128, 0.5);
/*margin: 2px;*/
padding: 4px;
border: 4px solid rgba(120, 120, 185, 0.6);
background-color: rgba(190, 190, 255, 0.4);
width: 20%;
min-width: 100px;
min-height: 400px;
min-height: 280px;
}
.divMain {
float: none;
GMW/Content/Style.less
+5 -2
View File
@@ -30,10 +30,13 @@
.divNumKeyb {
float: right;
background-color: rgba(128,255,128, 0.5);
/*margin: 2px;*/
padding: 4px;
border: 4px solid rgba(120,120,185,0.6);
background-color: rgba(190,190,255,0.4);
width: 20%;
min-width: 100px;
min-height: 400px;
min-height: 280px;
}
.divMain {
GMW/Content/Style.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
GMW/FullPage.master
-2
View File
@@ -13,8 +13,6 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="Main" runat="server">
<div runat="server" id="divNumKeyb" class="divNumKeyb">
<br />
<br />
NUMERIC KEYPAD
<uc1:mod_numKey runat="server" id="mod_numKey" />
</div>
GMW/Web.config
+1 -1
View File
@@ -71,7 +71,7 @@
<add key="intUpdateClock_ms" value="1000" />
<add key="maxRefreshToReload" value="60" />
<!--gestione numKey-->
<add key="showNumKey" value="true" />
<add key="showNumKey" value="false" />
<!--area temp-->
<add key="maxAgeTempAreaHours" value="24" />
<!--area logger-->
GMW/WebUserControls/mod_numKey.ascx
+43 -14
View File
@@ -1,21 +1,50 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_numKey.ascx.cs" Inherits="GMW.WebUserControls.mod_numKey" %>
<div class="row">
<div class="col-xs-4">7</div>
<div class="col-xs-4">8</div>
<div class="col-xs-4">9</div>
<div class="row" style="font-size: 2em; margin: 2px; border: 2px solid #333; min-height: 1.6em;">
<div class="col-xs-12 text-center">
<asp:Label runat="server" ID="lblInput" Text="" />
</div>
</div>
<div class="row">
<div class="col-xs-4">4</div>
<div class="col-xs-4">5</div>
<div class="col-xs-4">6</div>
<div class="col-xs-4">
<asp:Button runat="server" CssClass="btn btn-inverse btn-lg" Width="100%" ID="btn7" CommandArgument="7" Text="7" OnClick="btn_Click" />
</div>
<div class="col-xs-4">
<asp:Button runat="server" CssClass="btn btn-inverse btn-lg" Width="100%" ID="btn8" CommandArgument="8" Text="8" OnClick="btn_Click" />
</div>
<div class="col-xs-4">
<asp:Button runat="server" CssClass="btn btn-inverse btn-lg" Width="100%" ID="btn9" CommandArgument="9" Text="9" OnClick="btn_Click" />
</div>
</div>
<div class="row">
<div class="col-xs-4">1</div>
<div class="col-xs-4">2</div>
<div class="col-xs-4">3</div>
<div class="col-xs-4">
<asp:Button runat="server" CssClass="btn btn-inverse btn-lg" Width="100%" ID="btn4" CommandArgument="4" Text="4" OnClick="btn_Click" />
</div>
<div class="col-xs-4">
<asp:Button runat="server" CssClass="btn btn-inverse btn-lg" Width="100%" ID="btn5" CommandArgument="5" Text="5" OnClick="btn_Click" />
</div>
<div class="col-xs-4">
<asp:Button runat="server" CssClass="btn btn-inverse btn-lg" Width="100%" ID="btn6" CommandArgument="6" Text="6" OnClick="btn_Click" />
</div>
</div>
<div class="row">
<div class="col-xs-4">-</div>
<div class="col-xs-4">0</div>
<div class="col-xs-4">+</div>
</div>
<div class="col-xs-4">
<asp:Button runat="server" CssClass="btn btn-inverse btn-lg" Width="100%" ID="btn1" CommandArgument="1" Text="1" OnClick="btn_Click" />
</div>
<div class="col-xs-4">
<asp:Button runat="server" CssClass="btn btn-inverse btn-lg" Width="100%" ID="btn2" CommandArgument="2" Text="2" OnClick="btn_Click" />
</div>
<div class="col-xs-4">
<asp:Button runat="server" CssClass="btn btn-inverse btn-lg" Width="100%" ID="btn3" CommandArgument="3" Text="3" OnClick="btn_Click" />
</div>
</div>
<div class="row">
<div class="col-xs-4">
<asp:Button runat="server" CssClass="btn btn-lg" Width="100%" ID="btnC" CommandArgument="C" Text="CLR" OnClick="btn_Click" />
</div>
<div class="col-xs-4">
<asp:Button runat="server" CssClass="btn btn-inverse btn-lg" Width="100%" ID="btn0" CommandArgument="0" Text="0" OnClick="btn_Click" />
</div>
<div class="col-xs-4">
<asp:Button runat="server" CssClass="btn btn-lg" Width="100%" ID="btnS" CommandArgument="S" Text="ENT" OnClick="btn_Click" />
</div>
</div>
GMW/WebUserControls/mod_numKey.ascx.cs
+24 -1
View File
@@ -1,4 +1,5 @@
using System;
using SteamWare;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -13,5 +14,27 @@ namespace GMW.WebUserControls
{
}
protected void btn_Click(object sender, EventArgs e)
{
// controllo SE sia reset o canc...
string inChar = ((Button)sender).CommandArgument;
if (inChar == "C")
{
lblInput.Text = "";
}
else if (inChar == "S")
{
// salvo valore in sessione e ricarico...
memLayer.ML.setSessionVal("numKeyIn", lblInput.Text);
//lblInput.Text = "";
// ricarico
Response.Redirect(user_std.pagCorrente);
}
else
{
lblInput.Text += ((Button)sender).CommandArgument;
}
}
}
}
GMW/WebUserControls/mod_numKey.ascx.designer.cs
Generated
+122 -7
View File
@@ -3,15 +3,130 @@
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace GMW.WebUserControls
{
public partial class mod_numKey
{
namespace GMW.WebUserControls {
public partial class mod_numKey {
/// <summary>
/// lblInput 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 lblInput;
/// <summary>
/// btn7 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.Button btn7;
/// <summary>
/// btn8 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.Button btn8;
/// <summary>
/// btn9 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.Button btn9;
/// <summary>
/// btn4 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.Button btn4;
/// <summary>
/// btn5 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.Button btn5;
/// <summary>
/// btn6 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.Button btn6;
/// <summary>
/// btn1 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.Button btn1;
/// <summary>
/// btn2 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.Button btn2;
/// <summary>
/// btn3 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.Button btn3;
/// <summary>
/// btnC 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.Button btnC;
/// <summary>
/// btn0 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.Button btn0;
/// <summary>
/// btnS 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.Button btnS;
}
}
GMW/WebUserControls/mod_testata.ascx
+2 -2
View File
@@ -56,9 +56,9 @@
<SeparatorTemplate>
</SeparatorTemplate>
</asp:Repeater>
<%--<li>
<li>
<asp:LinkButton runat="server" ID="lbShowNumKey" class="navbar-brand" OnClick="lbShowNumKey_Click"> <i class="fa fa-calculator fa-lg"></i></asp:LinkButton>
</li>--%>
</li>
</ul>
<asp:XmlDataSource ID="XmlMenu" runat="server" EnableCaching="false"></asp:XmlDataSource>
</div>
GMW/WebUserControls/mod_testata.ascx.designer.cs
Generated
+9
View File
@@ -93,6 +93,15 @@ namespace GMW.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater menu;
/// <summary>
/// lbShowNumKey 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.LinkButton lbShowNumKey;
/// <summary>
/// XmlMenu control.
/// </summary>
GMW/bin/GMW.dll
BIN
View File
Binary file not shown.
GMW/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/bin/SteamWare.dll
BIN
View File
Binary file not shown.