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

This commit is contained in:
Antonio Cañas Vargas 2015-07-22 18:59:44 +02:00
parent ea408cfc96
commit 5c8c8c8826
10 changed files with 234 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swad_changelog.h
View File

@ -103,11 +103,13 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.117.15 (2015/07/22)"
#define Log_PLATFORM_VERSION "SWAD 14.117.17 (2015/07/22)"
// 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.117.17:Jul 22, 2015 Checking "alt" and "title" in all images. (185437 lines)
Version 14.117.16:Jul 22, 2015 Checking "alt" and "title" in all images. (185368 lines)
Version 14.117.15:Jul 22, 2015 Checking "alt" and "title" in all images. (185279 lines)
Version 14.117.14:Jul 22, 2015 Checking "alt" and "title" in all images. (185203 lines)
Version 14.117.13:Jul 22, 2015 Checking "alt" and "title" in all images.

91
swad_statistic.c
View File

@ -1845,7 +1845,8 @@ static void Sta_ShowNumAccessesPerUsr (unsigned long NumRows,MYSQL_RES *mysql_re
" vertical-align:top; background-color:%s;\">",
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (BarWidth)
fprintf (Gbl.F.Out,"<img src=\"%s/%c1x14.gif\" alt=\"\""
fprintf (Gbl.F.Out,"<img src=\"%s/%c1x14.gif\""
" alt=\"\" title=\"\""
" style=\"width:%upx; height:14px;"
" vertical-align:top;\" />"
"&nbsp;",
@ -2356,7 +2357,8 @@ static void Sta_DrawBarColors (Sta_ColorType_t ColorType,float MaxPagesGenerated
Sta_SetColor (ColorType,(float) NumColor,(float) GRAPH_DISTRIBUTION_PER_HOUR_TOTAL_WIDTH,&R,&G,&B);
fprintf (Gbl.F.Out,"<td style=\"width:1px; text-align:left;"
" background-color:#%02X%02X%02X;\">"
"<img src=\"%s/tr1x14.gif\" alt=\"\" />"
"<img src=\"%s/tr1x14.gif\""
" alt=\"\" title=\"\" />"
"</td>",
R,G,B,Gbl.Prefs.IconsURL);
}
@ -2769,7 +2771,8 @@ static void Sta_WriteAccessHour (unsigned Hour,float NumPagesGenerated,float Max
AltoBarra = (unsigned) (((NumPagesGenerated * 400.0) / MaxPagesGenerated) + 0.5);
if (AltoBarra == 0)
AltoBarra = 1;
fprintf (Gbl.F.Out,"<img src=\"%s/c8x1.gif\" alt=\"\""
fprintf (Gbl.F.Out,"<img src=\"%s/c8x1.gif\""
" alt=\"\" title=\"\""
" style=\"width:8px; height:%upx;\" /><br />",
Gbl.Prefs.IconsURL,AltoBarra);
}
@ -2862,7 +2865,8 @@ static void Sta_ShowAverageAccessesPerMinute (unsigned long NumRows,MYSQL_RES *m
/* First division (left) */
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"width:%upx;text-align:left;\">"
"<img src=\"%s/ejexizq24x1.gif\" alt=\"\""
"<img src=\"%s/ejexizq24x1.gif\""
" alt=\"\" title=\"\""
" style=\"display:block; width:%upx; height:1px;\" />"
"</td>",
WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.IconsURL,
@ -2872,7 +2876,8 @@ static void Sta_ShowAverageAccessesPerMinute (unsigned long NumRows,MYSQL_RES *m
i < NUM_DIVISIONS_X*2;
i++)
fprintf (Gbl.F.Out,"<td style=\"width:%upx; text-align:left;\">"
"<img src=\"%s/ejex24x1.gif\" alt=\"\""
"<img src=\"%s/ejex24x1.gif\""
" alt=\"\" title=\"\""
" style=\"display:block;"
" width:%upx; height:1px;\" />"
"</td>",
@ -2880,7 +2885,8 @@ static void Sta_ShowAverageAccessesPerMinute (unsigned long NumRows,MYSQL_RES *m
WIDTH_SEMIDIVISION_GRAPHIC);
/* Last division (right) */
fprintf (Gbl.F.Out,"<td style=\"width:%upx; text-align:left;\">"
"<img src=\"%s/tr24x1.gif\" alt=\"\""
"<img src=\"%s/tr24x1.gif\""
" alt=\"\" title=\"\""
" style=\"display:block; width:%upx; height:1px;\" />"
"</td>"
"</tr>",
@ -2971,7 +2977,8 @@ static void Sta_WriteAccessMinute (unsigned Minute,float NumPagesGenerated,float
/***** Draw bar with anchura proporcional al number of clicks *****/
if (NumPagesGenerated != 0.0)
if ((BarWidth = (unsigned) (((NumPagesGenerated * (float) WIDTH_GRAPHIC / MaxX)) + 0.5)) != 0)
fprintf (Gbl.F.Out,"<img src=\"%s/b%c1x1.gif\" alt=\"\""
fprintf (Gbl.F.Out,"<img src=\"%s/b%c1x1.gif\""
" alt=\"\" title=\"\""
" style=\"display:block;"
" width:%upx; height:1px;\" />",
Gbl.Prefs.IconsURL,
@ -3254,7 +3261,8 @@ static void Sta_ShowNumAccessesPerBanner (unsigned long NumRows,MYSQL_RES *mysql
"<td class=\"LOG\""
" style=\"text-align:left; vertical-align:top;\">"
"<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">"
"<img src=\"%s/%s/%s\" alt=\"%s\""
"<img src=\"%s/%s/%s\""
" alt=\"%s\" title=\"%s\""
" style=\"width:60px; height:20px;"
" margin:0 8px 4px 0;\" />"
"</a>",
@ -3262,7 +3270,8 @@ static void Sta_ShowNumAccessesPerBanner (unsigned long NumRows,MYSQL_RES *mysql
Ban.FullName,
Cfg_HTTPS_URL_SWAD_PUBLIC,Cfg_FOLDER_BANNER,
Ban.Img,
Ban.ShortName);
Ban.ShortName,
Ban.FullName);
/* Draw bar proportional to number of clicks */
NumClicks = Str_GetFloatNumFromStr (row[1]);
@ -3521,7 +3530,8 @@ static void Sta_DrawBarNumClicks (char Color,float NumPagesGenerated,float MaxPa
BarWidth = (unsigned) (((NumPagesGenerated * (float) MaxBarWidth) / MaxPagesGenerated) + 0.5);
if (BarWidth == 0)
BarWidth = 1;
fprintf (Gbl.F.Out,"<img src=\"%s/%c1x14.gif\" alt=\"\""
fprintf (Gbl.F.Out,"<img src=\"%s/%c1x14.gif\""
" alt=\"\" title=\"\""
" style=\"width:%upx; height:14px;"
" vertical-align:top;\" />"
"&nbsp;",
@ -4030,7 +4040,8 @@ static void Sta_GetAndShowNumCtysInSWAD (void)
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"TIT_TBL\" style=\"text-align:left;\">"
"<img src=\"%s/cty16x16.gif\""
" alt=\"%s\" class=\"ICON16x16\" />"
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />"
"&nbsp;%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:right;\">"
@ -4058,6 +4069,7 @@ static void Sta_GetAndShowNumCtysInSWAD (void)
Gbl.Prefs.IconsURL,
Txt_Countries,
Txt_Countries,
Txt_Countries,
NumCtysTotal,
NumCtysWithInss,
NumCtysWithCtrs,
@ -4153,7 +4165,8 @@ static void Sta_GetAndShowNumInssInSWAD (void)
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"TIT_TBL\" style=\"text-align:left;\">"
"<img src=\"%s/ins16x16.gif\""
" alt=\"%s\" class=\"ICON16x16\" />"
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />"
"&nbsp;%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:right;\">"
@ -4179,6 +4192,7 @@ static void Sta_GetAndShowNumInssInSWAD (void)
Gbl.Prefs.IconsURL,
Txt_Institutions,
Txt_Institutions,
Txt_Institutions,
NumInssTotal,
NumInssWithCtrs,
NumInssWithDegs,
@ -4266,7 +4280,8 @@ static void Sta_GetAndShowNumCtrsInSWAD (void)
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"TIT_TBL\" style=\"text-align:left;\">"
"<img src=\"%s/ctr16x16.gif\""
" alt=\"%s\" class=\"ICON16x16\" />"
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />"
"&nbsp;%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:right;\">"
@ -4290,6 +4305,7 @@ static void Sta_GetAndShowNumCtrsInSWAD (void)
Gbl.Prefs.IconsURL,
Txt_Centres,
Txt_Centres,
Txt_Centres,
NumCtrsTotal,
NumCtrsWithDegs,
NumCtrsWithCrss,
@ -4369,7 +4385,8 @@ static void Sta_GetAndShowNumDegsInSWAD (void)
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"TIT_TBL\" style=\"text-align:left;\">"
"<img src=\"%s/deg16x16.gif\""
" alt=\"%s\" class=\"ICON16x16\" />"
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />"
"&nbsp;%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:right;\">"
@ -4391,6 +4408,7 @@ static void Sta_GetAndShowNumDegsInSWAD (void)
Gbl.Prefs.IconsURL,
Txt_Degrees,
Txt_Degrees,
Txt_Degrees,
NumDegsTotal,
NumDegsWithCrss,
NumDegsWithTchs,
@ -4462,7 +4480,8 @@ static void Sta_GetAndShowNumCrssInSWAD (void)
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"TIT_TBL\" style=\"text-align:left;\">"
"<img src=\"%s/crs16x16.gif\""
" alt=\"%s\" class=\"ICON16x16\" />"
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />"
"&nbsp;%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:right;\">"
@ -4482,6 +4501,7 @@ static void Sta_GetAndShowNumCrssInSWAD (void)
Gbl.Prefs.IconsURL,
Txt_Courses,
Txt_Courses,
Txt_Courses,
NumCrssTotal,
NumCrssWithTchs,
NumCrssWithStds);
@ -6775,6 +6795,7 @@ static void Sta_GetAndShowMsgsStats (void)
static void Sta_GetAndShowForumStats (void)
{
extern const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_TYPES_USE_STATS];
extern const char *Txt_Scope;
extern const char *Txt_Forums;
extern const char *Txt_No_of_forums;
extern const char *Txt_No_of_threads;
@ -6799,6 +6820,7 @@ static void Sta_GetAndShowForumStats (void)
"<th style=\"width:16px;"
" text-align:left; vertical-align:top;\">"
"<img src=\"%s/forum16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" style=\"vertical-align:top;\" />"
"</th>"
"<th class=\"TIT_TBL\""
@ -6835,6 +6857,8 @@ static void Sta_GetAndShowForumStats (void)
"</th>"
"</tr>",
Gbl.Prefs.IconsURL,
Txt_Scope,
Txt_Scope,
Txt_Forums,
Txt_No_of_forums,
Txt_No_of_threads,
@ -7030,7 +7054,9 @@ static void Sta_WriteForumTitleAndStats (For_ForumType_t ForumType,
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"width:16px;"
" text-align:left; vertical-align:top;\">"
"<img src=\"%s/%s\" alt=\"\" class=\"ICON16x16\" />"
"<img src=\"%s/%s\""
" alt=\"%s%s\" title=\"%s%s\""
" class=\"ICON16x16\" />"
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:top;\">"
@ -7067,6 +7093,8 @@ static void Sta_WriteForumTitleAndStats (For_ForumType_t ForumType,
"</tr>",
Gbl.Prefs.IconsURL,Icon,
ForumName1,ForumName2,
ForumName1,ForumName2,
ForumName1,ForumName2,
NumForums,NumThreads,NumPosts,NumUsrsToBeNotifiedByEMail,
NumThrsPerForum,NumPostsPerThread,NumPostsPerForum);
}
@ -7622,7 +7650,9 @@ static void Sta_GetAndShowNumUsrsPerLayout (void)
Layout++)
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">"
"<img src=\"%s/%s32x32.gif\" alt=\"%s\" class=\"ICON32x32\" />"
"<img src=\"%s/%s32x32.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON32x32\" />"
"</td>"
"<td class=\"DAT\" style=\"text-align:right;\">"
"%u"
@ -7631,7 +7661,9 @@ static void Sta_GetAndShowNumUsrsPerLayout (void)
"%5.2f%%"
"</td>"
"</tr>",
Gbl.Prefs.IconsURL,Lay_LayoutIcons[Layout],Txt_LAYOUT_NAMES[Layout],
Gbl.Prefs.IconsURL,Lay_LayoutIcons[Layout],
Txt_LAYOUT_NAMES[Layout],
Txt_LAYOUT_NAMES[Layout],
NumUsrs[Layout],
NumUsrsTotal ? (float) NumUsrs[Layout] * 100.0 /
(float) NumUsrsTotal :
@ -7754,7 +7786,8 @@ static void Sta_GetAndShowNumUsrsPerTheme (void)
Theme++)
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">"
"<img src=\"%s/%s/%s/theme_32x20.gif\" alt=\"%s\""
"<img src=\"%s/%s/%s/theme_32x20.gif\""
" alt=\"%s\" title=\"%s\""
" style=\"width:32px; height:20px;\" />"
"</td>"
"<td class=\"DAT\" style=\"text-align:right;\">"
@ -7764,7 +7797,9 @@ static void Sta_GetAndShowNumUsrsPerTheme (void)
"%5.2f%%"
"</td>"
"</tr>",
Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_THEMES,The_ThemeId[Theme],The_ThemeNames[Theme],
Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_THEMES,The_ThemeId[Theme],
The_ThemeNames[Theme],
The_ThemeNames[Theme],
NumUsrs[Theme],
NumUsrsTotal ? (float) NumUsrs[Theme] * 100.0 /
(float) NumUsrsTotal :
@ -7886,7 +7921,8 @@ static void Sta_GetAndShowNumUsrsPerIconSet (void)
IconSet++)
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:left;\">"
"<img src=\"%s/%s/%s/%s/heart64x64.gif\" alt=\"%s\""
"<img src=\"%s/%s/%s/%s/heart64x64.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON32x32\" />"
"</td>"
"<td class=\"DAT\" style=\"text-align:right;\">"
@ -7901,6 +7937,7 @@ static void Sta_GetAndShowNumUsrsPerIconSet (void)
Ico_IconSetId[IconSet],
Cfg_ICON_ACTION,
Ico_IconSetNames[IconSet],
Ico_IconSetNames[IconSet],
NumUsrs[IconSet],
NumUsrsTotal ? (float) NumUsrs[IconSet] * 100.0 /
(float) NumUsrsTotal :
@ -8023,7 +8060,9 @@ static void Sta_GetAndShowNumUsrsPerMenu (void)
Menu++)
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">"
"<img src=\"%s/%s32x32.gif\" alt=\"%s\" class=\"ICON32x32\" />"
"<img src=\"%s/%s32x32.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON32x32\" />"
"</td>"
"<td class=\"DAT\" style=\"text-align:right;\">"
"%u"
@ -8032,7 +8071,9 @@ static void Sta_GetAndShowNumUsrsPerMenu (void)
"%5.2f%%"
"</td>"
"</tr>",
Gbl.Prefs.IconsURL,Mnu_MenuIcons[Menu],Txt_MENU_NAMES[Menu],
Gbl.Prefs.IconsURL,Mnu_MenuIcons[Menu],
Txt_MENU_NAMES[Menu],
Txt_MENU_NAMES[Menu],
NumUsrs[Menu],
NumUsrsTotal ? (float) NumUsrs[Menu] * 100.0 /
(float) NumUsrsTotal :
@ -8153,7 +8194,8 @@ static void Sta_GetAndShowNumUsrsPerSideColumns (void)
SideCols++)
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">"
"<img src=\"%s/layout%u%u_32x20.gif\" alt=\"%s\""
"<img src=\"%s/layout%u%u_32x20.gif\""
" alt=\"%s\" title=\"%s\""
" style=\"width:32px; height:20px;\" />"
"</td>"
"<td class=\"DAT\" style=\"text-align:right;\">"
@ -8165,6 +8207,7 @@ static void Sta_GetAndShowNumUsrsPerSideColumns (void)
"</tr>",
Gbl.Prefs.IconsURL,SideCols >> 1,SideCols & 1,
Txt_LAYOUT_SIDE_COLUMNS[SideCols],
Txt_LAYOUT_SIDE_COLUMNS[SideCols],
NumUsrs[SideCols],
NumUsrsTotal ? (float) NumUsrs[SideCols] * 100.0 /
(float) NumUsrsTotal :

27
swad_survey.c
View File

@ -3233,6 +3233,16 @@ static void Svy_DrawBarNumUsrs (unsigned NumUsrs,unsigned MaxUsrs)
extern const char *Txt_of_PART_OF_A_TOTAL;
unsigned BarWidth = 0;
/***** String with the number of users *****/
if (MaxUsrs)
sprintf (Gbl.Title,"%u&nbsp;(%u%%&nbsp;%s&nbsp;%u)",
NumUsrs,
(unsigned) ((((float) NumUsrs * 100.0) / (float) MaxUsrs) + 0.5),
Txt_of_PART_OF_A_TOTAL,MaxUsrs);
else
sprintf (Gbl.Title,"0&nbsp;(0%%&nbsp;%s&nbsp;%u)",
Txt_of_PART_OF_A_TOTAL,MaxUsrs);
/***** Draw bar with a with proportional to the number of clicks *****/
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"width:%upx;"
" text-align:left; vertical-align:top;\">",
@ -3242,21 +3252,20 @@ static void Svy_DrawBarNumUsrs (unsigned NumUsrs,unsigned MaxUsrs)
(float) MaxUsrs) + 0.5);
if (BarWidth < 2)
BarWidth = 2;
fprintf (Gbl.F.Out,"<img src=\"%s/c1x16.gif\" alt=\"\""
fprintf (Gbl.F.Out,"<img src=\"%s/c1x16.gif\""
" alt=\"%s\" title=\"%s\""
" style=\"width:%upx; height:16px;"
" vertical-align:top;\" />"
"&nbsp;",
Gbl.Prefs.IconsURL,BarWidth);
Gbl.Prefs.IconsURL,
Gbl.Title,
Gbl.Title,
BarWidth);
/***** Write the number of users *****/
if (MaxUsrs)
fprintf (Gbl.F.Out,"%u&nbsp;(%u",
NumUsrs,(unsigned) ((((float) NumUsrs * 100.0) / (float) MaxUsrs) + 0.5));
else
fprintf (Gbl.F.Out,"0&nbsp;(0");
fprintf (Gbl.F.Out,"%%&nbsp;%s&nbsp;%u)</td>"
fprintf (Gbl.F.Out,"%s</td>"
"</tr>",
Txt_of_PART_OF_A_TOTAL,MaxUsrs);
Gbl.Title);
}
/*****************************************************************************/

37
swad_syllabus.c
View File

@ -514,9 +514,11 @@ static void Syl_ShowSyllabus (Inf_InfoType_t InfoType)
static void Syl_ShowRowSyllabus (Inf_InfoType_t InfoType,unsigned NumItem,int Level,int *CodItem,const char *Text,bool NewItem)
{
extern const char *Txt_Removal_not_allowed;
extern const char *Txt_Remove;
extern const char *Txt_Move_up_X_and_its_subsections;
extern const char *Txt_Move_up_X;
extern const char *Txt_Movement_not_allowed;
extern const char *Txt_Move_down_X_and_its_subsections;
extern const char *Txt_Move_down_X;
extern const char *Txt_Increase_level_of_X;
@ -547,8 +549,11 @@ static void Syl_ShowRowSyllabus (Inf_InfoType_t InfoType,unsigned NumItem,int Le
fprintf (Gbl.F.Out,"<td class=\"BM%d\">",Gbl.RowEvenOdd);
if (LstItemsSyllabus.Lst[NumItem].HasChildren)
fprintf (Gbl.F.Out,"<img src=\"%s/deloff16x16.gif\""
" alt=\"\" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL);
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL,
Txt_Removal_not_allowed,
Txt_Removal_not_allowed);
else
{
Act_FormStart (InfoType == Inf_LECTURES ? ActDelItmSylLec :
@ -586,8 +591,11 @@ static void Syl_ShowRowSyllabus (Inf_InfoType_t InfoType,unsigned NumItem,int Le
}
else
fprintf (Gbl.F.Out,"<img src=\"%s/up_off16x16.gif\""
" alt=\"\" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL);
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL,
Txt_Movement_not_allowed,
Txt_Movement_not_allowed);
fprintf (Gbl.F.Out,"</td>");
/***** Icon to get down item *****/
@ -612,8 +620,11 @@ static void Syl_ShowRowSyllabus (Inf_InfoType_t InfoType,unsigned NumItem,int Le
}
else
fprintf (Gbl.F.Out,"<img src=\"%s/down_off16x16.gif\""
" alt=\"\" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL);
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL,
Txt_Movement_not_allowed,
Txt_Movement_not_allowed);
fprintf (Gbl.F.Out,"</td>");
/***** Icon to increase the level of an item *****/
@ -635,8 +646,11 @@ static void Syl_ShowRowSyllabus (Inf_InfoType_t InfoType,unsigned NumItem,int Le
}
else
fprintf (Gbl.F.Out,"<img src=\"%s/left_off16x16.gif\""
" alt=\"\" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL);
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL,
Txt_Movement_not_allowed,
Txt_Movement_not_allowed);
fprintf (Gbl.F.Out,"</td>");
/***** Icon to decrease level item *****/
@ -659,8 +673,11 @@ static void Syl_ShowRowSyllabus (Inf_InfoType_t InfoType,unsigned NumItem,int Le
}
else
fprintf (Gbl.F.Out,"<img src=\"%s/right_off16x16.gif\""
" alt=\"\" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL);
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL,
Txt_Movement_not_allowed,
Txt_Movement_not_allowed);
fprintf (Gbl.F.Out,"</td>");
LastLevel = Level;

27
swad_test.c
View File

@ -1421,10 +1421,14 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,bool
"<img src=\"%s/",
Gbl.Prefs.IconsURL);
if (TagHidden)
fprintf (Gbl.F.Out,"hidden_off16x16.gif\" alt=\"%s",
fprintf (Gbl.F.Out,"hidden_off16x16.gif\""
" alt=\"%s\" title=\"%s",
Txt_Tag_not_allowed,
Txt_Tag_not_allowed);
else
fprintf (Gbl.F.Out,"visible_off16x16.gif\" alt=\"%s",
fprintf (Gbl.F.Out,"visible_off16x16.gif\""
" alt=\"%s\" title=\"%s",
Txt_Tag_allowed,
Txt_Tag_allowed);
fprintf (Gbl.F.Out,"\" class=\"ICON16x16\" />"
"</td>");
@ -2781,8 +2785,11 @@ static void Tst_WriteAnswersOfAQstEdit (long QstCod)
"<td class=\"BT%d\">",Gbl.RowEvenOdd);
if (Str_ConvertToUpperLetter (row[2][0]) == 'Y')
fprintf (Gbl.F.Out,"<img src=\"%s/ok_on16x16.gif\""
" alt=\"%s\" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL,Txt_TEST_Correct_answer);
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL,
Txt_TEST_Correct_answer,
Txt_TEST_Correct_answer);
fprintf (Gbl.F.Out,"</td>");
/* Write the number of option */
@ -3215,14 +3222,16 @@ static void Tst_WriteChoiceAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res,
" vertical-align:top;\">");
if (AnswersUsr[Indexes[NumOpt]] == true) // This answer has been selected by the user
fprintf (Gbl.F.Out,"<img src=\"%s/%s16x16.gif\""
" alt=\"%s\" title=\"%s\" class=\"ICON16x16\" />",
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL,
(Gbl.Test.Config.FeedbackType == Tst_FEEDBACK_EACH_GOOD_BAD ||
Gbl.Test.Config.FeedbackType == Tst_FEEDBACK_FULL_FEEDBACK) ?
(Gbl.Test.Answer.Options[Indexes[NumOpt]].Correct ? "ok_green" :
"ok_red") :
"ok_on",
Txt_TEST_User_answer,Txt_TEST_User_answer);
Txt_TEST_User_answer,
Txt_TEST_User_answer);
fprintf (Gbl.F.Out,"</td>");
/* Draw icon that indicates whether the answer is correct */
@ -3233,9 +3242,11 @@ static void Tst_WriteChoiceAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res,
{
if (Gbl.Test.Answer.Options[Indexes[NumOpt]].Correct)
fprintf (Gbl.F.Out,"<img src=\"%s/ok_on16x16.gif\""
" alt=\"%s\" title=\"%s\" class=\"ICON16x16\" />",
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL,
Txt_TEST_Correct_answer,Txt_TEST_Correct_answer);
Txt_TEST_Correct_answer,
Txt_TEST_Correct_answer);
}
else
fprintf (Gbl.F.Out,"?");

13
swad_test_import.c
View File

@ -1025,12 +1025,15 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"BT%d\" style=\"text-align:center;\">"
"<img src=\"%s/%s16x16.gif\""
" alt=\"\" title=\"%s\" class=\"ICON16x16\" />"
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />"
"</td>",
Gbl.RowEvenOdd,
Gbl.Prefs.IconsURL,
QuestionExists ? "tr" :
"ok_green",
QuestionExists ? Txt_Existing_question :
Txt_New_question,
QuestionExists ? Txt_Existing_question :
Txt_New_question);
@ -1090,10 +1093,12 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
/* Put an icon that indicates whether shuffle is enabled or not */
if (Gbl.Test.Shuffle)
fprintf (Gbl.F.Out,"<img src=\"%s/%s16x16.gif\""
" alt=\"%s\" class=\"ICON16x16\" />",
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL,
QuestionExists ? "ok_off" :
"ok_on",
Txt_TEST_Correct_answer,
Txt_TEST_Correct_answer);
fprintf (Gbl.F.Out,"</td>");
@ -1157,10 +1162,12 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
"<td class=\"BT%d\">",Gbl.RowEvenOdd);
if (Gbl.Test.Answer.Options[NumOpt].Correct)
fprintf (Gbl.F.Out,"<img src=\"%s/%s16x16.gif\""
" alt=\"%s\" class=\"ICON16x16\" />",
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL,
QuestionExists ? "ok_off" :
"ok_on",
Txt_TEST_Correct_answer,
Txt_TEST_Correct_answer);
fprintf (Gbl.F.Out,"</td>");

42
swad_text.c
View File

@ -12795,6 +12795,27 @@ const char *Txt_Guided_academic_assignments =
"Atividades acad&eacute;micas guided";
#endif
const char *Txt_Happy_birthday =
#if L==0
"Feli&ccedil; aniversari!";
#elif L==1
"Gute zum Geburtstag!";
#elif L==2
"Happy birthday!";
#elif L==3
"&iexcl;Feliz cumplea&ntilde;os!";
#elif L==4
"Joyeux anniversaire!";
#elif L==5
"&iexcl;Feliz cumplea&ntilde;os!"; // Okoteve traducción
#elif L==6
"Buon compleanno!";
#elif L==7
"Wszystkiego najlepszego!";
#elif L==8
"Feliz anivers&aacute;rio!";
#endif
const char *Txt_HELP_email =
#if L==0
"Exemple: garcia@exemplemail.com";
@ -21633,6 +21654,27 @@ const char *Txt_Move_thread =
"Mover thread";
#endif
const char *Txt_Movement_not_allowed =
#if L==0
"Moviment no perm&egrave;s";
#elif L==1
"Bewegung nicht erlaubt";
#elif L==2
"Move up not allowed";
#elif L==3
"Movimiento no permitido";
#elif L==4
"Mouvement pas autoris&eacute;";
#elif L==5
"Movimiento no permitido"; // Okoteve traducción
#elif L==6
"Movimento non consentito";
#elif L==7
"Ruch nie jest dozwolone";
#elif L==8
"Movimento n&atilde;o permitido";
#endif
const char *Txt_MSG_containing_the_text =
#if L==0
"que contenga el texto"; // Necessita traduccio

1
swad_timetable.c
View File

@ -1101,6 +1101,7 @@ static void TT_TimeTableDrawCell (unsigned Day,unsigned Hour,unsigned Column,uns
case TT_TUT_SHOW:
if (HourType == TT_FREE_HOUR) // If cell is empty...
fprintf (Gbl.F.Out,"<img src=\"%s/tr1x16.gif\""
" alt=\"\" title=\"\""
" style=\"width:1px; height:16px;\" />",
Gbl.Prefs.IconsURL);
else

49
swad_user.c
View File

@ -1380,7 +1380,8 @@ void Usr_WriteFormLogin (void)
/***** User's ID/nickname and password *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"BM\">"
"<img src=\"%s/user16x16.gif\" alt=\"%s\" title=\"%s\""
"<img src=\"%s/user16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">"
@ -1391,7 +1392,8 @@ void Usr_WriteFormLogin (void)
"</tr>"
"<tr>"
"<td class=\"BM\">"
"<img src=\"%s/key16x16.gif\" alt=\"%s\" title=\"%s\""
"<img src=\"%s/key16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">"
@ -1433,6 +1435,7 @@ void Usr_WriteFormLogin (void)
void Usr_WelcomeUsr (void)
{
extern const unsigned Txt_Current_CGI_SWAD_Language;
extern const char *Txt_Happy_birthday;
extern const char *Txt_Welcome[Usr_NUM_SEXS];
extern const char *Txt_Welcome_X[Usr_NUM_SEXS];
extern const char *Txt_Welcome_X_and_happy_birthday[Usr_NUM_SEXS];
@ -1455,9 +1458,12 @@ void Usr_WelcomeUsr (void)
if ((CongratulateMyBirthday = Usr_CheckIfMyBirthdayHasNotBeenCongratulated ()))
{
Usr_InsertMyBirthday ();
fprintf (Gbl.F.Out,"<img src=\"%s/%s/cake128x128.gif\" alt=\"\""
fprintf (Gbl.F.Out,"<img src=\"%s/%s/cake128x128.gif\""
" alt=\"%s\" title=\"%s\""
" style=\"width:128px; height:128px;\" />",
Gbl.Prefs.PathIconSet,Cfg_ICON_128x128);
Gbl.Prefs.PathIconSet,Cfg_ICON_128x128,
Txt_Happy_birthday,
Txt_Happy_birthday);
sprintf (Gbl.Message,Txt_Welcome_X_and_happy_birthday[Gbl.Usrs.Me.UsrDat.Sex],
Gbl.Usrs.Me.UsrDat.FirstName);
}
@ -1533,9 +1539,13 @@ void Usr_PutFormLogIn (void)
Act_FormStart (ActFrmLogIn);
Act_LinkFormSubmit (Txt_Log_in,The_ClassHead[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/login16x16.gif\""
" alt=\"%s\" class=\"ICON16x16\" />"
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />"
" %s</a>",
Gbl.Prefs.PathTheme,Txt_Log_in,Txt_Log_in);
Gbl.Prefs.PathTheme,
Txt_Log_in,
Txt_Log_in,
Txt_Log_in);
Act_FormEnd ();
}
@ -1601,10 +1611,14 @@ void Usr_PutFormLogOut (void)
Act_FormStart (ActLogOut);
Act_LinkFormSubmit (Txt_Log_out,The_ClassHead[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/logout16x16.gif\" alt=\"%s\""
" class=\"ICON16x16\" style=\"vertical-align:middle;\" />"
fprintf (Gbl.F.Out,"<img src=\"%s/logout16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />"
" %s</a>",
Gbl.Prefs.PathTheme,Txt_Log_out,Txt_Log_out);
Gbl.Prefs.PathTheme,
Txt_Log_out,
Txt_Log_out,
Txt_Log_out);
Act_FormEnd ();
}
@ -2605,7 +2619,8 @@ static void Usr_WriteRowGstMainData (unsigned NumUsr,struct UsrData *UsrDat)
/***** Student has accepted enrollment in current course? *****/
fprintf (Gbl.F.Out,"<td class=\"BM%d\">"
"<img src=\"%s/tr16x16.gif\" alt=\"\""
"<img src=\"%s/tr16x16.gif\""
" alt=\"\" title=\"\""
" class=\"ICON16x16\" />"
"</td>",
Gbl.RowEvenOdd,
@ -2701,12 +2716,15 @@ void Usr_WriteRowStdMainData (unsigned NumUsr,struct UsrData *UsrDat,bool PutChe
else
fprintf (Gbl.F.Out,"BM%d",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"\">"
"<img src=\"%s/%s16x16.gif\" alt=\"\" title=\"%s\""
"<img src=\"%s/%s16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />"
"</td>",
Gbl.Prefs.IconsURL,
UsrDat->Accepted ? "ok_on" :
"tr",
UsrDat->Accepted ? Txt_Enrollment_confirmed :
Txt_Enrollment_not_confirmed,
UsrDat->Accepted ? Txt_Enrollment_confirmed :
Txt_Enrollment_not_confirmed);
@ -3022,11 +3040,14 @@ static void Usr_WriteRowTchMainData (unsigned NumUsr,struct UsrData *UsrDat,bool
fprintf (Gbl.F.Out,"BM%d",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"\">"
"<img src=\"%s/%s16x16.gif\""
" alt=\"\" title=\"%s\" class=\"ICON16x16\" />"
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />"
"</td>",
Gbl.Prefs.IconsURL,
UsrDat->Accepted ? "ok_on" :
"tr",
UsrDat->Accepted ? Txt_Enrollment_confirmed :
Txt_Enrollment_not_confirmed,
UsrDat->Accepted ? Txt_Enrollment_confirmed :
Txt_Enrollment_not_confirmed);
@ -4778,11 +4799,13 @@ static void Usr_FormToSelectUsrListType (Act_Action_t NextAction,Usr_ShowUsrsTyp
Usr_PutExtraParamsUsrList (NextAction);
Act_LinkFormSubmit (Txt_USR_LIST_TYPES[ListType],The_ClassFormulNB[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/%s16x16.gif\""
" alt=\"%s\" class=\"ICON16x16\" />"
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />"
" %s</a>",
Gbl.Prefs.IconsURL,
Usr_IconsClassPhotoOrList[ListType],
Txt_USR_LIST_TYPES[ListType],
Txt_USR_LIST_TYPES[ListType],
Txt_USR_LIST_TYPES[ListType]);
Act_FormEnd ();
}

16
swad_zip.c
View File

@ -330,10 +330,13 @@ void ZIP_PutButtonToDownloadZIPOfAFolder (const char *PathInTree,const char *Fil
}
Brw_ParamListFiles (Brw_IS_FOLDER,PathInTree,FileName);
Act_LinkFormSubmit (Txt_Create_ZIP_file,The_ClassFormul[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/download16x16.gif\" alt=\"%s\""
" title=\"%s\" class=\"ICON16x16B\" />"
fprintf (Gbl.F.Out,"<img src=\"%s/download16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16B\" />"
"</a>",
Gbl.Prefs.IconsURL,Txt_Create_ZIP_file,Txt_Create_ZIP_file);
Gbl.Prefs.IconsURL,
Txt_Create_ZIP_file,
Txt_Create_ZIP_file);
Act_FormEnd ();
}
@ -572,7 +575,8 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
"<td colspan=\"2\"class=\"FILENAME\""
" style=\"text-align:center; vertical-align:middle;\">"
"<a href=\"%s\" class=\"FILENAME\" title=\"%s\" target=\"_blank\">"
"<img src=\"%s/%s32x32/zip32x32.gif\" alt=\"%s\""
"<img src=\"%s/%s32x32/zip32x32.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON32x32\" />"
"&nbsp;%s&nbsp;"
"<img src=\"%s/down32x32.gif\""
@ -584,9 +588,11 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
URL,FileName,
Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_FILEXT,
Txt_ZIP_file,
Txt_ZIP_file,
FileNameShort,
Gbl.Prefs.IconsURL,
Txt_Download,Txt_Download);
Txt_Download,
Txt_Download);
/***** Filename *****/
fprintf (Gbl.F.Out,"<tr>"