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 16.252.2

This commit is contained in:
Antonio Cañas Vargas 2017-09-10 23:24:23 +02:00
parent 37da7184be
commit d6a7ba9cd0
14 changed files with 122 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
css/swad16.251.8.css → css/swad16.252.2.css
View File

@ -1534,10 +1534,8 @@ a:hover /* Default ==> underlined */
/*********************************** Icons ***********************************/
.ICO20x15 {width:20px; height:15px; vertical-align:middle;}
.ICO20x20 {width:20px; height:20px; vertical-align:middle;}
.ICO20x20B {width:20px; height:20px; vertical-align:middle; display:block;}
.ICO25x25 {width:25px; height:25px; vertical-align:middle;}
.ICO25x25B {width:25px; height:25px; vertical-align:middle; display:block;}
.ICO40x25B {width:40px; height:25px; vertical-align:middle;}
.ICO40x25 {width:40px; height:25px; vertical-align:middle;}
.ICO40x40 {width:40px; height:40px; vertical-align:middle;}
.ICO64x64 {width:64px; height:64px; vertical-align:middle;}
.ICO160x160 {width:160px; height:160px; vertical-align:middle;}
@ -1553,8 +1551,8 @@ a:hover /* Default ==> underlined */
.CONTEXT_OPT
{
display:inline-block;
margin-left:6px;
margin-right:6px;
margin-left:2px;
margin-right:2px;
white-space:nowrap;
}
.CONTEXT_COL
@ -1923,7 +1921,7 @@ a:hover img.CENTRE_PHOTO_SHOW
}
.ICO_HIGHLIGHT, .CHECKBOX_UNCHECKED
{
opacity:0.6;
opacity:0.7;
}
.ICO_HIGHLIGHT:hover, .CHECKBOX_UNCHECKED:hover, .CHECKBOX_CHECKED
{

2
swad_calendar.c
View File

@ -86,7 +86,7 @@ void Cal_PutIconsToSelectFirstDayOfWeek (void)
Box_StartBox (NULL,Txt_Calendar,Cal_PutIconsFirstDayOfWeek,
Hlp_PROFILE_Preferences_calendar,Box_NOT_CLOSABLE);
Cal_ShowFormToSelFirstDayOfWeek (ActChg1stDay,NULL,"ICO25x25B");
Cal_ShowFormToSelFirstDayOfWeek (ActChg1stDay,NULL,"ICO25x25");
Box_EndBox ();
}

5
swad_changelog.h
View File

@ -238,13 +238,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.252.1 (2017-09-09)"
#define CSS_FILE "swad16.251.8.css"
#define Log_PLATFORM_VERSION "SWAD 16.252.2 (2017-09-10)"
#define CSS_FILE "swad16.252.2.css"
#define JS_FILE "swad16.206.3.js"
// 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 16.252.2: Sep 10, 2017 Code refactoring in edition of syllabus. (226819 lines)
Version 16.252.1: Sep 09, 2017 Icons to move up and down questions in a game. (226864 lines)
Version 16.252: Sep 08, 2017 Icons to move up and down questions in a game. (226852 lines)
Version 16.251.13:Sep 07, 2017 Option Remote Control moved after Test. (226873 lines)

42
swad_file_browser.c
View File

