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 15.7.2

This commit is contained in:
Antonio Cañas Vargas 2015-10-04 16:24:10 +02:00
parent 76919ed8b3
commit d898223805
5 changed files with 64 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -98,11 +98,12 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.7.1 (2015/10/03)" #define Log_PLATFORM_VERSION "SWAD 15.7.2 (2015/10/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 sql/swad*.sql | tail -1 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/* /*
Version 15.7.2: Oct 04, 2015 New layout in enrollment requests. (185018 lines)
Version 15.7.1: Oct 03, 2015 Message translated. (184984 lines) Version 15.7.1: Oct 03, 2015 Message translated. (184984 lines)
Version 15.7: Oct 03, 2015 Height of tabs reduced. Version 15.7: Oct 03, 2015 Height of tabs reduced.
Changes in layout of students record cards in course. (184962 lines) Changes in layout of students record cards in course. (184962 lines)

21
swad_enrollment.c
View File

@ -2127,6 +2127,7 @@ void Enr_ShowEnrollmentRequests (void)
{ {
extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES]; extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_Enrollment_requests;
extern const char *Txt_Scope; extern const char *Txt_Scope;
extern const char *Txt_Users; extern const char *Txt_Users;
extern const char *Txt_Update; extern const char *Txt_Update;
@ -2156,6 +2157,9 @@ void Enr_ShowEnrollmentRequests (void)
char PhotoURL[PATH_MAX+1]; char PhotoURL[PATH_MAX+1];
Rol_Role_t DesiredRole; Rol_Role_t DesiredRole;
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Enrollment_requests);
/***** Selection of scope and roles *****/ /***** Selection of scope and roles *****/
/* Start form */ /* Start form */
Act_FormStart (ActSeeSignUpReq); Act_FormStart (ActSeeSignUpReq);
@ -2502,8 +2506,8 @@ void Enr_ShowEnrollmentRequests (void)
Usr_UsrDataConstructor (&UsrDat); Usr_UsrDataConstructor (&UsrDat);
/* Start table */ /* Start table */
Lay_StartRoundFrameTable (NULL,2,NULL); fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\""
fprintf (Gbl.F.Out,"<tr>" " style=\"margin:0 auto;\">"
"<th></th>" "<th></th>"
"<th class=\"LEFT_TOP\">" "<th class=\"LEFT_TOP\">"
"%s" "%s"
@ -2617,7 +2621,7 @@ void Enr_ShowEnrollmentRequests (void)
ActReqMdfTch); ActReqMdfTch);
Crs_PutParamCrsCod (Crs.CrsCod); Crs_PutParamCrsCod (Crs.CrsCod);
Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod); Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod);
Lay_PutCreateButton (Txt_Register); Lay_PutCreateButtonInline (Txt_Register);
Act_FormEnd (); Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
@ -2626,7 +2630,7 @@ void Enr_ShowEnrollmentRequests (void)
Act_FormStart (ActReqRejSignUp); Act_FormStart (ActReqRejSignUp);
Crs_PutParamCrsCod (Crs.CrsCod); Crs_PutParamCrsCod (Crs.CrsCod);
Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod); Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod);
Lay_PutConfirmButton (Txt_Reject); Lay_PutRemoveButtonInline (Txt_Reject);
Act_FormEnd (); Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
@ -2640,14 +2644,17 @@ void Enr_ShowEnrollmentRequests (void)
Enr_RemoveEnrollmentRequest (Crs.CrsCod,UsrDat.UsrCod); Enr_RemoveEnrollmentRequest (Crs.CrsCod,UsrDat.UsrCod);
} }
/* End frame */ /* End table */
Lay_EndRoundFrameTable (); fprintf (Gbl.F.Out,"</table>");
/* Free memory used for user's data */ /* Free memory used for user's data */
Usr_UsrDataDestructor (&UsrDat); Usr_UsrDataDestructor (&UsrDat);
} }
else // There are no requests else // There are no requests
Lay_ShowAlert (Lay_INFO,Txt_No_enrollment_requests); Lay_ShowAlert (Lay_INFO,Txt_No_enrollment_requests);
/***** End frame *****/
Lay_EndRoundFrame ();
} }
/*****************************************************************************/ /*****************************************************************************/

8
swad_layout.c
View File

