diff --git a/css/swad16.147.css b/css/swad16.156.1.css similarity index 99% rename from css/swad16.147.css rename to css/swad16.156.1.css index 851bdd27d..f3df08632 100644 --- a/css/swad16.147.css +++ b/css/swad16.156.1.css @@ -21,7 +21,6 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not,see . */ - /********************************* Body **************************************/ body { @@ -29,6 +28,7 @@ body background-color:white; font-family:"Helvetica Neue",Helvetica,Arial,sans-serif; font-size:1em; + overflow-y:scroll; /* force vertical scrollbar */ } input { diff --git a/swad_changelog.h b/swad_changelog.h index 2d5b62307..57fa6e3eb 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -209,13 +209,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.156 (2017-03-15)" -#define CSS_FILE "swad16.147.css" +#define Log_PLATFORM_VERSION "SWAD 16.156.1 (2017-03-15)" +#define CSS_FILE "swad16.156.1.css" #define JS_FILE "swad16.144.js" // Number of lines (includes comments but not blank lines) has been got with the following command: // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1 /* + Version 16.156.1: Mar 15, 2017 Force vertical scrollbar. (217078 lines) Version 16.156: Mar 15, 2017 Fixed bug in messages, reported by Francisco Ocaņa Lara. (217063 lines) Version 16.155.35:Mar 15, 2017 Some help URLs translated to spanish. (217047 lines) Version 16.155.34:Mar 15, 2017 Changes in keywords. (217046 lines) diff --git a/swad_layout.c b/swad_layout.c index 42bd3f5d5..ee78f5548 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -85,6 +85,7 @@ static void Lay_WriteRedirToMyLangOnLogIn (void); static void Lay_WriteRedirToMyLangOnViewUsrAgd (void); static void Lay_WriteScripts (void); +static void Lay_WriteScriptMathJax (void); static void Lay_WriteScriptInit (void); static void Lay_WriteScriptParamsAJAX (void); static void Lay_WriteScriptCustomDropzone (void); @@ -163,6 +164,8 @@ void Lay_WriteStartOfPage (void) // in httpd.conf to enable meta tag fprintf (Gbl.F.Out,"\n" "\n" +"\n" +"\n" "\n" "\n" "\n" + fprintf (Gbl.F.Out,"\n" "
" "\"\"" // main_zone "
\n"); // whole_page_* (box that contains the whole page except the foot) + /***** Script for MathJax *****/ + Lay_WriteScriptMathJax (); + Gbl.Layout.DivsEndWritten = true; } } @@ -469,29 +475,7 @@ static void Lay_WriteScripts (void) Cfg_URL_SWAD_PUBLIC,JS_FILE); /***** Script for MathJax *****/ - // MathJax configuration - /* - fprintf (Gbl.F.Out,""); - */ -#ifdef Cfg_MATHJAX_LOCAL - // Use the local copy of MathJax - fprintf (Gbl.F.Out,"\n", - Cfg_URL_SWAD_PUBLIC); -#else - // Use the MathJax Content Delivery Network (CDN) - fprintf (Gbl.F.Out,"\n"); -#endif + // Lay_WriteScriptMathJax (); /***** Scripts used only in main window *****/ if (Act_Actions[Gbl.Action.Act].BrowserWindow == Act_THIS_WINDOW) @@ -645,6 +629,37 @@ static void Lay_WriteScripts (void) // document.title = title; //} +/*****************************************************************************/ +/************ Write some scripts depending on the current action *************/ +/*****************************************************************************/ + +static void Lay_WriteScriptMathJax (void) + { + // MathJax configuration + /* + fprintf (Gbl.F.Out,""); + */ +#ifdef Cfg_MATHJAX_LOCAL + // Use the local copy of MathJax + fprintf (Gbl.F.Out,"\n", + Cfg_URL_SWAD_PUBLIC); +#else + // Use the MathJax Content Delivery Network (CDN) + fprintf (Gbl.F.Out,"\n"); +#endif + } + /*****************************************************************************/ /******* Write script with init function executed after loading page *********/ /*****************************************************************************/ @@ -695,7 +710,7 @@ static void Lay_WriteScriptInit (void) default: break; } - + // fprintf (Gbl.F.Out," document.getElementById('whole_page').style.opacity='1';\n"); fprintf (Gbl.F.Out,"}\n" "\n"); }