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

This commit is contained in:
Antonio Cañas Vargas 2015-02-04 20:03:23 +01:00
parent 1c7d925de5
commit 07c89b40b5
11 changed files with 106 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
swad_banner.c
View File

@ -793,8 +793,8 @@ static void Ban_PutFormToCreateBanner (void)
static void Ban_PutHeadBanners (void) static void Ban_PutHeadBanners (void)
{ {
extern const char *Txt_Code; extern const char *Txt_Code;
extern const char *Txt_Short_Name; extern const char *Txt_Short_name;
extern const char *Txt_Full_Name; extern const char *Txt_Full_name;
extern const char *Txt_Image; extern const char *Txt_Image;
extern const char *Txt_WWW; extern const char *Txt_WWW;
@ -808,8 +808,8 @@ static void Ban_PutHeadBanners (void)
"<td class=\"TIT_TBL\" style=\"text-align:left;\">%s</td>" "<td class=\"TIT_TBL\" style=\"text-align:left;\">%s</td>"
"</tr>", "</tr>",
Txt_Code, Txt_Code,
Txt_Short_Name, Txt_Short_name,
Txt_Full_Name, Txt_Full_name,
Txt_Image, Txt_Image,
Txt_WWW); Txt_WWW);
} }

58
swad_centre.c
View File