@ -1124,6 +1124,14 @@ void Lay_PutRemoveButton (const char *Text)
Text); Text);
} }
void Lay_PutRemoveButtonInline (const char *Text)
{
fprintf (Gbl.F.Out,"<button type=\"submit\" class=\"BT_SUBMIT_INLINE BT_REMOVE\">"
"%s"
"</button>",
Text);
}
/*****************************************************************************/ /*****************************************************************************/
/************ Write a centered message with the title of a table *************/ /************ Write a centered message with the title of a table *************/
/*****************************************************************************/ /*****************************************************************************/

1
swad_layout.h
View File

@ -96,6 +96,7 @@ void Lay_PutCreateButtonInline (const char *Text);
void Lay_PutConfirmButton (const char *Text); void Lay_PutConfirmButton (const char *Text);
void Lay_PutConfirmButtonInline (const char *Text); void Lay_PutConfirmButtonInline (const char *Text);
void Lay_PutRemoveButton (const char *Text); void Lay_PutRemoveButton (const char *Text);
void Lay_PutRemoveButtonInline (const char *Text);
void Lay_StartRoundFrameTable (const char *Width,unsigned CellPadding,const char *Title); void Lay_StartRoundFrameTable (const char *Width,unsigned CellPadding,const char *Title);
void Lay_StartRoundFrame (const char *Width,const char *Title); void Lay_StartRoundFrame (const char *Width,const char *Title);

58
swad_text.c
View File

