mirror of https://github.com/acanas/swad-core.git
Version19.90.3
This commit is contained in:
parent
ba510a38e7
commit
dd77a4e5ba
|
@ -490,13 +490,14 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
|
|||
En OpenSWAD:
|
||||
ps2pdf source.ps destination.pdf
|
||||
*/
|
||||
#define Log_PLATFORM_VERSION "SWAD 19.90.2 (2019-12-13)"
|
||||
#define Log_PLATFORM_VERSION "SWAD 19.90.3 (2019-12-13)"
|
||||
#define CSS_FILE "swad19.90.1.css"
|
||||
#define JS_FILE "swad19.90.js"
|
||||
/*
|
||||
// TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.)
|
||||
// TODO: Impedir la creación y edición de proyectos si no son editables.
|
||||
|
||||
Version 19.90.3: Dec 13, 2019 Changes in match layout. (248430 lines)
|
||||
Version 19.90.2: Dec 13, 2019 Code refactoring in matches. (248427 lines)
|
||||
Version 19.90.1: Dec 12, 2019 Changes in CSS. (248391 lines)
|
||||
Version 19.90: Dec 12, 2019 Hourglass to start countdown. (248373 lines)
|
||||
|
|
23
swad_match.c
23
swad_match.c
|
@ -169,7 +169,7 @@ static void Mch_WriteElapsedTimeInMch (struct Match *Match);
|
|||
static void Mch_WriteElapsedTimeInQst (struct Match *Match);
|
||||
static void Mch_WriteHourglass (struct Match *Match);
|
||||
static void Mch_PutFormCountdown (struct Match *Match,long Countdown,const char *Color);
|
||||
static void Mch_PutHourglassIconAndCountdown (struct Match *Match);
|
||||
static void Mch_PutCountdownAndHourglassIcon (struct Match *Match);
|
||||
static void Mch_WriteNumRespondersQst (struct Match *Match);
|
||||
|
||||
static void Mch_ShowRightColumnTch (const struct Match *Match);
|
||||
|
@ -2290,15 +2290,16 @@ static void Mch_WriteHourglass (struct Match *Match)
|
|||
/***** Start container *****/
|
||||
HTM_DIV_Begin ("class=\"MCH_SHOW_HOURGLASS\"");
|
||||
|
||||
/***** Put icon hourglass and write countdown *****/
|
||||
Mch_PutCountdownAndHourglassIcon (Match);
|
||||
HTM_BR ();
|
||||
|
||||
/***** Put forms to start countdown *****/
|
||||
Mch_PutFormCountdown (Match,-1 ,"MCH_GREEN" );
|
||||
Mch_PutFormCountdown (Match,Mch_COUNTDOWN_SECONDS_LARGE ,"MCH_LIMEGREEN");
|
||||
Mch_PutFormCountdown (Match,Mch_COUNTDOWN_SECONDS_MEDIUM,"MCH_YELLOW" );
|
||||
Mch_PutFormCountdown (Match,Mch_COUNTDOWN_SECONDS_SMALL ,"MCH_RED" );
|
||||
|
||||
/***** Put icon hourglass and write countdown *****/
|
||||
Mch_PutHourglassIconAndCountdown (Match);
|
||||
|
||||
/***** End container *****/
|
||||
HTM_DIV_End ();
|
||||
}
|
||||
|
@ -2352,7 +2353,7 @@ static void Mch_PutFormCountdown (struct Match *Match,long Countdown,const char
|
|||
Frm_EndForm ();
|
||||
}
|
||||
|
||||
static void Mch_PutHourglassIconAndCountdown (struct Match *Match)
|
||||
static void Mch_PutCountdownAndHourglassIcon (struct Match *Match)
|
||||
{
|
||||
extern const char *Txt_Countdown;
|
||||
const char *Class;
|
||||
|
@ -2385,16 +2386,20 @@ static void Mch_PutHourglassIconAndCountdown (struct Match *Match)
|
|||
Icon = "fa-hourglass-end";
|
||||
}
|
||||
|
||||
/***** Put hourglass icon with countdown *****/
|
||||
HTM_BR ();
|
||||
/***** Write countdown and put hourglass icon *****/
|
||||
HTM_DIV_Begin ("class=\"MCH_BIGBUTTON_CONT\"");
|
||||
HTM_BUTTON_BUTTON_Begin (Txt_Countdown,Class,NULL);
|
||||
HTM_TxtF ("<i class=\"fas %s\"></i>",Icon);
|
||||
HTM_BR ();
|
||||
|
||||
/* Countdown */
|
||||
if (Match->Status.Countdown > 0)
|
||||
HTM_TxtF (" %02ld″",Match->Status.Countdown);
|
||||
else
|
||||
HTM_NBSP ();
|
||||
HTM_BR ();
|
||||
|
||||
/* Icon */
|
||||
HTM_TxtF ("<i class=\"fas %s\"></i>",Icon);
|
||||
|
||||
HTM_BUTTON_End ();
|
||||
HTM_DIV_End ();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue