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.120.9

This commit is contained in:
Antonio Cañas Vargas 2015-07-27 19:42:24 +02:00
parent 69c4c4240d
commit f9b025dafc
7 changed files with 45 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swad_changelog.h
View File

@ -103,12 +103,13 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.120.8 (2015/07/26)"
#define Log_PLATFORM_VERSION "SWAD 14.120.9 (2015/07/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 sql/swad*.sql | tail -1
/*
Version 14.120.8: Jul 26, 2015 Changes in CSS of assignments. (? lines)
Version 14.120.9: Jul 27, 2015 Changes in CSS of forms. (184855 lines)
Version 14.120.8: Jul 26, 2015 Changes in CSS of assignments. (184881 lines)
Version 14.120.7: Jul 26, 2015 Changes in CSS of forms.
Changes in CSS of surveys. (184877 lines)
Version 14.120.6: Jul 26, 2015 Changes in CSS of forms. (184889 lines)

5
swad_group.c
View File

@ -251,7 +251,8 @@ static void Grp_ShowFormSeveralGrps (Act_Action_t NextAction)
/***** Select all groups *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"7\" class=\"%s\">"
"<td colspan=\"6\" class=\"%s\""
" style=\"text-align:center;\">"
"<input type=\"checkbox\" id=\"AllGroups\" name=\"AllGroups\" value=\"Y\"",
The_ClassFormul[Gbl.Prefs.Theme]);
if (Gbl.Usrs.ClassPhoto.AllGroups)
@ -277,7 +278,7 @@ static void Grp_ShowFormSeveralGrps (Act_Action_t NextAction)
/***** Submit button *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"7\" style=\"padding-top:10px;"
"<td colspan=\"6\" style=\"padding-top:10px;"
" text-align:center;\">");
Act_LinkFormSubmitAnimated (Txt_Update_students_according_to_selected_groups,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutCalculateIconWithText (Txt_Update_students_according_to_selected_groups,Txt_Update_students);

39
swad_record.c
View File

@ -3299,7 +3299,6 @@ static void Rec_PutLinkToChangeMySocialNetworks (void)
/********* Show form to edit my institution, centre and department ***********/
/*****************************************************************************/
#define COL1_WIDTH 140
#define COL2_WIDTH 400
void Rec_ShowFormMyInsCtrDpt (void)
@ -3340,10 +3339,9 @@ void Rec_ShowFormMyInsCtrDpt (void)
/***** Country *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">"
"%s:</td>"
"<td class=\"%s\">%s:</td>"
"<td style=\"width:%upx; text-align:left;\">",
ClassForm,COL1_WIDTH,Txt_Country_of_institution,
ClassForm,Txt_Country_of_institution,
COL2_WIDTH);
/* If list of countries is empty, try to get it */
@ -3380,11 +3378,9 @@ void Rec_ShowFormMyInsCtrDpt (void)
/***** Institution *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td class=\"%s\">%s:</td>"
"<td style=\"width:%upx; text-align:left;\">",
ClassForm,COL1_WIDTH,Txt_Institution,
ClassForm,Txt_Institution,
COL2_WIDTH);
/* Get list of institutions in this country */
@ -3426,12 +3422,9 @@ void Rec_ShowFormMyInsCtrDpt (void)
{
/***** Centre *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td class=\"%s\">%s:</td>"
"<td style=\"width:%upx; text-align:left;\">",
ClassForm,COL1_WIDTH,Txt_Centre,
ClassForm,Txt_Centre,
COL2_WIDTH);
/* Get list of centres in this institution */
@ -3471,12 +3464,9 @@ void Rec_ShowFormMyInsCtrDpt (void)
/***** Department *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td class=\"%s\">%s:</td>"
"<td style=\"width:%upx; text-align:left;\">",
ClassForm,COL1_WIDTH,Txt_Department,
ClassForm,Txt_Department,
COL2_WIDTH);
/* Get list of departments in this institution */
@ -3516,12 +3506,9 @@ void Rec_ShowFormMyInsCtrDpt (void)
/***** Office *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td class=\"%s\">%s:</td>"
"<td style=\"width:%upx; text-align:left;\">",
ClassForm,COL1_WIDTH,Txt_Office,
ClassForm,Txt_Office,
COL2_WIDTH);
Act_FormGoToStart (ActChgMyOff);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"Office\""
@ -3536,11 +3523,9 @@ void Rec_ShowFormMyInsCtrDpt (void)
/***** Phone *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">"
"%s:"
"</td>"
"<td class=\"%s\">%s:</td>"
"<td style=\"width:%upx; text-align:left;\">",
ClassForm,COL1_WIDTH,Txt_Phone,
ClassForm,Txt_Phone,
COL2_WIDTH);
Act_FormGoToStart (ActChgMyOffPho);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"OfficePhone\""

49
swad_test.c
View File

@ -279,8 +279,10 @@ void Tst_ShowFormAskTst (void)
Tst_ShowFormAnswerTypes ();
/***** Number of questions to generate ****/
fprintf (Gbl.F.Out,"<div class=\"%s\">"
"%s: "
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">"
"<label class=\"%s\">"
"%s:&nbsp;"
"</label>"
"<input type=\"text\" name=\"NumQst\" size=\"3\" maxlength=\"3\" value=\"%u\"",
The_ClassFormul[Gbl.Prefs.Theme],Txt_No_of_questions,
Gbl.Test.Config.Def);
@ -393,8 +395,7 @@ void Tst_ShowNewTestExam (void)
Tst_WriteTestFoot ();
/* Exam will be saved? */
fprintf (Gbl.F.Out,"<div class=\"%s\""
" style=\"text-align:center;\">"
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">"
"<input type=\"checkbox\" name=\"Save\" value=\"Y\"",
The_ClassFormul[Gbl.Prefs.Theme]);
if (Gbl.Test.AllowTeachers)
@ -1395,8 +1396,7 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,bool
fprintf (Gbl.F.Out,"<tr>");
if (!ShowOnlyEnabledTags)
fprintf (Gbl.F.Out,"<td></td>");
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:middle;\">"
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:left;\">"
"<input type=\"checkbox\" name=\"AllTags\" value=\"Y\"",
The_ClassFormul[Gbl.Prefs.Theme]);
if (Gbl.Test.AllTags)
@ -1464,7 +1464,6 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,bool
static void Tst_ShowFormEditTags (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_No_test_questions_in_X;
extern const char *Txt_Tags;
MYSQL_RES *mysql_res;
@ -1594,11 +1593,12 @@ static void Tst_ShowFormConfigTst (void)
/***** Tests are visible from plugins? *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;\">"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Plugins);
"<td style=\"text-align:left;\">",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Plugins);
for (Pluggable = Tst_PLUGGABLE_NO;
Pluggable <= Tst_PLUGGABLE_YES;
Pluggable++)
@ -1615,7 +1615,7 @@ static void Tst_ShowFormConfigTst (void)
/***** Number of questions *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;\">"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">"
@ -1661,10 +1661,10 @@ static void Tst_ShowFormConfigTst (void)
/***** Minimum time between test exams per question *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">"
"<td style=\"text-align:left; vertical-align:bottom;\">"
"<input type=\"text\" name=\"MinTimeNxtTstPerQst\" size=\"7\" maxlength=\"7\" value=\"%lu\" />"
"</td>"
"</tr>",
@ -1674,10 +1674,10 @@ static void Tst_ShowFormConfigTst (void)
/***** Feedback to students *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;\">"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">",
"<td style=\"text-align:left;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Feedback_to_students);
for (FeedbTyp = (Tst_Feedback_t) 0;
FeedbTyp < Tst_NUM_TYPES_FEEDBACK;
@ -2001,8 +2001,7 @@ static void Tst_ShowFormAnswerTypes (void)
/***** Select all types of answers *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:middle;\">"
"<td class=\"%s\" style=\"text-align:left;\">"
"<input type=\"checkbox\" name=\"AllAnsTypes\" value=\"Y\"",
The_ClassFormul[Gbl.Prefs.Theme]);
if (Gbl.Test.AllAnsTypes)
@ -2047,7 +2046,6 @@ static void Tst_ShowFormAnswerTypes (void)
void Tst_ListQuestionsToEdit (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
MYSQL_RES *mysql_res;
unsigned long NumRows;
@ -4240,8 +4238,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
/***** Write the tags *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:top;\">"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">"
@ -4302,8 +4299,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
/***** Stem *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:top;\">"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">"
@ -4318,8 +4314,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
/***** Feedback *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:top;\">"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">"
@ -4335,8 +4330,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
/***** Type of answer *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:top;\">"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s:"
"</td>"
"<td class=\"%s\" style=\"text-align:left;"
@ -4361,8 +4355,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
/***** Answers *****/
/* Integer answer */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:top;\">"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s:"
"</td>"
"<td class=\"%s\" style=\"text-align:left;"

2
swad_test_import.c
View File

@ -140,7 +140,7 @@ void TsI_ShowFormImportQstsFromXML (void)
Act_FormStart (ActImpTstQst);
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">"
"<tr>"
"<td class=\"%s\" style=\"text-align:right;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">"

9
swad_user.c
View File

@ -5022,7 +5022,6 @@ static void Usr_SetUsrDatMainFieldNames (void)
static void Usr_ListMainDataGsts (bool PutCheckBoxToSelectUsr)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
unsigned NumCol;
unsigned NumUsr;
struct UsrData UsrDat;
@ -5091,7 +5090,6 @@ static void Usr_ListMainDataGsts (bool PutCheckBoxToSelectUsr)
static void Usr_ListMainDataStds (bool PutCheckBoxToSelectUsr)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
unsigned NumCol;
unsigned NumUsr;
char *GroupNames;
@ -5180,7 +5178,6 @@ static void Usr_ListMainDataStds (bool PutCheckBoxToSelectUsr)
static void Usr_ListMainDataTchs (bool PutCheckBoxToSelectUsr)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_No_users_found[Rol_NUM_ROLES];
unsigned NumColumns;
unsigned NumCol;
@ -5893,10 +5890,10 @@ void Usr_ListDataAdms (void)
Usr_GetAndUpdatePrefsAboutUsrList ();
/***** Get scope *****/
Gbl.Scope.Allowed = 1 << Sco_SCOPE_SYS |
1 << Sco_SCOPE_CTY |
Gbl.Scope.Allowed = 1 << Sco_SCOPE_SYS |
1 << Sco_SCOPE_CTY |
1 << Sco_SCOPE_INS |
1 << Sco_SCOPE_CTR |
1 << Sco_SCOPE_CTR |
1 << Sco_SCOPE_DEG;
Gbl.Scope.Default = Sco_SCOPE_DEG;
Sco_GetScope ();

7
swad_zip.c
View File

@ -363,7 +363,6 @@ void ZIP_CompressFileTree (void)
static void ZIP_CompressFolderIntoZIP (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER];
extern const char *Txt_The_folder_is_empty;
extern const char *Txt_The_contents_of_the_folder_are_too_big;
@ -596,8 +595,7 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
/***** Filename *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -610,8 +608,7 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
/***** Write the file size *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"