@ -239,7 +239,8 @@ static void Ctr_Configuration (bool PrintView)
extern const char *The_ClassFormul[The_NUM_THEMES]; extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Degrees; extern const char *Txt_Degrees;
extern const char *Txt_Centre; extern const char *Txt_Centre;
extern const char *Txt_Short_Name; extern const char *Txt_Short_name;
extern const char *Txt_Web;
extern const char *Txt_Shortcut_to_this_centre; extern const char *Txt_Shortcut_to_this_centre;
extern const char *Txt_QR_code; extern const char *Txt_QR_code;
extern const char *Txt_Courses; extern const char *Txt_Courses;
@ -261,17 +262,17 @@ static void Ctr_Configuration (bool PrintView)
/***** Links to show degrees, to print view /***** Links to show degrees, to print view
and to upload photo and logo *****/ and to upload photo and logo *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
/* Link to show degrees */
Act_FormStart (ActSeeDeg);
Act_LinkFormSubmit (Txt_Degrees,The_ClassFormul[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("deg",Txt_Degrees,Txt_Degrees);
fprintf (Gbl.F.Out,"</form>");
if (!PrintView) if (!PrintView)
{ {
/* Link to print view */ fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
/* Link to show degrees */
Act_FormStart (ActSeeDeg);
Act_LinkFormSubmit (Txt_Degrees,The_ClassFormul[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("deg",Txt_Degrees,Txt_Degrees);
fprintf (Gbl.F.Out,"</form>");
/* Link to print view */
Lay_PutLinkToPrintView1 (ActPrnCtrInf); Lay_PutLinkToPrintView1 (ActPrnCtrInf);
Lay_PutLinkToPrintView2 (); Lay_PutLinkToPrintView2 ();
@ -281,9 +282,10 @@ static void Ctr_Configuration (bool PrintView)
Log_PutFormToChangeLogo (Sco_SCOPE_CTR); Log_PutFormToChangeLogo (Sco_SCOPE_CTR);
Ctr_PutFormToChangeCtrPhoto (PhotoExists); Ctr_PutFormToChangeCtrPhoto (PhotoExists);
} }
fprintf (Gbl.F.Out,"</div>");
} }
fprintf (Gbl.F.Out,"</div>");
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL); Lay_StartRoundFrameTable10 (NULL,2,NULL);
@ -391,10 +393,32 @@ static void Ctr_Configuration (bool PrintView)
"</td>" "</td>"
"</tr>", "</tr>",
The_ClassFormul[Gbl.Prefs.Theme], The_ClassFormul[Gbl.Prefs.Theme],
Txt_Short_Name, Txt_Short_name,
Gbl.CurrentCtr.Ctr.ShortName); Gbl.CurrentCtr.Ctr.ShortName);
/***** Link to the centre *****/ /***** Centre WWW *****/
if (Gbl.CurrentCtr.Ctr.WWW[0])
{
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"%s:"
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">"
"<a href=\"%s\" target=\"_blank\" class=\"DAT\">",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Web,
Gbl.CurrentCtr.Ctr.WWW);
Str_LimitLengthHTMLStr (Gbl.CurrentCtr.Ctr.WWW,20);
fprintf (Gbl.F.Out,"%s"
"</a>"
"</td>"
"</tr>",
Gbl.CurrentCtr.Ctr.WWW);
}
/***** Shortcut to the centre *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\"" "<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">" " style=\"text-align:right; vertical-align:middle;\">"
@ -2141,8 +2165,8 @@ static void Ctr_PutHeadCentresForEdition (void)
extern const char *Txt_Code; extern const char *Txt_Code;
extern const char *Txt_Institution; extern const char *Txt_Institution;
extern const char *Txt_Place; extern const char *Txt_Place;
extern const char *Txt_Short_Name; extern const char *Txt_Short_name;
extern const char *Txt_Full_Name; extern const char *Txt_Full_name;
extern const char *Txt_WWW; extern const char *Txt_WWW;
extern const char *Txt_Teachers_ABBREVIATION; extern const char *Txt_Teachers_ABBREVIATION;
extern const char *Txt_Degrees_ABBREVIATION; extern const char *Txt_Degrees_ABBREVIATION;
@ -2186,8 +2210,8 @@ static void Ctr_PutHeadCentresForEdition (void)
Txt_Code, Txt_Code,
Txt_Institution, Txt_Institution,
Txt_Place, Txt_Place,
Txt_Short_Name, Txt_Short_name,
Txt_Full_Name, Txt_Full_name,
Txt_WWW, Txt_WWW,
Txt_Teachers_ABBREVIATION, Txt_Teachers_ABBREVIATION,
Txt_Degrees_ABBREVIATION, Txt_Degrees_ABBREVIATION,

3
swad_changelog.h
View File

@ -41,11 +41,12 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.73.1 (2015/02/04)" #define Log_PLATFORM_VERSION "SWAD 14.73.2 (2015/02/04)"
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h | tail -1
/* /*
Version 14.73.2: Feb 04, 2015 Changes in centre configuration. (177057 lines)
Version 14.73.1: Feb 04, 2015 Fixed bug in logo of centre. (177012 lines) Version 14.73.1: Feb 04, 2015 Fixed bug in logo of centre. (177012 lines)
Version 14.73: Feb 03, 2015 New options to remove institution, centre and degree icons. (177007 lines) Version 14.73: Feb 03, 2015 New options to remove institution, centre and degree icons. (177007 lines)
3 changes necessary in database: 3 changes necessary in database:

4
swad_config.h
View File

@ -28,9 +28,9 @@
/** Uncomment one of the following installations of SWAD or create your own **/ /** 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 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 //#define WWW_CEVUNA_UNA_PY // Comment this line if not applicable
/*****************************************************************************/ /*****************************************************************************/

12
swad_course.c
View File

