From 84da962f70cd80cc207e70bbb50cd1d3fb1d27c8 Mon Sep 17 00:00:00 2001
From: samuele <samuele@43c8e981-f90d-406c-a89a-24a2c4268d51>
Date: Tue, 4 Nov 2008 15:28:13 +0000
Subject: [PATCH] Ripristinate modifiche ermanno erroneamente cancellate...

git-svn-id: https://keyhammer.ath.cx/svn/XPS/trunk@58 43c8e981-f90d-406c-a89a-24a2c4268d51
---
 XPS/Style.css                     | 23 ++++++++++++++++++--
 XPS/elencoBarcode.aspx            |  2 +-
 XPS/mod_ULP.ascx                  |  7 +++---
 XPS/mod_barcode.ascx              |  9 ++++----
 XPS/mod_barcode.ascx.cs           | 17 ++++++++++++++-
 XPS/mod_dettComm.ascx             |  2 +-
 XPS/mod_elencoBarcode.ascx        | 36 +++++++++++++++++++++++++++----
 XPS/mod_scadenziarioCommesse.ascx |  2 +-
 8 files changed, 80 insertions(+), 18 deletions(-)

diff --git a/XPS/Style.css b/XPS/Style.css
index 4cff321..1afea3b 100644
--- a/XPS/Style.css
+++ b/XPS/Style.css
@@ -78,7 +78,9 @@
 /*Modal Popup*/
 .modalBackground
 {
-	background-color: Gray; /* 	filter:alpha(opacity=70); 	opacity:0.7; */
+	background-color: Gray; 
+	filter:alpha(opacity=70); 	
+	opacity:0.7;
 }
 .hiddenTxt
 {
@@ -206,6 +208,8 @@ INPUT
 {
 	padding: 0px;
 	margin: 2px;
+	/* con questo Table va a full screen */
+	width: 99%;
 }
 .topContrDx
 {
@@ -2742,8 +2746,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/elencoBarcode.aspx b/XPS/elencoBarcode.aspx
index afe45bb..31c2c23 100644
--- a/XPS/elencoBarcode.aspx
+++ b/XPS/elencoBarcode.aspx
@@ -1,4 +1,4 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Standard.master" AutoEventWireup="true" CodeFile="elencoBarcode.aspx.cs" Inherits="elencoBarcode" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxSimple.master" AutoEventWireup="true" CodeFile="elencoBarcode.aspx.cs" Inherits="elencoBarcode" %>
 
 <%@ Register src="mod_elencoBarcode.ascx" tagname="mod_elencoBarcode" tagprefix="uc1" %>
 
diff --git a/XPS/mod_ULP.ascx b/XPS/mod_ULP.ascx
index 6437661..0a5efb0 100644
--- a/XPS/mod_ULP.ascx
+++ b/XPS/mod_ULP.ascx
@@ -5,8 +5,8 @@
 <asp:Label runat="server" ID="lblULP" CssClass="ctrHeaderPagerDet" Width="150px" />
 <asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataSourceID="ods"
     DataKeyNames="Cod" AllowPaging="True" AllowSorting="True" OnSelectedIndexChanged="grView_SelectedIndexChanged"
-    OnDataBound="grView_DataBound" OnRowUpdating="grView_RowUpdating" 
-    OnRowUpdated="grView_RowUpdated" onrowdeleted="grView_RowDeleted">
+    OnDataBound="grView_DataBound" OnRowUpdating="grView_RowUpdating" OnRowUpdated="grView_RowUpdated"
+    OnRowDeleted="grView_RowDeleted" Width="100%">
     <RowStyle CssClass="ctrRowStyleDet" />
     <AlternatingRowStyle CssClass="ctrAltRowStyleDet" />
     <EditRowStyle CssClass="ctrEditRowStyleDet" />
@@ -158,8 +158,7 @@
             <asp:Button ID="btnCancel" runat="server" Width="100px" OnClick="btnCancel_Click" />
         </div>
         <div style="text-align: center;">
-            <asp:Button ID="btnAllSched" runat="server" Width="250px" 
-                onclick="btnAllSched_Click" />
+            <asp:Button ID="btnAllSched" runat="server" Width="250px" OnClick="btnAllSched_Click" />
         </div>
     </div>
 </asp:Panel>
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 @@
         <asp:TextBox runat="server" ID="txtComando" TextMode="Password" Width="200px" 
             ontextchanged="txtComando_TextChanged" />
     </div>
-    <div style="width:700px; margin-top:20px;">
-    <div style="background-color:#FFE800; padding:8px; margin:1px;">
+    <asp:Panel runat="server" ID="pnlBarcodeBox" CssClass="">
+        <div style="background-color: #FFE800; padding: 8px; margin: 1px; height:15px;">
         <asp:Label runat="server" ID="lblInput" Text="" />
     </div>
      <div style="background-color:#FFC500; padding:8px; margin:1px;">
         <asp:Label runat="server" ID="lblValore" Text="" />
     </div>
-     <div style="background-color:#FF7700; padding:8px; margin:1px;">
+        <div style="background-color: #FF7700; padding: 8px; margin: 1px; height:15px;">
         <asp:Label runat="server" ID="lblRichiesta" Text="" Font-Bold="true" />
     </div>
-    </div>
+        <asp:Label ID="lblBrowser" runat="server"></asp:Label>
+</asp:Panel>
 </div>
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();
     }
     /// <summary>
@@ -128,7 +129,21 @@ public partial class mod_barcode : ApplicationUserControl
             _comandi.TryGetValue(txtComando.Text, out comando.descrComando);
         }
     }
