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

Version19.28

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2019-09-30 16:25:44 +02:00
parent e78e558cb2
commit 47719ab6b9
3 changed files with 50 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
css/swad19.27.css → css/swad19.28.css
View File

@ -2593,7 +2593,7 @@ a:hover img.CENTRE_PHOTO_SHOW
width:100%; width:100%;
height:60px; height:60px;
color:#808080; color:#808080;
font-size:18pt; font-size:14pt;
font-weight:bold; font-weight:bold;
text-align:center; text-align:center;
text-overflow:ellipsis; text-overflow:ellipsis;
@ -2605,10 +2605,18 @@ a:hover img.CENTRE_PHOTO_SHOW
padding-left:24px; padding-left:24px;
} }
.MATCH_REFRESHABLE_TEACHER
{
box-sizing:border-box;
width:100%;
white-space:nowrap;
overflow:hidden;
text-overflow:ellipsis;
}
.MATCH_NUM_QST .MATCH_NUM_QST
{ {
color:#808080; color:#808080;
font-size:36pt; font-size:32pt;
font-weight:bold; font-weight:bold;
text-align:center; text-align:center;
vertical-align:top; vertical-align:top;
@ -2616,7 +2624,7 @@ a:hover img.CENTRE_PHOTO_SHOW
.MATCH_TIME_QST .MATCH_TIME_QST
{ {
color:#808080; color:#808080;
font-size:18pt; font-size:16pt;
font-weight:bold; font-weight:bold;
text-align:center; text-align:center;
vertical-align:top; vertical-align:top;
@ -2627,13 +2635,6 @@ a:hover img.CENTRE_PHOTO_SHOW
padding-bottom:16pt; padding-bottom:16pt;
font-size:13pt; font-size:13pt;
} }
.MATCH_NUM_PLAYERS
{
text-align:center;
padding:8pt 0;
color:#808080;
font-size:16pt;
}
.MATCH_NUM_ANSWERERS .MATCH_NUM_ANSWERERS
{ {
text-align:center; text-align:center;
@ -2677,7 +2678,8 @@ a:hover img.CENTRE_PHOTO_SHOW
display:table; display:table;
width:100%; width:100%;
height:64px; height:64px;
font-size:36pt; font-size:32pt;
padding:2px;
} }
.MATCH_BUTTON_CONTAINER a .MATCH_BUTTON_CONTAINER a
{ {
@ -3131,29 +3133,29 @@ a:hover img.CENTRE_PHOTO_SHOW
@media only screen and (max-width: 590px) @media only screen and (max-width: 590px)
{ /* For mobile-phones (maximum width visible on Moto G4 vertical) */ { /* For mobile-phones (maximum width visible on Moto G4 vertical) */
.TL_WIDTH {width:316px;} /* 556-240 */ .TL_WIDTH {width:316px;} /* 556-240 */
.TL_RIGHT_WIDTH {width:260px;} /* 500-240 */ .TL_RIGHT_WIDTH {width:260px;} /* 500-240 */
.TL_RIGHT_AUTHOR_WIDTH {width:100px;} /* 340-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_COMM_AUTHOR_WIDTH {width: 60px;} /* 300-240 */
.TL_MED_INPUT_WIDTH {width:160px;} /* 400-240 */ .TL_MED_INPUT_WIDTH {width:160px;} /* 400-240 */
.TL_NOTE_FOOT_WIDTH {width:260px;} /* 500-240 */ .TL_NOTE_FOOT_WIDTH {width:260px;} /* 500-240 */
.TL_COMM_FOOT_WIDTH {width:220px;} /* 460-240 */ .TL_COMM_FOOT_WIDTH {width:220px;} /* 460-240 */
.TL_FAV_NOT_WIDTH {width:120px;} /* (480-240)/2 */ .TL_FAV_NOT_WIDTH {width:120px;} /* (480-240)/2 */
.TL_SHA_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_FAV_COM_WIDTH {width:200px;} /* 440-240 */
} }
@media only screen and (min-width: 590px) @media only screen and (min-width: 590px)
{ /* For tablets and desktop (maximum width visible on Moto G4 horizontal) */ { /* For tablets and desktop (maximum width visible on Moto G4 horizontal) */
.TL_WIDTH {width:556px;} .TL_WIDTH {width:556px;}
.TL_RIGHT_WIDTH {width:500px;} .TL_RIGHT_WIDTH {width:500px;}
.TL_RIGHT_AUTHOR_WIDTH {width:340px;} .TL_RIGHT_AUTHOR_WIDTH {width:340px;}
.TL_COMM_WIDTH {width:460px;} .TL_COMM_WIDTH {width:460px;}
.TL_COMM_AUTHOR_WIDTH {width:300px;} .TL_COMM_AUTHOR_WIDTH {width:300px;}
.TL_MED_INPUT_WIDTH {width:400px;} .TL_MED_INPUT_WIDTH {width:400px;}
.TL_FAV_NOT_WIDTH {width:240px;} .TL_FAV_NOT_WIDTH {width:240px;}
.TL_SHA_NOT_WIDTH {width:240px;} .TL_SHA_NOT_WIDTH {width:240px;}
.TL_FAV_COM_WIDTH {width:440px;} .TL_FAV_COM_WIDTH {width:440px;}
} }
.TL_NEW_PUB .TL_NEW_PUB

5
swad_changelog.h
View File

@ -485,10 +485,11 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD: En OpenSWAD:
ps2pdf source.ps destination.pdf ps2pdf source.ps destination.pdf
*/ */
#define Log_PLATFORM_VERSION "SWAD 19.27 (2019-09-30)" #define Log_PLATFORM_VERSION "SWAD 19.28 (2019-09-30)"
#define CSS_FILE "swad19.27.css" #define CSS_FILE "swad19.28.css"
#define JS_FILE "swad19.15.js" #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.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.1: Sep 30, 2019 Changes in edition of games. (246760 lines)
Version 19.26: Sep 30, 2019 Changes in edition of games. (246743 lines) Version 19.26: Sep 30, 2019 Changes in edition of games. (246743 lines)

43
swad_match.c
View File

@ -149,7 +149,7 @@ static void Mch_ShowMatchStatusForTch (struct Match *Match);
static void Mch_ShowMatchStatusForStd (struct Match *Match); static void Mch_ShowMatchStatusForStd (struct Match *Match);
static void Mch_ShowLeftColumnTch (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_ShowRightColumnTch (struct Match *Match);
static void Mch_ShowLeftColumnStd (struct Match *Match); static void Mch_ShowLeftColumnStd (struct Match *Match);
static void Mch_ShowRightColumnStd (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) static void Mch_ShowLeftColumnTch (struct Match *Match)
{ {
/***** Start left container *****/ /***** Start left container *****/
fprintf (Gbl.F.Out,"<div id=\"match_left\" class=\"MATCH_LEFT\">"); fprintf (Gbl.F.Out,"<div class=\"MATCH_LEFT\">");
/***** Show content of div *****/ /***** Refreshable part *****/
Mch_ShowInsideLeftColumnTch (Match); fprintf (Gbl.F.Out,"<div id=\"match_left\""
" class=\"MATCH_REFRESHABLE_TEACHER\">");
Mch_ShowRefreshablePartTch (Match);
fprintf (Gbl.F.Out,"</div>");
/***** Buttons *****/
Mch_PutMatchControlButtons (Match);
/***** Write button to request viewing results *****/
Mch_PutCheckboxResult (Match);
/***** End left container *****/ /***** End left container *****/
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }
static void Mch_ShowInsideLeftColumnTch (struct Match *Match) static void Mch_ShowRefreshablePartTch (struct Match *Match)
{ {
extern const char *Txt_MATCH_respond; extern const char *Txt_MATCH_respond;
struct Time Time; struct Time Time;
@ -2142,12 +2151,6 @@ static void Mch_ShowInsideLeftColumnTch (struct Match *Match)
fprintf (Gbl.F.Out,"</strong>" fprintf (Gbl.F.Out,"</strong>"
"</div>"); "</div>");
/***** 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 Mch_PutParamMchCod (Match->MchCod); // Current match being played
/***** Put icon with link *****/ /***** 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,"<div class=\"CONTEXT_OPT\">" fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT\">"
"<a href=\"\" class=\"ICO_HIGHLIGHT\"" "<a href=\"\" class=\"ICO_HIGHLIGHT\""
" title=\"%s\" " " title=\"%s\" "
" onmousedown=\"document.getElementById('%s').submit();" " onclick=\"document.getElementById('%s').submit();"
" return false;\">" " return false;\">"
"<i class=\"%s\"></i>" "<i class=\"%s\"></i>"
"&nbsp;%s" "&nbsp;%s"
@ -2551,12 +2551,9 @@ static void Mch_PutBigButton (Act_Action_t NextAction,long MchCod,
Mch_PutParamMchCod (MchCod); Mch_PutParamMchCod (MchCod);
/***** Put icon with link *****/ /***** 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,"<div class=\"MATCH_BUTTON_CONTAINER\">" fprintf (Gbl.F.Out,"<div class=\"MATCH_BUTTON_CONTAINER\">"
"<a href=\"\" class=\"MATCH_BUTTON_ON\" title=\"%s\" " "<a href=\"\" class=\"MATCH_BUTTON_ON\" title=\"%s\" "
" onmousedown=\"document.getElementById('%s').submit();" " onclick=\"document.getElementById('%s').submit();"
" return false;\">" " return false;\">"
"<i class=\"%s\"></i>" "<i class=\"%s\"></i>"
"</a>" "</a>"
@ -2585,12 +2582,9 @@ static void Mch_PutBigButtonClose (void)
extern const char *Txt_Close; extern const char *Txt_Close;
/***** Put icon with link *****/ /***** 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,"<div class=\"MATCH_BUTTON_CONTAINER\">" fprintf (Gbl.F.Out,"<div class=\"MATCH_BUTTON_CONTAINER\">"
"<a href=\"\" class=\"MATCH_BUTTON_ON\" title=\"%s\" " "<a href=\"\" class=\"MATCH_BUTTON_ON\" title=\"%s\" "
" onmousedown=\"window.close();" " onmouseclick=\"window.close();"
" return false;\"\">" " return false;\"\">"
"<i class=\"%s\"></i>" "<i class=\"%s\"></i>"
"</a>" "</a>"
@ -2743,8 +2737,7 @@ void Mch_RefreshMatchTch (void)
Mch_UpdateElapsedTimeInQuestion (&Match); Mch_UpdateElapsedTimeInQuestion (&Match);
/***** Show current match status *****/ /***** Show current match status *****/
// Mch_ShowMatchStatusForTch (&Match); Mch_ShowRefreshablePartTch (&Match);
Mch_ShowInsideLeftColumnTch (&Match);
} }
/*****************************************************************************/ /*****************************************************************************/