diff --git a/GMW/GMW_Term/GMW_Term.csproj b/GMW/GMW_Term/GMW_Term.csproj index ecbdaabe..b7b7eb44 100644 --- a/GMW/GMW_Term/GMW_Term.csproj +++ b/GMW/GMW_Term/GMW_Term.csproj @@ -88,6 +88,13 @@ Particolare.aspx + + SmartList.aspx + ASPXCodeBehind + + + SmartList.aspx + UDC.aspx @@ -201,6 +208,13 @@ mod_searchResults.ascx + + mod_smartList.ascx + ASPXCodeBehind + + + mod_smartList.ascx + AutoCompletamento.asmx Component @@ -330,6 +344,8 @@ + + diff --git a/GMW/GMW_Term/SmartList.aspx b/GMW/GMW_Term/SmartList.aspx new file mode 100644 index 00000000..f2e444e4 --- /dev/null +++ b/GMW/GMW_Term/SmartList.aspx @@ -0,0 +1,7 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/CompactBCode.Master" AutoEventWireup="true" CodeBehind="SmartList.aspx.cs" Inherits="GMW_Term.SmartList" %> +<%@ Register src="WebUserControls/mod_smartList.ascx" tagname="mod_smartList" tagprefix="uc1" %> + + + + + diff --git a/GMW/GMW_Term/SmartList.aspx.cs b/GMW/GMW_Term/SmartList.aspx.cs new file mode 100644 index 00000000..e7aeca70 --- /dev/null +++ b/GMW/GMW_Term/SmartList.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace GMW_Term +{ + public partial class SmartList : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} diff --git a/GMW/GMW_Term/SmartList.aspx.designer.cs b/GMW/GMW_Term/SmartList.aspx.designer.cs new file mode 100644 index 00000000..d468cd43 --- /dev/null +++ b/GMW/GMW_Term/SmartList.aspx.designer.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// 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 GMW_Term { + + + public partial class SmartList { + + /// + /// mod_smartList1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW_Term.WebUserControls.mod_smartList mod_smartList1; + } +} diff --git a/GMW/GMW_Term/Style.css b/GMW/GMW_Term/Style.css index db97b852..e5c59b94 100644 --- a/GMW/GMW_Term/Style.css +++ b/GMW/GMW_Term/Style.css @@ -53,7 +53,7 @@ font-size: 9pt; } -.quadro1, .quadro2 +.quadro1_wide { float: none; width: 100%; @@ -63,6 +63,24 @@ margin-bottom: 2px; } +.quadro1, .quadro3 +{ + float: left; + width: 48%; + text-align: center; + vertical-align: middle; + margin-top: 2px; + margin-bottom: 2px; +} +.quadro2, .quadro4 +{ + float: right; + width: 48%; + text-align: center; + vertical-align: middle; + margin-top: 2px; + margin-bottom: 2px; +} .userBanner { @@ -355,7 +373,15 @@ white-space: pre; } - +.btnSmartListBig +{ + width: 95px; + height: 90px; + border: solid 2px red; + background-color: #FFEE66; + font-weight: bold; + white-space: pre; +} .btnListBig { width: 95px; diff --git a/GMW/GMW_Term/Web.config b/GMW/GMW_Term/Web.config index 298992e9..cbe0244c 100644 --- a/GMW/GMW_Term/Web.config +++ b/GMW/GMW_Term/Web.config @@ -57,7 +57,7 @@ - + diff --git a/GMW/GMW_Term/WebUserControls/mod_home.ascx b/GMW/GMW_Term/WebUserControls/mod_home.ascx index c132172d..ff6fd31d 100644 --- a/GMW/GMW_Term/WebUserControls/mod_home.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_home.ascx @@ -1,10 +1,13 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_home.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_home" %> -
+
-
- +
+ +
+
+
diff --git a/GMW/GMW_Term/WebUserControls/mod_home.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_home.ascx.cs index 97722042..211e6d8c 100644 --- a/GMW/GMW_Term/WebUserControls/mod_home.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_home.ascx.cs @@ -30,8 +30,8 @@ namespace GMW_Term.WebUserControls //btn2.AccessKey = "3"; btn3.Text = traduci("TakeList") + "\n[Alt+7]"; btn3.AccessKey = "7"; - //btn4.Text = traduci("ActiveTask") + "\n[Alt+9]"; - //btn4.AccessKey = "9"; + btn4.Text = traduci("SmartList") + "\n[Alt+9]"; + btn4.AccessKey = "9"; } protected void btn1_Click(object sender, EventArgs e) @@ -51,7 +51,7 @@ namespace GMW_Term.WebUserControls protected void btn4_Click1(object sender, EventArgs e) { - Response.Redirect("ActiveTask.aspx"); + Response.Redirect("SmartList.aspx"); } } } diff --git a/GMW/GMW_Term/WebUserControls/mod_home.ascx.designer.cs b/GMW/GMW_Term/WebUserControls/mod_home.ascx.designer.cs index 97caafbf..1a5f5572 100644 --- a/GMW/GMW_Term/WebUserControls/mod_home.ascx.designer.cs +++ b/GMW/GMW_Term/WebUserControls/mod_home.ascx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 +// Runtime Version:2.0.50727.4963 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -30,5 +30,14 @@ namespace GMW_Term.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Button btn3; + + /// + /// btn4 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btn4; } } diff --git a/GMW/GMW_Term/WebUserControls/mod_smartList.ascx b/GMW/GMW_Term/WebUserControls/mod_smartList.ascx new file mode 100644 index 00000000..2186bb00 --- /dev/null +++ b/GMW/GMW_Term/WebUserControls/mod_smartList.ascx @@ -0,0 +1,2 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_smartList.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_smartList" %> +prova prova prova \ No newline at end of file diff --git a/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.cs new file mode 100644 index 00000000..42252a71 --- /dev/null +++ b/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace GMW_Term.WebUserControls +{ + public partial class mod_smartList : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.designer.cs b/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.designer.cs new file mode 100644 index 00000000..c0f6efb7 --- /dev/null +++ b/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.designer.cs @@ -0,0 +1,16 @@ +//------------------------------------------------------------------------------ +// +// 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 GMW_Term.WebUserControls { + + + public partial class mod_smartList { + } +} diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index 6ac7f4de..466d71e4 100644 Binary files a/GMW/GMW_Term/bin/GMW_Term.dll and b/GMW/GMW_Term/bin/GMW_Term.dll differ diff --git a/GMW/GMW_Term/bin/GMW_data.dll b/GMW/GMW_Term/bin/GMW_data.dll index 631a4452..fdabf987 100644 Binary files a/GMW/GMW_Term/bin/GMW_data.dll and b/GMW/GMW_Term/bin/GMW_data.dll differ diff --git a/GMW/GMW_Term/mazzAppSettings.config b/GMW/GMW_Term/mazzAppSettings.config index 394f5323..54d2c598 100644 --- a/GMW/GMW_Term/mazzAppSettings.config +++ b/GMW/GMW_Term/mazzAppSettings.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW_Term/mazzAppSettingsSP.config b/GMW/GMW_Term/mazzAppSettingsSP.config index 063e8cc6..ae94c088 100644 --- a/GMW/GMW_Term/mazzAppSettingsSP.config +++ b/GMW/GMW_Term/mazzAppSettingsSP.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW_Term/mazzAppSettingsTK.config b/GMW/GMW_Term/mazzAppSettingsTK.config index bbce0631..63ff66ef 100644 --- a/GMW/GMW_Term/mazzAppSettingsTK.config +++ b/GMW/GMW_Term/mazzAppSettingsTK.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll index 6ac7f4de..466d71e4 100644 Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ diff --git a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache index 0228e01a..95f5c572 100644 Binary files a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj index e8d8d2ac..422fe26f 100644 --- a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj +++ b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj @@ -344,14 +344,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMWT" - "ProductCode" = "8:{501A0239-9C30-48B1-82FB-A85655092CAC}" - "PackageCode" = "8:{F7350DEC-86CA-4229-840F-3B8F183BEDD3}" + "ProductCode" = "8:{1A84D167-51A6-4D92-9B33-3228084263D0}" + "PackageCode" = "8:{A828DB92-C6CD-4457-88A9-CA0C17AF74F3}" "UpgradeCode" = "8:{B348C50D-8DAD-4430-AEF0-60800C94CB78}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.1.402" + "ProductVersion" = "8:1.1.403" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" @@ -824,7 +824,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_9C1BA08A590A44EC9515C0F91AD50A1D" { - "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe" + "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A89965CB827F476CB8D496FFFC9653DF" @@ -852,7 +852,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_9F48A959FA0448498F7A80EFAE9D3368" { - "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe" + "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A89965CB827F476CB8D496FFFC9653DF"