mirror of https://github.com/acanas/swad-core.git
Version 21.72.1: Dec 22, 2021 Working on design of dark theme.
This commit is contained in:
parent
406e53fc51
commit
7327c8be5e
|
@ -95,7 +95,7 @@ address
|
|||
/*********************** Text decoration of links ****************************/
|
||||
a
|
||||
{
|
||||
color:#4D88A1;
|
||||
color:#4D88A1;text-decoration:none;
|
||||
}
|
||||
a:link, a:visited, a:active
|
||||
{
|
||||
|
@ -1630,7 +1630,6 @@ a:hover img.CENTER_PHOTO_SHOW
|
|||
.BT_LINK:hover
|
||||
{
|
||||
cursor:pointer;
|
||||
text-decoration:underline;
|
||||
}
|
||||
|
||||
/****************************** Course program *******************************/
|
|
@ -110,7 +110,7 @@ void Acc_PutLinkToCreateAccount (void)
|
|||
Lay_PutContextualLinkIconText (ActFrmMyAcc,NULL,
|
||||
NULL,NULL,
|
||||
"at.svg",Ico_BLACK,
|
||||
Txt_Create_account);
|
||||
Txt_Create_account,NULL);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -308,7 +308,7 @@ static void Ann_DrawAnAnnouncement (long AnnCod,Ann_Status_t Status,
|
|||
Lay_PutContextualLinkIconText (ActAnnSee,NULL,
|
||||
Ann_PutParams,&AnnCod,
|
||||
"times.svg",Ico_BLACK,
|
||||
Txt_Do_not_show_again);
|
||||
Txt_Do_not_show_again,NULL);
|
||||
|
||||
/* End container for foot */
|
||||
HTM_DIV_End ();
|
||||
|
|
|
@ -578,7 +578,7 @@ static void Asg_WriteAssignmentFolder (struct Asg_Assignment *Asg,bool PrintView
|
|||
sizeof (Gbl.FileBrowser.FilFolLnk.Name) - 1);
|
||||
Gbl.FileBrowser.FilFolLnk.Type = Brw_IS_FOLDER;
|
||||
Brw_PutImplicitParamsFileBrowser (&Gbl.FileBrowser.FilFolLnk);
|
||||
Ico_PutIconLink ("folder-open-yellow-plus.png",Ico_BLACK,
|
||||
Ico_PutIconLink ("folder-open-yellow-plus.png",Ico_UNCHANGED,
|
||||
Txt_Upload_file_or_create_folder);
|
||||
Frm_EndForm ();
|
||||
switch (Gbl.Usrs.Me.Role.Logged)
|
||||
|
|
|
@ -4814,7 +4814,7 @@ static void Brw_IndentAndWriteIconExpandContract (unsigned Level,
|
|||
switch (IconThisRow)
|
||||
{
|
||||
case Brw_ICON_TREE_NOTHING:
|
||||
Ico_PutIcon ("tr16x16.gif",Ico_BLACK,"","ICO20x20");
|
||||
Ico_PutIcon ("tr16x16.gif",Ico_UNCHANGED,"","ICO20x20");
|
||||
break;
|
||||
case Brw_ICON_TREE_EXPAND:
|
||||
/***** Visible icon to expand folder *****/
|
||||
|
@ -4855,7 +4855,7 @@ static void Brw_IndentDependingOnLevel (unsigned Level)
|
|||
i++)
|
||||
{
|
||||
HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd);
|
||||
Ico_PutIcon ("tr16x16.gif",Ico_BLACK,"","ICO20x20");
|
||||
Ico_PutIcon ("tr16x16.gif",Ico_UNCHANGED,"","ICO20x20");
|
||||
HTM_TD_End ();
|
||||
}
|
||||
}
|
||||
|
@ -5058,7 +5058,7 @@ static void Brw_PutIconFolderWithoutPlus (const char *FileBrowserId,const char *
|
|||
/***** Icon *****/
|
||||
Ico_PutIcon (Open ? "folder-open-yellow.png" :
|
||||
"folder-yellow.png",
|
||||
Ico_BLACK,
|
||||
Ico_UNCHANGED,
|
||||
Txt_Folder,"CONTEXT_OPT CONTEXT_ICO_16x16");
|
||||
|
||||
/***** End container *****/
|
||||
|
@ -5098,7 +5098,7 @@ static void Brw_PutIconNewFileOrFolder (void)
|
|||
|
||||
/***** Icon that indicates new file *****/
|
||||
HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd);
|
||||
Ico_PutIcon ("star16x16.gif",Ico_BLACK,Txt_New_FILE_OR_FOLDER,"ICO20x20");
|
||||
Ico_PutIcon ("star16x16.gif",Ico_UNCHANGED,Txt_New_FILE_OR_FOLDER,"ICO20x20");
|
||||
HTM_TD_End ();
|
||||
}
|
||||
|
||||
|
@ -5486,7 +5486,7 @@ static void Brw_WriteFileOrFolderPublisher (unsigned Level,long UsrCod)
|
|||
ClassPhoto[Gbl.Prefs.PhotoShape],Pho_ZOOM,
|
||||
false);
|
||||
else
|
||||
Ico_PutIcon ("usr_bl.jpg",Ico_BLACK,Txt_Unknown_or_without_photo,
|
||||
Ico_PutIcon ("usr_bl.jpg",Ico_UNCHANGED,Txt_Unknown_or_without_photo,
|
||||
ClassPhoto[Gbl.Prefs.PhotoShape]);
|
||||
|
||||
HTM_TD_End ();
|
||||
|
@ -8518,7 +8518,7 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL,
|
|||
|
||||
/* Name of the file of marks, link end and form end */
|
||||
HTM_TxtF (" %s ",FileNameToShow);
|
||||
Ico_PutIcon ("grades32x32.gif",Ico_BLACK,Txt_Check_marks_in_the_file,"ICO40x40");
|
||||
Ico_PutIcon ("grades32x32.gif",Ico_UNCHANGED,Txt_Check_marks_in_the_file,"ICO40x40");
|
||||
|
||||
/* End link */
|
||||
HTM_BUTTON_End ();
|
||||
|
@ -8568,7 +8568,8 @@ static void Brw_WriteSmallLinkToDownloadFile (const char *URL,
|
|||
|
||||
/* Begin link */
|
||||
HTM_BUTTON_SUBMIT_Begin (Txt_Check_marks_in_the_file,
|
||||
Str_BuildString ("BT_LINK %s",The_ClassDat[Gbl.Prefs.Theme]),
|
||||
Str_BuildString ("BT_LINK %s",
|
||||
The_ClassDat[Gbl.Prefs.Theme]),
|
||||
NULL);
|
||||
Str_FreeStrings ();
|
||||
|
||||
|
@ -9964,7 +9965,8 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
|
|||
Frm_BeginFormGoTo (ActSeeInsInf);
|
||||
Deg_PutParamDegCod (InsCod);
|
||||
HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (InsShortName),
|
||||
Str_BuildString ("BT_LINK LT %s",The_ClassDat[Gbl.Prefs.Theme]),
|
||||
Str_BuildString ("BT_LINK LT %s",
|
||||
The_ClassDat[Gbl.Prefs.Theme]),
|
||||
NULL);
|
||||
Str_FreeStrings ();
|
||||
Lgo_DrawLogo (HieLvl_INS,InsCod,InsShortName,20,"BT_LINK LT",true);
|
||||
|
@ -9981,7 +9983,8 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
|
|||
Frm_BeginFormGoTo (ActSeeCtrInf);
|
||||
Deg_PutParamDegCod (CtrCod);
|
||||
HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (CtrShortName),
|
||||
Str_BuildString ("BT_LINK LT %s",The_ClassDat[Gbl.Prefs.Theme]),
|
||||
Str_BuildString ("BT_LINK LT %s",
|
||||
The_ClassDat[Gbl.Prefs.Theme]),
|
||||
NULL);
|
||||
Str_FreeStrings ();
|
||||
Lgo_DrawLogo (HieLvl_CTR,CtrCod,CtrShortName,20,"LT",true);
|
||||
|
@ -9998,7 +10001,8 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
|
|||
Frm_BeginFormGoTo (ActSeeDegInf);
|
||||
Deg_PutParamDegCod (DegCod);
|
||||
HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (DegShortName),
|
||||
Str_BuildString ("BT_LINK LT %s",The_ClassDat[Gbl.Prefs.Theme]),
|
||||
Str_BuildString ("BT_LINK LT %s",
|
||||
The_ClassDat[Gbl.Prefs.Theme]),
|
||||
NULL);
|
||||
Str_FreeStrings ();
|
||||
Lgo_DrawLogo (HieLvl_DEG,DegCod,DegShortName,20,"LT",true);
|
||||
|
@ -10015,7 +10019,8 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
|
|||
Frm_BeginFormGoTo (ActSeeCrsInf);
|
||||
Crs_PutParamCrsCod (CrsCod);
|
||||
HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (CrsShortName),
|
||||
Str_BuildString ("BT_LINK %s",The_ClassDat[Gbl.Prefs.Theme]),
|
||||
Str_BuildString ("BT_LINK %s",
|
||||
The_ClassDat[Gbl.Prefs.Theme]),
|
||||
NULL);
|
||||
Str_FreeStrings ();
|
||||
HTM_Txt (CrsShortName);
|
||||
|
@ -10122,12 +10127,14 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
|
|||
|
||||
/* File or folder icon */
|
||||
HTM_BUTTON_SUBMIT_Begin (FileNameToShow,
|
||||
Str_BuildString ("BT_LINK LT %s",The_ClassDatStrong[Gbl.Prefs.Theme]),
|
||||
Str_BuildString ("BT_LINK LT %s",
|
||||
The_ClassDatStrong[Gbl.Prefs.Theme]),
|
||||
NULL);
|
||||
Str_FreeStrings ();
|
||||
if (FileMetadata.FilFolLnk.Type == Brw_IS_FOLDER)
|
||||
/* Icon with folder */
|
||||
Ico_PutIcon ("folder-yellow.png",Ico_BLACK,Txt_Folder,"CONTEXT_ICO_16x16");
|
||||
Ico_PutIcon ("folder-yellow.png",Ico_UNCHANGED,
|
||||
Txt_Folder,"CONTEXT_ICO_16x16");
|
||||
else
|
||||
/* Icon with file type or link */
|
||||
Brw_PutIconFile (FileMetadata.FilFolLnk.Type,FileMetadata.FilFolLnk.Name,
|
||||
|
@ -10156,7 +10163,7 @@ static void Brw_PutLinkToAskRemOldFiles (void)
|
|||
Lay_PutContextualLinkIconText (ActReqRemOldBrf,NULL,
|
||||
Brw_PutHiddenParamFullTreeIfSelected,&Gbl.FileBrowser.FullTree,
|
||||
"trash.svg",Ico_RED,
|
||||
Txt_Remove_old_files);
|
||||
Txt_Remove_old_files,NULL);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -133,7 +133,7 @@ void Cal_ShowFormToSelFirstDayOfWeek (Act_Action_t Action,
|
|||
if (FuncParams) // Extra parameters depending on the action
|
||||
FuncParams (Args);
|
||||
snprintf (Icon,sizeof (Icon),"first-day-of-week-%u.png",FirstDayOfWeek);
|
||||
Ico_PutSettingIconLink (Icon,Ico_BLACK,
|
||||
Ico_PutSettingIconLink (Icon,Ico_UNCHANGED,
|
||||
Str_BuildString (Txt_First_day_of_the_week_X,
|
||||
Txt_DAYS_SMALL[FirstDayOfWeek]));
|
||||
Str_FreeStrings ();
|
||||
|
|
|
@ -348,12 +348,14 @@ static void Ctr_ListOneCenterForSeeing (struct Ctr_Center *Ctr,unsigned NumCtr)
|
|||
if (Ctr->Status & Hie_STATUS_BIT_PENDING)
|
||||
{
|
||||
TxtClassNormal = The_ClassDatLight[Gbl.Prefs.Theme];
|
||||
TxtClassStrong = Str_BuildString ("BT_LINK LT %s",The_ClassDatLight[Gbl.Prefs.Theme]);
|
||||
TxtClassStrong = Str_BuildString ("BT_LINK LT %s",
|
||||
The_ClassDatLight[Gbl.Prefs.Theme]);
|
||||
}
|
||||
else
|
||||
{
|
||||
TxtClassNormal = The_ClassDat[Gbl.Prefs.Theme];
|
||||
TxtClassStrong = Str_BuildString ("BT_LINK LT %s",The_ClassDatStrong[Gbl.Prefs.Theme]);
|
||||
TxtClassStrong = Str_BuildString ("BT_LINK LT %s",
|
||||
The_ClassDatStrong[Gbl.Prefs.Theme]);
|
||||
}
|
||||
BgColor = (Ctr->CtrCod == Gbl.Hierarchy.Ctr.CtrCod) ? The_ClassBgHighlight[Gbl.Prefs.Theme] :
|
||||
Gbl.ColorRows[Gbl.RowEvenOdd];
|
||||
|
|
|
@ -598,7 +598,8 @@ static void CtrCfg_Institution (bool PrintView,bool PutForm)
|
|||
Frm_BeginFormGoTo (ActSeeInsInf);
|
||||
Ins_PutParamInsCod (Gbl.Hierarchy.Ins.InsCod);
|
||||
HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (Gbl.Hierarchy.Ins.ShrtName),
|
||||
Str_BuildString ("BT_LINK LT %s",The_ClassDat[Gbl.Prefs.Theme]),
|
||||
Str_BuildString ("BT_LINK LT %s",
|
||||
The_ClassDat[Gbl.Prefs.Theme]),
|
||||
NULL);
|
||||
Str_FreeStrings ();
|
||||
}
|
||||
|
@ -776,7 +777,8 @@ static void CtrCfg_NumDegs (void)
|
|||
Ctr_PutParamCtrCod (Gbl.Hierarchy.Ctr.CtrCod);
|
||||
HTM_BUTTON_SUBMIT_Begin (Str_BuildString (Txt_Degrees_of_CENTER_X,
|
||||
Gbl.Hierarchy.Ctr.ShrtName),
|
||||
Str_BuildString ("BT_LINK %s",The_ClassDat[Gbl.Prefs.Theme]),
|
||||
Str_BuildString ("BT_LINK %s",
|
||||
The_ClassDat[Gbl.Prefs.Theme]),
|
||||
NULL);
|
||||
Str_FreeStrings ();
|
||||
HTM_Unsigned (Deg_GetCachedNumDegsInCtr (Gbl.Hierarchy.Ctr.CtrCod));
|
||||
|
|
|
@ -602,10 +602,11 @@ TODO: FIX BUG, URGENT! En las fechas como par
|
|||
|
||||
TODO: En las encuestas, que los estudiantes no puedan ver los resultados hasta que no finalice el plazo.
|
||||
*/
|
||||
#define Log_PLATFORM_VERSION "SWAD 21.72 (2021-12-21)"
|
||||
#define CSS_FILE "swad21.72.css"
|
||||
#define Log_PLATFORM_VERSION "SWAD 21.72.1 (2021-12-22)"
|
||||
#define CSS_FILE "swad21.72.1.css"
|
||||
#define JS_FILE "swad21.67.4.js"
|
||||
/*
|
||||
Version 21.72.1: Dec 22, 2021 Working on design of dark theme. (322622 lines)
|
||||
Version 21.72: Dec 21, 2021 Working on design of dark theme. (322560 lines)
|
||||
Copy the following icons to icon public directory:
|
||||
|
||||
|
|
|
@ -158,7 +158,8 @@ void Cty_SeeCtyWithPendingInss (void)
|
|||
Cty_DrawCountryMapAndNameWithLink (&Cty,ActSeeIns,
|
||||
"COUNTRY_SMALL",
|
||||
"COUNTRY_MAP_SMALL",
|
||||
Str_BuildString ("BT_LINK %s",The_ClassDat[Gbl.Prefs.Theme]));
|
||||
Str_BuildString ("BT_LINK %s",
|
||||
The_ClassDat[Gbl.Prefs.Theme]));
|
||||
Str_FreeStrings ();
|
||||
HTM_TD_End ();
|
||||
|
||||
|
@ -421,7 +422,8 @@ static void Cty_ListOneCountryForSeeing (struct Cty_Countr *Cty,unsigned NumCty)
|
|||
Cty_DrawCountryMapAndNameWithLink (Cty,ActSeeIns,
|
||||
"COUNTRY_SMALL",
|
||||
"COUNTRY_MAP_SMALL",
|
||||
Str_BuildString ("BT_LINK %s",The_ClassDatStrong[Gbl.Prefs.Theme]));
|
||||
Str_BuildString ("BT_LINK %s",
|
||||
The_ClassDatStrong[Gbl.Prefs.Theme]));
|
||||
Str_FreeStrings ();
|
||||
HTM_TD_End ();
|
||||
|
||||
|
@ -562,7 +564,8 @@ void Cty_DrawCountryMap (struct Cty_Countr *Cty,const char *Class)
|
|||
free (URL);
|
||||
}
|
||||
else
|
||||
Ico_PutIcon ("tr16x16.gif",Ico_BLACK,Cty->Name[Gbl.Prefs.Language],Class);
|
||||
Ico_PutIcon ("tr16x16.gif",Ico_UNCHANGED,
|
||||
Cty->Name[Gbl.Prefs.Language],Class);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -376,11 +376,12 @@ static void CtyCfg_Platform (bool PrintView)
|
|||
{
|
||||
Frm_BeginFormGoTo (ActSeeSysInf);
|
||||
HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (Cfg_PLATFORM_SHORT_NAME),
|
||||
Str_BuildString ("BT_LINK LT %s",The_ClassDat[Gbl.Prefs.Theme]),
|
||||
Str_BuildString ("BT_LINK LT %s",
|
||||
The_ClassDat[Gbl.Prefs.Theme]),
|
||||
NULL);
|
||||
Str_FreeStrings ();
|
||||
}
|
||||
Ico_PutIcon ("swad64x64.png",Ico_BLACK,Cfg_PLATFORM_FULL_NAME,"ICO20x20");
|
||||
Ico_PutIcon ("swad64x64.png",Ico_UNCHANGED,Cfg_PLATFORM_FULL_NAME,"ICO20x20");
|
||||
HTM_NBSP ();
|
||||
HTM_Txt (Cfg_PLATFORM_SHORT_NAME);
|
||||
if (!PrintView)
|
||||
|
@ -485,7 +486,8 @@ static void CtyCfg_NumInss (void)
|
|||
Cty_PutParamCtyCod (Gbl.Hierarchy.Cty.CtyCod);
|
||||
HTM_BUTTON_SUBMIT_Begin (Str_BuildString (Txt_Institutions_of_COUNTRY_X,
|
||||
Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]),
|
||||
Str_BuildString ("BT_LINK %s",The_ClassDat[Gbl.Prefs.Theme]),
|
||||
Str_BuildString ("BT_LINK %s",
|
||||
The_ClassDat[Gbl.Prefs.Theme]),
|
||||
NULL);
|
||||
Str_FreeStrings ();
|
||||
HTM_Unsigned (Ins_GetCachedNumInssInCty (Gbl.Hierarchy.Cty.CtyCod));
|
||||
|
|
|
@ -963,12 +963,14 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year)
|
|||
if (Crs->Status & Hie_STATUS_BIT_PENDING)
|
||||
{
|
||||
TxtClassNormal = The_ClassDatLight[Gbl.Prefs.Theme];
|
||||
TxtClassStrong = Str_BuildString ("BT_LINK LT %s",The_ClassDatLight[Gbl.Prefs.Theme]);
|
||||
TxtClassStrong = Str_BuildString ("BT_LINK LT %s",
|
||||
The_ClassDatLight[Gbl.Prefs.Theme]);
|
||||
}
|
||||
else
|
||||
{
|
||||
TxtClassNormal = The_ClassDat[Gbl.Prefs.Theme];
|
||||
TxtClassStrong = Str_BuildString ("BT_LINK LT %s",The_ClassDatStrong[Gbl.Prefs.Theme]);
|
||||
TxtClassStrong = Str_BuildString ("BT_LINK LT %s",
|
||||
The_ClassDatStrong[Gbl.Prefs.Theme]);
|
||||
}
|
||||
|
||||
/* Check if this course is one of my courses */
|
||||
|
@ -2453,12 +2455,14 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA
|
|||
if (NumUsrs)
|
||||
{
|
||||
ClassTxt = The_ClassDatStrong[Gbl.Prefs.Theme];
|
||||
ClassLink = Str_BuildString ("BT_LINK LT %s",The_ClassDatStrong[Gbl.Prefs.Theme]);
|
||||
ClassLink = Str_BuildString ("BT_LINK LT %s",
|
||||
The_ClassDatStrong[Gbl.Prefs.Theme]);
|
||||
}
|
||||
else
|
||||
{
|
||||
ClassTxt = The_ClassDat[Gbl.Prefs.Theme];
|
||||
ClassLink = Str_BuildString ("BT_LINK LT %s",The_ClassDat[Gbl.Prefs.Theme]);
|
||||
ClassLink = Str_BuildString ("BT_LINK LT %s",
|
||||
The_ClassDat[Gbl.Prefs.Theme]);
|
||||
}
|
||||
BgColor = (CrsCod == Gbl.Hierarchy.Crs.CrsCod) ? The_ClassBgHighlight[Gbl.Prefs.Theme] :
|
||||
Gbl.ColorRows[RowEvenOdd];
|
||||
|
@ -2556,7 +2560,7 @@ void Crs_PutLinkToRemoveOldCrss (void)
|
|||
Lay_PutContextualLinkIconText (ActReqRemOldCrs,NULL,
|
||||
NULL,NULL,
|
||||
"trash.svg",Ico_RED,
|
||||
Txt_Eliminate_old_courses);
|
||||
Txt_Eliminate_old_courses,NULL);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -252,7 +252,8 @@ static void CrsCfg_Degree (bool PrintView,bool PutForm)
|
|||
Frm_BeginFormGoTo (ActSeeDegInf);
|
||||
Deg_PutParamDegCod (Gbl.Hierarchy.Deg.DegCod);
|
||||
HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (Gbl.Hierarchy.Deg.ShrtName),
|
||||
Str_BuildString ("BT_LINK LT %s",The_ClassDat[Gbl.Prefs.Theme]),
|
||||
Str_BuildString ("BT_LINK LT %s",
|
||||
The_ClassDat[Gbl.Prefs.Theme]),
|
||||
NULL);
|
||||
Str_FreeStrings ();
|
||||
}
|
||||
|
@ -450,13 +451,16 @@ static void CrsCfg_Indicators (void)
|
|||
Txt_of_PART_OF_A_TOTAL,Ind_NUM_INDICATORS) < 0)
|
||||
Err_NotEnoughMemoryExit ();
|
||||
HTM_BUTTON_SUBMIT_Begin (Title,
|
||||
Str_BuildString ("BT_LINK %s",The_ClassDat[Gbl.Prefs.Theme]),
|
||||
Str_BuildString ("BT_LINK %s",
|
||||
The_ClassDat[Gbl.Prefs.Theme]),
|
||||
NULL);
|
||||
Str_FreeStrings ();
|
||||
HTM_TxtF ("%s ",Title);
|
||||
Ico_PutIcon ((IndicatorsCrs.NumIndicators == Ind_NUM_INDICATORS) ? "check-circle.svg" :
|
||||
"exclamation-triangle.svg",
|
||||
Ico_BLACK,
|
||||
if (IndicatorsCrs.NumIndicators == Ind_NUM_INDICATORS)
|
||||
Ico_PutIcon ("check-circle.svg",Ico_GREEN,
|
||||
Title,"ICO16x16");
|
||||
else
|
||||
Ico_PutIcon ("exclamation-triangle.svg",Ico_RED, // TODO: Change to Ico_YELLOW
|
||||
Title,"ICO16x16");
|
||||
HTM_BUTTON_End ();
|
||||
free (Title);
|
||||
|
|
|
@ -817,12 +817,14 @@ static void Deg_ListOneDegreeForSeeing (struct Deg_Degree *Deg,unsigned NumDeg)
|
|||
if (Deg->Status & Hie_STATUS_BIT_PENDING)
|
||||
{
|
||||
TxtClassNormal = The_ClassDatLight[Gbl.Prefs.Theme];
|
||||
TxtClassStrong = Str_BuildString ("BT_LINK LT %s",The_ClassDatLight[Gbl.Prefs.Theme]);
|
||||
TxtClassStrong = Str_BuildString ("BT_LINK LT %s",
|
||||
The_ClassDatLight[Gbl.Prefs.Theme]);
|
||||
}
|
||||
else
|
||||
{
|
||||
TxtClassNormal = The_ClassDat[Gbl.Prefs.Theme];
|
||||
TxtClassStrong = Str_BuildString ("BT_LINK LT %s",The_ClassDatStrong[Gbl.Prefs.Theme]);
|
||||
TxtClassStrong = Str_BuildString ("BT_LINK LT %s",
|
||||
The_ClassDatStrong[Gbl.Prefs.Theme]);
|
||||
}
|
||||
BgColor = (Deg->DegCod == Gbl.Hierarchy.Deg.DegCod) ? The_ClassBgHighlight[Gbl.Prefs.Theme] :
|
||||
Gbl.ColorRows[Gbl.RowEvenOdd];
|
||||
|
|
|
@ -243,7 +243,8 @@ static void DegCfg_Center (bool PrintView,bool PutForm)
|
|||
Frm_BeginFormGoTo (ActSeeCtrInf);
|
||||
Ctr_PutParamCtrCod (Gbl.Hierarchy.Ctr.CtrCod);
|
||||
HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (Gbl.Hierarchy.Ctr.ShrtName),
|
||||
Str_BuildString ("BT_LINK LT %s",The_ClassDat[Gbl.Prefs.Theme]),
|
||||
Str_BuildString ("BT_LINK LT %s",
|
||||
The_ClassDat[Gbl.Prefs.Theme]),
|
||||
NULL);
|
||||
Str_FreeStrings ();
|
||||
}
|
||||
|
@ -333,7 +334,8 @@ static void DegCfg_NumCrss (void)
|
|||
Deg_PutParamDegCod (Gbl.Hierarchy.Deg.DegCod);
|
||||
HTM_BUTTON_SUBMIT_Begin (Str_BuildString (Txt_Courses_of_DEGREE_X,
|
||||
Gbl.Hierarchy.Deg.ShrtName),
|
||||
Str_BuildString ("BT_LINK %s",The_ClassDat[Gbl.Prefs.Theme]),
|
||||
Str_BuildString ("BT_LINK %s",
|
||||
The_ClassDat[Gbl.Prefs.Theme]),
|
||||
NULL);
|
||||
Str_FreeStrings ();
|
||||
HTM_Unsigned (Crs_GetCachedNumCrssInDeg (Gbl.Hierarchy.Deg.DegCod));
|
||||
|
|
|
@ -97,7 +97,7 @@ void Dup_PutLinkToListDupUsrs (void)
|
|||
Lay_PutContextualLinkIconText (ActLstDupUsr,NULL,
|
||||
NULL,NULL,
|
||||
"user-friends.svg",Ico_BLACK,
|
||||
Txt_Duplicate_USERS);
|
||||
Txt_Duplicate_USERS,NULL);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -196,7 +196,7 @@ void Enr_PutLinkToRequestSignUp (void)
|
|||
Lay_PutContextualLinkIconText (ActReqSignUp,NULL,
|
||||
NULL,NULL,
|
||||
"hand-point-up.svg",Ico_BLACK,
|
||||
Txt_Sign_up);
|
||||
Txt_Sign_up,NULL);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -647,7 +647,7 @@ void Enr_PutLinkToRemOldUsrs (void)
|
|||
Lay_PutContextualLinkIconText (ActReqRemOldUsr,NULL,
|
||||
NULL,NULL,
|
||||
"trash.svg",Ico_RED,
|
||||
Txt_Eliminate_old_users);
|
||||
Txt_Eliminate_old_users,NULL);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -1684,7 +1684,7 @@ static void Enr_PutLinkToRemAllStdsThisCrs (void)
|
|||
Lay_PutContextualLinkIconText (ActReqRemAllStdCrs,NULL,
|
||||
NULL,NULL,
|
||||
"trash.svg",Ico_RED,
|
||||
Txt_Remove_all_students);
|
||||
Txt_Remove_all_students,NULL);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -2238,7 +2238,8 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
|
|||
Frm_BeginFormGoTo (ActSeeCrsInf);
|
||||
Crs_PutParamCrsCod (Crs.CrsCod);
|
||||
HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (Crs.FullName),
|
||||
Str_BuildString ("BT_LINK LT %s",The_ClassDat[Gbl.Prefs.Theme]),
|
||||
Str_BuildString ("BT_LINK LT %s",
|
||||
The_ClassDat[Gbl.Prefs.Theme]),
|
||||
NULL);
|
||||
Str_FreeStrings ();
|
||||
HTM_TxtF ("%s > %s",Deg.ShrtName,Crs.ShrtName);
|
||||
|
@ -2362,7 +2363,7 @@ void Enr_PutLinkToAdminOneUsr (Act_Action_t NextAction)
|
|||
Lay_PutContextualLinkIconText (NextAction,NULL,
|
||||
NULL,NULL,
|
||||
"user-cog.svg",Ico_BLACK,
|
||||
TitleText);
|
||||
TitleText,NULL);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -2390,7 +2391,7 @@ void Enr_PutLinkToAdminSeveralUsrs (Rol_Role_t Role)
|
|||
Lay_PutContextualLinkIconText (WhatToDo[Role].NextAction,NULL,
|
||||
NULL,NULL,
|
||||
"users-cog.svg",Ico_BLACK,
|
||||
*WhatToDo[Role].Title);
|
||||
*WhatToDo[Role].Title,NULL);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -258,7 +258,8 @@ void ExaRes_ShowMyResultsInSes (void)
|
|||
false); // Do not put form to start new session
|
||||
|
||||
/***** List my sessions results in session *****/
|
||||
ExaRes_ShowResultsBegin (&Exams,Str_BuildString (Txt_Results_of_session_X,Session.Title),
|
||||
ExaRes_ShowResultsBegin (&Exams,Str_BuildString (Txt_Results_of_session_X,
|
||||
Session.Title),
|
||||
false); // Do not list exams to select
|
||||
Str_FreeStrings ();
|
||||
ExaRes_ListMyResultsInSes (&Exams,Session.SesCod);
|
||||
|
|
|
@ -449,8 +449,10 @@ static void Fig_GetAndShowNumUsrsInCrss (Rol_Role_t Role)
|
|||
extern const char *Txt_Total;
|
||||
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
|
||||
long Cod = Sco_GetCurrentCod ();
|
||||
char *Class = (Role == Rol_UNK) ? Str_BuildString ("RB %s LINE_TOP",The_ClassDatStrong[Gbl.Prefs.Theme]) :
|
||||
Str_BuildString ("RB %s",The_ClassDat[Gbl.Prefs.Theme]);
|
||||
char *Class = (Role == Rol_UNK) ? Str_BuildString ("RB %s LINE_TOP",
|
||||
The_ClassDatStrong[Gbl.Prefs.Theme]) :
|
||||
Str_BuildString ("RB %s",
|
||||
The_ClassDat[Gbl.Prefs.Theme]);
|
||||
unsigned Roles = (Role == Rol_UNK) ? ((1 << Rol_STD) |
|
||||
(1 << Rol_NET) |
|
||||
(1 << Rol_TCH)) :
|
||||
|
@ -634,31 +636,36 @@ static void Fig_WriteHeadHierarchy (void)
|
|||
HTM_TH_Empty (1);
|
||||
|
||||
HTM_TH_Begin (1,1,"RM");
|
||||
Ico_PutIcon ("globe-americas.svg",Ico_BLACK,Txt_Countries,"CONTEXT_ICO_x16");
|
||||
Ico_PutIcon ("globe-americas.svg",Ico_BLACK,
|
||||
Txt_Countries,"CONTEXT_ICO_x16");
|
||||
HTM_BR ();
|
||||
HTM_Txt (Txt_Countries);
|
||||
HTM_TH_End ();
|
||||
|
||||
HTM_TH_Begin (1,1,"RM");
|
||||
Ico_PutIcon ("university.svg",Ico_BLACK,Txt_Institutions,"CONTEXT_ICO_x16");
|
||||
Ico_PutIcon ("university.svg",Ico_BLACK,
|
||||
Txt_Institutions,"CONTEXT_ICO_x16");
|
||||
HTM_BR ();
|
||||
HTM_Txt (Txt_Institutions);
|
||||
HTM_TH_End ();
|
||||
|
||||
HTM_TH_Begin (1,1,"RM");
|
||||
Ico_PutIcon ("building.svg",Ico_BLACK,Txt_Centers,"CONTEXT_ICO_x16");
|
||||
Ico_PutIcon ("building.svg",Ico_BLACK,
|
||||
Txt_Centers,"CONTEXT_ICO_x16");
|
||||
HTM_BR ();
|
||||
HTM_Txt (Txt_Centers);
|
||||
HTM_TH_End ();
|
||||
|
||||
HTM_TH_Begin (1,1,"RM");
|
||||
Ico_PutIcon ("graduation-cap.svg",Ico_BLACK,Txt_Degrees,"CONTEXT_ICO_x16");
|
||||
Ico_PutIcon ("graduation-cap.svg",Ico_BLACK,
|
||||
Txt_Degrees,"CONTEXT_ICO_x16");
|
||||
HTM_BR ();
|
||||
HTM_Txt (Txt_Degrees);
|
||||
HTM_TH_End ();
|
||||
|
||||
HTM_TH_Begin (1,1,"RM");
|
||||
Ico_PutIcon ("chalkboard-teacher.svg",Ico_BLACK,Txt_Courses,"CONTEXT_ICO_x16");
|
||||
Ico_PutIcon ("chalkboard-teacher.svg",Ico_BLACK,
|
||||
Txt_Courses,"CONTEXT_ICO_x16");
|
||||
HTM_BR ();
|
||||
HTM_Txt (Txt_Courses);
|
||||
HTM_TH_End ();
|
||||
|
@ -926,7 +933,8 @@ static void Fig_GetAndShowHierarchyTotal (void)
|
|||
|
||||
/***** Write total number of elements *****/
|
||||
Fig_ShowHierarchyRow ("",Txt_Total,
|
||||
Str_BuildString ("%s LINE_TOP",The_ClassDatStrong[Gbl.Prefs.Theme]),
|
||||
Str_BuildString ("%s LINE_TOP",
|
||||
The_ClassDatStrong[Gbl.Prefs.Theme]),
|
||||
(int) NumCtysTotal,
|
||||
(int) NumInssTotal,
|
||||
(int) NumCtrsTotal,
|
||||
|
@ -1559,7 +1567,8 @@ static void Fig_WriteRowStatsFileBrowsers1 (const char *NameOfFileZones,
|
|||
char StrNumGrps[Cns_MAX_DECIMAL_DIGITS_UINT + 1];
|
||||
char StrNumUsrs[Cns_MAX_DECIMAL_DIGITS_UINT + 1];
|
||||
char FileSizeStr[Fil_MAX_BYTES_FILE_SIZE_STRING + 1];
|
||||
const char *Class = (FileZone == Brw_UNKNOWN) ? Str_BuildString ("%s LINE_TOP",The_ClassDatStrong[Gbl.Prefs.Theme]) :
|
||||
const char *Class = (FileZone == Brw_UNKNOWN) ? Str_BuildString ("%s LINE_TOP",
|
||||
The_ClassDatStrong[Gbl.Prefs.Theme]) :
|
||||
The_ClassDat[Gbl.Prefs.Theme];
|
||||
|
||||
Fil_WriteFileSizeFull ((double) SizeOfFileZones->Size,FileSizeStr);
|
||||
|
@ -1630,7 +1639,8 @@ static void Fig_WriteRowStatsFileBrowsers2 (const char *NameOfFileZones,
|
|||
char StrNumFoldersPerCrs[Cns_MAX_DECIMAL_DIGITS_UINT + 1];
|
||||
char StrNumFilesPerCrs[Cns_MAX_DECIMAL_DIGITS_UINT + 1];
|
||||
char FileSizePerCrsStr[Fil_MAX_BYTES_FILE_SIZE_STRING + 1];
|
||||
const char *Class = (FileZone == Brw_UNKNOWN) ? Str_BuildString ("%s LINE_TOP",The_ClassDatStrong[Gbl.Prefs.Theme]) :
|
||||
const char *Class = (FileZone == Brw_UNKNOWN) ? Str_BuildString ("%s LINE_TOP",
|
||||
The_ClassDatStrong[Gbl.Prefs.Theme]) :
|
||||
The_ClassDat[Gbl.Prefs.Theme];
|
||||
|
||||
if (SizeOfFileZones->NumCrss == -1) // Not applicable
|
||||
|
@ -1687,7 +1697,8 @@ static void Fig_WriteRowStatsFileBrowsers3 (const char *NameOfFileZones,
|
|||
char StrNumFoldersPerUsr[Cns_MAX_DECIMAL_DIGITS_UINT + 1];
|
||||
char StrNumFilesPerUsr[Cns_MAX_DECIMAL_DIGITS_UINT + 1];
|
||||
char FileSizePerUsrStr[Fil_MAX_BYTES_FILE_SIZE_STRING + 1];
|
||||
const char *Class = (FileZone == Brw_UNKNOWN) ? Str_BuildString ("%s LINE_TOP",The_ClassDatStrong[Gbl.Prefs.Theme]) :
|
||||
const char *Class = (FileZone == Brw_UNKNOWN) ? Str_BuildString ("%s LINE_TOP",
|
||||
The_ClassDatStrong[Gbl.Prefs.Theme]) :
|
||||
The_ClassDat[Gbl.Prefs.Theme];
|
||||
|
||||
if (SizeOfFileZones->NumUsrs == -1) // Not applicable
|
||||
|
|
|
@ -99,7 +99,7 @@ void Fol_PutLinkWhoToFollow (void)
|
|||
Lay_PutContextualLinkIconText (ActSeeSocPrf,NULL,
|
||||
NULL,NULL,
|
||||
"user-plus.svg",Ico_BLACK,
|
||||
Txt_Who_to_follow);
|
||||
Txt_Who_to_follow,NULL);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -641,7 +641,8 @@ static void Fol_ShowFollowedOrFollower (struct UsrData *UsrDat)
|
|||
Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
|
||||
HTM_DIV_Begin ("class=\"FOLLOW_USR_NAME\""); // Limited width
|
||||
HTM_BUTTON_SUBMIT_Begin (Txt_Another_user_s_profile,
|
||||
Str_BuildString ("BT_LINK LT %s",The_ClassDat[Gbl.Prefs.Theme]),
|
||||
Str_BuildString ("BT_LINK LT %s",
|
||||
The_ClassDat[Gbl.Prefs.Theme]),
|
||||
NULL);
|
||||
Str_FreeStrings ();
|
||||
Usr_WriteFirstNameBRSurnames (UsrDat);
|
||||
|
@ -739,7 +740,7 @@ static void Fol_WriteRowUsrToFollowOnRightColumn (struct UsrData *UsrDat)
|
|||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/*********************** Put icon to unfollow another user *********************/
|
||||
/************* Put inactive icon to follow/unfollow another user *************/
|
||||
/*****************************************************************************/
|
||||
|
||||
static void Fol_PutInactiveIconToFollowUnfollow (void)
|
||||
|
|
23
swad_forum.c
23
swad_forum.c
|
@ -929,10 +929,12 @@ static void For_ShowAForumPost (struct For_Forums *Forums,
|
|||
For_PutParamsForum (Forums);
|
||||
if (Enabled)
|
||||
Ico_PutIconLink ("eye.svg",Ico_GREEN,
|
||||
Str_BuildString (Txt_FORUM_Post_X_allowed_Click_to_ban_it,PstNum));
|
||||
Str_BuildString (Txt_FORUM_Post_X_allowed_Click_to_ban_it,
|
||||
PstNum));
|
||||
else
|
||||
Ico_PutIconLink ("eye-slash.svg",Ico_RED,
|
||||
Str_BuildString (Txt_FORUM_Post_X_banned_Click_to_unban_it,PstNum));
|
||||
Str_BuildString (Txt_FORUM_Post_X_banned_Click_to_unban_it,
|
||||
PstNum));
|
||||
Str_FreeStrings ();
|
||||
Frm_EndForm ();
|
||||
}
|
||||
|
@ -1698,7 +1700,8 @@ static void For_WriteLinkToForum (const struct For_Forums *Forums,
|
|||
{
|
||||
/* Check if thread to move is yet in current forum */
|
||||
if (For_DB_CheckIfThrBelongsToForum (Forums->Thread.ToMove,Forum))
|
||||
Ico_PutIcon ("paste.svg",Ico_BLACK,Txt_Copy_not_allowed,"CONTEXT_OPT ICO_HIDDEN ICO16x16");
|
||||
Ico_PutIcon ("paste.svg",Ico_BLACK,
|
||||
Txt_Copy_not_allowed,"CONTEXT_OPT ICO_HIDDEN ICO16x16");
|
||||
else
|
||||
{
|
||||
Frm_BeginFormAnchor (For_ActionsPasThrFor[Forum->Type],
|
||||
|
@ -1738,7 +1741,7 @@ static void For_WriteLinkToForum (const struct For_Forums *Forums,
|
|||
break;
|
||||
case For_FORUM__SWAD__USRS:
|
||||
case For_FORUM__SWAD__TCHS:
|
||||
Ico_PutIcon ("swad64x64.png",Ico_BLACK,ForumName,"ICO16x16");
|
||||
Ico_PutIcon ("swad64x64.png",Ico_UNCHANGED,ForumName,"ICO16x16");
|
||||
break;
|
||||
case For_FORUM_INSTIT_USRS:
|
||||
case For_FORUM_INSTIT_TCHS:
|
||||
|
@ -2201,12 +2204,12 @@ static void For_ListForumThrs (struct For_Forums *Forums,
|
|||
|
||||
HTM_TD_Begin ("class=\"CONTEXT_COL %s\"",BgColor);
|
||||
/***** Put an icon with thread status *****/
|
||||
Ico_PutIcon (Thr.NumUnreadPosts ? "envelope.svg" :
|
||||
"envelope-open-text.svg",
|
||||
Ico_BLACK,
|
||||
Thr.NumUnreadPosts ? Txt_There_are_new_posts :
|
||||
Txt_No_new_posts,
|
||||
"ICO16x16");
|
||||
if (Thr.NumUnreadPosts)
|
||||
Ico_PutIcon ("envelope.svg",Ico_BLACK,
|
||||
Txt_There_are_new_posts,"ICO16x16");
|
||||
else
|
||||
Ico_PutIcon ("envelope-open-text.svg",Ico_BLACK,
|
||||
Txt_No_new_posts,"ICO16x16");
|
||||
|
||||
/***** Put button to remove the thread *****/
|
||||
if (PermissionThreadDeletion[Forums->Forum.Type] &
|
||||
|
|
36
swad_group.c
36
swad_group.c
|
@ -1313,11 +1313,14 @@ static void Grp_ListGroupTypesForEdition (void)
|
|||
HTM_TR_Begin (NULL);
|
||||
|
||||
HTM_TD_Begin ("class=\"LM\" style=\"width:16px;\"");
|
||||
Ico_PutIcon ("clock.svg",Ico_BLACK,
|
||||
Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].MustBeOpened ? Txt_The_groups_will_automatically_open :
|
||||
Txt_The_groups_will_not_automatically_open,
|
||||
Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].MustBeOpened ? "CONTEXT_ICO_16x16" :
|
||||
"ICO_HIDDEN CONTEXT_ICO_16x16");
|
||||
if (Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].MustBeOpened)
|
||||
Ico_PutIconOn ("clock.svg",Ico_BLACK,
|
||||
Txt_The_groups_will_automatically_open);
|
||||
|
||||
else
|
||||
Ico_PutIconOff ("clock.svg",Ico_BLACK,
|
||||
Txt_The_groups_will_not_automatically_open);
|
||||
|
||||
HTM_TD_End ();
|
||||
|
||||
HTM_TD_Begin ("class=\"LM\"");
|
||||
|
@ -1465,10 +1468,12 @@ static void Grp_ListGroupsForEdition (const struct Roo_Rooms *Rooms)
|
|||
Grp_PutParamGrpCod (&Grp->GrpCod);
|
||||
if (Grp->Open)
|
||||
Ico_PutIconLink ("unlock.svg",Ico_GREEN,
|
||||
Str_BuildString (Txt_Group_X_open_click_to_close_it,Grp->GrpName));
|
||||
Str_BuildString (Txt_Group_X_open_click_to_close_it,
|
||||
Grp->GrpName));
|
||||
else
|
||||
Ico_PutIconLink ("lock.svg",Ico_RED,
|
||||
Str_BuildString (Txt_Group_X_closed_click_to_open_it,Grp->GrpName));
|
||||
Str_BuildString (Txt_Group_X_closed_click_to_open_it,
|
||||
Grp->GrpName));
|
||||
Str_FreeStrings ();
|
||||
Frm_EndForm ();
|
||||
HTM_TD_End ();
|
||||
|
@ -1481,10 +1486,12 @@ static void Grp_ListGroupsForEdition (const struct Roo_Rooms *Rooms)
|
|||
Grp_PutParamGrpCod (&Grp->GrpCod);
|
||||
if (Grp->FileZones)
|
||||
Ico_PutIconLink ("folder-open.svg",Ico_GREEN,
|
||||
Str_BuildString (Txt_File_zones_of_the_group_X_enabled_click_to_disable_them,Grp->GrpName));
|
||||
Str_BuildString (Txt_File_zones_of_the_group_X_enabled_click_to_disable_them,
|
||||
Grp->GrpName));
|
||||
else
|
||||
Ico_PutIconLink ("folder.svg",Ico_RED,
|
||||
Str_BuildString (Txt_File_zones_of_the_group_X_disabled_click_to_enable_them,Grp->GrpName));
|
||||
Str_BuildString (Txt_File_zones_of_the_group_X_disabled_click_to_enable_them,
|
||||
Grp->GrpName));
|
||||
Str_FreeStrings ();
|
||||
Frm_EndForm ();
|
||||
HTM_TD_End ();
|
||||
|
@ -2517,11 +2524,12 @@ static void Grp_PutFormToCreateGroupType (void)
|
|||
HTM_TR_Begin (NULL);
|
||||
|
||||
HTM_TD_Begin ("class=\"LM\" style=\"width:20px;\"");
|
||||
Ico_PutIcon ("clock.svg",Ico_BLACK,
|
||||
Gbl.Crs.Grps.GrpTyp.MustBeOpened ? Txt_The_groups_will_automatically_open :
|
||||
Txt_The_groups_will_not_automatically_open,
|
||||
Gbl.Crs.Grps.GrpTyp.MustBeOpened ? "CONTEXT_ICO_16x16" :
|
||||
"ICO_HIDDEN CONTEXT_ICO_16x16");
|
||||
if (Gbl.Crs.Grps.GrpTyp.MustBeOpened)
|
||||
Ico_PutIconOn ("clock.svg",Ico_BLACK,
|
||||
Txt_The_groups_will_automatically_open);
|
||||
else
|
||||
Ico_PutIconOff ("clock.svg",Ico_BLACK,
|
||||
Txt_The_groups_will_not_automatically_open);
|
||||
HTM_TD_End ();
|
||||
|
||||
HTM_TD_Begin ("class=\"LM\"");
|
||||
|
|
|
@ -409,7 +409,8 @@ void Hie_WriteBigNameCtyInsCtrDegCrs (void)
|
|||
switch (Gbl.Hierarchy.Level)
|
||||
{
|
||||
case HieLvl_SYS: // System
|
||||
Ico_PutIcon ("swad64x64.png",Ico_BLACK,Cfg_PLATFORM_FULL_NAME,"ICO40x40 TOP_LOGO");
|
||||
Ico_PutIcon ("swad64x64.png",Ico_UNCHANGED,
|
||||
Cfg_PLATFORM_FULL_NAME,"ICO40x40 TOP_LOGO");
|
||||
break;
|
||||
case HieLvl_CTY: // Country
|
||||
Cty_DrawCountryMap (&Gbl.Hierarchy.Cty,"COUNTRY_MAP_TITLE");
|
||||
|
@ -683,7 +684,8 @@ void Hie_GetAndWriteInsCtrDegAdminBy (long UsrCod,unsigned ColSpan)
|
|||
switch (Sco_GetScopeFromUnsignedStr (row[0]))
|
||||
{
|
||||
case HieLvl_SYS: // System
|
||||
Ico_PutIcon ("swad64x64.png",Ico_BLACK,Txt_all_degrees,"ICO16x16");
|
||||
Ico_PutIcon ("swad64x64.png",Ico_UNCHANGED,
|
||||
Txt_all_degrees,"ICO16x16");
|
||||
HTM_TxtF (" %s",Txt_all_degrees);
|
||||
break;
|
||||
case HieLvl_INS: // Institution
|
||||
|
|
|
@ -268,7 +268,8 @@ void HieCfg_NumCtrs (unsigned NumCtrs,bool PutForm)
|
|||
Ins_PutParamInsCod (Gbl.Hierarchy.Ins.InsCod);
|
||||
HTM_BUTTON_SUBMIT_Begin (Str_BuildString (Txt_Centers_of_INSTITUTION_X,
|
||||
Gbl.Hierarchy.Ins.ShrtName),
|
||||
Str_BuildString ("BT_LINK %s",The_ClassDat[Gbl.Prefs.Theme]),
|
||||
Str_BuildString ("BT_LINK %s",
|
||||
The_ClassDat[Gbl.Prefs.Theme]),
|
||||
NULL);
|
||||
Str_FreeStrings ();
|
||||
}
|
||||
|
|
162
swad_icon.c
162
swad_icon.c
|
@ -135,7 +135,7 @@ void Ico_PutIconsToSelectIconSet (void)
|
|||
snprintf (Icon,sizeof (Icon),"%s/%s/cog.svg",
|
||||
Cfg_ICON_FOLDER_SETS,
|
||||
Ico_IconSetId[IconSet]);
|
||||
Ico_PutSettingIconLink (Icon,Ico_BLACK,Ico_IconSetNames[IconSet]);
|
||||
Ico_PutSettingIconLink (Icon,Ico_UNCHANGED,Ico_IconSetNames[IconSet]);
|
||||
Frm_EndForm ();
|
||||
HTM_DIV_End ();
|
||||
}
|
||||
|
@ -231,7 +231,7 @@ void Ico_PutContextualIconToRemove (Act_Action_t NextAction,const char *Anchor,
|
|||
|
||||
Lay_PutContextualLinkOnlyIcon (NextAction,Anchor,
|
||||
FuncParams,Args,
|
||||
"trash.svg",Ico_BLACK,
|
||||
"trash.svg",Ico_RED,
|
||||
Txt_Remove);
|
||||
}
|
||||
|
||||
|
@ -343,7 +343,7 @@ void Ico_PutContextualIconToCreateInFolder (Act_Action_t NextAction,
|
|||
Lay_PutContextualLinkOnlyIcon (NextAction,NULL,
|
||||
FuncParams,Args,
|
||||
Open ? "folder-open-yellow-plus.png" :
|
||||
"folder-yellow-plus.png",Ico_BLACK,
|
||||
"folder-yellow-plus.png",Ico_UNCHANGED,
|
||||
Txt_Upload_file_or_create_folder);
|
||||
}
|
||||
|
||||
|
@ -410,21 +410,29 @@ void Ico_PutIconLink (const char *Icon,Ico_Color_t Color,const char *Title)
|
|||
{
|
||||
static const char *ClassIco[Ico_NUM_COLORS][The_NUM_THEMES] =
|
||||
{
|
||||
[Ico_BLACK][The_THEME_WHITE ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 BLACK_ICO_WHITE",
|
||||
[Ico_BLACK][The_THEME_GREY ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 BLACK_ICO_GREY",
|
||||
[Ico_BLACK][The_THEME_PURPLE] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 BLACK_ICO_PURPLE",
|
||||
[Ico_BLACK][The_THEME_BLUE ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 BLACK_ICO_BLUE",
|
||||
[Ico_BLACK][The_THEME_YELLOW] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 BLACK_ICO_YELLOW",
|
||||
[Ico_BLACK][The_THEME_PINK ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 BLACK_ICO_PINK",
|
||||
[Ico_BLACK][The_THEME_DARK ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 BLACK_ICO_DARK",
|
||||
[Ico_UNCHANGED][The_THEME_WHITE ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16",
|
||||
[Ico_UNCHANGED][The_THEME_GREY ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16",
|
||||
[Ico_UNCHANGED][The_THEME_PURPLE] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16",
|
||||
[Ico_UNCHANGED][The_THEME_BLUE ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16",
|
||||
[Ico_UNCHANGED][The_THEME_YELLOW] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16",
|
||||
[Ico_UNCHANGED][The_THEME_PINK ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16",
|
||||
[Ico_UNCHANGED][The_THEME_DARK ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16",
|
||||
|
||||
[Ico_GREEN][The_THEME_WHITE ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 GREEN_ICO_WHITE",
|
||||
[Ico_GREEN][The_THEME_GREY ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 GREEN_ICO_GREY",
|
||||
[Ico_GREEN][The_THEME_PURPLE] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 GREEN_ICO_PURPLE",
|
||||
[Ico_GREEN][The_THEME_BLUE ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 GREEN_ICO_BLUE",
|
||||
[Ico_GREEN][The_THEME_YELLOW] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 GREEN_ICO_YELLOW",
|
||||
[Ico_GREEN][The_THEME_PINK ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 GREEN_ICO_PINK",
|
||||
[Ico_GREEN][The_THEME_DARK ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 GREEN_ICO_DARK",
|
||||
[Ico_BLACK ][The_THEME_WHITE ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 BLACK_ICO_WHITE",
|
||||
[Ico_BLACK ][The_THEME_GREY ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 BLACK_ICO_GREY",
|
||||
[Ico_BLACK ][The_THEME_PURPLE] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 BLACK_ICO_PURPLE",
|
||||
[Ico_BLACK ][The_THEME_BLUE ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 BLACK_ICO_BLUE",
|
||||
[Ico_BLACK ][The_THEME_YELLOW] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 BLACK_ICO_YELLOW",
|
||||
[Ico_BLACK ][The_THEME_PINK ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 BLACK_ICO_PINK",
|
||||
[Ico_BLACK ][The_THEME_DARK ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 BLACK_ICO_DARK",
|
||||
|
||||
[Ico_GREEN ][The_THEME_WHITE ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 GREEN_ICO_WHITE",
|
||||
[Ico_GREEN ][The_THEME_GREY ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 GREEN_ICO_GREY",
|
||||
[Ico_GREEN ][The_THEME_PURPLE] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 GREEN_ICO_PURPLE",
|
||||
[Ico_GREEN ][The_THEME_BLUE ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 GREEN_ICO_BLUE",
|
||||
[Ico_GREEN ][The_THEME_YELLOW] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 GREEN_ICO_YELLOW",
|
||||
[Ico_GREEN ][The_THEME_PINK ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 GREEN_ICO_PINK",
|
||||
[Ico_GREEN ][The_THEME_DARK ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 GREEN_ICO_DARK",
|
||||
|
||||
[Ico_RED ][The_THEME_WHITE ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 RED_ICO_WHITE",
|
||||
[Ico_RED ][The_THEME_GREY ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 RED_ICO_GREY",
|
||||
|
@ -434,13 +442,13 @@ void Ico_PutIconLink (const char *Icon,Ico_Color_t Color,const char *Title)
|
|||
[Ico_RED ][The_THEME_PINK ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 RED_ICO_PINK",
|
||||
[Ico_RED ][The_THEME_DARK ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 RED_ICO_DARK",
|
||||
|
||||
[Ico_WHITE][The_THEME_WHITE ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 WHITE_ICO_WHITE",
|
||||
[Ico_WHITE][The_THEME_GREY ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 WHITE_ICO_GREY",
|
||||
[Ico_WHITE][The_THEME_PURPLE] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 WHITE_ICO_PURPLE",
|
||||
[Ico_WHITE][The_THEME_BLUE ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 WHITE_ICO_BLUE",
|
||||
[Ico_WHITE][The_THEME_YELLOW] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 WHITE_ICO_YELLOW",
|
||||
[Ico_WHITE][The_THEME_PINK ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 WHITE_ICO_PINK",
|
||||
[Ico_WHITE][The_THEME_DARK ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 WHITE_ICO_DARK",
|
||||
[Ico_WHITE ][The_THEME_WHITE ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 WHITE_ICO_WHITE",
|
||||
[Ico_WHITE ][The_THEME_GREY ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 WHITE_ICO_GREY",
|
||||
[Ico_WHITE ][The_THEME_PURPLE] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 WHITE_ICO_PURPLE",
|
||||
[Ico_WHITE ][The_THEME_BLUE ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 WHITE_ICO_BLUE",
|
||||
[Ico_WHITE ][The_THEME_YELLOW] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 WHITE_ICO_YELLOW",
|
||||
[Ico_WHITE ][The_THEME_PINK ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 WHITE_ICO_PINK",
|
||||
[Ico_WHITE ][The_THEME_DARK ] = "CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 WHITE_ICO_DARK",
|
||||
};
|
||||
|
||||
HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,Icon,Title,ClassIco[Color][Gbl.Prefs.Theme]);
|
||||
|
@ -478,21 +486,29 @@ void Ico_PutSettingIconLink (const char *Icon,Ico_Color_t Color,const char *Titl
|
|||
{
|
||||
static const char *ClassIco[Ico_NUM_COLORS][The_NUM_THEMES] =
|
||||
{
|
||||
[Ico_BLACK][The_THEME_WHITE ] = "ICO_HIGHLIGHT ICOx20 BLACK_ICO_WHITE",
|
||||
[Ico_BLACK][The_THEME_GREY ] = "ICO_HIGHLIGHT ICOx20 BLACK_ICO_GREY",
|
||||
[Ico_BLACK][The_THEME_PURPLE] = "ICO_HIGHLIGHT ICOx20 BLACK_ICO_PURPLE",
|
||||
[Ico_BLACK][The_THEME_BLUE ] = "ICO_HIGHLIGHT ICOx20 BLACK_ICO_BLUE",
|
||||
[Ico_BLACK][The_THEME_YELLOW] = "ICO_HIGHLIGHT ICOx20 BLACK_ICO_YELLOW",
|
||||
[Ico_BLACK][The_THEME_PINK ] = "ICO_HIGHLIGHT ICOx20 BLACK_ICO_PINK",
|
||||
[Ico_BLACK][The_THEME_DARK ] = "ICO_HIGHLIGHT ICOx20 BLACK_ICO_DARK",
|
||||
[Ico_UNCHANGED][The_THEME_WHITE ] = "ICO_HIGHLIGHT ICOx20",
|
||||
[Ico_UNCHANGED][The_THEME_GREY ] = "ICO_HIGHLIGHT ICOx20",
|
||||
[Ico_UNCHANGED][The_THEME_PURPLE] = "ICO_HIGHLIGHT ICOx20",
|
||||
[Ico_UNCHANGED][The_THEME_BLUE ] = "ICO_HIGHLIGHT ICOx20",
|
||||
[Ico_UNCHANGED][The_THEME_YELLOW] = "ICO_HIGHLIGHT ICOx20",
|
||||
[Ico_UNCHANGED][The_THEME_PINK ] = "ICO_HIGHLIGHT ICOx20",
|
||||
[Ico_UNCHANGED][The_THEME_DARK ] = "ICO_HIGHLIGHT ICOx20",
|
||||
|
||||
[Ico_GREEN][The_THEME_WHITE ] = "ICO_HIGHLIGHT ICOx20 GREEN_ICO_WHITE",
|
||||
[Ico_GREEN][The_THEME_GREY ] = "ICO_HIGHLIGHT ICOx20 GREEN_ICO_GREY",
|
||||
[Ico_GREEN][The_THEME_PURPLE] = "ICO_HIGHLIGHT ICOx20 GREEN_ICO_PURPLE",
|
||||
[Ico_GREEN][The_THEME_BLUE ] = "ICO_HIGHLIGHT ICOx20 GREEN_ICO_BLUE",
|
||||
[Ico_GREEN][The_THEME_YELLOW] = "ICO_HIGHLIGHT ICOx20 GREEN_ICO_YELLOW",
|
||||
[Ico_GREEN][The_THEME_PINK ] = "ICO_HIGHLIGHT ICOx20 GREEN_ICO_PINK",
|
||||
[Ico_GREEN][The_THEME_DARK ] = "ICO_HIGHLIGHT ICOx20 GREEN_ICO_DARK",
|
||||
[Ico_BLACK ][The_THEME_WHITE ] = "ICO_HIGHLIGHT ICOx20 BLACK_ICO_WHITE",
|
||||
[Ico_BLACK ][The_THEME_GREY ] = "ICO_HIGHLIGHT ICOx20 BLACK_ICO_GREY",
|
||||
[Ico_BLACK ][The_THEME_PURPLE] = "ICO_HIGHLIGHT ICOx20 BLACK_ICO_PURPLE",
|
||||
[Ico_BLACK ][The_THEME_BLUE ] = "ICO_HIGHLIGHT ICOx20 BLACK_ICO_BLUE",
|
||||
[Ico_BLACK ][The_THEME_YELLOW] = "ICO_HIGHLIGHT ICOx20 BLACK_ICO_YELLOW",
|
||||
[Ico_BLACK ][The_THEME_PINK ] = "ICO_HIGHLIGHT ICOx20 BLACK_ICO_PINK",
|
||||
[Ico_BLACK ][The_THEME_DARK ] = "ICO_HIGHLIGHT ICOx20 BLACK_ICO_DARK",
|
||||
|
||||
[Ico_GREEN ][The_THEME_WHITE ] = "ICO_HIGHLIGHT ICOx20 GREEN_ICO_WHITE",
|
||||
[Ico_GREEN ][The_THEME_GREY ] = "ICO_HIGHLIGHT ICOx20 GREEN_ICO_GREY",
|
||||
[Ico_GREEN ][The_THEME_PURPLE] = "ICO_HIGHLIGHT ICOx20 GREEN_ICO_PURPLE",
|
||||
[Ico_GREEN ][The_THEME_BLUE ] = "ICO_HIGHLIGHT ICOx20 GREEN_ICO_BLUE",
|
||||
[Ico_GREEN ][The_THEME_YELLOW] = "ICO_HIGHLIGHT ICOx20 GREEN_ICO_YELLOW",
|
||||
[Ico_GREEN ][The_THEME_PINK ] = "ICO_HIGHLIGHT ICOx20 GREEN_ICO_PINK",
|
||||
[Ico_GREEN ][The_THEME_DARK ] = "ICO_HIGHLIGHT ICOx20 GREEN_ICO_DARK",
|
||||
|
||||
[Ico_RED ][The_THEME_WHITE ] = "ICO_HIGHLIGHT ICOx20 RED_ICO_WHITE",
|
||||
[Ico_RED ][The_THEME_GREY ] = "ICO_HIGHLIGHT ICOx20 RED_ICO_GREY",
|
||||
|
@ -502,13 +518,13 @@ void Ico_PutSettingIconLink (const char *Icon,Ico_Color_t Color,const char *Titl
|
|||
[Ico_RED ][The_THEME_PINK ] = "ICO_HIGHLIGHT ICOx20 RED_ICO_PINK",
|
||||
[Ico_RED ][The_THEME_DARK ] = "ICO_HIGHLIGHT ICOx20 RED_ICO_DARK",
|
||||
|
||||
[Ico_WHITE][The_THEME_WHITE ] = "ICO_HIGHLIGHT ICOx20 WHITE_ICO_WHITE",
|
||||
[Ico_WHITE][The_THEME_GREY ] = "ICO_HIGHLIGHT ICOx20 WHITE_ICO_GREY",
|
||||
[Ico_WHITE][The_THEME_PURPLE] = "ICO_HIGHLIGHT ICOx20 WHITE_ICO_PURPLE",
|
||||
[Ico_WHITE][The_THEME_BLUE ] = "ICO_HIGHLIGHT ICOx20 WHITE_ICO_BLUE",
|
||||
[Ico_WHITE][The_THEME_YELLOW] = "ICO_HIGHLIGHT ICOx20 WHITE_ICO_YELLOW",
|
||||
[Ico_WHITE][The_THEME_PINK ] = "ICO_HIGHLIGHT ICOx20 WHITE_ICO_PINK",
|
||||
[Ico_WHITE][The_THEME_DARK ] = "ICO_HIGHLIGHT ICOx20 WHITE_ICO_DARK",
|
||||
[Ico_WHITE ][The_THEME_WHITE ] = "ICO_HIGHLIGHT ICOx20 WHITE_ICO_WHITE",
|
||||
[Ico_WHITE ][The_THEME_GREY ] = "ICO_HIGHLIGHT ICOx20 WHITE_ICO_GREY",
|
||||
[Ico_WHITE ][The_THEME_PURPLE] = "ICO_HIGHLIGHT ICOx20 WHITE_ICO_PURPLE",
|
||||
[Ico_WHITE ][The_THEME_BLUE ] = "ICO_HIGHLIGHT ICOx20 WHITE_ICO_BLUE",
|
||||
[Ico_WHITE ][The_THEME_YELLOW] = "ICO_HIGHLIGHT ICOx20 WHITE_ICO_YELLOW",
|
||||
[Ico_WHITE ][The_THEME_PINK ] = "ICO_HIGHLIGHT ICOx20 WHITE_ICO_PINK",
|
||||
[Ico_WHITE ][The_THEME_DARK ] = "ICO_HIGHLIGHT ICOx20 WHITE_ICO_DARK",
|
||||
};
|
||||
|
||||
HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,Icon,Title,ClassIco[Color][Gbl.Prefs.Theme]);
|
||||
|
@ -536,21 +552,29 @@ void Ico_PutIcon (const char *Icon,Ico_Color_t Color,const char *Title,const cha
|
|||
{
|
||||
static const char *ClassColor[Ico_NUM_COLORS][The_NUM_THEMES] =
|
||||
{
|
||||
[Ico_BLACK][The_THEME_WHITE ] = "BLACK_ICO_WHITE",
|
||||
[Ico_BLACK][The_THEME_GREY ] = "BLACK_ICO_GREY",
|
||||
[Ico_BLACK][The_THEME_PURPLE] = "BLACK_ICO_PURPLE",
|
||||
[Ico_BLACK][The_THEME_BLUE ] = "BLACK_ICO_BLUE",
|
||||
[Ico_BLACK][The_THEME_YELLOW] = "BLACK_ICO_YELLOW",
|
||||
[Ico_BLACK][The_THEME_PINK ] = "BLACK_ICO_PINK",
|
||||
[Ico_BLACK][The_THEME_DARK ] = "BLACK_ICO_DARK",
|
||||
[Ico_UNCHANGED][The_THEME_WHITE ] = NULL,
|
||||
[Ico_UNCHANGED][The_THEME_GREY ] = NULL,
|
||||
[Ico_UNCHANGED][The_THEME_PURPLE] = NULL,
|
||||
[Ico_UNCHANGED][The_THEME_BLUE ] = NULL,
|
||||
[Ico_UNCHANGED][The_THEME_YELLOW] = NULL,
|
||||
[Ico_UNCHANGED][The_THEME_PINK ] = NULL,
|
||||
[Ico_UNCHANGED][The_THEME_DARK ] = NULL,
|
||||
|
||||
[Ico_GREEN][The_THEME_WHITE ] = "GREEN_ICO_WHITE",
|
||||
[Ico_GREEN][The_THEME_GREY ] = "GREEN_ICO_GREY",
|
||||
[Ico_GREEN][The_THEME_PURPLE] = "GREEN_ICO_PURPLE",
|
||||
[Ico_GREEN][The_THEME_BLUE ] = "GREEN_ICO_BLUE",
|
||||
[Ico_GREEN][The_THEME_YELLOW] = "GREEN_ICO_YELLOW",
|
||||
[Ico_GREEN][The_THEME_PINK ] = "GREEN_ICO_PINK",
|
||||
[Ico_GREEN][The_THEME_DARK ] = "GREEN_ICO_DARK",
|
||||
[Ico_BLACK ][The_THEME_WHITE ] = "BLACK_ICO_WHITE",
|
||||
[Ico_BLACK ][The_THEME_GREY ] = "BLACK_ICO_GREY",
|
||||
[Ico_BLACK ][The_THEME_PURPLE] = "BLACK_ICO_PURPLE",
|
||||
[Ico_BLACK ][The_THEME_BLUE ] = "BLACK_ICO_BLUE",
|
||||
[Ico_BLACK ][The_THEME_YELLOW] = "BLACK_ICO_YELLOW",
|
||||
[Ico_BLACK ][The_THEME_PINK ] = "BLACK_ICO_PINK",
|
||||
[Ico_BLACK ][The_THEME_DARK ] = "BLACK_ICO_DARK",
|
||||
|
||||
[Ico_GREEN ][The_THEME_WHITE ] = "GREEN_ICO_WHITE",
|
||||
[Ico_GREEN ][The_THEME_GREY ] = "GREEN_ICO_GREY",
|
||||
[Ico_GREEN ][The_THEME_PURPLE] = "GREEN_ICO_PURPLE",
|
||||
[Ico_GREEN ][The_THEME_BLUE ] = "GREEN_ICO_BLUE",
|
||||
[Ico_GREEN ][The_THEME_YELLOW] = "GREEN_ICO_YELLOW",
|
||||
[Ico_GREEN ][The_THEME_PINK ] = "GREEN_ICO_PINK",
|
||||
[Ico_GREEN ][The_THEME_DARK ] = "GREEN_ICO_DARK",
|
||||
|
||||
[Ico_RED ][The_THEME_WHITE ] = "RED_ICO_WHITE",
|
||||
[Ico_RED ][The_THEME_GREY ] = "RED_ICO_GREY",
|
||||
|
@ -560,17 +584,21 @@ void Ico_PutIcon (const char *Icon,Ico_Color_t Color,const char *Title,const cha
|
|||
[Ico_RED ][The_THEME_PINK ] = "RED_ICO_PINK",
|
||||
[Ico_RED ][The_THEME_DARK ] = "RED_ICO_DARK",
|
||||
|
||||
[Ico_WHITE][The_THEME_WHITE ] = "WHITE_ICO_WHITE",
|
||||
[Ico_WHITE][The_THEME_GREY ] = "WHITE_ICO_GREY",
|
||||
[Ico_WHITE][The_THEME_PURPLE] = "WHITE_ICO_PURPLE",
|
||||
[Ico_WHITE][The_THEME_BLUE ] = "WHITE_ICO_BLUE",
|
||||
[Ico_WHITE][The_THEME_YELLOW] = "WHITE_ICO_YELLOW",
|
||||
[Ico_WHITE][The_THEME_PINK ] = "WHITE_ICO_PINK",
|
||||
[Ico_WHITE][The_THEME_DARK ] = "WHITE_ICO_DARK",
|
||||
[Ico_WHITE ][The_THEME_WHITE ] = "WHITE_ICO_WHITE",
|
||||
[Ico_WHITE ][The_THEME_GREY ] = "WHITE_ICO_GREY",
|
||||
[Ico_WHITE ][The_THEME_PURPLE] = "WHITE_ICO_PURPLE",
|
||||
[Ico_WHITE ][The_THEME_BLUE ] = "WHITE_ICO_BLUE",
|
||||
[Ico_WHITE ][The_THEME_YELLOW] = "WHITE_ICO_YELLOW",
|
||||
[Ico_WHITE ][The_THEME_PINK ] = "WHITE_ICO_PINK",
|
||||
[Ico_WHITE ][The_THEME_DARK ] = "WHITE_ICO_DARK",
|
||||
};
|
||||
const char *CC = ClassColor[Color][Gbl.Prefs.Theme];
|
||||
|
||||
HTM_IMG (Cfg_URL_ICON_PUBLIC,Icon,Title,
|
||||
"class=\"%s %s\"",Class,ClassColor[Color][Gbl.Prefs.Theme]);
|
||||
"class=\"%s%s%s\"",
|
||||
Class,
|
||||
CC ? " " : "",
|
||||
CC ? CC : "");
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
11
swad_icon.h
11
swad_icon.h
|
@ -40,13 +40,14 @@ typedef enum
|
|||
} Ico_IconSet_t;
|
||||
#define Ico_ICON_SET_DEFAULT Ico_ICON_SET_AWESOME
|
||||
|
||||
#define Ico_NUM_COLORS 4
|
||||
#define Ico_NUM_COLORS 5
|
||||
typedef enum
|
||||
{
|
||||
Ico_BLACK = 0,
|
||||
Ico_GREEN = 1,
|
||||
Ico_RED = 2,
|
||||
Ico_WHITE = 3,
|
||||
Ico_UNCHANGED = 0,
|
||||
Ico_BLACK = 1,
|
||||
Ico_GREEN = 2,
|
||||
Ico_RED = 3,
|
||||
Ico_WHITE = 4,
|
||||
} Ico_Color_t;
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -374,12 +374,14 @@ static void Ins_ListOneInstitutionForSeeing (struct Ins_Instit *Ins,unsigned Num
|
|||
if (Ins->Status & Hie_STATUS_BIT_PENDING)
|
||||
{
|
||||
TxtClassNormal = The_ClassDatLight[Gbl.Prefs.Theme];
|
||||
TxtClassStrong = Str_BuildString ("BT_LINK LT %s",The_ClassDatLight[Gbl.Prefs.Theme]);
|
||||
TxtClassStrong = Str_BuildString ("BT_LINK LT %s",
|
||||
The_ClassDatLight[Gbl.Prefs.Theme]);
|
||||
}
|
||||
else
|
||||
{
|
||||
TxtClassNormal = The_ClassDat[Gbl.Prefs.Theme];
|
||||
TxtClassStrong = Str_BuildString ("BT_LINK LT %s",The_ClassDatStrong[Gbl.Prefs.Theme]);
|
||||
TxtClassStrong = Str_BuildString ("BT_LINK LT %s",
|
||||
The_ClassDatStrong[Gbl.Prefs.Theme]);
|
||||
}
|
||||
BgColor = (Ins->InsCod == Gbl.Hierarchy.Ins.InsCod) ? The_ClassBgHighlight[Gbl.Prefs.Theme] :
|
||||
Gbl.ColorRows[Gbl.RowEvenOdd];
|
||||
|
|
|
@ -344,7 +344,8 @@ static void InsCfg_Country (bool PrintView,bool PutForm)
|
|||
Frm_BeginFormGoTo (ActSeeCtyInf);
|
||||
Cty_PutParamCtyCod (Gbl.Hierarchy.Cty.CtyCod);
|
||||
HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]),
|
||||
Str_BuildString ("BT_LINK LT %s",The_ClassDat[Gbl.Prefs.Theme]),
|
||||
Str_BuildString ("BT_LINK LT %s",
|
||||
The_ClassDat[Gbl.Prefs.Theme]),
|
||||
NULL);
|
||||
Str_FreeStrings ();
|
||||
}
|
||||
|
|
|
@ -78,7 +78,7 @@ void Lan_PutLinkToChangeLanguage (void)
|
|||
Lay_PutContextualLinkIconText (ActReqEdiSet,NULL,
|
||||
NULL,NULL,
|
||||
"globe-americas.svg",Ico_BLACK,
|
||||
"Change language");
|
||||
"Change language",NULL);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -1208,7 +1208,7 @@ void Lay_PutContextualLinkOnlyIcon (Act_Action_t NextAction,const char *Anchor,
|
|||
void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor,
|
||||
void (*FuncParams) (void *Args),void *Args,
|
||||
const char *Icon,Ico_Color_t Color,
|
||||
const char *Text)
|
||||
const char *Text,const char *OnSubmit)
|
||||
{
|
||||
extern const char *The_ClassFormLinkOutBoxBold[The_NUM_THEMES];
|
||||
|
||||
|
@ -1222,42 +1222,8 @@ void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor,
|
|||
FuncParams (Args);
|
||||
|
||||
/***** Put icon and text with link *****/
|
||||
HTM_BUTTON_SUBMIT_Begin (Text,The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme],NULL);
|
||||
Ico_PutIconTextLink (Icon,Color,Text);
|
||||
HTM_BUTTON_End ();
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
||||
/***** Separator *****/
|
||||
HTM_Txt (" "); // This space is necessary to enable
|
||||
// jumping to the next line on narrow screens
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/**************** Show an icon with a link in contextual menu ****************/
|
||||
/*****************************************************************************/
|
||||
|
||||
void Lay_PutContextualLinkIconTextOnSubmit (Act_Action_t NextAction,const char *Anchor,
|
||||
void (*FuncParams) (const void *Args),const void *Args,
|
||||
const char *Icon,
|
||||
const char *Text,
|
||||
const char *OnSubmit)
|
||||
{
|
||||
extern const char *The_ClassFormLinkOutBoxBold[The_NUM_THEMES];
|
||||
|
||||
/***** Separator *****/
|
||||
HTM_Txt (" "); // This space is necessary to enable
|
||||
// jumping to the next line on narrow screens
|
||||
|
||||
/***** Begin form *****/
|
||||
Frm_BeginFormAnchor (NextAction,Anchor);
|
||||
if (FuncParams)
|
||||
FuncParams (Args);
|
||||
|
||||
/***** Put icon with link *****/
|
||||
HTM_BUTTON_SUBMIT_Begin (Text,The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme],OnSubmit);
|
||||
Ico_PutIconTextLink (Icon,Ico_BLACK,Text);
|
||||
Ico_PutIconTextLink (Icon,Color,Text);
|
||||
HTM_BUTTON_End ();
|
||||
|
||||
/***** End form *****/
|
||||
|
|
|
@ -56,12 +56,7 @@ void Lay_PutContextualLinkOnlyIcon (Act_Action_t NextAction,const char *Anchor,
|
|||
void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor,
|
||||
void (*FuncParams) (void *Args),void *Args,
|
||||
const char *Icon,Ico_Color_t Color,
|
||||
const char *Text);
|
||||
void Lay_PutContextualLinkIconTextOnSubmit (Act_Action_t NextAction,const char *Anchor,
|
||||
void (*FuncParams) (const void *Args),const void *Args,
|
||||
const char *Icon,
|
||||
const char *Text,
|
||||
const char *OnSubmit);
|
||||
const char *Text,const char *OnSubmit);
|
||||
void Lay_PutContextualCheckbox (Act_Action_t NextAction,
|
||||
void (*FuncParams) (void),
|
||||
const char *CheckboxName,
|
||||
|
|
|
@ -121,7 +121,7 @@ void Log_PutLinkToLastClicks (void)
|
|||
Lay_PutContextualLinkIconText (ActLstClk,NULL,
|
||||
NULL,NULL,
|
||||
"mouse-pointer.svg",Ico_BLACK,
|
||||
Txt_Last_clicks);
|
||||
Txt_Last_clicks,NULL);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -1149,7 +1149,7 @@ static void Mai_ShowFormChangeUsrEmail (bool ItsMe,
|
|||
/* Email confirmed? */
|
||||
if (Confirmed)
|
||||
{
|
||||
Ico_PutIcon ("check-circle.svg",Ico_BLACK,
|
||||
Ico_PutIcon ("check-circle.svg",Ico_GREEN,
|
||||
Str_BuildString (Txt_Email_X_confirmed,row[0]),
|
||||
"ICO16x16");
|
||||
Str_FreeStrings ();
|
||||
|
|
|
@ -61,7 +61,7 @@ static void Mtn_PutLinkToSetUp (void)
|
|||
Lay_PutContextualLinkIconText (ActSetUp,NULL,
|
||||
NULL,NULL,
|
||||
"bolt.svg",Ico_BLACK,
|
||||
Txt_Set_up);
|
||||
Txt_Set_up,NULL);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -2702,7 +2702,8 @@ static void Mch_PutCheckboxResult (const struct Mch_Match *Match)
|
|||
|
||||
/***** Put icon with link *****/
|
||||
HTM_BUTTON_SUBMIT_Begin (Txt_View_results,
|
||||
Str_BuildString ("BT_LINK %s ICO_HIGHLIGHT",The_ClassDat[Gbl.Prefs.Theme]),
|
||||
Str_BuildString ("BT_LINK %s ICO_HIGHLIGHT",
|
||||
The_ClassDat[Gbl.Prefs.Theme]),
|
||||
NULL);
|
||||
Str_FreeStrings ();
|
||||
HTM_TxtF ("<i class=\"%s\"></i>",
|
||||
|
@ -3351,7 +3352,7 @@ static void Mch_PutBigButtonClose (void)
|
|||
static void Mch_ShowWaitImage (const char *Txt)
|
||||
{
|
||||
HTM_DIV_Begin ("class=\"MCH_WAIT_CONT\"");
|
||||
Ico_PutIcon ("Spin-1s-200px.gif",Ico_BLACK,Txt,"MCH_WAIT_IMG");
|
||||
Ico_PutIcon ("Spin-1s-200px.gif",Ico_UNCHANGED,Txt,"MCH_WAIT_IMG");
|
||||
HTM_DIV_End ();
|
||||
}
|
||||
|
||||
|
|
|
@ -221,7 +221,8 @@ void MchRes_ShowMyMchResultsInMch (void)
|
|||
false); // Do not put form to start new match
|
||||
|
||||
/***** List my matches results in match *****/
|
||||
MchRes_ShowResultsBegin (&Games,Str_BuildString (Txt_Results_of_match_X,Match.Title),
|
||||
MchRes_ShowResultsBegin (&Games,Str_BuildString (Txt_Results_of_match_X,
|
||||
Match.Title),
|
||||
false); // Do not list games to select
|
||||
Str_FreeStrings ();
|
||||
MchRes_ListMyMchResultsInMch (&Games,Match.MchCod);
|
||||
|
|
|
@ -1822,7 +1822,7 @@ static void Med_AlertThirdPartyCookies (void)
|
|||
Lay_PutContextualLinkIconText (ActReqEdiSet,Coo_COOKIES_ID,
|
||||
NULL,NULL,
|
||||
"cog.svg",Ico_BLACK,
|
||||
Txt_Settings);
|
||||
Txt_Settings,NULL);
|
||||
|
||||
/* End alert */
|
||||
Ale_ShowAlertAndButton2 (ActUnk,NULL,NULL,
|
||||
|
|
|
@ -324,7 +324,7 @@ void Mnu_PutIconsToSelectMenu (void)
|
|||
HTM_DIV_Begin ("class=\"PREF_OFF\"");
|
||||
Frm_BeginForm (ActChgMnu);
|
||||
Par_PutHiddenParamUnsigned (NULL,"Menu",(unsigned) Menu);
|
||||
Ico_PutSettingIconLink (Mnu_MenuIcons[Menu],Ico_BLACK,
|
||||
Ico_PutSettingIconLink (Mnu_MenuIcons[Menu],Ico_UNCHANGED,
|
||||
Txt_MENU_NAMES[Menu]);
|
||||
Frm_EndForm ();
|
||||
HTM_DIV_End ();
|
||||
|
|
|
@ -114,8 +114,8 @@ static bool Msg_GetParamOnlyUnreadMsgs (void);
|
|||
static void Msg_ShowASentOrReceivedMessage (struct Msg_Messages *Messages,
|
||||
long MsgNum,long MsgCod);
|
||||
static long Msg_GetParamMsgCod (void);
|
||||
static void Msg_PutLinkToShowMorePotentialRecipients (const struct Msg_Messages *Messages);
|
||||
static void Msg_PutParamsShowMorePotentialRecipients (const void *Messages);
|
||||
static void Msg_PutLinkToShowMorePotentialRecipients (struct Msg_Messages *Messages);
|
||||
static void Msg_PutParamsShowMorePotentialRecipients (void *Messages);
|
||||
static void Msg_PutParamsWriteMsg (void *Messages);
|
||||
static void Msg_PutHiddenParamsSubjectAndContent (void);
|
||||
static void Msg_ShowOneUniqueRecipient (void);
|
||||
|
@ -406,17 +406,17 @@ static void Msg_PutFormMsgUsrs (struct Msg_Messages *Messages,
|
|||
/********** Put contextual link to show more potential recipients ************/
|
||||
/*****************************************************************************/
|
||||
|
||||
static void Msg_PutLinkToShowMorePotentialRecipients (const struct Msg_Messages *Messages)
|
||||
static void Msg_PutLinkToShowMorePotentialRecipients (struct Msg_Messages *Messages)
|
||||
{
|
||||
extern const char *Txt_Show_more_recipients;
|
||||
|
||||
/***** Contextual menu *****/
|
||||
Mnu_ContextMenuBegin ();
|
||||
Lay_PutContextualLinkIconTextOnSubmit (ActReqMsgUsr,NULL,
|
||||
Lay_PutContextualLinkIconText (ActReqMsgUsr,NULL,
|
||||
Msg_PutParamsShowMorePotentialRecipients,Messages,
|
||||
"users.svg",
|
||||
"users.svg",Ico_BLACK,
|
||||
Txt_Show_more_recipients,
|
||||
"CopyMessageToHiddenFields();"); // Shor more potential recipients
|
||||
"CopyMessageToHiddenFields();"); // Show more potential recipients
|
||||
Mnu_ContextMenuEnd ();
|
||||
}
|
||||
|
||||
|
@ -424,7 +424,7 @@ static void Msg_PutLinkToShowMorePotentialRecipients (const struct Msg_Messages
|
|||
/************ Put parameters to show more potential recipients ***************/
|
||||
/*****************************************************************************/
|
||||
|
||||
static void Msg_PutParamsShowMorePotentialRecipients (const void *Messages)
|
||||
static void Msg_PutParamsShowMorePotentialRecipients (void *Messages)
|
||||
{
|
||||
if (((struct Msg_Messages *) Messages)->Reply.IsReply)
|
||||
{
|
||||
|
@ -1612,7 +1612,7 @@ static void Msg_PutLinkToViewBannedUsers(void)
|
|||
Lay_PutContextualLinkIconText (ActLstBanUsr,NULL,
|
||||
NULL,NULL,
|
||||
"lock.svg",Ico_RED,
|
||||
Txt_Banned_users);
|
||||
Txt_Banned_users,NULL);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -2338,7 +2338,7 @@ void Msg_WriteMsgAuthor (struct UsrData *UsrDat,bool Enabled,const char *BgColor
|
|||
ClassPhoto[Gbl.Prefs.PhotoShape],Pho_ZOOM,
|
||||
false);
|
||||
else
|
||||
Ico_PutIcon ("usr_bl.jpg",Ico_BLACK,Txt_Unknown_or_without_photo,
|
||||
Ico_PutIcon ("usr_bl.jpg",Ico_UNCHANGED,Txt_Unknown_or_without_photo,
|
||||
ClassPhoto[Gbl.Prefs.PhotoShape]);
|
||||
|
||||
HTM_TD_End ();
|
||||
|
|
|
@ -361,15 +361,15 @@ void Ntf_ShowMyNotifications (void)
|
|||
Lay_PutContextualLinkIconText (ActMrkNtfSee,NULL,
|
||||
NULL,NULL,
|
||||
"eye.svg",Ico_BLACK,
|
||||
Txt_Mark_all_NOTIFICATIONS_as_read); // Mark notifications as read
|
||||
Txt_Mark_all_NOTIFICATIONS_as_read,NULL); // Mark notifications as read
|
||||
Lay_PutContextualLinkIconText (ActReqEdiSet,Ntf_NOTIFICATIONS_ID,
|
||||
NULL,NULL,
|
||||
"cog.svg",Ico_BLACK,
|
||||
Txt_Settings); // Change notification settings
|
||||
Txt_Settings,NULL); // Change notification settings
|
||||
Lay_PutContextualLinkIconText (ActSeeMai,NULL,
|
||||
NULL,NULL,
|
||||
"envelope.svg",Ico_BLACK,
|
||||
Txt_Domains); // View allowed mail domains
|
||||
Txt_Domains,NULL); // View allowed mail domains
|
||||
Mnu_ContextMenuEnd ();
|
||||
|
||||
/***** Begin box *****/
|
||||
|
|
|
@ -235,7 +235,7 @@ void Pwd_PutLinkToSendNewPasswd (void)
|
|||
Lay_PutContextualLinkIconText (ActReqSndNewPwd,NULL,
|
||||
Pwd_PutLinkToSendNewPasswdParams,Gbl.Usrs.Me.UsrIdLogin,
|
||||
"key.svg",Ico_BLACK,
|
||||
Txt_Forgotten_password);
|
||||
Txt_Forgotten_password,NULL);
|
||||
}
|
||||
|
||||
static void Pwd_PutLinkToSendNewPasswdParams (void *UsrIdLogin)
|
||||
|
|
|
@ -2255,7 +2255,8 @@ static void Pho_ShowOrPrintListDegrees (struct Pho_DegPhotos *DegPhotos,
|
|||
if (SeeOrPrint == Pho_DEGREES_SEE)
|
||||
{
|
||||
Deg_DrawDegreeLogoAndNameWithLink (&Deg,ActSeeDegInf,
|
||||
Str_BuildString ("BT_LINK %s",The_ClassDat[Gbl.Prefs.Theme]),
|
||||
Str_BuildString ("BT_LINK %s",
|
||||
The_ClassDat[Gbl.Prefs.Theme]),
|
||||
"CT");
|
||||
Str_FreeStrings ();
|
||||
}
|
||||
|
|
|
@ -150,7 +150,7 @@ void Prf_PutLinkMyPublicProfile (void)
|
|||
Lay_PutContextualLinkIconText (ActSeeOthPubPrf,NULL,
|
||||
Usr_PutParamMyUsrCodEncrypted,Gbl.Usrs.Me.UsrDat.EnUsrCod,
|
||||
"user-circle.svg",Ico_BLACK,
|
||||
Txt_My_public_profile);
|
||||
Txt_My_public_profile,NULL);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -164,7 +164,7 @@ void Prf_PutLinkRequestAnotherUserProfile (void)
|
|||
Lay_PutContextualLinkIconText (ActReqOthPubPrf,NULL,
|
||||
NULL,NULL,
|
||||
"user-circle.svg",Ico_BLACK,
|
||||
Txt_Another_user_s_profile);
|
||||
Txt_Another_user_s_profile,NULL);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -697,10 +697,14 @@ static void Prj_ShowFormToFilterByWarning (const struct Prj_Projects *Projects)
|
|||
extern const char *Txt_PROJECT_FAULTY_FAULTLESS_PROJECTS[Prj_NUM_FAULTINESS];
|
||||
struct Prj_Filter Filter;
|
||||
Prj_Faultiness_t Faultiness;
|
||||
static const char *FaultinessIcon[Prj_NUM_FAULTINESS] =
|
||||
struct
|
||||
{
|
||||
[Prj_FAULTY ] = "exclamation-triangle.svg",
|
||||
[Prj_FAULTLESS] = "check-circle.svg",
|
||||
const char *Icon;
|
||||
Ico_Color_t Color;
|
||||
} FaultinessIcon[Prj_NUM_FAULTINESS] =
|
||||
{
|
||||
[Prj_FAULTY ] = {"exclamation-triangle.svg",Ico_RED },
|
||||
[Prj_FAULTLESS] = {"check-circle.svg" ,Ico_GREEN},
|
||||
};
|
||||
|
||||
Set_BeginOneSettingSelector ();
|
||||
|
@ -722,7 +726,8 @@ static void Prj_ShowFormToFilterByWarning (const struct Prj_Projects *Projects)
|
|||
Projects->SelectedOrder,
|
||||
Projects->CurrentPage,
|
||||
-1L);
|
||||
Ico_PutSettingIconLink (FaultinessIcon[Faultiness],Ico_BLACK,
|
||||
Ico_PutSettingIconLink (FaultinessIcon[Faultiness].Icon,
|
||||
FaultinessIcon[Faultiness].Color,
|
||||
Txt_PROJECT_FAULTY_FAULTLESS_PROJECTS[Faultiness]);
|
||||
Frm_EndForm ();
|
||||
HTM_DIV_End ();
|
||||
|
@ -1648,7 +1653,7 @@ static bool Prj_CheckIfPrjIsFaulty (long PrjCod,struct Prj_Faults *Faults)
|
|||
|
||||
static void Prj_PutWarningIcon (void)
|
||||
{
|
||||
Ico_PutIcon ("warning64x64.gif",Ico_BLACK,"","ICO16x16");
|
||||
Ico_PutIcon ("warning64x64.gif",Ico_UNCHANGED,"","ICO16x16");
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -883,12 +883,12 @@ static void QstImp_WriteRowImportedQst (struct XMLElement *StemElem,
|
|||
|
||||
/***** Put icon to indicate that a question does not exist in database *****/
|
||||
HTM_TD_Begin ("class=\"BT%u CT\"",Gbl.RowEvenOdd);
|
||||
Ico_PutIcon (QuestionExists ? "tr16x16.gif" :
|
||||
"check-circle.svg",
|
||||
Ico_BLACK,
|
||||
QuestionExists ? Txt_Existing_question :
|
||||
Txt_New_question,
|
||||
"CONTEXT_ICO_16x16");
|
||||
if (QuestionExists)
|
||||
Ico_PutIcon ("tr16x16.gif" ,Ico_UNCHANGED,
|
||||
Txt_Existing_question,"CONTEXT_ICO_16x16");
|
||||
else
|
||||
Ico_PutIcon ("check-circle.svg",Ico_GREEN ,
|
||||
Txt_New_question ,"CONTEXT_ICO_16x16");
|
||||
HTM_TD_End ();
|
||||
|
||||
/***** Write number of question *****/
|
||||
|
|
|
@ -843,7 +843,7 @@ void Rec_PutLinkToEditRecordFields (void)
|
|||
Lay_PutContextualLinkIconText (ActEdiRecFie,NULL,
|
||||
NULL,NULL,
|
||||
"pen.svg",Ico_BLACK,
|
||||
Txt_Edit_record_fields);
|
||||
Txt_Edit_record_fields,NULL);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -2691,7 +2691,8 @@ static void Rec_ShowCountryInHead (struct UsrData *UsrDat,bool ShowData)
|
|||
{
|
||||
/* Link to see country information */
|
||||
Cty_WriteCountryName (UsrDat->CtyCod,
|
||||
Str_BuildString ("BT_LINK %s",The_ClassDatStrong[Gbl.Prefs.Theme])); // Put link to country
|
||||
Str_BuildString ("BT_LINK %s",
|
||||
The_ClassDatStrong[Gbl.Prefs.Theme])); // Put link to country
|
||||
Str_FreeStrings ();
|
||||
}
|
||||
HTM_TD_End ();
|
||||
|
|
|
@ -230,7 +230,7 @@ static void Set_PutIconsToSelectSideCols (void)
|
|||
Par_PutHiddenParamUnsigned (NULL,"SideCols",SideCols);
|
||||
snprintf (Icon,sizeof (Icon),"layout%u%u_32x20.gif",
|
||||
SideCols >> 1,SideCols & 1);
|
||||
Ico_PutSettingIconLink (Icon,Ico_BLACK,Txt_LAYOUT_SIDE_COLUMNS[SideCols]);
|
||||
Ico_PutSettingIconLink (Icon,Ico_UNCHANGED,Txt_LAYOUT_SIDE_COLUMNS[SideCols]);
|
||||
Frm_EndForm ();
|
||||
HTM_DIV_End ();
|
||||
}
|
||||
|
|
|
@ -623,7 +623,7 @@ void Sta_PutLinkToCourseHits (void)
|
|||
Lay_PutContextualLinkIconText (ActReqAccCrs,NULL,
|
||||
NULL,NULL,
|
||||
"chart-line.svg",Ico_BLACK,
|
||||
Txt_Visits_to_course);
|
||||
Txt_Visits_to_course,NULL);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
@ -641,7 +641,7 @@ void Sta_PutLinkToGlobalHits (void)
|
|||
Lay_PutContextualLinkIconText (ActReqAccGbl,NULL,
|
||||
NULL,NULL,
|
||||
"chart-line.svg",Ico_BLACK,
|
||||
Txt_Global_visits);
|
||||
Txt_Global_visits,NULL);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -1887,7 +1887,7 @@ static void Sta_DrawBarColors (Sta_ColorType_t ColorType,double HitsMax)
|
|||
Sta_SetColor (ColorType,(double) NumColor,(double) GRAPH_DISTRIBUTION_PER_HOUR_TOTAL_WIDTH,&R,&G,&B);
|
||||
HTM_TD_Begin ("class=\"LM\" style=\"width:1px; background-color:#%02X%02X%02X;\"",
|
||||
R,G,B);
|
||||
Ico_PutIcon ("tr1x14.gif",Ico_BLACK,"","");
|
||||
Ico_PutIcon ("tr1x14.gif",Ico_UNCHANGED,"","");
|
||||
HTM_TD_End ();
|
||||
}
|
||||
|
||||
|
|
|
@ -312,7 +312,8 @@ static void SysCfg_NumCtys (void)
|
|||
HTM_TD_Begin ("class=\"LB\"");
|
||||
Frm_BeginFormGoTo (ActSeeCty);
|
||||
HTM_BUTTON_SUBMIT_Begin (Txt_Countries,
|
||||
Str_BuildString ("BT_LINK %s",The_ClassDat[Gbl.Prefs.Theme]),
|
||||
Str_BuildString ("BT_LINK %s",
|
||||
The_ClassDat[Gbl.Prefs.Theme]),
|
||||
NULL);
|
||||
Str_FreeStrings ();
|
||||
HTM_Unsigned (Cty_GetCachedNumCtysInSys ());
|
||||
|
|
|
@ -479,7 +479,7 @@ void The_PutIconsToSelectTheme (void)
|
|||
Par_PutHiddenParamString (NULL,"Theme",The_ThemeId[Theme]);
|
||||
snprintf (Icon,sizeof (Icon),"%s/%s/theme_32x20.gif",
|
||||
Cfg_ICON_FOLDER_THEMES,The_ThemeId[Theme]);
|
||||
Ico_PutSettingIconLink (Icon,Ico_BLACK,The_ThemeNames[Theme]);
|
||||
Ico_PutSettingIconLink (Icon,Ico_UNCHANGED,The_ThemeNames[Theme]);
|
||||
Frm_EndForm ();
|
||||
HTM_DIV_End ();
|
||||
}
|
||||
|
|
|
@ -1119,7 +1119,7 @@ void Usr_PutLinkToLogin (void)
|
|||
Lay_PutContextualLinkIconText (ActFrmLogIn,NULL,
|
||||
NULL,NULL,
|
||||
"sign-in-alt.svg",Ico_GREEN,
|
||||
Txt_Log_in);
|
||||
Txt_Log_in,NULL);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -1375,7 +1375,8 @@ void Usr_WriteLoggedUsrHead (void)
|
|||
}
|
||||
else
|
||||
{
|
||||
Rol_PutFormToChangeMyRole (Str_BuildString ("SEL_ROLE %s",The_ClassInput[Gbl.Prefs.Theme]));
|
||||
Rol_PutFormToChangeMyRole (Str_BuildString ("SEL_ROLE %s",
|
||||
The_ClassInput[Gbl.Prefs.Theme]));
|
||||
Str_FreeStrings ();
|
||||
}
|
||||
HTM_NBSP ();
|
||||
|
@ -4994,7 +4995,7 @@ static void Usr_PutLinkToSeeAdmins (void)
|
|||
Lay_PutContextualLinkIconText (ActLstOth,NULL,
|
||||
NULL,NULL,
|
||||
Rol_Icons[Rol_DEG_ADM],Ico_BLACK,
|
||||
Txt_ROLES_PLURAL_Abc[Rol_DEG_ADM][Usr_SEX_UNKNOWN]);
|
||||
Txt_ROLES_PLURAL_Abc[Rol_DEG_ADM][Usr_SEX_UNKNOWN],NULL);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -5009,7 +5010,7 @@ static void Usr_PutLinkToSeeGuests (void)
|
|||
Lay_PutContextualLinkIconText (ActLstGst,NULL,
|
||||
NULL,NULL,
|
||||
"users.svg",Ico_BLACK,
|
||||
Txt_ROLES_PLURAL_Abc[Rol_GST][Usr_SEX_UNKNOWN]);
|
||||
Txt_ROLES_PLURAL_Abc[Rol_GST][Usr_SEX_UNKNOWN],NULL);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -87,7 +87,7 @@ void ZIP_PutLinkToCreateZIPAsgWrk (void)
|
|||
Lay_PutContextualLinkIconText (ActAdmAsgWrkCrs,NULL,
|
||||
ZIP_PutLinkToCreateZIPAsgWrkParams,NULL,
|
||||
"download.svg",Ico_BLACK,
|
||||
Txt_Create_ZIP_file);
|
||||
Txt_Create_ZIP_file,NULL);
|
||||
}
|
||||
|
||||
static void ZIP_PutLinkToCreateZIPAsgWrkParams (__attribute__((unused)) void *Args)
|
||||
|
|
Loading…
Reference in New Issue