diff --git a/GIM_data/WebGimUtils.cs b/GIM_data/WebGimUtils.cs index 4474a7f..c4d212a 100644 --- a/GIM_data/WebGimUtils.cs +++ b/GIM_data/WebGimUtils.cs @@ -76,8 +76,8 @@ public class WebGimUtils // ipotesi: folder bilanciate andando a mettere MAX 1000 files x folder, quindi fodler 0 --> 0...999, 1000 --> 1000...1999, etc int maxFiles = 1000; int numDir = numInt / maxFiles; - string BaseDir = "Files"; - return string.Format(@"{0}\{1}\{2}", BaseDir, numDir*maxFiles, numInt); + string uploadDir = memLayer.ML.CRS("uploadDir"); + return string.Format(@"{0}\{1}\{2}", uploadDir, numDir*maxFiles, numInt); } /// diff --git a/GIM_data/bin/GIM_data.dll b/GIM_data/bin/GIM_data.dll index 36f5cb5..523b39a 100644 Binary files a/GIM_data/bin/GIM_data.dll and b/GIM_data/bin/GIM_data.dll differ diff --git a/GIM_data/bin/SteamWare.dll b/GIM_data/bin/SteamWare.dll index c667178..b7dd02a 100644 Binary files a/GIM_data/bin/SteamWare.dll and b/GIM_data/bin/SteamWare.dll differ diff --git a/GIM_data/obj/Debug/GIM_data.csprojResolveAssemblyReference.cache b/GIM_data/obj/Debug/GIM_data.csprojResolveAssemblyReference.cache index 3117967..95123d8 100644 Binary files a/GIM_data/obj/Debug/GIM_data.csprojResolveAssemblyReference.cache and b/GIM_data/obj/Debug/GIM_data.csprojResolveAssemblyReference.cache differ diff --git a/GIM_site/Files/16000/16239/Daily_Vocal_Exercises.pdf b/GIM_site/Files/16000/16239/Daily_Vocal_Exercises.pdf new file mode 100644 index 0000000..e0db523 Binary files /dev/null and b/GIM_site/Files/16000/16239/Daily_Vocal_Exercises.pdf differ diff --git a/GIM_site/Files/16000/16239/Vocal_Exercises.pdf b/GIM_site/Files/16000/16239/Vocal_Exercises.pdf new file mode 100644 index 0000000..2fb24e0 Binary files /dev/null and b/GIM_site/Files/16000/16239/Vocal_Exercises.pdf differ diff --git a/GIM_site/Web.config b/GIM_site/Web.config index 4926cc0..6a75361 100644 --- a/GIM_site/Web.config +++ b/GIM_site/Web.config @@ -118,6 +118,8 @@ + + diff --git a/GIM_site/WebUserControls/mod_fileUpload.ascx b/GIM_site/WebUserControls/mod_fileUpload.ascx index bb29bb3..2882f25 100644 --- a/GIM_site/WebUserControls/mod_fileUpload.ascx +++ b/GIM_site/WebUserControls/mod_fileUpload.ascx @@ -1,8 +1,9 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_fileUpload.ascx.cs" Inherits="GIM_site.WebUserControls.mod_fileUpload" %> -
- <%: numAllegati %>Allegati +
+ + <%: numAllegati %> files allegati
@@ -38,9 +39,9 @@
- - - + + +
diff --git a/GIM_site/WebUserControls/mod_fileUpload.ascx.cs b/GIM_site/WebUserControls/mod_fileUpload.ascx.cs index 5c09f49..6905f9f 100644 --- a/GIM_site/WebUserControls/mod_fileUpload.ascx.cs +++ b/GIM_site/WebUserControls/mod_fileUpload.ascx.cs @@ -115,6 +115,11 @@ namespace GIM_site.WebUserControls Response.Redirect(Request.Url.AbsoluteUri); } + public string fileUrl(object name) + { + return string.Format("{0}//{1}", WebGimUtils.dirPathIntMtz(numIntMtz), name); + } + protected void DownloadFile(object sender, EventArgs e) { byte[] bytes; diff --git a/GIM_site/bin/SteamWare.dll b/GIM_site/bin/SteamWare.dll index c667178..b7dd02a 100644 Binary files a/GIM_site/bin/SteamWare.dll and b/GIM_site/bin/SteamWare.dll differ diff --git a/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache b/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache index 3701f3f..3c87e32 100644 Binary files a/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache and b/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache differ