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 16.132.6

This commit is contained in:
Antonio Cañas Vargas 2017-01-31 00:25:10 +01:00
parent 628e8506e6
commit 5e9e9d1dec
5 changed files with 74 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -191,13 +191,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.132.5 (2017-01-30)"
#define Log_PLATFORM_VERSION "SWAD 16.132.6 (2017-01-31)"
#define CSS_FILE "swad16.132.4.css"
#define JS_FILE "swad16.123.js"
// 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 16.132.6: Jan 31, 2017 Help on adminitration of students. (211895 lines)
Version 16.132.5: Jan 30, 2017 Fixed bug in checking consent on dangerous action. (211888 lines)
Version 16.132.4: Jan 30, 2017 Changes in connected users. (211887 lines)
Version 16.132.3: Jan 30, 2017 Code refactoring in connected users. (211881 lines)

34
swad_enrollment.c
View File

@ -554,9 +554,10 @@ static void Enr_ReqAdminUsrs (Rol_Role_t Role)
static void Enr_ShowFormRegRemSeveralUsrs (Rol_Role_t Role)
{
extern const char *Hlp_USERS_Administration_administer_multiple_users;
extern const char *The_ClassTitle[The_NUM_THEMES];
extern const char *Txt_Admin_several_students;
extern const char *Txt_Admin_several_teachers;
extern const char *Txt_Administer_multiple_students;
extern const char *Txt_Administer_multiple_teachers;
extern const char *Txt_Step_1_Provide_a_list_of_users;
extern const char *Txt_Type_or_paste_a_list_of_IDs_nicks_or_emails_;
extern const char *Txt_Step_2_Select_the_desired_action;
@ -585,9 +586,10 @@ static void Enr_ShowFormRegRemSeveralUsrs (Rol_Role_t Role)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,
Role == Rol_STUDENT ? Txt_Admin_several_students :
Txt_Admin_several_teachers,
NULL,NULL);
Role == Rol_STUDENT ? Txt_Administer_multiple_students :
Txt_Administer_multiple_teachers,
NULL,
Hlp_USERS_Administration_administer_multiple_users);
/***** Step 1: List of students to be enrolled / removed *****/
fprintf (Gbl.F.Out,"<div class=\"%s LEFT_MIDDLE\">"
@ -2868,10 +2870,10 @@ static void Enr_RemoveExpiredEnrollmentRequests (void)
void Enr_PutLinkToAdminOneUsr (Act_Action_t NextAction)
{
extern const char *Txt_Admin_me;
extern const char *Txt_Admin_one_user;
const char *TitleText = Enr_ICanAdminOtherUsrs () ? Txt_Admin_one_user :
Txt_Admin_me;
extern const char *Txt_Administer_me;
extern const char *Txt_Administer_one_user;
const char *TitleText = Enr_ICanAdminOtherUsrs () ? Txt_Administer_one_user :
Txt_Administer_me;
Lay_PutContextualLink (NextAction,NULL,
"config64x64.gif",
@ -2885,10 +2887,10 @@ void Enr_PutLinkToAdminOneUsr (Act_Action_t NextAction)
void Enr_PutLinkToAdminSeveralUsrs (Rol_Role_t Role)
{
extern const char *Txt_Admin_several_students;
extern const char *Txt_Admin_several_teachers;
const char *TitleText = (Role == Rol_STUDENT) ? Txt_Admin_several_students :
Txt_Admin_several_teachers;
extern const char *Txt_Administer_multiple_students;
extern const char *Txt_Administer_multiple_teachers;
const char *TitleText = (Role == Rol_STUDENT) ? Txt_Administer_multiple_students :
Txt_Administer_multiple_teachers;
Lay_PutContextualLink (Role == Rol_STUDENT ? ActReqEnrSevStd :
ActReqEnrSevTch,
@ -2956,10 +2958,12 @@ static bool Enr_ICanAdminOtherUsrs (void)
static void Enr_ReqAnotherUsrIDToRegisterRemove (Rol_Role_t Role)
{
extern const char *Txt_Admin_one_user;
extern const char *Hlp_USERS_Administration_administer_one_user;
extern const char *Txt_Administer_one_user;
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Admin_one_user,NULL,NULL);
Lay_StartRoundFrame (NULL,Txt_Administer_one_user,NULL,
Hlp_USERS_Administration_administer_one_user);
/***** Write form to request another user's ID *****/
Enr_WriteFormToReqAnotherUsrID ( Role == Rol_STUDENT ? ActReqMdfStd :

3
swad_help.c
View File

@ -158,6 +158,9 @@ const char *Hlp_USERS_Students = WIKI "USERS.Students";
const char *Hlp_USERS_Students_shared_record_card = WIKI "USERS.Students#shared-record-card";
const char *Hlp_USERS_Students_course_record_card = WIKI "USERS.Students#course-record-card";
const char *Hlp_USERS_Administration_administer_one_user = WIKI "USERS.Administration#administer-one-user";
const char *Hlp_USERS_Administration_administer_multiple_users = WIKI "USERS.Administration#administer-multiple-users";
const char *Hlp_USERS_Teachers = WIKI "USERS.Teachers";
const char *Hlp_USERS_Teachers_shared_record_card = WIKI "USERS.Teachers#shared-record-card";
const char *Hlp_USERS_Teachers_timetable = WIKI "USERS.Teachers#timetable";

4
swad_record.c
View File

@ -2337,7 +2337,7 @@ static void Rec_PutIconsCommands (void)
extern const char *Txt_View_record_for_this_course;
extern const char *Txt_View_record_and_office_hours;
extern const char *Txt_Show_agenda;
extern const char *Txt_Admin_user;
extern const char *Txt_Administer_user;
extern const char *Txt_Write_a_message;
extern const char *Txt_View_homework;
extern const char *Txt_View_test_results;
@ -2416,7 +2416,7 @@ static void Rec_PutIconsCommands (void)
ActReqMdfOth),
Rec_PutParamUsrCodEncrypted,
"config64x64.gif",
Txt_Admin_user,NULL,
Txt_Administer_user,NULL,
NULL);
if (Gbl.CurrentCrs.Crs.CrsCod > 0 && // A course is selected

96
swad_text.c
View File

@ -1995,34 +1995,13 @@ const char *Txt_Action =
"A&ccedil;&atilde;o";
#endif
const char *Txt_Admin_one_user =
#if L==1
"Administrar un usuari";
#elif L==2
"Verwalten eines Benutzer";
#elif L==3
"Admin one user";
#elif L==4
"Administrar un usuario";
#elif L==5
"G&eacute;rer un utilisateur";
#elif L==6
"Administrar un usuario"; // Okoteve traducción
#elif L==7
"Gestire un utente";
#elif L==8
"Zarz&aogon;dzaj u&zdot;ytkownika";
#elif L==9
"Gerenciar um utilizador";
#endif
const char *Txt_Admin_me =
const char *Txt_Administer_me =
#if L==1
"Administrarme";
#elif L==2
"Verwalten Sie mich";
#elif L==3
"Admin me";
"Administer me";
#elif L==4
"Administrarme";
#elif L==5
@ -2037,34 +2016,13 @@ const char *Txt_Admin_me =
"Gerenciar me";
#endif
const char *Txt_Admin_user =
#if L==1
"Administrar usuari";
#elif L==2
"Verwalten Benutzer";
#elif L==3
"Admin user";
#elif L==4
"Administrar usuario";
#elif L==5
"G&eacute;rer utilisateur";
#elif L==6
"Administrar usuario"; // Okoteve traducción
#elif L==7
"Gestire utente";
#elif L==8
"Zarz&aogon;dzaj u&zdot;ytkownika";
#elif L==9
"Gerenciar utilizador";
#endif
const char *Txt_Admin_several_students =
const char *Txt_Administer_multiple_students =
#if L==1
"Administrar diversos estudiants";
#elif L==2
"Verwalten Sie mehrere Studenten";
#elif L==3
"Admin several students";
"Administer multiple students";
#elif L==4
"Administrar varios estudiantes";
#elif L==5
@ -2079,13 +2037,13 @@ const char *Txt_Admin_several_students =
"Gerenciar v&aacute;rios estudantes";
#endif
const char *Txt_Admin_several_teachers =
const char *Txt_Administer_multiple_teachers =
#if L==1
"Administrar diversos professors";
#elif L==2
"Verwalten Sie mehrere Lehrkr&auml;fte";
#elif L==3
"Admin several teachers";
"Administer multiple teachers";
#elif L==4
"Administrar varios profesores";
#elif L==5
@ -2100,6 +2058,48 @@ const char *Txt_Admin_several_teachers =
"Gerenciar v&aacute;rios professores";
#endif
const char *Txt_Administer_one_user =
#if L==1
"Administrar un usuari";
#elif L==2
"Verwalten eines Benutzer";
#elif L==3
"Administer one user";
#elif L==4
"Administrar un usuario";
#elif L==5
"G&eacute;rer un utilisateur";
#elif L==6
"Administrar un usuario"; // Okoteve traducción
#elif L==7
"Gestire un utente";
#elif L==8
"Zarz&aogon;dzaj u&zdot;ytkownika";
#elif L==9
"Gerenciar um utilizador";
#endif
const char *Txt_Administer_user =
#if L==1
"Administrar usuari";
#elif L==2
"Verwalten Benutzer";
#elif L==3
"Administer user";
#elif L==4
"Administrar usuario";
#elif L==5
"G&eacute;rer utilisateur";
#elif L==6
"Administrar usuario"; // Okoteve traducción
#elif L==7
"Gestire utente";
#elif L==8
"Zarz&aogon;dzaj u&zdot;ytkownika";
#elif L==9
"Gerenciar utilizador";
#endif
const char *Txt_all =
#if L==1
"tot";