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

Version 16.156.1

This commit is contained in:
Antonio Cañas Vargas 2017-03-15 22:15:19 +01:00
parent 20e0683453
commit 97326c1416
3 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/swad16.147.css → css/swad16.156.1.css
View File

@ -21,7 +21,6 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not,see <http://www.gnu.org/licenses/>.
*/
/********************************* 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
{

5
swad_changelog.h
View File

@ -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)

65
swad_layout.c
View File

@ -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,"<html lang=\"%s\">\n"
"<head>\n"
"<meta http-equiv=\"Page-Enter\" content=\"blendTrans(Duration=0)\">\n"
"<meta http-equiv=\"Page-Exit\" content=\"blendTrans(Duration=0)\">\n"
"<meta http-equiv=\"Content-Type\" content=\"text/html;charset=windows-1252\" />\n"
"<meta name=\"description\" content=\"A free-software, educational, online tool for managing courses and students.\" />\n"
"<meta name=\"keywords\" content=\""
@ -255,7 +258,7 @@ void Lay_WriteStartOfPage (void)
/***** HTML body *****/
if (Act_Actions[Gbl.Action.Act].BrowserWindow == Act_THIS_WINDOW)
fprintf (Gbl.F.Out,"<body onload=\"init()\">\n"
fprintf (Gbl.F.Out,"<body onload=\"init();\">\n"
"<div id=\"zoomLyr\" class=\"ZOOM\">"
"<img id=\"zoomImg\" src=\"%s/usr_bl.jpg\""
" alt=\"\" title=\"\""
@ -386,6 +389,9 @@ static void Lay_WriteEndOfPage (void)
"</div>" // main_zone
"</div>\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,"<script type=\"text/javascript\">"
" window.MathJax = {"
" tex2jax: {"
" inlineMath: [ ['$','$'], [\"\\\\(\",\"\\\\)\"] ],"
" processEscapes: true"
" }"
" };"
"</script>");
*/
#ifdef Cfg_MATHJAX_LOCAL
// Use the local copy of MathJax
fprintf (Gbl.F.Out,"<script type=\"text/javascript\""
" src=\"%s/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML\">"
"</script>\n",
Cfg_URL_SWAD_PUBLIC);
#else
// Use the MathJax Content Delivery Network (CDN)
fprintf (Gbl.F.Out,"<script type=\"text/javascript\""
" src=\"//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML\">"
"</script>\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,"<script type=\"text/javascript\">"
" window.MathJax = {"
" tex2jax: {"
" inlineMath: [ ['$','$'], [\"\\\\(\",\"\\\\)\"] ],"
" processEscapes: true"
" }"
" };"
"</script>");
*/
#ifdef Cfg_MATHJAX_LOCAL
// Use the local copy of MathJax
fprintf (Gbl.F.Out,"<script type=\"text/javascript\""
" src=\"%s/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML\">"
"</script>\n",
Cfg_URL_SWAD_PUBLIC);
#else
// Use the MathJax Content Delivery Network (CDN)
fprintf (Gbl.F.Out,"<script type=\"text/javascript\""
" src=\"//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML\">"
"</script>\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"
"</script>\n");
}