From 9038a3cb7f9cfd06716e52e90116292e2981ffdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Tue, 21 Jul 2015 12:40:41 +0200 Subject: [PATCH] Version 14.117.5 --- sql/cambios.sql | 18 +++++++++++++++++- swad_account.c | 4 +--- swad_changelog.h | 3 ++- swad_config.h | 4 ++-- swad_user.c | 6 ++++-- 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/sql/cambios.sql b/sql/cambios.sql index 16c142591..44e1f10a7 100644 --- a/sql/cambios.sql +++ b/sql/cambios.sql @@ -10586,4 +10586,20 @@ SELECT DISTINCTROW tst_questions.QstCod,tst_questions.AnsType,tst_questions.Shuf -SELECT DISTINCTROW tst_questions.QstCod,tst_questions.AnsType,tst_questions.Shuffle, tst_questions.Stem,tst_questions.Feedback,tst_questions.NumHits/tst_questions.Score AS S FROM courses,tst_questions WHERE courses.DegCod IN ('252') AND courses.CrsCod=tst_questions.CrsCod AND tst_questions.AnsType='unique_choice' AND tst_questions.NumHits>'0' AND tst_questions.QstCod NOT IN (SELECT tst_question_tags.QstCod FROM courses,tst_tags,tst_question_tags WHERE courses.DegCod IN ('252') AND courses.CrsCod=tst_tags.CrsCod AND tst_tags.TagHidden='Y' AND tst_tags.TagCod=tst_question_tags.TagCod) HAVING S>='0.0' AND S<='1.0' ORDER BY RAND(NOW()) LIMIT 1; \ No newline at end of file +SELECT DISTINCTROW tst_questions.QstCod,tst_questions.AnsType,tst_questions.Shuffle, tst_questions.Stem,tst_questions.Feedback,tst_questions.NumHits/tst_questions.Score AS S FROM courses,tst_questions WHERE courses.DegCod IN ('252') AND courses.CrsCod=tst_questions.CrsCod AND tst_questions.AnsType='unique_choice' AND tst_questions.NumHits>'0' AND tst_questions.QstCod NOT IN (SELECT tst_question_tags.QstCod FROM courses,tst_tags,tst_question_tags WHERE courses.DegCod IN ('252') AND courses.CrsCod=tst_tags.CrsCod AND tst_tags.TagHidden='Y' AND tst_tags.TagCod=tst_question_tags.TagCod) HAVING S>='0.0' AND S<='1.0' ORDER BY RAND(NOW()) LIMIT 1; + + + +
+ +
+
+
+ New on OpenSWAD? Sign up +
+
+ +
+
+
+
\ No newline at end of file diff --git a/swad_account.c b/swad_account.c index 629d5bb46..4c44be476 100644 --- a/swad_account.c +++ b/swad_account.c @@ -100,7 +100,7 @@ void Acc_ShowFormAccount (void) /***** Form to send students to be enrolled / removed *****/ Act_FormStart (ActEdiPrf); - Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,"Change language"); + Lay_PutConfirmButton ("Change language"); Act_FormEnd (); } } @@ -128,7 +128,6 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith fprintf (Gbl.F.Out,""); /***** Form to enter some data of the new user *****/ - fprintf (Gbl.F.Out,"
"); Act_FormStart (ActCreUsrAcc); sprintf (Gbl.Title,Txt_New_on_PLATFORM_Sign_up,Cfg_PLATFORM_SHORT_NAME); Lay_StartRoundFrameTable (NULL,2,Gbl.Title); @@ -177,7 +176,6 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith /***** Send button and form end *****/ Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_account); Act_FormEnd (); - fprintf (Gbl.F.Out,"
"); } /*****************************************************************************/ diff --git a/swad_changelog.h b/swad_changelog.h index 1def2fe34..067c766b8 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -103,11 +103,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.117.4 (2015/07/17)" +#define Log_PLATFORM_VERSION "SWAD 14.117.5 (2015/07/21)" // 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.117.5: Jul 21, 2015 Fixed HTML bug in account form. (184930 lines) Version 14.117.4: Jul 17, 2015 Fixed bug in course record, reported by Antonio Peņa Freire. (184929 lines) Version 14.117.3: Jul 17, 2015 Fixed recent bug in cache control. (184893 lines) Version 14.117.2: Jul 16, 2015 Changes in cache control. (184893 lines) diff --git a/swad_config.h b/swad_config.h index 41e113369..5151df613 100644 --- a/swad_config.h +++ b/swad_config.h @@ -28,8 +28,8 @@ /** Uncomment one of the following installations of SWAD or create your own **/ /*****************************************************************************/ -#define LOCALHOST_UBUNTU // Comment this line if not applicable -//#define OPENSWAD_ORG // Comment this line if not applicable +//#define LOCALHOST_UBUNTU // Comment this line if not applicable +#define OPENSWAD_ORG // Comment this line if not applicable //#define SWAD_UGR_ES // Comment this line if not applicable //#define WWW_CEVUNA_UNA_PY // Comment this line if not applicable diff --git a/swad_user.c b/swad_user.c index 68612d466..a0ac48179 100644 --- a/swad_user.c +++ b/swad_user.c @@ -1380,7 +1380,7 @@ void Usr_WriteFormLogin (void) /***** User's ID/nickname and password *****/ fprintf (Gbl.F.Out,"" "" - "\"%s\"" "" "" @@ -1391,7 +1391,7 @@ void Usr_WriteFormLogin (void) "" "" "" - "\"%s\"" "" "" @@ -1401,11 +1401,13 @@ void Usr_WriteFormLogin (void) "", Gbl.Prefs.IconsURL, Txt_User, + Txt_User, Usr_MAX_LENGTH_USR_LOGIN, Txt_nick_email_or_ID, Gbl.Usrs.Me.UsrIdLogin, Gbl.Prefs.IconsURL, Txt_Password, + Txt_Password, Pwd_MAX_LENGTH_PLAIN_PASSWORD, Txt_password);