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.74.9

This commit is contained in:
Antonio Cañas Vargas 2015-02-10 17:22:57 +01:00
parent 08037d7ef5
commit f45bd973c2
4 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -41,11 +41,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.74.8 (2015/02/10)"
#define Log_PLATFORM_VERSION "SWAD 14.74.9 (2015/02/10)"
// 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 | tail -1
/*
Version 14.74.9: Feb 10, 2015 Description/keywords meta tags and canonical URL added to head. (178060 lines)
Version 14.74.8: Feb 10, 2015 Fixed bug in degree logo. (178045 lines)
Version 14.74.7: Feb 08, 2015 Link to register/remove several users. (178029 lines)
Version 14.74.6: Feb 08, 2015 Changes in layout of form to register/remove one user. (178009 lines)

8
swad_config.h
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 WWW_CEVUNA_UNA_PY // Comment this line if not applicable
/*****************************************************************************/
@ -52,7 +52,6 @@
#define Cfg_PLATFORM_FULL_NAME "SWAD (Shared Workspace At a Distance)"
#define Cfg_PLATFORM_PAGE_TITLE "SWAD local" // This title will appear on browser top
#define Cfg_PLATFORM_SERVER "localhost" // Server name (main part of the URL)
#define Cfg_HTTP_SwAD_HOME_PAGE "http://localhost" // Without ending slash
#define Cfg_HTTPS_URL_SWAD_CGI "https://localhost/swad" // Without ending slash
#define Cfg_HTTPS_URL_SWAD_PUBLIC "https://localhost/swad" // Without ending slash
#define Cfg_HTTP_URL_SWAD_PUBLIC "http://localhost/swad" // Without ending slash
@ -99,7 +98,6 @@
#define Cfg_PLATFORM_FULL_NAME "SWAD (Shared Workspace At a Distance)"
#define Cfg_PLATFORM_PAGE_TITLE "OpenSWAD" // This title will appear on browser top
#define Cfg_PLATFORM_SERVER "openswad.org" // Server name (main part of the URL)
#define Cfg_HTTP_SwAD_HOME_PAGE "http://openswad.org/swad" // Without ending slash
#define Cfg_HTTPS_URL_SWAD_CGI "https://openswad.org" // Without ending slash
#define Cfg_HTTPS_URL_SWAD_PUBLIC "https://openswad.org/swad" // Without ending slash
#define Cfg_HTTP_URL_SWAD_PUBLIC "http://openswad.org/swad" // Without ending slash
@ -163,7 +161,6 @@
#define Cfg_PLATFORM_FULL_NAME "SWAD (Shared Workspace At a Distance)"
#define Cfg_PLATFORM_PAGE_TITLE "SWAD UGR" // This title will appear on browser top
#define Cfg_PLATFORM_SERVER "swad.ugr.es" // Server name (main part of the URL)
#define Cfg_HTTP_SwAD_HOME_PAGE "http://swad.ugr.es/swad" // Without ending slash
#define Cfg_HTTPS_URL_SWAD_CGI "https://swad.ugr.es" // Without ending slash
#define Cfg_HTTPS_URL_SWAD_PUBLIC "https://swad.ugr.es/swad" // Without ending slash
#define Cfg_HTTP_URL_SWAD_PUBLIC "http://swad.ugr.es/swad" // Without ending slash
@ -217,7 +214,6 @@
#define Cfg_PLATFORM_FULL_NAME "SWAD (Shared Workspace At a Distance)"
#define Cfg_PLATFORM_PAGE_TITLE "SWAD UNA" // This title will appear on browser top
#define Cfg_PLATFORM_SERVER "www.cevuna.una.py" // Server name (main part of the URL)
#define Cfg_HTTP_SwAD_HOME_PAGE "http://www.cevuna.una.py/swad" // Without ending slash
#define Cfg_HTTPS_URL_SWAD_CGI "https://www.cevuna.una.py/swad" // Without ending slash
#define Cfg_HTTPS_URL_SWAD_PUBLIC "https://www.cevuna.una.py/swad" // Without ending slash
#define Cfg_HTTP_URL_SWAD_PUBLIC "http://www.cevuna.una.py/swad" // Without ending slash

27
swad_layout.c
View File

@ -161,12 +161,31 @@ void Lay_WriteStartOfPage (void)
// WARNING: It is necessary to comment the line AddDefaultCharset UTF8 in httpd.conf to enable meta tag
fprintf (Gbl.F.Out,"<html lang=\"%s\">\n"
"<head>\n"
"<meta http-equiv=\"Content-Type\" content=\"text/html;charset=windows-1252\" />\n",
Txt_STR_LANG_ID[Gbl.Prefs.Language]);
"<meta http-equiv=\"Content-Type\" content=\"text/html;charset=windows-1252\" />\n"
"<meta http-equiv=\"Content-Style-Type\" content=\"text/css\" />\n"
"<meta name=\"description\" content=\"SWAD is a free-software platform for learning and educational management\" />\n"
"<meta name=\"keywords\" content=\""
"%s,"
"SWAD platform,shared workspace at a distance,sistema web de apoyo a la docencia,"
"LMS,Learning Management System,"
"VLE,Virtual Learning Environment,"
"e-learning,b-learning,m-learning,"
"platform,plataforma,"
"teaching,docencia,"
"learning,aprendizaje,"
"open source,free software,software libre,"
"virtual\" />\n",
Txt_STR_LANG_ID[Gbl.Prefs.Language],
Cfg_PLATFORM_SHORT_NAME);
/* Title */
Lay_WritePageTitle ();
/* Canonical URL */
fprintf (Gbl.F.Out,"<link rel=\"canonical\""
" href=\"%s\" />\n",
Cfg_HTTPS_URL_SWAD_CGI);
/* Favicon */
fprintf (Gbl.F.Out,"<link type=\"image/x-icon\" href=\"%s/favicon.ico\" rel=\"icon\" />\n"
"<link type=\"image/x-icon\" href=\"%s/favicon.ico\" rel=\"shortcut icon\" />\n",
@ -397,7 +416,7 @@ static void Lay_WritePageTitle (void)
fprintf (Gbl.F.Out,"%s",
Cfg_PLATFORM_PAGE_TITLE);
fprintf (Gbl.F.Out,"</title>");
fprintf (Gbl.F.Out,"</title>\n");
}
/*****************************************************************************/
@ -602,7 +621,7 @@ static void Lay_WritePageTopHeading (void)
" style=\"width:%upx; height:%upx;"
" margin:0 auto; vertical-align:middle;\" />"
"</a>",
Cfg_HTTP_SwAD_HOME_PAGE,Gbl.Prefs.PathTheme,
Cfg_HTTPS_URL_SWAD_CGI,Gbl.Prefs.PathTheme,
LogoLayout[Gbl.Prefs.Layout].Icon,
Cfg_PLATFORM_FULL_NAME,
LogoLayout[Gbl.Prefs.Layout].Width,

2
swad_mail.c
View File

@ -1519,5 +1519,5 @@ void Mai_WriteFootNoteEMail (Txt_Language_t Language)
"%s\n",
Txt_Please_do_not_reply_to_this_automatically_generated_email_NO_HTML[Language],
Cfg_PLATFORM_FULL_NAME,
Cfg_HTTP_SwAD_HOME_PAGE);
Cfg_HTTPS_URL_SWAD_CGI);
}