Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 14.44.3

This commit is contained in:
Antonio Cañas Vargas 2014-12-27 19:43:01 +01:00
parent b8fb5a28fd
commit b19167ba45
16 changed files with 49 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/swad_desktop.css
View File

@ -156,7 +156,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
.NOTICE_CONTAINER .NOTICE_CONTAINER
{ {
margin:8px 0 8px 0; margin:8px auto;
padding:8px; padding:8px;
background-color:#FAF098; background-color:#FAF098;
background-image:linear-gradient(#EED86C 0%, #FEED95 15%, #FAF098 100%); background-image:linear-gradient(#EED86C 0%, #FEED95 15%, #FAF098 100%);

2
css/swad_mobile.css
View File

@ -107,7 +107,7 @@ p {margin:0;}
.NOTICE_CONTAINER .NOTICE_CONTAINER
{ {
margin:8px 0 8px 0; margin:8px auto;
padding:8px; padding:8px;
background-color:#FAF098; background-color:#FAF098;
background-image:linear-gradient(#EED86C 0%, #FEED95 15%, #FAF098 100%); background-image:linear-gradient(#EED86C 0%, #FEED95 15%, #FAF098 100%);

7
swad_announcement.c
View File

@ -320,12 +320,10 @@ void Ann_ShowFormAnnouncement (void)
extern const char *Txt_Users; extern const char *Txt_Users;
extern const char *Txt_Create_announcement; extern const char *Txt_Create_announcement;
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
Act_FormStart (ActRcvAnn); Act_FormStart (ActRcvAnn);
/***** Message subject and body *****/ /***** Message subject and body *****/
fprintf (Gbl.F.Out,"<table>" fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">"
"<tr>" "<tr>"
"<td></td>" "<td></td>"
"<td class=\"%s\" style=\"text-align:left;\">%s</td>" "<td class=\"%s\" style=\"text-align:left;\">%s</td>"
@ -371,8 +369,7 @@ void Ann_ShowFormAnnouncement (void)
"</table>"); "</table>");
Lay_PutSendButton (Txt_Create_announcement); Lay_PutSendButton (Txt_Create_announcement);
fprintf (Gbl.F.Out,"</form>" fprintf (Gbl.F.Out,"</form>");
"</div>");
} }
/*****************************************************************************/ /*****************************************************************************/

3
swad_attendance.c
View File

@ -182,7 +182,8 @@ static void Att_ShowAllAttEvents (void)
Order <= Att_ORDER_BY_END_DATE; Order <= Att_ORDER_BY_END_DATE;
Order++) 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); Act_FormStart (ActSeeAtt);
Grp_PutParamWhichGrps (); Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);

3
swad_changelog.h
View File

@ -35,11 +35,12 @@
/****************************** Public constants *****************************/ /****************************** 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: // 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.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.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.1 :Dic 27, 2014 Changes in layout columns. (174251 lines)
Version 14.44 :Dic 27, 2014 Removed vendor-specific properties in CSS. (174230 lines) Version 14.44 :Dic 27, 2014 Removed vendor-specific properties in CSS. (174230 lines)

2
swad_config.h
View File

@ -272,7 +272,7 @@
#define Cfg_HOW_TO_COLLABORATE_URL "http://swad.ugr.es/wiki/index.php/Colaborar" #define Cfg_HOW_TO_COLLABORATE_URL "http://swad.ugr.es/wiki/index.php/Colaborar"
/* Link to nettiquete rules for messages */ /* 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! */ /* Link to download Java: keep updated! */
#define Cfg_JAVA_URL "http://www.java.com/es/download/" #define Cfg_JAVA_URL "http://www.java.com/es/download/"

4
swad_country.c
View File

