diff --git a/swad_changelog.h b/swad_changelog.h index c99f97fa2..19f5097b8 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -172,13 +172,15 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.65 (2016-11-20)" +#define Log_PLATFORM_VERSION "SWAD 16.65.2 (2016-11-20)" #define CSS_FILE "swad16.60.1.css" #define JS_FILE "swad16.46.1.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.65.2: Nov 20, 2016 Changed order of links in USERS > Others. (207371 lines) + Version 16.65.1: Nov 20, 2016 Changes in help of administrators and guests. (207370 lines) Version 16.65: Nov 20, 2016 Changes in selector of my courses. (207369 lines) Version 16.64.34: Nov 20, 2016 Input fields for URLs are changed from text to url. (207376 lines) Version 16.64.33: Nov 20, 2016 Input fields for email are changed from text to email. (207375 lines) diff --git a/swad_help.c b/swad_help.c index 85031302e..f2c36c45a 100644 --- a/swad_help.c +++ b/swad_help.c @@ -101,8 +101,8 @@ 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"; -const char *Hlp_USERS_Others_administrators = WIKI "USERS.Others#administrators"; -const char *Hlp_USERS_Others_guests = WIKI "USERS.Others#guests"; +const char *Hlp_USERS_Administrators = WIKI "USERS.Administrators"; +const char *Hlp_USERS_Guests = WIKI "USERS.Guests"; const char *Hlp_USERS_Attendance = WIKI "USERS.Attendance"; diff --git a/swad_record.c b/swad_record.c index 66881bece..25283a3cb 100644 --- a/swad_record.c +++ b/swad_record.c @@ -2023,7 +2023,7 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView, { extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS]; extern const char *Hlp_PROFILE_Record; - extern const char *Hlp_USERS_Others_guests; + extern const char *Hlp_USERS_Guests; extern const char *Hlp_USERS_Students_shared_record_card; extern const char *Hlp_USERS_Teachers_shared_record_card; extern const char *The_ClassForm[The_NUM_THEMES]; @@ -2048,7 +2048,7 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView, const char *Rec_RecordListHelp[Rol_NUM_ROLES] = { NULL, // Rol_UNKNOWN - Hlp_USERS_Others_guests, // Rol__GUEST_ + Hlp_USERS_Guests, // Rol__GUEST_ NULL, // Rol_VISITOR Hlp_USERS_Students_shared_record_card, // Rol_STUDENT Hlp_USERS_Teachers_shared_record_card, // Rol_TEACHER diff --git a/swad_user.c b/swad_user.c index 69f9b6802..84aa274ad 100644 --- a/swad_user.c +++ b/swad_user.c @@ -6209,7 +6209,7 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,const char *SearchQuery) void Usr_ListDataAdms (void) { - extern const char *Hlp_USERS_Others_administrators; + extern const char *Hlp_USERS_Administrators; extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_Scope; @@ -6233,20 +6233,20 @@ void Usr_ListDataAdms (void) fprintf (Gbl.F.Out,"
"); if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM) + { /* Put link to remove old users */ Usr_PutLinkToSeeGuests (); + /* Put link to list possible duplicate users */ + Dup_PutLinkToListDupUsrs (); + } + /* Put link to go to admin one user */ Enr_PutLinkToAdminOneUsr (ActReqMdfOneOth); if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM) - { - /* Put link to list possible duplicate users */ - Dup_PutLinkToListDupUsrs (); - /* Put link to remove old users */ Enr_PutLinkToRemOldUsrs (); - } fprintf (Gbl.F.Out,"
"); } @@ -6279,7 +6279,7 @@ void Usr_ListDataAdms (void) /***** Start frame with list of administrators *****/ Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_DEG_ADM][Usr_SEX_UNKNOWN], - NULL,Hlp_USERS_Others_administrators); + NULL,Hlp_USERS_Administrators); /***** Form to select range of administrators *****/ fprintf (Gbl.F.Out,"
" @@ -6717,7 +6717,7 @@ static void Usr_PutLinkToSeeGuests (void) void Usr_SeeGuests (void) { - extern const char *Hlp_USERS_Others_guests; + extern const char *Hlp_USERS_Guests; extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_Scope; @@ -6757,7 +6757,7 @@ void Usr_SeeGuests (void) /***** Start frame *****/ Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol__GUEST_][Usr_SEX_UNKNOWN], - Usr_PutIconsListGsts,Hlp_USERS_Others_guests); + Usr_PutIconsListGsts,Hlp_USERS_Guests); /***** Form to select range of guests *****/ switch (Gbl.Usrs.Me.LoggedRole)