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

This commit is contained in:
Antonio Cañas Vargas 2015-07-25 20:51:17 +02:00
parent d3dcc2faa9
commit 87cb8f098f
6 changed files with 122 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
css/swad_desktop.css
View File

@ -923,12 +923,50 @@ a:hover img.CENTRE_PHOTO_SHOW
.BM0 {width:16px; text-align:left; vertical-align:middle; background-color:#F4F2EA;}
.BM1 {width:16px; text-align:left; vertical-align:middle; background-color:#FBFAF7;}
.CONV_TIT {font-family:Garamond, "DejaVu LGC Serif", "Bitstream Vera Serif", serif; color:#404040; font-weight:bold; font-size:14pt;}
.CONV_TIT_IMPR {font-family:Garamond, "DejaVu LGC Serif", "Bitstream Vera Serif", serif; color:#202020; font-weight:bold; font-size:14pt;}
.CONV_NEG {font-family:Garamond, "DejaVu LGC Serif", "Bitstream Vera Serif", serif; color:#404040; font-weight:bold; font-size:11pt; white-space:nowrap;}
.CONV_NEG_IMPR {font-family:Garamond, "DejaVu LGC Serif", "Bitstream Vera Serif", serif; color:#202020; font-weight:bold; font-size:11pt; white-space:nowrap;}
.CONV {font-family:Garamond, "DejaVu LGC Serif", "Bitstream Vera Serif", serif; color:#404040; font-size:11pt;}
.CONV_IMPR {font-family:Garamond, "DejaVu LGC Serif", "Bitstream Vera Serif", serif; color:#202020; font-size:11pt;}
/***************************** Calls for exams *******************************/
.CONV_TIT
{
font-family:Garamond, "DejaVu LGC Serif", "Bitstream Vera Serif", serif;
color:#404040;
font-weight:bold;
font-size:14pt;
}
.CONV_TIT_IMPR
{
font-family:Garamond, "DejaVu LGC Serif", "Bitstream Vera Serif", serif;
color:#202020;
font-weight:bold;
font-size:14pt;
}
.CONV_NEG
{
font-family:Garamond, "DejaVu LGC Serif", "Bitstream Vera Serif", serif;
color:#404040;
font-weight:bold;
font-size:11pt;
white-space:nowrap;
}
.CONV_NEG_IMPR
{
font-family:Garamond, "DejaVu LGC Serif", "Bitstream Vera Serif", serif;
color:#202020;
font-weight:bold;
font-size:11pt;
white-space:nowrap;
text-align:right;
}
.CONV
{
font-family:Garamond, "DejaVu LGC Serif", "Bitstream Vera Serif", serif;
color:#404040;
font-size:11pt;
}
.CONV_IMPR
{
font-family:Garamond, "DejaVu LGC Serif", "Bitstream Vera Serif", serif;
color:#202020;
font-size:11pt;
}
/***************************** Public user's profile *************************/
.FOLLOW

49
css/swad_mobile.css
View File

@ -736,12 +736,49 @@ a:hover img.CENTRE_PHOTO_SHOW
.BM0 {width:16px; text-align:left; vertical-align:middle; background-color:#F4F2EA;}
.BM1 {width:16px; text-align:left; vertical-align:middle; background-color:#FBFAF7;}
.CONV_TIT {font-Family:Garamond, "DejaVu LGC Serif", "Bitstream Vera Serif", serif; color:#404040; font-weight:bold; font-size:14pt;}
.CONV_TIT_IMPR {font-Family:Garamond, "DejaVu LGC Serif", "Bitstream Vera Serif", serif; color:#202020; font-weight:bold; font-size:14pt;}
.CONV_NEG {font-Family:Garamond, "DejaVu LGC Serif", "Bitstream Vera Serif", serif; color:#404040; font-weight:bold; font-size:11pt; white-space:nowrap;}
.CONV_NEG_IMPR {font-Family:Garamond, "DejaVu LGC Serif", "Bitstream Vera Serif", serif; color:#202020; font-weight:bold; font-size:11pt; white-space:nowrap;}
.CONV {font-Family:Garamond, "DejaVu LGC Serif", "Bitstream Vera Serif", serif; color:#404040; font-size:11pt;}
.CONV_IMPR {font-Family:Garamond, "DejaVu LGC Serif", "Bitstream Vera Serif", serif; color:#202020; font-size:11pt;}
/***************************** Calls for exams *******************************/
.CONV_TIT
{
font-family:Garamond, "DejaVu LGC Serif", "Bitstream Vera Serif", serif;
color:#404040;
font-weight:bold;
font-size:14pt;
}
.CONV_TIT_IMPR
{
font-family:Garamond, "DejaVu LGC Serif", "Bitstream Vera Serif", serif;
color:#202020;
font-weight:bold;
font-size:14pt;
}
.CONV_NEG
{
font-family:Garamond, "DejaVu LGC Serif", "Bitstream Vera Serif", serif;
color:#404040;
font-weight:bold;
font-size:11pt;
white-space:nowrap;
}
.CONV_NEG_IMPR
{
font-family:Garamond, "DejaVu LGC Serif", "Bitstream Vera Serif", serif;
color:#202020;
font-weight:bold;
font-size:11pt;
white-space:nowrap;
}
.CONV
{
font-family:Garamond, "DejaVu LGC Serif", "Bitstream Vera Serif", serif;
color:#404040;
font-size:11pt;
}
.CONV_IMPR
{
font-family:Garamond, "DejaVu LGC Serif", "Bitstream Vera Serif", serif;
color:#202020;
font-size:11pt;
}
/***************************** Public user's profile *************************/
.FOLLOW

3
swad_changelog.h
View File

@ -103,11 +103,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.120.3 (2015/07/25)"
#define Log_PLATFORM_VERSION "SWAD 14.120.4 (2015/07/25)"
// 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.4: Jul 25, 2015 Changes in CSS of forms. (184937 lines)
Version 14.120.3: Jul 25, 2015 Changes in selectors of country, institution, centre, degree and course. (184893 lines)
Version 14.120.2: Jul 25, 2015 Changes in CSS of forms.
Fixed bug in selectors of country, institution, centre and degree. (184819 lines)

23
swad_enrollment.c
View File

@ -255,7 +255,7 @@ void Enr_WriteFormToReqAnotherUsrID (Act_Action_t NextAction)
/***** Form to request user's ID, @nickname or e-mail address *****/
Act_FormStart (NextAction);
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"%s: "
"%s:&nbsp;"
"</label>"
"<input type=\"text\" name=\"OtherUsrIDNickOrEMail\""
" size=\"20\" maxlength=\"%u\" />",
@ -760,9 +760,8 @@ static void Enr_PutAreaToEnterUsrsIDs (void)
/***** Start of text area *****/
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">"
"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:top;\">"
"%s: "
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s:&nbsp;"
"</td>"
"<td style=\"text-align:left;\">"
"<textarea name=\"UsrsIDs\" cols=\"72\" rows=\"10\">",
@ -783,7 +782,6 @@ static void Enr_PutAreaToEnterUsrsIDs (void)
bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Modify_me_in_the_course_X;
extern const char *Txt_Modify_user_in_the_course_X;
extern const char *Txt_Register_me_in_the_course_X;
@ -836,9 +834,7 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
/***** Start list of options *****/
fprintf (Gbl.F.Out,"<div style=\"display:inline-block; margin:0 auto;\">"
"<ul class=\"%s\" style=\"list-style-type:none;"
" text-align:left;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
"<ul class=\"LIST_LEFT\">");
/***** Register user in course / Modify user's data *****/
if (Gbl.CurrentCrs.Crs.CrsCod > 0 &&
@ -1045,7 +1041,6 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
static void Enr_PutActionsRegRemSeveralUsrs (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Register_the_users_indicated_in_step_1;
extern const char *Txt_Remove_the_users_indicated_in_step_1;
extern const char *Txt_Remove_the_users_not_indicated_in_step_1;
@ -1054,9 +1049,7 @@ static void Enr_PutActionsRegRemSeveralUsrs (void)
/***** Start list of options *****/
fprintf (Gbl.F.Out,"<div style=\"display:inline-block; margin:0 auto;\">"
"<ul class=\"%s\" style=\"list-style-type:none;"
" text-align:left;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
"<ul class=\"LIST_LEFT\">");
/***** Register / remove users listed or not listed *****/
if (Gbl.CurrentCrs.Crs.CrsCod > 0) // Course selected
@ -2117,8 +2110,7 @@ void Enr_ShowEnrollmentRequests (void)
/* Scope (whole platform, current centre, current degree or current course) */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:middle;\">"
"<td class=\"%s\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">",
@ -2137,8 +2129,7 @@ void Enr_ShowEnrollmentRequests (void)
/* Users' roles in listing */
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=\"DAT\""

38
swad_exam.c
View File

@ -855,8 +855,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Name of the course *****/
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\""
@ -876,8 +875,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Year (optional, 1º, 2º, 3º, 4º, 5º...) *****/
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\""
@ -905,8 +903,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Exam session *****/
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\""
@ -924,8 +921,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Date of the exam *****/
fprintf (Gbl.F.Out,"<tr>" \
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:top;\">"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s:"
"</td>",
StyleForm,Txt_EXAM_ANNOUNCEMENT_Exam_date);
@ -953,8 +949,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Start time *****/
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\""
@ -1000,8 +995,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Approximate duration of the exam *****/
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\""
@ -1064,8 +1058,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Place where the exam will be made *****/
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\""
@ -1086,8 +1079,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Exam mode *****/
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\""
@ -1108,8 +1100,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Structure of the exam *****/
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\""
@ -1130,8 +1121,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Documentation required *****/
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\""
@ -1152,8 +1142,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Material required *****/
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\""
@ -1174,7 +1163,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Material allowed *****/
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\""
@ -1195,8 +1184,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Other information to students *****/
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\""

37
swad_file_browser.c
View File

@ -4312,8 +4312,7 @@ static void Brw_WriteFormFullTree (void)
extern const char *Txt_Show_all_files;
/***** Start form depending on type of tree *****/
fprintf (Gbl.F.Out,"<div class=\"%s\""
" style=\"text-align:center; vertical-align:middle;\">",
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
Act_FormStart (Brw_ActSeeAdm[Gbl.FileBrowser.Type]);
switch (Gbl.FileBrowser.Type)
@ -7672,7 +7671,7 @@ static void Brw_PutFormToCreateAFolder (const char *FileNameToShow)
/***** Folder *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"%s: "
"%s:&nbsp;"
"</label>"
"<input type=\"text\" name=\"NewFolderName\""
" size=\"32\" maxlength=\"40\" value=\"\" />",
@ -7830,7 +7829,6 @@ static void Brw_PutFormToUploadOneFileClassic (const char *FileNameToShow)
static void Brw_PutFormToPasteAFileOrFolder (const char *FileNameToShow)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Paste;
extern const char *Txt_or_you_can_make_a_file_copy_to_the_folder_X;
@ -7912,7 +7910,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
fprintf (Gbl.F.Out,"<table>"
"<tr>"
"<td style=\"text-align:right;\">"
"<label class=\"%s\">%s:</label>"
"<label class=\"%s\">%s:&nbsp;</label>"
"</td>"
"<td style=\"text-align:left;\">"
"<input type=\"text\" name=\"NewLinkURL\""
@ -7925,7 +7923,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
/***** Link name *****/
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:right;\">"
"<label class=\"%s\">%s (%s):</label>"
"<label class=\"%s\">%s&nbsp;(%s):&nbsp;</label>"
"</td>"
"<td style=\"text-align:left;\">"
"<input type=\"text\" name=\"NewLinkName\""
@ -8905,8 +8903,7 @@ void Brw_ShowFileMetadata (void)
/***** 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;"
@ -8918,8 +8915,7 @@ void Brw_ShowFileMetadata (void)
/***** Publisher's data *****/
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;"
@ -8949,8 +8945,7 @@ void Brw_ShowFileMetadata (void)
/***** 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;"
@ -8962,8 +8957,7 @@ void Brw_ShowFileMetadata (void)
/***** Write the date *****/
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;"
@ -8976,8 +8970,7 @@ void Brw_ShowFileMetadata (void)
/***** Private or public? *****/
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;"
@ -9008,8 +9001,7 @@ void Brw_ShowFileMetadata (void)
/***** License *****/
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;"
@ -9038,8 +9030,7 @@ void Brw_ShowFileMetadata (void)
/***** Write my number of views *****/
if (Gbl.Usrs.Me.Logged)
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;"
@ -9052,8 +9043,7 @@ void Brw_ShowFileMetadata (void)
/***** Write number of identificated views *****/
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;"
@ -9069,8 +9059,7 @@ void Brw_ShowFileMetadata (void)
/***** Write number of public views *****/
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;"