From 99d20f957268d0fb1780ddbad9e7af060c042ccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 19 Feb 2020 02:04:45 +0100 Subject: [PATCH] Version19.128.1 --- swad_changelog.h | 6 ++---- swad_game.c | 8 +------- swad_test_visibility.c | 30 ------------------------------ swad_test_visibility.h | 1 - swad_text.c | 23 +---------------------- 5 files changed, 4 insertions(+), 64 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index a70304c90..78830e43f 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -497,7 +497,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.128 (2020-02-19)" +#define Log_PLATFORM_VERSION "SWAD 19.128.1 (2020-02-19)" #define CSS_FILE "swad19.118.css" #define JS_FILE "swad19.91.1.js" /* @@ -521,14 +521,12 @@ Param // TODO: Add visibility to API function getTestConfig // TODO: Get visibility IN API function getGames // TODO: Sugerencia de Jesús González Peñalver: añadir un poco más de espacio entre pregunta y pregunta en las opciones de un juego -// TODO: Remove Txt_Result + Version 19.128.1: Feb 18, 2020 Changes in match results. (279117 lines) Version 19.128: Feb 18, 2020 Changes in match results. (279175 lines) Copy the following icons to icon public directory: sudo cp -a icon/file-regular-red.svg /var/www/html/swad/icon/ sudo cp -a icon/file-alt-regular-green.svg /var/www/html/swad/icon/ -sudo cp -a icon/file-regular-red.svg /var/www/html/swad/icon/ -sudo cp -a icon/file-alt-regular-green.svg /var/www/html/swad/icon/ sudo cp -a icon/spell-red.svg /var/www/html/swad/icon/ sudo cp -a icon/spell-check-green.svg /var/www/html/swad/icon/ sudo cp -a icon/list-ul-red.svg /var/www/html/swad/icon/ diff --git a/swad_game.c b/swad_game.c index 6be702969..070922569 100644 --- a/swad_game.c +++ b/swad_game.c @@ -525,13 +525,7 @@ static void Gam_ShowOneGame (struct Game *Game,bool ShowOnlyThisGame) HTM_Double (Game->MaxGrade); HTM_BR (); HTM_TxtColonNBSP (Txt_Result_visibility); - if (ShowOnlyThisGame) - { - HTM_BR (); - TsV_ShowVisibilityIconsAndTxt (Game->Visibility); - } - else - TsV_ShowVisibilityIcons (Game->Visibility); + TsV_ShowVisibilityIcons (Game->Visibility); HTM_DIV_End (); /***** Number of matches in game *****/ diff --git a/swad_test_visibility.c b/swad_test_visibility.c index 70a87339b..b0f9b7ac3 100644 --- a/swad_test_visibility.c +++ b/swad_test_visibility.c @@ -107,36 +107,6 @@ void TsV_ShowVisibilityIcons (unsigned SelectedVisibility) } } -/*****************************************************************************/ -/*********************** Show visibility with text ***************************/ -/*****************************************************************************/ - -void TsV_ShowVisibilityIconsAndTxt (unsigned SelectedVisibility) - { - extern const char *Txt_Visible; - extern const char *Txt_Hidden; - extern const char *Txt_TST_STR_VISIBILITY[TsV_NUM_ITEMS_VISIBILITY]; - TsV_Visibility_t Visibility; - bool ItemVisible; - - for (Visibility = (TsV_Visibility_t) 0; - Visibility <= (TsV_Visibility_t) (TsV_NUM_ITEMS_VISIBILITY - 1); - Visibility++) - { - ItemVisible = (SelectedVisibility & (1 << Visibility)) != 0; - HTM_LABEL_Begin ("class=\"%s\"",ItemVisible ? "DAT_SMALL_GREEN" : - "DAT_SMALL_RED"); - Ico_PutIcon (ItemVisible ? "eye-green.svg" : - "eye-slash-red.svg", - ItemVisible ? Txt_Visible : - Txt_Hidden, - "CONTEXT_OPT CONTEXT_ICO_16x16"); - HTM_Txt (Txt_TST_STR_VISIBILITY[Visibility]); - HTM_LABEL_End (); - HTM_BR (); - } - } - /*****************************************************************************/ /************ Put checkboxes in form to select result visibility *************/ /*****************************************************************************/ diff --git a/swad_test_visibility.h b/swad_test_visibility.h index 1bfeaa2f1..92e03b636 100644 --- a/swad_test_visibility.h +++ b/swad_test_visibility.h @@ -55,7 +55,6 @@ typedef enum /*****************************************************************************/ void TsV_ShowVisibilityIcons (unsigned SelectedVisibility); -void TsV_ShowVisibilityIconsAndTxt (unsigned SelectedVisibility); void TsV_PutVisibilityCheckboxes (unsigned SelectedVisibility); unsigned TsV_GetVisibilityFromForm (void); unsigned TsV_GetVisibilityFromStr (const char *Str); diff --git a/swad_text.c b/swad_text.c index 298004305..05da42430 100644 --- a/swad_text.c +++ b/swad_text.c @@ -33712,28 +33712,7 @@ const char *Txt_Reset_survey = #elif L==9 // pt "Reiniciar inquérito"; #endif -/* -const char *Txt_Result = -#if L==1 // ca - "Resultat"; -#elif L==2 // de - "Ergebnis"; -#elif L==3 // en - "Result"; -#elif L==4 // es - "Resultado"; -#elif L==5 // fr - "Résultat"; -#elif L==6 // gn - "Resultado"; // Okoteve traducción -#elif L==7 // it - "Risultato"; -#elif L==8 // pl - "Wynik"; -#elif L==9 // pt - "Resultado"; -#endif -*/ + const char *Txt_Results = #if L==1 // ca "Resultats";