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 14.110.4

This commit is contained in:
Antonio Cañas Vargas 2015-04-11 02:04:23 +02:00
parent acbad24b2d
commit 719cf80772
7 changed files with 178 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
css/swad_desktop.css
View File

@ -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;}

10
css/swad_mobile.css
View File

@ -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;}

3
swad_changelog.h
View File

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

40
swad_info.c
View File

@ -1840,19 +1840,18 @@ void Inf_EditPlainTxtInfo (void)
/***** Edition area *****/
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">"
"<textarea name=\"Txt\" cols=\"100\" rows=\"20\">"
"<td style=\"text-align:center;\">");
Lay_HelpPlainEditor ();
fprintf (Gbl.F.Out,"<textarea name=\"Txt\" cols=\"80\" rows=\"20\">"
"%s"
"</textarea>"
"</td>"
"</tr>",
"</textarea>",
TxtHTML);
/***** End of table *****/
Lay_EndRoundFrameTable10 ();
/***** Send and undo buttons *****/
Lay_PutConfirmButton (Txt_Save);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** 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,"<tr>"
"<td style=\"text-align:center;\">");
Lay_ShowAlert (Lay_INFO,Txt_RICH_TEXT_EDITOR_HELP);
fprintf (Gbl.F.Out,"<textarea name=\"Txt\" cols=\"100\" rows=\"20\">"
Lay_HelpRichEditor ();
fprintf (Gbl.F.Out,"<textarea name=\"Txt\" cols=\"80\" rows=\"20\">"
"%s"
"</textarea>"
"</td>"
"</tr>",
"</textarea>",
TxtHTML);
/***** End of table *****/
Lay_EndRoundFrameTable10 ();
/***** Send and undo buttons *****/
Lay_PutConfirmButton (Txt_Save);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End form *****/
Lay_EndRoundFrameTable10 ();
Act_FormEnd ();
}

53
swad_layout.c
View File

@ -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,"<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\""
@ -1616,3 +1629,43 @@ void Lay_IndentDependingOnLevel (unsigned Level,bool IsLastItemInLevel[])
IsLastItemInLevel[Level] ? "subend" :
"submid");
}
/*****************************************************************************/
/************************** Help for the text editor *************************/
/*****************************************************************************/
void Lay_HelpPlainEditor (void)
{
extern const char *Txt_TEXT_plain;
Lay_HelpTextEditor (Txt_TEXT_plain,
"\\(LaTeX\\)",
"$$LaTeX$$, \\[LaTeX\\]");
}
void Lay_HelpRichEditor (void)
{
Lay_HelpTextEditor ("<a href=\"http://johnmacfarlane.net/pandoc/README.html#pandocs-markdown\""
" target=\"_blank\">Markdown + Pandoc</a>",
"$LaTeX$",
"$$LaTeX$$");
}
static void Lay_HelpTextEditor (const char *Text,const char *InlineMath,const char *Equation)
{
extern const char *Txt_Text;
extern const char *Txt_Inline_math;
extern const char *Txt_Equation_centered;
fprintf (Gbl.F.Out,"<div class=\"HELP_EDIT\">"
"<code>"
"%s: %s"
"&nbsp;&nbsp;&nbsp;"
"%s: %s"
"&nbsp;&nbsp;&nbsp;"
"%s: %s"
"</code>"
"</div>",
Txt_Text,Text,
Txt_Inline_math,InlineMath,
Txt_Equation_centered,Equation);
}

3
swad_layout.h
View File

@ -121,4 +121,7 @@ void Lay_AdvertisementMobile (void);
void Lay_IndentDependingOnLevel (unsigned Level,bool IsLastItemInLevel[]);
void Lay_HelpPlainEditor (void);
void Lay_HelpRichEditor (void);
#endif

141
swad_text.c
View File

