From 080fbbf44b507daa03805ba854d389a91fa2648f Mon Sep 17 00:00:00 2001 From: ermanno Date: Fri, 31 Oct 2008 09:17:02 +0000 Subject: [PATCH] =?UTF-8?q?modifiche=20per=20stile=20barcode;=20modifiche?= =?UTF-8?q?=20crossbrowser=20per=20compatibilit=C3=A0;=20allargata=20al=20?= =?UTF-8?q?100%=20la=20largezza=20tabella=20di=20masterAjax=20search=20e?= =?UTF-8?q?=20non=20con=20moduli=20interni=20tutti=20al=20100%=20e=20poi?= =?UTF-8?q?=20proporzionale;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://keyhammer.ath.cx/svn/XPS/trunk@50 43c8e981-f90d-406c-a89a-24a2c4268d51 --- XPS/Style.css | 19 ++++++++++++++++++- XPS/mod_ULP.ascx | 2 +- XPS/mod_barcode.ascx | 9 +++++---- XPS/mod_barcode.ascx.cs | 17 ++++++++++++++++- XPS/mod_dettComm.ascx | 2 +- XPS/mod_elencoComm.ascx | 1 + 6 files changed, 42 insertions(+), 8 deletions(-) diff --git a/XPS/Style.css b/XPS/Style.css index 51cb7f0..84382a0 100644 --- a/XPS/Style.css +++ b/XPS/Style.css @@ -206,6 +206,8 @@ INPUT { padding: 0px; margin: 2px; + /* con questo Table va a full screen */ + width: 99%; } .topContrDx { @@ -2671,8 +2673,23 @@ A:hover font-size:smaller; } -grvGiornalieroComm +/* grvGiornalieroComm { font-size: xx-small; color: Yellow; +} +*/ + +/* stile custom per questa webapp */ +.barcodeBoxIE +{ + width:700px; + margin-top: 20px; +} + +.barcodeBoxOther +{ + margin-left:20%; + margin-right:20%; + margin-top: 20px; } \ No newline at end of file diff --git a/XPS/mod_ULP.ascx b/XPS/mod_ULP.ascx index a3094b7..e2fd8ea 100644 --- a/XPS/mod_ULP.ascx +++ b/XPS/mod_ULP.ascx @@ -5,7 +5,7 @@ + OnDataBound="grView_DataBound" OnRowUpdating="grView_RowUpdating" OnRowUpdated="grView_RowUpdated" Width="100%"> diff --git a/XPS/mod_barcode.ascx b/XPS/mod_barcode.ascx index 98a45e0..385349c 100644 --- a/XPS/mod_barcode.ascx +++ b/XPS/mod_barcode.ascx @@ -4,15 +4,16 @@ -
-
+ +
-
+
-
+ +
diff --git a/XPS/mod_barcode.ascx.cs b/XPS/mod_barcode.ascx.cs index 6dc587d..835d1b2 100644 --- a/XPS/mod_barcode.ascx.cs +++ b/XPS/mod_barcode.ascx.cs @@ -48,6 +48,7 @@ public partial class mod_barcode : ApplicationUserControl protected override void Page_Load(object sender, EventArgs e) { base.Page_Load(sender, e); + DetectAgent(); myInitialize(); } /// @@ -128,7 +129,21 @@ public partial class mod_barcode : ApplicationUserControl _comandi.TryGetValue(txtComando.Text, out comando.descrComando); } } - + /// + /// verifica quale browser usato e applica css corretto al div attorno al box + /// + private void DetectAgent() + { + System.Web.HttpBrowserCapabilities browser = Request.Browser; + if (browser.Browser == "IE") + { + pnlBarcodeBox.CssClass="barcodeBoxIE"; + } + else + { + pnlBarcodeBox.CssClass = "barcodeBoxOther"; + } + } #endregion #region area public diff --git a/XPS/mod_dettComm.ascx b/XPS/mod_dettComm.ascx index bd7de01..7eef3eb 100644 --- a/XPS/mod_dettComm.ascx +++ b/XPS/mod_dettComm.ascx @@ -9,7 +9,7 @@ + OnDataBound="grView_DataBound" onrowupdating="grView_RowUpdating" Width="100%"> diff --git a/XPS/mod_elencoComm.ascx b/XPS/mod_elencoComm.ascx index 42909d2..3be37ce 100644 --- a/XPS/mod_elencoComm.ascx +++ b/XPS/mod_elencoComm.ascx @@ -49,6 +49,7 @@ +