"
"");
/***** Start form *****/
Act_FormStart (ActChgNtfPrf);
- fprintf (Gbl.F.Out,"%s
"
- ""
+ fprintf (Gbl.F.Out,""
""
" "
""
@@ -1673,7 +1672,6 @@ void Ntf_PutFormChangeNotifSentByEMail (void)
"%s"
" "
" ",
- Txt_Notifications,
Txt_Create_BR_notification,
Txt_Notify_me_BR_by_e_mail);
diff --git a/swad_preference.c b/swad_preference.c
index 5e4af167..6f97e9f6 100644
--- a/swad_preference.c
+++ b/swad_preference.c
@@ -63,98 +63,46 @@ static void Prf_PutFormPublicPhoto (void);
void Prf_EditPrefs (void)
{
extern const char *Txt_Language;
- extern const char *Txt_Layout;
- extern const char *Txt_Theme_SKIN;
- extern const char *Txt_Columns;
- extern const char *Txt_Icons;
extern const char *Txt_You_can_only_receive_email_notifications_if_;
char MailDomain[Cns_MAX_BYTES_STRING+1];
- /***** Language selection *****/
- Lay_StartRoundFrameTable10 (NULL,0,NULL);
+ /***** Language *****/
+ Lay_StartRoundFrameTable10 (NULL,2,Txt_Language);
fprintf (Gbl.F.Out,""
- ""
- "%s"
- " "
- " "
- ""
- "",
- Txt_Language);
+ " ");
Prf_PutSelectorToSelectLanguage ();
fprintf (Gbl.F.Out," "
" ");
Lay_EndRoundFrameTable10 ();
- /***** Layout selection *****/
- Lay_StartRoundFrameTable10 (NULL,0,NULL);
- fprintf (Gbl.F.Out,""
- ""
- "%s"
- " "
- " "
+ /***** Layout & icons *****/
+ fprintf (Gbl.F.Out,""
""
- "",
- Txt_Layout);
+ " ");
Lay_PutIconsToSelectLayout ();
fprintf (Gbl.F.Out," "
- " ");
- Lay_EndRoundFrameTable10 ();
-
- /***** Theme selection *****/
- Lay_StartRoundFrameTable10 (NULL,0,NULL);
- fprintf (Gbl.F.Out,""
- ""
- "%s"
- " "
- " "
- ""
- "",
- Txt_Theme_SKIN);
- The_PutIconsToSelectTheme ();
- fprintf (Gbl.F.Out," "
- " ");
- Lay_EndRoundFrameTable10 ();
-
- /***** Side columns selection *****/
- Lay_StartRoundFrameTable10 (NULL,0,NULL);
- fprintf (Gbl.F.Out,""
- ""
- "%s"
- " "
- " "
- ""
- "",
- Txt_Columns);
- Prf_PutIconsToSelectSideCols ();
- fprintf (Gbl.F.Out," "
- " ");
- Lay_EndRoundFrameTable10 ();
-
- /***** Icons selection *****/
- Lay_StartRoundFrameTable10 (NULL,0,NULL);
- fprintf (Gbl.F.Out,""
- ""
- "%s"
- " "
- " "
- ""
- "",
- Txt_Icons);
+ " ");
Ico_PutIconsToSelectIconSet ();
fprintf (Gbl.F.Out," "
- " ");
- Lay_EndRoundFrameTable10 ();
+ ""
+ "
");
+
+ /***** Theme & side colums *****/
+ fprintf (Gbl.F.Out,""
+ ""
+ "");
+ The_PutIconsToSelectTheme ();
+ fprintf (Gbl.F.Out," "
+ "");
+ Prf_PutIconsToSelectSideCols ();
+ fprintf (Gbl.F.Out," "
+ " "
+ "
");
if (Gbl.Usrs.Me.Logged)
{
/***** Public / private photo *****/
- Lay_StartRoundFrameTable10 (NULL,0,NULL);
- fprintf (Gbl.F.Out,""
- "");
Prf_PutFormPublicPhoto ();
- fprintf (Gbl.F.Out," "
- " ");
- Lay_EndRoundFrameTable10 ();
/***** Automatic e-mail to notify of new events *****/
Ntf_PutFormChangeNotifSentByEMail ();
@@ -384,11 +332,12 @@ Txt_Language_t Prf_GetParamLanguage (void)
void Prf_PutIconsToSelectSideCols (void)
{
- unsigned SideCols;
+ extern const char *Txt_Columns;
extern const char *Txt_LAYOUT_SIDE_COLUMNS[4];
+ unsigned SideCols;
- fprintf (Gbl.F.Out,""
- "");
+ Lay_StartRoundFrameTable10 (NULL,2,Txt_Columns);
+ fprintf (Gbl.F.Out," ");
for (SideCols = 0;
SideCols <= Lay_SHOW_BOTH_COLUMNS;
SideCols++)
@@ -408,8 +357,8 @@ void Prf_PutIconsToSelectSideCols (void)
Txt_LAYOUT_SIDE_COLUMNS[SideCols],
Txt_LAYOUT_SIDE_COLUMNS[SideCols]);
}
- fprintf (Gbl.F.Out," "
- "
");
+ fprintf (Gbl.F.Out,"");
+ Lay_EndRoundFrameTable10 ();
}
/*****************************************************************************/
@@ -591,27 +540,25 @@ static void Prf_PutFormPublicPhoto (void)
extern const char *Txt_Public_photo;
/***** Start form *****/
+ Lay_StartRoundFrameTable10 (NULL,2,Txt_Public_photo);
+ fprintf (Gbl.F.Out,""
+ "",
+ The_ClassFormul[Gbl.Prefs.Theme]);
Act_FormStart (ActChgPubPho);
- fprintf (Gbl.F.Out,""
- "");
/***** Checkbox to select between public or private photo *****/
- fprintf (Gbl.F.Out,""
- " "
- " ",
+ fprintf (Gbl.F.Out," onchange=\"javascript:document.getElementById('%s').submit();\" />",
Gbl.FormId);
- fprintf (Gbl.F.Out,""
- "%s"
- " ",
- The_ClassFormul[Gbl.Prefs.Theme],Txt_Public_photo);
+ fprintf (Gbl.F.Out,"%s",Txt_Public_photo);
/***** End form *****/
- fprintf (Gbl.F.Out," "
- "
"
- "");
+ fprintf (Gbl.F.Out,""
+ " "
+ " ");
+ Lay_EndRoundFrameTable10 ();
}
/*****************************************************************************/
diff --git a/swad_theme.c b/swad_theme.c
index 31b237cc..c679df05 100644
--- a/swad_theme.c
+++ b/swad_theme.c
@@ -230,10 +230,11 @@ const char *The_ClassFormulB[The_NUM_THEMES] =
void The_PutIconsToSelectTheme (void)
{
+ extern const char *Txt_Theme_SKIN;
The_Theme_t Theme;
- fprintf (Gbl.F.Out,""
- "");
+ Lay_StartRoundFrameTable10 (NULL,2,Txt_Theme_SKIN);
+ fprintf (Gbl.F.Out," ");
for (Theme = (The_Theme_t) 0;
Theme < The_NUM_THEMES;
Theme++)
@@ -254,8 +255,8 @@ void The_PutIconsToSelectTheme (void)
The_ThemeNames[Theme],
The_ThemeNames[Theme]);
}
- fprintf (Gbl.F.Out," "
- "
");
+ fprintf (Gbl.F.Out,"");
+ Lay_EndRoundFrameTable10 ();
}
/*****************************************************************************/