Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-09 18:25:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version18.139.3

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2019-09-09 11:07:53 +02:00
parent f10b4a3335
commit 06e32d48f9
3 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
css/swad18.138.css
View File

@ -2651,24 +2651,16 @@ a:hover img.CENTRE_PHOTO_SHOW
.MATCH_BUTTONS_CONTAINER .MATCH_BUTTONS_CONTAINER
{ {
box-sizing:border-box;
display:table; display:table;
box-sizing:border-box;
width:100%; width:100%;
background:pink;
} }
.MATCH_BUTTON_LEFT_CONTAINER .MATCH_BUTTON_LEFT_CONTAINER
{ {
display:table-cell; display:table-cell;
box-sizing:border-box; box-sizing:border-box;
float:left; float:left;
width:50%; width:50%;
height:200px;
margin:0 auto;
text-align:center;
vertical-align:middle;
border:1px solid black;
font-size:48pt;
} }
.MATCH_BUTTON_RIGHT_CONTAINER .MATCH_BUTTON_RIGHT_CONTAINER
{ {
@ -2676,14 +2668,16 @@ a:hover img.CENTRE_PHOTO_SHOW
box-sizing:border-box; box-sizing:border-box;
float:left; float:left;
width:50%; width:50%;
height:200px;
margin:0 auto;
text-align:center;
vertical-align:middle;
border:1px solid blue;
font-size:48pt;
} }
.MATCH_BUTTON_CONTAINER
{
box-sizing:border-box;
display:table;
width:100%;
height:100px;
vertical-align:middle;
}
.MATCH_BUTTON .MATCH_BUTTON
{ {
display:table-cell; display:table-cell;
@ -2691,12 +2685,12 @@ a:hover img.CENTRE_PHOTO_SHOW
font-size:48pt; font-size:48pt;
text-align:center; text-align:center;
vertical-align:middle; vertical-align:middle;
background:red;
margin:auto; margin:auto;
} }
.MATCH_BUTTON a .MATCH_BUTTON_CONTAINER a
{ {
text-decoration:none; text-decoration:none;
color:#404040;
} }
.MATCH_TCH_QST .MATCH_TCH_QST

3
swad_changelog.h
View File

