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 15.5.1

This commit is contained in:
Antonio Cañas Vargas 2015-10-02 12:28:52 +02:00
parent 85a0b50430
commit dc1ae70508
8 changed files with 90 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/swad_desktop.css
View File

@ -846,7 +846,7 @@ a:hover img.CENTRE_PHOTO_SHOW
.BLUE_FORM {color:#4D88A1; font-size:13pt;}
.YELLOW_FORM {color:#7C4D2A; font-size:13pt;}
.WHITE_FORM_NOWRAP {color:#4D88A1; font-size:16pt; white-space:nowrap;}
.WHITE_FORM_NOWRAP {color:#4D88A1; font-size:13pt; white-space:nowrap;}
.GREY_FORM_NOWRAP {color:#4D88A1; font-size:13pt; white-space:nowrap;}
.BLUE_FORM_NOWRAP {color:#4D88A1; font-size:13pt; white-space:nowrap;}
.YELLOW_FORM_NOWRAP {color:#7C4D2A; font-size:13pt; white-space:nowrap;}

3
swad_changelog.h
View File

@ -98,11 +98,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.5 (2015/10/01)"
#define Log_PLATFORM_VERSION "SWAD 15.5.1 (2015/10/02)"
// 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 15.5.1: Oct 02, 2015 Changes in layout of forms with initial and final dates. (184938 lines)
Version 15.5: Oct 01, 2015 Changes in layout of selectors classphoto/list. (184909 lines)
Version 15.4.2: Oct 01, 2015 Institution admins can edit holidays. (184863 lines)
Version 15.4.1: Sep 30, 2015 Code refactoring in global/course statistics. (184861 lines)

52
swad_date.c
View File

@ -241,16 +241,23 @@ void Dat_WriteFormIniEndDates (void)
&(Gbl.DateRange.DateIni),
false,false);
/***** "Yesterday" button *****/
fprintf (Gbl.F.Out,"<input type=\"button\" name=\"Yesterday\" value=\"%s\""
" style=\"margin-left:40px;\""
/***** "Yesterday" and "Today" buttons *****/
fprintf (Gbl.F.Out,"</td>"
"<td rowspan=\"2\" class=\"LEFT_MIDDLE\">"
"<input type=\"button\" name=\"Yesterday\" value=\"%s\""
" onclick=\"setDateTo(this,%u,%u,%u)\" />"
"<input type=\"button\" name=\"Today\" value=\"%s\""
" onclick=\"setDateTo(this,%u,%u,%u)\" />"
"</td>"
"</tr>",
Txt_Yesterday,
Gbl.Yesterday.Day,
Gbl.Yesterday.Month,
Gbl.Yesterday.Year - Cfg_LOG_START_YEAR + 1);
Gbl.Yesterday.Year - Cfg_LOG_START_YEAR + 1,
Txt_Today,
Gbl.Now.Date.Day,
Gbl.Now.Date.Month,
Gbl.Now.Date.Year - Cfg_LOG_START_YEAR + 1);
/***** End date *****/
fprintf (Gbl.F.Out,"<tr>"
@ -263,17 +270,8 @@ void Dat_WriteFormIniEndDates (void)
Dat_WriteFormDate (Cfg_LOG_START_YEAR,Gbl.Now.Date.Year,"EndDay","EndMonth","EndYear",
&(Gbl.DateRange.DateEnd),
false,false);
/***** "Today" button *****/
fprintf (Gbl.F.Out,"<input type=\"button\" name=\"Today\" value=\"%s\""
" style=\"margin-left:40px;\""
" onclick=\"setDateTo(this,%u,%u,%u)\" />"
"</td>"
"</tr>",
Txt_Today,
Gbl.Now.Date.Day,
Gbl.Now.Date.Month,
Gbl.Now.Date.Year - Cfg_LOG_START_YEAR + 1);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
/*****************************************************************************/
@ -291,16 +289,23 @@ http://javascript.internet.com/forms/category-selection.html
See also http://www.ashleyit.com/rs/jsrs/select/php/select.php
*/
void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear,
const char *NameSelectDay,const char *NameSelectMonth,const char *NameSelectYear,
const char *NameSelectDay,
const char *NameSelectMonth,
const char *NameSelectYear,
struct Date *DateSelected,
bool SubmitFormOnChange,bool Disabled)
{
unsigned Day,Month,Year;
unsigned NumDaysSelectedMonth;
extern const char *Txt_MONTHS_SMALL[12];
unsigned Day;
unsigned Month;
unsigned Year;
unsigned NumDaysSelectedMonth;
/***** Day *****/
fprintf (Gbl.F.Out,"<select id=\"%s\" name=\"%s\"",
fprintf (Gbl.F.Out,"<table>"
"<tr>"
"<td class=\"CENTER_MIDDLE\">"
"<select id=\"%s\" name=\"%s\"",
NameSelectDay,NameSelectDay);
if (SubmitFormOnChange)
fprintf (Gbl.F.Out," onchange=\"javascript:document.getElementById('%s').submit();\"",
@ -323,6 +328,8 @@ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear,
/***** Month *****/
fprintf (Gbl.F.Out,"</select>"
"</td>"
"<td class=\"CENTER_MIDDLE\">"
"<select id=\"%s\" name=\"%s\""
" onchange=\"adjustDateForm(this.form.%s,this.form.%s,this.form.%s)",
NameSelectMonth,NameSelectMonth,NameSelectDay,NameSelectMonth,NameSelectYear);
@ -345,6 +352,8 @@ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear,
/***** Year *****/
fprintf (Gbl.F.Out,"</select>"
"</td>"
"<td class=\"CENTER_MIDDLE\">"
"<select id=\"%s\" name=\"%s\" onchange=\"adjustDateForm(this.form.%s,this.form.%s,this.form.%s)",
NameSelectYear,NameSelectYear,NameSelectDay,NameSelectMonth,NameSelectYear);
if (SubmitFormOnChange)
@ -363,7 +372,10 @@ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear,
fprintf (Gbl.F.Out," selected=\"selected\"");
fprintf (Gbl.F.Out,">%u</option>",Year);
}
fprintf (Gbl.F.Out,"</select>");
fprintf (Gbl.F.Out,"</select>"
"</td>"
"</tr>"
"</table>");
}
/*****************************************************************************/

4
swad_date.h
View File

@ -81,7 +81,9 @@ void Dat_ConvDateToDateStr (struct Date *Date,char *DateStr);
void Dat_WriteFormIniEndDates (void);
void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear,
const char *NameSelectDay,const char *NameSelectMonth,const char *NameSelectYear,
const char *NameSelectDay,
const char *NameSelectMonth,
const char *NameSelectYear,
struct Date *DateSelected,
bool SubmitFormOnChange,bool Disabled);
void Dat_WriteFormHourMinute (const char *NameSelectHour,const char *NameSelectMinute,

4
swad_group.c
View File

@ -1217,7 +1217,7 @@ static void Grp_ListGroupTypesForEdition (void)
Txt_The_groups_will_not_automatically_open,
Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].MustBeOpened ? Txt_The_groups_will_automatically_open :
Txt_The_groups_will_not_automatically_open);
Dat_WriteFormDate (Gbl.Now.Date.Year,Gbl.Now.Date.Year+1,
Dat_WriteFormDate (Gbl.Now.Date.Year,Gbl.Now.Date.Year + 1,
"OpenDay","OpenMonth","OpenYear",
&(Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].OpenTime.Date),
true,false);
@ -2107,7 +2107,7 @@ static void Grp_PutFormToCreateGroupType (void)
Txt_The_groups_will_not_automatically_open,
Gbl.CurrentCrs.Grps.GrpTyp.MustBeOpened ? Txt_The_groups_will_automatically_open :
Txt_The_groups_will_not_automatically_open);
Dat_WriteFormDate (Gbl.Now.Date.Year,Gbl.Now.Date.Year+1,
Dat_WriteFormDate (Gbl.Now.Date.Year,Gbl.Now.Date.Year + 1,
"OpenDay","OpenMonth","OpenYear",
&(Gbl.CurrentCrs.Grps.GrpTyp.OpenTime.Date),
false,false);

12
swad_statistic.c
View File

@ -453,7 +453,7 @@ void Sta_AskSeeCrsAccesses (void)
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>"
"<td class=\"%s LEFT_TOP\">"
"<td colspan=\"2\" class=\"%s LEFT_TOP\">"
"<table>",
The_ClassForm[Gbl.Prefs.Theme],Txt_Users,
The_ClassForm[Gbl.Prefs.Theme]);
@ -474,7 +474,7 @@ void Sta_AskSeeCrsAccesses (void)
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>"
"<td class=\"%s LEFT_TOP\">",
"<td colspan=\"2\" class=\"%s LEFT_TOP\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Show,
The_ClassForm[Gbl.Prefs.Theme]);
@ -603,7 +603,7 @@ void Sta_AskSeeGblAccesses (void)
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"LEFT_MIDDLE\">"
"<td colspan=\"2\" class=\"LEFT_MIDDLE\">"
"<select name=\"Role\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Users);
for (RoleStat = (Sta_Role_t) 0;
@ -627,7 +627,7 @@ void Sta_AskSeeGblAccesses (void)
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"LEFT_MIDDLE\">",
"<td colspan=\"2\" class=\"LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Scope);
Gbl.Scope.Allowed = 1 << Sco_SCOPE_SYS |
1 << Sco_SCOPE_CTY |
@ -646,7 +646,7 @@ void Sta_AskSeeGblAccesses (void)
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>"
"<td class=\"%s LEFT_TOP\">",
"<td colspan=\"2\" class=\"%s LEFT_TOP\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Show,
The_ClassForm[Gbl.Prefs.Theme]);
Sta_WriteSelectorCountType ();
@ -719,7 +719,7 @@ static void Sta_WriteSelectorAction (void)
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>"
"<td class=\"LEFT_TOP\">"
"<td colspan=\"2\" class=\"LEFT_TOP\">"
"<select name=\"StatAct\" id=\"StatAct\""
" style=\"width:375px;\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Action);

31
swad_test.c
View File

@ -5887,6 +5887,8 @@ static unsigned Tst_GetNumCoursesWithPluggableTstQuestions (Sco_Scope_t Scope,Ts
void Tst_SelUsrsToSeeUsrsTstExams (void)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Exams;
extern const char *Txt_Users;
extern const char *Txt_See_exams;
@ -5908,7 +5910,7 @@ void Tst_SelUsrsToSeeUsrsTstExams (void)
Gbl.Usrs.LstStds.NumUsrs))
{
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Users);
Lay_StartRoundFrame (NULL,Txt_Exams);
/***** Form to select type of list used for select several users *****/
Usr_ShowFormsToSelectUsrListType (ActReqSeeUsrTstExa);
@ -5918,14 +5920,25 @@ void Tst_SelUsrsToSeeUsrsTstExams (void)
Grp_PutParamsCodGrps ();
/***** Put list of users to select some of them *****/
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">");
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\""
" style=\"margin:0 auto;\">"
"<tr>"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s LEFT_TOP\">"
"<table>",
The_ClassForm[Gbl.Prefs.Theme],Txt_Users,
The_ClassForm[Gbl.Prefs.Theme]);
Usr_ListUsersToSelect (Rol_TEACHER);
Usr_ListUsersToSelect (Rol_STUDENT);
fprintf (Gbl.F.Out,"</table>");
fprintf (Gbl.F.Out,"</table>"
"</td>"
"</tr>");
/***** Starting and ending dates in the search *****/
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">");
Dat_WriteFormIniEndDates ();
fprintf (Gbl.F.Out,"</table>");
/***** Send button *****/
@ -5958,18 +5971,20 @@ void Tst_SelUsrsToSeeUsrsTstExams (void)
void Tst_SelDatesToSeeMyTstExams (void)
{
extern const char *Txt_Exams;
extern const char *Txt_See_exams;
/***** Start form *****/
Act_FormStart (ActSeeMyTstExa);
/***** Starting and ending dates in the search *****/
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">");
Lay_StartRoundFrameTable (NULL,2,Txt_Exams);
Dat_WriteFormIniEndDates ();
fprintf (Gbl.F.Out,"</table>");
/***** Button to send the form *****/
Lay_PutConfirmButton (Txt_See_exams);
/***** Send button and end frame *****/
Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_See_exams);
/***** End form *****/
Act_FormEnd ();
}

