Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version19.82.2

This commit is contained in:
Antonio Cañas Vargas 2019-12-03 19:36:30 +01:00
parent 5233b622e2
commit 2294375c69
6 changed files with 46 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
swad_HTML.c
View File

@ -1328,11 +1328,17 @@ void HTM_INPUT_CHECKBOX (const char *Name,bool SubmitOnChange,
/********************************** Buttons **********************************/
/*****************************************************************************/
void HTM_BUTTON_OnMouseDown_Begin (const char *Class)
void HTM_BUTTON_OnMouseDown_Begin (const char *Title,const char *Class)
{
fprintf (Gbl.F.Out,"<button type=\"submit\" class=\"%s\""
" onmousedown=\"document.getElementById('%s').submit();return false;\">",
Class,Gbl.Form.Id);
fprintf (Gbl.F.Out,"<button type=\"submit\"");
if (Title)
if (Title[0])
HTM_TxtF (" title=\"%s\"",Title);
if (Class)
if (Class[0])
HTM_TxtF (" class=\"%s\"",Class);
fprintf (Gbl.F.Out," onmousedown=\"document.getElementById('%s').submit();return false;\">",
Gbl.Form.Id);
HTM_BUTTON_NestingLevel++;
}
@ -1347,7 +1353,7 @@ void HTM_BUTTON_SUBMIT_Begin (const char *Title,const char *Class,const char *On
HTM_TxtF (" class=\"%s\"",Class);
if (OnSubmit) // JavaScript function to be called before submitting the form
if (OnSubmit[0])
HTM_TxtF ("onsubmit=\"%s;\"",OnSubmit);
HTM_TxtF (" onsubmit=\"%s;\"",OnSubmit);
fprintf (Gbl.F.Out,">");
HTM_BUTTON_NestingLevel++;
@ -1364,7 +1370,7 @@ void HTM_BUTTON_BUTTON_Begin (const char *Title,const char *Class,const char *On
HTM_TxtF (" class=\"%s\"",Class);
if (OnClick) // JavaScript function to be called when clicking the button
if (OnClick[0])
HTM_TxtF ("onclick=\"%s;\"",OnClick);
HTM_TxtF (" onclick=\"%s;\"",OnClick);
fprintf (Gbl.F.Out,">");
HTM_BUTTON_NestingLevel++;

2
swad_HTML.h
View File

@ -136,7 +136,7 @@ void HTM_INPUT_RADIO (const char *Name,bool SubmitOnClick,
void HTM_INPUT_CHECKBOX (const char *Name,bool SubmitOnChange,
const char *fmt,...);
void HTM_BUTTON_OnMouseDown_Begin (const char *Class);
void HTM_BUTTON_OnMouseDown_Begin (const char *Title,const char *Class);
void HTM_BUTTON_SUBMIT_Begin (const char *Title,const char *Class,const char *OnSubmit);
void HTM_BUTTON_BUTTON_Begin (const char *Title,const char *Class,const char *OnClick);
void HTM_BUTTON_Animated_Begin (const char *Title,const char *Class,const char *OnClick);

3
swad_changelog.h
View File

@ -490,7 +490,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.82.1 (2019-12-03)"
#define Log_PLATFORM_VERSION "SWAD 19.82.2 (2019-12-03)"
#define CSS_FILE "swad19.82.css"
#define JS_FILE "swad19.70.js"
/*
@ -498,6 +498,7 @@ ps2pdf source.ps destination.pdf
// TODO: Impedir la creación y edición de proyectos si no son editables.
// TODO: En cada juego, poder listar los resultados en una tabla como la de resultados globales
Version 19.82.2: Dec 03, 2019 Some messages translated. (247781 lines)
Version 19.82.1: Dec 03, 2019 Fixed bug in surveys.
Fixed bug in statistics.
Fixed bug in matches. (247757 lines)

16
swad_match.c
View File

@ -2471,7 +2471,7 @@ static void Mch_PutCheckboxResult (struct Match *Match)
static void Mch_PutIfAnswered (const struct Match *Match,bool Answered)
{
extern const char *Txt_View_results;
extern const char *Txt_View_my_answer;
/***** Start container *****/
HTM_DIV_Begin ("class=\"MCH_SHOW_RESULTS\"");
@ -2484,15 +2484,11 @@ static void Mch_PutIfAnswered (const struct Match *Match,bool Answered)
Frm_StartForm (ActSeeMchAnsQstStd);
Mch_PutParamMchCod (Match->MchCod); // Current match being played
HTM_A_Begin ("href=\"\" class=\"DAT_SMALL\" title=\"%s\" "
" onclick=\"document.getElementById('%s').submit();return false;\"",
"Ver mi respuesta", // TODO: Need translation!!!!
Gbl.Form.Id);
HTM_TxtF ("<i class=\"%s\" title=\"%s\"></i>",
"fas fa-check-circle",
"Respondida"); // TODO: Need translation!!!!
HTM_BUTTON_OnMouseDown_Begin (Txt_View_my_answer,"BT_LINK DAT_SMALL");
HTM_TxtF ("<i class=\"%s\"></i>","fas fa-check-circle");
HTM_TxtF ("&nbsp;%s","Respondida"); // TODO: Need translation!!!!
HTM_A_End ();
HTM_BUTTON_End ();
/* End form */
Frm_EndForm ();
@ -2700,7 +2696,7 @@ static void Mch_ShowQuestionAndAnswersStd (struct Match *Match,
"",
'A' + (char) NumOpt) < 0)
Lay_NotEnoughMemoryExit ();
HTM_BUTTON_OnMouseDown_Begin (Class);
HTM_BUTTON_OnMouseDown_Begin (NULL,Class);
HTM_TxtF ("%c",'a' + (char) NumOpt);
HTM_BUTTON_End ();
free (Class);

6
swad_match_result.c
View File

@ -115,6 +115,7 @@ void McR_ShowMyMchResults (void)
extern const char *Hlp_ASSESSMENT_Games_results;
extern const char *Hlp_ASSESSMENT_Games_results;
extern const char *Txt_Results;
extern const char *Txt_No_games;
unsigned NumGamesSelected;
/***** Get list of games *****/
@ -155,7 +156,7 @@ void McR_ShowMyMchResults (void)
Box_BoxEnd ();
}
else
Ale_ShowAlert (Ale_WARNING,"No games selected."); // TODO: Need translation!!!!
Ale_ShowAlert (Ale_WARNING,Txt_No_games);
/***** Free memory for list of game events selected *****/
free (Gbl.Games.StrGamCodsSelected);
@ -283,6 +284,7 @@ static void McR_ShowUsrsMchResults (void)
{
extern const char *Hlp_ASSESSMENT_Games_results;
extern const char *Txt_Results;
extern const char *Txt_No_games;
unsigned NumGamesSelected;
const char *Ptr;
@ -333,7 +335,7 @@ static void McR_ShowUsrsMchResults (void)
Box_BoxEnd ();
}
else
Ale_ShowAlert (Ale_WARNING,"No games selected."); // TODO: Need translation!!!!
Ale_ShowAlert (Ale_WARNING,Txt_No_games);
/***** Free memory for list of game events selected *****/
free (Gbl.Games.StrGamCodsSelected);

21
swad_text.c
View File

@ -52674,6 +52674,27 @@ const char *Txt_View_matches_results =
"Ver resultados de partidas";
#endif
const char *Txt_View_my_answer =
#if L==1 // ca
"Veure la meva resposta";
#elif L==2 // de
"Meine Antwort anzeigen";
#elif L==3 // en
"View my answer";
#elif L==4 // es
"Ver mi respuesta";
#elif L==5 // fr
"Voir ma r&eacute;ponse";
#elif L==6 // gn
"Ver mi respuesta"; // Okoteve traducción
#elif L==7 // it
"Vedi la mia risposta";
#elif L==8 // pl
"Zobacz moj&aogon; odpowied&zacute;";
#elif L==9 // pt
"Ver minha resposta";
#endif
const char *Txt_View_projects =
#if L==1 // ca
"Veure projectes";