mirror of
https://github.com/acanas/swad-core.git
synced 2024-06-14 12:44:09 +02:00
Version18.116.9
This commit is contained in:
parent
3c62e03068
commit
9e10644120
|
@ -448,10 +448,11 @@ En OpenSWAD:
|
||||||
ps2pdf source.ps destination.pdf
|
ps2pdf source.ps destination.pdf
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 18.116.8 (2019-04-20)"
|
#define Log_PLATFORM_VERSION "SWAD 18.116.9 (2019-04-20)"
|
||||||
#define CSS_FILE "swad18.112.1.css"
|
#define CSS_FILE "swad18.112.1.css"
|
||||||
#define JS_FILE "swad18.116.5.js"
|
#define JS_FILE "swad18.116.5.js"
|
||||||
/*
|
/*
|
||||||
|
Version 18.116.9: Apr 20, 2019 Changed the behaviour of hiding/showing a game. (242841 lines)
|
||||||
Version 18.116.8: Apr 20, 2019 Changed the behaviour of hiding/showing an exam announcement. (242881 lines)
|
Version 18.116.8: Apr 20, 2019 Changed the behaviour of hiding/showing an exam announcement. (242881 lines)
|
||||||
Version 18.116.7: Apr 20, 2019 Changed the behaviour of hiding/showing a banner. (242934 lines)
|
Version 18.116.7: Apr 20, 2019 Changed the behaviour of hiding/showing a banner. (242934 lines)
|
||||||
Version 18.116.6: Apr 20, 2019 Changed the behaviour of hiding/showing an assignment. (242974 lines)
|
Version 18.116.6: Apr 20, 2019 Changed the behaviour of hiding/showing an assignment. (242974 lines)
|
||||||
|
|
38
swad_game.c
38
swad_game.c
|
@ -99,7 +99,8 @@ static void Gam_WriteAuthor (struct Game *Game);
|
||||||
static void Gam_WriteStatus (struct Game *Game);
|
static void Gam_WriteStatus (struct Game *Game);
|
||||||
static void Gam_GetParamGameOrder (void);
|
static void Gam_GetParamGameOrder (void);
|
||||||
|
|
||||||
static void Gam_PutFormsToRemEditOneGame (long GamCod,bool Visible,
|
static void Gam_PutFormsToRemEditOneGame (const struct Game *Game,
|
||||||
|
const char *Anchor,
|
||||||
bool ShowOnlyThisGame);
|
bool ShowOnlyThisGame);
|
||||||
static void Gam_PutParamsToPlayGame1stQst (void);
|
static void Gam_PutParamsToPlayGame1stQst (void);
|
||||||
static void Gam_PutParams (void);
|
static void Gam_PutParams (void);
|
||||||
|
@ -430,6 +431,7 @@ static void Gam_ShowOneGame (long GamCod,
|
||||||
extern const char *Txt_Users;
|
extern const char *Txt_Users;
|
||||||
extern const char *Txt_Play;
|
extern const char *Txt_Play;
|
||||||
extern const char *Txt_View_game_results;
|
extern const char *Txt_View_game_results;
|
||||||
|
char *Anchor = NULL;
|
||||||
static unsigned UniqueId = 0;
|
static unsigned UniqueId = 0;
|
||||||
struct Game Game;
|
struct Game Game;
|
||||||
char Txt[Cns_MAX_BYTES_TEXT + 1];
|
char Txt[Cns_MAX_BYTES_TEXT + 1];
|
||||||
|
@ -443,6 +445,9 @@ static void Gam_ShowOneGame (long GamCod,
|
||||||
Game.GamCod = GamCod;
|
Game.GamCod = GamCod;
|
||||||
Gam_GetDataOfGameByCod (&Game);
|
Gam_GetDataOfGameByCod (&Game);
|
||||||
|
|
||||||
|
/***** Set anchor string *****/
|
||||||
|
Frm_SetAnchorStr (Game.GamCod,&Anchor);
|
||||||
|
|
||||||
/***** Start table *****/
|
/***** Start table *****/
|
||||||
if (ShowOnlyThisGame)
|
if (ShowOnlyThisGame)
|
||||||
Tbl_StartTableWide (2);
|
Tbl_StartTableWide (2);
|
||||||
|
@ -455,8 +460,7 @@ static void Gam_ShowOneGame (long GamCod,
|
||||||
fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd);
|
fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd);
|
||||||
fprintf (Gbl.F.Out,"\">");
|
fprintf (Gbl.F.Out,"\">");
|
||||||
if (Game.Status.ICanEdit)
|
if (Game.Status.ICanEdit)
|
||||||
Gam_PutFormsToRemEditOneGame (Game.GamCod,Game.Status.Visible,
|
Gam_PutFormsToRemEditOneGame (&Game,Anchor,ShowOnlyThisGame);
|
||||||
ShowOnlyThisGame);
|
|
||||||
fprintf (Gbl.F.Out,"</td>");
|
fprintf (Gbl.F.Out,"</td>");
|
||||||
|
|
||||||
/* Start date/time */
|
/* Start date/time */
|
||||||
|
@ -501,8 +505,7 @@ static void Gam_ShowOneGame (long GamCod,
|
||||||
if (!ShowOnlyThisGame)
|
if (!ShowOnlyThisGame)
|
||||||
fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd);
|
fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd);
|
||||||
fprintf (Gbl.F.Out,"\">");
|
fprintf (Gbl.F.Out,"\">");
|
||||||
|
Lay_StartArticle (Anchor);
|
||||||
/* Put form to view game */
|
|
||||||
Frm_StartForm (ActSeeOneGam);
|
Frm_StartForm (ActSeeOneGam);
|
||||||
Gam_PutParamGameCod (GamCod);
|
Gam_PutParamGameCod (GamCod);
|
||||||
Gam_PutHiddenParamGameOrder ();
|
Gam_PutHiddenParamGameOrder ();
|
||||||
|
@ -514,6 +517,7 @@ static void Gam_ShowOneGame (long GamCod,
|
||||||
fprintf (Gbl.F.Out,"%s</a>",
|
fprintf (Gbl.F.Out,"%s</a>",
|
||||||
Game.Title);
|
Game.Title);
|
||||||
Frm_EndForm ();
|
Frm_EndForm ();
|
||||||
|
Lay_EndArticle ();
|
||||||
|
|
||||||
/* Number of questions and number of distinct users who have already answered this game */
|
/* Number of questions and number of distinct users who have already answered this game */
|
||||||
fprintf (Gbl.F.Out,"<div class=\"%s\">%s: %u; %s: %u</div>"
|
fprintf (Gbl.F.Out,"<div class=\"%s\">%s: %u; %s: %u</div>"
|
||||||
|
@ -681,6 +685,9 @@ static void Gam_ShowOneGame (long GamCod,
|
||||||
else
|
else
|
||||||
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
|
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
|
||||||
|
|
||||||
|
/***** Free anchor string *****/
|
||||||
|
Frm_FreeAnchorStr (Anchor);
|
||||||
|
|
||||||
/***** Put big button to start playing *****/
|
/***** Put big button to start playing *****/
|
||||||
if (PutButtonToStart)
|
if (PutButtonToStart)
|
||||||
Gam_PutBigButtonToStartGame (Game.GamCod);
|
Gam_PutBigButtonToStartGame (Game.GamCod);
|
||||||
|
@ -805,13 +812,14 @@ void Gam_PutHiddenParamGameOrder (void)
|
||||||
/******************** Put a link (form) to edit one game *********************/
|
/******************** Put a link (form) to edit one game *********************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
static void Gam_PutFormsToRemEditOneGame (long GamCod,bool Visible,
|
static void Gam_PutFormsToRemEditOneGame (const struct Game *Game,
|
||||||
|
const char *Anchor,
|
||||||
bool ShowOnlyThisGame)
|
bool ShowOnlyThisGame)
|
||||||
{
|
{
|
||||||
extern const char *Txt_Reset;
|
extern const char *Txt_Reset;
|
||||||
extern const char *Txt_Play;
|
extern const char *Txt_Play;
|
||||||
|
|
||||||
Gbl.Games.CurrentGamCod = GamCod; // Used as parameter in contextual links
|
Gbl.Games.CurrentGamCod = Game->GamCod; // Used as parameter in contextual links
|
||||||
|
|
||||||
/***** Put icon to remove game *****/
|
/***** Put icon to remove game *****/
|
||||||
Ico_PutContextualIconToRemove (ActReqRemGam,Gam_PutParams);
|
Ico_PutContextualIconToRemove (ActReqRemGam,Gam_PutParams);
|
||||||
|
@ -822,10 +830,10 @@ static void Gam_PutFormsToRemEditOneGame (long GamCod,bool Visible,
|
||||||
Txt_Reset);
|
Txt_Reset);
|
||||||
|
|
||||||
/***** Put icon to hide/show game *****/
|
/***** Put icon to hide/show game *****/
|
||||||
if (Visible)
|
if (Game->Status.Visible)
|
||||||
Ico_PutContextualIconToHide (ActHidGam,NULL,Gam_PutParams);
|
Ico_PutContextualIconToHide (ActHidGam,Anchor,Gam_PutParams);
|
||||||
else
|
else
|
||||||
Ico_PutContextualIconToUnhide (ActShoGam,NULL,Gam_PutParams);
|
Ico_PutContextualIconToUnhide (ActShoGam,Anchor,Gam_PutParams);
|
||||||
|
|
||||||
/***** Put icon to edit game *****/
|
/***** Put icon to edit game *****/
|
||||||
Ico_PutContextualIconToEdit (ActEdiOneGam,Gam_PutParams);
|
Ico_PutContextualIconToEdit (ActEdiOneGam,Gam_PutParams);
|
||||||
|
@ -1640,7 +1648,6 @@ void Gam_ResetGame (void)
|
||||||
|
|
||||||
void Gam_HideGame (void)
|
void Gam_HideGame (void)
|
||||||
{
|
{
|
||||||
extern const char *Txt_Game_X_is_now_hidden;
|
|
||||||
struct Game Game;
|
struct Game Game;
|
||||||
|
|
||||||
/***** Get game code *****/
|
/***** Get game code *****/
|
||||||
|
@ -1657,10 +1664,6 @@ void Gam_HideGame (void)
|
||||||
"UPDATE games SET Hidden='Y' WHERE GamCod=%ld",
|
"UPDATE games SET Hidden='Y' WHERE GamCod=%ld",
|
||||||
Game.GamCod);
|
Game.GamCod);
|
||||||
|
|
||||||
/***** Write message to show the change made *****/
|
|
||||||
Ale_ShowAlert (Ale_SUCCESS,Txt_Game_X_is_now_hidden,
|
|
||||||
Game.Title);
|
|
||||||
|
|
||||||
/***** Show games again *****/
|
/***** Show games again *****/
|
||||||
Gam_ListAllGames ();
|
Gam_ListAllGames ();
|
||||||
}
|
}
|
||||||
|
@ -1671,7 +1674,6 @@ void Gam_HideGame (void)
|
||||||
|
|
||||||
void Gam_UnhideGame (void)
|
void Gam_UnhideGame (void)
|
||||||
{
|
{
|
||||||
extern const char *Txt_Game_X_is_now_visible;
|
|
||||||
struct Game Game;
|
struct Game Game;
|
||||||
|
|
||||||
/***** Get game code *****/
|
/***** Get game code *****/
|
||||||
|
@ -1688,10 +1690,6 @@ void Gam_UnhideGame (void)
|
||||||
"UPDATE games SET Hidden='N' WHERE GamCod=%ld",
|
"UPDATE games SET Hidden='N' WHERE GamCod=%ld",
|
||||||
Game.GamCod);
|
Game.GamCod);
|
||||||
|
|
||||||
/***** Write message to show the change made *****/
|
|
||||||
Ale_ShowAlert (Ale_SUCCESS,Txt_Game_X_is_now_visible,
|
|
||||||
Game.Title);
|
|
||||||
|
|
||||||
/***** Show games again *****/
|
/***** Show games again *****/
|
||||||
Gam_ListAllGames ();
|
Gam_ListAllGames ();
|
||||||
}
|
}
|
||||||
|
|
42
swad_text.c
42
swad_text.c
|
@ -13552,48 +13552,6 @@ const char *Txt_Game =
|
||||||
"Jogo";
|
"Jogo";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const char *Txt_Game_X_is_now_hidden = // Warning: it is very important to include %s in the following sentences
|
|
||||||
#if L==1 // ca
|
|
||||||
"El joc <strong>%s</strong> ara està oculto.";
|
|
||||||
#elif L==2 // de
|
|
||||||
"Das Spiel <strong>%s</strong> ist jetzt ausgeblendet.";
|
|
||||||
#elif L==3 // en
|
|
||||||
"Game <strong>%s</strong> is now hidden.";
|
|
||||||
#elif L==4 // es
|
|
||||||
"El juego <strong>%s</strong> ahora está oculto.";
|
|
||||||
#elif L==5 // fr
|
|
||||||
"Le jeu <strong>%s</strong> est maintenant caché.";
|
|
||||||
#elif L==6 // gn
|
|
||||||
"El juego <strong>%s</strong> ahora está oculto."; // Okoteve traducción
|
|
||||||
#elif L==7 // it
|
|
||||||
"Il gioco <strong>%s</strong> è ora nascosto.";
|
|
||||||
#elif L==8 // pl
|
|
||||||
"Gra <strong>%s</strong> jest teraz ukryta.";
|
|
||||||
#elif L==9 // pt
|
|
||||||
"O jogo <strong>%s</strong> é agora oculto.";
|
|
||||||
#endif
|
|
||||||
|
|
||||||
const char *Txt_Game_X_is_now_visible = // Warning: it is very important to include %s in the following sentences
|
|
||||||
#if L==1 // ca
|
|
||||||
"El joc <strong>%s</strong> ara està visible.";
|
|
||||||
#elif L==2 // de
|
|
||||||
"Das Spiel <strong>%s</strong> ist jetzt sichtbar.";
|
|
||||||
#elif L==3 // en
|
|
||||||
"Game <strong>%s</strong> is now visible.";
|
|
||||||
#elif L==4 // es
|
|
||||||
"El juego <strong>%s</strong> ahora está visible.";
|
|
||||||
#elif L==5 // fr
|
|
||||||
"Le jeu <strong>%s</strong> est maintenant visible.";
|
|
||||||
#elif L==6 // gn
|
|
||||||
"El juego <strong>%s</strong> ahora está visible."; // Okoteve traducción
|
|
||||||
#elif L==7 // it
|
|
||||||
"Il gioco <strong>%s</strong> è ora visibile.";
|
|
||||||
#elif L==8 // pl
|
|
||||||
"Badanie <strong>%s</strong> jest teraz widoczne.";
|
|
||||||
#elif L==9 // pt
|
|
||||||
"O jogo <strong>%s</strong> é agora visível.";
|
|
||||||
#endif
|
|
||||||
|
|
||||||
const char *Txt_Game_X_removed = // Warning: it is very important to include %s in the following sentences
|
const char *Txt_Game_X_removed = // Warning: it is very important to include %s in the following sentences
|
||||||
#if L==1 // ca
|
#if L==1 // ca
|
||||||
"Joc <strong>%s</strong> eliminat.";
|
"Joc <strong>%s</strong> eliminat.";
|
||||||
|
|
Loading…
Reference in New Issue
Block a user