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

Version19.60

This commit is contained in:
Antonio Cañas Vargas 2019-11-09 20:31:17 +01:00
parent 2a58312fd1
commit c24732c40d
4 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
swad_HTML.c
View File

@ -72,6 +72,7 @@ static unsigned HTM_LABEL_NestingLevel = 0;
static unsigned HTM_BUTTON_NestingLevel = 0; static unsigned HTM_BUTTON_NestingLevel = 0;
static unsigned HTM_TEXTAREA_NestingLevel = 0; static unsigned HTM_TEXTAREA_NestingLevel = 0;
static unsigned HTM_SELECT_NestingLevel = 0; static unsigned HTM_SELECT_NestingLevel = 0;
static unsigned HTM_OPTGROUP_NestingLevel = 0;
/*****************************************************************************/ /*****************************************************************************/
/***************************** Private prototypes ****************************/ /***************************** Private prototypes ****************************/
@ -1378,6 +1379,23 @@ void HTM_SELECT_End (void)
HTM_SELECT_NestingLevel--; HTM_SELECT_NestingLevel--;
} }
void HTM_OPTGROUP_Begin (const char *Label)
{
fprintf (Gbl.F.Out,"<optgroup label=\"%s\">",Label);
HTM_OPTGROUP_NestingLevel++;
}
void HTM_OPTGROUP_End (void)
{
if (HTM_OPTGROUP_NestingLevel == 0) // No OPTGROUP open
Ale_ShowAlert (Ale_ERROR,"Trying to close unopened OPTGROUP.");
fprintf (Gbl.F.Out,"</optgroup>");
HTM_OPTGROUP_NestingLevel--;
}
void HTM_OPTION (HTM_Type_t Type,const void *ValuePtr,bool Selected,bool Disabled, void HTM_OPTION (HTM_Type_t Type,const void *ValuePtr,bool Selected,bool Disabled,
const char *fmt,...) const char *fmt,...)
{ {

2
swad_HTML.h
View File

@ -139,6 +139,8 @@ void HTM_TEXTAREA_End (void);
void HTM_SELECT_Begin (bool SubmitOnChange, void HTM_SELECT_Begin (bool SubmitOnChange,
const char *fmt,...); const char *fmt,...);
void HTM_SELECT_End (void); void HTM_SELECT_End (void);
void HTM_OPTGROUP_Begin (const char *Label);
void HTM_OPTGROUP_End (void);
void HTM_OPTION (HTM_Type_t Type,const void *ValuePtr,bool Selected,bool Disabled, void HTM_OPTION (HTM_Type_t Type,const void *ValuePtr,bool Selected,bool Disabled,
const char *fmt,...); const char *fmt,...);

3
swad_changelog.h
View File

@ -487,7 +487,7 @@ 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.59 (2019-11-09)" #define Log_PLATFORM_VERSION "SWAD 19.60 (2019-11-09)"
#define CSS_FILE "swad19.47.css" #define CSS_FILE "swad19.47.css"
#define JS_FILE "swad19.39.js" #define JS_FILE "swad19.39.js"
/* /*
@ -495,6 +495,7 @@ ps2pdf source.ps destination.pdf
// TODO: Impedir la creación y edición de proyectos si no son editables. // TODO: Impedir la creación y edición de proyectos si no son editables.
// TODO: Importante: filtrar proyectos por usuarios (igual que en trabajos o en asistencia) // TODO: Importante: filtrar proyectos por usuarios (igual que en trabajos o en asistencia)
Version 19.60: Nov 09, 2019 Code refactoring in HTML options. (246203 lines)
Version 19.59: Nov 09, 2019 Code refactoring in HTML params. (246187 lines) Version 19.59: Nov 09, 2019 Code refactoring in HTML params. (246187 lines)
Version 19.58: Nov 09, 2019 Code refactoring in HTML definition lists. (246169 lines) Version 19.58: Nov 09, 2019 Code refactoring in HTML definition lists. (246169 lines)
Version 19.57: Nov 09, 2019 Code refactoring in HTML definition lists. (246156 lines) Version 19.57: Nov 09, 2019 Code refactoring in HTML definition lists. (246156 lines)

6
swad_course.c
View File

@ -1072,8 +1072,8 @@ void Crs_WriteSelectorMyCoursesInBreadcrumb (void)
if (DegCod != LastDegCod) if (DegCod != LastDegCod)
{ {
if (LastDegCod > 0) if (LastDegCod > 0)
fprintf (Gbl.F.Out,"</optgroup>"); HTM_OPTGROUP_End ();
fprintf (Gbl.F.Out,"<optgroup label=\"%s\">",DegShortName); HTM_OPTGROUP_Begin (DegShortName);
LastDegCod = DegCod; LastDegCod = DegCod;
} }
@ -1083,7 +1083,7 @@ void Crs_WriteSelectorMyCoursesInBreadcrumb (void)
} }
if (LastDegCod > 0) if (LastDegCod > 0)
fprintf (Gbl.F.Out,"</optgroup>"); HTM_OPTGROUP_End ();
} }
/***** Write an option with the current course /***** Write an option with the current course