diff --git a/project/XPS/bin/SteamWare.dll b/project/XPS/bin/SteamWare.dll index fc470e7..e77a478 100644 Binary files a/project/XPS/bin/SteamWare.dll and b/project/XPS/bin/SteamWare.dll differ diff --git a/project/XPS/bin/XPS.dll b/project/XPS/bin/XPS.dll index 1a30713..363352b 100644 Binary files a/project/XPS/bin/XPS.dll and b/project/XPS/bin/XPS.dll differ diff --git a/project/XPS/bin/XPS_data.dll b/project/XPS/bin/XPS_data.dll index 79f6c00..e38848e 100644 Binary files a/project/XPS/bin/XPS_data.dll and b/project/XPS/bin/XPS_data.dll differ diff --git a/project/XPS/obj/Debug/XPS.dll b/project/XPS/obj/Debug/XPS.dll index b7f4558..363352b 100644 Binary files a/project/XPS/obj/Debug/XPS.dll and b/project/XPS/obj/Debug/XPS.dll differ diff --git a/project/XPS/obj/EQUA/XPS.dll b/project/XPS/obj/EQUA/XPS.dll index 1a30713..c7f8341 100644 Binary files a/project/XPS/obj/EQUA/XPS.dll and b/project/XPS/obj/EQUA/XPS.dll differ diff --git a/project/XPST/Default.aspx.cs b/project/XPST/Default.aspx.cs index cecee8e..09c45cc 100644 --- a/project/XPST/Default.aspx.cs +++ b/project/XPST/Default.aspx.cs @@ -21,7 +21,6 @@ namespace XPST } else { - //Response.Redirect("Home.aspx"); Response.Redirect("barcode.aspx"); } } diff --git a/project/XPST/Style.css b/project/XPST/Style.css index 9678abb..835f4e1 100644 --- a/project/XPST/Style.css +++ b/project/XPST/Style.css @@ -339,7 +339,7 @@ border: solid 2px blue; background-color: #88FFFF; font-weight: bold; - font-size:20pt; + font-size: 20pt; text-align: center; } .btnBarcodeBigWide2 @@ -349,7 +349,7 @@ border: solid 2px blue; background-color: #FF88FF; font-weight: bold; - font-size:20pt; + font-size: 20pt; text-align: center; } .btnBarcodeBigWide3 @@ -359,7 +359,7 @@ border: solid 2px blue; background-color: #FFFF88; font-weight: bold; - font-size:20pt; + font-size: 20pt; text-align: center; } .btnBarcodeBigWide4 @@ -369,7 +369,7 @@ border: solid 2px blue; background-color: #F8F8F8; font-weight: bold; - font-size:20pt; + font-size: 20pt; text-align: center; } .btnBarcodeBigWide5 @@ -379,7 +379,7 @@ border: solid 2px blue; background-color: #44FF44; font-weight: bold; - font-size:20pt; + font-size: 20pt; text-align: center; } .btnBarcodeBigWide6 @@ -389,7 +389,7 @@ border: solid 2px blue; background-color: #FF4444; font-weight: bold; - font-size:20pt; + font-size: 20pt; text-align: center; } @@ -549,3 +549,11 @@ color: Red; font-weight: bold; } +.divSx +{ + float: left; +} +.divDx +{ + float: right; +} diff --git a/project/XPST/Web.Debug.config b/project/XPST/Web.Debug.config new file mode 100644 index 0000000..2c6dd51 --- /dev/null +++ b/project/XPST/Web.Debug.config @@ -0,0 +1,30 @@ + + + + + + + + + + \ No newline at end of file diff --git a/project/XPST/Web.EQUA.config b/project/XPST/Web.EQUA.config new file mode 100644 index 0000000..4122d79 --- /dev/null +++ b/project/XPST/Web.EQUA.config @@ -0,0 +1,31 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/project/XPST/Web.Release.config b/project/XPST/Web.Release.config new file mode 100644 index 0000000..4122d79 --- /dev/null +++ b/project/XPST/Web.Release.config @@ -0,0 +1,31 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/project/XPST/Web.config b/project/XPST/Web.config index 65743f0..26b04f4 100644 --- a/project/XPST/Web.config +++ b/project/XPST/Web.config @@ -1,4 +1,4 @@ - + - - -
- -
-
-
-
- - - -
-
+
+
- + - - - - - - + + + + + + - + - - - + + + - + The StorageMethod parameter sets the ViewState's storage type. + Possible values are : + + - File (saves ViewState into a file, server side) + - StoragePath must specify a write enabled server path ( ~ means site root path) + If StoragePath is a web path (i.e.: \\MachineName\Dir), when used in webfarms, + please add the following line under + + + - Default (default ViewState saving method, sending hidden fields to client side) + + - Session (saves ViewState into a Session variable, server side) + + - SqlServer (saves the ViewState into a database table) + - ConnectionString specifies the database connection. + - TableName specifies the table in the database where the records will be stored. + + New Option : + Compressed="true" or Compressed="false" + this will compress the ViewState if StorageMethod is Default or File. + so the ViewState's value will be significantly smaller than the original value. + Compression method is not suported by StorageMethod="Session" + + --> + - - - - - - - - + + - - - - - - - - - - - - + + + + + + + - + - - - - - + - - + - + This HttpModule provides automatic cleanup of viewstate files + on the start of each session, thus requiring + the SessionStateModule to be installed as well. + --> + - + - + + --> + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - + + + + + + + - - - + + + - - - - - + - - - - - - - - + - - - - - - - - - - + + + + + + - - - - - - - - - - - - - \ No newline at end of file diff --git a/project/XPST/WebMasterPages/Compact.Master b/project/XPST/WebMasterPages/Compact.Master deleted file mode 100644 index bc97d7b..0000000 --- a/project/XPST/WebMasterPages/Compact.Master +++ /dev/null @@ -1,27 +0,0 @@ -<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Compact.master.cs" Inherits="XPST.Compact" %> - -<%@ Register Src="../WebUserControls/mod_menuTopCompact.ascx" TagName="mod_menuTopCompact" - TagPrefix="uc1" %> -<%@ Register Src="../WebUserControls/mod_currentTask.ascx" TagName="mod_currentTask" - TagPrefix="uc2" %> - - - - XPST Term - - - - - -
-
- -
- -
- - -
-
- - diff --git a/project/XPST/WebMasterPages/Compact.Master.cs b/project/XPST/WebMasterPages/Compact.Master.cs deleted file mode 100644 index 48ec4cb..0000000 --- a/project/XPST/WebMasterPages/Compact.Master.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace XPST -{ - public partial class Compact : System.Web.UI.MasterPage - { - protected void Page_Load(object sender, EventArgs e) - { - } - } -} diff --git a/project/XPST/WebMasterPages/Compact.Master.designer.cs b/project/XPST/WebMasterPages/Compact.Master.designer.cs deleted file mode 100644 index 29d28dd..0000000 --- a/project/XPST/WebMasterPages/Compact.Master.designer.cs +++ /dev/null @@ -1,61 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:2.0.50727.4963 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace XPST { - - - public partial class Compact { - - /// - /// head control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ContentPlaceHolder head; - - /// - /// form1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - - /// - /// mod_menuTopCompact1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.UserControl mod_menuTopCompact1; - - /// - /// mod_currentTask1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.UserControl mod_currentTask1; - - /// - /// body control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ContentPlaceHolder body; - } -} diff --git a/project/XPST/WebMasterPages/CompactBCode.Master b/project/XPST/WebMasterPages/CompactBCode.Master index 8b1aa4a..273f05a 100644 --- a/project/XPST/WebMasterPages/CompactBCode.Master +++ b/project/XPST/WebMasterPages/CompactBCode.Master @@ -1,10 +1,7 @@ -<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="CompactBCode.master.cs" - Inherits="XPST.WebMasterPages.CompactBCode" %> +<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="CompactBCode.master.cs" Inherits="XPST.WebMasterPages.CompactBCode" %> -<%@ Register Src="../WebUserControls/mod_menuTopCompact.ascx" TagName="mod_menuTopCompact" - TagPrefix="uc1" %> -<%@ Register Src="../WebUserControls/mod_currentTask.ascx" TagName="mod_currentTask" - TagPrefix="uc2" %> +<%@ Register Src="../WebUserControls/mod_menuTopCompact.ascx" TagName="mod_menuTopCompact" TagPrefix="uc1" %> +<%@ Register Src="../WebUserControls/mod_footer.ascx" TagName="mod_footer" TagPrefix="uc2" %> @@ -12,26 +9,37 @@ - - + + <%-- - + $(document).live('pageshow', focusBC); + --%>
- -
- +
+ +
+ +
+
+ + +
+
+ +
- - -
diff --git a/project/XPST/WebMasterPages/CompactBCode.Master.designer.cs b/project/XPST/WebMasterPages/CompactBCode.Master.designer.cs index d4a3135..787a01f 100644 --- a/project/XPST/WebMasterPages/CompactBCode.Master.designer.cs +++ b/project/XPST/WebMasterPages/CompactBCode.Master.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4963 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -49,15 +48,6 @@ namespace XPST.WebMasterPages { /// protected global::XPST.WebUserControls.mod_menuTopCompact mod_menuTopCompact1; - /// - /// mod_currentTask1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::XPST.WebUserControls.mod_currentTask mod_currentTask1; - /// /// body control. /// @@ -66,5 +56,14 @@ namespace XPST.WebMasterPages { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ContentPlaceHolder body; + + /// + /// mod_footer1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GPW.WebUserControls.mod_footer mod_footer1; } } diff --git a/project/XPST/WebUserControls/mod_barcode.ascx b/project/XPST/WebUserControls/mod_barcode.ascx index 61e728c..8130d67 100644 --- a/project/XPST/WebUserControls/mod_barcode.ascx +++ b/project/XPST/WebUserControls/mod_barcode.ascx @@ -1,19 +1,27 @@ -<%@ Control Language="C#" AutoEventWireup="true" Inherits="XPST.WebUserControls.mod_barcode" Codebehind="mod_barcode.ascx.cs" %> -
-
- +<%@ Control Language="C#" AutoEventWireup="true" Inherits="XPST.WebUserControls.mod_barcode" CodeBehind="mod_barcode.ascx.cs" %> +
+
+
+ +
+
+ +
- -
- +
-
- +
+ +
+ +
+
+ +
+
+ +
+ +
-
- -
- -
diff --git a/project/XPST/WebUserControls/mod_barcode.ascx.cs b/project/XPST/WebUserControls/mod_barcode.ascx.cs index 6fcaac8..b6e8389 100644 --- a/project/XPST/WebUserControls/mod_barcode.ascx.cs +++ b/project/XPST/WebUserControls/mod_barcode.ascx.cs @@ -258,6 +258,5 @@ namespace XPST.WebUserControls } #endregion - } } \ No newline at end of file diff --git a/project/XPST/WebUserControls/mod_barcode.ascx.designer.cs b/project/XPST/WebUserControls/mod_barcode.ascx.designer.cs index 028e3ea..b301ee5 100644 --- a/project/XPST/WebUserControls/mod_barcode.ascx.designer.cs +++ b/project/XPST/WebUserControls/mod_barcode.ascx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4963 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -22,6 +21,15 @@ namespace XPST.WebUserControls { /// protected global::System.Web.UI.WebControls.TextBox txtInput; + /// + /// btnCerca control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnCerca; + /// /// pnlBarcodeBox control. /// diff --git a/project/XPST/WebUserControls/mod_btnComandi.ascx b/project/XPST/WebUserControls/mod_btnComandi.ascx index 20980bc..9a52a94 100644 --- a/project/XPST/WebUserControls/mod_btnComandi.ascx +++ b/project/XPST/WebUserControls/mod_btnComandi.ascx @@ -1,24 +1,25 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_btnComandi.ascx.cs" - Inherits="XPST.WebUserControls.mod_btnComandi" %> -
- +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_btnComandi.ascx.cs" Inherits="XPST.WebUserControls.mod_btnComandi" %> +
+
+ +
+
+ +
-
- +
+
+ +
+
+ +
-
-
-
- -
-
- -
-
-
-
- -
-
- +
+
+ +
+
+ +
diff --git a/project/XPST/WebUserControls/mod_btnComandi.ascx.cs b/project/XPST/WebUserControls/mod_btnComandi.ascx.cs index 38ded5c..5b51da6 100644 --- a/project/XPST/WebUserControls/mod_btnComandi.ascx.cs +++ b/project/XPST/WebUserControls/mod_btnComandi.ascx.cs @@ -66,17 +66,57 @@ namespace XPST.WebUserControls catch { } + switch (currState) + { + case 1: + case 2: + case 3: + btn1.Enabled = true; + btn2.Enabled = false; + btn3.Enabled = false; + btn4.Enabled = false; + break; + case 4: + btn1.Enabled = false; + btn2.Enabled = true; + btn3.Enabled = false; + btn4.Enabled = false; + break; + case 5: + btn1.Enabled = false; + btn2.Enabled = false; + btn3.Enabled = true; + btn4.Enabled = true; + break; + case 6: + btn1.Enabled = false; + btn2.Enabled = false; + btn3.Enabled = false; + btn4.Enabled = true; + break; + case 7: + btn1.Enabled = false; + btn2.Enabled = false; + btn3.Enabled = false; + btn4.Enabled = true; + break; + default: + btn1.Enabled = false; + btn2.Enabled = false; + btn3.Enabled = false; + btn4.Enabled = false; + break; + } + if (currState >= 5) { // controllo se c'è email del cliente... if (emailDest != "") { - btn4.Visible = true; btn4.Enabled = true; } else { - btn4.Visible = true; btn4.Enabled = false; } // controllo se va indicato email richiesta! @@ -91,10 +131,6 @@ namespace XPST.WebUserControls btn4.Text += string.Format("{0}{1}: {2}", Environment.NewLine, user_std.UtSn.Traduci("emailSent"), emailSent); } } - else - { - btn4.Visible = false; - } } /// /// carico da tab i comandi ammessi per il barcode... diff --git a/project/XPST/WebUserControls/mod_btnComandi.ascx.designer.cs b/project/XPST/WebUserControls/mod_btnComandi.ascx.designer.cs index bfa2e04..c724a3d 100644 --- a/project/XPST/WebUserControls/mod_btnComandi.ascx.designer.cs +++ b/project/XPST/WebUserControls/mod_btnComandi.ascx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4971 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/project/XPST/WebUserControls/mod_currentTask.ascx b/project/XPST/WebUserControls/mod_currentTask.ascx deleted file mode 100644 index 343a382..0000000 --- a/project/XPST/WebUserControls/mod_currentTask.ascx +++ /dev/null @@ -1,10 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_currentTask.ascx.cs" - Inherits="XPST.WebUserControls.mod_currentTask" %> -
-
- -
-
- -
-
diff --git a/project/XPST/WebUserControls/mod_currentTask.ascx.cs b/project/XPST/WebUserControls/mod_currentTask.ascx.cs deleted file mode 100644 index 56baab6..0000000 --- a/project/XPST/WebUserControls/mod_currentTask.ascx.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; -using SteamWare; - -namespace XPST.WebUserControls -{ - public partial class mod_currentTask : System.Web.UI.UserControl - { - - /// - /// wrapper traduzione termini - /// - /// - /// - public string traduci(string lemma) - { - return user_std.UtSn.Traduci(lemma); - } - - protected void Page_Load(object sender, EventArgs e) - { - string task = memLayer.ML.StringSessionObj("activeTask"); - if (task == "") - { - task = "..." + traduci("waiting") + "..."; - } - lblTask.Text = task; - setClock(); - } - - private void setClock() - { - lblDateTime.Text = DateTime.Now.ToString("HH:mm:ss"); - } - } -} \ No newline at end of file diff --git a/project/XPST/WebUserControls/mod_footer.ascx b/project/XPST/WebUserControls/mod_footer.ascx new file mode 100644 index 0000000..79453dc --- /dev/null +++ b/project/XPST/WebUserControls/mod_footer.ascx @@ -0,0 +1,9 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_footer.ascx.cs" Inherits="GPW.WebUserControls.mod_footer" %> +
+
+ +
+
+ +
+
diff --git a/project/XPST/WebUserControls/mod_footer.ascx.cs b/project/XPST/WebUserControls/mod_footer.ascx.cs new file mode 100644 index 0000000..29a11d1 --- /dev/null +++ b/project/XPST/WebUserControls/mod_footer.ascx.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; + +namespace GPW.WebUserControls +{ + public partial class mod_footer : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + lblLastUpdt.Text = DateTime.Now.ToString("yyyy.MM.dd HH:mm:ss"); + lblVers.Text = string.Format("vers. {0}.{1}", memLayer.ML.confReadString("mainRev"), memLayer.ML.confReadString("minRev")); + } + } +} \ No newline at end of file diff --git a/project/XPST/WebUserControls/mod_currentTask.ascx.designer.cs b/project/XPST/WebUserControls/mod_footer.ascx.designer.cs similarity index 67% rename from project/XPST/WebUserControls/mod_currentTask.ascx.designer.cs rename to project/XPST/WebUserControls/mod_footer.ascx.designer.cs index 42382d3..4633a19 100644 --- a/project/XPST/WebUserControls/mod_currentTask.ascx.designer.cs +++ b/project/XPST/WebUserControls/mod_footer.ascx.designer.cs @@ -1,34 +1,33 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:2.0.50727.4963 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace XPST.WebUserControls { - - - public partial class mod_currentTask { - - /// - /// lblTask control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblTask; - - /// - /// lblDateTime control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblDateTime; - } -} +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GPW.WebUserControls { + + + public partial class mod_footer { + + /// + /// lblLastUpdt control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblLastUpdt; + + /// + /// lblVers control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblVers; + } +} diff --git a/project/XPST/WebUserControls/mod_menuTopCompact.ascx b/project/XPST/WebUserControls/mod_menuTopCompact.ascx index 2713a0d..d511a60 100644 --- a/project/XPST/WebUserControls/mod_menuTopCompact.ascx +++ b/project/XPST/WebUserControls/mod_menuTopCompact.ascx @@ -1,4 +1,4 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_menuTopCompact.ascx.cs" Inherits="XPST.WebUserControls.mod_menuTopCompact" %> -
- -
\ No newline at end of file +
+ +
diff --git a/project/XPST/WebUserControls/mod_menuTopCompact.ascx.cs b/project/XPST/WebUserControls/mod_menuTopCompact.ascx.cs index debac3d..07c3afa 100644 --- a/project/XPST/WebUserControls/mod_menuTopCompact.ascx.cs +++ b/project/XPST/WebUserControls/mod_menuTopCompact.ascx.cs @@ -12,34 +12,7 @@ namespace XPST.WebUserControls { protected void Page_Load(object sender, EventArgs e) { - string operatore = ""; - try - { - operatore = user_std.UtSn.CognomeNome; - } - catch - { - // rimando a login... - Response.Redirect("~/Default.aspx"); - } - if (operatore != "") - { - lblTitolo.Text = string.Format("{0} - {1}", traduci(memLayer.ML.confReadString("titleApp")), operatore); - } - else - { - lblTitolo.Text = traduci(memLayer.ML.confReadString("titleApp")); - } - } - - /// - /// wrapper traduzione termini - /// - /// - /// - public string traduci(string lemma) - { - return user_std.UtSn.Traduci(lemma); + lblTitolo.Text = memLayer.ML.confReadString("appName"); } } } \ No newline at end of file diff --git a/project/XPST/WebUserControls/mod_menuTopCompact.ascx.designer.cs b/project/XPST/WebUserControls/mod_menuTopCompact.ascx.designer.cs index 5fc006d..044dd54 100644 --- a/project/XPST/WebUserControls/mod_menuTopCompact.ascx.designer.cs +++ b/project/XPST/WebUserControls/mod_menuTopCompact.ascx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4963 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/project/XPST/XPST.Publish.xml b/project/XPST/XPST.Publish.xml index d718374..e3eaf8e 100644 --- a/project/XPST/XPST.Publish.xml +++ b/project/XPST/XPST.Publish.xml @@ -1,29 +1,4 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/project/XPST/XPST.csproj b/project/XPST/XPST.csproj index 632c0e5..9f4df69 100644 --- a/project/XPST/XPST.csproj +++ b/project/XPST/XPST.csproj @@ -26,12 +26,13 @@ Properties XPST XPST - v3.5 + v4.0 3.5 false + true @@ -53,6 +54,9 @@ AllRules.ruleset + + ..\packages\AjaxMin.4.78.4724.23869\lib\net35\AjaxMin.dll + False ..\..\..\..\..\..\..\Library\FleskAccelerator\bin\Release\Flesk.Accelerator.dll @@ -67,18 +71,11 @@ - - 3.5 - - - 3.5 - - - 3.5 - - - 3.5 - + + + + + @@ -86,10 +83,27 @@ + + + + + + + + + + + + + + + + + Designer @@ -111,13 +125,6 @@ Default.aspx - - Compact.Master - ASPXCodeBehind - - - Compact.Master - CompactBCode.Master ASPXCodeBehind @@ -139,12 +146,12 @@ mod_btnComandi.ascx - - mod_currentTask.ascx + + mod_footer.ascx ASPXCodeBehind - - mod_currentTask.ascx + + mod_footer.ascx mod_menuTopCompact.ascx @@ -165,13 +172,10 @@ - - - - + @@ -193,6 +197,24 @@ + + + + + + Web.config + + + + + Web.config + + + + + Web.config + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/project/XPST/bin/AjaxMin.dll b/project/XPST/bin/AjaxMin.dll new file mode 100644 index 0000000..9adbb7a Binary files /dev/null and b/project/XPST/bin/AjaxMin.dll differ diff --git a/project/XPST/bin/SteamWare.dll b/project/XPST/bin/SteamWare.dll index fc470e7..e77a478 100644 Binary files a/project/XPST/bin/SteamWare.dll and b/project/XPST/bin/SteamWare.dll differ diff --git a/project/XPST/bin/XPST.dll b/project/XPST/bin/XPST.dll index ad7e9bd..97669b5 100644 Binary files a/project/XPST/bin/XPST.dll and b/project/XPST/bin/XPST.dll differ diff --git a/project/XPST/bin/XPS_data.dll b/project/XPST/bin/XPS_data.dll index 79f6c00..e38848e 100644 Binary files a/project/XPST/bin/XPS_data.dll and b/project/XPST/bin/XPS_data.dll differ diff --git a/project/XPST/obj/Debug/XPST.csproj.FileListAbsolute.txt b/project/XPST/obj/Debug/XPST.csproj.FileListAbsolute.txt index 4d2d008..0c96c3f 100644 --- a/project/XPST/obj/Debug/XPST.csproj.FileListAbsolute.txt +++ b/project/XPST/obj/Debug/XPST.csproj.FileListAbsolute.txt @@ -28,3 +28,4 @@ C:\Users\samuele\Documents\Visual Studio 2010\Projects\XPS\project\XPST\bin\XPS_ C:\Users\samuele\Documents\Visual Studio 2010\Projects\XPS\project\XPST\obj\Debug\XPST.pdb C:\Users\samuele\Documents\Visual Studio 2010\Projects\XPS\project\XPST\bin\ICSharpCode.SharpZipLib.pdb C:\Users\samuele\Documents\Visual Studio 2010\Projects\XPS\project\XPST\bin\ICSharpCode.SharpZipLib.xml +C:\Users\samuele\Documents\Visual Studio 2010\Projects\XPS\project\XPST\bin\AjaxMin.dll diff --git a/project/XPST/obj/Debug/XPST.dll b/project/XPST/obj/Debug/XPST.dll index 15b7c48..97669b5 100644 Binary files a/project/XPST/obj/Debug/XPST.dll and b/project/XPST/obj/Debug/XPST.dll differ diff --git a/project/XPST/obj/EQUA/CSAutoParameterize.parameters.xml b/project/XPST/obj/EQUA/CSAutoParameterize.parameters.xml new file mode 100644 index 0000000..62a077a --- /dev/null +++ b/project/XPST/obj/EQUA/CSAutoParameterize.parameters.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/project/XPST/obj/EQUA/CSAutoParameterize/original/Web.config b/project/XPST/obj/EQUA/CSAutoParameterize/original/Web.config new file mode 100644 index 0000000..9a9f6f5 --- /dev/null +++ b/project/XPST/obj/EQUA/CSAutoParameterize/original/Web.config @@ -0,0 +1,185 @@ + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/project/XPST/obj/EQUA/CSAutoParameterize/transformed/Web.config b/project/XPST/obj/EQUA/CSAutoParameterize/transformed/Web.config new file mode 100644 index 0000000..c908ece --- /dev/null +++ b/project/XPST/obj/EQUA/CSAutoParameterize/transformed/Web.config @@ -0,0 +1,185 @@ + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/project/XPST/obj/EQUA/DesignTimeResolveAssemblyReferencesInput.cache b/project/XPST/obj/EQUA/DesignTimeResolveAssemblyReferencesInput.cache index d54fe24..1219887 100644 Binary files a/project/XPST/obj/EQUA/DesignTimeResolveAssemblyReferencesInput.cache and b/project/XPST/obj/EQUA/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/project/XPST/obj/EQUA/Package/XPST.SourceManifest.xml b/project/XPST/obj/EQUA/Package/XPST.SourceManifest.xml new file mode 100644 index 0000000..646bee1 --- /dev/null +++ b/project/XPST/obj/EQUA/Package/XPST.SourceManifest.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/project/XPST/obj/EQUA/TransformWebConfig/original/Web.config b/project/XPST/obj/EQUA/TransformWebConfig/original/Web.config new file mode 100644 index 0000000..a983844 --- /dev/null +++ b/project/XPST/obj/EQUA/TransformWebConfig/original/Web.config @@ -0,0 +1,185 @@ + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/project/XPST/obj/EQUA/TransformWebConfig/transformed/Web.config b/project/XPST/obj/EQUA/TransformWebConfig/transformed/Web.config new file mode 100644 index 0000000..9a9f6f5 --- /dev/null +++ b/project/XPST/obj/EQUA/TransformWebConfig/transformed/Web.config @@ -0,0 +1,185 @@ + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/project/XPST/obj/EQUA/XPST.csproj.FileListAbsolute.txt b/project/XPST/obj/EQUA/XPST.csproj.FileListAbsolute.txt index 2f41e45..064aee5 100644 --- a/project/XPST/obj/EQUA/XPST.csproj.FileListAbsolute.txt +++ b/project/XPST/obj/EQUA/XPST.csproj.FileListAbsolute.txt @@ -9,3 +9,4 @@ C:\Users\samuele\Documents\Visual Studio 2010\Projects\XPS\project\XPST\obj\EQUA C:\Users\samuele\Documents\Visual Studio 2010\Projects\XPS\project\XPST\obj\EQUA\XPST.pdb C:\Users\samuele\Documents\Visual Studio 2010\Projects\XPS\project\XPST\bin\ICSharpCode.SharpZipLib.pdb C:\Users\samuele\Documents\Visual Studio 2010\Projects\XPS\project\XPST\bin\ICSharpCode.SharpZipLib.xml +C:\Users\samuele\Documents\Visual Studio 2010\Projects\XPS\project\XPST\bin\AjaxMin.dll diff --git a/project/XPST/obj/EQUA/XPST.csprojResolveAssemblyReference.cache b/project/XPST/obj/EQUA/XPST.csprojResolveAssemblyReference.cache index 5f9f071..27a1563 100644 Binary files a/project/XPST/obj/EQUA/XPST.csprojResolveAssemblyReference.cache and b/project/XPST/obj/EQUA/XPST.csprojResolveAssemblyReference.cache differ diff --git a/project/XPST/obj/EQUA/XPST.dll b/project/XPST/obj/EQUA/XPST.dll index ad7e9bd..68182ff 100644 Binary files a/project/XPST/obj/EQUA/XPST.dll and b/project/XPST/obj/EQUA/XPST.dll differ diff --git a/project/XPS_app.suo b/project/XPS_app.suo index e74b249..3edd7fa 100644 Binary files a/project/XPS_app.suo and b/project/XPS_app.suo differ diff --git a/project/XPS_data/bin/Debug/XPS_data.dll b/project/XPS_data/bin/Debug/XPS_data.dll index 54c9972..e38848e 100644 Binary files a/project/XPS_data/bin/Debug/XPS_data.dll and b/project/XPS_data/bin/Debug/XPS_data.dll differ diff --git a/project/XPS_data/obj/Debug/XPS_data.dll b/project/XPS_data/obj/Debug/XPS_data.dll index 54c9972..e38848e 100644 Binary files a/project/XPS_data/obj/Debug/XPS_data.dll and b/project/XPS_data/obj/Debug/XPS_data.dll differ