@ -5509,16 +5509,19 @@ static void Brw_PutIconRemoveFile (const char PathInTree[PATH_MAX + 1],
PathInTree,FileName,
Gbl.FileBrowser.FileType,-1L);
sprintf (Gbl.Title,Txt_Remove_FILE_OR_LINK_X,FileNameToShow);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/remove-on64x64.png\""
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT ICO_HIGHLIGHT\">"
"<input type=\"image\" src=\"%s/remove-on64x64.png\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20B\" />",
" class=\"ICO20x20\" />"
"</div>",
Gbl.Prefs.IconsURL,
Gbl.Title,
Gbl.Title);
Act_FormEnd ();
}
else
Ico_PutIconBRemovalNotAllowed ();
// Ico_PutIconBRemovalNotAllowed ();
Ico_PutIconRemovalNotAllowed ();
fprintf (Gbl.F.Out,"</td>");
}
@ -5541,16 +5544,19 @@ static void Brw_PutIconRemoveDir (const char PathInTree[PATH_MAX + 1],
PathInTree,FileName,
Brw_IS_FOLDER,-1L);
sprintf (Gbl.Title,Txt_Remove_folder_X,FileNameToShow);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/remove-on64x64.png\""
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT ICO_HIGHLIGHT\">"
"<input type=\"image\" src=\"%s/remove-on64x64.png\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20B\" />",
" class=\"ICO20x20\" />"
"</div>",
Gbl.Prefs.IconsURL,
Gbl.Title,
Gbl.Title);
Act_FormEnd ();
}
else
Ico_PutIconBRemovalNotAllowed ();
// Ico_PutIconBRemovalNotAllowed ();
Ico_PutIconRemovalNotAllowed ();
fprintf (Gbl.F.Out,"</td>");
}
@ -5573,7 +5579,7 @@ static void Brw_PutIconCopy (const char PathInTree[PATH_MAX + 1],
sprintf (Gbl.Title,Txt_Copy_FOLDER_FILE_OR_LINK_X,FileNameToShow);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/copy_on16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20B\" />",
" class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL,
Gbl.Title,
Gbl.Title);
@ -5601,7 +5607,7 @@ static void Brw_PutIconPasteOn (const char PathInTree[PATH_MAX + 1],
sprintf (Gbl.Title,Txt_Paste_in_X,FileNameToShow);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/paste_on16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20B\" />",
" class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL,
Gbl.Title,
Gbl.Title);
@ -5620,7 +5626,7 @@ static void Brw_PutIconPasteOff (void)
fprintf (Gbl.F.Out,"<td class=\"BM%u\">"
"<img src=\"%s/paste_off16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20B\" />"
" class=\"ICO20x20\" />"
"</td>",
Gbl.RowEvenOdd,Gbl.Prefs.IconsURL,
Txt_Copy_not_allowed,
@ -5650,7 +5656,7 @@ static void Brw_IndentAndWriteIconExpandContract (unsigned Level,Brw_ExpandTree_
case Brw_EXPAND_TREE_NOTHING:
fprintf (Gbl.F.Out,"<img src=\"%s/tr16x16.gif\""
" alt=\"\" title=\"\""
" class=\"ICO20x20B\" />",
" class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL);
break;
case Brw_EXPAND_TREE_PLUS:
@ -5663,7 +5669,7 @@ static void Brw_IndentAndWriteIconExpandContract (unsigned Level,Brw_ExpandTree_
sprintf (Gbl.Title,"%s %s",Txt_Expand,FileNameToShow);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/expand64x64.png\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20B\" />",
" class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL,
Gbl.Title,
Gbl.Title);
@ -5680,7 +5686,7 @@ static void Brw_IndentAndWriteIconExpandContract (unsigned Level,Brw_ExpandTree_
sprintf (Gbl.Title,"%s %s",Txt_Contract,FileNameToShow);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/contract64x64.png\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20B\" />",
" class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL,
Gbl.Title,
Gbl.Title);
@ -5709,7 +5715,7 @@ static void Brw_IndentDependingOnLevel (unsigned Level)
fprintf (Gbl.F.Out,"<td style=\"width:20px;\">"
"<img src=\"%s/tr16x16.gif\""
" alt=\"\" title=\"\""
" class=\"ICO20x20B\" />"
" class=\"ICO20x20\" />"
"</td>",
Gbl.Prefs.IconsURL);
}
@ -5730,7 +5736,7 @@ static void Brw_PutIconShow (unsigned Level,const char *PathInTree,const char *F
sprintf (Gbl.Title,Txt_Show_FOLDER_FILE_OR_LINK_X,FileNameToShow);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/eye-slash-%s64x64.png\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20B\" />",
" class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL,
Brw_CheckIfAnyUpperLevelIsHidden (Level) ? "off" :
"on",
@ -5756,7 +5762,7 @@ static void Brw_PutIconHide (unsigned Level,const char *PathInTree,const char *F
sprintf (Gbl.Title,Txt_Hide_FOLDER_FILE_OR_LINK_X,FileNameToShow);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/eye-%s64x64.png\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20B\" />",
" class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL,
Brw_CheckIfAnyUpperLevelIsHidden (Level) ? "off" :
"on",
@ -5810,7 +5816,7 @@ static void Brw_PutIconFolder (unsigned Level,Brw_ExpandTree_t ExpandTree,
fprintf (Gbl.F.Out,"<input type=\"image\""
" src=\"%s/folder-%s-plus16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20B\" />",
" class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL,
(ExpandTree == Brw_EXPAND_TREE_PLUS) ? "closed" :
"open",
@ -5821,7 +5827,7 @@ static void Brw_PutIconFolder (unsigned Level,Brw_ExpandTree_t ExpandTree,
else // I can't create a new file or folder
fprintf (Gbl.F.Out,"<img src=\"%s/folder-%s16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20B\" />",
" class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL,
(ExpandTree == Brw_EXPAND_TREE_PLUS) ? "closed" :
"open",
@ -5844,7 +5850,7 @@ static void Brw_PutIconNewFileOrFolder (void)
fprintf (Gbl.F.Out,"<td class=\"BM%u\">"
"<img src=\"%s/star16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20B\" />"
" class=\"ICO20x20\" />"
"</td>",
Gbl.RowEvenOdd,Gbl.Prefs.IconsURL,
Txt_New_FILE_OR_FOLDER,

3
swad_global.h
View File

@ -493,7 +493,8 @@ struct Globals
struct
{
char PathDir[PATH_MAX + 1];
unsigned NumItem;
unsigned NumItem; // Item beeing edited
unsigned ParamNumItem; // Used as parameter in forms
bool EditionIsActive;
Syl_WhichSyllabus_t WhichSyllabus;
} Syllabus;

27
swad_icon.c
View File

@ -90,7 +90,7 @@ void Ico_PutIconsToSelectIconSet (void)
Act_FormStart (ActChgIco);
Par_PutHiddenParamString ("IconSet",Ico_IconSetId[IconSet]);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s/%s/%s/heart64x64.gif\""
" alt=\"%s\" title=\"%s\" class=\"ICO25x25B\" />",
" alt=\"%s\" title=\"%s\" class=\"ICO25x25\" />",
Gbl.Prefs.IconsURL,
Cfg_ICON_FOLDER_ICON_SETS,
Ico_IconSetId[IconSet],
@ -323,24 +323,7 @@ void Ico_PutIconRemovalNotAllowed (void)
{
extern const char *Txt_Removal_not_allowed;
fprintf (Gbl.F.Out,"<img src=\"%s/remove-off64x64.png\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL,
Txt_Removal_not_allowed,
Txt_Removal_not_allowed);
}
void Ico_PutIconBRemovalNotAllowed (void)
{
extern const char *Txt_Removal_not_allowed;
fprintf (Gbl.F.Out,"<img src=\"%s/remove-off64x64.png\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20B\" />",
Gbl.Prefs.IconsURL,
Txt_Removal_not_allowed,
Txt_Removal_not_allowed);
Ico_PutIconWithText ("remove-off64x64.png",Txt_Removal_not_allowed,NULL);
}
/*****************************************************************************/
@ -351,9 +334,11 @@ void Ico_PutIconRemove (void)
{
extern const char *Txt_Remove;
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/remove-on64x64.png\""
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT ICO_HIGHLIGHT\">"
"<input type=\"image\" src=\"%s/remove-on64x64.png\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />",
" class=\"ICO20x20\" />"
"</div>",
Gbl.Prefs.IconsURL,
Txt_Remove,
Txt_Remove);

1
swad_icon.h
View File

@ -68,7 +68,6 @@ void Ico_PutCalculateIcon (const char *Alt);
void Ico_PutCalculateIconWithText (const char *Alt,const char *Text);
void Ico_PutIconRemovalNotAllowed (void);
void Ico_PutIconBRemovalNotAllowed (void);
void Ico_PutIconRemove (void);
#endif

2
swad_menu.c
View File

@ -412,7 +412,7 @@ void Mnu_PutIconsToSelectMenu (void)
Act_FormStart (ActChgMnu);
Par_PutHiddenParamUnsigned ("Menu",(unsigned) Menu);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s32x32.gif\""
" alt=\"%s\" title=\"%s\" class=\"ICO25x25B\" />",
" alt=\"%s\" title=\"%s\" class=\"ICO25x25\" />",
Gbl.Prefs.IconsURL,
Mnu_MenuIcons[Menu],
Txt_MENU_NAMES[Menu],

2
swad_preference.c
View File

@ -250,7 +250,7 @@ static void Pre_PutIconsToSelectSideCols (void)
Act_FormStart (ActChgCol);
Par_PutHiddenParamUnsigned ("SideCols",SideCols);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/layout%u%u_32x20.gif\""
" alt=\"%s\" title=\"%s\" class=\"ICO40x25B\" />",
" alt=\"%s\" title=\"%s\" class=\"ICO40x25\" />",
Gbl.Prefs.IconsURL,
SideCols >> 1,SideCols & 1,
Txt_LAYOUT_SIDE_COLUMNS[SideCols],

190
swad_syllabus.c
View File

@ -106,11 +106,12 @@ struct
/*****************************************************************************/
static void Syl_SetSyllabusTypeFromAction (void);
static void Syl_ShowSyllabus (void);
static void Syl_ShowSyllabus (bool PutIconToEdit);
static void Syl_ShowRowSyllabus (unsigned NumItem,
int Level,int *CodItem,const char *Text,bool NewItem);
static void Syl_WriteSyllabusIntoHTMLTmpFile (FILE *FileHTMLTmp);
static void Syl_PutFormItemSyllabus (bool NewItem,unsigned NumItem,int Level,int *CodItem,const char *Text);
static void Syl_PutParamNumItem (void);
static void Syl_WriteNumItem (char *StrDst,FILE *FileTgt,int Level,int *CodItem);
@ -219,10 +220,7 @@ bool Syl_CheckSyllabus (long CrsCod,Inf_InfoType_t InfoType)
bool Syl_CheckAndEditSyllabus (void)
{
extern const char *Hlp_COURSE_Syllabus_edit;
extern const char *Hlp_COURSE_Syllabus;
extern const Act_Action_t Inf_ActionsSeeInfo[Inf_NUM_INFO_TYPES];
extern const char *Txt_INFO_TITLE[Inf_NUM_INFO_TYPES];
extern const char *Txt_Done;
bool ICanEdit;
bool PutIconToEdit;
@ -243,23 +241,8 @@ bool Syl_CheckAndEditSyllabus (void)
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM;
PutIconToEdit = ICanEdit && !Gbl.Syllabus.EditionIsActive;
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
PutIconToEdit ? Inf_PutIconToEditInfo :
NULL,
Gbl.Syllabus.EditionIsActive ? Hlp_COURSE_Syllabus_edit :
Hlp_COURSE_Syllabus,
Box_NOT_CLOSABLE,1);
/***** Write the current syllabus *****/
Syl_ShowSyllabus ();
/***** If the syllabus is empty ==> show form to add a iten to the end *****/
if (Gbl.Syllabus.EditionIsActive && LstItemsSyllabus.NumItems == 0)
Syl_ShowRowSyllabus (0,1,LstItemsSyllabus.Lst[0].CodItem,"",true);
/***** End table *****/
Tbl_EndTable ();
Syl_ShowSyllabus (PutIconToEdit);
if (Gbl.Syllabus.EditionIsActive)
{
@ -521,17 +504,28 @@ int Syl_ReadLevelItemSyllabus (void)
/***************** Show a syllabus of lectures or practicals *****************/
/*****************************************************************************/
static void Syl_ShowSyllabus (void)
static void Syl_ShowSyllabus (bool PutIconToEdit)
{
extern const char *Txt_INFO_TITLE[Inf_NUM_INFO_TYPES];
extern const char *Hlp_COURSE_Syllabus_edit;
extern const char *Hlp_COURSE_Syllabus;
unsigned NumItem;
int i;
int NumButtons = Gbl.Syllabus.EditionIsActive ? 5 :
0;
0;
bool ShowRowInsertNewItem = (Gbl.Action.Act == ActInsIteSylLec || Gbl.Action.Act == ActInsIteSylPra ||
Gbl.Action.Act == ActModIteSylLec || Gbl.Action.Act == ActModIteSylPra ||
Gbl.Action.Act == ActRgtIteSylLec || Gbl.Action.Act == ActRgtIteSylPra ||
Gbl.Action.Act == ActLftIteSylLec || Gbl.Action.Act == ActLftIteSylPra);
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
PutIconToEdit ? Inf_PutIconToEditInfo :
NULL,
Gbl.Syllabus.EditionIsActive ? Hlp_COURSE_Syllabus_edit :
Hlp_COURSE_Syllabus,
Box_NOT_CLOSABLE,0);
/***** Set width of columns of the table *****/
fprintf (Gbl.F.Out,"<colgroup>");
for (i = 0;
@ -546,21 +540,29 @@ static void Syl_ShowSyllabus (void)
fprintf (Gbl.F.Out,"<col width=\"*\" />"
"</colgroup>");
/***** Loop for writing all items of the syllabus *****/
for (NumItem = 0;
NumItem < LstItemsSyllabus.NumItems;
NumItem++)
{
Syl_ShowRowSyllabus (NumItem,
LstItemsSyllabus.Lst[NumItem].Level,
LstItemsSyllabus.Lst[NumItem].CodItem,
LstItemsSyllabus.Lst[NumItem].Text,false);
if (ShowRowInsertNewItem && NumItem == Gbl.Syllabus.NumItem)
// Mostrar a new row where se puede insert a new item
Syl_ShowRowSyllabus (NumItem + 1,
LstItemsSyllabus.Lst[NumItem].Level,NULL,
"",true);
}
if (LstItemsSyllabus.NumItems)
/***** Loop writing all items of the syllabus *****/
for (NumItem = 0;
NumItem < LstItemsSyllabus.NumItems;
NumItem++)
{
Syl_ShowRowSyllabus (NumItem,
LstItemsSyllabus.Lst[NumItem].Level,
LstItemsSyllabus.Lst[NumItem].CodItem,
LstItemsSyllabus.Lst[NumItem].Text,false);
if (ShowRowInsertNewItem && NumItem == Gbl.Syllabus.NumItem)
// Mostrar a new row where se puede insert a new item
Syl_ShowRowSyllabus (NumItem + 1,
LstItemsSyllabus.Lst[NumItem].Level,NULL,
"",true);
}
else if (Gbl.Syllabus.EditionIsActive)
/***** If the syllabus is empty ==>
show form to add a iten to the end *****/
Syl_ShowRowSyllabus (0,1,LstItemsSyllabus.Lst[0].CodItem,"",true);
/***** End table *****/
Tbl_EndTable ();
}
/*****************************************************************************/
@ -585,6 +587,8 @@ static void Syl_ShowRowSyllabus (unsigned NumItem,
Subtree.ToGetDown.Ini = Subtree.ToGetDown.End = 0;
Subtree.MovAllowed = false;
Gbl.Syllabus.ParamNumItem = NumItem; // Used as parameter in forms
if (!NewItem) // If the item is new (not stored in file), it has no number
Syl_WriteNumItem (StrItemCod,NULL,Level,CodItem);
@ -607,7 +611,7 @@ static void Syl_ShowRowSyllabus (unsigned NumItem,
{
Act_FormStart (Gbl.CurrentCrs.Info.Type == Inf_LECTURES ? ActDelItmSylLec :
ActDelItmSylPra);
Syl_PutParamNumItem (NumItem);
Syl_PutParamNumItem ();
Ico_PutIconRemove ();
Act_FormEnd ();
}
@ -618,28 +622,19 @@ static void Syl_ShowRowSyllabus (unsigned NumItem,
fprintf (Gbl.F.Out,"<td class=\"BM%u\">",Gbl.RowEvenOdd);
if (Subtree.MovAllowed)
{
Act_FormStart (Gbl.CurrentCrs.Info.Type == Inf_LECTURES ? ActUp_IteSylLec :
ActUp_IteSylPra);
Syl_PutParamNumItem (NumItem);
sprintf (Gbl.Title,
LstItemsSyllabus.Lst[NumItem].HasChildren ? Txt_Move_up_X_and_its_subsections :
Txt_Move_up_X,
StrItemCod);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/up_on16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL,
Gbl.Title,
Gbl.Title);
Act_FormEnd ();
Lay_PutContextualLink (Gbl.CurrentCrs.Info.Type == Inf_LECTURES ? ActUp_IteSylLec :
ActUp_IteSylPra,
NULL,Syl_PutParamNumItem,
"up_on16x16.gif",
Gbl.Title,NULL,
NULL);
}
else
fprintf (Gbl.F.Out,"<img src=\"%s/up_off16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL,
Txt_Movement_not_allowed,
Txt_Movement_not_allowed);
Ico_PutIconWithText ("up_off16x16.gif",Txt_Movement_not_allowed,NULL);
fprintf (Gbl.F.Out,"</td>");
/***** Icon to get down item *****/
@ -647,56 +642,35 @@ static void Syl_ShowRowSyllabus (unsigned NumItem,
fprintf (Gbl.F.Out,"<td class=\"BM%u\">",Gbl.RowEvenOdd);
if (Subtree.MovAllowed)
{
Act_FormStart (Gbl.CurrentCrs.Info.Type == Inf_LECTURES ? ActDwnIteSylLec :
ActDwnIteSylPra);
Syl_PutParamNumItem (NumItem);
sprintf (Gbl.Title,
LstItemsSyllabus.Lst[NumItem].HasChildren ? Txt_Move_down_X_and_its_subsections :
Txt_Move_down_X,
StrItemCod);
fprintf (Gbl.F.Out,"<input type=\"image\""
" src=\"%s/down_on16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL,
Gbl.Title,
Gbl.Title);
Act_FormEnd ();
Lay_PutContextualLink (Gbl.CurrentCrs.Info.Type == Inf_LECTURES ? ActDwnIteSylLec :
ActDwnIteSylPra,
NULL,Syl_PutParamNumItem,
"down_on16x16.gif",
Gbl.Title,NULL,
NULL);
}
else
fprintf (Gbl.F.Out,"<img src=\"%s/down_off16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL,
Txt_Movement_not_allowed,
Txt_Movement_not_allowed);
Ico_PutIconWithText ("down_off16x16.gif",Txt_Movement_not_allowed,NULL);
fprintf (Gbl.F.Out,"</td>");
/***** Icon to increase the level of an item *****/
fprintf (Gbl.F.Out,"<td class=\"BM%u\">",Gbl.RowEvenOdd);
if (Level > 1)
{
Act_FormStart (Gbl.CurrentCrs.Info.Type == Inf_LECTURES ? ActRgtIteSylLec :
ActRgtIteSylPra);
Syl_PutParamNumItem (NumItem);
sprintf (Gbl.Title,Txt_Increase_level_of_X,
StrItemCod);
fprintf (Gbl.F.Out,"<input type=\"image\""
" src=\"%s/left_on16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL,
Gbl.Title,
Gbl.Title);
Act_FormEnd ();
sprintf (Gbl.Title,Txt_Increase_level_of_X,StrItemCod);
Lay_PutContextualLink (Gbl.CurrentCrs.Info.Type == Inf_LECTURES ? ActRgtIteSylLec :
ActRgtIteSylPra,
NULL,Syl_PutParamNumItem,
"left_on16x16.gif",
Gbl.Title,NULL,
NULL);
}
else
fprintf (Gbl.F.Out,"<img src=\"%s/left_off16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL,
Txt_Movement_not_allowed,
Txt_Movement_not_allowed);
Ico_PutIconWithText ("left_off16x16.gif",Txt_Movement_not_allowed,NULL);
fprintf (Gbl.F.Out,"</td>");
/***** Icon to decrease level item *****/
@ -704,27 +678,16 @@ static void Syl_ShowRowSyllabus (unsigned NumItem,
if (Level < LastLevel + 1 &&
Level < Syl_MAX_LEVELS_SYLLABUS)
{
Act_FormStart (Gbl.CurrentCrs.Info.Type == Inf_LECTURES ? ActLftIteSylLec :
ActLftIteSylPra);
Syl_PutParamNumItem (NumItem);
sprintf (Gbl.Title,Txt_Decrease_level_of_X,
StrItemCod);
fprintf (Gbl.F.Out,"<input type=\"image\""
" src=\"%s/right_on16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL,
Gbl.Title,
Gbl.Title);
Act_FormEnd ();
sprintf (Gbl.Title,Txt_Decrease_level_of_X,StrItemCod);
Lay_PutContextualLink (Gbl.CurrentCrs.Info.Type == Inf_LECTURES ? ActLftIteSylLec :
ActLftIteSylPra,
NULL,Syl_PutParamNumItem,
"right_on16x16.gif",
Gbl.Title,NULL,
NULL);
}
else
fprintf (Gbl.F.Out,"<img src=\"%s/right_off16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL,
Txt_Movement_not_allowed,
Txt_Movement_not_allowed);
Ico_PutIconWithText ("right_off16x16.gif",Txt_Movement_not_allowed,NULL);
fprintf (Gbl.F.Out,"</td>");
LastLevel = Level;
@ -947,9 +910,10 @@ static void Syl_PutFormItemSyllabus (bool NewItem,unsigned NumItem,int Level,int
ActInsIteSylPra) :
(Gbl.CurrentCrs.Info.Type == Inf_LECTURES ? ActModIteSylLec :
ActModIteSylPra));
Syl_PutParamNumItem (NumItem);
Gbl.Syllabus.ParamNumItem = NumItem;
Syl_PutParamNumItem ();
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"Txt\""
" size=\"80\" maxlength=\"%u\" value=\"%s\""
" size=\"60\" maxlength=\"%u\" value=\"%s\""
" placeholder=\"%s\"",
Syl_MAX_CHARS_TEXT_ITEM,Text,
Txt_Enter_a_new_item_here);
@ -965,9 +929,9 @@ static void Syl_PutFormItemSyllabus (bool NewItem,unsigned NumItem,int Level,int
/***** Write parameter with the number of an item in a syllabus form *********/
/*****************************************************************************/
void Syl_PutParamNumItem (unsigned NumItem)
static void Syl_PutParamNumItem (void)
{
Par_PutHiddenParamUnsigned ("NumI",NumItem);
Par_PutHiddenParamUnsigned ("NumI",Gbl.Syllabus.ParamNumItem);
}
/*****************************************************************************/

1
swad_syllabus.h
View File

@ -79,7 +79,6 @@ void Syl_FreeListItemsSyllabus (void);
int Syl_ReadLevelItemSyllabus (void);
int Syl_WriteSyllabusIntoHTMLBuffer (char **HTMLBuffer);
void Syl_PutParamNumItem (unsigned NumItem);
void Syl_RemoveItemSyllabus (void);
void Syl_UpItemSyllabus (void);

2
swad_test.c
View File

@ -7846,7 +7846,7 @@ static void Tst_ShowTestResults (struct UsrData *UsrDat)
Tst_PutParamTstCod (TstCod);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/exam64x64.png\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20B\" />",
" class=\"ICO20x20\" />",
Gbl.Prefs.IconsURL,
Txt_View_test,
Txt_View_test);

2
swad_theme.c
View File

@ -254,7 +254,7 @@ void The_PutIconsToSelectTheme (void)
Par_PutHiddenParamString ("Theme",The_ThemeId[Theme]);
fprintf (Gbl.F.Out,"<input type=\"image\""
" src=\"%s/%s/%s/theme_32x20.gif\" alt=\"%s\""
" title=\"%s\" class=\"ICO40x25B\" />",
" title=\"%s\" class=\"ICO40x25\" />",
Gbl.Prefs.IconsURL,
Cfg_ICON_FOLDER_THEMES,
The_ThemeId[Theme],

2
swad_zip.c
View File

@ -366,7 +366,7 @@ void ZIP_PutButtonToDownloadZIPOfAFolder (const char *PathInTree,const char *Fil
Act_LinkFormSubmit (Txt_Create_ZIP_file,The_ClassForm[Gbl.Prefs.Theme],NULL);
fprintf (Gbl.F.Out,"<img src=\"%s/download64x64.png\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20B\" />"
" class=\"ICO20x20\" />"
"</a>",
Gbl.Prefs.IconsURL,
Txt_Create_ZIP_file,