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

This commit is contained in:
Antonio Cañas Vargas 2015-04-02 13:38:05 +02:00
parent f280080ead
commit 522e5ff23f
47 changed files with 293 additions and 297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
swad_ID.c
View File

@ -360,7 +360,7 @@ void ID_WriteUsrIDs (struct UsrData *UsrDat,bool ICanSeeUsrID)
void ID_PutLinkToChangeUsrIDs (const struct UsrData *UsrDat)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Change_IDs;
extern const char *Txt_User_not_found_or_you_do_not_have_permission_;
@ -374,7 +374,7 @@ void ID_PutLinkToChangeUsrIDs (const struct UsrData *UsrDat)
Act_FormStart (ActFrmIDsOthUsr);
Usr_PutParamOtherUsrCodEncrypted (UsrDat->EncryptedUsrCod);
}
Act_LinkFormSubmit (Txt_Change_IDs,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Change_IDs,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("arroba",Txt_Change_IDs,Txt_Change_IDs);
Act_FormEnd ();
}
@ -388,7 +388,6 @@ void ID_PutLinkToChangeUsrIDs (const struct UsrData *UsrDat)
void ID_ShowFormOthIDs (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Changing_the_IDs_for_the_following_user;
extern const char *Txt_User_not_found_or_you_do_not_have_permission_;
@ -404,7 +403,7 @@ void ID_ShowFormOthIDs (void)
/* Show user's record */
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">"
"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">");
"<td colspan=\"3\" style=\"text-align:center;\">");
Rec_ShowSharedUsrRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat);
fprintf (Gbl.F.Out,"</td>"
"</tr>");

14
swad_QR.c
View File

@ -72,7 +72,7 @@ static void QR_ImageQRCode (const char *QRString);
void QR_PutLinkToPrintQRCode (QR_QRType_t QRType,struct UsrData *UsrDat,bool PrintText)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_QR_code;
char NicknameWithArroba[Nck_MAX_BYTES_NICKNAME_WITH_ARROBA+1];
@ -91,14 +91,10 @@ void QR_PutLinkToPrintQRCode (QR_QRType_t QRType,struct UsrData *UsrDat,bool Pri
Par_PutHiddenParamString ("QRString",UsrDat->Email);
break;
}
Act_LinkFormSubmit (Txt_QR_code,The_ClassFormul[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/qr16x16.gif\" alt=\"%s\""
" class=\"ICON16x16\" style=\"margin-left:10px;\" />",
Gbl.Prefs.IconsURL,
Txt_QR_code);
if (PrintText)
fprintf (Gbl.F.Out," %s",Txt_QR_code);
fprintf (Gbl.F.Out,"</a>");
Act_LinkFormSubmit (Txt_QR_code,PrintText ? The_ClassFormulB[Gbl.Prefs.Theme] :
NULL);
Lay_PutSendIcon ("qr",Txt_QR_code,PrintText ? Txt_QR_code :
NULL);
Act_FormEnd ();
}

11
swad_account.c
View File

@ -103,6 +103,7 @@ void Acc_ShowFormAccount (void)
static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWithoutArroba,
const char *NewEmail)
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Log_in;
extern const char *Txt_Nickname;
@ -114,9 +115,9 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
char NewNicknameWithArroba[Nck_MAX_BYTES_NICKNAME_WITH_ARROBA+1];
/***** Link to log in *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:20px;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart (ActFrmLogIn);
Act_LinkFormSubmit (Txt_Log_in,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Log_in,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("login",Txt_Log_in,Txt_Log_in);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
@ -207,7 +208,7 @@ void Acc_ShowFormChangeMyAccount (void)
Lay_ShowAlert (Lay_WARNING,Txt_Please_fill_in_your_ID);
/***** Put links to change my password and to remove my account*****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Pwd_PutLinkToChangeUsrPassword (&Gbl.Usrs.Me.UsrDat);
if (Acc_CheckIfICanEliminateAccount (true)) // ItsMe = true
Acc_PutLinkToRemoveMyAccount ();
@ -242,13 +243,13 @@ void Acc_ShowFormChangeMyAccount (void)
static void Acc_PutLinkToRemoveMyAccount (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Remove_account;
Act_FormStart (ActUpdOthUsrDat);
Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Me.UsrDat.EncryptedUsrCod);
Par_PutHiddenParamUnsigned ("RegRemAction",(unsigned) Enr_ELIMINATE_ONE_USR_FROM_PLATFORM);
Act_LinkFormSubmit (Txt_Remove_account,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Remove_account,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("delon",Txt_Remove_account,Txt_Remove_account);
Act_FormEnd ();
}

2
swad_action.c
View File

@ -2592,7 +2592,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActReqSndNewPwd */{ 665,-1,TabPrf,ActFrmLogIn ,0x000,0x001,0x001,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pwd_ShowFormSendNewPwd ,NULL},
/* ActSndNewPwd */{ 633,-1,TabPrf,ActFrmLogIn ,0x000,0x001,0x001,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pwd_ChkIdLoginAndSendNewPwd ,NULL},
/* ActChgMyRol */{ 589,-1,TabPrf,ActFrmLogIn ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,Rol_ChangeMyRole ,Usr_ShowFormsRoleAndLogout ,NULL},
/* ActChgMyRol */{ 589,-1,TabPrf,ActFrmLogIn ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,Rol_ChangeMyRole ,Usr_ShowFormsLogoutAndRole ,NULL},
/* ActCreUsrAcc */{1163,-1,TabPrf,ActFrmUsrAcc ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Acc_AfterCreationNewAccount ,NULL},

6
swad_announcement.c
View File