@ -460,10 +460,11 @@ En OpenSWAD:
ps2pdf source.ps destination.pdf ps2pdf source.ps destination.pdf
*/ */
#define Log_PLATFORM_VERSION "SWAD 18.139.2 (2019-09-05)" #define Log_PLATFORM_VERSION "SWAD 18.139.3 (2019-09-09)"
#define CSS_FILE "swad18.138.css" #define CSS_FILE "swad18.138.css"
#define JS_FILE "swad18.130.2.js" #define JS_FILE "swad18.130.2.js"
/* /*
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. Version 18.139.2: Sep 05, 2019 Number of match players is not displayed for students.
Changes in layout of matches buttons (not finished). Changes in layout of matches buttons (not finished).
Display match elapsed time. (244306 lines) Display match elapsed time. (244306 lines)

55
swad_game.c
View File

@ -3741,7 +3741,8 @@ static void Gam_ShowLeftColumnTch (struct Match *Match)
// Gam_PutBigButton (ActCurMchTch,Match->MchCod, // Gam_PutBigButton (ActCurMchTch,Match->MchCod,
// "step-backward.svg",Txt_Stem); // "step-backward.svg",Txt_Stem);
Gam_PutBigButton (ActCurMchTch,Match->MchCod, Gam_PutBigButton (ActCurMchTch,Match->MchCod,
"⇤",Txt_Stem); "⏪", // "⇤"
Txt_Stem);
else else
{ {
/* Get index of the previous question */ /* Get index of the previous question */
@ -3752,13 +3753,15 @@ static void Gam_ShowLeftColumnTch (struct Match *Match)
// Gam_PutBigButton (ActPrvMchTch,Match->MchCod, // Gam_PutBigButton (ActPrvMchTch,Match->MchCod,
// "step-backward.svg",Txt_MATCH_Start); // "step-backward.svg",Txt_MATCH_Start);
Gam_PutBigButton (ActPrvMchTch,Match->MchCod, Gam_PutBigButton (ActPrvMchTch,Match->MchCod,
"⇤",Txt_MATCH_Start); "⏪", // "⇤"
Txt_MATCH_Start);
else // There is a previous question else // There is a previous question
/* Put button to show previous question */ /* Put button to show previous question */
// Gam_PutBigButton (ActPrvMchTch,Match->MchCod, // Gam_PutBigButton (ActPrvMchTch,Match->MchCod,
// "step-backward.svg",Txt_Previous_QUESTION); // "step-backward.svg",Txt_Previous_QUESTION);
Gam_PutBigButton (ActPrvMchTch,Match->MchCod, Gam_PutBigButton (ActPrvMchTch,Match->MchCod,
"⇤",Txt_Previous_QUESTION); "⏪", // "⇤"
Txt_Previous_QUESTION);
} }
} }
else // Not being played else // Not being played
@ -3770,7 +3773,8 @@ static void Gam_ShowLeftColumnTch (struct Match *Match)
// Gam_PutBigButton (ActPrvMchTch,Match->MchCod, // Gam_PutBigButton (ActPrvMchTch,Match->MchCod,
// "step-backward.svg",Txt_Previous_QUESTION); // "step-backward.svg",Txt_Previous_QUESTION);
Gam_PutBigButton (ActPrvMchTch,Match->MchCod, Gam_PutBigButton (ActPrvMchTch,Match->MchCod,
"⇤",Txt_Previous_QUESTION); "⏪", // "⇤"
Txt_Previous_QUESTION);
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
@ -3791,20 +3795,23 @@ static void Gam_ShowLeftColumnTch (struct Match *Match)
// Gam_PutBigButton (ActNxtMchTch,Match->MchCod, // Gam_PutBigButton (ActNxtMchTch,Match->MchCod,
// "step-forward.svg",Txt_Finish); // "step-forward.svg",Txt_Finish);
Gam_PutBigButton (ActNxtMchTch,Match->MchCod, Gam_PutBigButton (ActNxtMchTch,Match->MchCod,
"&rarrb;",Txt_Finish); "&#9193;", // "&larrb;"
Txt_Finish);
else // There are more questions else // There are more questions
/* Put button to show next question */ /* Put button to show next question */
// Gam_PutBigButton (ActNxtMchTch,Match->MchCod, // Gam_PutBigButton (ActNxtMchTch,Match->MchCod,
// "step-forward.svg",Txt_Next_QUESTION); // "step-forward.svg",Txt_Next_QUESTION);
Gam_PutBigButton (ActNxtMchTch,Match->MchCod, Gam_PutBigButton (ActNxtMchTch,Match->MchCod,
"&rarrb;",Txt_Next_QUESTION); "&#9193;", // "&larrb;"
Txt_Next_QUESTION);
} }
else else
/* Put button to show answers */ /* Put button to show answers */
// Gam_PutBigButton (ActNxtMchTch,Match->MchCod, // Gam_PutBigButton (ActNxtMchTch,Match->MchCod,
// "step-forward.svg",Txt_Answers); // "step-forward.svg",Txt_Answers);
Gam_PutBigButton (ActNxtMchTch,Match->MchCod, Gam_PutBigButton (ActNxtMchTch,Match->MchCod,
"&rarrb;",Txt_Answers); "&#9193;", // "&larrb;"
Txt_Answers);
} }
else else
/* Put button to start / resume match */ /* Put button to start / resume match */
@ -3815,7 +3822,7 @@ static void Gam_ShowLeftColumnTch (struct Match *Match)
// Txt_Resume); // Txt_Resume);
Gam_PutBigButton (ActCurMchTch, Gam_PutBigButton (ActCurMchTch,
Match->MchCod, Match->MchCod,
"&rtrif;", "&#9193;", // "&rarrb;", // "&#9656;", // "&#9654;", // "&#8227;", //"&rarrb;", // "&rtrif;",
Match->Status.QstInd == 0 ? Txt_Start : Match->Status.QstInd == 0 ? Txt_Start :
Txt_Resume); Txt_Resume);
@ -4153,16 +4160,13 @@ static void Gam_PutBigButton (Act_Action_t NextAction,long MchCod,
/* Submitting onmousedown instead of default onclick /* Submitting onmousedown instead of default onclick
is necessary in order to be fast is necessary in order to be fast
and not lose clicks due to refresh */ and not lose clicks due to refresh */
fprintf (Gbl.F.Out,"<div class=\"MATCH_BUTTON\">"); fprintf (Gbl.F.Out,"<div class=\"MATCH_BUTTON_CONTAINER\">");
fprintf (Gbl.F.Out,"<a href=\"\""); fprintf (Gbl.F.Out,"<a href=\"\" title=\"%s\" class=\"MATCH_BUTTON ICO_HIGHLIGHT\""
fprintf (Gbl.F.Out," title=\"%s\"",Txt); " onmousedown=\"document.getElementById('%s').submit();"
fprintf (Gbl.F.Out," class=\"%s\"","ICO_HIGHLIGHT"); " return false;\">%s</a>",
fprintf (Gbl.F.Out," onmousedown=\""); Txt,
fprintf (Gbl.F.Out,"document.getElementById('%s').submit();" Gbl.Form.Id,
"return false;\">", Icon);
Gbl.Form.Id);
fprintf (Gbl.F.Out,"%s",Icon);
fprintf (Gbl.F.Out,"</a>");
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
/***** End form *****/ /***** End form *****/
@ -4200,14 +4204,13 @@ static void Gam_PutBigButtonClose (void)
/* onmousedown instead of default onclick /* onmousedown instead of default onclick
is necessary in order to be fast is necessary in order to be fast
and not lose clicks due to refresh */ and not lose clicks due to refresh */
// fprintf (Gbl.F.Out,"<div class=\"MATCH_BUTTON\">"); fprintf (Gbl.F.Out,"<div class=\"MATCH_BUTTON_CONTAINER\">");
fprintf (Gbl.F.Out,"<a href=\"\""); fprintf (Gbl.F.Out,"<a href=\"\" title=\"%s\" class=\"MATCH_BUTTON ICO_HIGHLIGHT\""
fprintf (Gbl.F.Out," title=\"%s\"",Txt_Close); " onmousedown=\"window.close(); return false;\"\">"
fprintf (Gbl.F.Out," class=\"%s\"","MATCH_BUTTON ICO_HIGHLIGHT"); "&#10062;" // "&#10060;" // "&times;" // "&#10005;"
fprintf (Gbl.F.Out," onmousedown=\"window.close(); return false;\"\">"); "</a>",
fprintf (Gbl.F.Out,"%s","&times;"); Txt_Close);
fprintf (Gbl.F.Out,"</a>"); fprintf (Gbl.F.Out,"</div>");
// fprintf (Gbl.F.Out,"</div>");
} }
/*****************************************************************************/ /*****************************************************************************/