@ -548,9 +548,7 @@ void Cty_ListCountries2 (void)
Order <= Cty_ORDER_BY_NUM_USRS; Order <= Cty_ORDER_BY_NUM_USRS;
Order++) Order++)
{ {
fprintf (Gbl.F.Out,"<th class=\"TIT_TBL\" style=\"text-align:%s;\">", fprintf (Gbl.F.Out,"<th class=\"TIT_TBL\" style=\"text-align:left;\">");
Order == Cty_ORDER_BY_COUNTRY ? "left" :
"right");
Act_FormStart (ActSeeCty); Act_FormStart (ActSeeCty);
Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); Par_PutHiddenParamUnsigned ("Order",(unsigned) Order);
Act_LinkFormSubmit (Txt_COUNTRIES_HELP_ORDER[Order],"TIT_TBL"); Act_LinkFormSubmit (Txt_COUNTRIES_HELP_ORDER[Order],"TIT_TBL");

7
swad_degree.c
View File

@ -487,8 +487,8 @@ void Deg_WriteMenuAllCourses (Act_Action_t NextActionCty,
extern const char *Txt_Degree; extern const char *Txt_Degree;
/***** Start of table *****/ /***** Start of table *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:10px;\">" fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\""
"<table class=\"CELLS_PAD_2\">"); " style=\"margin:0 auto 10px auto;\">");
/***** Write a 1st selector /***** Write a 1st selector
with all the countries *****/ with all the countries *****/
@ -551,8 +551,7 @@ void Deg_WriteMenuAllCourses (Act_Action_t NextActionCty,
} }
/***** End of table *****/ /***** End of table *****/
fprintf (Gbl.F.Out,"</table>" fprintf (Gbl.F.Out,"</table>");
"</div>");
} }
/*****************************************************************************/ /*****************************************************************************/

2
swad_department.c
View File

@ -107,7 +107,7 @@ void Dpt_SeeDepts (void)
Order++) Order++)
{ {
fprintf (Gbl.F.Out,"<td class=\"TIT_TBL\"" fprintf (Gbl.F.Out,"<td class=\"TIT_TBL\""
" style=\"text-align:center;\">"); " style=\"text-align:left;\">");
Act_FormStart (ActSeeDpt); Act_FormStart (ActSeeDpt);
Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); Par_PutHiddenParamUnsigned ("Order",(unsigned) Order);
Act_LinkFormSubmit (Txt_DEPARTMENTS_HELP_ORDER[Order],"TIT_TBL"); Act_LinkFormSubmit (Txt_DEPARTMENTS_HELP_ORDER[Order],"TIT_TBL");

17
swad_forum.c
View File

@ -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_allowed_Click_to_ban_it;
extern const char *Txt_Post_X_banned_Click_to_unban_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_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; struct UsrData UsrDat;
char CreatTime[4+2+2+2+2+2+1]; // Creation time of a post in YYYYMMDDHHMMSS format 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]; 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); Msg_WriteMsgContent (Content,Cns_MAX_BYTES_LONG_TEXT,true,false);
} }
else 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,"%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>" fprintf (Gbl.F.Out,"</tt>"
"<br />&nbsp;" "<br />&nbsp;"
"</td>" "</td>"
@ -3500,8 +3495,7 @@ void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject)
Act_FormStart (For_ActionsRecThrFor[Gbl.Forum.ForumType]); Act_FormStart (For_ActionsRecThrFor[Gbl.Forum.ForumType]);
For_PutAllHiddenParamsForum (); For_PutAllHiddenParamsForum ();
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">" fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">"
"<table>"
"<tr>" "<tr>"
"<td></td>" "<td></td>"
"<td style=\"text-align:left;\">" "<td style=\"text-align:left;\">"
@ -3512,12 +3506,6 @@ void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject)
Txt_New_thread, Txt_New_thread,
Txt_If_you_send_this_message_you_will_appear_as_its_author); 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>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\"" "<td class=\"%s\""
" style=\"text-align:right; vertical-align:top;\">" " style=\"text-align:right; vertical-align:top;\">"
@ -3542,8 +3530,7 @@ void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject)
"</textarea>" "</textarea>"
"</td>" "</td>"
"</tr>" "</tr>"
"</table>" "</table>",
"</div>",
The_ClassFormul[Gbl.Prefs.Theme], The_ClassFormul[Gbl.Prefs.Theme],
Txt_MSG_Message); Txt_MSG_Message);

2
swad_group.c
View File