@ -140,7 +140,7 @@ static void Crs_Configuration (bool PrintView)
extern const char *Txt_Show_more_details; extern const char *Txt_Show_more_details;
extern const char *Txt_NO; extern const char *Txt_NO;
extern const char *Txt_Course; extern const char *Txt_Course;
extern const char *Txt_Short_Name; extern const char *Txt_Short_name;
extern const char *Txt_Year_OF_A_DEGREE; extern const char *Txt_Year_OF_A_DEGREE;
extern const char *Txt_YEAR_OF_DEGREE[1+Deg_MAX_YEARS_PER_DEGREE]; extern const char *Txt_YEAR_OF_DEGREE[1+Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_Semester; extern const char *Txt_Semester;
@ -248,7 +248,7 @@ static void Crs_Configuration (bool PrintView)
"</td>" "</td>"
"</tr>", "</tr>",
The_ClassFormul[Gbl.Prefs.Theme], The_ClassFormul[Gbl.Prefs.Theme],
Txt_Short_Name, Txt_Short_name,
Gbl.CurrentCrs.Crs.ShortName); Gbl.CurrentCrs.Crs.ShortName);
/***** Course year *****/ /***** Course year *****/
@ -1841,8 +1841,8 @@ static void Crs_PutHeadCoursesForEdition (void)
extern const char *Txt_Degree; extern const char *Txt_Degree;
extern const char *Txt_Year_OF_A_DEGREE; extern const char *Txt_Year_OF_A_DEGREE;
extern const char *Txt_Semester_ABBREVIATION; extern const char *Txt_Semester_ABBREVIATION;
extern const char *Txt_Short_Name; extern const char *Txt_Short_name;
extern const char *Txt_Full_Name; extern const char *Txt_Full_name;
extern const char *Txt_Students_ABBREVIATION; extern const char *Txt_Students_ABBREVIATION;
extern const char *Txt_Teachers_ABBREVIATION; extern const char *Txt_Teachers_ABBREVIATION;
extern const char *Txt_Status; extern const char *Txt_Status;
@ -1889,8 +1889,8 @@ static void Crs_PutHeadCoursesForEdition (void)
Txt_Degree, Txt_Degree,
Txt_Year_OF_A_DEGREE, Txt_Year_OF_A_DEGREE,
Txt_Semester_ABBREVIATION, Txt_Semester_ABBREVIATION,
Txt_Short_Name, Txt_Short_name,
Txt_Full_Name, Txt_Full_name,
Txt_Students_ABBREVIATION, Txt_Students_ABBREVIATION,
Txt_Teachers_ABBREVIATION, Txt_Teachers_ABBREVIATION,
Txt_Status, Txt_Status,

4
swad_degree.c
View File

@ -290,7 +290,7 @@ static void Deg_Configuration (bool PrintView)
extern const char *The_ClassFormul[The_NUM_THEMES]; extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Courses; extern const char *Txt_Courses;
extern const char *Txt_Degree; extern const char *Txt_Degree;
extern const char *Txt_Short_Name; extern const char *Txt_Short_name;
extern const char *Txt_Shortcut_to_this_degree; extern const char *Txt_Shortcut_to_this_degree;
extern const char *Txt_QR_code; extern const char *Txt_QR_code;
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
@ -375,7 +375,7 @@ static void Deg_Configuration (bool PrintView)
"</td>" "</td>"
"</tr>", "</tr>",
The_ClassFormul[Gbl.Prefs.Theme], The_ClassFormul[Gbl.Prefs.Theme],
Txt_Short_Name, Txt_Short_name,
Gbl.CurrentDeg.Deg.ShortName); Gbl.CurrentDeg.Deg.ShortName);
/***** Link to the degree *****/ /***** Link to the degree *****/

16
swad_department.c
View File

