Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version18.139.4

This commit is contained in:
Antonio Cañas Vargas 2019-09-09 13:01:04 +02:00
parent 1d0ee04450
commit 460ee2e8a6
3 changed files with 9 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
css/swad18.138.css
View File

@ -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
{

3
swad_changelog.h
View File

@ -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.

30
swad_game.c
View File

@ -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,"<div class=\"MATCH_RIGHT\">");
/***** 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,"<div class=\"MATCH_RIGHT\">");
/***** 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,"<div class=\"MATCH_TOP\">");
/***** Left: Match title *****/
fprintf (Gbl.F.Out,"<div class=\"MATCH_TOP_LEFT\">"
"%s"
"</div>",
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,"<div class=\"MATCH_TOP_RIGHT ICO_HIGHLIGHT\">"
"<a href=\"\" title=\"%s\""
" onmousedown=\"window.close();\"\">"
"<img src=\"%s/close.svg\" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />"
"</a>"
"</div>",
Txt_Close,
Cfg_URL_ICON_PUBLIC,
Txt_Close,Txt_Close);
fprintf (Gbl.F.Out,"%s",Match->Title);
/***** End container *****/
fprintf (Gbl.F.Out,"</div>");