@ -4186,7 +4186,7 @@ void Grp_ShowSelectorWhichGrps (void)
Grp_WhichGroups_t WhichGrps; Grp_WhichGroups_t WhichGrps;
fprintf (Gbl.F.Out,"<ul style=\"list-style-type:none;" 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; for (WhichGrps = Grp_ONLY_MY_GROUPS;
WhichGrps <= Grp_ALL_GROUPS; WhichGrps <= Grp_ALL_GROUPS;
WhichGrps++) WhichGrps++)

10
swad_message.c
View File

@ -333,12 +333,6 @@ static void Msg_PutFormMsgUsrs (const char *Content)
"</tr>"); "</tr>");
/***** Subject and content *****/ /***** 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); Msg_WriteFormSubjectAndContentMsgToUsrs (Content);
fprintf (Gbl.F.Out,"</table>"); fprintf (Gbl.F.Out,"</table>");
@ -3253,7 +3247,7 @@ static long Msg_GetParamMsgCod (void)
/*****************************************************************************/ /*****************************************************************************/
/*********************** Write a link to netiquette rules ********************/ /*********************** Write a link to netiquette rules ********************/
/*****************************************************************************/ /*****************************************************************************/
/*
void Msg_WriteLinkToNetiquette (void) void Msg_WriteLinkToNetiquette (void)
{ {
extern const char *Txt_Mandatory_rules_to_compose_messages; 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); Cfg_NETTIQUETE,Txt_Mandatory_rules_to_compose_messages);
Lay_WriteTitle (Title); Lay_WriteTitle (Title);
} }
*/
/*****************************************************************************/ /*****************************************************************************/
/***************** Put a form to ban the sender of a message *****************/ /***************** Put a form to ban the sender of a message *****************/
/*****************************************************************************/ /*****************************************************************************/

2
swad_message.h
View File

@ -110,7 +110,7 @@ void Msg_IndentDependingOnLevel (int Level,bool IsLastItemInLevel[]);
void Msg_PutHiddenParamMsgCod (long MsgCod); void Msg_PutHiddenParamMsgCod (long MsgCod);
void Msg_WriteLinkToNetiquette (void); // void Msg_WriteLinkToNetiquette (void);
void Msg_BanSenderWhenShowingMsgs (void); void Msg_BanSenderWhenShowingMsgs (void);
void Msg_UnbanSenderWhenShowingMsgs (void); void Msg_UnbanSenderWhenShowingMsgs (void);

9
swad_notice.c
View File

@ -93,12 +93,8 @@ void Not_ShowFormNotice (void)
Gbl.CurrentCrs.Crs.FullName); Gbl.CurrentCrs.Crs.FullName);
Lay_ShowAlert (Lay_INFO,Gbl.Message); Lay_ShowAlert (Lay_INFO,Gbl.Message);
Msg_WriteLinkToNetiquette ();
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
Act_FormStart (ActRcvNot); Act_FormStart (ActRcvNot);
fprintf (Gbl.F.Out,"<table>" fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">"
"<tr>" "<tr>"
"<td></td>" "<td></td>"
"<td class=\"%s\" style=\"text-align:left;\">" "<td class=\"%s\" style=\"text-align:left;\">"
@ -120,8 +116,7 @@ void Not_ShowFormNotice (void)
The_ClassFormul[Gbl.Prefs.Theme], The_ClassFormul[Gbl.Prefs.Theme],
Txt_MSG_Message); Txt_MSG_Message);
Lay_PutSendButton (Txt_Create_notice); Lay_PutSendButton (Txt_Create_notice);
fprintf (Gbl.F.Out,"</form>" fprintf (Gbl.F.Out,"</form>");
"</div>");
} }
/*****************************************************************************/ /*****************************************************************************/

11
swad_record.c
View File