@ -866,8 +866,8 @@ static void Dpt_PutFormToCreateDepartment (void)
{ {
extern const char *Txt_New_department; extern const char *Txt_New_department;
extern const char *Txt_Institution; extern const char *Txt_Institution;
extern const char *Txt_Short_Name; extern const char *Txt_Short_name;
extern const char *Txt_Full_Name; extern const char *Txt_Full_name;
extern const char *Txt_WWW; extern const char *Txt_WWW;
extern const char *Txt_Another_institution; extern const char *Txt_Another_institution;
extern const char *Txt_Create_department; extern const char *Txt_Create_department;
@ -898,8 +898,8 @@ static void Dpt_PutFormToCreateDepartment (void)
"</th>" "</th>"
"</tr>", "</tr>",
Txt_Institution, Txt_Institution,
Txt_Short_Name, Txt_Short_name,
Txt_Full_Name, Txt_Full_name,
Txt_WWW); Txt_WWW);
/***** Institution *****/ /***** Institution *****/
@ -963,8 +963,8 @@ static void Dpt_PutHeadDepartments (void)
{ {
extern const char *Txt_Code; extern const char *Txt_Code;
extern const char *Txt_Institution; extern const char *Txt_Institution;
extern const char *Txt_Short_Name; extern const char *Txt_Short_name;
extern const char *Txt_Full_Name; extern const char *Txt_Full_name;
extern const char *Txt_WWW; extern const char *Txt_WWW;
extern const char *Txt_Teachers_ABBREVIATION; extern const char *Txt_Teachers_ABBREVIATION;
@ -992,8 +992,8 @@ static void Dpt_PutHeadDepartments (void)
"</tr>", "</tr>",
Txt_Code, Txt_Code,
Txt_Institution, Txt_Institution,
Txt_Short_Name, Txt_Short_name,
Txt_Full_Name, Txt_Full_name,
Txt_WWW, Txt_WWW,
Txt_Teachers_ABBREVIATION); Txt_Teachers_ABBREVIATION);
} }

12
swad_institution.c
View File

@ -228,7 +228,7 @@ static void Ins_Configuration (bool PrintView)
extern const char *The_ClassFormul[The_NUM_THEMES]; extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Centres; extern const char *Txt_Centres;
extern const char *Txt_Institution; extern const char *Txt_Institution;
extern const char *Txt_Short_Name; extern const char *Txt_Short_name;
extern const char *Txt_Shortcut_to_this_institution; extern const char *Txt_Shortcut_to_this_institution;
extern const char *Txt_QR_code; extern const char *Txt_QR_code;
extern const char *Txt_Degrees; extern const char *Txt_Degrees;
@ -315,7 +315,7 @@ static void Ins_Configuration (bool PrintView)
"</td>" "</td>"
"</tr>", "</tr>",
The_ClassFormul[Gbl.Prefs.Theme], The_ClassFormul[Gbl.Prefs.Theme],
Txt_Short_Name, Txt_Short_name,
Gbl.CurrentIns.Ins.ShortName); Gbl.CurrentIns.Ins.ShortName);
/***** Link to the institution *****/ /***** Link to the institution *****/
@ -1848,8 +1848,8 @@ static void Ins_PutHeadInstitutionsForEdition (void)
{ {
extern const char *Txt_Code; extern const char *Txt_Code;
extern const char *Txt_Country; extern const char *Txt_Country;
extern const char *Txt_Short_Name; extern const char *Txt_Short_name;
extern const char *Txt_Full_Name; extern const char *Txt_Full_name;
extern const char *Txt_WWW; extern const char *Txt_WWW;
extern const char *Txt_Users; extern const char *Txt_Users;
extern const char *Txt_Centres_ABBREVIATION; extern const char *Txt_Centres_ABBREVIATION;
@ -1889,8 +1889,8 @@ static void Ins_PutHeadInstitutionsForEdition (void)
"</tr>", "</tr>",
Txt_Code, Txt_Code,
Txt_Country, Txt_Country,
Txt_Short_Name, Txt_Short_name,
Txt_Full_Name, Txt_Full_name,
Txt_WWW, Txt_WWW,
Txt_Users, Txt_Users,
Txt_Centres_ABBREVIATION, Txt_Centres_ABBREVIATION,

8
swad_link.c
View File

@ -641,8 +641,8 @@ static void Lnk_PutFormToCreateLink (void)
static void Lnk_PutHeadLinks (void) static void Lnk_PutHeadLinks (void)
{ {
extern const char *Txt_Code; extern const char *Txt_Code;
extern const char *Txt_Short_Name; extern const char *Txt_Short_name;
extern const char *Txt_Full_Name; extern const char *Txt_Full_name;
extern const char *Txt_WWW; extern const char *Txt_WWW;
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
@ -661,8 +661,8 @@ static void Lnk_PutHeadLinks (void)
"</td>" "</td>"
"</tr>", "</tr>",
Txt_Code, Txt_Code,
Txt_Short_Name, Txt_Short_name,
Txt_Full_Name, Txt_Full_name,
Txt_WWW); Txt_WWW);
} }

