From 8191ed5790297404007109c0fcd36aedb07f5a92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 4 Nov 2019 10:03:37 +0100 Subject: [PATCH] Version19.51.10 --- swad_HTML.c | 10 ++++++++++ swad_HTML.h | 1 + swad_centre.c | 5 +---- swad_changelog.h | 3 ++- swad_file_browser.c | 3 +-- swad_info.c | 3 +-- swad_logo.c | 5 +---- swad_photo.c | 5 +---- swad_test_import.c | 5 +---- 9 files changed, 19 insertions(+), 21 deletions(-) diff --git a/swad_HTML.c b/swad_HTML.c index ffad7726..99fa1b68 100644 --- a/swad_HTML.c +++ b/swad_HTML.c @@ -897,6 +897,16 @@ void HTM_INPUT_URL (const char *Name,const char *Value, fprintf (Gbl.F.Out," />"); } +void HTM_INPUT_FILE (const char *Accept,bool SubmitOnChange) + { + fprintf (Gbl.F.Out,""); + } + /*****************************************************************************/ /********************************* Text areas ********************************/ /*****************************************************************************/ diff --git a/swad_HTML.h b/swad_HTML.h index 112dfac7..e2db5d0b 100644 --- a/swad_HTML.h +++ b/swad_HTML.h @@ -95,6 +95,7 @@ void HTM_INPUT_EMAIL (const char *Name,unsigned MaxLength,const char *Value, const char *fmt,...); void HTM_INPUT_URL (const char *Name,const char *Value, const char *fmt,...); +void HTM_INPUT_FILE (const char *Accept,bool SubmitOnChange); void HTM_TEXTAREA_Begin (const char *fmt,...); void HTM_TEXTAREA_End (void); diff --git a/swad_centre.c b/swad_centre.c index ccbeecf4..5170d8c7 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -2319,10 +2319,7 @@ void Ctr_RequestPhoto (void) /***** Upload photo *****/ HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); fprintf (Gbl.F.Out,"%s: ",Txt_File_with_the_photo); - fprintf (Gbl.F.Out,"", - Fil_NAME_OF_PARAM_FILENAME_ORG, - Gbl.Form.Id); + HTM_INPUT_FILE ("image/*",true); HTM_LABEL_End (); /***** End box *****/ diff --git a/swad_changelog.h b/swad_changelog.h index 21639539..fced36db 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -487,7 +487,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.51.9 (2019-11-04)" +#define Log_PLATFORM_VERSION "SWAD 19.51.10 (2019-11-04)" #define CSS_FILE "swad19.47.css" #define JS_FILE "swad19.39.js" /* @@ -495,6 +495,7 @@ ps2pdf source.ps destination.pdf // TODO: Impedir la creación y edición de proyectos si no son editables. // TODO: Importante: filtrar proyectos por usuarios (igual que en trabajos o en asistencia) + Version 19.51.10: Nov 04, 2019 Code refactoring in HTML inputs. (245971 lines) Version 19.51.9: Nov 04, 2019 Code refactoring in HTML inputs. (245974 lines) Version 19.51.8: Nov 04, 2019 Code refactoring in HTML inputs. (245968 lines) Version 19.51.7: Nov 03, 2019 Code refactoring in HTML inputs. (246051 lines) diff --git a/swad_file_browser.c b/swad_file_browser.c index 8e8d453b..7ee1d134 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -8435,8 +8435,7 @@ static void Brw_PutFormToUploadOneFileClassic (const char *FileNameToShow) /***** Form to upload one files using the classic way *****/ Frm_StartForm (Brw_ActUploadFileClassic[Gbl.FileBrowser.Type]); Brw_PutImplicitParamsFileBrowser (); - fprintf (Gbl.F.Out,"", - Fil_NAME_OF_PARAM_FILENAME_ORG); + HTM_INPUT_FILE ("*",false); /* Button to send */ Btn_PutCreateButton (Txt_Upload_file); diff --git a/swad_info.c b/swad_info.c index 4fc31a68..2ec72908 100644 --- a/swad_info.c +++ b/swad_info.c @@ -1277,8 +1277,7 @@ void Inf_FormToSendPage (Inf_InfoSrc_t InfoSrc) HTM_DIV_Begin ("class=\"CM\""); HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); fprintf (Gbl.F.Out,"%s: ",Txt_File); - fprintf (Gbl.F.Out,"", - Fil_NAME_OF_PARAM_FILENAME_ORG); + HTM_INPUT_FILE (".htm,.html,.pdf",false); HTM_LABEL_End (); HTM_DIV_End (); diff --git a/swad_logo.c b/swad_logo.c index 0a5f0a0a..46d65d44 100644 --- a/swad_logo.c +++ b/swad_logo.c @@ -315,10 +315,7 @@ void Log_RequestLogo (Hie_Level_t Scope) /***** Upload logo *****/ HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); fprintf (Gbl.F.Out,"%s: ",Txt_File_with_the_logo); - fprintf (Gbl.F.Out,"", - Fil_NAME_OF_PARAM_FILENAME_ORG, - Gbl.Form.Id); + HTM_INPUT_FILE ("image/png",true); HTM_LABEL_End (); /***** End box *****/ diff --git a/swad_photo.c b/swad_photo.c index 4c7a4c65..230f0fa1 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -337,10 +337,7 @@ static void Pho_ReqPhoto (const struct UsrData *UsrDat) /***** Form to upload photo *****/ HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); fprintf (Gbl.F.Out,"%s: ",Txt_File_with_the_photo); - fprintf (Gbl.F.Out,"", - Fil_NAME_OF_PARAM_FILENAME_ORG, - Gbl.Form.Id); + HTM_INPUT_FILE ("image/*",true); HTM_LABEL_End (); /***** End form *****/ diff --git a/swad_test_import.c b/swad_test_import.c index f2191a90..9f61cf91 100644 --- a/swad_test_import.c +++ b/swad_test_import.c @@ -143,10 +143,7 @@ void TsI_ShowFormImportQstsFromXML (void) Frm_StartForm (ActImpTstQst); HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); fprintf (Gbl.F.Out,"%s: ",Txt_XML_file); - fprintf (Gbl.F.Out,"", - Fil_NAME_OF_PARAM_FILENAME_ORG, - Gbl.Form.Id); + HTM_INPUT_FILE (".xml",true); HTM_LABEL_End (); Frm_EndForm ();