diff --git a/css/swad_desktop.css b/css/swad_desktop.css index 0f6a356e9..c7c7a94c9 100644 --- a/css/swad_desktop.css +++ b/css/swad_desktop.css @@ -35,7 +35,7 @@ body } input {font-size:10pt; vertical-align:middle;} select {font-size:10pt;} -textarea {font-size:8pt;} +textarea {font-size:10pt;} table { border-width:0; @@ -769,6 +769,14 @@ a:hover img.CENTRE_PHOTO_SHOW padding:5px; } +/************************ Help for the text editor ***************************/ +.HELP_EDIT + { + margin-bottom:10px; + color:#808080; + font-size:8pt; + } + /*****************************************************************************/ .FILENAME {color:#404040; font-size:14pt; font-weight:bold;} diff --git a/css/swad_mobile.css b/css/swad_mobile.css index 872b35b0e..b07224186 100644 --- a/css/swad_mobile.css +++ b/css/swad_mobile.css @@ -34,7 +34,7 @@ body } input {font-size:16pt; vertical-align:middle;} select {font-size:16pt;} -textarea {font-size:12pt;} +textarea {font-size:16pt;} table { border-width:0; @@ -580,6 +580,14 @@ a:hover img.CENTRE_PHOTO_SHOW padding:5px; } +/************************ Help for the text editor ***************************/ +.HELP_EDIT + { + margin-bottom:10px; + color:#808080; + font-size:8pt; + } + /*****************************************************************************/ .FILENAME {color:#404040; font-size:18pt; font-weight:bold;} diff --git a/swad_changelog.h b/swad_changelog.h index aa5e7d952..26842d62c 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -103,11 +103,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.110.3 (2015/04/09)" +#define Log_PLATFORM_VERSION "SWAD 14.110.4 (2015/04/11)" // 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 14.110.4: Apr 11, 2015 Changes in MathJax configuration. (184685 lines) Version 14.110.3: Apr 09, 2015 Changes in conversion from Markdown to HTML5 using pandoc. (184599 lines) Version 14.110.2: Apr 09, 2015 Changes in CSS and scripts. MathJax installed in local by default. (184555 lines) diff --git a/swad_info.c b/swad_info.c index f0cae8fc1..b61040439 100644 --- a/swad_info.c +++ b/swad_info.c @@ -1840,19 +1840,18 @@ void Inf_EditPlainTxtInfo (void) /***** Edition area *****/ fprintf (Gbl.F.Out,"" - "" - "" - "" - "", + "", TxtHTML); - - /***** End of table *****/ - Lay_EndRoundFrameTable10 (); - - /***** Send and undo buttons *****/ Lay_PutConfirmButton (Txt_Save); + fprintf (Gbl.F.Out,"" + ""); + + /***** End form *****/ + Lay_EndRoundFrameTable10 (); Act_FormEnd (); } @@ -1863,12 +1862,11 @@ void Inf_EditPlainTxtInfo (void) void Inf_EditRichTxtInfo (void) { extern const char *Txt_INFO_TITLE[Inf_NUM_INFO_TYPES]; - extern const char *Txt_RICH_TEXT_EDITOR_HELP; extern const char *Txt_Save; Inf_InfoType_t InfoType = Inf_AsignInfoType (); char TxtHTML[Cns_MAX_BYTES_LONG_TEXT+1]; - /***** Start table *****/ + /***** Start form *****/ Act_FormStart (Inf_ActionsRcvRchTxtInfo[InfoType]); Lay_StartRoundFrameTable10 (NULL,0,Txt_INFO_TITLE[InfoType]); @@ -1882,19 +1880,17 @@ void Inf_EditRichTxtInfo (void) /***** Edition area *****/ fprintf (Gbl.F.Out,"" ""); - Lay_ShowAlert (Lay_INFO,Txt_RICH_TEXT_EDITOR_HELP); - fprintf (Gbl.F.Out,"" - "" - "", + "", TxtHTML); - - /***** End of table *****/ - Lay_EndRoundFrameTable10 (); - - /***** Send and undo buttons *****/ Lay_PutConfirmButton (Txt_Save); + fprintf (Gbl.F.Out,"" + ""); + + /***** End form *****/ + Lay_EndRoundFrameTable10 (); Act_FormEnd (); } diff --git a/swad_layout.c b/swad_layout.c index 15979de14..5efd64baf 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -97,6 +97,8 @@ static void Lay_ShowRightColumn (void); static void Lay_WriteFootFromHTMLFile (void); +static void Lay_HelpTextEditor (const char *Text,const char *InlineMath,const char *Equation); + /*****************************************************************************/ /*********************** Write the start of the page *************************/ /*****************************************************************************/ @@ -446,6 +448,17 @@ static void Lay_WriteScripts (void) Cfg_HTTPS_URL_SWAD_PUBLIC); /***** Script for MathJax *****/ + // MathJax configuration + /* + fprintf (Gbl.F.Out,""); + */ #ifdef Cfg_MATHJAX_LOCAL // Use the local copy of MathJax fprintf (Gbl.F.Out,"