16
swad_place.c
View File

@ -675,8 +675,8 @@ static bool Plc_CheckIfPlaceNameExists (const char *FieldName,const char *Name,l
static void Plc_PutFormToCreatePlace (void) static void Plc_PutFormToCreatePlace (void)
{ {
extern const char *Txt_New_place; extern const char *Txt_New_place;
extern const char *Txt_Short_Name; extern const char *Txt_Short_name;
extern const char *Txt_Full_Name; extern const char *Txt_Full_name;
extern const char *Txt_Create_place; extern const char *Txt_Create_place;
struct Place *Plc; struct Place *Plc;
@ -697,8 +697,8 @@ static void Plc_PutFormToCreatePlace (void)
"%s" "%s"
"</td>" "</td>"
"</tr>", "</tr>",
Txt_Short_Name, Txt_Short_name,
Txt_Full_Name); Txt_Full_name);
/***** Place short name *****/ /***** Place short name *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
@ -737,8 +737,8 @@ static void Plc_PutFormToCreatePlace (void)
static void Plc_PutHeadPlaces (void) static void Plc_PutHeadPlaces (void)
{ {
extern const char *Txt_Code; extern const char *Txt_Code;
extern const char *Txt_Short_Name; extern const char *Txt_Short_name;
extern const char *Txt_Full_Name; extern const char *Txt_Full_name;
extern const char *Txt_Centres; extern const char *Txt_Centres;
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
@ -757,8 +757,8 @@ static void Plc_PutHeadPlaces (void)
"</td>" "</td>"
"</tr>", "</tr>",
Txt_Code, Txt_Code,
Txt_Short_Name, Txt_Short_name,
Txt_Full_Name, Txt_Full_name,
Txt_Centres); Txt_Centres);
} }

25
swad_text.c
View File

@ -12093,7 +12093,7 @@ const char *Txt_From_this_time_you_will_not_receive_messages_from_X = // Warning
"From this time, you will not receive messages from %s."; // Necessita de tradução "From this time, you will not receive messages from %s."; // Necessita de tradução
#endif #endif
const char *Txt_Full_Name = const char *Txt_Full_name =
#if L==0 #if L==0
"Nombre completo"; // Necessita traduccio "Nombre completo"; // Necessita traduccio
#elif L==1 #elif L==1
@ -33613,7 +33613,7 @@ const char *Txt_shared_files_area =
"zona de arquivos compartilhados"; "zona de arquivos compartilhados";
#endif #endif
const char *Txt_Short_Name = const char *Txt_Short_name =
#if L==0 #if L==0
"Nombre breve"; // Necessita traduccio "Nombre breve"; // Necessita traduccio
#elif L==1 #elif L==1
@ -46812,6 +46812,27 @@ const char *Txt_Visits_to_course =
"Visitas disciplina"; "Visitas disciplina";
#endif #endif
const char *Txt_Web =
#if L==0
"Web";
#elif L==1
"Web";
#elif L==2
"Web";
#elif L==3
"Web";
#elif L==4
"Web";
#elif L==5
"Web"; // Okoteve traducción
#elif L==6
"Web";
#elif L==7
"Web";
#elif L==8
"Web";
#endif
const char *Txt_Web_page = const char *Txt_Web_page =
#if L==0 #if L==0
"P&agrave;gina web"; "P&agrave;gina web";