Version 14.70.3

This commit is contained in:
Antonio Cañas Vargas 2015-01-28 01:14:14 +01:00
parent 704f2e775d
commit f5507746c9
14 changed files with 84 additions and 46 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 424 B

After

Width:  |  Height:  |  Size: 402 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 159 B

After

Width:  |  Height:  |  Size: 166 B

View File

@ -2913,7 +2913,7 @@ static void Att_GetListSelectedAttCods (char **StrAttCodsSelected)
static void Att_PutFormToPrintListStds (bool ShowDetails,char *StrAttCodsSelected) static void Att_PutFormToPrintListStds (bool ShowDetails,char *StrAttCodsSelected)
{ {
extern const char *The_ClassFormul[The_NUM_THEMES]; extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Print_view; extern const char *Txt_Print;
/***** Link to print view *****/ /***** Link to print view *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">"); fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
@ -2924,8 +2924,8 @@ static void Att_PutFormToPrintListStds (bool ShowDetails,char *StrAttCodsSelecte
Usr_PutHiddenParUsrCodAll (ActPrnLstAttStd,Gbl.Usrs.Select.All); Usr_PutHiddenParUsrCodAll (ActPrnLstAttStd,Gbl.Usrs.Select.All);
if (StrAttCodsSelected[0]) if (StrAttCodsSelected[0])
Par_PutHiddenParamString ("AttCods",StrAttCodsSelected); Par_PutHiddenParamString ("AttCods",StrAttCodsSelected);
Act_LinkFormSubmit (Txt_Print_view,The_ClassFormul[Gbl.Prefs.Theme]); Act_LinkFormSubmit (Txt_Print,The_ClassFormul[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("print",Txt_Print_view,Txt_Print_view); Lay_PutSendIcon ("print",Txt_Print,Txt_Print);
fprintf (Gbl.F.Out,"</form>" fprintf (Gbl.F.Out,"</form>"
"</div>"); "</div>");
} }

View File

@ -677,6 +677,9 @@ void Ctr_EditCentres (void)
extern const char *Txt_There_is_no_list_of_institutions; extern const char *Txt_There_is_no_list_of_institutions;
extern const char *Txt_You_must_create_at_least_one_institution_before_creating_centres; extern const char *Txt_You_must_create_at_least_one_institution_before_creating_centres;
/***** Put link (form) to view centres *****/
Lay_PutFormToView (ActSeeCtr);
/***** Get list of institutions of the current country *****/ /***** Get list of institutions of the current country *****/
Ins_GetListInstitutions (Gbl.CurrentCty.Cty.CtyCod,Ins_GET_MINIMAL_DATA); Ins_GetListInstitutions (Gbl.CurrentCty.Cty.CtyCod,Ins_GET_MINIMAL_DATA);
if (Gbl.Inss.Num) if (Gbl.Inss.Num)

View File

@ -39,11 +39,13 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.70.2 (2015/01/27)" #define Log_PLATFORM_VERSION "SWAD 14.70.3 (2015/01/28)"
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h | tail -1
/* /*
Version 14.70.3: Jan 28, 2015 Some button messages changed.
Buttons to view when editing. (176217 lines)
Version 14.70.2: Jan 27, 2015 Changed permissions in documents zones of institution, centre and degree. (176188 lines) Version 14.70.2: Jan 27, 2015 Changed permissions in documents zones of institution, centre and degree. (176188 lines)
Version 14.70.1: Jan 27, 2015 Fixed bug when removing a user from a course. (176187 lines) Version 14.70.1: Jan 27, 2015 Fixed bug when removing a user from a course. (176187 lines)
Version 14.70: Jan 26, 2015 Fixed bugs in statistics about sizes of file browsers. Version 14.70: Jan 26, 2015 Fixed bugs in statistics about sizes of file browsers.

View File

@ -819,6 +819,9 @@ void Cty_EditCountries (void)
{ {
extern const char *Txt_No_countries_have_been_created; extern const char *Txt_No_countries_have_been_created;
/***** Put link (form) to view countries *****/
Lay_PutFormToView (ActSeeCty);
/***** Get list of countries *****/ /***** Get list of countries *****/
Gbl.Ctys.SelectedOrderType = Cty_ORDER_BY_COUNTRY; Gbl.Ctys.SelectedOrderType = Cty_ORDER_BY_COUNTRY;
Cty_GetListCountries (Cty_GET_EXTRA_DATA); Cty_GetListCountries (Cty_GET_EXTRA_DATA);

View File

@ -1180,6 +1180,9 @@ static void Crs_EditCourses (void)
{ {
extern const char *Txt_No_courses_have_been_created_in_this_degree; extern const char *Txt_No_courses_have_been_created_in_this_degree;
/***** Put link (form) to view courses *****/
Lay_PutFormToView (ActSeeCrs);
/***** Help message *****/ /***** Help message *****/
if (!Gbl.CurrentDeg.Deg.NumCourses) // There aren't courses if (!Gbl.CurrentDeg.Deg.NumCourses) // There aren't courses
Lay_ShowAlert (Lay_INFO,Txt_No_courses_have_been_created_in_this_degree); Lay_ShowAlert (Lay_INFO,Txt_No_courses_have_been_created_in_this_degree);

View File

@ -1021,6 +1021,9 @@ static void Deg_EditDegreeTypes (void)
{ {
extern const char *Txt_There_are_no_types_of_degree; extern const char *Txt_There_are_no_types_of_degree;
/***** Put link (form) to view degree types *****/
Lay_PutFormToView (ActSeeDegTyp);
/***** Help message *****/ /***** Help message *****/
if (!Gbl.Degs.DegTypes.Num) if (!Gbl.Degs.DegTypes.Num)
Lay_ShowAlert (Lay_INFO,Txt_There_are_no_types_of_degree); Lay_ShowAlert (Lay_INFO,Txt_There_are_no_types_of_degree);
@ -1734,7 +1737,7 @@ static void Deg_PutFormToCreateDegType (void)
"<th class=\"TIT_TBL\" style=\"text-align:center;\">" "<th class=\"TIT_TBL\" style=\"text-align:center;\">"
"%s" "%s"
"</th>" "</th>"
"<th lass=\"TIT_TBL\" style=\"text-align:center;\">" "<th class=\"TIT_TBL\" style=\"text-align:center;\">"
"%s" "%s"
"</th>" "</th>"
"</tr>", "</tr>",
@ -2236,6 +2239,9 @@ void Deg_EditDegrees (void)
extern const char *Txt_There_is_no_list_of_types_of_degree; extern const char *Txt_There_is_no_list_of_types_of_degree;
extern const char *Txt_You_must_create_at_least_one_type_of_degree_before_creating_degrees; extern const char *Txt_You_must_create_at_least_one_type_of_degree_before_creating_degrees;
/***** Put link (form) to view degrees *****/
Lay_PutFormToView (ActSeeDeg);
/***** Get list of degrees in the current centre *****/ /***** Get list of degrees in the current centre *****/
Deg_GetListDegsOfCurrentCtr (); Deg_GetListDegsOfCurrentCtr ();

View File

@ -4028,7 +4028,7 @@ static void Brw_PutFormToShowOrAdmin (Brw_ShowOrAdmin_t ShowOrAdmin,
Act_Action_t Action) Act_Action_t Action)
{ {
extern const char *The_ClassFormul[The_NUM_THEMES]; extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_View_as_a_student; extern const char *Txt_View;
extern const char *Txt_Edit; extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">"); fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
@ -4040,10 +4040,10 @@ static void Brw_PutFormToShowOrAdmin (Brw_ShowOrAdmin_t ShowOrAdmin,
switch (ShowOrAdmin) switch (ShowOrAdmin)
{ {
case Brw_SHOW: case Brw_SHOW:
Act_LinkFormSubmit (Txt_View_as_a_student,The_ClassFormul[Gbl.Prefs.Theme]); Act_LinkFormSubmit (Txt_View,The_ClassFormul[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("visible_on", Lay_PutSendIcon ("visible_on",
Txt_View_as_a_student, Txt_View,
Txt_View_as_a_student); Txt_View);
break; break;
case Brw_ADMIN: case Brw_ADMIN:
Act_LinkFormSubmit (Txt_Edit,The_ClassFormul[Gbl.Prefs.Theme]); Act_LinkFormSubmit (Txt_Edit,The_ClassFormul[Gbl.Prefs.Theme]);

View File

@ -685,6 +685,9 @@ void Ins_EditInstitutions (void)
{ {
extern const char *Txt_No_institutions_have_been_created_in_this_country; extern const char *Txt_No_institutions_have_been_created_in_this_country;
/***** Put link (form) to view institutions *****/
Lay_PutFormToView (ActSeeIns);
/***** Get list of institutions *****/ /***** Get list of institutions *****/
Ins_GetListInstitutions (Gbl.CurrentCty.Cty.CtyCod,Ins_GET_EXTRA_DATA); Ins_GetListInstitutions (Gbl.CurrentCty.Cty.CtyCod,Ins_GET_EXTRA_DATA);

View File

@ -908,6 +908,23 @@ static void Lay_ShowRightColumn (void)
"</table>"); "</table>");
} }
/*****************************************************************************/
/************************* Put a link (form) to view *************************/
/*****************************************************************************/
void Lay_PutFormToView (Act_Action_t Action)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_View;
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">");
Act_FormStart (Action);
Act_LinkFormSubmit (Txt_View,The_ClassFormul[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("visible_on",Txt_View,Txt_View);
fprintf (Gbl.F.Out,"</form>"
"</div>");
}
/*****************************************************************************/ /*****************************************************************************/
/************************* Put a link (form) to edit *************************/ /************************* Put a link (form) to edit *************************/
/*****************************************************************************/ /*****************************************************************************/
@ -1438,10 +1455,10 @@ void Lay_PutLinkToPrintView1 (Act_Action_t NextAction)
void Lay_PutLinkToPrintView2 (void) void Lay_PutLinkToPrintView2 (void)
{ {
extern const char *The_ClassFormul[The_NUM_THEMES]; extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Print_view; extern const char *Txt_Print;
Act_LinkFormSubmit (Txt_Print_view,The_ClassFormul[Gbl.Prefs.Theme]); Act_LinkFormSubmit (Txt_Print,The_ClassFormul[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("print",Txt_Print_view,Txt_Print_view); Lay_PutSendIcon ("print",Txt_Print,Txt_Print);
fprintf (Gbl.F.Out,"</form>"); fprintf (Gbl.F.Out,"</form>");
} }

View File

@ -86,6 +86,7 @@ typedef enum
void Lay_WriteStartOfPage (void); void Lay_WriteStartOfPage (void);
void Lay_WriteTitle (const char *Title); void Lay_WriteTitle (const char *Title);
void Lay_PutFormToView (Act_Action_t Action);
void Lay_PutFormToEdit (Act_Action_t Action); void Lay_PutFormToEdit (Act_Action_t Action);
void Lay_PutSendIcon (const char *Icon,const char *Alt,const char *Text); void Lay_PutSendIcon (const char *Icon,const char *Alt,const char *Text);
void Lay_PutSendButton (const char *TextSendButton); void Lay_PutSendButton (const char *TextSendButton);

View File

@ -1280,12 +1280,12 @@ void Rec_ListRecordsTchsCrs (void)
void Rec_ShowLinkToPrintPreviewOfRecords (void) void Rec_ShowLinkToPrintPreviewOfRecords (void)
{ {
extern const char *The_ClassFormul[The_NUM_THEMES]; extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Print_view; extern const char *Txt_Print;
extern const char *Txt_record_cards_per_page; extern const char *Txt_record_cards_per_page;
unsigned i; unsigned i;
Act_LinkFormSubmit (Txt_Print_view,The_ClassFormul[Gbl.Prefs.Theme]); Act_LinkFormSubmit (Txt_Print,The_ClassFormul[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("print",Txt_Print_view,Txt_Print_view); Lay_PutSendIcon ("print",Txt_Print,Txt_Print);
fprintf (Gbl.F.Out,"<span class=\"%s\"> (</span>" fprintf (Gbl.F.Out,"<span class=\"%s\"> (</span>"
"<select name=\"RecsPerPag\">", "<select name=\"RecsPerPag\">",
The_ClassFormul[Gbl.Prefs.Theme]); The_ClassFormul[Gbl.Prefs.Theme]);

View File

@ -26411,25 +26411,25 @@ const char *Txt_Presents =
"Presentes"; "Presentes";
#endif #endif
const char *Txt_Print_view = const char *Txt_Print =
#if L==0 #if L==0
"Vista d'impressi&oacute;"; "Imprimir";
#elif L==1 #elif L==1
"Druckansicht"; "Ausdrucken";
#elif L==2 #elif L==2
"Print view"; "Print";
#elif L==3 #elif L==3
"Vista de impresi&oacute;n"; "Imprimir";
#elif L==4 #elif L==4
"Vue d'impression"; "Imprimer";
#elif L==5 #elif L==5
"Vista de impresi&oacute;n"; // Okoteve traducción "Imprimir"; // Okoteve traducción
#elif L==6 #elif L==6
"Anteprima di stampa"; "Stampare";
#elif L==7 #elif L==7
"Widok do druku"; "Wydrukuj";
#elif L==8 #elif L==8
"Impress&atilde;o vista"; "Imprimir";
#endif #endif
const char *Txt_Private_available_to_certain_users_identified = const char *Txt_Private_available_to_certain_users_identified =
@ -46153,6 +46153,27 @@ const char *Txt_Vacants =
"Desocupados"; "Desocupados";
#endif #endif
const char *Txt_View =
#if L==0
"Veure";
#elif L==1
"Anzeigen";
#elif L==2
"View";
#elif L==3
"Ver";
#elif L==4
"Voir";
#elif L==5
"Ver"; // Okoteve traducción
#elif L==6
"Vedi";
#elif L==7
"Wy&sacute;wietl";
#elif L==8
"Ver";
#endif
const char *Txt_View_all_recipients = const char *Txt_View_all_recipients =
#if L==0 #if L==0
"Ver todos los destinatarios"; // Necessita traduccio "Ver todos los destinatarios"; // Necessita traduccio
@ -46174,27 +46195,6 @@ const char *Txt_View_all_recipients =
"Ver todos os estinat&aacute;rios"; "Ver todos os estinat&aacute;rios";
#endif #endif
const char *Txt_View_as_a_student =
#if L==0
"Veure com estudiant";
#elif L==1
"Anzeigen als Student";
#elif L==2
"View as a student";
#elif L==3
"Ver como estudiante";
#elif L==4
"Voir comme &eacute;tudiant/e";
#elif L==5
"Ver como estudiante"; // Okoteve traducción
#elif L==6
"Vedi come studente";
#elif L==7
"Wy&sacute;wietl jako student";
#elif L==8
"Ver como estudante";
#endif
const char *Txt_View_data_of_FILE_OR_LINK_X = // Warning: it is very important to include %s in the following sentences const char *Txt_View_data_of_FILE_OR_LINK_X = // Warning: it is very important to include %s in the following sentences
#if L==0 #if L==0
"Veure dades de %s"; "Veure dades de %s";