From 875b733100ff4f49fdfbbeb0295568031008df4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 31 Jul 2019 22:44:15 +0200 Subject: [PATCH] Version18.138.2 --- css/swad18.138.css | 4 ---- swad_changelog.h | 4 ++-- swad_game.c | 18 ++++++++---------- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/css/swad18.138.css b/css/swad18.138.css index 4d2fe7d0c..0f7560922 100644 --- a/css/swad18.138.css +++ b/css/swad18.138.css @@ -2674,10 +2674,6 @@ a:hover img.CENTRE_PHOTO_SHOW text-align:center; border:1px solid blue; } -.MATCH_BUTTON_RIGHT_CONTAINER a - { - text-decoration:none; - } .MATCH_BUTTON { font-size:12pt; diff --git a/swad_changelog.h b/swad_changelog.h index 013fe83cb..b140c19c5 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -460,13 +460,13 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.138.1 (2019-07-31)" +#define Log_PLATFORM_VERSION "SWAD 18.138.2 (2019-07-31)" #define CSS_FILE "swad18.138.css" #define JS_FILE "swad18.130.2.js" /* Version 18.138.4: Jul 31, 2019 Time of current match and current match question are stored in database. (? lines) Version 18.138.3: Jul 31, 2019 Buttons backward and start on finished games. (? lines) - Version 18.138.2: Jul 31, 2019 Three buttons: backward, answers, forward. (? lines) + Version 18.138.2: Jul 31, 2019 Changes in backward and forward behaviour and buttons in matches. (244111 lines) Version 18.138.1: Jul 31, 2019 Close button in games always present. Number of players in left column. (244117 lines) Version 18.138: Jul 30, 2019 Button to go backward when playing a game. (244080 lines) diff --git a/swad_game.c b/swad_game.c index 84ec65e61..e2b1c5ce6 100644 --- a/swad_game.c +++ b/swad_game.c @@ -3500,16 +3500,16 @@ static void Gam_SetMatchStatusToPrevQuestion (struct Match *Match) { Match->Status.QstCod = Gam_GetQstCodFromQstInd (Match->GamCod, Match->Status.QstInd); - Match->Status.Finished = false; // Match is not finished + Match->Status.ShowingAnswers = true; // Show answers } else // No previous question { Match->Status.QstCod = -1L; // No previous questions - Match->Status.BeingPlayed = false; // Match is not being played - Match->Status.Finished = false; // Match is not finished + Match->Status.BeingPlayed = false; // Match is not being played + Match->Status.ShowingAnswers = false; // Do not show answers } - Match->Status.ShowingAnswers = false; // Don't show answers + Match->Status.Finished = false; // Match is not finished } /*****************************************************************************/ @@ -3662,16 +3662,15 @@ static void Gam_ShowLeftColumnTch (struct Match *Match) fprintf (Gbl.F.Out,"
"); /* Left button */ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); if (!Match->Status.Finished) // Not finished { if (Match->Status.BeingPlayed) { - /* Put button to go backward */ if (Match->Status.ShowingAnswers) - /* Put button to start current question */ + /* Put button to hide answers */ Gam_PutBigButton (ActCurMchTch,Match->MchCod, - "angle-up.svg",Txt_Stem); + "step-backward.svg",Txt_Stem); else { /* Get index of the previous question */ @@ -3700,7 +3699,6 @@ static void Gam_ShowLeftColumnTch (struct Match *Match) Gam_PutBigButtonClose (); else if (Match->Status.BeingPlayed) { - /* Put button to continue */ if (Match->Status.ShowingAnswers) { /* Get index of the next question */ @@ -3718,7 +3716,7 @@ static void Gam_ShowLeftColumnTch (struct Match *Match) else /* Put button to show answers */ Gam_PutBigButton (ActNxtMchTch,Match->MchCod, - "angle-down.svg",Txt_Answers); + "step-forward.svg",Txt_Answers); } else /* Put button to start / resume match */