42
swad_text.c
View File

@ -7877,17 +7877,17 @@ const char *Txt_Display_photos =
const char *Txt_distributed_by =
#if L==0
"distribuïts per";
"distribu&iuml;t per";
#elif L==1
"vertrieben von";
#elif L==2
"distributed by";
#elif L==3
"distribuidos por";
"distribuido por";
#elif L==4
"distribu&eacute; par";
#elif L==5
"distribuidos por"; // Okoteve traducción
"distribuido por"; // Okoteve traducción
#elif L==6
"distribuito da";
#elif L==7
@ -35883,43 +35883,43 @@ const char *Txt_STAT_TYPE_COUNT_SMALL[Sta_NUM_COUNT_TYPES] =
#endif
,
#if L==0
"tiempo de generaci&oacute;n de p&aacute;gina" // Necessita traduccio
"tiempo de generaci&oacute;n" // Necessita traduccio
#elif L==1
"Zeit zur Erzeugung der Seite"
"Zeit zur Erzeugung"
#elif L==2
"time to generate page"
"time to generate"
#elif L==3
"tiempo de generaci&oacute;n de p&aacute;gina"
"tiempo de generaci&oacute;n"
#elif L==4
"temps pour g&eacute;n&eacute;rer la page"
"temps pour g&eacute;n&eacute;rer"
#elif L==5
"tiempo de generaci&oacute;n de p&aacute;gina" // Okoteve traducción
"tiempo de generaci&oacute;n" // Okoteve traducción
#elif L==6
"tempo per generare pagina"
"tempo per generare"
#elif L==7
"time to generate page" // Potrzebujesz tlumaczenie
"time to generate" // Potrzebujesz tlumaczenie
#elif L==8
"tempo para gerar p&aacute;gina"
"tempo para gerar"
#endif
,
#if L==0
"tiempo de env&iacute;o de p&aacute;gina" // Necessita traduccio
"tiempo de env&iacute;o" // Necessita traduccio
#elif L==1
"Zeit, um Seite zu senden"
"Zeit, um Seite"
#elif L==2
"time to send page"
"time to send"
#elif L==3
"tiempo de env&iacute;o de p&aacute;gina"
"tiempo de env&iacute;o"
#elif L==4
"temps pour envoyer la page"
"temps pour envoyer"
#elif L==5
"tiempo de env&iacute;o de p&aacute;gina" // Okoteve traducción
"tiempo de env&iacute;o" // Okoteve traducción
#elif L==6
"tempo d'invio di una pagina"
"tempo d'invio"
#elif L==7
"time to send page" // Potrzebujesz tlumaczenie
"time to send" // Potrzebujesz tlumaczenie
#elif L==8
"Tempo para enviar a p&aacute;gina"
"Tempo para enviar"
#endif
};