@ -781,9 +781,9 @@ const char *Txt_The_following_password_has_been_assigned_to_you_to_log_in_X_NO_H
" Un cop hagi entrat, pot canviar la contrasenya per una altra.\n" " Un cop hagi entrat, pot canviar la contrasenya per una altra.\n"
"Si no accedeix amb aquesta nova contrasenya," "Si no accedeix amb aquesta nova contrasenya,"
" seguirà tenint la contrasenya que tingués fins ara.\n" " seguirà tenint la contrasenya que tingués fins ara.\n"
"Si ha rebut aquest missatge sense sol·licitar-lo," "Si ha rebut aquest missatge sense sol&middot;licitar-lo,"
" es deu a que algú que coneix el seu ID (DNI/cédula), el seu sobrenom o el seu e-mail" " es deu a que algú que coneix el seu ID (DNI/cédula), el seu sobrenom o el seu e-mail"
" ha sol·licitat l'enviament de una nova contrasenya per a vostè.\n" " ha sol&middot;licitat l'enviament de una nova contrasenya per a vostè.\n"
"Aquesta nova contrasenya se ha enviat només a la adreça de correu %s," "Aquesta nova contrasenya se ha enviat només a la adreça de correu %s,"
" que és la que apareix a la seva fitxa.\n\n"; " que és la que apareix a la seva fitxa.\n\n";
#elif L==1 #elif L==1
@ -4690,9 +4690,9 @@ const char *Txt_Congratulations_You_have_created_your_account_X_Now_Y_will_reque
#if L==0 #if L==0
"Enhorabona! Ha creat el seu compte @%s." "Enhorabona! Ha creat el seu compte @%s."
" Ara %s li demanar&agrave; algunes dades per completar el seu perfil." " Ara %s li demanar&agrave; algunes dades per completar el seu perfil."
" Despr&eacute;s podr&agrave; sol·licitar la seva inscripci&oacute; en assignatures." " Despr&eacute;s podr&agrave; sol&middot;licitar la seva inscripci&oacute; en assignatures."
" Si no hi ha una assignatura," " Si no hi ha una assignatura,"
" vost&egrave; pot crear abans de sol·licitar la seva inscripci&oacute; en ella" " vost&egrave; pot crear abans de sol&middot;licitar la seva inscripci&oacute; en ella"
" (el mateix &eacute;s aplicable a institucions, centres i titulacions)."; " (el mateix &eacute;s aplicable a institucions, centres i titulacions).";
#elif L==1 #elif L==1
"Herzlichen Gl&uuml;ckwunsch! Du hast Dein Konto @%s erstellt." "Herzlichen Gl&uuml;ckwunsch! Du hast Dein Konto @%s erstellt."
@ -9863,7 +9863,6 @@ const char *Txt_Enroll_in_groups =
"Inscreva-me em grupos "; "Inscreva-me em grupos ";
#endif #endif
const char *Txt_Enrollment_confirmed = const char *Txt_Enrollment_confirmed =
#if L==0 #if L==0
"Inscripci&oacute;n confirmada"; // Necessita traduccio "Inscripci&oacute;n confirmada"; // Necessita traduccio
@ -9927,6 +9926,27 @@ const char *Txt_Enrollment_not_confirmed =
"Enrollment not confirmed"; // Necessita de tradução "Enrollment not confirmed"; // Necessita de tradução
#endif #endif
const char *Txt_Enrollment_requests =
#if L==0
"Peticions d'inscripci&oacute;";
#elif L==1
"Registrierungsanforderungen";
#elif L==2
"Enrollment requests";
#elif L==3
"Solicitudes de inscripci&oacute;n";
#elif L==4
"Demandes d'inscription";
#elif L==5
"Solicitudes de inscripci&oacute;n"; // Okoteve traducción
#elif L==6
"Richieste di registrazione";
#elif L==7
"Pro&sacute;by o rejestracji";
#elif L==8
"Pedidos de inscri&ccedil;&atilde;o";
#endif
const char *Txt_Enter_a_new_item_here = const char *Txt_Enter_a_new_item_here =
#if L==0 #if L==0
"Escriba aqu&iacute; un nuevo apartado"; // Necessita traduccio "Escriba aqu&iacute; un nuevo apartado"; // Necessita traduccio
@ -19521,7 +19541,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
, ,
// ActReqSignUp // ActReqSignUp
#if L==0 #if L==0
"Sol·licitar inscripci&oacute;" "Sol&middot;licitar inscripci&oacute;"
#elif L==1 #elif L==1
"Registrierung beantragen" "Registrierung beantragen"
#elif L==2 #elif L==2
@ -19546,13 +19566,13 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
#elif L==1 #elif L==1
"Registrierungsanforderungen" "Registrierungsanforderungen"
#elif L==2 #elif L==2
"Requests for enrollment in this course pending verification" "Enrollment requests in this course pending verification"
#elif L==3 #elif L==3
"Peticiones de inscripci&oacute;n pendientes de verificar" "Peticiones de inscripci&oacute;n pendientes de verificar"
#elif L==4 #elif L==4
"Demandes d'inscription" "Demandes d'inscription"
#elif L==5 #elif L==5
"Peticiones de inscripci&oacute;n pendientes de verificar"// Okoteve traducción "Peticiones de inscripci&oacute;n pendientes de verificar" // Okoteve traducción
#elif L==6 #elif L==6
"Richieste di iscrizione" "Richieste di iscrizione"
#elif L==7 #elif L==7
@ -23012,17 +23032,17 @@ const char *Txt_No_degrees_have_been_created_in_this_centre =
const char *Txt_No_enrollment_requests = const char *Txt_No_enrollment_requests =
#if L==0 #if L==0
"No hay peticiones de inscripci&oacute;n."; // Necessita traduccio "No hay solicitudes de inscripci&oacute;n."; // Necessita traduccio
#elif L==1 #elif L==1
"No enrollment requests."; // Need Übersetzung "No enrollment requests."; // Need Übersetzung
#elif L==2 #elif L==2
"No enrollment requests."; "No enrollment requests.";
#elif L==3 #elif L==3
"No hay peticiones de inscripci&oacute;n."; "No hay solicitudes de inscripci&oacute;n.";
#elif L==4 #elif L==4
"No enrollment requests."; // Besoin de traduction "No enrollment requests."; // Besoin de traduction
#elif L==5 #elif L==5
"No hay peticiones de inscripci&oacute;n."; // Okoteve traducción "No hay solicitudes de inscripci&oacute;n."; // Okoteve traducción
#elif L==6 #elif L==6
"No enrollment requests."; // Bisogno di traduzione "No enrollment requests."; // Bisogno di traduzione
#elif L==7 #elif L==7
@ -29260,7 +29280,7 @@ const char *Txt_Reply_again =
const char *Txt_Requester = const char *Txt_Requester =
#if L==0 #if L==0
"Sol·licitant"; "Sol&middot;licitant";
#elif L==1 #elif L==1
"Requester"; "Requester";
#elif L==2 #elif L==2
@ -34758,7 +34778,7 @@ const char *Txt_Shuffle =
const char *Txt_Sign_up = const char *Txt_Sign_up =
#if L==0 #if L==0
"Sol·licitar inscripci&oacute;"; "Sol&middot;licitar inscripci&oacute;";
#elif L==1 #elif L==1
"Registrierung beantragen"; "Registrierung beantragen";
#elif L==2 #elif L==2
@ -41544,7 +41564,7 @@ const char *Txt_The_record_field_X_has_been_renamed_as_Y = // Warning: it is ver
const char *Txt_The_requested_group_changes_were_successful = const char *Txt_The_requested_group_changes_were_successful =
#if L==0 #if L==0
"Els canvis de grup sol·licitats s'han realitzat correctament."; "Els canvis de grup sol&middot;licitats s'han realitzat correctament.";
#elif L==1 #elif L==1
"The requested group changes were successful."; // Need Übersetzung "The requested group changes were successful."; // Need Übersetzung
#elif L==2 #elif L==2
@ -43176,7 +43196,7 @@ const char *Txt_There_are_no_banners =
const char *Txt_There_are_no_centres_with_requests_for_degrees_to_be_confirmed = const char *Txt_There_are_no_centres_with_requests_for_degrees_to_be_confirmed =
#if L==0 #if L==0
"No hi ha centres amb sol·licituds de titulacions pendents de confirmar."; "No hi ha centres amb sol&middot;licituds de titulacions pendents de confirmar.";
#elif L==1 #elif L==1
"There are no centres with requests for degrees to be confirmed"; // Need Übersetzung "There are no centres with requests for degrees to be confirmed"; // Need Übersetzung
#elif L==2 #elif L==2
@ -43197,7 +43217,7 @@ const char *Txt_There_are_no_centres_with_requests_for_degrees_to_be_confirmed =
const char *Txt_There_are_no_countries_with_requests_for_institutions_to_be_confirmed = const char *Txt_There_are_no_countries_with_requests_for_institutions_to_be_confirmed =
#if L==0 #if L==0
"No hi ha pa&iuml;sos amb sol·licituds de institucions pendents de confirmar."; "No hi ha pa&iuml;sos amb sol&middot;licituds de institucions pendents de confirmar.";
#elif L==1 #elif L==1
"There are no countries with requests for institutions to be confirmed"; // Need Übersetzung "There are no countries with requests for institutions to be confirmed"; // Need Übersetzung
#elif L==2 #elif L==2
@ -43218,7 +43238,7 @@ const char *Txt_There_are_no_countries_with_requests_for_institutions_to_be_conf
const char *Txt_There_are_no_degrees_with_requests_for_courses_to_be_confirmed = const char *Txt_There_are_no_degrees_with_requests_for_courses_to_be_confirmed =
#if L==0 #if L==0
"No hi ha titulacions amb sol·licituds d'assignatures pendents de confirmar."; "No hi ha titulacions amb sol&middot;licituds d'assignatures pendents de confirmar.";
#elif L==1 #elif L==1
"There are no degrees with requests for courses to be confirmed"; // Need Übersetzung "There are no degrees with requests for courses to be confirmed"; // Need Übersetzung
#elif L==2 #elif L==2
@ -43239,7 +43259,7 @@ const char *Txt_There_are_no_degrees_with_requests_for_courses_to_be_confirmed =
const char *Txt_There_are_no_institutions_with_requests_for_centres_to_be_confirmed = const char *Txt_There_are_no_institutions_with_requests_for_centres_to_be_confirmed =
#if L==0 #if L==0
"No hi ha institucions amb sol·licituds de centres pendents de confirmar."; "No hi ha institucions amb sol&middot;licituds de centres pendents de confirmar.";
#elif L==1 #elif L==1
"There are no institutions with requests for centres to be confirmed"; // Need Übersetzung "There are no institutions with requests for centres to be confirmed"; // Need Übersetzung
#elif L==2 #elif L==2
@ -49719,7 +49739,7 @@ const char *Txt_You_can_register_voluntarily_in_one_or_more_groups_of_type_X = /
const char *Txt_You_can_search_for_courses_select_them_and_request_your_enrollment_in_them = const char *Txt_You_can_search_for_courses_select_them_and_request_your_enrollment_in_them =
#if L==0 #if L==0
"Podeu cercar assignatures, seleccionar-les" "Podeu cercar assignatures, seleccionar-les"
" i sol·licitar la seva inscripci&oacute; en elles."; " i sol&middot;licitar la seva inscripci&oacute; en elles.";
#elif L==1 #elif L==1
"Sie k&ouml;nnen f&uuml;r Kurse zu suchen, w&auml;hlen Sie sie aus" "Sie k&ouml;nnen f&uuml;r Kurse zu suchen, w&auml;hlen Sie sie aus"
" und fordern Sie Ihre Anmeldung in ihnen."; " und fordern Sie Ihre Anmeldung in ihnen.";