mirror of
https://github.com/acanas/swad-core.git
synced 2024-06-05 16:25:29 +02:00
Version 14.44.3
This commit is contained in:
parent
b8fb5a28fd
commit
b19167ba45
|
@ -156,7 +156,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
|
|||
|
||||
.NOTICE_CONTAINER
|
||||
{
|
||||
margin:8px 0 8px 0;
|
||||
margin:8px auto;
|
||||
padding:8px;
|
||||
background-color:#FAF098;
|
||||
background-image:linear-gradient(#EED86C 0%, #FEED95 15%, #FAF098 100%);
|
||||
|
|
|
@ -107,7 +107,7 @@ p {margin:0;}
|
|||
|
||||
.NOTICE_CONTAINER
|
||||
{
|
||||
margin:8px 0 8px 0;
|
||||
margin:8px auto;
|
||||
padding:8px;
|
||||
background-color:#FAF098;
|
||||
background-image:linear-gradient(#EED86C 0%, #FEED95 15%, #FAF098 100%);
|
||||
|
|
|
@ -320,12 +320,10 @@ void Ann_ShowFormAnnouncement (void)
|
|||
extern const char *Txt_Users;
|
||||
extern const char *Txt_Create_announcement;
|
||||
|
||||
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
|
||||
|
||||
Act_FormStart (ActRcvAnn);
|
||||
|
||||
/***** Message subject and body *****/
|
||||
fprintf (Gbl.F.Out,"<table>"
|
||||
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">"
|
||||
"<tr>"
|
||||
"<td></td>"
|
||||
"<td class=\"%s\" style=\"text-align:left;\">%s</td>"
|
||||
|
@ -371,8 +369,7 @@ void Ann_ShowFormAnnouncement (void)
|
|||
"</table>");
|
||||
|
||||
Lay_PutSendButton (Txt_Create_announcement);
|
||||
fprintf (Gbl.F.Out,"</form>"
|
||||
"</div>");
|
||||
fprintf (Gbl.F.Out,"</form>");
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -182,7 +182,8 @@ static void Att_ShowAllAttEvents (void)
|
|||
Order <= Att_ORDER_BY_END_DATE;
|
||||
Order++)
|
||||
{
|
||||
fprintf (Gbl.F.Out,"<th class=\"TIT_TBL\" style=\"text-align:left;\">");
|
||||
fprintf (Gbl.F.Out,"<th class=\"TIT_TBL\""
|
||||
" style=\"text-align:left;\">");
|
||||
Act_FormStart (ActSeeAtt);
|
||||
Grp_PutParamWhichGrps ();
|
||||
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
|
||||
|
|
|
@ -35,11 +35,12 @@
|
|||
/****************************** Public constants *****************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
#define Log_PLATFORM_VERSION "SWAD 14.44.2 (2014/12/27)"
|
||||
#define Log_PLATFORM_VERSION "SWAD 14.44.3 (2014/12/27)"
|
||||
|
||||
// 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.44.3 :Dic 27, 2014 Fixed bugs in layout. (174246 lines)
|
||||
Version 14.44.2 :Dic 27, 2014 Fixed bugs in layout columns. (174262 lines)
|
||||
Version 14.44.1 :Dic 27, 2014 Changes in layout columns. (174251 lines)
|
||||
Version 14.44 :Dic 27, 2014 Removed vendor-specific properties in CSS. (174230 lines)
|
||||
|
|
|
@ -272,7 +272,7 @@
|
|||
#define Cfg_HOW_TO_COLLABORATE_URL "http://swad.ugr.es/wiki/index.php/Colaborar"
|
||||
|
||||
/* Link to nettiquete rules for messages */
|
||||
#define Cfg_NETTIQUETE "http://swad.ugr.es/wiki/index.php/Netiquette"
|
||||
// #define Cfg_NETTIQUETE "http://swad.ugr.es/wiki/index.php/Netiquette"
|
||||
|
||||
/* Link to download Java: keep updated! */
|
||||
#define Cfg_JAVA_URL "http://www.java.com/es/download/"
|
||||
|
|
|
@ -548,9 +548,7 @@ void Cty_ListCountries2 (void)
|
|||
Order <= Cty_ORDER_BY_NUM_USRS;
|
||||
Order++)
|
||||
{
|
||||
fprintf (Gbl.F.Out,"<th class=\"TIT_TBL\" style=\"text-align:%s;\">",
|
||||
Order == Cty_ORDER_BY_COUNTRY ? "left" :
|
||||
"right");
|
||||
fprintf (Gbl.F.Out,"<th class=\"TIT_TBL\" style=\"text-align:left;\">");
|
||||
Act_FormStart (ActSeeCty);
|
||||
Par_PutHiddenParamUnsigned ("Order",(unsigned) Order);
|
||||
Act_LinkFormSubmit (Txt_COUNTRIES_HELP_ORDER[Order],"TIT_TBL");
|
||||
|
|
|
@ -487,8 +487,8 @@ void Deg_WriteMenuAllCourses (Act_Action_t NextActionCty,
|
|||
extern const char *Txt_Degree;
|
||||
|
||||
/***** Start of table *****/
|
||||
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">"
|
||||
"<table class=\"CELLS_PAD_2\">");
|
||||
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\""
|
||||
" style=\"margin:0 auto 10px auto;\">");
|
||||
|
||||
/***** Write a 1st selector
|
||||
with all the countries *****/
|
||||
|
@ -551,8 +551,7 @@ void Deg_WriteMenuAllCourses (Act_Action_t NextActionCty,
|
|||
}
|
||||
|
||||
/***** End of table *****/
|
||||
fprintf (Gbl.F.Out,"</table>"
|
||||
"</div>");
|
||||
fprintf (Gbl.F.Out,"</table>");
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -107,7 +107,7 @@ void Dpt_SeeDepts (void)
|
|||
Order++)
|
||||
{
|
||||
fprintf (Gbl.F.Out,"<td class=\"TIT_TBL\""
|
||||
" style=\"text-align:center;\">");
|
||||
" style=\"text-align:left;\">");
|
||||
Act_FormStart (ActSeeDpt);
|
||||
Par_PutHiddenParamUnsigned ("Order",(unsigned) Order);
|
||||
Act_LinkFormSubmit (Txt_DEPARTMENTS_HELP_ORDER[Order],"TIT_TBL");
|
||||
|
|
17
swad_forum.c
17
swad_forum.c
|
@ -999,7 +999,6 @@ static void For_ShowAForumPost (struct ForumThread *Thr,unsigned PstNum,long Pst
|
|||
extern const char *Txt_Post_X_allowed_Click_to_ban_it;
|
||||
extern const char *Txt_Post_X_banned_Click_to_unban_it;
|
||||
extern const char *Txt_This_post_has_been_banned_probably_for_not_satisfy_the_rules_of_the_forums;
|
||||
extern const char *Txt_Mandatory_rules_to_compose_messages;
|
||||
struct UsrData UsrDat;
|
||||
char CreatTime[4+2+2+2+2+2+1]; // Creation time of a post in YYYYMMDDHHMMSS format
|
||||
char OriginalContent[Cns_MAX_BYTES_LONG_TEXT+1];
|
||||
|
@ -1151,11 +1150,7 @@ static void For_ShowAForumPost (struct ForumThread *Thr,unsigned PstNum,long Pst
|
|||
Msg_WriteMsgContent (Content,Cns_MAX_BYTES_LONG_TEXT,true,false);
|
||||
}
|
||||
else
|
||||
{
|
||||
fprintf (Gbl.F.Out,"%s",Txt_This_post_has_been_banned_probably_for_not_satisfy_the_rules_of_the_forums);
|
||||
fprintf (Gbl.F.Out,"(<a href=\"%s\" target=\"_blank\">%s</a>)",
|
||||
Cfg_NETTIQUETE,Txt_Mandatory_rules_to_compose_messages);
|
||||
}
|
||||
fprintf (Gbl.F.Out,"</tt>"
|
||||
"<br /> "
|
||||
"</td>"
|
||||
|
@ -3500,8 +3495,7 @@ void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject)
|
|||
Act_FormStart (For_ActionsRecThrFor[Gbl.Forum.ForumType]);
|
||||
For_PutAllHiddenParamsForum ();
|
||||
|
||||
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">"
|
||||
"<table>"
|
||||
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">"
|
||||
"<tr>"
|
||||
"<td></td>"
|
||||
"<td style=\"text-align:left;\">"
|
||||
|
@ -3512,12 +3506,6 @@ void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject)
|
|||
Txt_New_thread,
|
||||
Txt_If_you_send_this_message_you_will_appear_as_its_author);
|
||||
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td colspan=\"2\" style=\"text-align:center;\">");
|
||||
Msg_WriteLinkToNetiquette ();
|
||||
fprintf (Gbl.F.Out,"</td>"
|
||||
"</tr>");
|
||||
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td class=\"%s\""
|
||||
" style=\"text-align:right; vertical-align:top;\">"
|
||||
|
@ -3542,8 +3530,7 @@ void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject)
|
|||
"</textarea>"
|
||||
"</td>"
|
||||
"</tr>"
|
||||
"</table>"
|
||||
"</div>",
|
||||
"</table>",
|
||||
The_ClassFormul[Gbl.Prefs.Theme],
|
||||
Txt_MSG_Message);
|
||||
|
||||
|
|
|
@ -4186,7 +4186,7 @@ void Grp_ShowSelectorWhichGrps (void)
|
|||
Grp_WhichGroups_t WhichGrps;
|
||||
|
||||
fprintf (Gbl.F.Out,"<ul style=\"list-style-type:none;"
|
||||
" padding:0; margin:0;\">");
|
||||
" padding:0; margin:10px auto;\">");
|
||||
for (WhichGrps = Grp_ONLY_MY_GROUPS;
|
||||
WhichGrps <= Grp_ALL_GROUPS;
|
||||
WhichGrps++)
|
||||
|
|
|
@ -333,12 +333,6 @@ static void Msg_PutFormMsgUsrs (const char *Content)
|
|||
"</tr>");
|
||||
|
||||
/***** Subject and content *****/
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td colspan=\"2\" style=\"text-align:center;\">");
|
||||
Msg_WriteLinkToNetiquette ();
|
||||
fprintf (Gbl.F.Out,"</td>"
|
||||
"</tr>");
|
||||
|
||||
Msg_WriteFormSubjectAndContentMsgToUsrs (Content);
|
||||
|
||||
fprintf (Gbl.F.Out,"</table>");
|
||||
|
@ -3253,7 +3247,7 @@ static long Msg_GetParamMsgCod (void)
|
|||
/*****************************************************************************/
|
||||
/*********************** Write a link to netiquette rules ********************/
|
||||
/*****************************************************************************/
|
||||
|
||||
/*
|
||||
void Msg_WriteLinkToNetiquette (void)
|
||||
{
|
||||
extern const char *Txt_Mandatory_rules_to_compose_messages;
|
||||
|
@ -3263,7 +3257,7 @@ void Msg_WriteLinkToNetiquette (void)
|
|||
Cfg_NETTIQUETE,Txt_Mandatory_rules_to_compose_messages);
|
||||
Lay_WriteTitle (Title);
|
||||
}
|
||||
|
||||
*/
|
||||
/*****************************************************************************/
|
||||
/***************** Put a form to ban the sender of a message *****************/
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -110,7 +110,7 @@ void Msg_IndentDependingOnLevel (int Level,bool IsLastItemInLevel[]);
|
|||
|
||||
void Msg_PutHiddenParamMsgCod (long MsgCod);
|
||||
|
||||
void Msg_WriteLinkToNetiquette (void);
|
||||
// void Msg_WriteLinkToNetiquette (void);
|
||||
|
||||
void Msg_BanSenderWhenShowingMsgs (void);
|
||||
void Msg_UnbanSenderWhenShowingMsgs (void);
|
||||
|
|
|
@ -93,12 +93,8 @@ void Not_ShowFormNotice (void)
|
|||
Gbl.CurrentCrs.Crs.FullName);
|
||||
Lay_ShowAlert (Lay_INFO,Gbl.Message);
|
||||
|
||||
Msg_WriteLinkToNetiquette ();
|
||||
|
||||
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
|
||||
|
||||
Act_FormStart (ActRcvNot);
|
||||
fprintf (Gbl.F.Out,"<table>"
|
||||
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">"
|
||||
"<tr>"
|
||||
"<td></td>"
|
||||
"<td class=\"%s\" style=\"text-align:left;\">"
|
||||
|
@ -120,8 +116,7 @@ void Not_ShowFormNotice (void)
|
|||
The_ClassFormul[Gbl.Prefs.Theme],
|
||||
Txt_MSG_Message);
|
||||
Lay_PutSendButton (Txt_Create_notice);
|
||||
fprintf (Gbl.F.Out,"</form>"
|
||||
"</div>");
|
||||
fprintf (Gbl.F.Out,"</form>");
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -475,9 +475,12 @@ unsigned long Rec_GetAllFieldsInCurrCrs (MYSQL_RES **mysql_res)
|
|||
char Query[512];
|
||||
|
||||
/***** Get fields of cards of current course from database *****/
|
||||
sprintf (Query,"SELECT FieldCod,FieldName,Visibility FROM crs_record_fields"
|
||||
" WHERE CrsCod='%ld' ORDER BY FieldName",Gbl.CurrentCrs.Crs.CrsCod);
|
||||
return DB_QuerySELECT (Query,mysql_res,"can not get fields of cards of a course");
|
||||
sprintf (Query,"SELECT FieldCod,FieldName,Visibility"
|
||||
" FROM crs_record_fields"
|
||||
" WHERE CrsCod='%ld' ORDER BY FieldName",
|
||||
Gbl.CurrentCrs.Crs.CrsCod);
|
||||
return DB_QuerySELECT (Query,mysql_res,
|
||||
"can not get fields of cards of a course");
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -499,7 +502,7 @@ void Rec_CreateRecordField (void)
|
|||
(unsigned) Gbl.CurrentCrs.Records.Field.Visibility);
|
||||
DB_QueryINSERT (Query,"can not create field of record");
|
||||
|
||||
/***** Write mensaje of éxito *****/
|
||||
/***** Write message of success *****/
|
||||
sprintf (Gbl.Message,Txt_Created_new_record_field_X,
|
||||
Gbl.CurrentCrs.Records.Field.Name);
|
||||
Lay_ShowAlert (Lay_SUCCESS,Gbl.Message);
|
||||
|
|
40
swad_text.c
40
swad_text.c
|
@ -15396,7 +15396,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
|
||||
|
@ -15417,7 +15417,7 @@ const char *Txt_Mandatory_rules_to_compose_messages =
|
|||
#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";
|
||||
|
@ -16778,23 +16778,23 @@ const char *Txt_MENU_BR[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
|
|||
,
|
||||
// ActSeeAtt
|
||||
#if L==0
|
||||
"Control<br />d'assistència"
|
||||
"Assistència"
|
||||
#elif L==1
|
||||
"Kontrolle der<br />Anwesenheit"
|
||||
"Anwesenheit"
|
||||
#elif L==2
|
||||
"Control of<br />attendance"
|
||||
"Attendance"
|
||||
#elif L==3
|
||||
"Control de<br />asistencia"
|
||||
"Asistencia"
|
||||
#elif L==4
|
||||
"Contrôle de<br />présence"
|
||||
"Présence"
|
||||
#elif L==5
|
||||
"Control de<br />asistencia" // Okoteve traducción
|
||||
"Asistencia" // Okoteve traducción
|
||||
#elif L==6
|
||||
"Controllo di<br />frequenza"
|
||||
"Frequenza"
|
||||
#elif L==7
|
||||
"Kontrola<br />frekwencji"
|
||||
"Frekwencji"
|
||||
#elif L==8
|
||||
"Lista de<br />presença"
|
||||
"Presença"
|
||||
#endif
|
||||
,
|
||||
// ActLstTch
|
||||
|
@ -18692,23 +18692,23 @@ const char *Txt_MENU_NO_BR[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
|
|||
,
|
||||
// ActSeeAtt
|
||||
#if L==0
|
||||
"Control d'assistència"
|
||||
"Assistència"
|
||||
#elif L==1
|
||||
"Kontrolle der Anwesenheit"
|
||||
"Anwesenheit"
|
||||
#elif L==2
|
||||
"Control of attendance"
|
||||
"Attendance"
|
||||
#elif L==3
|
||||
"Control de asistencia"
|
||||
"Asistencia"
|
||||
#elif L==4
|
||||
"Contrôle de présence"
|
||||
"Présence"
|
||||
#elif L==5
|
||||
"Control de asistencia" // Okoteve traducción
|
||||
"Asistencia" // Okoteve traducción
|
||||
#elif L==6
|
||||
"Controllo di frequenza"
|
||||
"Frequenza"
|
||||
#elif L==7
|
||||
"Kontrola frekwencji"
|
||||
"Frekwencji"
|
||||
#elif L==8
|
||||
"Lista de presença"
|
||||
"Presença"
|
||||
#endif
|
||||
,
|
||||
// ActLstTch
|
||||
|
|
Loading…
Reference in New Issue
Block a user