From 30ddce4ad4ff0dacb6317cee259e8f817b0964eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Tue, 15 Dec 2015 01:33:09 +0100 Subject: [PATCH] Version 15.66.3 --- icon/enrollmentrequest64x64.gif | Bin 0 -> 479 bytes icon/sys64x64.gif | Bin 0 -> 410 bytes swad_banner.c | 6 +++--- swad_changelog.h | 12 +++++++++--- swad_country.c | 20 +++++++++++++------- swad_course.c | 7 +++---- swad_degree.c | 2 +- swad_enrollment.c | 2 +- 8 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 icon/enrollmentrequest64x64.gif create mode 100644 icon/sys64x64.gif diff --git a/icon/enrollmentrequest64x64.gif b/icon/enrollmentrequest64x64.gif new file mode 100644 index 0000000000000000000000000000000000000000..856fd459c1a7be9fc670bf67f67808dbde9ccdbe GIT binary patch literal 479 zcmV<50U-WINk%w1VL$*t0J8u9KtMoEO-)l%Q(IeGWMpJ(Yin|Ha(jDwf`WpHiHVh! zm71EGp`oFytgN-Qwg3PBA^8LW000jFEC2ui06+jh000F3@X1N5y*TU5yZ>M)j$~<` zR5Ji9P&jC85p4||axU1mk)yO4VOLB1N{$+CQm7qCP1cgKVlAE`rzOcMU_-3{rZxD2 z!ef@$>}d(ofH%8?zSQTNd&Q0C@a<}Sd4Yf|1PFp~YZg2J0|W#HSBZa&jW$zrdK8zJ zhisb@1~3u_okCxg8x9Q;4naJNBnm_<0tTTT374`V0jF^>2udTrz`Z36S|G57&9*sF z01RL)3Kgb=G0IXP!`&A&$R;fWAhj9}nJB7$Er}0gXWD%&ULQ4+cw9Fi(g5c0C}^Rt zjg5O|U=`!B?#Hqa-)xZj!404ZTs9E>kX8_ijew0Z9-44q4B9q%Ihu_VA&uIPZ0}Bp zl(C@3N)HvwVBr^xM8s=fDgu}o0v(%OEPRZZ`J^2_da0m31#mM5u&XxlVBK0ZM)j$~<` zXsWJk>%MR{0Ca8BNDLNtUn@F~Zzu?MhQ6Y4gX{&C%%<%L%}A$J>y<{$TDDy81q|ql zCuH;akzP~UZV9;%mn^`Jx`c5k6bLqc1vz?SG)je9Wr-R!YK(7TkcNwsUy@Y~0c4y$ z111igqCO=8qo*|qB!Pmhu6}?uud}ck{o!?-gXaWVdo)x{+JM4)3iB~sc;#V0h!Z7N#Bi}=M0!XcJ!S+sQshQTCp9{3*u-K;eJqi< z+(L(_r4Nq2ayrP8)vH*uYTe2;YXkrQ EJM@FLHUIzs literal 0 HcmV?d00001 diff --git a/swad_banner.c b/swad_banner.c index 9a8f656e..25f06f0f 100644 --- a/swad_banner.c +++ b/swad_banner.c @@ -331,11 +331,11 @@ static void Ban_ListBannersForEdition (void) Act_FormStart (Ban->IsHidden ? ActShoBan : ActHidBan); Ban_PutParamBanCod (Ban->BanCod); - fprintf (Gbl.F.Out,"", Gbl.Prefs.IconsURL, - Ban->IsHidden ? "hidden" : - "visible", + Ban->IsHidden ? "eye-slash-on64x64.png" : + "eye-on64x64.png", Ban->IsHidden ? Txt_Show : Txt_Hide, Ban->IsHidden ? Txt_Show : diff --git a/swad_changelog.h b/swad_changelog.h index df199986..17aec594 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -120,12 +120,18 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.66.2 (2015/12/14)" +#define Log_PLATFORM_VERSION "SWAD 15.66.3 (2015/12/15)" #define CSS_FILE "swad15.65.1.css" // 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 15.66.3: Dec 15, 2015 Changes in some small icons. + Fixed bug in record card. (187004 lines) + 2 changes necessary in database: +UPDATE actions SET Txt='Ver información país' WHERE ActCod='1155' AND Language='es'; +UPDATE actions SET Txt='Imprimir información país' WHERE ActCod='1156' AND Language='es'; + Version 15.66.2: Dec 14, 2015 Changes in edition of institutions, centres and degrees. (186994 lines) Version 15.66.1: Dec 14, 2015 Removed unused code related to list of countries, institutions and centres by reasons of speed. (186966 lines) Version 15.66: Dec 14, 2015 Number of teachers and number of students removed from list of countries, institutions and centres by reasons of speed. (187057 lines) @@ -2237,8 +2243,8 @@ INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1151','es','N','Ver INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1152','es','N','Imprimir información centro'); INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1153','es','N','Ver información institución'); INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1154','es','N','Imprimir información institución'); -INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1155','es','N','Ver información institución'); -INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1156','es','N','Imprimir información institución'); +INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1155','es','N','Ver información país'); +INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1156','es','N','Imprimir información país'); Version 13.20: Dec 12, 2013 Course configuration is integrated with course introduction. New option to view degree configuration. (159558 lines) diff --git a/swad_country.c b/swad_country.c index 0702ba0d..d6468c78 100644 --- a/swad_country.c +++ b/swad_country.c @@ -1120,13 +1120,19 @@ void Cty_WriteCountryName (long CtyCod,const char *Class) /***** Get country name *****/ Cty_GetCountryName (CtyCod,CtyName); - /***** Link to country information *****/ - Act_FormStart (ActSeeCtyInf); - Cty_PutParamCtyCod (CtyCod); - Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeCtyInf].ActCod,ActTxt), - Class); - fprintf (Gbl.F.Out,"%s",CtyName); - Act_FormEnd (); + if (Gbl.InsideForm) // If we are writing another form + /***** Write country name without link *****/ + fprintf (Gbl.F.Out,"%s",CtyName); + else + { + /***** Write country name with link to country information *****/ + Act_FormStart (ActSeeCtyInf); + Cty_PutParamCtyCod (CtyCod); + Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeCtyInf].ActCod,ActTxt), + Class); + fprintf (Gbl.F.Out,"%s",CtyName); + Act_FormEnd (); + } } /*****************************************************************************/ diff --git a/swad_course.c b/swad_course.c index 40f64759..fe37a286 100644 --- a/swad_course.c +++ b/swad_course.c @@ -506,7 +506,7 @@ void Crs_ChangeCourseConfig (void) /************************ Write menu with my courses *************************/ /*****************************************************************************/ -#define Crs_MAX_BYTES_TXT_LINK 60 +#define Crs_MAX_BYTES_TXT_LINK 40 static void Crs_WriteListMyCoursesToSelectOne (void) { @@ -551,7 +551,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void) Par_PutHiddenParamUnsigned ("NxtTab",(unsigned) TabSys); Act_LinkFormSubmit (Txt_System, The_ClassForm[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"\"%s\"", Gbl.Prefs.IconsURL, @@ -742,8 +742,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void) Act_FormStart (ActSeeCrsInf); Crs_PutParamCrsCod (Crs.CrsCod); sprintf (Gbl.Title,Txt_Go_to_X,Crs.ShortName); - Act_LinkFormSubmit (Gbl.Title, - The_ClassForm[Gbl.Prefs.Theme]); + Act_LinkFormSubmit (Gbl.Title,The_ClassForm[Gbl.Prefs.Theme]); fprintf (Gbl.F.Out,"\"%s\"", diff --git a/swad_degree.c b/swad_degree.c index fe514988..e79bdcfb 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -1314,7 +1314,7 @@ static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg) BgColor, Gbl.Prefs.IconsURL, Deg->NumCrss ? "ok_green" : - "tr", + "tr", Deg->NumCrss ? Txt_DEGREE_With_courses : Txt_DEGREE_Without_courses, Deg->NumCrss ? Txt_DEGREE_With_courses : diff --git a/swad_enrollment.c b/swad_enrollment.c index b1828129..aaae9f4e 100644 --- a/swad_enrollment.c +++ b/swad_enrollment.c @@ -152,7 +152,7 @@ void Enr_PutLinkToRequestSignUp (void) extern const char *Txt_Sign_up; /***** Show the form *****/ - Lay_PutContextualLink (ActReqSignUp,NULL,"signup16x16.gif", + Lay_PutContextualLink (ActReqSignUp,NULL,"enrollmentrequest64x64.gif", Txt_Sign_up,Txt_Sign_up); }