"
+ "| ");
+
/***** Write help message *****/
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_HEIGHT);
Lay_ShowAlert (Lay_INFO,Gbl.Message);
- /***** Write a form to send photo *****/
- Act_FormStart (ActRecCtrPho);
- fprintf (Gbl.F.Out,"");
+ /***** Button to create announcement and end frame *****/
+ Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Upload_photo);
+
+ /***** End form *****/
Act_FormEnd ();
}
diff --git a/swad_changelog.h b/swad_changelog.h
index 16d29bd8b..8dc66d6cf 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -103,12 +103,15 @@
/****************************** 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:
// 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: Apr 11, 2015 Changes in layout of surveys.
Fixed bugs in surveys.
diff --git a/swad_logo.c b/swad_logo.c
index 0a6d90e51..65ed45e9e 100644
--- a/swad_logo.c
+++ b/swad_logo.c
@@ -227,6 +227,7 @@ void Log_PutFormToChangeLogo (Sco_Scope_t Scope)
void Log_RequestLogo (Sco_Scope_t Scope)
{
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_File_with_the_logo;
extern const char *Txt_Upload_logo;
@@ -275,31 +276,34 @@ void Log_RequestLogo (Sco_Scope_t Scope)
fprintf (Gbl.F.Out,"");
}
+ /***** Start form to upload logo *****/
+ Act_FormStart (ActionRec);
+
+ /***** Start frame *****/
+ Lay_StartRoundFrameTable10 (NULL,2,Txt_Logo);
+ fprintf (Gbl.F.Out," |
"
+ "| ");
+
/***** Write help message *****/
sprintf (Gbl.Message,Txt_You_can_send_a_file_with_an_image_in_png_format_transparent_background_and_size_X_Y,
64,64);
Lay_ShowAlert (Lay_INFO,Gbl.Message);
- /***** Write a form to send logo *****/
- Act_FormStart (ActionRec);
- fprintf (Gbl.F.Out,"");
+
+ /***** Button to create announcement and end frame *****/
+ Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Upload_logo);
+
+ /***** End form *****/
Act_FormEnd ();
}
diff --git a/swad_message.c b/swad_message.c
index 2cb225ae0..7a46780f5 100644
--- a/swad_message.c
+++ b/swad_message.c
@@ -83,6 +83,8 @@ static long Msg_GetParamMsgCod (void);
static void Msg_WriteFormSubjectAndContentMsgToUsrs (const char *Content);
static void Msg_ShowNumMsgsDeleted (unsigned NumMsgs);
+static void Msg_MakeFilterFromToSubquery (char *FilterFromToSubquery);
+
static void Msg_ExpandSentMsg (long MsgCod);
static void Msg_ExpandReceivedMsg (long MsgCod);
static void Msg_ContractSentMsg (long MsgCod);
@@ -941,7 +943,7 @@ void Msg_GetParamFilterContent (void)
/************************* Make "from"/"to" subquery *************************/
/*****************************************************************************/
-void Msg_MakeFilterFromToSubquery (char *FilterFromToSubquery)
+static void Msg_MakeFilterFromToSubquery (char *FilterFromToSubquery)
{
const char *Ptr;
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 :
Query;
- if (FilterCrsCod >= 0) // If origin course selected
+ if (FilterCrsCod > 0) // If origin course selected
switch (TypeOfMessages)
{
case Msg_MESSAGES_RECEIVED:
diff --git a/swad_message.h b/swad_message.h
index c08c053b0..dfe172de8 100644
--- a/swad_message.h
+++ b/swad_message.h
@@ -71,7 +71,6 @@ void Msg_DelAllSntMsgs (void);
void Msg_GetParamMsgsCrsCod (void);
void Msg_GetParamFilterFromTo (void);
void Msg_GetParamFilterContent (void);
-void Msg_MakeFilterFromToSubquery (char *FilterFromToSubquery);
void Msg_DelSntMsg (void);
void Msg_DelRecMsg (void);
void Msg_ExpSntMsg (void);
diff --git a/swad_text.c b/swad_text.c
index cb5038647..bc5258856 100644
--- a/swad_text.c
+++ b/swad_text.c
@@ -44766,7 +44766,7 @@ const char *Txt_time =
const char *Txt_TIMETABLE_TYPES[TT_NUM_TIMETABLE_TYPES] =
{
- // TT_COURSE_TIMETABLE
+ // TT_COURSE_TIMETABLE
#if L==0
"Horari de classes de l'assignatura"
#elif L==1
@@ -44787,7 +44787,7 @@ const char *Txt_TIMETABLE_TYPES[TT_NUM_TIMETABLE_TYPES] =
"Horário"
#endif
,
- // TT_MY_TIMETABLE
+ // TT_MY_TIMETABLE
#if L==0
"Horari de les meves assignatures"
#elif L==1
@@ -44808,7 +44808,7 @@ const char *Txt_TIMETABLE_TYPES[TT_NUM_TIMETABLE_TYPES] =
"Horário minha disciplinas"
#endif
,
- // TT_TUTOR_TIMETABLE
+ // TT_TUTOR_TIMETABLE
#if L==0
"Horari de tutories"
#elif L==1
diff --git a/swad_timetable.c b/swad_timetable.c
index 3c85452ea..73cd3cca9 100644
--- a/swad_timetable.c
+++ b/swad_timetable.c
@@ -307,6 +307,7 @@ void TT_ShowClassTimeTable (void)
void TT_EditCrsTimeTable (void)
{
extern const char *Txt_Show_timetable;
+ extern const char *Txt_TIMETABLE_TYPES[TT_NUM_TIMETABLE_TYPES];
/***** Link (form) to see my timetable *****/
fprintf (Gbl.F.Out,"");
/***** Start of table *****/
- Lay_StartRoundFrameTable10 ("98%",0,NULL);
+ Lay_StartRoundFrameTable10 (NULL,0,Txt_TIMETABLE_TYPES[TT_COURSE_TIMETABLE]);
/***** Editable time table *****/
fprintf (Gbl.F.Out," |