diff --git a/css/swad18.32.css b/css/swad18.33.css
similarity index 98%
rename from css/swad18.32.css
rename to css/swad18.33.css
index 3ce668f65..b164af17f 100644
--- a/css/swad18.32.css
+++ b/css/swad18.33.css
@@ -246,17 +246,6 @@ a:hover /* Default ==> underlined */
display:inline;
padding:0 10px;
}
-@media only screen and (max-width: 1024px)
- { /* For mobile phones and tablets */
- #login_txt
- {
- display:none;
- }
- }
-.WHITE_HEAD {color:#E0E0E0; font-size:12pt; white-space:nowrap;}
-.GREY_HEAD {color:#E0E0E0; font-size:12pt; white-space:nowrap;}
-.BLUE_HEAD {color:white; font-size:12pt; white-space:nowrap;}
-.YELLOW_HEAD {color:#B3B0B3; font-size:12pt; white-space:nowrap;}
/************************ Layout (second heading row) ************************/
#head_row_2
@@ -1564,13 +1553,11 @@ a:hover /* Default ==> underlined */
}
/*********************************** Icons ***********************************/
-.ICO20x15 {width:20px; height:15px; vertical-align:middle;}
-.ICOx16 { height:16px; vertical-align:middle;}
+.ICOx16 {height:16px; vertical-align:middle;}
.ICO16x16 {width:16px; height:16px; vertical-align:middle;}
.ICO20x20 {width:20px; height:20px; vertical-align:middle;}
.ICO25x25 {width:25px; height:25px; vertical-align:middle;}
-.ICOx25 { height:25px; vertical-align:middle;}
-.ICO40x25 {width:40px; height:25px; vertical-align:middle;}
+.ICOx25 {height:25px; vertical-align:middle; margin:0 auto;}
.ICO40x40 {width:40px; height:40px; vertical-align:middle;}
.ICO64x64 {width:64px; height:64px; vertical-align:middle;}
.ICO160x160 {width:160px; height:160px; vertical-align:middle;}
@@ -1956,15 +1943,15 @@ a:hover img.CENTRE_PHOTO_SHOW
.USR_LIST_NUM_N {color:#404040; font-size:15pt; font-weight:bold;}
/*****************************************************************************/
-.WHITE_TITLE {color:#505050; font-size:18pt;}
+.WHITE_TITLE {color:#505050; font-size:18pt;}
.GREY_TITLE {color:#505050; font-size:18pt;}
.BLUE_TITLE {color:#4D88A1; font-size:18pt;}
-.YELLOW_TITLE {color:#BD4815; font-size:18pt;}
+.YELLOW_TITLE {color:#BD4815; font-size:18pt;}
/*********************** Icon and checkbox highlighting **********************/
.ICO_HIDDEN
{
- opacity:0.2;
+ opacity:0.3;
}
.ICO_HIGHLIGHT, .CHECKBOX_UNCHECKED
{
diff --git a/icon/arrow-right-green.svg b/icon/arrow-right-green.svg
new file mode 100644
index 000000000..41c584943
--- /dev/null
+++ b/icon/arrow-right-green.svg
@@ -0,0 +1 @@
+
diff --git a/icon/arrow-right-red.svg b/icon/arrow-right-red.svg
new file mode 100644
index 000000000..2fa0d87bb
--- /dev/null
+++ b/icon/arrow-right-red.svg
@@ -0,0 +1 @@
+
diff --git a/icon/check-square.svg b/icon/check-square.svg
new file mode 100644
index 000000000..30397cafe
--- /dev/null
+++ b/icon/check-square.svg
@@ -0,0 +1 @@
+
diff --git a/icon/square.svg b/icon/square.svg
new file mode 100644
index 000000000..986f9efd0
--- /dev/null
+++ b/icon/square.svg
@@ -0,0 +1 @@
+
diff --git a/icon/unlock.svg b/icon/unlock.svg
new file mode 100644
index 000000000..6984136a0
--- /dev/null
+++ b/icon/unlock.svg
@@ -0,0 +1 @@
+
diff --git a/swad_ID.c b/swad_ID.c
index 7e37fad08..476ba2a3a 100644
--- a/swad_ID.c
+++ b/swad_ID.c
@@ -499,7 +499,8 @@ static void ID_PutLinkToConfirmID (struct UsrData *UsrDat,unsigned NumID,
/***** Put link *****/
Frm_LinkFormSubmit (Txt_Confirm_ID,The_ClassFormBold[Gbl.Prefs.Theme],NULL);
- Ico_PutIconWithText ("check.svg",Txt_Confirm_ID,Txt_Confirm_ID);
+ Ico_PutIconTextLink ("check.svg",
+ Txt_Confirm_ID);
fprintf (Gbl.F.Out,"");
/***** End form *****/
diff --git a/swad_account.c b/swad_account.c
index ee18ba832..4b72279a4 100644
--- a/swad_account.c
+++ b/swad_account.c
@@ -99,7 +99,6 @@ void Acc_PutLinkToCreateAccount (void)
Lay_PutContextualLinkIconText (ActFrmMyAcc,NULL,NULL,
"at.svg",
- Txt_Create_account,
Txt_Create_account);
}
diff --git a/swad_agenda.c b/swad_agenda.c
index 13368672b..60a116579 100644
--- a/swad_agenda.c
+++ b/swad_agenda.c
@@ -218,7 +218,7 @@ static void Agd_ShowFormToSelPrivatPublicEvents (void)
static const char *Image[2] =
{
"lock.svg", // Agd_PRIVAT_EVENTS
- "lock-open.svg", // Agd_PUBLIC_EVENTS
+ "unlock.svg", // Agd_PUBLIC_EVENTS
};
fprintf (Gbl.F.Out,"
");
@@ -846,7 +846,7 @@ static void Agd_PutFormsToRemEditOneEvent (struct AgendaEvent *AgdEvent)
if (AgdEvent->Public)
Lay_PutContextualLinkOnlyIcon (ActPrvEvtMyAgd,NULL,
Agd_PutCurrentParamsMyAgenda,
- "lock-open.svg",
+ "unlock.svg",
Txt_Event_visible_to_the_users_of_your_courses_click_to_make_it_private);
else
Lay_PutContextualLinkOnlyIcon (ActPubEvtMyAgd,NULL,
diff --git a/swad_announcement.c b/swad_announcement.c
index 050dcaf53..67a1a7b64 100644
--- a/swad_announcement.c
+++ b/swad_announcement.c
@@ -360,7 +360,6 @@ static void Ann_DrawAnAnnouncement (long AnnCod,Ann_Status_t Status,
/***** Put form to mark announcement as seen *****/
Lay_PutContextualLinkIconText (ActAnnSee,NULL,Ann_PutParams,
"trash.svg",
- Txt_Do_not_show_again,
Txt_Do_not_show_again);
fprintf (Gbl.F.Out,"
");
diff --git a/swad_attendance.c b/swad_attendance.c
index 4e3ec771f..280e425b8 100644
--- a/swad_attendance.c
+++ b/swad_attendance.c
@@ -537,7 +537,6 @@ static void Att_PutFormToListMyAttendance (void)
Lay_PutContextualLinkIconText (ActSeeLstMyAtt,NULL,NULL,
"list-ol.svg",
- Txt_Attendance_list,
Txt_Attendance_list);
}
@@ -552,7 +551,6 @@ static void Att_PutFormToListStdsAttendance (void)
Lay_PutContextualLinkIconText (ActReqLstStdAtt,NULL,
Att_PutFormToListStdsParams,
"list-ol.svg",
- Txt_Attendance_list,
Txt_Attendance_list);
}
@@ -2094,14 +2092,15 @@ static void Att_WriteRowStdToCallTheRoll (unsigned NumStd,
fprintf (Gbl.F.Out,""
""
""
" | ",
Gbl.RowEvenOdd,NumStd,
Gbl.Prefs.URLIcons,
- Present ? "check" :
- "check-empty",
+ Present ? "check-square.svg" :
+ "square.svg",
Present ? Txt_Present :
Txt_Absent,
Present ? Txt_Present :
@@ -3168,7 +3167,6 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
extern const char *Txt_Event;
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_Today;
- extern const char *Txt_Update_attendance_according_to_selected_events;
extern const char *Txt_Update_attendance;
unsigned UniqueId;
unsigned NumAttEvent;
@@ -3259,11 +3257,10 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
{
fprintf (Gbl.F.Out,"
"
"");
- Frm_LinkFormSubmitAnimated (Txt_Update_attendance_according_to_selected_events,
+ Frm_LinkFormSubmitAnimated (Txt_Update_attendance,
The_ClassFormBold[Gbl.Prefs.Theme],
NULL);
- Ico_PutCalculateIconWithText (Txt_Update_attendance_according_to_selected_events,
- Txt_Update_attendance);
+ Ico_PutCalculateIconWithText (Txt_Update_attendance);
fprintf (Gbl.F.Out," | "
"
");
}
@@ -3496,13 +3493,14 @@ static void Att_WriteRowStdSeveralAttEvents (unsigned NumStd,struct UsrData *Usr
Present = Att_CheckIfUsrIsPresentInAttEvent (Gbl.AttEvents.Lst[NumAttEvent].AttCod,UsrDat->UsrCod);
fprintf (Gbl.F.Out,""
- ""
+ ""
" | ",
Gbl.RowEvenOdd,
Gbl.Prefs.URLIcons,
- Present ? "check" :
- "check-empty",
+ Present ? "check-square.svg" :
+ "square.svg",
Present ? Txt_Present :
Txt_Absent,
Present ? Txt_Present :
@@ -3658,8 +3656,9 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat)
"%u:"
""
""
- ""
+ ""
" %s"
"",
- UniqueId,(long) Gbl.FileBrowser.Asg.TimeUTC[Dat_START_TIME],
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
- fprintf (Gbl.F.Out,"");
-
- /***** Arrow *****/
- fprintf (Gbl.F.Out,"",
- Gbl.Prefs.URLIcons,
- Gbl.FileBrowser.Asg.Open ? "green" :
- "red");
-
- /***** Write end date *****/
- fprintf (Gbl.F.Out,"",
- UniqueId,
- Gbl.FileBrowser.Asg.Open ? "ASG_LST_DATE_GREEN" :
- "ASG_LST_DATE_RED");
- fprintf (Gbl.F.Out,""
+ ""
+ "→"
+ ""
+ "",
+ ""
+ "",
+ UniqueId,
+ UniqueId,(long) Gbl.FileBrowser.Asg.TimeUTC[Dat_START_TIME],
+ (unsigned) Gbl.Prefs.DateFormat,Txt_Today,
+ UniqueId,
UniqueId,(long) Gbl.FileBrowser.Asg.TimeUTC[Dat_END_TIME],
(unsigned) Gbl.Prefs.DateFormat,Txt_Today);
- fprintf (Gbl.F.Out,"");
}
else
fprintf (Gbl.F.Out," (%s)",
@@ -12500,7 +12484,6 @@ static void Brw_PutLinkToAskRemOldFiles (void)
Lay_PutContextualLinkIconText (ActReqRemOldBrf,NULL,
Brw_PutHiddenParamFullTreeIfSelected,
"trash.svg",
- Txt_Remove_old_files,
Txt_Remove_old_files);
}
diff --git a/swad_follow.c b/swad_follow.c
index 34cc957a3..fc1266704 100644
--- a/swad_follow.c
+++ b/swad_follow.c
@@ -101,7 +101,6 @@ void Fol_PutLinkWhoToFollow (void)
Lay_PutContextualLinkIconText (ActSeeSocPrf,NULL,NULL,
"user-plus.svg",
- Txt_Who_to_follow,
Txt_Who_to_follow);
}
diff --git a/swad_group.c b/swad_group.c
index b04ef013a..274f39881 100644
--- a/swad_group.c
+++ b/swad_group.c
@@ -367,7 +367,6 @@ void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction,
extern const char *Hlp_USERS_Groups;
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_Groups;
- extern const char *Txt_Update_users_according_to_selected_groups;
extern const char *Txt_Update_users;
unsigned NumGrpTyp;
bool ICanEdit;
@@ -413,11 +412,10 @@ void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction,
/***** Submit button *****/
fprintf (Gbl.F.Out," ");
- Frm_LinkFormSubmitAnimated (Txt_Update_users_according_to_selected_groups,
+ Frm_LinkFormSubmitAnimated (Txt_Update_users,
The_ClassFormBold[Gbl.Prefs.Theme],
"CopyMessageToHiddenFields()");
- Ico_PutCalculateIconWithText (Txt_Update_users_according_to_selected_groups,
- Txt_Update_users);
+ Ico_PutCalculateIconWithText (Txt_Update_users);
fprintf (Gbl.F.Out," ");
/***** End form *****/
@@ -1385,7 +1383,7 @@ static void Grp_ListGroupTypesForEdition (void)
" | "
""
+ " class=\"%sCONTEXT_ICO_16x16\" />"
" | "
"",
Gbl.Prefs.URLIcons,
@@ -1545,7 +1543,7 @@ static void Grp_ListGroupsForEdition (void)
Grp->Open ? Txt_Group_X_open_click_to_close_it :
Txt_Group_X_closed_click_to_open_it,
Grp->GrpName);
- Ico_PutIconLink (Grp->Open ? "lock-open.svg" :
+ Ico_PutIconLink (Grp->Open ? "unlock.svg" :
"lock.svg",
Gbl.Title);
Frm_EndForm ();
@@ -2454,18 +2452,14 @@ static void Grp_WriteRowGrp (struct Group *Grp,bool Highlight)
Grp->Open ? Txt_Group_X_open :
Txt_Group_X_closed,
Grp->GrpName);
- fprintf (Gbl.F.Out," | "
- ""
- " | ",
- Gbl.Prefs.URLIcons,
- Grp->Open ? "lock-open.svg" :
- "lock.svg",
- Gbl.Title,Gbl.Title);
+ fprintf (Gbl.F.Out,"\" >");
+ Ico_PutIconOff (Grp->Open ? "unlock.svg" :
+ "lock.svg",
+ Gbl.Title);
+ fprintf (Gbl.F.Out,"");
/***** Group name *****/
fprintf (Gbl.F.Out,""
""
+ " class=\"%sCONTEXT_ICO_16x16\" />"
" | "
"",
Gbl.Prefs.URLIcons,
@@ -2669,25 +2663,19 @@ static void Grp_PutFormToCreateGroup (void)
/***** Write heading *****/
Grp_WriteHeadingGroups ();
- /***** Put disabled icons to open group and archive zone *****/
+ /***** Empty column to remove *****/
fprintf (Gbl.F.Out," | "
- " | "
- ""
- ""
- " | "
- ""
- ""
- " | ",
- Gbl.Prefs.URLIcons,
- Txt_Group_closed,
- Txt_Group_closed,
- Gbl.Prefs.URLIcons,
- Txt_File_zones_disabled,
- Txt_File_zones_disabled);
+ " | ");
+
+ /***** Disabled icon to open group *****/
+ fprintf (Gbl.F.Out,"");
+ Ico_PutIconOff ("lock.svg",Txt_Group_closed);
+ fprintf (Gbl.F.Out," | ");
+
+ /***** Disabled icon for archive zone *****/
+ fprintf (Gbl.F.Out,"");
+ Ico_PutIconOff ("folder-red.svg",Txt_File_zones_disabled);
+ fprintf (Gbl.F.Out," | ");
/***** Group type *****/
/* Start selector */
diff --git a/swad_icon.c b/swad_icon.c
index f555a267b..b10dda188 100644
--- a/swad_icon.c
+++ b/swad_icon.c
@@ -311,15 +311,9 @@ void Ico_PutDivIcon (const char *DivClass,const char *Icon,const char *Title)
void Ico_PutDivIconLink (const char *DivClass,const char *Icon,const char *Title)
{
- fprintf (Gbl.F.Out,""
- ""
- "
",
- DivClass,
- Gbl.Prefs.URLIcons,Icon,
- Title,Title);
+ fprintf (Gbl.F.Out,"",DivClass);
+ Ico_PutIconLink (Icon,Title);
+ fprintf (Gbl.F.Out,"
");
}
/*****************************************************************************/
@@ -335,6 +329,22 @@ void Ico_PutIconLink (const char *Icon,const char *Title)
Title,Title);
}
+/*****************************************************************************/
+/******************* Show an icon with a link (with text) ********************/
+/*****************************************************************************/
+
+void Ico_PutIconTextLink (const char *Icon,const char *Text)
+ {
+ /***** Print icon and optional text *****/
+ fprintf (Gbl.F.Out,""
+ "
"
+ " %s"
+ "
",
+ Gbl.Prefs.URLIcons,Icon,Text,Text,
+ Text);
+ }
+
/*****************************************************************************/
/************************** Show a preference selector ***********************/
/*****************************************************************************/
@@ -343,8 +353,7 @@ void Ico_PutPrefIconLink (const char *Icon,const char *Title)
{
fprintf (Gbl.F.Out,"",
+ " class=\"ICO_HIGHLIGHT ICOx25\" />",
Gbl.Prefs.URLIcons,Icon,
Title,Title);
}
@@ -353,29 +362,11 @@ void Ico_PutPrefIconLink (const char *Icon,const char *Title)
/********************** Put an inactive/disabled icon ************************/
/*****************************************************************************/
-void Ico_PutIconOff (const char *Icon,const char *Alt)
+void Ico_PutIconOff (const char *Icon,const char *Title)
{
fprintf (Gbl.F.Out,"",
- Gbl.Prefs.URLIcons,Icon,Alt,Alt);
- }
-
-/*****************************************************************************/
-/**************** Put a icon with a text to submit a form ********************/
-/*****************************************************************************/
-
-void Ico_PutIconWithText (const char *Icon,const char *Alt,const char *Text)
- {
- /***** Print icon and optional text *****/
- fprintf (Gbl.F.Out,""
- "
",
- Gbl.Prefs.URLIcons,Icon,Alt,Text ? Text :
- Alt);
- if (Text)
- if (Text[0])
- fprintf (Gbl.F.Out," %s",Text);
- fprintf (Gbl.F.Out,"
");
+ Gbl.Prefs.URLIcons,Icon,Title,Title);
}
/*****************************************************************************/
@@ -383,7 +374,7 @@ void Ico_PutIconWithText (const char *Icon,const char *Alt,const char *Text)
/********** When clicked, the icon will be replaced by an animation **********/
/*****************************************************************************/
-void Ico_PutCalculateIcon (const char *Alt)
+void Ico_PutCalculateIcon (const char *Title)
{
fprintf (Gbl.F.Out,""
"
" // Animated icon hidden
"
"
"",
- Gbl.Form.Num,Gbl.Prefs.URLIcons,Alt,Alt,
- Gbl.Form.Num,Gbl.Prefs.URLIcons,Alt,Alt);
+ Gbl.Form.Num,Gbl.Prefs.URLIcons,Title,Title,
+ Gbl.Form.Num,Gbl.Prefs.URLIcons,Title,Title);
}
/*****************************************************************************/
@@ -403,7 +394,7 @@ void Ico_PutCalculateIcon (const char *Alt)
/********** When clicked, the icon will be replaced by an animation **********/
/*****************************************************************************/
-void Ico_PutCalculateIconWithText (const char *Alt,const char *Text)
+void Ico_PutCalculateIconWithText (const char *Text)
{
fprintf (Gbl.F.Out,""
@@ -416,8 +407,8 @@ void Ico_PutCalculateIconWithText (const char *Alt,const char *Text)
" %s"
"
"
"",
- Gbl.Form.Num,Gbl.Prefs.URLIcons,Alt,Text,
- Gbl.Form.Num,Gbl.Prefs.URLIcons,Alt,Text,
+ Gbl.Form.Num,Gbl.Prefs.URLIcons,Text,Text,
+ Gbl.Form.Num,Gbl.Prefs.URLIcons,Text,Text,
Text);
}
diff --git a/swad_icon.h b/swad_icon.h
index ee99b3222..c6022c627 100644
--- a/swad_icon.h
+++ b/swad_icon.h
@@ -69,12 +69,12 @@ void Ico_PutContextualIconToPrint (Act_Action_t NextAction,void (*FuncParams) ()
void Ico_PutDivIcon (const char *DivClass,const char *Icon,const char *Title);
void Ico_PutDivIconLink (const char *DivClass,const char *Icon,const char *Title);
void Ico_PutIconLink (const char *Icon,const char *Title);
+void Ico_PutIconTextLink (const char *Icon,const char *Text);
void Ico_PutPrefIconLink (const char *Icon,const char *Title);
-void Ico_PutIconOff (const char *Icon,const char *Alt);
-void Ico_PutIconWithText (const char *Icon,const char *Alt,const char *Text);
+void Ico_PutIconOff (const char *Icon,const char *Title);
-void Ico_PutCalculateIcon (const char *Alt);
-void Ico_PutCalculateIconWithText (const char *Alt,const char *Text);
+void Ico_PutCalculateIcon (const char *Title);
+void Ico_PutCalculateIconWithText (const char *Text);
void Ico_PutIconRemovalNotAllowed (void);
void Ico_PutIconRemove (void);
diff --git a/swad_info.c b/swad_info.c
index c55bcfcbd..df7790337 100644
--- a/swad_info.c
+++ b/swad_info.c
@@ -1050,8 +1050,7 @@ static void Inf_ShowPage (const char *URL)
/***** Link to view in a new window *****/
fprintf (Gbl.F.Out,"",
URL,The_ClassFormBold[Gbl.Prefs.Theme]);
- Ico_PutIconWithText ("expand-arrows-alt.svg",
- Txt_View_in_a_new_window,
+ Ico_PutIconTextLink ("expand-arrows-alt.svg",
Txt_View_in_a_new_window);
fprintf (Gbl.F.Out,"");
diff --git a/swad_language.c b/swad_language.c
index 2f28d5bc5..caedabce8 100644
--- a/swad_language.c
+++ b/swad_language.c
@@ -79,7 +79,6 @@ void Lan_PutLinkToChangeLanguage (void)
{
Lay_PutContextualLinkIconText (ActEdiPrf,NULL,NULL,
"globe.svg",
- "Change language",
"Change language");
}
diff --git a/swad_layout.c b/swad_layout.c
index a92404a1b..f5e2db333 100644
--- a/swad_layout.c
+++ b/swad_layout.c
@@ -831,7 +831,6 @@ static void Lay_WriteScriptCustomDropzone (void)
static void Lay_WritePageTopHeading (void)
{
- extern const char *The_ClassHead[The_NUM_THEMES];
extern const char *The_ClassTagline[The_NUM_THEMES];
extern const char *Txt_System;
extern const char *Txt_TAGLINE;
@@ -902,8 +901,7 @@ static void Lay_WritePageTopHeading (void)
/* 1st. row, 3rd. column: logged user or language selection,
and link to open/close session */
- fprintf (Gbl.F.Out,"",
- The_ClassHead[Gbl.Prefs.Theme]);
+ fprintf (Gbl.F.Out,"
");
if (Gbl.Usrs.Me.Logged)
Usr_WriteLoggedUsrHead ();
else
@@ -1113,7 +1111,6 @@ void Lay_PutContextualLinkOnlyIcon (Act_Action_t NextAction,const char *Anchor,
void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor,
void (*FuncParams) (),
const char *Icon,
- const char *Title,
const char *Text)
{
extern const char *The_ClassFormBold[The_NUM_THEMES];
@@ -1128,8 +1125,8 @@ void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor,
FuncParams ();
/***** Put icon and text with link *****/
- Frm_LinkFormSubmit (Title,The_ClassFormBold[Gbl.Prefs.Theme],NULL);
- Ico_PutIconWithText (Icon,Title,Text);
+ Frm_LinkFormSubmit (Text,The_ClassFormBold[Gbl.Prefs.Theme],NULL);
+ Ico_PutIconTextLink (Icon,Text);
fprintf (Gbl.F.Out,"");
/***** End form *****/
@@ -1147,7 +1144,6 @@ void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor,
void Lay_PutContextualLinkIconTextOnSubmit (Act_Action_t NextAction,const char *Anchor,
void (*FuncParams) (),
const char *Icon,
- const char *Title,
const char *Text,
const char *OnSubmit)
{
@@ -1163,8 +1159,8 @@ void Lay_PutContextualLinkIconTextOnSubmit (Act_Action_t NextAction,const char *
FuncParams ();
/***** Put icon with link *****/
- Frm_LinkFormSubmit (Title,The_ClassFormBold[Gbl.Prefs.Theme],OnSubmit);
- Ico_PutIconWithText (Icon,Title,Text);
+ Frm_LinkFormSubmit (Text,The_ClassFormBold[Gbl.Prefs.Theme],OnSubmit);
+ Ico_PutIconTextLink (Icon,Text);
fprintf (Gbl.F.Out,"");
/***** End form *****/
diff --git a/swad_layout.h b/swad_layout.h
index b88067d2f..833e4378e 100644
--- a/swad_layout.h
+++ b/swad_layout.h
@@ -59,12 +59,10 @@ void Lay_PutContextualLinkOnlyIcon (Act_Action_t NextAction,const char *Anchor,
void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor,
void (*FuncParams) (),
const char *Icon,
- const char *Title,
const char *Text);
void Lay_PutContextualLinkIconTextOnSubmit (Act_Action_t NextAction,const char *Anchor,
void (*FuncParams) (),
const char *Icon,
- const char *Title,
const char *Text,
const char *OnSubmit);
void Lay_PutContextualCheckbox (Act_Action_t NextAction,
diff --git a/swad_logo.c b/swad_logo.c
index 811922838..11a4dfa1a 100644
--- a/swad_logo.c
+++ b/swad_logo.c
@@ -280,7 +280,6 @@ void Log_RequestLogo (Sco_Scope_t Scope)
fprintf (Gbl.F.Out,"
");
Lay_PutContextualLinkIconText (ActionRem,NULL,NULL,
"trash.svg",
- Txt_Remove_logo,
Txt_Remove_logo);
fprintf (Gbl.F.Out,"
");
}
diff --git a/swad_mail.c b/swad_mail.c
index 33c3ad777..0cc477e32 100644
--- a/swad_mail.c
+++ b/swad_mail.c
@@ -985,8 +985,7 @@ void Mai_ListEmails (void)
StrAddresses,
Txt_Create_email_message,
The_ClassFormBold[Gbl.Prefs.Theme]);
- Ico_PutIconWithText ("pen.svg",
- Txt_Create_email_message,
+ Ico_PutIconTextLink ("pen.svg",
Txt_Create_email_message);
fprintf (Gbl.F.Out,""
"
");
diff --git a/swad_message.c b/swad_message.c
index 56fe38cb0..14d7d2066 100644
--- a/swad_message.c
+++ b/swad_message.c
@@ -367,7 +367,6 @@ static void Msg_PutLinkToShowMorePotentialRecipients (void)
Msg_PutParamsShowMorePotentialRecipients,
"users.svg",
Txt_Show_more_recipients,
- Txt_Show_more_recipients,
"CopyMessageToHiddenFields()");
fprintf (Gbl.F.Out,"
");
}
@@ -1773,7 +1772,7 @@ static void Msg_ShowSentOrReceivedMessages (void)
Frm_LinkFormSubmitAnimated (Txt_Update_messages,
The_ClassFormBold[Gbl.Prefs.Theme],
NULL);
- Ico_PutCalculateIconWithText (Txt_Update_messages,Txt_Update_messages);
+ Ico_PutCalculateIconWithText (Txt_Update_messages);
fprintf (Gbl.F.Out,"");
Frm_EndForm ();
@@ -1875,7 +1874,6 @@ static void Msg_PutLinkToViewBannedUsers(void)
Lay_PutContextualLinkIconText (ActLstBanUsr,NULL,NULL,
"lock.svg",
- Txt_Banned_users,
Txt_Banned_users);
}
@@ -3675,7 +3673,7 @@ static void Msg_PutFormToBanSender (struct UsrData *UsrDat)
Gbl.Msg.CurrentPage);
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Msg_PutHiddenParamsMsgsFilters ();
- Ico_PutIconLink ("lock-open.svg",Txt_Sender_permitted_click_to_ban_him);
+ Ico_PutIconLink ("unlock.svg",Txt_Sender_permitted_click_to_ban_him);
Frm_EndForm ();
}
diff --git a/swad_notification.c b/swad_notification.c
index e8ac0228c..0d5a89284 100644
--- a/swad_notification.c
+++ b/swad_notification.c
@@ -302,11 +302,8 @@ static unsigned Ntf_GetNumberOfMyNewUnseenNtfs (void);
void Ntf_ShowMyNotifications (void)
{
extern const char *Hlp_MESSAGES_Notifications;
- extern const char *Txt_Change_preferences;
extern const char *Txt_Settings;
- extern const char *Txt_Email_domains_allowed_for_notifications;
extern const char *Txt_Domains;
- extern const char *Txt_Mark_all_notifications_as_read;
extern const char *Txt_Mark_all_NOTIFICATIONS_as_read;
extern const char *Txt_Notifications;
extern const char *Txt_Date;
@@ -373,19 +370,16 @@ void Ntf_ShowMyNotifications (void)
/* Put form to change notification preferences */
Lay_PutContextualLinkIconText (ActMrkNtfSee,NULL,NULL,
"eye.svg",
- Txt_Mark_all_notifications_as_read,
Txt_Mark_all_NOTIFICATIONS_as_read);
/* Put form to change notification preferences */
Lay_PutContextualLinkIconText (ActEdiPrf,NULL,NULL,
"cog.svg",
- Txt_Change_preferences,
Txt_Settings);
/* Put form to view allowed mail domains */
Lay_PutContextualLinkIconText (ActSeeMai,NULL,NULL,
"envelope.svg",
- Txt_Email_domains_allowed_for_notifications,
Txt_Domains);
fprintf (Gbl.F.Out,"");
diff --git a/swad_password.c b/swad_password.c
index 64a1e191d..392d6331b 100644
--- a/swad_password.c
+++ b/swad_password.c
@@ -262,7 +262,6 @@ void Pwd_PutLinkToSendNewPasswd (void)
Lay_PutContextualLinkIconText (ActReqSndNewPwd,NULL,
Pwd_PutLinkToSendNewPasswdParams,
"key.svg",
- Txt_Forgotten_password,
Txt_Forgotten_password);
}
diff --git a/swad_photo.c b/swad_photo.c
index 365bac52f..c1ea0932b 100644
--- a/swad_photo.c
+++ b/swad_photo.c
@@ -1993,7 +1993,6 @@ static void Pho_PutLinkToPrintViewOfDegreeStatsParams (void)
static void Pho_PutLinkToCalculateDegreeStats (void)
{
extern const char *The_ClassFormBold[The_NUM_THEMES];
- extern const char *Txt_Calculate_average_photo_of_a_degree;
extern const char *Txt_Calculate_average_photo_of_THE_DEGREE_X;
extern const char *Txt_unknown_TIME;
extern const char *Txt_time;
@@ -2020,11 +2019,10 @@ static void Pho_PutLinkToCalculateDegreeStats (void)
Pho_PutHiddenParamPhotoSize ();
Pho_PutHiddenParamOrderDegrees ();
Usr_PutParamsPrefsAboutUsrList ();
- Frm_LinkFormSubmitAnimated (Txt_Calculate_average_photo_of_a_degree,
+ Frm_LinkFormSubmitAnimated (Txt_Calculate_average_photo_of_THE_DEGREE_X,
The_ClassFormBold[Gbl.Prefs.Theme],
NULL);
- Ico_PutCalculateIconWithText (Txt_Calculate_average_photo_of_a_degree,
- Txt_Calculate_average_photo_of_THE_DEGREE_X);
+ Ico_PutCalculateIconWithText (Txt_Calculate_average_photo_of_THE_DEGREE_X);
/***** Put selector with all the degrees with students *****/
fprintf (Gbl.F.Out,"
",
+ "%s ",
Prj->Hidden == Prj_HIDDEN ? "DAT_LIGHT" :
"DAT",
(Prj->Preassigned == Prj_PREASSIGNED) ? Txt_Yes :
- Txt_No,
- Gbl.Prefs.URLIcons,PreassignedNonpreassigImage[Prj->Preassigned],
- Txt_PROJECT_PREASSIGNED_NONPREASSIGNED_SINGUL[Prj->Preassigned],
- Txt_PROJECT_PREASSIGNED_NONPREASSIGNED_SINGUL[Prj->Preassigned]);
+ Txt_No);
+ Ico_PutIconOff (PreassignedNonpreassigImage[Prj->Preassigned],
+ Txt_PROJECT_PREASSIGNED_NONPREASSIGNED_SINGUL[Prj->Preassigned]);
+ fprintf (Gbl.F.Out,""
+ "");
/***** Number of students *****/
fprintf (Gbl.F.Out,"");
@@ -1204,7 +1201,7 @@ static void Prj_PutIconToToggleProject (unsigned UniqueId,
" onclick=\"toggleProject('%u');return false;\" />",
Text,The_ClassForm[Gbl.Prefs.Theme],
UniqueId);
- Ico_PutIconWithText (Icon,Text,Text);
+ Ico_PutIconTextLink (Icon,Text);
fprintf (Gbl.F.Out,"");
}
diff --git a/swad_record.c b/swad_record.c
index 1e2b7c0b1..09d06b5db 100644
--- a/swad_record.c
+++ b/swad_record.c
@@ -997,7 +997,6 @@ void Rec_PutLinkToEditRecordFields (void)
/***** Link to edit record fields *****/
Lay_PutContextualLinkIconText (ActEdiRecFie,NULL,NULL,
"pen.svg",
- Txt_Edit_record_fields,
Txt_Edit_record_fields);
}
@@ -1562,7 +1561,8 @@ static void Rec_ShowLinkToPrintPreviewOfRecords (void)
unsigned i;
Frm_LinkFormSubmit (Txt_Print,The_ClassFormBold[Gbl.Prefs.Theme],NULL);
- Ico_PutIconWithText ("print.svg",Txt_Print,Txt_Print);
+ Ico_PutIconTextLink ("print.svg",
+ Txt_Print);
fprintf (Gbl.F.Out,""
"