diff --git a/swad_calendar.c b/swad_calendar.c index 793036de0..f34b46802 100644 --- a/swad_calendar.c +++ b/swad_calendar.c @@ -287,7 +287,7 @@ static void Cal_DrawCalendar (Act_Action_t ActionSeeCalendar, void (*FunctionToDrawContextualIcons) (void), bool PrintView) { - extern const char *Hlp_ASSESSMENT_Calendar; + extern const char *Hlp_Calendar; extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES]; char ParamsStr[256 + 256 + Ses_LENGTH_SESSION_ID + 256]; @@ -302,7 +302,7 @@ static void Cal_DrawCalendar (Act_Action_t ActionSeeCalendar, Lay_StartRoundFrame (NULL,NULL, FunctionToDrawContextualIcons, PrintView ? NULL : - Hlp_ASSESSMENT_Calendar); + Hlp_Calendar); Lay_WriteHeaderClassPhoto (PrintView,false, Gbl.CurrentIns.Ins.InsCod, Gbl.CurrentDeg.Deg.DegCod, diff --git a/swad_changelog.h b/swad_changelog.h index 088d80d17..53cea4726 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -190,18 +190,20 @@ // TODO: Ver solución de Guillermo Gómez Trenado cuando se pulsa con el botón derecho para abrir una descarga en otra ventana // TODO: En los detalles de asistencia debería salir la fecha de cada sesión +// TODO: System admin should view link "Visits to course" /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.135.5 (2017-02-11)" +#define Log_PLATFORM_VERSION "SWAD 16.135.6 (2017-02-13)" #define CSS_FILE "swad16.135.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.135.6: Feb 13, 2017 Changes in contextual help after changes in tabs. (212501 lines) Version 16.135.5: Feb 11, 2017 Change in button to register teacher when no teachers found. Changed color in statistics of countries. (212503 lines) Version 16.135.4: Feb 11, 2017 Force filling of ID in form to check if account exists. (212502 lines) diff --git a/swad_file_browser.c b/swad_file_browser.c index 18c66adfb..f8efe2d66 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -3074,7 +3074,7 @@ static bool Brw_CheckIfQuotaExceded (void) void Brw_AskEditWorksCrs (void) { - extern const char *Hlp_ASSESSMENT_Homework_for_teachers; + extern const char *Hlp_FILES_Homework_for_teachers; extern const char *Txt_Users; extern const char *Txt_View_homework; unsigned NumTotalUsrs; @@ -3098,7 +3098,7 @@ void Brw_AskEditWorksCrs (void) /***** Draw class photos to select users *****/ Lay_StartRoundFrame (NULL,Txt_Users, - NULL,Hlp_ASSESSMENT_Homework_for_teachers); + NULL,Hlp_FILES_Homework_for_teachers); /***** Show form to select the groups *****/ Grp_ShowFormToSelectSeveralGroups (ActReqAsgWrkCrs); @@ -3165,7 +3165,7 @@ static void Brw_ShowFileBrowserNormal (void) static void Brw_ShowFileBrowsersAsgWrkCrs (void) { - extern const char *Hlp_ASSESSMENT_Homework_for_teachers; + extern const char *Hlp_FILES_Homework_for_teachers; extern const char *Txt_Assignments_and_other_works; extern const char *Txt_You_must_select_one_ore_more_users; const char *Ptr; @@ -3182,7 +3182,7 @@ static void Brw_ShowFileBrowsersAsgWrkCrs (void) /***** Header of the table with the list of users *****/ Lay_StartRoundFrameTable ("100%",Txt_Assignments_and_other_works, - Brw_PutIconShowFigure,Hlp_ASSESSMENT_Homework_for_teachers,0); + Brw_PutIconShowFigure,Hlp_FILES_Homework_for_teachers,0); /***** List the assignments and works of the selected users *****/ Ptr = Gbl.Usrs.Select.All; @@ -3478,18 +3478,18 @@ void Brw_ShowAgainFileBrowserOrWorks (void) static void Brw_ShowFileBrowser (void) { - extern const char *Hlp_INSTITUTION_Documents; - extern const char *Hlp_INSTITUTION_Shared; - extern const char *Hlp_CENTRE_Documents; - extern const char *Hlp_CENTRE_Shared; - extern const char *Hlp_DEGREE_Documents; - extern const char *Hlp_DEGREE_Shared; - extern const char *Hlp_COURSE_Documents; - extern const char *Hlp_COURSE_Private; - extern const char *Hlp_COURSE_Shared; - extern const char *Hlp_ASSESSMENT_Homework_for_students; - extern const char *Hlp_ASSESSMENT_Homework_for_teachers; - extern const char *Hlp_ASSESSMENT_Marks; + extern const char *Hlp_FILES_Documents; + extern const char *Hlp_FILES_Shared; + extern const char *Hlp_FILES_Documents; + extern const char *Hlp_FILES_Shared; + extern const char *Hlp_FILES_Documents; + extern const char *Hlp_FILES_Shared; + extern const char *Hlp_FILES_Documents; + extern const char *Hlp_FILES_Private; + extern const char *Hlp_FILES_Shared; + extern const char *Hlp_FILES_Homework_for_students; + extern const char *Hlp_FILES_Homework_for_teachers; + extern const char *Hlp_FILES_Marks; extern const char *Hlp_PROFILE_Briefcase; extern const char *Txt_Documents_area; @@ -3539,32 +3539,32 @@ static void Brw_ShowFileBrowser (void) /***** Set help link of file browser *****/ Brw_HelpOfFileBrowser[Brw_UNKNOWN ] = NULL; // Brw_UNKNOWN - Brw_HelpOfFileBrowser[Brw_SHOW_DOCUM_CRS] = Hlp_COURSE_Documents; // Brw_SHOW_DOCUM_CRS - Brw_HelpOfFileBrowser[Brw_SHOW_MARKS_CRS] = Hlp_ASSESSMENT_Marks; // Brw_SHOW_MARKS_CRS - Brw_HelpOfFileBrowser[Brw_ADMI_DOCUM_CRS] = Hlp_COURSE_Documents; // Brw_ADMI_DOCUM_CRS - Brw_HelpOfFileBrowser[Brw_ADMI_SHARE_CRS] = Hlp_COURSE_Shared; // Brw_ADMI_SHARE_CRS - Brw_HelpOfFileBrowser[Brw_ADMI_SHARE_GRP] = Hlp_COURSE_Shared; // Brw_ADMI_SHARE_GRP - Brw_HelpOfFileBrowser[Brw_ADMI_WORKS_USR] = Hlp_ASSESSMENT_Homework_for_students; // Brw_ADMI_WORKS_USR - Brw_HelpOfFileBrowser[Brw_ADMI_WORKS_CRS] = Hlp_ASSESSMENT_Homework_for_teachers; // Brw_ADMI_WORKS_CRS - Brw_HelpOfFileBrowser[Brw_ADMI_MARKS_CRS] = Hlp_ASSESSMENT_Marks; // Brw_ADMI_MARKS_CRS + Brw_HelpOfFileBrowser[Brw_SHOW_DOCUM_CRS] = Hlp_FILES_Documents; // Brw_SHOW_DOCUM_CRS + Brw_HelpOfFileBrowser[Brw_SHOW_MARKS_CRS] = Hlp_FILES_Marks; // Brw_SHOW_MARKS_CRS + Brw_HelpOfFileBrowser[Brw_ADMI_DOCUM_CRS] = Hlp_FILES_Documents; // Brw_ADMI_DOCUM_CRS + Brw_HelpOfFileBrowser[Brw_ADMI_SHARE_CRS] = Hlp_FILES_Shared; // Brw_ADMI_SHARE_CRS + Brw_HelpOfFileBrowser[Brw_ADMI_SHARE_GRP] = Hlp_FILES_Shared; // Brw_ADMI_SHARE_GRP + Brw_HelpOfFileBrowser[Brw_ADMI_WORKS_USR] = Hlp_FILES_Homework_for_students; // Brw_ADMI_WORKS_USR + Brw_HelpOfFileBrowser[Brw_ADMI_WORKS_CRS] = Hlp_FILES_Homework_for_teachers; // Brw_ADMI_WORKS_CRS + Brw_HelpOfFileBrowser[Brw_ADMI_MARKS_CRS] = Hlp_FILES_Marks; // Brw_ADMI_MARKS_CRS Brw_HelpOfFileBrowser[Brw_ADMI_BRIEF_USR] = Hlp_PROFILE_Briefcase; // Brw_ADMI_BRIEF_USR - Brw_HelpOfFileBrowser[Brw_SHOW_DOCUM_GRP] = Hlp_COURSE_Documents; // Brw_SHOW_DOCUM_GRP - Brw_HelpOfFileBrowser[Brw_ADMI_DOCUM_GRP] = Hlp_COURSE_Documents; // Brw_ADMI_DOCUM_GRP - Brw_HelpOfFileBrowser[Brw_SHOW_MARKS_GRP] = Hlp_ASSESSMENT_Marks; // Brw_SHOW_MARKS_GRP - Brw_HelpOfFileBrowser[Brw_ADMI_MARKS_GRP] = Hlp_ASSESSMENT_Marks; // Brw_ADMI_MARKS_GRP - Brw_HelpOfFileBrowser[Brw_ADMI_ASSIG_USR] = Hlp_ASSESSMENT_Homework_for_students; // Brw_ADMI_ASSIG_USR - Brw_HelpOfFileBrowser[Brw_ADMI_ASSIG_CRS] = Hlp_ASSESSMENT_Homework_for_teachers; // Brw_ADMI_ASSIG_CRS - Brw_HelpOfFileBrowser[Brw_SHOW_DOCUM_DEG] = Hlp_DEGREE_Documents; // Brw_SHOW_DOCUM_DEG - Brw_HelpOfFileBrowser[Brw_ADMI_DOCUM_DEG] = Hlp_DEGREE_Documents; // Brw_ADMI_DOCUM_DEG - Brw_HelpOfFileBrowser[Brw_SHOW_DOCUM_CTR] = Hlp_CENTRE_Documents; // Brw_SHOW_DOCUM_CTR - Brw_HelpOfFileBrowser[Brw_ADMI_DOCUM_CTR] = Hlp_CENTRE_Documents; // Brw_ADMI_DOCUM_CTR - Brw_HelpOfFileBrowser[Brw_SHOW_DOCUM_INS] = Hlp_INSTITUTION_Documents; // Brw_SHOW_DOCUM_INS - Brw_HelpOfFileBrowser[Brw_ADMI_DOCUM_INS] = Hlp_INSTITUTION_Documents; // Brw_ADMI_DOCUM_INS - Brw_HelpOfFileBrowser[Brw_ADMI_SHARE_DEG] = Hlp_DEGREE_Shared; // Brw_ADMI_SHARE_DEG - Brw_HelpOfFileBrowser[Brw_ADMI_SHARE_CTR] = Hlp_CENTRE_Shared; // Brw_ADMI_SHARE_CTR - Brw_HelpOfFileBrowser[Brw_ADMI_SHARE_INS] = Hlp_INSTITUTION_Shared; // Brw_ADMI_SHARE_INS - Brw_HelpOfFileBrowser[Brw_ADMI_TEACH_CRS] = Hlp_COURSE_Private; // Brw_ADMI_TEACH_CRS - Brw_HelpOfFileBrowser[Brw_ADMI_TEACH_GRP] = Hlp_COURSE_Private; // Brw_ADMI_TEACH_GRP + Brw_HelpOfFileBrowser[Brw_SHOW_DOCUM_GRP] = Hlp_FILES_Documents; // Brw_SHOW_DOCUM_GRP + Brw_HelpOfFileBrowser[Brw_ADMI_DOCUM_GRP] = Hlp_FILES_Documents; // Brw_ADMI_DOCUM_GRP + Brw_HelpOfFileBrowser[Brw_SHOW_MARKS_GRP] = Hlp_FILES_Marks; // Brw_SHOW_MARKS_GRP + Brw_HelpOfFileBrowser[Brw_ADMI_MARKS_GRP] = Hlp_FILES_Marks; // Brw_ADMI_MARKS_GRP + Brw_HelpOfFileBrowser[Brw_ADMI_ASSIG_USR] = Hlp_FILES_Homework_for_students; // Brw_ADMI_ASSIG_USR + Brw_HelpOfFileBrowser[Brw_ADMI_ASSIG_CRS] = Hlp_FILES_Homework_for_teachers; // Brw_ADMI_ASSIG_CRS + Brw_HelpOfFileBrowser[Brw_SHOW_DOCUM_DEG] = Hlp_FILES_Documents; // Brw_SHOW_DOCUM_DEG + Brw_HelpOfFileBrowser[Brw_ADMI_DOCUM_DEG] = Hlp_FILES_Documents; // Brw_ADMI_DOCUM_DEG + Brw_HelpOfFileBrowser[Brw_SHOW_DOCUM_CTR] = Hlp_FILES_Documents; // Brw_SHOW_DOCUM_CTR + Brw_HelpOfFileBrowser[Brw_ADMI_DOCUM_CTR] = Hlp_FILES_Documents; // Brw_ADMI_DOCUM_CTR + Brw_HelpOfFileBrowser[Brw_SHOW_DOCUM_INS] = Hlp_FILES_Documents; // Brw_SHOW_DOCUM_INS + Brw_HelpOfFileBrowser[Brw_ADMI_DOCUM_INS] = Hlp_FILES_Documents; // Brw_ADMI_DOCUM_INS + Brw_HelpOfFileBrowser[Brw_ADMI_SHARE_DEG] = Hlp_FILES_Shared; // Brw_ADMI_SHARE_DEG + Brw_HelpOfFileBrowser[Brw_ADMI_SHARE_CTR] = Hlp_FILES_Shared; // Brw_ADMI_SHARE_CTR + Brw_HelpOfFileBrowser[Brw_ADMI_SHARE_INS] = Hlp_FILES_Shared; // Brw_ADMI_SHARE_INS + Brw_HelpOfFileBrowser[Brw_ADMI_TEACH_CRS] = Hlp_FILES_Private; // Brw_ADMI_TEACH_CRS + Brw_HelpOfFileBrowser[Brw_ADMI_TEACH_GRP] = Hlp_FILES_Private; // Brw_ADMI_TEACH_GRP /***** Set contextual icon in frame *****/ Gbl.FileBrowser.IconViewEdit = Brw_ICON_NONE; diff --git a/swad_help.c b/swad_help.c index 04cad9c1d..156a81913 100644 --- a/swad_help.c +++ b/swad_help.c @@ -39,7 +39,9 @@ #define WIKI "https://github.com/acanas/swad-core/wiki/" -const char *Hlp_Search = WIKI "Search"; +const char *Hlp_Search = WIKI "Search"; +//const char *Hlp_Calendar = WIKI "ASSESSMENT.Calendar"; +const char *Hlp_Calendar = WIKI "Calendar"; /***** SYSTEM tab *****/ @@ -81,25 +83,16 @@ const char *Hlp_INSTITUTION_Places_edit = WIKI "INSTITUTION.Places#edit"; const char *Hlp_INSTITUTION_Holidays = WIKI "INSTITUTION.Holidays"; const char *Hlp_INSTITUTION_Holidays_edit = WIKI "INSTITUTION.Holidays#edit"; -const char *Hlp_INSTITUTION_Documents = WIKI "INSTITUTION.Documents"; -const char *Hlp_INSTITUTION_Shared = WIKI "INSTITUTION.Shared"; - /***** CENTRE tab *****/ const char *Hlp_CENTRE_Information = WIKI "CENTRE.Information"; const char *Hlp_CENTRE_Degrees = WIKI "CENTRE.Degrees"; -const char *Hlp_CENTRE_Documents = WIKI "CENTRE.Documents"; -const char *Hlp_CENTRE_Shared = WIKI "CENTRE.Shared"; - /***** DEGREE tab *****/ const char *Hlp_DEGREE_Information = WIKI "DEGREE.Information"; const char *Hlp_DEGREE_Courses = WIKI "DEGREE.Courses"; -const char *Hlp_DEGREE_Documents = WIKI "DEGREE.Documents"; -const char *Hlp_DEGREE_Shared = WIKI "DEGREE.Shared"; - /***** COURSE tab *****/ const char *Hlp_COURSE_Information = WIKI "COURSE.Information"; @@ -112,10 +105,6 @@ const char *Hlp_COURSE_Guide_edit = WIKI "COURSE.Guide#edit"; const char *Hlp_COURSE_Syllabus = WIKI "COURSE.Syllabus"; const char *Hlp_COURSE_Syllabus_edit = WIKI "COURSE.Syllabus#edit"; -const char *Hlp_COURSE_Documents = WIKI "COURSE.Documents"; -const char *Hlp_COURSE_Private = WIKI "COURSE.Private"; -const char *Hlp_COURSE_Shared = WIKI "COURSE.Shared"; - const char *Hlp_COURSE_Timetable = WIKI "COURSE.Timetable"; const char *Hlp_COURSE_Bibliography = WIKI "COURSE.Bibliography"; @@ -136,19 +125,23 @@ const char *Hlp_ASSESSMENT_Assignments = WIKI "ASSESSMENT.Assign const char *Hlp_ASSESSMENT_Assignments_new_assignment = WIKI "ASSESSMENT.Assignments#new-assignment"; const char *Hlp_ASSESSMENT_Assignments_edit_assignment = WIKI "ASSESSMENT.Assignments#edit-assignment"; -const char *Hlp_ASSESSMENT_Homework_for_students = WIKI "ASSESSMENT.Homework#for-students"; -const char *Hlp_ASSESSMENT_Homework_for_teachers = WIKI "ASSESSMENT.Homework#for-teachers"; - const char *Hlp_ASSESSMENT_Tests = WIKI "ASSESSMENT.Tests"; const char *Hlp_ASSESSMENT_Tests_test_results = WIKI "ASSESSMENT.Tests#test-results"; -const char *Hlp_ASSESSMENT_Calendar = WIKI "ASSESSMENT.Calendar"; - const char *Hlp_ASSESSMENT_Announcements = WIKI "ASSESSMENT.Announcements"; const char *Hlp_ASSESSMENT_Announcements_new_announcement = WIKI "ASSESSMENT.Announcements#new-announcement"; const char *Hlp_ASSESSMENT_Announcements_edit_announcement = WIKI "ASSESSMENT.Announcements#edit-announcement"; -const char *Hlp_ASSESSMENT_Marks = WIKI "ASSESSMENT.Marks"; +/***** FILES tab *****/ + +const char *Hlp_FILES_Documents = WIKI "FILES.Documents"; +const char *Hlp_FILES_Private = WIKI "FILES.Private"; +const char *Hlp_FILES_Shared = WIKI "FILES.Shared"; + +const char *Hlp_FILES_Homework_for_students = WIKI "FILES.Homework#for-students"; +const char *Hlp_FILES_Homework_for_teachers = WIKI "FILES.Homework#for-teachers"; + +const char *Hlp_FILES_Marks = WIKI "FILES.Marks"; /***** USERS tab *****/