diff --git a/css/swad18.135.7.css b/css/swad18.136.css similarity index 99% rename from css/swad18.135.7.css rename to css/swad18.136.css index 375e28000..086300253 100644 --- a/css/swad18.135.7.css +++ b/css/swad18.136.css @@ -2571,29 +2571,65 @@ a:hover img.CENTRE_PHOTO_SHOW margin:5%; width:90%; } -.MATCH_CONT_TOP +.MATCH_TOP { box-sizing:border-box; + display:table; + width:100%; + border:1px solid pink; + } +.MATCH_TOP_LEFT + { + box-sizing:border-box; + float:left; + width:80%; + white-space:nowrap; + overflow:hidden; + text-overflow:ellipsis; + border:1px solid red; + } +.MATCH_TOP_RIGHT + { + box-sizing:border-box; + float:left; + width:20%; + text-align:right; + border:1px solid blue; + } +.MATCH_BOTTOM + { + box-sizing:border-box; + width:100%; + border:1px solid pink; + } +.MATCH_BOTTOM_LEFT + { + box-sizing:border-box; + float:left; + width:20%; + white-space:nowrap; + overflow:hidden; + text-overflow:ellipsis; + border:1px solid red; + } +.MATCH_BOTTOM_RIGHT + { + box-sizing:border-box; + float:left; + width:80%; + border:1px solid blue; } .MATCH_TCH_NUM_QST { - width:15%; - float:left; + text-align:center; padding-bottom:24pt; color:#808080; font-size:48pt; font-weight:bold; } -.MATCH_TCH_QST_CONTAINER - { - width:70%; - float:left; - } .MATCH_TCH_NXT_CONTAINER { - width:15%; - float:left; } .MATCH_TCH_QST { @@ -2603,6 +2639,7 @@ a:hover img.CENTRE_PHOTO_SHOW .MATCH_TCH_CONTINUE_CONTAINER { clear:all; + margin:0 auto; text-align:center; } .MATCH_TCH_CONTINUE_CONTAINER a diff --git a/swad_changelog.h b/swad_changelog.h index e7fc4a213..017cab1e8 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -458,10 +458,11 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.135.7 (2019-07-17)" -#define CSS_FILE "swad18.135.7.css" +#define Log_PLATFORM_VERSION "SWAD 18.136 (2019-07-17)" +#define CSS_FILE "swad18.136.css" #define JS_FILE "swad18.130.2.js" /* + Version 18.136: Jul 18, 2019 Changes in layout of match. (243767 lines) Version 18.135.7: Jul 17, 2019 CSS refactoring and translation in match playing. (243699 lines) Version 18.135.6: Jul 17, 2019 Code refactoring in match playing. (243654 lines) Version 18.135.5: Jul 17, 2019 Changes while removing a match. (243692 lines) diff --git a/swad_config.h b/swad_config.h index a00767e37..a55dbb8e8 100644 --- a/swad_config.h +++ b/swad_config.h @@ -503,7 +503,7 @@ #define Cfg_TIME_TO_REFRESH_TIMELINE ((time_t)( 2UL * 1000UL)) // Initial refresh period of social timeline in miliseconds // This delay is increased 1 second on each refresh -#define Cfg_SECONDS_TO_REFRESH_GAME 1 // Refresh period of game being played in seconds +#define Cfg_SECONDS_TO_REFRESH_GAME 60 // Refresh period of game being played in seconds #define Cfg_TIME_TO_REFRESH_GAME ((time_t)(Cfg_SECONDS_TO_REFRESH_GAME * 1000UL)) // Refresh period of game being played in miliseconds #define Cfg_TIME_TO_REFRESH_LAST_CLICKS ((time_t)( 1UL * 1000UL)) // Refresh period of last clicks in miliseconds diff --git a/swad_game.c b/swad_game.c index 0333f8fe0..4ca09fc9a 100644 --- a/swad_game.c +++ b/swad_game.c @@ -183,12 +183,13 @@ static void Gam_PutButtonNewMatch (long GamCod); static void Gam_PutFormNewMatch (struct Game *Game); static long Gam_CreateMatch (long GamCod,char Title[Gam_MAX_BYTES_TITLE + 1]); -static void Gam_UpdateMatchBeingPlayed (struct Match *Match); +static void Gam_UpdateMatchStatus (struct Match *Match); static void Gam_SetMatchStatusToNextQuestion (struct Match *Match); static void Gam_ShowMatchStatusForTch (struct Match *Match); static void Gam_ShowAlertFinishedMatch (void); -static void Gam_PlayGameShowQuestionAndAnswers (struct Match *Match); +static void Gam_ShowBottonLeftColumnTch (struct Match *Match); +static void Gam_ShowQuestionAndAnswersTch (struct Match *Match); static void Gam_PutBigButton (Act_Action_t NextAction,long MchCod, const char *Icon,const char *Txt); @@ -3262,8 +3263,6 @@ void Gam_CreateNewMatchTch (void) void Gam_RequestStartResumeMatchTch (void) { - extern const char *Txt_Start_match; - extern const char *Txt_Resume_match; struct Match Match; /***** Get data of the match from database *****/ @@ -3271,22 +3270,8 @@ void Gam_RequestStartResumeMatchTch (void) Gam_GetDataOfMatchByCod (&Match); /***** Show current match status *****/ - fprintf (Gbl.F.Out,"