Version18.120.2

This commit is contained in:
Antonio Cañas Vargas 2019-05-14 09:03:48 +02:00
parent 30ea0bec54
commit 1cf76a6f13
7 changed files with 16 additions and 11 deletions

View File

@ -11,7 +11,7 @@
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="(g?cc)|([gc]\+\+)|(clang)" prefer-non-shared="true"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-525352425879766662" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-524711994852726662" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>

View File

@ -53,6 +53,12 @@ extern struct Globals Gbl;
/******************************* Private types *******************************/
/*****************************************************************************/
/*****************************************************************************/
/***************************** Private variabled *****************************/
/*****************************************************************************/
static unsigned Box_Nested = 0;
/*****************************************************************************/
/***************************** Private prototypes ****************************/
/*****************************************************************************/
@ -176,11 +182,11 @@ static void Box_StartBoxInternal (const char *Width,const char *Title,
fprintf (Gbl.F.Out,"<div class=\"FRAME_TITLE %s\">"
"%s"
"</div>",
Gbl.Layout.NestedBox ? "FRAME_TITLE_SMALL" :
"FRAME_TITLE_BIG",
Box_Nested ? "FRAME_TITLE_SMALL" :
"FRAME_TITLE_BIG",
Title);
Gbl.Layout.NestedBox++;
Box_Nested++;
}
void Box_EndBoxTable (void)
@ -203,7 +209,7 @@ void Box_EndBoxWithButton (Btn_Button_t Button,const char *TxtButton)
void Box_EndBox (void)
{
Gbl.Layout.NestedBox--;
Box_Nested--;
/***** End box and box container *****/
fprintf (Gbl.F.Out,"</div>"

View File

@ -448,10 +448,11 @@ En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 18.120.1 (2019-04-25)"
#define Log_PLATFORM_VERSION "SWAD 18.120.2 (2019-04-30)"
#define CSS_FILE "swad18.112.1.css"
#define JS_FILE "swad18.116.5.js"
/*
Version 18.120.2: Apr 30, 2019 Code refactoring related to boxes. (242465 lines)
Version 18.120.1: Apr 25, 2019 Code refactoring related to file browser. (242461 lines)
Version 18.120: Apr 25, 2019 Code refactoring related to file browser. (242466 lines)
Version 18.119: Apr 25, 2019 Code refactoring related to selected users. (242536 lines)

View File

@ -28,9 +28,9 @@
/** Uncomment one of the following installations of SWAD or create your own **/
/*****************************************************************************/
#define LOCALHOST_UBUNTU // Comment this line if not applicable
//#define LOCALHOST_UBUNTU // Comment this line if not applicable
//#define OPENSWAD_ORG // Comment this line if not applicable
//#define SWAD_UGR_ES // Comment this line if not applicable
#define SWAD_UGR_ES // Comment this line if not applicable
//#define SWADBERRY_UGR_ES // Comment this line if not applicable
/*****************************************************************************/

View File

@ -27,6 +27,7 @@
#define _GNU_SOURCE // For asprintf
#include <stdio.h> // For asprintf
#include <stdlib.h> // For free
#include "swad_form.h"
#include "swad_global.h"

View File

@ -402,8 +402,6 @@ void Gbl_InitializeGlobals (void)
Gbl.WebService.Function = Svc_unknown;
Gbl.Layout.NestedBox = 0;
/* Flush caches */
Cty_FlushCacheCountryName ();
Ins_FlushCacheShortNameOfInstitution ();

View File

@ -143,7 +143,6 @@ struct Globals
bool HTMLStartWritten; // Used to avoid writing more than once the HTML head
bool DivsEndWritten; // Used to avoid writing more than once the HTML end
bool HTMLEndWritten; // Used to avoid writing more than once the HTML end
unsigned NestedBox;
} Layout;
struct
{