-
+    /// <summary>
+    /// verifica quale browser usato e applica css corretto al div attorno al box
+    /// </summary>
+    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 @@
 <asp:Label runat="server" ID="lblRowsDDT" CssClass="ctrHeaderPager" Width="150px" />
 <asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataSourceID="ods"
     DataKeyNames="Cod" AllowPaging="True" AllowSorting="True" OnSelectedIndexChanged="grView_SelectedIndexChanged"
-    OnDataBound="grView_DataBound" onrowupdating="grView_RowUpdating">
+    OnDataBound="grView_DataBound" onrowupdating="grView_RowUpdating" Width="100%">
     <RowStyle CssClass="ctrRowStyle" />
     <AlternatingRowStyle CssClass="ctrAltRowStyle" />
     <EditRowStyle CssClass="ctrEditRowStyle" />
diff --git a/XPS/mod_elencoBarcode.ascx b/XPS/mod_elencoBarcode.ascx
index 02a8393..3168a66 100644
--- a/XPS/mod_elencoBarcode.ascx
+++ b/XPS/mod_elencoBarcode.ascx
@@ -1,13 +1,14 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeFile="mod_elencoBarcode.ascx.cs"
     Inherits="mod_elencoBarcode" %>
-<div style="font-size: larger; float:left;">
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<div style="font-size: larger; float: left;">
     <link href="Style.css" rel="stylesheet" type="text/css" />
     <asp:GridView ID="GridView1" runat="server" AutoGenerateColumns="False" DataSourceID="ods">
         <Columns>
             <asp:BoundField DataField="descrComando" HeaderText="Comando Inviato" SortExpression="descrComando" />
             <asp:TemplateField HeaderText="Barcode" SortExpression="codInviato">
                 <ItemTemplate>
-                    <div style="padding: 40px; text-align:center;">
+                    <div style="padding: 40px; text-align: center;">
                         <asp:Label ID="Label1" runat="server" Text='<%# barcodeFormat(Eval("codInviato")) %>'
                             CssClass="barcodeFont" />
                     </div>
@@ -16,8 +17,35 @@
         </Columns>
     </asp:GridView>
 </div>
-<div style="float:left; margin-left: 150px;">
-Scarica l'elenco in <a href="docs/ElencoBarcodeXPS.pdf">formato pdf</a>
+<div style="float: left; margin-left: 150px;">
+    Scarica l'elenco in <a href="docs/ElencoBarcodeXPS.pdf">formato pdf</a><br />
+    <br />
+    <a href="docs/FRE3OF9X.TTF">Scarica il font</a> per visualizzare correttamente i
+    barcode<br />
+    <br />
+    <asp:LinkButton ID="lnkHowTo" runat="server"><i style="text-decoration:none;">Come installare il font</i></asp:LinkButton>
+    <cc1:ModalPopupExtender ID="ModalPopupExtender1" runat="server" TargetControlID="lnkHowTo"
+        runat="server" PopupControlID="pnlInstallFont" BackgroundCssClass="modalBackground"
+        CancelControlID="lnkEsci">
+    </cc1:ModalPopupExtender>
+    <asp:Panel runat="server" ID="pnlInstallFont" Visible="true">
+        <p style="color: White; font-weight: bold;">
+            Per installare il font:</p>
+        <cc1:TabContainer ID="TabContainer1" runat="server" ActiveTabIndex="0">
+            <cc1:TabPanel ID="TabPanel1" runat="server" HeaderText="Windows">
+                <ContentTemplate>
+                    Copiare il font nella cartella C:\Windows\Font (potrebbero essere necessari i permessi
+                    di amministratore
+                    <img src="images/installWindows.png" width="750px" /></ContentTemplate>
+            </cc1:TabPanel>
+            <cc1:TabPanel ID="TabPanel2" runat="server" HeaderText="Macintosh">
+                <ContentTemplate>
+                    Fare doppio clic sul font e verrà installato automaticamente</ContentTemplate>
+            </cc1:TabPanel>
+        </cc1:TabContainer>
+        <br /><br />
+        <asp:LinkButton ID="lnkEsci" runat="server"><div style="text-decoration:none; color:White; font-weight:bold; text-align:center;">Esci</div></asp:LinkButton>
+    </asp:Panel>
 </div>
 <asp:ObjectDataSource ID="ods" runat="server" DeleteMethod="Delete" InsertMethod="Insert"
     OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="DS_applicazioneTableAdapters.TransizioneEventiTableAdapter"
diff --git a/XPS/mod_scadenziarioCommesse.ascx b/XPS/mod_scadenziarioCommesse.ascx
index 651bf11..67abae0 100644
--- a/XPS/mod_scadenziarioCommesse.ascx
+++ b/XPS/mod_scadenziarioCommesse.ascx
@@ -24,7 +24,7 @@
         </span>
     </div>
 </div>
-<div style="clear: both; float: left;">
+<div style="clear: both; float: left; width:100%">
     <uc2:mod_scadute ID="mod_scadute1" runat="server" />
     <uc3:mod_completate ID="mod_completate1" runat="server" />
 </div>