From 17b311341b8488ec8deef05e251761114a6020a8 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 16 Sep 2015 17:30:14 +0200 Subject: [PATCH] allegati: ok upload/download in nuova pagina... --- CMS-SC-Data/bin/Debug/CMS-SC-Data.dll | Bin 364544 -> 364544 bytes CMS-SC-Data/bin/Debug/SteamWare.dll | Bin 619520 -> 619520 bytes CMS-SC-Data/obj/Debug/CMS-SC-Data.dll | Bin 364544 -> 364544 bytes CMS_SC/BootstrapNoUpdPnl.Master | 112 ++++++++++++ CMS_SC/BootstrapNoUpdPnl.Master.cs | 51 ++++++ CMS_SC/BootstrapNoUpdPnl.Master.designer.cs | 159 ++++++++++++++++++ CMS_SC/CMS_SC.csproj | 24 +++ CMS_SC/Empty.Master | 112 ++++++++++++ CMS_SC/Empty.Master.cs | 37 ++++ CMS_SC/Empty.Master.designer.cs | 141 ++++++++++++++++ CMS_SC/FileManager.aspx | 8 + CMS_SC/FileManager.aspx.cs | 20 +++ CMS_SC/FileManager.aspx.designer.cs | 24 +++ CMS_SC/Test.aspx | 4 +- CMS_SC/ToDo.txt | 9 +- CMS_SC/Web.config | 2 + CMS_SC/WebUserControls/mod_collaudi.ascx | 7 +- CMS_SC/WebUserControls/mod_collaudi.ascx.cs | 49 ++++++ CMS_SC/WebUserControls/mod_fileUpload.ascx | 155 +++++++++-------- .../mod_fileUpload.ascx.designer.cs | 9 - CMS_SC/bin/CMS-SC-Data.dll | Bin 364544 -> 364544 bytes CMS_SC/bin/CMS_SC.dll | Bin 351232 -> 352768 bytes CMS_SC/bin/CMS_SC.dll.config | 2 + CMS_SC/bin/SteamWare.dll | Bin 619520 -> 619520 bytes VersGen/CMS_SC.cs | 4 +- VersGen/CMS_SC.tt | 4 +- VersGen/bin/Debug/VersGen.dll | Bin 4096 -> 4096 bytes 27 files changed, 832 insertions(+), 101 deletions(-) create mode 100644 CMS_SC/BootstrapNoUpdPnl.Master create mode 100644 CMS_SC/BootstrapNoUpdPnl.Master.cs create mode 100644 CMS_SC/BootstrapNoUpdPnl.Master.designer.cs create mode 100644 CMS_SC/Empty.Master create mode 100644 CMS_SC/Empty.Master.cs create mode 100644 CMS_SC/Empty.Master.designer.cs create mode 100644 CMS_SC/FileManager.aspx create mode 100644 CMS_SC/FileManager.aspx.cs create mode 100644 CMS_SC/FileManager.aspx.designer.cs diff --git a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll index fcc42f03e9fb26334a6e3321aad3703c95d93e95..a4f747dbda9c2fed3c1a514a3501d373ff148fce 100644 GIT binary patch delta 104 zcmZozAl9%zY(fW9WLINXYZqf{7gK8&b88pN)-KjVaRT}^BAxjz!X6W3XUMMAzdm() zOgyWKhE8PH&rk*+U;^SMAfB<5m0?CZD??DQOK{HP`@v^a-+0b;yIRJU^`mS1ns(L@ F4gjR=C4~S0 delta 104 zcmZozAl9%zY(fXq^VG(!)-J}@E~eHl=GHEjtzE2#;sorbHEjQTcD?KVL#~omy_*8I z$HcR$Xy`mo{Ta#t1WZ8O1jI9zvNFtQXJrTqb_rHUdaS-`MXf{cwWTS!*RM!#U(?PS G!T|t%)+jvy diff --git a/CMS-SC-Data/bin/Debug/SteamWare.dll b/CMS-SC-Data/bin/Debug/SteamWare.dll index c1266359422399858f0f670aeee0533834e33f3e..354c46c6dc9768ceabcca478591a1def39eb6bff 100644 GIT binary patch delta 96 zcmV-m0H6PW=p}&YC6I^$S&D&*g^B@%iUNg-1BHqNg^C4*iUx&>2Zf3VwTcNABoLqz zKH%Q$4nx0L(3`6++IP3GBnhZR0$GZeT51Uz5WW5vn^uSuPPKB|mrs<;+_!{k3495c CR4Cy9 delta 96 zcmV-m0H6PW=p}&YC6I^$=4FA3g^B@%iUNg-1BHqNg^C4*iUx&>2Zf3VwTcNABoM;p zo8J2r8bGkhssoXrP!qSXBnhZR0_J6xT51Uz5X~)Nad&LrNSq|_FEM5Ug|~!i3495# Cn + +<%@ Register Src="~/WebUserControls/mod_testata.ascx" TagPrefix="uc1" TagName="mod_testata" %> + + + + + + + + + + + + <%: Page.Title %> - CMS_SC + + + <%: Scripts.Render("~/bundles/modernizr") %> + <%: Scripts.Render("~/bundles/jquery") %> + <%: Scripts.Render("~/bundles/jqueryui") %> + + + + + + + + + +
+ + + <%--To learn more about bundling scripts in ScriptManager see http://go.microsoft.com/fwlink/?LinkID=272931&clcid=0x409 --%> + <%--Framework Scripts--%> + + + + + + + + + + + <%--Site Scripts--%> + + + + + + + + + + +
+ +
+

hello world!

+ Area main content da customizzare +
+ +
+ + + +
+ + + +
+ + +
+ + + <%: Scripts.Render("~/bundles/jSteamware") %> + + + diff --git a/CMS_SC/BootstrapNoUpdPnl.Master.cs b/CMS_SC/BootstrapNoUpdPnl.Master.cs new file mode 100644 index 0000000..7ba13c2 --- /dev/null +++ b/CMS_SC/BootstrapNoUpdPnl.Master.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace CMS_SC +{ + public partial class BootstrapNoUpdPnl : System.Web.UI.MasterPage + { + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + lblVers.Text = string.Format("v.{0}", System.Reflection.Assembly.GetExecutingAssembly().GetName().Version); + setTimer(); + updateLabels(); + } + } + /// + /// imposta il tempo di scadenza del timer x il refresh della pagina (della parte top) per evitare che la sessione sul server scada + /// + private void setTimer() + { + Timer1.Interval = SteamWare.memLayer.ML.confReadInt("intUpdatePagina_ms"); + } + protected void Timer1_Tick(object sender, EventArgs e) + { + updateLabels(); + } + private void updateLabels() + { + lblDateTime.Text = DateTime.Now.ToString(); + } + /// + /// determina visibilità controllo ricerca + /// + public bool showSearch + { + get + { + return mod_testata.pageHasSearch; + } + set + { + mod_testata.pageHasSearch = value; + } + } + } +} \ No newline at end of file diff --git a/CMS_SC/BootstrapNoUpdPnl.Master.designer.cs b/CMS_SC/BootstrapNoUpdPnl.Master.designer.cs new file mode 100644 index 0000000..c94630d --- /dev/null +++ b/CMS_SC/BootstrapNoUpdPnl.Master.designer.cs @@ -0,0 +1,159 @@ +//------------------------------------------------------------------------------ +// +// 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 CMS_SC { + + + public partial class BootstrapNoUpdPnl { + + /// + /// PlaceHolder1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1; + + /// + /// BundleReference1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; + + /// + /// BundleReference2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; + + /// + /// HeadContent control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder HeadContent; + + /// + /// 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; + + /// + /// ScriptManager1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.ScriptManager ScriptManager1; + + /// + /// uppNavbar control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel uppNavbar; + + /// + /// mod_testata control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::CMS_SC.WebUserControls.mod_testata mod_testata; + + /// + /// FeaturedContent control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder FeaturedContent; + + /// + /// MainContent control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent; + + /// + /// uppFooter control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel uppFooter; + + /// + /// Timer1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.Timer Timer1; + + /// + /// 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; + + /// + /// 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; + + /// + /// updtRicerca control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdateProgress updtRicerca; + + /// + /// PlaceHolder2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder2; + } +} diff --git a/CMS_SC/CMS_SC.csproj b/CMS_SC/CMS_SC.csproj index 658b2e6..b17758b 100644 --- a/CMS_SC/CMS_SC.csproj +++ b/CMS_SC/CMS_SC.csproj @@ -255,6 +255,7 @@ + @@ -299,6 +300,7 @@ + @@ -313,6 +315,7 @@ + Designer @@ -478,6 +481,13 @@ Bootstrap.Master + + BootstrapNoUpdPnl.Master + ASPXCodeBehind + + + BootstrapNoUpdPnl.Master + Collaudi.aspx ASPXCodeBehind @@ -506,6 +516,20 @@ ElencoSchede.aspx + + Empty.Master + ASPXCodeBehind + + + Empty.Master + + + FileManager.aspx + ASPXCodeBehind + + + FileManager.aspx + Global.asax diff --git a/CMS_SC/Empty.Master b/CMS_SC/Empty.Master new file mode 100644 index 0000000..fcc9877 --- /dev/null +++ b/CMS_SC/Empty.Master @@ -0,0 +1,112 @@ +<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Empty.master.cs" Inherits="CMS_SC.Empty" %> + +<%@ Register Src="~/WebUserControls/mod_testata.ascx" TagPrefix="uc1" TagName="mod_testata" %> + + + + + + + + + + + + <%: Page.Title %> - CMS_SC + + + <%: Scripts.Render("~/bundles/modernizr") %> + <%: Scripts.Render("~/bundles/jquery") %> + <%: Scripts.Render("~/bundles/jqueryui") %> + + + + + + + + + +
+ + + <%--To learn more about bundling scripts in ScriptManager see http://go.microsoft.com/fwlink/?LinkID=272931&clcid=0x409 --%> + <%--Framework Scripts--%> + + + + + + + + + + + <%--Site Scripts--%> + + + <%-- + + + + + --%> + + +
+ +
+

hello world!

+ Area main content da customizzare +
+ +
+ + + +
+ + + +
+ + +
+ + + <%: Scripts.Render("~/bundles/jSteamware") %> + + + diff --git a/CMS_SC/Empty.Master.cs b/CMS_SC/Empty.Master.cs new file mode 100644 index 0000000..94b5e25 --- /dev/null +++ b/CMS_SC/Empty.Master.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace CMS_SC +{ + public partial class Empty : System.Web.UI.MasterPage + { + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + lblVers.Text = string.Format("v.{0}", System.Reflection.Assembly.GetExecutingAssembly().GetName().Version); + setTimer(); + updateLabels(); + } + } + /// + /// imposta il tempo di scadenza del timer x il refresh della pagina (della parte top) per evitare che la sessione sul server scada + /// + private void setTimer() + { + Timer1.Interval = SteamWare.memLayer.ML.confReadInt("intUpdatePagina_ms"); + } + protected void Timer1_Tick(object sender, EventArgs e) + { + updateLabels(); + } + private void updateLabels() + { + lblDateTime.Text = DateTime.Now.ToString(); + } + } +} \ No newline at end of file diff --git a/CMS_SC/Empty.Master.designer.cs b/CMS_SC/Empty.Master.designer.cs new file mode 100644 index 0000000..a9e255c --- /dev/null +++ b/CMS_SC/Empty.Master.designer.cs @@ -0,0 +1,141 @@ +//------------------------------------------------------------------------------ +// +// 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 CMS_SC { + + + public partial class Empty { + + /// + /// PlaceHolder1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1; + + /// + /// BundleReference1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; + + /// + /// BundleReference2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; + + /// + /// HeadContent control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder HeadContent; + + /// + /// 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; + + /// + /// ScriptManager1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.ScriptManager ScriptManager1; + + /// + /// FeaturedContent control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder FeaturedContent; + + /// + /// MainContent control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent; + + /// + /// uppFooter control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel uppFooter; + + /// + /// Timer1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.Timer Timer1; + + /// + /// 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; + + /// + /// 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; + + /// + /// updtRicerca control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdateProgress updtRicerca; + + /// + /// PlaceHolder2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder2; + } +} diff --git a/CMS_SC/FileManager.aspx b/CMS_SC/FileManager.aspx new file mode 100644 index 0000000..2315af3 --- /dev/null +++ b/CMS_SC/FileManager.aspx @@ -0,0 +1,8 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Empty.Master" AutoEventWireup="true" CodeBehind="FileManager.aspx.cs" Inherits="CMS_SC.FileManager" %> + +<%@ Register Src="~/WebUserControls/mod_fileUpload.ascx" TagPrefix="uc1" TagName="mod_fileUpload" %> + + + + + diff --git a/CMS_SC/FileManager.aspx.cs b/CMS_SC/FileManager.aspx.cs new file mode 100644 index 0000000..058e9d6 --- /dev/null +++ b/CMS_SC/FileManager.aspx.cs @@ -0,0 +1,20 @@ +using SteamWare; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace CMS_SC +{ + public partial class FileManager : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + // imposto filtKey + mod_fileUpload.enableMod = memLayer.ML.QSB("enableMod"); + mod_fileUpload.filtKey = memLayer.ML.QSS("filtKey"); + } + } +} \ No newline at end of file diff --git a/CMS_SC/FileManager.aspx.designer.cs b/CMS_SC/FileManager.aspx.designer.cs new file mode 100644 index 0000000..316e2b0 --- /dev/null +++ b/CMS_SC/FileManager.aspx.designer.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// 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 CMS_SC { + + + public partial class FileManager { + + /// + /// mod_fileUpload control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::CMS_SC.WebUserControls.mod_fileUpload mod_fileUpload; + } +} diff --git a/CMS_SC/Test.aspx b/CMS_SC/Test.aspx index 5606a1e..2a919f6 100644 --- a/CMS_SC/Test.aspx +++ b/CMS_SC/Test.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="Test.aspx.cs" Inherits="CMS_SC.Test" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/BootstrapNoUpdPnl.Master" AutoEventWireup="true" CodeBehind="Test.aspx.cs" Inherits="CMS_SC.Test" %> <%@ Register Src="~/WebUserControls/mod_fileUpload.ascx" TagPrefix="uc1" TagName="mod_fileUpload" %> @@ -8,5 +8,5 @@ area featured - + diff --git a/CMS_SC/ToDo.txt b/CMS_SC/ToDo.txt index 13b99a9..3ea8f6f 100644 --- a/CMS_SC/ToDo.txt +++ b/CMS_SC/ToDo.txt @@ -4,10 +4,7 @@ - TODO's ---------------------------------------------------------------------------------------------------------------- -- uso modulo file: passare KEY ricerca come IdxDossier.CodScheda.Vers.NumSCheda.CodMisura.Fase -- gestione allegati tipo FILE (blob? in scheda o "generale"?) -- allegati FILE (su DB come link?) - +- show/hide pannello storico schede - Potrebbero servire schede speciali in cui i valori di Minimo e Massimo sono variabili (tolleranze variabili a FDO) -> si è deciso con Carlo di costruire delle schede con 2 valori TESTUALI + un file allegato, x cui misura 1 = valori massimi da ORDINE, misura 2 valori massimi rilevati, misura 3 OK / KO (con deroga...), misura 4 = allegato file @@ -69,7 +66,9 @@ Gestione FILES - creazione oggetti dataset - moduli gestione files... - modificare file: mettere KEY ricerca come IdxDossier.CodScheda.Vers.NumSCheda.CodMisura.Fase - +- uso modulo file: passare KEY ricerca come IdxDossier.CodScheda.Vers.NumSCheda.CodMisura.Fase +- gestione allegati tipo FILE (blob? in scheda o "generale"?) +- allegati FILE (su DB come link?) ................................................................................................................ diff --git a/CMS_SC/Web.config b/CMS_SC/Web.config index 603daf5..f926000 100644 --- a/CMS_SC/Web.config +++ b/CMS_SC/Web.config @@ -61,6 +61,8 @@ + + diff --git a/CMS_SC/WebUserControls/mod_collaudi.ascx b/CMS_SC/WebUserControls/mod_collaudi.ascx index faa8169..9b261aa 100644 --- a/CMS_SC/WebUserControls/mod_collaudi.ascx +++ b/CMS_SC/WebUserControls/mod_collaudi.ascx @@ -25,7 +25,8 @@
- + <%# contaAllegati(Eval("ValoreMis")) %> + <%----%>
@@ -35,7 +36,9 @@
- + <%# contaAllegati(Eval("ValoreMis")) %> + <%--<%: traduci("FileAllegati") %>--%> + <%----%>
diff --git a/CMS_SC/WebUserControls/mod_collaudi.ascx.cs b/CMS_SC/WebUserControls/mod_collaudi.ascx.cs index 3eb0a09..df12e21 100644 --- a/CMS_SC/WebUserControls/mod_collaudi.ascx.cs +++ b/CMS_SC/WebUserControls/mod_collaudi.ascx.cs @@ -207,5 +207,54 @@ namespace CMS_SC.WebUserControls hfEditEnabled.Value = value.ToString(); } } + + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(string lemma) + { + return user_std.UtSn.Traduci(lemma); + } + /// + /// formatta URL x mostrare i file associati al record + /// + /// + /// + /// + public string fileTarget(object _filter, object _enableMod) + { + string answ = "FileManager"; + try + { + answ = string.Format(memLayer.ML.CRS("fileManUrl"), _filter, _enableMod); + } + catch + { } + return answ; + } + + public string contaAllegati(object filtro) + { + string answ = traduci("FileAllegati"); + try + { + int numFile = DtProxy.man.taFiles.getByFiltKey(filtro.ToString()).Rows.Count; + answ = string.Format("{0} {1}", numFile, answ); + } + catch + { } + return answ; + } + +#if false + protected void lbFileMan_DataBinding(object sender, EventArgs e) + { + LinkButton lnkBtn = (LinkButton)sender; + lnkBtn.Attributes.Add("target", "_blank"); + //lnkBtn.Attributes.Add("onClick", "window.open (this.href, 'Files', 'height=500,width=400,scrollbars'); return false"); + } +#endif } } \ No newline at end of file diff --git a/CMS_SC/WebUserControls/mod_fileUpload.ascx b/CMS_SC/WebUserControls/mod_fileUpload.ascx index ee541db..8dc712b 100644 --- a/CMS_SC/WebUserControls/mod_fileUpload.ascx +++ b/CMS_SC/WebUserControls/mod_fileUpload.ascx @@ -1,84 +1,81 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_fileUpload.ascx.cs" Inherits="CMS_SC.WebUserControls.mod_fileUpload" %> - - - - - -
- -
-
-
- - +
+ <%-- + + + + --%> +
+
-
- +
+
+ + +
+
+ +
-
- - - - - - - - - - - - - - <%: traduci("NoFileFound") %> - - - - -
- -
- - - - - - - - -
- - - -
-
- - -
- - - - - -
- -
- - - - - - - - - - - - - - - + + + + + + + + + + + + + + <%: traduci("NoFileFound") %> + + + + +
+ +
+ + + + + + + + +
+ + +
+ + +
+ + + + + +
+
+ + + + + + + + + + + + + - - + <%-- + --%> +
diff --git a/CMS_SC/WebUserControls/mod_fileUpload.ascx.designer.cs b/CMS_SC/WebUserControls/mod_fileUpload.ascx.designer.cs index 17ae5d3..548b71a 100644 --- a/CMS_SC/WebUserControls/mod_fileUpload.ascx.designer.cs +++ b/CMS_SC/WebUserControls/mod_fileUpload.ascx.designer.cs @@ -12,15 +12,6 @@ namespace CMS_SC.WebUserControls { public partial class mod_fileUpload { - /// - /// uppContainer control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.UpdatePanel uppContainer; - /// /// divFileUpl control. /// diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index fcc42f03e9fb26334a6e3321aad3703c95d93e95..a4f747dbda9c2fed3c1a514a3501d373ff148fce 100644 GIT binary patch delta 104 zcmZozAl9%zY(fW9WLINXYZqf{7gK8&b88pN)-KjVaRT}^BAxjz!X6W3XUMMAzdm() zOgyWKhE8PH&rk*+U;^SMAfB<5m0?CZD??DQOK{HP`@v^a-+0b;yIRJU^`mS1ns(L@ F4gjR=C4~S0 delta 104 zcmZozAl9%zY(fXq^VG(!)-J}@E~eHl=GHEjtzE2#;sorbHEjQTcD?KVL#~omy_*8I z$HcR$Xy`mo{Ta#t1WZ8O1jI9zvNFtQXJrTqb_rHUdaS-`MXf{cwWTS!*RM!#U(?PS G!T|t%)+jvy diff --git a/CMS_SC/bin/CMS_SC.dll b/CMS_SC/bin/CMS_SC.dll index 35c27150f1701c83844db2cdacfe3bdd532c419b..226cb414f5e55d76c1dc903b751aaeeb7b79d4d9 100644 GIT binary patch delta 35993 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 delta 34803 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 + + diff --git a/CMS_SC/bin/SteamWare.dll b/CMS_SC/bin/SteamWare.dll index c1266359422399858f0f670aeee0533834e33f3e..354c46c6dc9768ceabcca478591a1def39eb6bff 100644 GIT binary patch delta 96 zcmV-m0H6PW=p}&YC6I^$S&D&*g^B@%iUNg-1BHqNg^C4*iUx&>2Zf3VwTcNABoLqz zKH%Q$4nx0L(3`6++IP3GBnhZR0$GZeT51Uz5WW5vn^uSuPPKB|mrs<;+_!{k3495c CR4Cy9 delta 96 zcmV-m0H6PW=p}&YC6I^$=4FA3g^B@%iUNg-1BHqNg^C4*iUx&>2Zf3VwTcNABoM;p zo8J2r8bGkhssoXrP!qSXBnhZR0_J6xT51Uz5X~)Nad&LrNSq|_FEM5Ug|~!i3495# Cn")] -[assembly: AssemblyFileVersion("1.8.073.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("1.8.074.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("1.8.074.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2009-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index 19423007281d348779cd08d71d1c3841ab5bdc96..6131baf301ff4107c5d28e14196d69f577b5bab9 100644 GIT binary patch delta 123 zcmZorXi%8Y!E~x-V^;?=qt|9(7EdODZ00u$`ldg2SZ_Pi^h#Xn^~pJGaf~LDPqXa> zDxBQKE+rsba%?*D6IZ9H$zSCfE0%oSyoLQ16Q>sg2LmHREYO(gT!D;?CYxV!#{;R! bp1ii4CJcHE#tbG5mXjMfiZ(Oy{bvLKNk%GV delta 123 zcmZorXi%8Y!F0rGV^;?=qvvK}7EdOD^v9-5SA@I$Tkf7YmS295b8-$_9Ha5%(`4f|A&(Z9Avg3Ad-ok#1iPMvTgMpDD7HG_Lu0Tdc