mirror of https://github.com/acanas/swad-core.git
Version 14.112
This commit is contained in:
parent
e121ce316c
commit
0400f10254
|
@ -1839,37 +1839,40 @@ static void Ctr_PutFormToChangeCtrPhoto (bool PhotoExists)
|
||||||
void Ctr_RequestPhoto (void)
|
void Ctr_RequestPhoto (void)
|
||||||
{
|
{
|
||||||
extern const char *The_ClassFormul[The_NUM_THEMES];
|
extern const char *The_ClassFormul[The_NUM_THEMES];
|
||||||
|
extern const char *Txt_Photo;
|
||||||
extern const char *Txt_You_can_send_a_file_with_an_image_in_jpg_format_and_size_X_Y;
|
extern const char *Txt_You_can_send_a_file_with_an_image_in_jpg_format_and_size_X_Y;
|
||||||
extern const char *Txt_File_with_the_photo;
|
extern const char *Txt_File_with_the_photo;
|
||||||
extern const char *Txt_Upload_photo;
|
extern const char *Txt_Upload_photo;
|
||||||
|
|
||||||
|
/***** Start form to upload photo *****/
|
||||||
|
Act_FormStart (ActRecCtrPho);
|
||||||
|
|
||||||
|
/***** Start frame *****/
|
||||||
|
Lay_StartRoundFrameTable10 (NULL,2,Txt_Photo);
|
||||||
|
fprintf (Gbl.F.Out,"<tr>"
|
||||||
|
"<td style=\"text-align:center;\">");
|
||||||
|
|
||||||
/***** Write help message *****/
|
/***** Write help message *****/
|
||||||
sprintf (Gbl.Message,Txt_You_can_send_a_file_with_an_image_in_jpg_format_and_size_X_Y,
|
sprintf (Gbl.Message,Txt_You_can_send_a_file_with_an_image_in_jpg_format_and_size_X_Y,
|
||||||
Ctr_PHOTO_REAL_WIDTH,
|
Ctr_PHOTO_REAL_WIDTH,
|
||||||
Ctr_PHOTO_REAL_HEIGHT);
|
Ctr_PHOTO_REAL_HEIGHT);
|
||||||
Lay_ShowAlert (Lay_INFO,Gbl.Message);
|
Lay_ShowAlert (Lay_INFO,Gbl.Message);
|
||||||
|
|
||||||
/***** Write a form to send photo *****/
|
/***** Upload photo *****/
|
||||||
Act_FormStart (ActRecCtrPho);
|
fprintf (Gbl.F.Out,"<label class=\"%s\">"
|
||||||
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">"
|
"%s:"
|
||||||
"<tr>"
|
"</label>"
|
||||||
"<td class=\"%s\" style=\"text-align:right;\">"
|
|
||||||
"%s:"
|
|
||||||
"</td>"
|
|
||||||
"<td style=\"text-align:left;\">"
|
|
||||||
"<input type=\"file\" name=\"%s\" size=\"40\" maxlength=\"100\" value=\"\" />"
|
"<input type=\"file\" name=\"%s\" size=\"40\" maxlength=\"100\" value=\"\" />"
|
||||||
"</td>"
|
"</td>"
|
||||||
"</tr>"
|
"</tr>",
|
||||||
"<tr>"
|
|
||||||
"<td colspan=\"2\" style=\"text-align:center;\">",
|
|
||||||
The_ClassFormul[Gbl.Prefs.Theme],
|
The_ClassFormul[Gbl.Prefs.Theme],
|
||||||
Txt_File_with_the_photo,
|
Txt_File_with_the_photo,
|
||||||
Fil_NAME_OF_PARAM_FILENAME_ORG);
|
Fil_NAME_OF_PARAM_FILENAME_ORG);
|
||||||
Lay_PutCreateButton (Txt_Upload_photo);
|
|
||||||
fprintf (Gbl.F.Out,"</td>"
|
|
||||||
"</tr>"
|
|
||||||
"</table>");
|
|
||||||
|
|
||||||
|
/***** Button to create announcement and end frame *****/
|
||||||
|
Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Upload_photo);
|
||||||
|
|
||||||
|
/***** End form *****/
|
||||||
Act_FormEnd ();
|
Act_FormEnd ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -103,12 +103,15 @@
|
||||||
/****************************** Public constants *****************************/
|
/****************************** Public constants *****************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 14.112 (2015/04/11)"
|
#define Log_PLATFORM_VERSION "SWAD 14.112 (2015/04/12)"
|
||||||
|
|
||||||
// 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 sql/swad*.sql | tail -1
|
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
|
||||||
/*
|
/*
|
||||||
Version 14.112: Apr 11, 2015 Optimization in frames with ending buttons. (184568 lines)
|
Version 14.112: Apr 12, 2015 Optimization in frames with ending buttons.
|
||||||
|
Changes in form to upload logo.
|
||||||
|
Changes in form to photo of centre.
|
||||||
|
Changes in edition of course timetable. (184572 lines)
|
||||||
Version 14.111.1: Apr 11, 2015 Message translated. (184745 lines)
|
Version 14.111.1: Apr 11, 2015 Message translated. (184745 lines)
|
||||||
Version 14.111: Apr 11, 2015 Changes in layout of surveys.
|
Version 14.111: Apr 11, 2015 Changes in layout of surveys.
|
||||||
Fixed bugs in surveys.
|
Fixed bugs in surveys.
|
||||||
|
|
34
swad_logo.c
34
swad_logo.c
|
@ -227,6 +227,7 @@ void Log_PutFormToChangeLogo (Sco_Scope_t Scope)
|
||||||
void Log_RequestLogo (Sco_Scope_t Scope)
|
void Log_RequestLogo (Sco_Scope_t Scope)
|
||||||
{
|
{
|
||||||
extern const char *The_ClassFormul[The_NUM_THEMES];
|
extern const char *The_ClassFormul[The_NUM_THEMES];
|
||||||
|
extern const char *Txt_Logo;
|
||||||
extern const char *Txt_You_can_send_a_file_with_an_image_in_png_format_transparent_background_and_size_X_Y;
|
extern const char *Txt_You_can_send_a_file_with_an_image_in_png_format_transparent_background_and_size_X_Y;
|
||||||
extern const char *Txt_File_with_the_logo;
|
extern const char *Txt_File_with_the_logo;
|
||||||
extern const char *Txt_Upload_logo;
|
extern const char *Txt_Upload_logo;
|
||||||
|
@ -275,31 +276,34 @@ void Log_RequestLogo (Sco_Scope_t Scope)
|
||||||
fprintf (Gbl.F.Out,"</div>");
|
fprintf (Gbl.F.Out,"</div>");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/***** Start form to upload logo *****/
|
||||||
|
Act_FormStart (ActionRec);
|
||||||
|
|
||||||
|
/***** Start frame *****/
|
||||||
|
Lay_StartRoundFrameTable10 (NULL,2,Txt_Logo);
|
||||||
|
fprintf (Gbl.F.Out,"<tr>"
|
||||||
|
"<td style=\"text-align:center;\">");
|
||||||
|
|
||||||
/***** Write help message *****/
|
/***** Write help message *****/
|
||||||
sprintf (Gbl.Message,Txt_You_can_send_a_file_with_an_image_in_png_format_transparent_background_and_size_X_Y,
|
sprintf (Gbl.Message,Txt_You_can_send_a_file_with_an_image_in_png_format_transparent_background_and_size_X_Y,
|
||||||
64,64);
|
64,64);
|
||||||
Lay_ShowAlert (Lay_INFO,Gbl.Message);
|
Lay_ShowAlert (Lay_INFO,Gbl.Message);
|
||||||
|
|
||||||
/***** Write a form to send logo *****/
|
/***** Upload logo *****/
|
||||||
Act_FormStart (ActionRec);
|
fprintf (Gbl.F.Out,"<label class=\"%s\">"
|
||||||
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">"
|
"%s:"
|
||||||
"<tr>"
|
"</label>"
|
||||||
"<td class=\"%s\" style=\"text-align:right;\">"
|
|
||||||
"%s:"
|
|
||||||
"</td>"
|
|
||||||
"<td style=\"text-align:left;\">"
|
|
||||||
"<input type=\"file\" name=\"%s\" size=\"40\" maxlength=\"100\" value=\"\" />"
|
"<input type=\"file\" name=\"%s\" size=\"40\" maxlength=\"100\" value=\"\" />"
|
||||||
"</td>"
|
"</td>"
|
||||||
"</tr>"
|
"</tr>",
|
||||||
"<tr>"
|
|
||||||
"<td colspan=\"2\" style=\"text-align:center;\">",
|
|
||||||
The_ClassFormul[Gbl.Prefs.Theme],
|
The_ClassFormul[Gbl.Prefs.Theme],
|
||||||
Txt_File_with_the_logo,
|
Txt_File_with_the_logo,
|
||||||
Fil_NAME_OF_PARAM_FILENAME_ORG);
|
Fil_NAME_OF_PARAM_FILENAME_ORG);
|
||||||
Lay_PutCreateButton (Txt_Upload_logo);
|
|
||||||
fprintf (Gbl.F.Out,"</td>"
|
/***** Button to create announcement and end frame *****/
|
||||||
"</tr>"
|
Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Upload_logo);
|
||||||
"</table>");
|
|
||||||
|
/***** End form *****/
|
||||||
Act_FormEnd ();
|
Act_FormEnd ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -83,6 +83,8 @@ static long Msg_GetParamMsgCod (void);
|
||||||
static void Msg_WriteFormSubjectAndContentMsgToUsrs (const char *Content);
|
static void Msg_WriteFormSubjectAndContentMsgToUsrs (const char *Content);
|
||||||
static void Msg_ShowNumMsgsDeleted (unsigned NumMsgs);
|
static void Msg_ShowNumMsgsDeleted (unsigned NumMsgs);
|
||||||
|
|
||||||
|
static void Msg_MakeFilterFromToSubquery (char *FilterFromToSubquery);
|
||||||
|
|
||||||
static void Msg_ExpandSentMsg (long MsgCod);
|
static void Msg_ExpandSentMsg (long MsgCod);
|
||||||
static void Msg_ExpandReceivedMsg (long MsgCod);
|
static void Msg_ExpandReceivedMsg (long MsgCod);
|
||||||
static void Msg_ContractSentMsg (long MsgCod);
|
static void Msg_ContractSentMsg (long MsgCod);
|
||||||
|
@ -941,7 +943,7 @@ void Msg_GetParamFilterContent (void)
|
||||||
/************************* Make "from"/"to" subquery *************************/
|
/************************* Make "from"/"to" subquery *************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
void Msg_MakeFilterFromToSubquery (char *FilterFromToSubquery)
|
static void Msg_MakeFilterFromToSubquery (char *FilterFromToSubquery)
|
||||||
{
|
{
|
||||||
const char *Ptr;
|
const char *Ptr;
|
||||||
char SearchWord[Usr_MAX_LENGTH_USR_NAME_OR_SURNAME+1];
|
char SearchWord[Usr_MAX_LENGTH_USR_NAME_OR_SURNAME+1];
|
||||||
|
@ -1702,7 +1704,7 @@ static void Msg_ConstructQueryToSelectSentOrReceivedMsgs (char *Query,Msg_TypeOf
|
||||||
PtrQuery = Gbl.Msg.FilterContent[0] ? SubQuery :
|
PtrQuery = Gbl.Msg.FilterContent[0] ? SubQuery :
|
||||||
Query;
|
Query;
|
||||||
|
|
||||||
if (FilterCrsCod >= 0) // If origin course selected
|
if (FilterCrsCod > 0) // If origin course selected
|
||||||
switch (TypeOfMessages)
|
switch (TypeOfMessages)
|
||||||
{
|
{
|
||||||
case Msg_MESSAGES_RECEIVED:
|
case Msg_MESSAGES_RECEIVED:
|
||||||
|
|
|
@ -71,7 +71,6 @@ void Msg_DelAllSntMsgs (void);
|
||||||
void Msg_GetParamMsgsCrsCod (void);
|
void Msg_GetParamMsgsCrsCod (void);
|
||||||
void Msg_GetParamFilterFromTo (void);
|
void Msg_GetParamFilterFromTo (void);
|
||||||
void Msg_GetParamFilterContent (void);
|
void Msg_GetParamFilterContent (void);
|
||||||
void Msg_MakeFilterFromToSubquery (char *FilterFromToSubquery);
|
|
||||||
void Msg_DelSntMsg (void);
|
void Msg_DelSntMsg (void);
|
||||||
void Msg_DelRecMsg (void);
|
void Msg_DelRecMsg (void);
|
||||||
void Msg_ExpSntMsg (void);
|
void Msg_ExpSntMsg (void);
|
||||||
|
|
|
@ -44766,7 +44766,7 @@ const char *Txt_time =
|
||||||
|
|
||||||
const char *Txt_TIMETABLE_TYPES[TT_NUM_TIMETABLE_TYPES] =
|
const char *Txt_TIMETABLE_TYPES[TT_NUM_TIMETABLE_TYPES] =
|
||||||
{
|
{
|
||||||
// TT_COURSE_TIMETABLE
|
// TT_COURSE_TIMETABLE
|
||||||
#if L==0
|
#if L==0
|
||||||
"Horari de classes de l'assignatura"
|
"Horari de classes de l'assignatura"
|
||||||
#elif L==1
|
#elif L==1
|
||||||
|
@ -44787,7 +44787,7 @@ const char *Txt_TIMETABLE_TYPES[TT_NUM_TIMETABLE_TYPES] =
|
||||||
"Horário"
|
"Horário"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// TT_MY_TIMETABLE
|
// TT_MY_TIMETABLE
|
||||||
#if L==0
|
#if L==0
|
||||||
"Horari de les meves assignatures"
|
"Horari de les meves assignatures"
|
||||||
#elif L==1
|
#elif L==1
|
||||||
|
@ -44808,7 +44808,7 @@ const char *Txt_TIMETABLE_TYPES[TT_NUM_TIMETABLE_TYPES] =
|
||||||
"Horário minha disciplinas"
|
"Horário minha disciplinas"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// TT_TUTOR_TIMETABLE
|
// TT_TUTOR_TIMETABLE
|
||||||
#if L==0
|
#if L==0
|
||||||
"Horari de tutories"
|
"Horari de tutories"
|
||||||
#elif L==1
|
#elif L==1
|
||||||
|
|
|
@ -307,6 +307,7 @@ void TT_ShowClassTimeTable (void)
|
||||||
void TT_EditCrsTimeTable (void)
|
void TT_EditCrsTimeTable (void)
|
||||||
{
|
{
|
||||||
extern const char *Txt_Show_timetable;
|
extern const char *Txt_Show_timetable;
|
||||||
|
extern const char *Txt_TIMETABLE_TYPES[TT_NUM_TIMETABLE_TYPES];
|
||||||
|
|
||||||
/***** Link (form) to see my timetable *****/
|
/***** Link (form) to see my timetable *****/
|
||||||
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
|
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
|
||||||
|
@ -314,7 +315,7 @@ void TT_EditCrsTimeTable (void)
|
||||||
fprintf (Gbl.F.Out,"</div>");
|
fprintf (Gbl.F.Out,"</div>");
|
||||||
|
|
||||||
/***** Start of table *****/
|
/***** Start of table *****/
|
||||||
Lay_StartRoundFrameTable10 ("98%",0,NULL);
|
Lay_StartRoundFrameTable10 (NULL,0,Txt_TIMETABLE_TYPES[TT_COURSE_TIMETABLE]);
|
||||||
|
|
||||||
/***** Editable time table *****/
|
/***** Editable time table *****/
|
||||||
fprintf (Gbl.F.Out,"<tr>"
|
fprintf (Gbl.F.Out,"<tr>"
|
||||||
|
|
Loading…
Reference in New Issue