@ -71,16 +71,16 @@ static void Ann_CreateAnnouncement (unsigned Roles,const char *Subject,const cha
void Ann_ShowAllAnnouncements (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_New_announcement;
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
/***** Put link (form) to create a new announcement *****/
if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SYS_ADM)
{
Act_FormStart (ActWriAnn);
Act_LinkFormSubmit (Txt_New_announcement,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_New_announcement,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("new",Txt_New_announcement,Txt_New_announcement);
Act_FormEnd ();
}

7
swad_assignment.c
View File

@ -471,16 +471,16 @@ void Asg_PutHiddenParamAsgOrderType (void)
static void Asg_PutFormToCreateNewAsg (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_New_assignment;
/***** Put form to create a new assignment *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart (ActFrmNewAsg);
Asg_PutHiddenParamAsgOrderType ();
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
Act_LinkFormSubmit (Txt_New_assignment,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_New_assignment,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("new",Txt_New_assignment,Txt_New_assignment);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
@ -1070,7 +1070,6 @@ void Asg_RequestCreatOrEditAsg (void)
{
extern const char *Txt_New_assignment;
extern const char *Txt_Edit_assignment;
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Start_date;
extern const char *Txt_End_date;
extern const char *Txt_Title;

22
swad_attendance.c
View File

@ -117,7 +117,7 @@ void Att_SeeAttEvents (void)
Pag_GetParamPagNum (Pag_ATT_EVENTS);
/***** Put other options *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
/* Put link (form) to create a bew attendance event */
switch (Gbl.Usrs.Me.LoggedRole)
@ -443,7 +443,7 @@ void Att_PutHiddenParamAttOrderType (void)
static void Att_PutFormToListStds (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Attendance_list;
/***** Put form to create a new attendance event *****/
@ -451,7 +451,7 @@ static void Att_PutFormToListStds (void)
Att_PutHiddenParamAttOrderType ();
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
Act_LinkFormSubmit (Txt_Attendance_list,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Attendance_list,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("list",Txt_Attendance_list,Txt_Attendance_list);
Act_FormEnd ();
}
@ -462,7 +462,7 @@ static void Att_PutFormToListStds (void)
static void Att_PutFormToCreateNewAttEvent (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_New_event;
/***** Put form to create a new attendance event *****/
@ -470,7 +470,7 @@ static void Att_PutFormToCreateNewAttEvent (void)
Att_PutHiddenParamAttOrderType ();
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
Act_LinkFormSubmit (Txt_New_event,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_New_event,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("new",Txt_New_event,Txt_New_event);
Act_FormEnd ();
}
@ -1029,7 +1029,6 @@ static bool Att_CheckIfSimilarAttEventExists (const char *Field,const char *Valu
void Att_RequestCreatOrEditAttEvent (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_New_event;
extern const char *Txt_Edit_event;
extern const char *Txt_Teachers_comment;
@ -2687,7 +2686,6 @@ void Usr_ReqListAttendanceStdsCrs (void)
void Usr_ListAttendanceStdsCrs (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_You_must_select_one_ore_more_students;
unsigned NumStdsInList;
long *LstSelectedUsrCods;
@ -2914,11 +2912,11 @@ static void Att_GetListSelectedAttCods (char **StrAttCodsSelected)
static void Att_PutFormToPrintListStds (bool ShowDetails,char *StrAttCodsSelected)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Print;
/***** Link to print view *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart (ActPrnLstAttStd);
if (ShowDetails)
Par_PutHiddenParamChar ("ShowDetails",'Y');
@ -2926,7 +2924,7 @@ static void Att_PutFormToPrintListStds (bool ShowDetails,char *StrAttCodsSelecte
Usr_PutHiddenParUsrCodAll (ActPrnLstAttStd,Gbl.Usrs.Select.All);
if (StrAttCodsSelected[0])
Par_PutHiddenParamString ("AttCods",StrAttCodsSelected);
Act_LinkFormSubmit (Txt_Print,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Print,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("print",Txt_Print,Txt_Print);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
@ -2959,7 +2957,7 @@ static void Att_PutButtonToShowDetails (char *StrAttCodsSelected)
static void Att_ListEventsToSelect (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Events;
extern const char *Txt_Event;
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
@ -3048,7 +3046,7 @@ static void Att_ListEventsToSelect (void)
{
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"4\" style=\"text-align:center;\">");
Act_LinkFormSubmitAnimated (Txt_Update_attendance_according_to_selected_events,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmitAnimated (Txt_Update_attendance_according_to_selected_events,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutCalculateIcon (Txt_Update_attendance_according_to_selected_events,Txt_Update_attendance);
fprintf (Gbl.F.Out,"</td>"
"</tr>");

6
swad_banner.c
View File

@ -124,12 +124,12 @@ void Ban_SeeBanners (void)
static void Ban_PutFormToEditBanners (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart (ActEdiBan);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");

2
swad_calendar.c
View File

@ -125,7 +125,7 @@ void Cal_DrawCalendar (void)
if (!PrintView)
{
/* Link to print view */
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Lay_PutLinkToPrintView1 (ActPrnCal);
Lay_PutLinkToPrintView2 ();
fprintf (Gbl.F.Out,"</div>");

9
swad_centre.c
View File

@ -236,6 +236,7 @@ void Ctr_PrintConfiguration (void)
static void Ctr_Configuration (bool PrintView)
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Degrees;
extern const char *Txt_Centre;
@ -265,11 +266,11 @@ static void Ctr_Configuration (bool PrintView)
and to upload photo and logo *****/
if (!PrintView)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
/* Link to show degrees */
Act_FormStart (ActSeeDeg);
Act_LinkFormSubmit (Txt_Degrees,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Degrees,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("deg",Txt_Degrees,Txt_Degrees);
Act_FormEnd ();
@ -1827,7 +1828,7 @@ void Ctr_RemoveLogo (void)
static void Ctr_PutFormToChangeCtrPhoto (bool PhotoExists)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Change_photo;
extern const char *Txt_Upload_photo;
const char *Msg;
@ -1836,7 +1837,7 @@ static void Ctr_PutFormToChangeCtrPhoto (bool PhotoExists)
Act_FormStart (ActReqCtrPho);
Msg = PhotoExists ? Txt_Change_photo :
Txt_Upload_photo;
Act_LinkFormSubmit (Msg,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Msg,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("photo",Msg,Msg);
Act_FormEnd ();
}

3
swad_changelog.h
View File

@ -103,11 +103,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.105.3 (2015/04/01)"
#define Log_PLATFORM_VERSION "SWAD 14.106 (2015/04/02)"
// 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.106: Apr 02, 2015 Lot of changes in layout of icon with links. (183909 lines)
Version 14.105.3: Apr 01, 2015 Changes in layout of course configuration and exam announcements. (183912 lines)
Version 14.105.2: Mar 30, 2015 Some messages translated. (183941 lines)
Version 14.105.1: Mar 30, 2015 Shared record card is shown after updating course record card. (183937 lines)

3
swad_connected.c
View File

@ -71,6 +71,7 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R
void Con_ShowConnectedUsrs (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Update_connected_users;
extern const char *Txt_Scope;
extern const char *Txt_MONTHS_SMALL_SHORT[12];
@ -103,7 +104,7 @@ void Con_ShowConnectedUsrs (void)
Sco_PutSelectorScope (false);
fprintf (Gbl.F.Out,"</div>");
}
Act_LinkFormSubmitAnimated (Txt_Update_connected_users,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmitAnimated (Txt_Update_connected_users,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutCalculateIcon (Txt_Update_connected_users,Txt_Update_connected_users);
Act_FormEnd ();

5
swad_country.c
View File

@ -216,6 +216,7 @@ void Cty_PrintConfiguration (void)
static void Cty_Configuration (bool PrintView)
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Institutions;
extern const char *Txt_Country;
@ -232,11 +233,11 @@ static void Cty_Configuration (bool PrintView)
if (Gbl.CurrentCty.Cty.CtyCod > 0)
{
/***** Links to show institutions and to print view *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
/* Link to show institutions */
Act_FormStart (ActSeeIns);
Act_LinkFormSubmit (Txt_Institutions,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Institutions,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("ins",Txt_Institutions,Txt_Institutions);
Act_FormEnd ();

12
swad_course.c
View File

@ -183,7 +183,7 @@ static void Crs_Configuration (bool PrintView)
}
/***** Links to print view and request enrollment *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
/* Link to print view */
Lay_PutLinkToPrintView1 (ActPrnCrsInf);
@ -2976,7 +2976,7 @@ void Crs_ReqSelectOneOfMyCourses (void)
extern const char *Txt_If_you_can_not_find_your_institution_your_centre_your_degree_or_your_courses_you_can_create_them;
/***** Search / select more courses *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Crs_PutLinkToSearchCourses ();
fprintf (Gbl.F.Out,"</div>");
@ -3002,7 +3002,7 @@ void Crs_ReqSelectOneOfMyCourses (void)
static void Crs_PutLinkToSearchCourses (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Search_courses;
/***** Put form to search / select courses *****/
@ -3014,7 +3014,7 @@ static void Crs_PutLinkToSearchCourses (void)
ActSysReqSch)))));
Sco_PutParamScope (Sco_SCOPE_SYS);
Par_PutHiddenParamUnsigned ("WhatToSearch",(unsigned) Sch_SEARCH_COURSES);
Act_LinkFormSubmit (Txt_Search_courses,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Search_courses,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("search",Txt_Search_courses,Txt_Search_courses);
Act_FormEnd ();
}
@ -3025,12 +3025,12 @@ static void Crs_PutLinkToSearchCourses (void)
void Crs_PutFormToSelectMyCourses (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_My_courses;
/***** Put form to search / select courses *****/
Act_FormStart (ActMyCrs);
Act_LinkFormSubmit (Txt_My_courses,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_My_courses,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("hierarchy",Txt_My_courses,Txt_My_courses);
Act_FormEnd ();
}

5
swad_degree.c
View File

@ -287,6 +287,7 @@ void Deg_PrintConfiguration (void)
static void Deg_Configuration (bool PrintView)
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Courses;
extern const char *Txt_Degree;
@ -303,11 +304,11 @@ static void Deg_Configuration (bool PrintView)
/***** Links to show courses, to print view and to upload logo *****/
if (!PrintView)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
/* Link to show courses */
Act_FormStart (ActSeeCrs);
Act_LinkFormSubmit (Txt_Courses,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Courses,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("crs",Txt_Courses,Txt_Courses);
Act_FormEnd ();

6
swad_department.c
View File

@ -211,12 +211,12 @@ static void Dpt_GetParamDptOrderType (void)
static void Dpt_PutFormToEditDpts (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart (ActEdiDpt);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");

41
swad_enrollment.c
View File

@ -130,12 +130,12 @@ static void Enr_EffectivelyRemAdm (struct UsrData *UsrDat,Sco_Scope_t Scope,
void Enr_PutLinkToRequestSignUp (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Sign_up;
/***** Show the form *****/
Act_FormStart (ActReqSignUp);
Act_LinkFormSubmit (Txt_Sign_up,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Sign_up,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("signup",Txt_Sign_up,Txt_Sign_up);
Act_FormEnd ();
}
@ -278,7 +278,7 @@ void Enr_WriteFormToReqAnotherUsrID (Act_Action_t NextAction)
void Enr_ReqAcceptRegisterInCrs (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_A_teacher_or_administrator_has_enrolled_you_into_the_course_;
extern const char *Txt_Confirm_my_enrollment;
extern const char *Txt_Remove_me_from_this_course;
@ -289,15 +289,15 @@ void Enr_ReqAcceptRegisterInCrs (void)
Lay_ShowAlert (Lay_INFO,Gbl.Message);
/***** Send button to accept register in the current course *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart (ActAccEnrCrs);
Act_LinkFormSubmit (Txt_Confirm_my_enrollment,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Confirm_my_enrollment,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("ok_green",Txt_Confirm_my_enrollment,Txt_Confirm_my_enrollment);
Act_FormEnd ();
/***** Send button to refuse register in the current course *****/
Act_FormStart (ActRemMeCrs);
Act_LinkFormSubmit (Txt_Remove_me_from_this_course,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Remove_me_from_this_course,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("delon",Txt_Remove_me_from_this_course,Txt_Remove_me_from_this_course);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
@ -517,7 +517,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (void)
bool ExternalUsrsServiceAvailable = (Cfg_EXTERNAL_LOGIN_CLIENT_COMMAND[0] != '\0');
/***** Put contextual links *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
/* Put link to go to admin one user */
Enr_PutLinkToAdminOneUsr ();
@ -530,7 +530,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (void)
if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SYS_ADM)
Enr_PutLinkToRemOldUsrs ();
fprintf (Gbl.F.Out,"<div>");
fprintf (Gbl.F.Out,"</div>");
/***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_Admin_several_users);
@ -632,12 +632,12 @@ static void Enr_ShowFormRegRemSeveralUsrs (void)
static void Enr_PutLinkToRemOldUsrs (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Remove_old_users;
/***** Put form to remove old users *****/
Act_FormStart (ActReqRemOldUsr);
Act_LinkFormSubmit (Txt_Remove_old_users,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Remove_old_users,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("delon",Txt_Remove_old_users,Txt_Remove_old_users);
Act_FormEnd ();
}
@ -1716,12 +1716,12 @@ static void Enr_MarkOfficialStdsAsRemovable (long ImpGrpCod,bool RemoveSpecified
static void Enr_PutLinkToRemAllStdsThisCrs (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Remove_all_students;
/***** Put form to remove all the students in the current course *****/
Act_FormStart (ActReqRemAllStdCrs);
Act_LinkFormSubmit (Txt_Remove_all_students,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Remove_all_students,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("delon",Txt_Remove_all_students,Txt_Remove_all_students);
Act_FormEnd ();
}
@ -2099,6 +2099,7 @@ void Enr_RejectSignUp (void)
void Enr_ShowEnrollmentRequests (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Scope;
extern const char *Txt_Users;
extern const char *Txt_Update;
@ -2184,8 +2185,8 @@ void Enr_ShowEnrollmentRequests (void)
"</table>");
/* Send button */
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
Act_LinkFormSubmitAnimated (Txt_Update,The_ClassFormul[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_LinkFormSubmitAnimated (Txt_Update,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutCalculateIcon (Txt_Update,Txt_Update);
fprintf (Gbl.F.Out,"</div>");
@ -2586,11 +2587,11 @@ static void Enr_RemoveEnrollmentRequest (long CrsCod,long UsrCod)
static void Enr_PutLinkToAdminOneUsr (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Admin_one_user;
Act_FormStart (ActReqMdfOneUsr);
Act_LinkFormSubmit (Txt_Admin_one_user,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Admin_one_user,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("configtest",Txt_Admin_one_user,Txt_Admin_one_user);
Act_FormEnd ();
}
@ -2601,11 +2602,11 @@ static void Enr_PutLinkToAdminOneUsr (void)
static void Enr_PutLinkToAdminSeveralUsrs (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Admin_several_users;
Act_FormStart (ActReqMdfSevUsr);
Act_LinkFormSubmit (Txt_Admin_several_users,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Admin_several_users,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("configtest",Txt_Admin_several_users,Txt_Admin_several_users);
Act_FormEnd ();
}
@ -2670,7 +2671,7 @@ static void Enr_ReqAnotherUsrIDToRegisterRemove (void)
if (Gbl.CurrentCrs.Crs.CrsCod > 0 ||
Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SYS_ADM)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
if (Gbl.CurrentCrs.Crs.CrsCod > 0)
/* Put link to go to admin several users */
@ -2851,7 +2852,7 @@ static void Enr_AskIfRegRemUsr (struct ListUsrCods *ListUsrCods)
static void Enr_ShowFormToEditOtherUsr (void)
{
/***** Buttons for edition *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
if (Pwd_CheckIfICanChangeOtherUsrPassword (Gbl.Usrs.Other.UsrDat.UsrCod))
{
ID_PutLinkToChangeUsrIDs (&Gbl.Usrs.Other.UsrDat); // Put link (form) to change user's IDs

32
swad_exam.c
View File

@ -415,9 +415,9 @@ static void Exa_ListExamAnnouncementsEdit (void)
static void Exa_ListExamAnnouncements (Exa_tTypeViewExamAnnouncement_t TypeViewExamAnnouncement)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_No_announcements_of_exams_of_X;
extern const char *Txt_New_announcement_of_exam;
extern const char *Txt_New_announcement_OF_EXAM;
char Query[512];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
@ -442,12 +442,11 @@ static void Exa_ListExamAnnouncements (Exa_tTypeViewExamAnnouncement_t TypeViewE
switch (Gbl.Usrs.Me.LoggedRole)
{
case Rol_ROLE_TEACHER:
case Rol_ROLE_DEG_ADM:
case Rol_ROLE_SYS_ADM:
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart (ActEdiExaAnn);
Act_LinkFormSubmit (Txt_New_announcement_of_exam,The_ClassFormul[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("new",Txt_New_announcement_of_exam,Txt_New_announcement_of_exam);
Act_LinkFormSubmit (Txt_New_announcement_OF_EXAM,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("new",Txt_New_announcement_OF_EXAM,Txt_New_announcement_OF_EXAM);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
break;
@ -779,32 +778,23 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Link to remove this exam announcement *****/
Act_FormStart (ActRemExaAnn);
Par_PutHiddenParamLong ("ExaCod",ExaCod);
Act_LinkFormSubmit (Txt_Remove,The_ClassFormul[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/delon16x16.gif\" alt=\"%s\""
" class=\"ICON16x16\" style=\"margin-left:10px;\" />"
"</a>",
Gbl.Prefs.IconsURL,Txt_Remove);
Act_LinkFormSubmit (Txt_Remove,NULL);
Lay_PutSendIcon ("delon",Txt_Remove,NULL);
Act_FormEnd ();
/***** Link to edit this exam announcement *****/
Act_FormStart (ActEdiExaAnn);
Par_PutHiddenParamLong ("ExaCod",ExaCod);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormul[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/edit16x16.gif\" alt=\"%s\""
" class=\"ICON16x16\" style=\"margin-left:10px;\" />"
"</a>",
Gbl.Prefs.IconsURL,Txt_Edit);
Act_LinkFormSubmit (Txt_Edit,NULL);
Lay_PutSendIcon ("edit",Txt_Edit,NULL);
Act_FormEnd ();
}
/***** Link to print view *****/
Act_FormStart (ActPrnExaAnn);
Par_PutHiddenParamLong ("ExaCod",ExaCod);
Act_LinkFormSubmit (Txt_Print,The_ClassFormul[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/print16x16.gif\" alt=\"%s\""
" class=\"ICON16x16\" style=\"margin-left:10px;\" />"
"</a>",
Gbl.Prefs.IconsURL,Txt_Print);
Act_LinkFormSubmit (Txt_Print,NULL);
Lay_PutSendIcon ("print",Txt_Print,NULL);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"

14
swad_file_browser.c
View File

@ -4269,7 +4269,7 @@ void Brw_RemoveUsrFilesFromDB (long UsrCod)
static void Brw_PutFormToShowOrAdmin (Brw_ShowOrAdmin_t ShowOrAdmin,
Act_Action_t Action)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_View;
extern const char *Txt_Edit;
@ -4282,16 +4282,12 @@ static void Brw_PutFormToShowOrAdmin (Brw_ShowOrAdmin_t ShowOrAdmin,
switch (ShowOrAdmin)
{
case Brw_SHOW:
Act_LinkFormSubmit (Txt_View,The_ClassFormul[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("visible_on",
Txt_View,
Txt_View);
Act_LinkFormSubmit (Txt_View,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("visible_on",Txt_View,Txt_View);
break;
case Brw_ADMIN:
Act_LinkFormSubmit (Txt_Edit,The_ClassFormul[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("edit",
Txt_Edit,
Txt_Edit);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit);
break;
}
Act_FormEnd ();

5
swad_group.c
View File

@ -227,6 +227,7 @@ static void Grp_EditGroups (void)
static void Grp_ShowFormSeveralGrps (Act_Action_t NextAction)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_All_groups;
extern const char *Txt_Update_students;
extern const char *Txt_Update_students_according_to_selected_groups;
@ -278,7 +279,7 @@ static void Grp_ShowFormSeveralGrps (Act_Action_t NextAction)
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"7\" style=\"padding-top:10px;"
" text-align:center;\">");
Act_LinkFormSubmitAnimated (Txt_Update_students_according_to_selected_groups,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmitAnimated (Txt_Update_students_according_to_selected_groups,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutCalculateIcon (Txt_Update_students_according_to_selected_groups,Txt_Update_students);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -2044,7 +2045,6 @@ static void Grp_WriteRowGrp (struct Group *Grp,bool Highlight)
static void Grp_PutFormToCreateGroupType (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_New_type_of_group;
extern const char *Txt_It_is_optional_to_choose_a_group;
extern const char *Txt_It_is_mandatory_to_choose_a_group;
@ -2162,7 +2162,6 @@ static void Grp_PutFormToCreateGroupType (void)
static void Grp_PutFormToCreateGroup (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_New_group;
extern const char *Txt_Create_group;
unsigned NumGrpTyp;

6
swad_holiday.c
View File

@ -195,12 +195,12 @@ static void Hld_GetParamHldOrderType (void)
static void Hld_PutFormToEditHlds (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart (ActEdiHld);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");

3
swad_indicator.c
View File

@ -75,6 +75,7 @@ static unsigned long Ind_GetNumFilesOfCrsFileZoneFromDB (Brw_FileBrowser_t FileB
void Ind_ReqIndicatorsCourses (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Scope;
extern const char *Txt_Types_of_degree;
extern const char *Txt_only_if_the_scope_is_X;
@ -175,7 +176,7 @@ void Ind_ReqIndicatorsCourses (void)
/* Send button */
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">");
Act_LinkFormSubmitAnimated (Txt_Update_indicators,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmitAnimated (Txt_Update_indicators,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutCalculateIcon (Txt_Update_indicators,Txt_Update_indicators);
fprintf (Gbl.F.Out,"</td>"
"</tr>"

10
swad_info.c
View File

@ -409,12 +409,12 @@ void Inf_ShowInfo (void)
static void Inf_PutFormToEditInfo (Inf_InfoType_t InfoType)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart (Inf_ActionsEditInfo[InfoType]);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
@ -870,7 +870,7 @@ void Inf_WriteURLIntoTxtBuffer (Inf_InfoType_t InfoType,char TxtBuffer[Cns_MAX_B
static void Inf_ShowPage (Inf_InfoType_t InfoType,const char *URL)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_View_in_a_new_window;
extern const char *Txt_INFO_TITLE[Inf_NUM_INFO_TYPES];
@ -881,7 +881,7 @@ static void Inf_ShowPage (Inf_InfoType_t InfoType,const char *URL)
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">"
"<a href=\"%s\" target=\"_blank\" class=\"%s\">",
URL,The_ClassFormul[Gbl.Prefs.Theme]);
URL,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("fullscreen",
Txt_View_in_a_new_window,
Txt_View_in_a_new_window);

5
swad_institution.c
View File

@ -225,6 +225,7 @@ void Ins_PrintConfiguration (void)
static void Ins_Configuration (bool PrintView)
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Centres;
extern const char *Txt_Institution;
@ -244,11 +245,11 @@ static void Ins_Configuration (bool PrintView)
/***** Links to show centres, to print view and to upload logo *****/
if (!PrintView)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
/* Link to show centres */
Act_FormStart (ActSeeCtr);
Act_LinkFormSubmit (Txt_Centres,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Centres,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("ctr",Txt_Centres,Txt_Centres);
Act_FormEnd ();

37
swad_layout.c
View File

@ -938,12 +938,12 @@ static void Lay_ShowRightColumn (void)
void Lay_PutFormToView (Act_Action_t Action)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_View;
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart (Action);
Act_LinkFormSubmit (Txt_View,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_View,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("visible_on",Txt_View,Txt_View);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
@ -955,12 +955,12 @@ void Lay_PutFormToView (Act_Action_t Action)
void Lay_PutFormToEdit (Act_Action_t Action)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart (Action);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
@ -972,11 +972,18 @@ void Lay_PutFormToEdit (Act_Action_t Action)
void Lay_PutSendIcon (const char *Icon,const char *Alt,const char *Text)
{
// margin-left is used because this form link may be placed after another one
fprintf (Gbl.F.Out,"<img src=\"%s/%s16x16.gif\" alt=\"%s\""
" class=\"ICON16x16\" style=\"margin-left:10px;\" />"
"&nbsp;%s</a>",
Gbl.Prefs.IconsURL,Icon,Alt,Text);
// margin is used because this form link may be placed after another one
fprintf (Gbl.F.Out,"<div class=\"ICON_HIGHLIGHT\""
" style=\"margin:0 5px; display:inline;\">"
"<img src=\"%s/%s16x16.gif\" alt=\"%s\""
" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL,Icon,Alt);
if (Text)
if (Text[0])
fprintf (Gbl.F.Out,"&nbsp;%s",
Text);
fprintf (Gbl.F.Out,"</div>"
"</a>");
}
/*****************************************************************************/
@ -986,11 +993,15 @@ void Lay_PutSendIcon (const char *Icon,const char *Alt,const char *Text)
void Lay_PutCalculateIcon (const char *Alt,const char *Text)
{
fprintf (Gbl.F.Out,"<img id=\"update_%d\" src=\"%s/recycle16x16.gif\" alt=\"%s\""
fprintf (Gbl.F.Out,"<div class=\"ICON_HIGHLIGHT\""
" style=\"margin:0 5px; display:inline;\">"
"<img id=\"update_%d\" src=\"%s/recycle16x16.gif\" alt=\"%s\""
" class=\"ICON16x16\" />"
"<img id=\"updating_%d\" src=\"%s/working16x16.gif\" alt=\"%s\""
" class=\"ICON16x16\" style=\"display:none;\" />" // Animated icon hidden
"&nbsp;%s</a>",
"&nbsp;%s"
"</div>"
"</a>",
Gbl.NumForm,Gbl.Prefs.IconsURL,Alt,
Gbl.NumForm,Gbl.Prefs.IconsURL,Alt,
Text);
@ -1533,10 +1544,10 @@ void Lay_PutLinkToPrintView1 (Act_Action_t NextAction)
void Lay_PutLinkToPrintView2 (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Print;
Act_LinkFormSubmit (Txt_Print,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Print,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("print",Txt_Print,Txt_Print);
Act_FormEnd ();
}

6
swad_link.c
View File

@ -118,12 +118,12 @@ void Lnk_SeeLinks (void)
static void Lnk_PutFormToEditLinks (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart (ActEdiLnk);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");

8
swad_logo.c
View File

@ -173,7 +173,7 @@ void Log_DrawLogo (Sco_Scope_t Scope,long Cod,const char *AltText,
void Log_PutFormToChangeLogo (Sco_Scope_t Scope)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Change_logo;
extern const char *Txt_Upload_logo;
Act_Action_t Action;
@ -221,7 +221,7 @@ void Log_PutFormToChangeLogo (Sco_Scope_t Scope)
Act_FormStart (Action);
Msg = LogoExists ? Txt_Change_logo :
Txt_Upload_logo;
Act_LinkFormSubmit (Msg,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Msg,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon (Icon,Msg,Msg);
Act_FormEnd ();
}
@ -315,12 +315,12 @@ void Log_RequestLogo (Sco_Scope_t Scope)
static void Log_PutLinkToRemoveLogo (Act_Action_t Action)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Remove_logo;
/***** Link for removing the photo *****/
Act_FormStart (Action);
Act_LinkFormSubmit (Txt_Remove_logo,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Remove_logo,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("delon",Txt_Remove_logo,Txt_Remove_logo);
Act_FormEnd ();
}

6
swad_mail.c
View File

@ -174,12 +174,12 @@ static void Mai_GetParamMaiOrderType (void)
static void Mai_PutFormToEditMailDomains (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart (ActEdiMai);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");

29
swad_message.c
View File

@ -124,7 +124,7 @@ static bool Msg_CheckIfUsrIsBanned (long FromUsrCod,long ToUsrCod);
void Msg_ListEMails (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Students_who_have_accepted_and_who_have_e_mail;
extern const char *Txt_X_students_who_have_e_mail;
extern const char *Txt_X_students_who_have_accepted_and_who_have_e_mail;
@ -217,12 +217,12 @@ void Msg_ListEMails (void)
Lay_EndRoundFrameTable10 ();
/***** Icon to open the client e-mail program *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">"
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">"
"<a href=\"mailto:%s?subject=%s&cc=%s&bcc=%s\" title=\"%s\" class=\"%s\">",
Gbl.Usrs.Me.UsrDat.Email,
Gbl.CurrentCrs.Crs.FullName,Gbl.Usrs.Me.UsrDat.Email,StrAddresses,
Txt_Create_e_mail_message,
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("editnewmsg",Txt_Create_e_mail_message,Txt_Create_e_mail_message);
fprintf (Gbl.F.Out,"</div>");
}
@ -1498,8 +1498,7 @@ void Msg_ShowRecMsgs (void)
/***** Link to view banned users *****/
if (Msg_GetNumUsrsBannedByMe ())
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;"
" margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Msg_PutLinkToViewBannedUsers ();
fprintf (Gbl.F.Out,"</div>");
}
@ -1666,11 +1665,11 @@ static unsigned long Msg_GetNumUsrsBannedByMe (void)
static void Msg_PutLinkToViewBannedUsers(void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Banned_users;
Act_FormStart (ActLstBanUsr);
Act_LinkFormSubmit (Txt_Banned_users,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Banned_users,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("stop",Txt_Banned_users,Txt_Banned_users);
Act_FormEnd ();
}
@ -2140,7 +2139,7 @@ void Msg_WriteNumMsgs (unsigned NumMsgs,unsigned NumUnreadMsgs)
void Msg_ShowFormDelSentOrRecMsgs (Msg_TypeOfMessages_t TypeOfMessages,unsigned NumMsgs)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_MSG_containing_the_text;
extern const char *Txt_MSGS_containing_the_text;
extern const char *Txt_Remove_the_MESSAGE;
@ -2152,10 +2151,11 @@ void Msg_ShowFormDelSentOrRecMsgs (Msg_TypeOfMessages_t TypeOfMessages,unsigned
extern const char *Txt_messages_received_from_A_USER;
extern const char *Txt_messages_sent_to_A_USER;
extern const char *Txt_from_A_COURSE;
extern const char *Txt_Remove;
char StrFilterContent[256+Msg_MAX_LENGTH_FILTER_CONTENT+1];
/***** Put link to request deletion of all sent or received messages *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart ((TypeOfMessages == Msg_MESSAGES_RECEIVED) ? ActReqDelAllRcvMsg : ActReqDelAllSntMsg);
Msg_PutHiddenParamsMsgsFilters ();
@ -2189,11 +2189,8 @@ void Msg_ShowFormDelSentOrRecMsgs (Msg_TypeOfMessages_t TypeOfMessages,unsigned
Txt_from_A_COURSE,
Gbl.Msg.FilterCrsShortName,
StrFilterContent);
Act_LinkFormSubmit (Gbl.Title,The_ClassFormul[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/delon16x16.gif\" alt=\"%s\""
" class=\"ICON16x16\" style=\"vertical-align:middle;\" />"
" %s</a>",
Gbl.Prefs.IconsURL,Gbl.Title,Gbl.Title);
Act_LinkFormSubmit (Gbl.Title,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("delon",Txt_Remove,Gbl.Title);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
}
@ -2948,7 +2945,7 @@ static void Msg_WriteFormToReply (long MsgCod,long CrsCod,const char *Subject,
bool FromThisCrs,bool Replied,
const char EncryptedUsrCod[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64+1])
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Reply;
extern const char *Txt_Reply_again;
extern const char *Txt_Go_to_course_and_reply;
@ -2976,7 +2973,7 @@ static void Msg_WriteFormToReply (long MsgCod,long CrsCod,const char *Subject,
Txt_Reply) :
(Replied ? Txt_Go_to_course_and_reply_again :
Txt_Go_to_course_and_reply),
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("reply",Replied ? Txt_Reply_again :
Txt_Reply,
Replied ? Txt_Reply_again :

9
swad_notice.c
View File

@ -291,7 +291,7 @@ void Not_ShowANotice (void)
void Not_ShowNotices (Not_Listing_t TypeNoticesListing)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_No_notices;
extern const char *Txt_New_notice;
extern const char *Txt_All_notices;
@ -317,14 +317,15 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing)
Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SYS_ADM)
);
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
if (ICanEditNotices)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart (ActWriNot);
Act_LinkFormSubmit (Txt_New_notice,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_New_notice,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("new",Txt_New_notice,Txt_New_notice);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
}
/***** Show highlighted notice *****/
@ -458,8 +459,6 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing)
Lay_EndRoundFrameTable10 ();
}
fprintf (Gbl.F.Out,"</div>");
/***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res);

8
swad_notification.c
View File

@ -1634,11 +1634,11 @@ static void Ntf_UpdateNumNotifSent (long DegCod,long CrsCod,
static void Ntf_PutLinkToChangePrefs (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Change_preferences;
Act_FormStart (ActEdiPrf);
Act_LinkFormSubmit (Txt_Change_preferences,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Change_preferences,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("heart",Txt_Change_preferences,Txt_Change_preferences);
Act_FormEnd ();
}
@ -1649,11 +1649,11 @@ static void Ntf_PutLinkToChangePrefs (void)
static void Ntf_PutLinkToMarkAllNotifAsSeen (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Mark_all_notifications_as_read;
Act_FormStart (ActMrkNtfSee);
Act_LinkFormSubmit (Txt_Mark_all_notifications_as_read,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Mark_all_notifications_as_read,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("visible_on",Txt_Mark_all_notifications_as_read,Txt_Mark_all_notifications_as_read);
Act_FormEnd ();
}

4
swad_password.c
View File

@ -782,7 +782,7 @@ void Pwd_ShowFormOthPwd (void)
void Pwd_PutLinkToChangeUsrPassword (const struct UsrData *UsrDat)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Change_password;
extern const char *Txt_User_not_found_or_you_do_not_have_permission_;
@ -796,7 +796,7 @@ void Pwd_PutLinkToChangeUsrPassword (const struct UsrData *UsrDat)
Act_FormStart (ActFrmPwdOthUsr);
Usr_PutParamOtherUsrCodEncrypted (UsrDat->EncryptedUsrCod);
}
Act_LinkFormSubmit (Txt_Change_password,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Change_password,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("key",Txt_Change_password,Txt_Change_password);
Act_FormEnd ();
}

22
swad_photo.c
View File

@ -145,7 +145,7 @@ bool Pho_CheckIfICanChangeOtherUsrPhoto (long UsrCod)
void Pho_PutLinkToChangeUsrPhoto (const struct UsrData *UsrDat)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Change_photo;
extern const char *Txt_Upload_photo;
bool PhotoExists;
@ -166,7 +166,7 @@ void Pho_PutLinkToChangeUsrPhoto (const struct UsrData *UsrDat)
}
Msg = PhotoExists ? Txt_Change_photo :
Txt_Upload_photo;
Act_LinkFormSubmit (Msg,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Msg,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("photo",Msg,Msg);
Act_FormEnd ();
}
@ -177,7 +177,7 @@ void Pho_PutLinkToChangeUsrPhoto (const struct UsrData *UsrDat)
static void Pho_PutLinkToRemoveUsrPhoto (const struct UsrData *UsrDat)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Remove_photo;
/***** Link for removing the photo *****/
@ -189,7 +189,7 @@ static void Pho_PutLinkToRemoveUsrPhoto (const struct UsrData *UsrDat)
Usr_PutParamOtherUsrCodEncrypted (UsrDat->EncryptedUsrCod);
}
Act_LinkFormSubmit (Txt_Remove_photo,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Remove_photo,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("delon",Txt_Remove_photo,Txt_Remove_photo);
Act_FormEnd ();
}
@ -236,7 +236,7 @@ void Pho_ReqPhoto (const struct UsrData *UsrDat,bool PhotoExists,const char *Pho
if (PhotoExists) // User has photo
{
/***** Forms to remove photo and make it public *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Pho_PutLinkToRemoveUsrPhoto (UsrDat);
if (ItsMe)
Pri_PutLinkToChangeMyPrivacy (); // Put link (form) to change my privacy
@ -1671,7 +1671,7 @@ static Pho_HowOrderDegrees_t Pho_GetHowOrderDegreesFromForm (void)
static void Pho_PutLinkToPrintViewOfDegreeStats (void)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Lay_PutLinkToPrintView1 (ActPrnPhoDeg);
Pho_PutHiddenParamTypeOfAvg ();
Pho_PutHiddenParamPhotoSize ();
@ -1689,7 +1689,7 @@ static void Pho_PutLinkToPrintViewOfDegreeStats (void)
static void Pho_PutLinkToCalculateDegreeStats (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Calculate_average_photo_of_a_degree;
extern const char *Txt_Calculate_average_photo_of_THE_DEGREE_X;
extern const char *Txt_unknown_TIME;
@ -1707,8 +1707,8 @@ static void Pho_PutLinkToCalculateDegreeStats (void)
/***** Get data of the degree from database *****/
Deg_GetDataOfDegreeByCod (&Deg);
/***** Start div and table *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
/***** Start div *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
/***** Start form *****/
Act_FormStart (ActCalPhoDeg);
@ -1718,7 +1718,7 @@ static void Pho_PutLinkToCalculateDegreeStats (void)
Usr_PutParamUsrListType (Gbl.Usrs.Me.ListType);
Usr_PutParamColsClassPhoto ();
Usr_PutParamListWithPhotos ();
Act_LinkFormSubmitAnimated (Txt_Calculate_average_photo_of_a_degree,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmitAnimated (Txt_Calculate_average_photo_of_a_degree,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutCalculateIcon (Txt_Calculate_average_photo_of_a_degree,Txt_Calculate_average_photo_of_THE_DEGREE_X);
/***** Put selector with all the degrees *****/
@ -1745,7 +1745,7 @@ static void Pho_PutLinkToCalculateDegreeStats (void)
StrEstimatedTimeToComputeAvgPhoto);
}
/***** End selector, form, table and div *****/
/***** End selector, form and div *****/
fprintf (Gbl.F.Out,"</select>");
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");

6
swad_place.c
View File

@ -200,12 +200,12 @@ static void Plc_GetParamPlcOrderType (void)
static void Plc_PutFormToEditPlcs (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart (ActEdiPlc);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");

6
swad_plugin.c
View File

@ -150,12 +150,12 @@ void Plg_ListPlugins (void)
static void Plg_PutFormToEditPlugins (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart (ActEdiPlg);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");

12
swad_profile.c
View File

@ -296,7 +296,7 @@ void Prf_ChangeProfileVisibility (void)
static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_teachers_ABBREVIATION;
extern const char *Txt_students_ABBREVIATION;
@ -439,7 +439,7 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
/***** Button to fetch and store first click time *****/
Act_FormStart (ActCal1stClkTim);
Usr_PutParamOtherUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutCalculateIcon (Txt_Calculate,Txt_Calculate);
Act_FormEnd ();
}
@ -481,7 +481,7 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
/***** Button to fetch and store number of clicks *****/
Act_FormStart (ActCalNumClk);
Usr_PutParamOtherUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutCalculateIcon (Txt_Calculate,Txt_Calculate);
Act_FormEnd ();
}
@ -518,7 +518,7 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
/***** Button to fetch and store number of file views *****/
Act_FormStart (ActCalNumFilVie);
Usr_PutParamOtherUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutCalculateIcon (Txt_Calculate,Txt_Calculate);
Act_FormEnd ();
}
@ -555,7 +555,7 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
/***** Button to fetch and store number of forum posts *****/
Act_FormStart (ActCalNumForPst);
Usr_PutParamOtherUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutCalculateIcon (Txt_Calculate,Txt_Calculate);
Act_FormEnd ();
}
@ -592,7 +592,7 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
/***** Button to fetch and store number of messages sent *****/
Act_FormStart (ActCalNumMsgSnt);
Usr_PutParamOtherUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutCalculateIcon (Txt_Calculate,Txt_Calculate);
Act_FormEnd ();
}

28
swad_record.c
View File

@ -868,12 +868,12 @@ void Rec_FreeListFields (void)
void Rec_PutLinkToEditRecordFields (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Edit_record_fields;
/***** Link to edit record fields *****/
Act_FormStart (ActEdiRecFie);
Act_LinkFormSubmit (Txt_Edit_record_fields,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Edit_record_fields,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("edit",Txt_Edit_record_fields,Txt_Edit_record_fields);
Act_FormEnd ();
}
@ -1295,16 +1295,16 @@ void Rec_ListRecordsTchsCrs (void)
void Rec_ShowLinkToPrintPreviewOfRecords (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Print;
extern const char *Txt_record_cards_per_page;
unsigned i;
Act_LinkFormSubmit (Txt_Print,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Print,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("print",Txt_Print,Txt_Print);
fprintf (Gbl.F.Out,"<span class=\"%s\"> (</span>"
"<select name=\"RecsPerPag\">",
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassFormulB[Gbl.Prefs.Theme]);
for (i = 1;
i <= 10;
@ -1317,7 +1317,7 @@ void Rec_ShowLinkToPrintPreviewOfRecords (void)
}
fprintf (Gbl.F.Out,"</select>"
"<span class=\"%s\"> %s)</span>",
The_ClassFormul[Gbl.Prefs.Theme],Txt_record_cards_per_page);
The_ClassFormulB[Gbl.Prefs.Theme],Txt_record_cards_per_page);
}
/*****************************************************************************/
@ -1864,16 +1864,16 @@ void Rec_ShowFormMyCommRecord (void)
Lay_ShowAlert (Lay_WARNING,Txt_Please_fill_in_your_record_card_including_your_name);
/***** Buttons for edition *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Rec_PutLinkToChangeMyInsCtrDpt (); // Put link (form) to change my institution, centre, department...
Rec_PutLinkToChangeMySocialNetworks (); // Put link (form) to change my social networks
Pho_PutLinkToChangeUsrPhoto (&Gbl.Usrs.Me.UsrDat); // Put link (form) to change my photo
Pri_PutLinkToChangeMyPrivacy (); // Put link (form) to change my privacy
fprintf (Gbl.F.Out,"</div>");
/***** My record *****/
Rec_ShowSharedUsrRecord (Rec_FORM_MY_COMMON_RECORD,&Gbl.Usrs.Me.UsrDat);
Rec_WriteLinkToDataProtectionClause ();
fprintf (Gbl.F.Out,"</div>");
}
/*****************************************************************************/
@ -3085,7 +3085,9 @@ static void Rec_WriteLinkToDataProtectionClause (void)
extern const char *Txt_DATA_PROTECTION_CLAUSE;
char Title[1024];
sprintf (Title,"<a href=\"%s/%s/\" target=\"_blank\">%s</a>",
sprintf (Title,"<div style=\"text-align:center;\">"
"<a href=\"%s/%s/\" target=\"_blank\">%s</a>"
"</div>",
Cfg_HTTP_URL_SWAD_PUBLIC,Cfg_DATA_PROTECTION_FOLDER,
Txt_DATA_PROTECTION_CLAUSE);
Lay_WriteTitle (Title);
@ -3220,12 +3222,12 @@ static void Rec_GetUsrCommentsFromForm (struct UsrData *UsrDat)
static void Rec_PutLinkToChangeMyInsCtrDpt (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Edit_my_institution;
/***** Link to edit my institution, centre, department... *****/
Act_FormStart (ActReqEdiMyIns);
Act_LinkFormSubmit (Txt_Edit_my_institution,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Edit_my_institution,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("institution",Txt_Edit_my_institution,Txt_Edit_my_institution);
Act_FormEnd ();
}
@ -3236,12 +3238,12 @@ static void Rec_PutLinkToChangeMyInsCtrDpt (void)
static void Rec_PutLinkToChangeMySocialNetworks (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Edit_my_webs_networks;
/***** Link to edit my social networks *****/
Act_FormStart (ActReqEdiMyNet);
Act_LinkFormSubmit (Txt_Edit_my_webs_networks,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Edit_my_webs_networks,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("earth",Txt_Edit_my_webs_networks,Txt_Edit_my_webs_networks);
Act_FormEnd ();
}

12
swad_search.c
View File

@ -90,7 +90,7 @@ void Sch_ReqSysSearch (void)
/***** Select one of my courses *****/
if (Gbl.Usrs.Me.Logged)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Crs_PutFormToSelectMyCourses ();
fprintf (Gbl.F.Out,"</div>");
}
@ -109,7 +109,7 @@ void Sch_ReqCtySearch (void)
/***** Select one of my courses *****/
if (Gbl.Usrs.Me.Logged)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Crs_PutFormToSelectMyCourses ();
fprintf (Gbl.F.Out,"</div>");
}
@ -128,7 +128,7 @@ void Sch_ReqInsSearch (void)
/***** Select one of my courses *****/
if (Gbl.Usrs.Me.Logged)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Crs_PutFormToSelectMyCourses ();
fprintf (Gbl.F.Out,"</div>");
}
@ -147,7 +147,7 @@ void Sch_ReqCtrSearch (void)
/***** Select one of my courses *****/
if (Gbl.Usrs.Me.Logged)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Crs_PutFormToSelectMyCourses ();
fprintf (Gbl.F.Out,"</div>");
}
@ -166,7 +166,7 @@ void Sch_ReqDegSearch (void)
/***** Select one of my courses *****/
if (Gbl.Usrs.Me.Logged)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Crs_PutFormToSelectMyCourses ();
fprintf (Gbl.F.Out,"</div>");
}
@ -185,7 +185,7 @@ void Sch_ReqCrsSearch (void)
/***** Select one of my courses *****/
if (Gbl.Usrs.Me.Logged)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Crs_PutFormToSelectMyCourses ();
fprintf (Gbl.F.Out,"</div>");
}

4
swad_statistic.c
View File

@ -371,11 +371,11 @@ void Sta_RemoveOldEntriesRecentLog (void)
static void Sta_PutFormToRequestAccessesCrs (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Visits_to_course;
Act_FormStart (ActReqAccCrs);
Act_LinkFormSubmit (Txt_Visits_to_course,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Visits_to_course,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("stats",Txt_Visits_to_course,Txt_Visits_to_course);
Act_FormEnd ();
}

11
swad_survey.c
View File

@ -694,15 +694,15 @@ void Svy_PutHiddenParamSvyOrderType (void)
static void Svy_PutFormToCreateNewSvy (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_New_survey;
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart (ActFrmNewSvy);
Svy_PutHiddenParamSvyOrderType ();
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
Act_LinkFormSubmit (Txt_New_survey,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_New_survey,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("new",Txt_New_survey,Txt_New_survey);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
@ -1510,7 +1510,6 @@ void Svy_RequestCreatOrEditSvy (void)
extern const char *Txt_New_survey;
extern const char *Txt_Scope;
extern const char *Txt_Edit_survey;
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Start_date;
extern const char *Txt_End_date;
extern const char *Txt_Title;
@ -2952,7 +2951,7 @@ static unsigned Svy_GetNextQuestionIndexInSvy (long SvyCod)
static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQst)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Survey_questions;
extern const char *Txt_No_INDEX;
extern const char *Txt_Type;
@ -3124,7 +3123,7 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ
Svy_PutHiddenParamSvyOrderType ();
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
Act_LinkFormSubmit (Txt_New_question,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_New_question,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("new",Txt_New_question,Txt_New_question);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"

18
swad_test.c
View File

@ -256,7 +256,7 @@ void Tst_ShowFormAskTst (void)
Gbl.Usrs.Me.LoggedRole == Rol_ROLE_TEACHER ||
Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SYS_ADM)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Tst_PutFormToSeeResultsOfUsersTests ();
Tst_PutFormToEdit ();
Tst_PutFormToConfigure ();
@ -312,12 +312,12 @@ void Tst_ShowFormAskTst (void)
static void Tst_PutFormToSeeResultsOfUsersTests (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Results_tests;
Act_FormStart (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_STUDENT ? ActReqSeeMyTstExa:
ActReqSeeUsrTstExa);
Act_LinkFormSubmit (Txt_Results_tests,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Results_tests,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("file",Txt_Results_tests,Txt_Results_tests);
Act_FormEnd ();
}
@ -328,11 +328,11 @@ static void Tst_PutFormToSeeResultsOfUsersTests (void)
static void Tst_PutFormToEdit (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Edit;
Act_FormStart (ActEdiTstQst);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit);
Act_FormEnd ();
}
@ -343,12 +343,12 @@ static void Tst_PutFormToEdit (void)
static void Tst_PutFormToConfigure (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Configure_tests;
extern const char *Txt_Configure;
Act_FormStart (ActCfgTst);
Act_LinkFormSubmit (Txt_Configure_tests,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Configure_tests,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("configtest",Txt_Configure,Txt_Configure);
Act_FormEnd ();
}
@ -1158,12 +1158,12 @@ void Tst_ShowFormAskEditTsts (void)
static void Tst_PutFormToCreateNewTstQst (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_New_question;
/***** Put form to create a new test question *****/
Act_FormStart (ActEdiOneTstQst);
Act_LinkFormSubmit (Txt_New_question,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_New_question,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("new",Txt_New_question,Txt_New_question);
Act_FormEnd ();
}

12
swad_test_import.c
View File

@ -81,7 +81,7 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
void TsI_PutFormToExportQuestions (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Export_questions_to_XML_file;
extern const char *Txt_Export_questions;
@ -96,7 +96,7 @@ void TsI_PutFormToExportQuestions (void)
Par_PutHiddenParamChar ("CreateXML",'Y');
/***** Put a link to create a file with questions *****/
Act_LinkFormSubmit (Txt_Export_questions_to_XML_file,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Export_questions_to_XML_file,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("export",Txt_Export_questions_to_XML_file,Txt_Export_questions);
Act_FormEnd ();
}
@ -107,7 +107,7 @@ void TsI_PutFormToExportQuestions (void)
void TsI_PutFormToImportQuestions (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Import_questions_from_XML_file;
extern const char *Txt_Import_questions;
@ -115,7 +115,7 @@ void TsI_PutFormToImportQuestions (void)
Act_FormStart (ActReqImpTstQst);
/***** Put a link to create a file with questions *****/
Act_LinkFormSubmit (Txt_Import_questions_from_XML_file,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Import_questions_from_XML_file,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("import",Txt_Import_questions_from_XML_file,Txt_Import_questions);
Act_FormEnd ();
}
@ -166,7 +166,7 @@ void TsI_ShowFormImportQstsFromXML (void)
void TsI_CreateXML (unsigned long NumRows,MYSQL_RES *mysql_res)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Tst_StrAnswerTypesXML[Tst_NUM_ANS_TYPES];
extern const char *Txt_NEW_LINE;
extern const char *Txt_XML_file;
@ -263,7 +263,7 @@ void TsI_CreateXML (unsigned long NumRows,MYSQL_RES *mysql_res)
fprintf (Gbl.F.Out,"<a href=\"%s/%s/%s/test.xml\" class=\"%s\" target=\"_blank\">",
Cfg_HTTPS_URL_SWAD_PUBLIC,Cfg_FOLDER_FILE_BROWSER_TMP,
Gbl.FileBrowser.TmpPubDir,
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("file",Txt_XML_file,Txt_XML_file);
}

38
swad_text.c
View File

@ -3442,23 +3442,23 @@ const char *Txt_Calculate_average_photo_of_a_degree =
const char *Txt_Calculate_average_photo_of_THE_DEGREE_X =
#if L==0
"Calcular fotografia mitjana de ";
"Calcular fotografia mitjana de";
#elif L==1
"Calculate average photo of "; // Need Übersetzung
"Calculate average photo of"; // Need Übersetzung
#elif L==2
"Calculate average photo of ";
"Calculate average photo of";
#elif L==3
"Calcular fotograf&iacute;a promedio de ";
"Calcular fotograf&iacute;a promedio de";
#elif L==4
"Calculate average photo of "; // Besoin de traduction
"Calculate average photo of"; // Besoin de traduction
#elif L==5
"Calcular fotograf&iacute;a promedio de "; // Okoteve traducción
"Calcular fotograf&iacute;a promedio de"; // Okoteve traducción
#elif L==6
"Calcolare la media della foto di ";
"Calcolare la media della foto di";
#elif L==7
"Obliczyc &sacute;rednia zdjecie ";
"Obliczyc &sacute;rednia zdjecie";
#elif L==8
"Calculate average photo of "; // Necessita de tradução
"Calculate average photo of"; // Necessita de tradução
#endif
const char *Txt_Call_the_roll =
@ -21966,25 +21966,25 @@ const char *Txt_New_announcement =
"Novo an&uacute;ncio";
#endif
const char *Txt_New_announcement_of_exam =
const char *Txt_New_announcement_OF_EXAM =
#if L==0
"Nova convocat&ograve;ria d'examen";
"Nova convocat&ograve;ria";
#elif L==1
"Neuer Aufruf f&uuml;r Pr&uuml;fung";
"Neuer Aufruf";
#elif L==2
"New announcement of exam";
"New announcement";
#elif L==3
"Nueva convocatoria de examen";
"Nueva convocatoria";
#elif L==4
"Nouvelle convocation &agrave; un examen";
"Nouvelle convocation";
#elif L==5
"Nueva convocatoria de examen"; // Okoteve traducción
"Nueva convocatoria"; // Okoteve traducción
#elif L==6
"Nuova sessione d'esame";
"Nuova sessione";
#elif L==7
"Nowe ogloszenie egzaminu";
"Nowe ogloszenie";
#elif L==8
"Nova chamada para exame";
"Nova chamada";
#endif
const char *Txt_New_banner =

20
swad_timetable.c
View File

@ -218,7 +218,7 @@ static void TT_GetParamsTimeTable (void)
void TT_ShowClassTimeTable (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Edit;
extern const char *Txt_Edit_office_hours;
extern const char *Txt_TIMETABLE_TYPES[TT_NUM_TIMETABLE_TYPES];
@ -249,13 +249,13 @@ void TT_ShowClassTimeTable (void)
/***** Put buttons *****/
if (PutEditButton || PutEditOfficeHours || !PrintView)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
if (PutEditButton)
{
Act_FormStart (ActEdiCrsTimTbl);
Grp_PutParamWhichGrps ();
Act_LinkFormSubmit (Txt_Edit,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Edit,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("edit",Txt_Edit,Txt_Edit);
Act_FormEnd ();
}
@ -263,7 +263,7 @@ void TT_ShowClassTimeTable (void)
if (PutEditOfficeHours)
{
Act_FormStart (ActEdiTut);
Act_LinkFormSubmit (Txt_Edit_office_hours,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Edit_office_hours,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("edit",Txt_Edit_office_hours,Txt_Edit_office_hours);
Act_FormEnd ();
}
@ -318,13 +318,13 @@ void TT_ShowClassTimeTable (void)
void TT_EditCrsTimeTable (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Show_timetable;
/***** Link (form) to see my timetable *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart (ActSeeCrsTimTbl);
Act_LinkFormSubmit (Txt_Show_timetable,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Show_timetable,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("clock",Txt_Show_timetable,Txt_Show_timetable);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
@ -349,14 +349,14 @@ void TT_EditCrsTimeTable (void)
void TT_ShowMyTutTimeTable (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Show_timetable;
extern const char *Txt_TIMETABLE_TYPES[TT_NUM_TIMETABLE_TYPES];
/***** Link (form) to see my timetable *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart (ActSeeMyTimTbl);
Act_LinkFormSubmit (Txt_Show_timetable,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Show_timetable,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("clock",Txt_Show_timetable,Txt_Show_timetable);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");

49
swad_user.c
View File

@ -1303,7 +1303,7 @@ void Usr_WriteFormLoginLogout (void)
{
if (Gbl.Session.IsOpen)
/***** Form to change my role *****/
Usr_ShowFormsRoleAndLogout ();
Usr_ShowFormsLogoutAndRole ();
else
/***** Form to log in *****/
Usr_WriteFormLogin ();
@ -1333,7 +1333,7 @@ void Usr_Logout (void)
void Usr_WriteFormLogin (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_New_on_PLATFORM_Sign_up;
extern const char *Txt_Create_account;
extern const char *Txt_Enter_from_X;
@ -1345,12 +1345,12 @@ void Usr_WriteFormLogin (void)
extern const char *Txt_I_forgot_my_password;
/***** Links to other actions *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:20px;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
/* Link to create a new account */
Act_FormStart (ActFrmUsrAcc);
sprintf (Gbl.Title,Txt_New_on_PLATFORM_Sign_up,Cfg_PLATFORM_SHORT_NAME);
Act_LinkFormSubmit (Gbl.Title,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Gbl.Title,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("arroba",Txt_Create_account,Gbl.Title);
Act_FormEnd ();
@ -1360,7 +1360,7 @@ void Usr_WriteFormLogin (void)
{
fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"%s\">",
Cfg_EXTERNAL_LOGIN_URL,
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassFormulB[Gbl.Prefs.Theme]);
sprintf (Gbl.Title,Txt_Enter_from_X,
Cfg_EXTERNAL_LOGIN_SERVICE_SHORT_NAME);
Lay_PutSendIcon ("login",Gbl.Title,Gbl.Title);
@ -1369,7 +1369,7 @@ void Usr_WriteFormLogin (void)
/* Link to send a new password */
Act_FormStart (ActReqSndNewPwd);
Par_PutHiddenParamString ("UsrId",Gbl.Usrs.Me.UsrIdLogin);
Act_LinkFormSubmit (Txt_I_forgot_my_password,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_I_forgot_my_password,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("key",Txt_I_forgot_my_password,Txt_I_forgot_my_password);
Act_FormEnd ();
@ -2445,11 +2445,12 @@ void Usr_WarningWhenDegreeTypeDoesntAllowDirectLogin (void)
}
/*****************************************************************************/
/************** Show forms to change my role and to log out ******************/
/************** Show forms to log out and to change my role ******************/
/*****************************************************************************/
void Usr_ShowFormsRoleAndLogout (void)
void Usr_ShowFormsLogoutAndRole (void)
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Log_out;
extern const char *Txt_You_are_LOGGED_as_X;
@ -2458,9 +2459,9 @@ void Usr_ShowFormsRoleAndLogout (void)
extern const char *Txt_Role;
/***** Link to log out *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:20px;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart (ActLogOut);
Act_LinkFormSubmit (Txt_Log_out,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Log_out,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("logout",Txt_Log_out,Txt_Log_out);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
@ -6288,6 +6289,7 @@ static void Usr_UpdateMyPrefAboutListWithPhotosPhotoInDB (void)
void Usr_SeeGuests (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Scope;
extern const char *Txt_Show_all_data;
extern const char *Txt_Show_records;
@ -6339,18 +6341,18 @@ void Usr_SeeGuests (void)
{
case Usr_CLASS_PHOTO:
/***** Link to print view *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Lay_PutLinkToPrintView1 (ActPrnInvPho);
Lay_PutLinkToPrintView2 ();
fprintf (Gbl.F.Out,"</div>");
break;
case Usr_LIST:
/****** Link to show all the data ******/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart (ActLstInvAll);
Usr_PutParamListWithPhotos ();
Usr_PutExtraParamsUsrList (ActLstInvAll);
Act_LinkFormSubmit (Txt_Show_all_data,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Show_all_data,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("table",Txt_Show_all_data,Txt_Show_all_data);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
@ -6412,6 +6414,7 @@ void Usr_SeeGuests (void)
void Usr_SeeStudents (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Scope;
extern const char *Txt_Show_all_data;
extern const char *Txt_Show_records;
@ -6421,8 +6424,7 @@ void Usr_SeeStudents (void)
(Gbl.Usrs.Me.LoggedRole == Rol_ROLE_TEACHER || // My role in current course is teacher...
Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SYS_ADM)) // ...or superuser
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;"
" margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
/***** Link to list official students *****/
Usr_PutLinkToListOfficialStudents ();
@ -6488,7 +6490,7 @@ void Usr_SeeStudents (void)
{
case Usr_CLASS_PHOTO:
/***** Link to print view *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Lay_PutLinkToPrintView1 (ActPrnStdPho);
Grp_PutParamsCodGrps ();
Lay_PutLinkToPrintView2 ();
@ -6498,12 +6500,12 @@ void Usr_SeeStudents (void)
if (Gbl.Usrs.Me.LoggedRole >= Rol_ROLE_TEACHER)
{
/****** Link to show all the data ******/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart (ActLstStdAll);
Grp_PutParamsCodGrps ();
Usr_PutParamListWithPhotos ();
Usr_PutExtraParamsUsrList (ActLstStdAll);
Act_LinkFormSubmit (Txt_Show_all_data,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Show_all_data,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("table",Txt_Show_all_data,Txt_Show_all_data);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
@ -6583,6 +6585,7 @@ void Usr_SeeStudents (void)
void Usr_SeeTeachers (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Scope;
extern const char *Txt_Show_all_data;
extern const char *Txt_Show_records;
@ -6631,7 +6634,7 @@ void Usr_SeeTeachers (void)
switch (Gbl.Usrs.Me.ListType)
{
case Usr_CLASS_PHOTO:
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Lay_PutLinkToPrintView1 (ActPrnTchPho);
Sco_PutParamScope (Gbl.Scope.Current);
Lay_PutLinkToPrintView2 ();
@ -6641,11 +6644,11 @@ void Usr_SeeTeachers (void)
if (Gbl.Usrs.Me.LoggedRole >= Rol_ROLE_TEACHER)
{
/****** Link to show all the data ******/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart (ActLstTchAll);
Sco_PutParamScope (Gbl.Scope.Current);
Usr_PutParamListWithPhotos ();
Act_LinkFormSubmit (Txt_Show_all_data,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Show_all_data,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("table",Txt_Show_all_data,Txt_Show_all_data);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
@ -6718,7 +6721,7 @@ void Usr_SeeTeachers (void)
static void Usr_PutLinkToListOfficialStudents (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Official_students;
bool ExternalUsrsServiceAvailable = (Cfg_EXTERNAL_LOGIN_CLIENT_COMMAND[0] != '\0');
@ -6729,7 +6732,7 @@ static void Usr_PutLinkToListOfficialStudents (void)
{
/***** Link to list official students *****/
Act_FormStart (ActGetExtLstStd);
Act_LinkFormSubmit (Txt_Official_students,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Official_students,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("list",Txt_Official_students,Txt_Official_students);
Act_FormEnd ();
}

2
swad_user.h
View File

@ -249,7 +249,7 @@ bool Usr_GetParamOtherUsrCodEncryptedAndGetUsrData (void);
void Usr_ChkUsrAndGetUsrData (void);
void Usr_WarningWhenDegreeTypeDoesntAllowDirectLogin (void);
void Usr_ShowFormsRoleAndLogout (void);
void Usr_ShowFormsLogoutAndRole (void);
bool Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (struct UsrData *UsrDat);
bool Usr_GetIfUserHasAcceptedEnrollmentInCurrentCrs (long UsrCod);

7
swad_zip.c
View File

@ -111,16 +111,16 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
void ZIP_PutButtonToCreateZIPAsgWrk (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Create_ZIP_file;
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart (ActAdmAsgWrkCrs);
Usr_PutHiddenParUsrCodAll (ActAdmAsgWrkCrs,Gbl.Usrs.Select.All);
if (Gbl.FileBrowser.FullTree)
Par_PutHiddenParamChar ("FullTree",'Y');
Par_PutHiddenParamChar ("CreateZIP",'Y');
Act_LinkFormSubmit (Txt_Create_ZIP_file,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Create_ZIP_file,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("download",Txt_Create_ZIP_file,Txt_Create_ZIP_file);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
@ -145,7 +145,6 @@ bool ZIP_GetCreateZIPFromForm (void)
void ZIP_CreateZIPAsgWrk (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_works_ZIP_FILE_NAME;
char StrZip[100+PATH_MAX*2+1];
char Path[PATH_MAX+1];