From 460ee2e8a6056d62d0bdb934467d35d76e4fb860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 9 Sep 2019 13:01:04 +0200 Subject: [PATCH] Version18.139.4 --- css/swad18.138.css | 21 ++------------------- swad_changelog.h | 3 ++- swad_game.c | 30 +++++------------------------- 3 files changed, 9 insertions(+), 45 deletions(-) diff --git a/css/swad18.138.css b/css/swad18.138.css index d53f28797..2be48fb5e 100644 --- a/css/swad18.138.css +++ b/css/swad18.138.css @@ -2592,30 +2592,13 @@ a:hover img.CENTRE_PHOTO_SHOW .MATCH_TOP { box-sizing:border-box; - display:table; + /* display:table; */ width:100%; height:60px; font-size:18pt; text-align:center; - border:1px solid pink; - } -.MATCH_TOP_LEFT - { - box-sizing:border-box; - float:left; - width:90%; - white-space:nowrap; - overflow:hidden; text-overflow:ellipsis; - border:1px solid red; - } -.MATCH_TOP_RIGHT - { - box-sizing:border-box; - float:left; - width:10%; - text-align:right; - border:1px solid blue; + border:1px solid pink; } .MATCH_BOTTOM { diff --git a/swad_changelog.h b/swad_changelog.h index 12e3b5cd4..e31738411 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -460,10 +460,11 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.139.4 (2019-09-09)" +#define Log_PLATFORM_VERSION "SWAD 18.139.5 (2019-09-09)" #define CSS_FILE "swad18.138.css" #define JS_FILE "swad18.130.2.js" /* + Version 18.139.5: Sep 09, 2019 Changes in layout of matches. (? lines) Version 18.139.4: Sep 09, 2019 Changes in layout of matches buttons. Removed unused code. (244239 lines) Version 18.139.3: Sep 09, 2019 Changes in layout of matches buttons. (244305 lines) Version 18.139.2: Sep 05, 2019 Number of match players is not displayed for students. diff --git a/swad_game.c b/swad_game.c index d687a8f2b..4f171004f 100644 --- a/swad_game.c +++ b/swad_game.c @@ -212,7 +212,7 @@ static void Gam_ShowMatchStatusForStd (struct Match *Match); static void Gam_ShowLeftColumnTch (struct Match *Match); static void Gam_ShowLeftColumnStd (struct Match *Match); static void Gam_ShowNumPlayers (struct Match *Match); -static void Gam_ShowMatchTitleAndCloseButton (struct Match *Match); +static void Gam_ShowMatchTitle (struct Match *Match); static void Gam_ShowQuestionAndAnswersTch (struct Match *Match); static void Gam_ShowQuestionAndAnswersStd (struct Match *Match); @@ -3623,7 +3623,7 @@ static void Gam_ShowMatchStatusForTch (struct Match *Match) fprintf (Gbl.F.Out,"
"); /***** Top row *****/ - Gam_ShowMatchTitleAndCloseButton (Match); + Gam_ShowMatchTitle (Match); /***** Bottom row *****/ if (Match->Status.BeingPlayed) @@ -3660,7 +3660,7 @@ static void Gam_ShowMatchStatusForStd (struct Match *Match) fprintf (Gbl.F.Out,"
"); /***** Top row *****/ - Gam_ShowMatchTitleAndCloseButton (Match); + Gam_ShowMatchTitle (Match); /***** Bottom row *****/ if (Match->Status.QstInd < Gam_AFTER_LAST_QUESTION) // Unfinished @@ -3901,33 +3901,13 @@ static void Gam_ShowNumPlayers (struct Match *Match) /******************** Show match title and close button **********************/ /*****************************************************************************/ -static void Gam_ShowMatchTitleAndCloseButton (struct Match *Match) +static void Gam_ShowMatchTitle (struct Match *Match) { - extern const char *Txt_Close; - /***** Start container *****/ fprintf (Gbl.F.Out,"
"); /***** Left: Match title *****/ - fprintf (Gbl.F.Out,"
" - "%s" - "
", - Match->Title); - - /***** Right: Icon to close this tab *****/ - /* onmousedown instead of default onclick - is necessary in order to be fast - and not lose clicks due to refresh */ - fprintf (Gbl.F.Out,"
" - "" - "\"%s\"" - "" - "
", - Txt_Close, - Cfg_URL_ICON_PUBLIC, - Txt_Close,Txt_Close); + fprintf (Gbl.F.Out,"%s",Match->Title); /***** End container *****/ fprintf (Gbl.F.Out,"
");