From 5572467839fa2aa032eda44a302512b095740ba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Tue, 24 Mar 2015 18:12:06 +0100 Subject: [PATCH] Version 14.101 --- swad_action.c | 12 +++++------- swad_action.h | 4 +--- swad_changelog.h | 3 ++- swad_layout.c | 12 +++++------- swad_layout.h | 4 +--- swad_profile.c | 30 ++++++++++-------------------- 6 files changed, 24 insertions(+), 41 deletions(-) diff --git a/swad_action.c b/swad_action.c index d2eeecc02..b7f50a1ec 100644 --- a/swad_action.c +++ b/swad_action.c @@ -4299,9 +4299,7 @@ void Act_LinkFormSubmitId (const char *Title,const char *LinkStyle,const char *I Id); } -void Act_LinkFormSubmitAnimated (const char *Title,const char *LinkStyle, - const char *StaticIconId, - const char *AnimatedIconId) +void Act_LinkFormSubmitAnimated (const char *Title,const char *LinkStyle) { fprintf (Gbl.F.Out,"", - StaticIconId, // Icon to be hiden on click - AnimatedIconId, // Icon to be shown on click + Gbl.NumForm, + Gbl.NumForm, Gbl.FormId); } diff --git a/swad_action.h b/swad_action.h index 562951a10..b52ae119c 100644 --- a/swad_action.h +++ b/swad_action.h @@ -1342,9 +1342,7 @@ void Act_FormStartId (Act_Action_t NextAction,const char *Id); void Act_FormEnd (void); void Act_LinkFormSubmit (const char *Title,const char *LinkStyle); void Act_LinkFormSubmitId (const char *Title,const char *LinkStyle,const char *Id); -void Act_LinkFormSubmitAnimated (const char *Title,const char *LinkStyle, - const char *StaticIconId, - const char *AnimatedIconId); +void Act_LinkFormSubmitAnimated (const char *Title,const char *LinkStyle); void Act_AdjustActionWhenNoUsrLogged (void); void Act_AdjustCurrentAction (void); Act_Action_t Act_GetFirstActionAvailableInCurrentTab (void); diff --git a/swad_changelog.h b/swad_changelog.h index f1fae22cc..e27ec7f99 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -103,11 +103,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.101 (2015/03/24)" +#define Log_PLATFORM_VERSION "SWAD 14.101.1 (2015/03/24)" // Number of lines (includes comments but not blank lines) has been got with the following command: // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1 /* + Version 14.101.1: Mar 24, 2015 Changes in some update buttons. (? lines) Version 14.101: Mar 24, 2015 Fixed bug in form to create a new account. Fixed bug in statistics. New design of buttons. (183753 lines) diff --git a/swad_layout.c b/swad_layout.c index 281d13b33..823508cef 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -984,17 +984,15 @@ void Lay_PutSendIcon (const char *Icon,const char *Alt,const char *Text) /********** When clicked, the icon will be replaced by an animation **********/ /*****************************************************************************/ -void Lay_PutCalculateIcon (const char *Alt,const char *Text, - const char *StaticIconId, - const char *AnimatedIconId) +void Lay_PutCalculateIcon (const char *Alt,const char *Text) { - fprintf (Gbl.F.Out,"\"%s\""" - "\"%s\""" // Animated icon hidden " %s", - StaticIconId,Gbl.Prefs.IconsURL,Alt, - AnimatedIconId,Gbl.Prefs.IconsURL,Alt, + Gbl.NumForm,Gbl.Prefs.IconsURL,Alt, + Gbl.NumForm,Gbl.Prefs.IconsURL,Alt, Text); } diff --git a/swad_layout.h b/swad_layout.h index 12b0f29f6..6f921b8b2 100644 --- a/swad_layout.h +++ b/swad_layout.h @@ -89,9 +89,7 @@ void Lay_WriteTitle (const char *Title); void Lay_PutFormToView (Act_Action_t Action); void Lay_PutFormToEdit (Act_Action_t Action); void Lay_PutSendIcon (const char *Icon,const char *Alt,const char *Text); -void Lay_PutCalculateIcon (const char *Alt,const char *Text, - const char *StaticIconId, - const char *AnimatedIconId); +void Lay_PutCalculateIcon (const char *Alt,const char *Text); void Lay_PutCreateButton (const char *Text); void Lay_PutCreateButtonInline (const char *Text); diff --git a/swad_profile.c b/swad_profile.c index cc3420e58..46b924672 100644 --- a/swad_profile.c +++ b/swad_profile.c @@ -438,10 +438,8 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat) /***** Button to fetch and store first click time *****/ Act_FormStart (ActCal1stClkTim); Usr_PutParamOtherUsrCodEncrypted (UsrDat->EncryptedUsrCod); - Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormul[Gbl.Prefs.Theme], - "calculate1","calculating1"); - Lay_PutCalculateIcon (Txt_Calculate,Txt_Calculate, - "calculate1","calculating1"); + Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormul[Gbl.Prefs.Theme]); + Lay_PutCalculateIcon (Txt_Calculate,Txt_Calculate); Act_FormEnd (); } fprintf (Gbl.F.Out,"" @@ -478,10 +476,8 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat) /***** Button to fetch and store number of clicks *****/ Act_FormStart (ActCalNumClk); Usr_PutParamOtherUsrCodEncrypted (UsrDat->EncryptedUsrCod); - Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormul[Gbl.Prefs.Theme], - "calculate2","calculating2"); - Lay_PutCalculateIcon (Txt_Calculate,Txt_Calculate, - "calculate2","calculating2"); + Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormul[Gbl.Prefs.Theme]); + Lay_PutCalculateIcon (Txt_Calculate,Txt_Calculate); Act_FormEnd (); } fprintf (Gbl.F.Out,"" @@ -517,10 +513,8 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat) /***** Button to fetch and store number of file views *****/ Act_FormStart (ActCalNumFilVie); Usr_PutParamOtherUsrCodEncrypted (UsrDat->EncryptedUsrCod); - Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormul[Gbl.Prefs.Theme], - "calculate3","calculating3"); - Lay_PutCalculateIcon (Txt_Calculate,Txt_Calculate, - "calculate3","calculating3"); + Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormul[Gbl.Prefs.Theme]); + Lay_PutCalculateIcon (Txt_Calculate,Txt_Calculate); Act_FormEnd (); } fprintf (Gbl.F.Out,"" @@ -556,10 +550,8 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat) /***** Button to fetch and store number of forum posts *****/ Act_FormStart (ActCalNumForPst); Usr_PutParamOtherUsrCodEncrypted (UsrDat->EncryptedUsrCod); - Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormul[Gbl.Prefs.Theme], - "calculate4","calculating4"); - Lay_PutCalculateIcon (Txt_Calculate,Txt_Calculate, - "calculate4","calculating4"); + Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormul[Gbl.Prefs.Theme]); + Lay_PutCalculateIcon (Txt_Calculate,Txt_Calculate); Act_FormEnd (); } fprintf (Gbl.F.Out,"" @@ -595,10 +587,8 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat) /***** Button to fetch and store number of messages sent *****/ Act_FormStart (ActCalNumMsgSnt); Usr_PutParamOtherUsrCodEncrypted (UsrDat->EncryptedUsrCod); - Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormul[Gbl.Prefs.Theme], - "calculate5","calculating5"); - Lay_PutCalculateIcon (Txt_Calculate,Txt_Calculate, - "calculate5","calculating5"); + Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormul[Gbl.Prefs.Theme]); + Lay_PutCalculateIcon (Txt_Calculate,Txt_Calculate); Act_FormEnd (); } fprintf (Gbl.F.Out,""