From 47719ab6b9f510f1599a70d318c8bea7cf18171e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 30 Sep 2019 16:25:44 +0200 Subject: [PATCH] Version19.28 --- css/{swad19.27.css => swad19.28.css} | 56 ++++++++++++++-------------- swad_changelog.h | 5 ++- swad_match.c | 43 +++++++++------------ 3 files changed, 50 insertions(+), 54 deletions(-) rename css/{swad19.27.css => swad19.28.css} (98%) diff --git a/css/swad19.27.css b/css/swad19.28.css similarity index 98% rename from css/swad19.27.css rename to css/swad19.28.css index d7d511461..24b79a38b 100644 --- a/css/swad19.27.css +++ b/css/swad19.28.css @@ -2593,7 +2593,7 @@ a:hover img.CENTRE_PHOTO_SHOW width:100%; height:60px; color:#808080; - font-size:18pt; + font-size:14pt; font-weight:bold; text-align:center; text-overflow:ellipsis; @@ -2605,10 +2605,18 @@ a:hover img.CENTRE_PHOTO_SHOW padding-left:24px; } +.MATCH_REFRESHABLE_TEACHER + { + box-sizing:border-box; + width:100%; + white-space:nowrap; + overflow:hidden; + text-overflow:ellipsis; + } .MATCH_NUM_QST { color:#808080; - font-size:36pt; + font-size:32pt; font-weight:bold; text-align:center; vertical-align:top; @@ -2616,7 +2624,7 @@ a:hover img.CENTRE_PHOTO_SHOW .MATCH_TIME_QST { color:#808080; - font-size:18pt; + font-size:16pt; font-weight:bold; text-align:center; vertical-align:top; @@ -2627,13 +2635,6 @@ a:hover img.CENTRE_PHOTO_SHOW padding-bottom:16pt; font-size:13pt; } -.MATCH_NUM_PLAYERS - { - text-align:center; - padding:8pt 0; - color:#808080; - font-size:16pt; - } .MATCH_NUM_ANSWERERS { text-align:center; @@ -2677,7 +2678,8 @@ a:hover img.CENTRE_PHOTO_SHOW display:table; width:100%; height:64px; - font-size:36pt; + font-size:32pt; + padding:2px; } .MATCH_BUTTON_CONTAINER a { @@ -3131,29 +3133,29 @@ a:hover img.CENTRE_PHOTO_SHOW @media only screen and (max-width: 590px) { /* For mobile-phones (maximum width visible on Moto G4 vertical) */ - .TL_WIDTH {width:316px;} /* 556-240 */ - .TL_RIGHT_WIDTH {width:260px;} /* 500-240 */ + .TL_WIDTH {width:316px;} /* 556-240 */ + .TL_RIGHT_WIDTH {width:260px;} /* 500-240 */ .TL_RIGHT_AUTHOR_WIDTH {width:100px;} /* 340-240 */ - .TL_COMM_WIDTH {width:220px;} /* 460-240 */ + .TL_COMM_WIDTH {width:220px;} /* 460-240 */ .TL_COMM_AUTHOR_WIDTH {width: 60px;} /* 300-240 */ - .TL_MED_INPUT_WIDTH {width:160px;} /* 400-240 */ - .TL_NOTE_FOOT_WIDTH {width:260px;} /* 500-240 */ - .TL_COMM_FOOT_WIDTH {width:220px;} /* 460-240 */ - .TL_FAV_NOT_WIDTH {width:120px;} /* (480-240)/2 */ - .TL_SHA_NOT_WIDTH {width:120px;} /* (480-240)/2 */ - .TL_FAV_COM_WIDTH {width:200px;} /* 440-240 */ + .TL_MED_INPUT_WIDTH {width:160px;} /* 400-240 */ + .TL_NOTE_FOOT_WIDTH {width:260px;} /* 500-240 */ + .TL_COMM_FOOT_WIDTH {width:220px;} /* 460-240 */ + .TL_FAV_NOT_WIDTH {width:120px;} /* (480-240)/2 */ + .TL_SHA_NOT_WIDTH {width:120px;} /* (480-240)/2 */ + .TL_FAV_COM_WIDTH {width:200px;} /* 440-240 */ } @media only screen and (min-width: 590px) { /* For tablets and desktop (maximum width visible on Moto G4 horizontal) */ - .TL_WIDTH {width:556px;} - .TL_RIGHT_WIDTH {width:500px;} + .TL_WIDTH {width:556px;} + .TL_RIGHT_WIDTH {width:500px;} .TL_RIGHT_AUTHOR_WIDTH {width:340px;} - .TL_COMM_WIDTH {width:460px;} + .TL_COMM_WIDTH {width:460px;} .TL_COMM_AUTHOR_WIDTH {width:300px;} - .TL_MED_INPUT_WIDTH {width:400px;} - .TL_FAV_NOT_WIDTH {width:240px;} - .TL_SHA_NOT_WIDTH {width:240px;} - .TL_FAV_COM_WIDTH {width:440px;} + .TL_MED_INPUT_WIDTH {width:400px;} + .TL_FAV_NOT_WIDTH {width:240px;} + .TL_SHA_NOT_WIDTH {width:240px;} + .TL_FAV_COM_WIDTH {width:440px;} } .TL_NEW_PUB diff --git a/swad_changelog.h b/swad_changelog.h index 0321a8506..ff02d0532 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -485,10 +485,11 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.27 (2019-09-30)" -#define CSS_FILE "swad19.27.css" +#define Log_PLATFORM_VERSION "SWAD 19.28 (2019-09-30)" +#define CSS_FILE "swad19.28.css" #define JS_FILE "swad19.15.js" /* + Version 19.28: Sep 30, 2019 Changes in layout of match playing. (246752 lines) Version 19.27: Sep 30, 2019 Changes in layout of match playing. (246756 lines) Version 19.26.1: Sep 30, 2019 Changes in edition of games. (246760 lines) Version 19.26: Sep 30, 2019 Changes in edition of games. (246743 lines) diff --git a/swad_match.c b/swad_match.c index 662170d2a..95ac6df16 100644 --- a/swad_match.c +++ b/swad_match.c @@ -149,7 +149,7 @@ static void Mch_ShowMatchStatusForTch (struct Match *Match); static void Mch_ShowMatchStatusForStd (struct Match *Match); static void Mch_ShowLeftColumnTch (struct Match *Match); -static void Mch_ShowInsideLeftColumnTch (struct Match *Match); +static void Mch_ShowRefreshablePartTch (struct Match *Match); static void Mch_ShowRightColumnTch (struct Match *Match); static void Mch_ShowLeftColumnStd (struct Match *Match); static void Mch_ShowRightColumnStd (struct Match *Match); @@ -2082,16 +2082,25 @@ bool Mch_CheckIfICanPlayThisMatchBasedOnGrps (long MchCod) static void Mch_ShowLeftColumnTch (struct Match *Match) { /***** Start left container *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); - /***** Show content of div *****/ - Mch_ShowInsideLeftColumnTch (Match); + /***** Refreshable part *****/ + fprintf (Gbl.F.Out,"
"); + Mch_ShowRefreshablePartTch (Match); + fprintf (Gbl.F.Out,"
"); + + /***** Buttons *****/ + Mch_PutMatchControlButtons (Match); + + /***** Write button to request viewing results *****/ + Mch_PutCheckboxResult (Match); /***** End left container *****/ fprintf (Gbl.F.Out,"
"); } -static void Mch_ShowInsideLeftColumnTch (struct Match *Match) +static void Mch_ShowRefreshablePartTch (struct Match *Match) { extern const char *Txt_MATCH_respond; struct Time Time; @@ -2142,12 +2151,6 @@ static void Mch_ShowInsideLeftColumnTch (struct Match *Match) fprintf (Gbl.F.Out,"" "
"); - - /***** Buttons *****/ - Mch_PutMatchControlButtons (Match); - - /***** Write button to request viewing results *****/ - Mch_PutCheckboxResult (Match); } /*****************************************************************************/ @@ -2323,13 +2326,10 @@ static void Mch_PutCheckboxResult (struct Match *Match) Mch_PutParamMchCod (Match->MchCod); // Current match being played /***** Put icon with link *****/ - /* Submitting onmousedown instead of default onclick - is necessary in order to be fast - and not lose clicks due to refresh */ fprintf (Gbl.F.Out,"
" "" "" " %s" @@ -2551,12 +2551,9 @@ static void Mch_PutBigButton (Act_Action_t NextAction,long MchCod, Mch_PutParamMchCod (MchCod); /***** Put icon with link *****/ - /* Submitting onmousedown instead of default onclick - is necessary in order to be fast - and not lose clicks due to refresh */ fprintf (Gbl.F.Out,"
" "" "" "" @@ -2585,12 +2582,9 @@ static void Mch_PutBigButtonClose (void) extern const char *Txt_Close; /***** Put icon with link *****/ - /* onmousedown instead of default onclick - is necessary in order to be fast - and not lose clicks due to refresh */ fprintf (Gbl.F.Out,"
" "" "" "" @@ -2743,8 +2737,7 @@ void Mch_RefreshMatchTch (void) Mch_UpdateElapsedTimeInQuestion (&Match); /***** Show current match status *****/ - // Mch_ShowMatchStatusForTch (&Match); - Mch_ShowInsideLeftColumnTch (&Match); + Mch_ShowRefreshablePartTch (&Match); } /*****************************************************************************/