@ -475,9 +475,12 @@ unsigned long Rec_GetAllFieldsInCurrCrs (MYSQL_RES **mysql_res)
char Query[512]; char Query[512];
/***** Get fields of cards of current course from database *****/ /***** Get fields of cards of current course from database *****/
sprintf (Query,"SELECT FieldCod,FieldName,Visibility FROM crs_record_fields" sprintf (Query,"SELECT FieldCod,FieldName,Visibility"
" WHERE CrsCod='%ld' ORDER BY FieldName",Gbl.CurrentCrs.Crs.CrsCod); " FROM crs_record_fields"
return DB_QuerySELECT (Query,mysql_res,"can not get fields of cards of a course"); " 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); (unsigned) Gbl.CurrentCrs.Records.Field.Visibility);
DB_QueryINSERT (Query,"can not create field of record"); 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, sprintf (Gbl.Message,Txt_Created_new_record_field_X,
Gbl.CurrentCrs.Records.Field.Name); Gbl.CurrentCrs.Records.Field.Name);
Lay_ShowAlert (Lay_SUCCESS,Gbl.Message); Lay_ShowAlert (Lay_SUCCESS,Gbl.Message);

40
swad_text.c
View File

@ -15396,7 +15396,7 @@ const char *Txt_Mandatory_enrollment = // (to a type of group)
#elif L==8 #elif L==8
"Inscri&ccedil;&atilde;o obrigat&oacute;ria?"; "Inscri&ccedil;&atilde;o obrigat&oacute;ria?";
#endif #endif
/*
const char *Txt_Mandatory_rules_to_compose_messages = const char *Txt_Mandatory_rules_to_compose_messages =
#if L==0 #if L==0
"Normas obligatorias al redactar mensajes (netiquette)"; // Necessita traduccio "Normas obligatorias al redactar mensajes (netiquette)"; // Necessita traduccio
@ -15417,7 +15417,7 @@ const char *Txt_Mandatory_rules_to_compose_messages =
#elif L==8 #elif L==8
"Regras obrigat&oacute;rias para compor mensagens (netiquette)"; "Regras obrigat&oacute;rias para compor mensagens (netiquette)";
#endif #endif
*/
const char *Txt_Mark_all_notifications_as_read = const char *Txt_Mark_all_notifications_as_read =
#if L==0 #if L==0
"Marca totes les notificacions com llegides"; "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 // ActSeeAtt
#if L==0 #if L==0
"Control<br />d'assist&egrave;ncia" "Assist&egrave;ncia"
#elif L==1 #elif L==1
"Kontrolle der<br />Anwesenheit" "Anwesenheit"
#elif L==2 #elif L==2
"Control of<br />attendance" "Attendance"
#elif L==3 #elif L==3
"Control de<br />asistencia" "Asistencia"
#elif L==4 #elif L==4
"Contr&ocirc;le de<br />pr&eacute;sence" "Pr&eacute;sence"
#elif L==5 #elif L==5
"Control de<br />asistencia" // Okoteve traducción "Asistencia" // Okoteve traducción
#elif L==6 #elif L==6
"Controllo di<br />frequenza" "Frequenza"
#elif L==7 #elif L==7
"Kontrola<br />frekwencji" "Frekwencji"
#elif L==8 #elif L==8
"Lista de<br />presen&ccedil;a" "Presen&ccedil;a"
#endif #endif
, ,
// ActLstTch // ActLstTch
@ -18692,23 +18692,23 @@ const char *Txt_MENU_NO_BR[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
, ,
// ActSeeAtt // ActSeeAtt
#if L==0 #if L==0
"Control d'assist&egrave;ncia" "Assist&egrave;ncia"
#elif L==1 #elif L==1
"Kontrolle der Anwesenheit" "Anwesenheit"
#elif L==2 #elif L==2
"Control of attendance" "Attendance"
#elif L==3 #elif L==3
"Control de asistencia" "Asistencia"
#elif L==4 #elif L==4
"Contr&ocirc;le de pr&eacute;sence" "Pr&eacute;sence"
#elif L==5 #elif L==5
"Control de asistencia" // Okoteve traducción "Asistencia" // Okoteve traducción
#elif L==6 #elif L==6
"Controllo di frequenza" "Frequenza"
#elif L==7 #elif L==7
"Kontrola frekwencji" "Frekwencji"
#elif L==8 #elif L==8
"Lista de presen&ccedil;a" "Presen&ccedil;a"
#endif #endif
, ,
// ActLstTch // ActLstTch