mirror of https://github.com/acanas/swad-core.git
Version 15.200
This commit is contained in:
Antonio Cañas Vargas
parent
f847ba2ab6
commit
0a5eaca762
|
|
@ -135,13 +135,14 @@
|
|||
/****************************** Public constants *****************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
#define Log_PLATFORM_VERSION "SWAD 15.199.8 (2016-04-18)"
|
||||
#define Log_PLATFORM_VERSION "SWAD 15.200 (2016-04-18)"
|
||||
#define CSS_FILE "swad15.198.css"
|
||||
#define JS_FILE "swad15.197.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 15.200: Apr 18, 2016 New layout of search form. (199718 lines)
|
||||
Version 15.199.8: Apr 18, 2016 Changes in title of results of searching documents. (199723 lines)
|
||||
Version 15.199.7: Apr 17, 2016 Changes in title of results of searching users. (199639 lines)
|
||||
Version 15.199.6: Apr 17, 2016 Changes in title of results of searching courses. (199647 lines)
|
||||
|
|
|
|||
|
|
@ -11136,8 +11136,8 @@ unsigned Brw_ListDocsFound (const char *Query,
|
|||
extern const char *Txt_Course;
|
||||
extern const char *Txt_File_zone;
|
||||
extern const char *Txt_Document;
|
||||
extern const char *Txt_document_hidden;
|
||||
extern const char *Txt_DOCUM_hidden;
|
||||
extern const char *Txt_hidden_document;
|
||||
extern const char *Txt_hidden_documents;
|
||||
MYSQL_RES *mysql_res;
|
||||
MYSQL_ROW row;
|
||||
unsigned NumDocs;
|
||||
|
|
@ -11203,9 +11203,9 @@ unsigned Brw_ListDocsFound (const char *Query,
|
|||
"(");
|
||||
NumDocsHidden = NumDocs - NumDocsNotHidden;
|
||||
if (NumDocsHidden == 1)
|
||||
fprintf (Gbl.F.Out,"1 %s",Txt_document_hidden);
|
||||
fprintf (Gbl.F.Out,"1 %s",Txt_hidden_document);
|
||||
else
|
||||
fprintf (Gbl.F.Out,"%u %s",NumDocsHidden,Txt_DOCUM_hidden);
|
||||
fprintf (Gbl.F.Out,"%u %s",NumDocsHidden,Txt_hidden_documents);
|
||||
fprintf (Gbl.F.Out,")"
|
||||
"</th>"
|
||||
"</tr>");
|
||||
|
|
|
|||
|
|
@ -809,7 +809,8 @@ static void Lay_WritePageTopHeading (void)
|
|||
(Gbl.CurrentCty.Cty.CtyCod > 0 ? ActCtySch :
|
||||
ActSysSch)))));
|
||||
Sco_PutParamScope (Sco_SCOPE_SYS);
|
||||
Sch_PutFormToSearch ("search-white64x64.png","head_search_text");
|
||||
Sch_PutInputStringToSearch ("head_search_text");
|
||||
Sch_PutMagnifyingGlassButton ("search-white64x64.png");
|
||||
Act_FormEnd ();
|
||||
fprintf (Gbl.F.Out,"</div>"); // head_row_1_search
|
||||
|
||||
|
|
|
|||
|
|
@ -203,29 +203,30 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
|
|||
{
|
||||
extern const char *The_ClassForm[The_NUM_THEMES];
|
||||
extern const char *Txt_Scope;
|
||||
extern const char *Txt_All;
|
||||
extern const char *Txt_Institutions;
|
||||
extern const char *Txt_Centres;
|
||||
extern const char *Txt_Degrees;
|
||||
extern const char *Txt_Courses;
|
||||
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
|
||||
extern const char *Txt_My_documents;
|
||||
extern const char *Txt_Documents_in_my_courses;
|
||||
extern const char *Txt_Open_documents;
|
||||
extern const char *Txt_SEARCH_X_in_Y;
|
||||
extern const char *Txt_all;
|
||||
extern const char *Txt_institutions;
|
||||
extern const char *Txt_centres;
|
||||
extern const char *Txt_degrees;
|
||||
extern const char *Txt_courses;
|
||||
extern const char *Txt_ROLES_PLURAL_abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
|
||||
extern const char *Txt_my_documents;
|
||||
extern const char *Txt_documents_in_my_courses;
|
||||
extern const char *Txt_open_documents;
|
||||
extern const char *Txt_Search;
|
||||
const char *Titles[Sch_NUM_WHAT_TO_SEARCH] =
|
||||
{
|
||||
Txt_All, // Sch_SEARCH_ALL
|
||||
Txt_Institutions, // Sch_SEARCH_INSTITUTIONS
|
||||
Txt_Centres, // Sch_SEARCH_CENTRES
|
||||
Txt_Degrees, // Sch_SEARCH_DEGREES
|
||||
Txt_Courses, // Sch_SEARCH_COURSES
|
||||
Txt_ROLES_PLURAL_Abc[Rol_TEACHER][Usr_SEX_UNKNOWN], // Sch_SEARCH_TEACHERS
|
||||
Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN], // Sch_SEARCH_STUDENTS
|
||||
Txt_ROLES_PLURAL_Abc[Rol__GUEST_][Usr_SEX_UNKNOWN], // Sch_SEARCH_GUESTS
|
||||
Txt_Open_documents, // Sch_SEARCH_OPEN_DOCUMENTS
|
||||
Txt_Documents_in_my_courses, // Sch_SEARCH_DOCUM_IN_MY_COURSES
|
||||
Txt_My_documents, // Sch_SEARCH_MY_DOCUMENTS
|
||||
Txt_all, // Sch_SEARCH_ALL
|
||||
Txt_institutions, // Sch_SEARCH_INSTITUTIONS
|
||||
Txt_centres, // Sch_SEARCH_CENTRES
|
||||
Txt_degrees, // Sch_SEARCH_DEGREES
|
||||
Txt_courses, // Sch_SEARCH_COURSES
|
||||
Txt_ROLES_PLURAL_abc[Rol_TEACHER][Usr_SEX_UNKNOWN], // Sch_SEARCH_TEACHERS
|
||||
Txt_ROLES_PLURAL_abc[Rol_STUDENT][Usr_SEX_UNKNOWN], // Sch_SEARCH_STUDENTS
|
||||
Txt_ROLES_PLURAL_abc[Rol__GUEST_][Usr_SEX_UNKNOWN], // Sch_SEARCH_GUESTS
|
||||
Txt_open_documents, // Sch_SEARCH_OPEN_DOCUMENTS
|
||||
Txt_documents_in_my_courses, // Sch_SEARCH_DOCUM_IN_MY_COURSES
|
||||
Txt_my_documents, // Sch_SEARCH_MY_DOCUMENTS
|
||||
};
|
||||
Sch_WhatToSearch_t WhatToSearch;
|
||||
|
||||
|
|
@ -249,7 +250,12 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
|
|||
Sco_PutSelectorScope (false);
|
||||
fprintf (Gbl.F.Out,"</div>");
|
||||
|
||||
/***** String to find *****/
|
||||
Sch_PutInputStringToSearch (NULL);
|
||||
|
||||
/***** What to search? *****/
|
||||
fprintf (Gbl.F.Out,"<span class=\"%s\"> %s </span>",
|
||||
The_ClassForm[Gbl.Prefs.Theme],Txt_SEARCH_X_in_Y);
|
||||
fprintf (Gbl.F.Out,"<select name=\"WhatToSearch\" style=\"width:186px;\">");
|
||||
for (WhatToSearch = (Sch_WhatToSearch_t) 0;
|
||||
WhatToSearch < Sch_NUM_WHAT_TO_SEARCH;
|
||||
|
|
@ -265,8 +271,8 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
|
|||
}
|
||||
fprintf (Gbl.F.Out,"</select>");
|
||||
|
||||
/***** String to find *****/
|
||||
Sch_PutFormToSearch ("search64x64.png",NULL);
|
||||
/***** Magnifying glass icon *****/
|
||||
Sch_PutMagnifyingGlassButton ("search64x64.png");
|
||||
|
||||
/***** Send button and end frame *****/
|
||||
Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Search);
|
||||
|
|
@ -301,10 +307,10 @@ static bool Sch_CheckIfIHavePermissionToSearch (Sch_WhatToSearch_t WhatToSearch)
|
|||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/*********** Put form to search courses, teachers, documents... **************/
|
||||
/********************* Put string to search inside form **********************/
|
||||
/*****************************************************************************/
|
||||
|
||||
void Sch_PutFormToSearch (const char *Icon,const char *IdInputText)
|
||||
void Sch_PutInputStringToSearch (const char *IdInputText)
|
||||
{
|
||||
extern const char *Txt_Search;
|
||||
|
||||
|
|
@ -320,6 +326,15 @@ void Sch_PutFormToSearch (const char *Icon,const char *IdInputText)
|
|||
fprintf (Gbl.F.Out," placeholder=\"%s…\"",
|
||||
Txt_Search);
|
||||
fprintf (Gbl.F.Out," style=\"margin:0;\" />");
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/******************* Put magnifying glass button inside form *****************/
|
||||
/*****************************************************************************/
|
||||
|
||||
void Sch_PutMagnifyingGlassButton (const char *Icon)
|
||||
{
|
||||
extern const char *Txt_Search;
|
||||
|
||||
/***** Send button *****/
|
||||
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s\""
|
||||
|
|
|
|||
|
|
@ -63,7 +63,8 @@ void Sch_ReqInsSearch (void);
|
|||
void Sch_ReqCtrSearch (void);
|
||||
void Sch_ReqDegSearch (void);
|
||||
void Sch_ReqCrsSearch (void);
|
||||
void Sch_PutFormToSearch (const char *Icon,const char *IdInputText);
|
||||
void Sch_PutInputStringToSearch (const char *IdInputText);
|
||||
void Sch_PutMagnifyingGlassButton (const char *Icon);
|
||||
void Sch_GetParamWhatToSearch (void);
|
||||
void Sch_GetParamsSearch (void);
|
||||
void Sch_SysSearch (void);
|
||||
|
|
|
|||
187
swad_text.c
187
swad_text.c
|
|
@ -2077,25 +2077,25 @@ const char *Txt_Admin_several_teachers =
|
|||
"Gerenciar vários professores";
|
||||
#endif
|
||||
|
||||
const char *Txt_All =
|
||||
const char *Txt_all =
|
||||
#if L==1
|
||||
"Tot";
|
||||
"tot";
|
||||
#elif L==2
|
||||
"Alle";
|
||||
"alle";
|
||||
#elif L==3
|
||||
"All";
|
||||
"all";
|
||||
#elif L==4
|
||||
"Todo";
|
||||
"todo";
|
||||
#elif L==5
|
||||
"Tout";
|
||||
"tout";
|
||||
#elif L==6
|
||||
"Opakatu";
|
||||
"opakatu";
|
||||
#elif L==7
|
||||
"Tutto";
|
||||
"tutto";
|
||||
#elif L==8
|
||||
"Wszystko";
|
||||
"wszystko";
|
||||
#elif L==9
|
||||
"Tudo";
|
||||
"tudo";
|
||||
#endif
|
||||
|
||||
const char *Txt_all_degrees =
|
||||
|
|
@ -9126,27 +9126,6 @@ const char *Txt_Document =
|
|||
"Documento";
|
||||
#endif
|
||||
|
||||
const char *Txt_document_hidden =
|
||||
#if L==1
|
||||
"document ocult";
|
||||
#elif L==2
|
||||
"Dokument verborgen";
|
||||
#elif L==3
|
||||
"document hidden";
|
||||
#elif L==4
|
||||
"documento oculto";
|
||||
#elif L==5
|
||||
"document caché";
|
||||
#elif L==6
|
||||
"documento oculto"; // Okoteve traducción
|
||||
#elif L==7
|
||||
"documento nascosto";
|
||||
#elif L==8
|
||||
"document hidden"; // Potrzebujesz tlumaczenie
|
||||
#elif L==9
|
||||
"documento oculto";
|
||||
#endif
|
||||
|
||||
const char *Txt_document_in_my_courses =
|
||||
#if L==1
|
||||
"document en les meves assignatures";
|
||||
|
|
@ -9231,27 +9210,6 @@ const char *Txt_documents_from_me =
|
|||
"documentos de mim";
|
||||
#endif
|
||||
|
||||
const char *Txt_Documents_in_my_courses =
|
||||
#if L==1
|
||||
"Documents en les meves assignatures";
|
||||
#elif L==2
|
||||
"Dokumente in meinen Kursen";
|
||||
#elif L==3
|
||||
"Documents in my courses";
|
||||
#elif L==4
|
||||
"Documentos en mis asignaturas";
|
||||
#elif L==5
|
||||
"Documents à mes matières";
|
||||
#elif L==6
|
||||
"Documentos en mis asignaturas"; // Okoteve traducción
|
||||
#elif L==7
|
||||
"Documenti in miei corsi";
|
||||
#elif L==8
|
||||
"Dokumenty w moich kursach";
|
||||
#elif L==9
|
||||
"Documentos em minha disciplinas";
|
||||
#endif
|
||||
|
||||
const char *Txt_documents_in_my_courses =
|
||||
#if L==1
|
||||
"documents en les meves assignatures";
|
||||
|
|
@ -9273,27 +9231,6 @@ const char *Txt_documents_in_my_courses =
|
|||
"documentos em minha disciplinas";
|
||||
#endif
|
||||
|
||||
const char *Txt_DOCUM_hidden =
|
||||
#if L==1
|
||||
"documents ocults";
|
||||
#elif L==2
|
||||
"Dokumente verborgen";
|
||||
#elif L==3
|
||||
"documents hidden";
|
||||
#elif L==4
|
||||
"documentos ocultos";
|
||||
#elif L==5
|
||||
"documents cachés";
|
||||
#elif L==6
|
||||
"documentos ocultos"; // Okoteve traducción
|
||||
#elif L==7
|
||||
"documenti nascosti";
|
||||
#elif L==8
|
||||
"documents hidden"; // Potrzebujesz tlumaczenie
|
||||
#elif L==9
|
||||
"documentos ocultos";
|
||||
#endif
|
||||
|
||||
const char *Txt_Documents_area =
|
||||
#if L==1
|
||||
"Zona de documents";
|
||||
|
|
@ -13572,6 +13509,48 @@ const char *Txt_Hidden_MALE_PLURAL =
|
|||
"Ocultos";
|
||||
#endif
|
||||
|
||||
const char *Txt_hidden_document =
|
||||
#if L==1
|
||||
"document ocult";
|
||||
#elif L==2
|
||||
"Dokument verborgen";
|
||||
#elif L==3
|
||||
"hidden document";
|
||||
#elif L==4
|
||||
"documento oculto";
|
||||
#elif L==5
|
||||
"document caché";
|
||||
#elif L==6
|
||||
"documento oculto"; // Okoteve traducción
|
||||
#elif L==7
|
||||
"documento nascosto";
|
||||
#elif L==8
|
||||
"hidden document"; // Potrzebujesz tlumaczenie
|
||||
#elif L==9
|
||||
"documento oculto";
|
||||
#endif
|
||||
|
||||
const char *Txt_hidden_documents =
|
||||
#if L==1
|
||||
"documents ocults";
|
||||
#elif L==2
|
||||
"Dokumente verborgen";
|
||||
#elif L==3
|
||||
"hidden documents";
|
||||
#elif L==4
|
||||
"documentos ocultos";
|
||||
#elif L==5
|
||||
"documents cachés";
|
||||
#elif L==6
|
||||
"documentos ocultos"; // Okoteve traducción
|
||||
#elif L==7
|
||||
"documenti nascosti";
|
||||
#elif L==8
|
||||
"hidden documents"; // Potrzebujesz tlumaczenie
|
||||
#elif L==9
|
||||
"documentos ocultos";
|
||||
#endif
|
||||
|
||||
const char *Txt_Hidden_survey =
|
||||
#if L==1
|
||||
"Encuesta oculta"; // Necessita traduccio
|
||||
|
|
@ -14453,6 +14432,27 @@ const char *Txt_Imported_questions =
|
|||
"Imported questions"; // Necessita de tradução
|
||||
#endif
|
||||
|
||||
const char *Txt_SEARCH_X_in_Y = // Search string "in" documentos, users, etc.
|
||||
#if L==1
|
||||
"en";
|
||||
#elif L==2
|
||||
"im";
|
||||
#elif L==3
|
||||
"in";
|
||||
#elif L==4
|
||||
"en";
|
||||
#elif L==5
|
||||
"dans";
|
||||
#elif L==6
|
||||
"en"; // Okoteve traducción
|
||||
#elif L==7
|
||||
"in";
|
||||
#elif L==8
|
||||
"w";
|
||||
#elif L==9
|
||||
"em";
|
||||
#endif
|
||||
|
||||
const char *Txt_In_a_type_of_group_with_single_enrollment_students_can_not_be_registered_in_more_than_one_group =
|
||||
#if L==1
|
||||
"En un tipo de grupo de adscripción única"
|
||||
|
|
@ -22693,25 +22693,25 @@ const char *Txt_My_courses =
|
|||
"As minha disciplinas";
|
||||
#endif
|
||||
|
||||
const char *Txt_My_documents =
|
||||
const char *Txt_my_documents =
|
||||
#if L==1
|
||||
"Els meus documents";
|
||||
"els meus documents";
|
||||
#elif L==2
|
||||
"Meine Dokumente";
|
||||
"meine Dokumente";
|
||||
#elif L==3
|
||||
"My documents";
|
||||
"my documents";
|
||||
#elif L==4
|
||||
"Mis documentos";
|
||||
"mis documentos";
|
||||
#elif L==5
|
||||
"Mes documents";
|
||||
"mes documents";
|
||||
#elif L==6
|
||||
"Mis documentos"; // Okoteve traducción
|
||||
"mis documentos"; // Okoteve traducción
|
||||
#elif L==7
|
||||
"I miei documenti";
|
||||
"i miei documenti";
|
||||
#elif L==8
|
||||
"Moje dokumenty";
|
||||
"moje dokumenty";
|
||||
#elif L==9
|
||||
"Meus documentos";
|
||||
"meus documentos";
|
||||
#endif
|
||||
|
||||
const char *Txt_My_groups =
|
||||
|
|
@ -26806,27 +26806,6 @@ const char *Txt_open_document =
|
|||
"documento aberto";
|
||||
#endif
|
||||
|
||||
const char *Txt_Open_documents =
|
||||
#if L==1
|
||||
"Documents oberts";
|
||||
#elif L==2
|
||||
"Geöffnete Dokumente";
|
||||
#elif L==3
|
||||
"Open documents";
|
||||
#elif L==4
|
||||
"Documentos abiertos";
|
||||
#elif L==5
|
||||
"Documents ouverts";
|
||||
#elif L==6
|
||||
"Documentos abiertos"; // Okoteve traducción
|
||||
#elif L==7
|
||||
"Documenti aperti";
|
||||
#elif L==8
|
||||
"Otwarte dokumenty";
|
||||
#elif L==9
|
||||
"Documentos abertos";
|
||||
#endif
|
||||
|
||||
const char *Txt_open_documents =
|
||||
#if L==1
|
||||
"documents oberts";
|
||||
|
|
|
|||
Loading…
Reference in New Issue