@ -9870,6 +9870,27 @@ const char *Txt_Enter_from_X = // Warning: it is very important to include %s in
"Digite partir %s";
#endif
const char *Txt_Equation_centered =
#if L==0
"Equaci&oacute; centrada";
#elif L==1
"Gleichung zentriert";
#elif L==2
"Equation centered";
#elif L==3
"Ecuaci&oacute;n centrada";
#elif L==4
"Equation centr&eacute;";
#elif L==5
"Ecuaci&oacute;n centrada"; // Okoteve traducción
#elif L==6
"Equazione centrato";
#elif L==7
"R&oacute;wnanie centered";
#elif L==8
"equa&ccedil;&atilde;o centrado";
#endif
const char *Txt_Error_getting_data_from_a_recipient =
#if L==0
"Error obteniendo datos de un destinatario."; // Necessita traduccio
@ -14263,6 +14284,27 @@ const char *Txt_INFO_SRC_SHORT_TEXT[Inf_NUM_INFO_SOURCES] =
#endif
};
const char *Txt_Inline_math =
#if L==0
"F&oacute;rmula en par&agrave;graf";
#elif L==1
"Inline Mathematik";
#elif L==2
"Inline math";
#elif L==3
"F&oacute;rmula en p&aacute;rrafo";
#elif L==4
"Formule au paragraphe";
#elif L==5
"F&oacute;rmula en p&aacute;rrafo"; // Okoteve traducción
#elif L==6
"Matematica inline";
#elif L==7
"Jazda matematyki";
#elif L==8
"Fórmula em par&aacute;grafo";
#endif
const char *Txt_Institution =
#if L==0
"Instituci&oacute;";
@ -29693,63 +29735,6 @@ const char *Txt_Retype_password =
"Redigite a senha";
#endif
const char *Txt_RICH_TEXT_EDITOR_HELP =
#if L==0
"Pot formatar el text usant"
" <a href=\"http://ca.wikipedia.org/wiki/Markdown\" target=\"_blank\">Markdown</a>."
" A m&eacute;s pot escriure f&oacute;rmules en"
" <a href=\"https://ca.wikipedia.org/wiki/LaTeX\" target=\"_blank\">LaTeX</a>"
" entre dues $ o dues $$.";
#elif L==1
"Sie k&ouml;nnen den Text zu formatieren mit"
" <a href=\"http://de.wikipedia.org/wiki/Markdown\" target=\"_blank\">Markdown</a>."
" Sie k&ouml;nnen"
" <a href=\"https://de.wikipedia.org/wiki/LaTeX\" target=\"_blank\">LaTeX</a>"
" Formeln auch zwischen zwei $ oder zwei $$.";
#elif L==2
"You can format the text using"
" <a href=\"http://en.wikipedia.org/wiki/Markdown\" target=\"_blank\">Markdown</a>."
" You can also type"
" <a href=\"https://en.wikipedia.org/wiki/LaTeX\" target=\"_blank\">LaTeX</a>"
" formulas between two $ or two $$.";
#elif L==3
"Puede formatear el texto usando"
" <a href=\"http://es.wikipedia.org/wiki/Markdown\" target=\"_blank\">Markdown</a>."
" Adem&aacute;s puede escribir f&oacute;rmulas en"
" <a href=\"https://es.wikipedia.org/wiki/LaTeX\" target=\"_blank\">LaTeX</a>"
" entre dos $ o dos $$.";
#elif L==4
"Vous pouvez formater le texte en utilisant"
" <a href=\"http://fr.wikipedia.org/wiki/Markdown\" target=\"_blank\">Markdown</a>."
" Vous pouvez &eacute;galement taper des formules"
" <a href=\"https://fr.wikipedia.org/wiki/LaTeX\" target=\"_blank\">LaTeX</a>"
" entre deux $ ou deux $$.";
#elif L==5
"Puede formatear el texto usando"
" <a href=\"http://es.wikipedia.org/wiki/Markdown\" target=\"_blank\">Markdown</a>."
" Adem&aacute;s puede escribir f&oacute;rmulas en"
" <a href=\"https://es.wikipedia.org/wiki/LaTeX\" target=\"_blank\">LaTeX</a>"
" entre dos $ o dos $$."; // Okoteve traducción
#elif L==6
"&Egrave; possibile formattare il testo con"
" <a href=\"http://it.wikipedia.org/wiki/Markdown\" target=\"_blank\">Markdown</a>."
" &Egrave; inoltre possibile digitare formule"
" <a href=\"https://it.wikipedia.org/wiki/LaTeX\" target=\"_blank\">LaTeX</a>"
" tra due $ o due $$.";
#elif L==7
"Mo&zdot;esz formatowa&cacute; tekst za pomoc&aogon;"
" <a href=\"http://pl.wikipedia.org/wiki/Markdown\" target=\"_blank\">Markdown</a>."
" Mo&zdot;esz r&oacute;wnie&zdot; wpisa&cacute; formu&lstrok;y"
" <a href=\"https://pl.wikipedia.org/wiki/LaTeX\" target=\"_blank\">LaTeX</a>"
" mi&eogon;dzy dwoma $ lub dw&oacute;ch $$.";
#elif L==8
"Voc&ecirc; pode formatar o texto usando"
" <a href=\"http://pt.wikipedia.org/wiki/Markdown\" target=\"_blank\">Markdown</a>."
" Voc&ecirc; tamb&eacute;m pode digitar f&oacute;rmulas"
" <a href=\"https://pt.wikipedia.org/wiki/LaTeX\" target=\"_blank\">LaTeX</a>"
" entre duas $ ou duas $$.";
#endif
const char *Txt_Role =
#if L==0
"Rol";
@ -38509,6 +38494,48 @@ const char *Txt_Test_result =
"Resultado do teste";
#endif
const char *Txt_Text =
#if L==0
"Text";
#elif L==1
"Text";
#elif L==2
"Text";
#elif L==3
"Texto";
#elif L==4
"Texte";
#elif L==5
"Texto"; // Okoteve traducción
#elif L==6
"Testo";
#elif L==7
"Tekst";
#elif L==8
"Texto";
#endif
const char *Txt_TEXT_plain =
#if L==0
"sense format";
#elif L==1
"Plain";
#elif L==2
"plain";
#elif L==3
"sin formato";
#elif L==4
"plain";
#elif L==5
"sin formato"; // Okoteve traducción
#elif L==6
"normale";
#elif L==7
"zwykly";
#elif L==8
"plano";
#endif
const char *Txt_Thanks_for_answering_the_survey =
#if L==0
"Gracias por responder la encuesta."; // Necessita traduccio