diff --git a/swad_centre.c b/swad_centre.c index 702318d87..186497444 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -506,25 +506,6 @@ static void Ctr_Configuration (bool PrintView) } } -/*****************************************************************************/ -/********* Put a link (form) to view centres of current institution **********/ -/*****************************************************************************/ -// Gbl.CurrentIns.Ins.InsCod must be > 0 -/* -void Ctr_PutLinkToViewCentresOfCurrentIns (void) - { - extern const char *The_ClassFormul[The_NUM_THEMES]; - extern const char *Txt_Centres_of_INSTITUTION_X; - - ***** Put form to view centres of current institution ***** - Act_FormStart (ActSeeCtr); - sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X, - Gbl.CurrentIns.Ins.ShortName); - Act_LinkFormSubmit (Gbl.Title,The_ClassFormul[Gbl.Prefs.Theme]); - Lay_PutSendIcon ("ctr",Gbl.Title,Gbl.Title); - fprintf (Gbl.F.Out,""); - } -*/ /*****************************************************************************/ /*************** Show the centres of the current institution *****************/ /*****************************************************************************/ diff --git a/swad_centre.h b/swad_centre.h index 85bbff2f1..70c6d61b7 100644 --- a/swad_centre.h +++ b/swad_centre.h @@ -90,7 +90,6 @@ void Ctr_SeeCtrWithPendingDegs (void); void Ctr_ShowConfiguration (void); void Ctr_PrintConfiguration (void); -// void Ctr_PutLinkToViewCentresOfCurrentIns (void); void Ctr_ShowCtrsOfCurrentIns (void); void Ctr_EditCentres (void); void Ctr_GetListCentres (long InsCod); diff --git a/swad_changelog.h b/swad_changelog.h index 6ec417e8e..7e3775c5b 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -35,11 +35,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.47.2 (2014/12/29)" +#define Log_PLATFORM_VERSION "SWAD 14.47.3 (2014/12/29)" // 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 | tail -1 /* + Version 14.47.3 :Dic 29, 2014 Removed old code not used. (174499 lines) Version 14.47.2 :Dic 29, 2014 Changes in listing of chat rooms, forums and user's courses. (174677 lines) Version 14.47.1 :Dic 29, 2014 Changes in listing of chat rooms, forums and user's courses. Fixed bugs in CSS. (174619 lines) diff --git a/swad_country.c b/swad_country.c index c908161a5..cfaf081e6 100644 --- a/swad_country.c +++ b/swad_country.c @@ -472,22 +472,6 @@ static void Cty_Configuration (bool PrintView) } } -/*****************************************************************************/ -/******************** Put a link (form) to view countries ********************/ -/*****************************************************************************/ -/* -void Cty_PutLinkToViewCountries (void) - { - extern const char *The_ClassFormul[The_NUM_THEMES]; - extern const char *Txt_Countries; - - ***** Put form to view institutions of current country ***** - Act_FormStart (ActSeeCty); - Act_LinkFormSubmit (Txt_Countries,The_ClassFormul[Gbl.Prefs.Theme]); - Lay_PutSendIcon ("earth",Txt_Countries,Txt_Countries); - fprintf (Gbl.F.Out,""); - } -*/ /*****************************************************************************/ /*************************** List all the countries **************************/ /*****************************************************************************/ diff --git a/swad_country.h b/swad_country.h index 3aa5e96f5..2ddab1f79 100644 --- a/swad_country.h +++ b/swad_country.h @@ -75,7 +75,6 @@ void Cty_SeeCtyWithPendingInss (void); void Cty_ShowConfiguration (void); void Cty_PrintConfiguration (void); -// void Cty_PutLinkToViewCountries (void); void Cty_ListCountries (void); void Cty_ListCountries1 (void); void Cty_ListCountries2 (void); diff --git a/swad_course.c b/swad_course.c index 939194380..a6c9162f2 100644 --- a/swad_course.c +++ b/swad_course.c @@ -75,7 +75,6 @@ static void Crs_PutFormToConfigLogIn (bool IsForm); static void Crs_WriteListMyCoursesToSelectOne (void); -// static void Crs_PutLinkToViewCoursesOfCurrentDeg (void); static void Crs_GetListCoursesInDegree (Crs_WhatCourses_t WhatCourses); static void Crs_ListCourses (void); static void Crs_EditCourses (void); @@ -919,25 +918,6 @@ unsigned Crs_GetNumCrssWithUsrs (Rol_Role_t Role,const char *SubQuery) return (unsigned) DB_QueryCOUNT (Query,"can not get number of courses with users"); } -/*****************************************************************************/ -/************ Put a link (form) to view courses of current degree ************/ -/*****************************************************************************/ -// Gbl.CurrentDeg.Deg.DegCod must be > 0 -/* -static void Crs_PutLinkToViewCoursesOfCurrentDeg (void) - { - extern const char *The_ClassFormul[The_NUM_THEMES]; - extern const char *Txt_Courses_of_DEGREE_X; - - ***** Put form to view courses of current degree ***** - Act_FormStart (ActSeeCrs); - sprintf (Gbl.Title,Txt_Courses_of_DEGREE_X, - Gbl.CurrentDeg.Deg.ShortName); - Act_LinkFormSubmit (Gbl.Title,The_ClassFormul[Gbl.Prefs.Theme]); - Lay_PutSendIcon ("hierarchy",Gbl.Title,Gbl.Title); - fprintf (Gbl.F.Out,""); - } -*/ /*****************************************************************************/ /************************** Show courses of a degree *************************/ /*****************************************************************************/ @@ -2980,18 +2960,6 @@ void Crs_ReqSelectOneOfMyCourses (void) /***** Search / select more courses *****/ fprintf (Gbl.F.Out,"
"); Crs_PutLinkToSearchCourses (); - /* - if (Gbl.CurrentDeg.Deg.DegCod > 0) - Crs_PutLinkToViewCoursesOfCurrentDeg (); - else if (Gbl.CurrentCtr.Ctr.CtrCod > 0) - Deg_PutLinkToViewDegreesOfCurrentCtr (); - else if (Gbl.CurrentIns.Ins.InsCod > 0) - Ctr_PutLinkToViewCentresOfCurrentIns (); - else if (Gbl.CurrentCty.Cty.CtyCod > 0) - Ins_PutLinkToViewInstitutionsOfCurrentCty (); - else - Cty_PutLinkToViewCountries (); - */ fprintf (Gbl.F.Out,"
"); /***** Select one of my courses *****/ diff --git a/swad_degree.c b/swad_degree.c index e787ff5b3..5714fe65a 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -966,25 +966,6 @@ void Deg_ReqEditDegreeTypes (void) Deg_FreeListDegTypes (); } -/*****************************************************************************/ -/*********** Put a link (form) to view degrees of current centre *************/ -/*****************************************************************************/ -// Gbl.CurrentCtr.Ctr.CtrCod must be > 0 -/* -void Deg_PutLinkToViewDegreesOfCurrentCtr (void) - { - extern const char *The_ClassFormul[The_NUM_THEMES]; - extern const char *Txt_Degrees_of_CENTRE_X; - - ***** Put form to view degrees of current centre ***** - Act_FormStart (ActSeeDeg); - sprintf (Gbl.Title,Txt_Degrees_of_CENTRE_X, - Gbl.CurrentCtr.Ctr.ShortName); - Act_LinkFormSubmit (Gbl.Title,The_ClassFormul[Gbl.Prefs.Theme]); - Lay_PutSendIcon ("deg",Gbl.Title,Gbl.Title); - fprintf (Gbl.F.Out,""); - } -*/ /*****************************************************************************/ /************* Show the degrees belonging to the current centre **************/ /*****************************************************************************/ diff --git a/swad_degree.h b/swad_degree.h index e125e966b..e97b7c6fa 100644 --- a/swad_degree.h +++ b/swad_degree.h @@ -114,7 +114,6 @@ void Deg_InitCurrentCourse (void); void Deg_WriteSelectorDegTypes (void); void Deg_SeeDegTypes (void); void Deg_ReqEditDegreeTypes (void); -// void Deg_PutLinkToViewDegreesOfCurrentCtr (void); void Deg_ShowDegsOfCurrentCtr (void); unsigned Deg_ConvStrToYear (const char *StrYear); diff --git a/swad_institution.c b/swad_institution.c index 2dc40471c..066eb5ab9 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -459,25 +459,6 @@ static void Ins_Configuration (bool PrintView) } } -/*****************************************************************************/ -/********* Put a link (form) to view institutions of current country *********/ -/*****************************************************************************/ -// Gbl.CurrentCty.Cty.CtyCod must be > 0 -/* -void Ins_PutLinkToViewInstitutionsOfCurrentCty (void) - { - extern const char *The_ClassFormul[The_NUM_THEMES]; - extern const char *Txt_Institutions_of_COUNTRY_X; - - ***** Put form to view institutions of current country ***** - Act_FormStart (ActSeeIns); - sprintf (Gbl.Title,Txt_Institutions_of_COUNTRY_X, - Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]); - Act_LinkFormSubmit (Gbl.Title,The_ClassFormul[Gbl.Prefs.Theme]); - Lay_PutSendIcon ("ins",Gbl.Title,Gbl.Title); - fprintf (Gbl.F.Out,""); - } -*/ /*****************************************************************************/ /**************** List the institutions of the current country ***************/ /*****************************************************************************/ diff --git a/swad_institution.h b/swad_institution.h index a2efcf511..badd4cf31 100644 --- a/swad_institution.h +++ b/swad_institution.h @@ -97,7 +97,6 @@ void Ins_SeeInsWithPendingCtrs (void); void Ins_ShowConfiguration (void); void Ins_PrintConfiguration (void); -// void Ins_PutLinkToViewInstitutionsOfCurrentCty (void); void Ins_ShowInssOfCurrentCty (void); void Ins_EditInstitutions (void); void Ins_GetListInstitutions (long CtyCod,Ins_GetExtraData_t GetExtraData); diff --git a/swad_text.c b/swad_text.c index 1273bb397..30d892108 100644 --- a/swad_text.c +++ b/swad_text.c @@ -12245,28 +12245,7 @@ const char *Txt_Guided_academic_assignments = #elif L==8 "Atividades académicas guided"; #endif -/* -const char *Txt_X_header_rows_Y_student_rows_and_Z_footer_rows_found = // Warning: it is very important to include three %u in the following sentences -#if L==0 - "Se han detectado %u fila(s) de cabecera, %u fila(s) de estudiantes y %u fila(s) de pie."; // Necessita traduccio -#elif L==1 - "%u header row(s), %u student row(s) and %u footer row(s) found."; // Need Übersetzung -#elif L==2 - "%u header row(s), %u student row(s) and %u footer row(s) found."; -#elif L==3 - "Se han detectado %u fila(s) de cabecera, %u fila(s) de estudiantes y %u fila(s) de pie."; -#elif L==4 - "%u header row(s), %u student row(s) and %u footer row(s) found."; // Besoin de traduction -#elif L==5 - "Se han detectado %u fila(s) de cabecera, %u fila(s) de estudiantes y %u fila(s) de pie."; // Okoteve traducción -#elif L==6 - "Si è/sono individuata/e %u riga/righe di intestazione, %u righe di studenti e %u righe a piè di pagina."; -#elif L==7 - "%u wiersz naglówka(s) %u wierszu studenta i wierszu stopki(s) znaleziono."; -#elif L==8 - "%u header row(s), %u student row(s) and %u footer row(s) found."; // Necessita de tradução -#endif -*/ + const char *Txt_Help_on_the_file_browser = #if L==0 "Ajuda sobre el explorador de fitxers"; @@ -14301,37 +14280,7 @@ const char *Txt_IP = // Internet Protocol address #elif L==8 "IP"; #endif -/* -const char *Txt_X_is_busy_at_the_moment_Try_again_in_a_few_seconds = // Warning: it is very important to include %s in the following sentences -#if L==0 - "%s está ocupado en este momento." - " Vuelva a intentarlo dentro de unos segundos."; // Necessita traduccio -#elif L==1 - "%s ist im Moment beschäftigt." - " Wieder in ein paar Sekunden noch einmal."; -#elif L==2 - "%s is busy at the moment." - " Try again in a few seconds."; -#elif L==3 - "%s está ocupado en este momento." - " Vuelva a intentarlo dentro de unos segundos."; -#elif L==4 - "%s est occupé en ce moment." - " Essayez à nouveau dans quelques secondes."; -#elif L==5 - "%s está ocupado en este momento." - " Vuelva a intentarlo dentro de unos segundos."; // Okoteve traducción -#elif L==6 - "%s è occupato in questo momento." - " Riprova tra pochi secondi."; -#elif L==7 - "%s jest zajety." - " Spróbuj ponownie za kilka sekund."; -#elif L==8 - "%s está ocupado no momento." - " Tente novamente em alguns segundos."; -#endif -*/ + const char *Txt_It_is_mandatory_to_choose_a_group = #if L==0 "Elegir grupo es obligatorio"; // Necessita traduccio @@ -15376,28 +15325,7 @@ const char *Txt_Mandatory_enrollment = // (to a type of group) #elif L==8 "Inscrição obrigatória?"; #endif -/* -const char *Txt_Mandatory_rules_to_compose_messages = -#if L==0 - "Normas obligatorias al redactar mensajes (netiquette)"; // Necessita traduccio -#elif L==1 - "Verbindliche Regeln zum Verfassen von Nachrichten (Netiquette)"; -#elif L==2 - "Mandatory rules to compose messages (netiquette)"; -#elif L==3 - "Normas obligatorias al redactar mensajes (netiquette)"; -#elif L==4 - "R&wgrave;gles impératives de composer des messages (netiquette)"; -#elif L==5 - "Normas obligatorias al redactar mensajes (netiquette)"; // Okoteve traducción -#elif L==6 - "Norme obbligatorie per comporre messaggi (netiquette)"; -#elif L==7 - "Przepisy bezwzglednie obowiazujace do redagowania wiadomosci (netykieta)"; -#elif L==8 - "Regras obrigatórias para compor mensagens (netiquette)"; -#endif -*/ + const char *Txt_Mark_all_notifications_as_read = #if L==0 "Marca totes les notificacions com llegides";