From f04217f3ea53d8f248168ef4bc8126b9b838f4be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= <acanas@ugr.es>
Date: Fri, 3 Apr 2015 01:19:45 +0200
Subject: [PATCH] Version 14.107.6

---
 swad_changelog.h |  1 +
 swad_password.c  | 24 +++++++++++++++++-------
 swad_photo.c     |  2 +-
 swad_text.c      | 23 ++++++++++++++++++++++-
 4 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/swad_changelog.h b/swad_changelog.h
index 71baa47ed..eca8f7816 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -108,6 +108,7 @@
 // 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.107.6: Apr 03, 2015	Changes in layout of form to change password. (183748 lines)
         Version 14.107.5: Apr 03, 2015	Changes in layout of form to change photo. (183718 lines)
         Version 14.107.4: Apr 03, 2015	Fixed bugs when changing user's ID, password and photo. (183699 lines)
         Version 14.107.3: Apr 02, 2015	Changes in icons in attendance events.
diff --git a/swad_password.c b/swad_password.c
index 9857914ab..e48b0382c 100644
--- a/swad_password.c
+++ b/swad_password.c
@@ -657,7 +657,8 @@ void Pwd_ShowFormChgPwd (void)
    extern const char *Txt_Your_password_must_be_at_least_X_characters_and_can_not_contain_spaces_;
    extern const char *Txt_Password;
    extern const char *Txt_Current_password;
-   extern const char *Txt_Save;
+   extern const char *Txt_Change_password;
+   extern const char *Txt_Set_password;
    bool IHaveAPasswordInDB = (bool) Gbl.Usrs.Me.UsrDat.Password[0];
 
    /***** Help message *****/
@@ -669,16 +670,13 @@ void Pwd_ShowFormChgPwd (void)
          Lay_ShowAlert (Lay_WARNING,Txt_Your_password_is_not_secure_enough);
      }
 
-   sprintf (Gbl.Message,Txt_Your_password_must_be_at_least_X_characters_and_can_not_contain_spaces_,
-            Pwd_MIN_LENGTH_PLAIN_PASSWORD);
-   Lay_ShowAlert (Lay_INFO,Gbl.Message);
-
    /***** Start form *****/
    Act_FormStart (ActChgPwd);
 
    /***** Start table *****/
    Lay_StartRoundFrameTable10 (NULL,2,Txt_Password);
 
+   /* Current password */
    if (IHaveAPasswordInDB) // If I have a password in database...
       fprintf (Gbl.F.Out,"<tr>"
 	                 "<td class=\"%s\" style=\"text-align:right;\">"
@@ -686,18 +684,30 @@ void Pwd_ShowFormChgPwd (void)
 	                 "</td>"
                          "<td style=\"text-align:left;\">"
                          "<input type=\"password\" name=\"UsrPwd\""
-                         " size=\"25\" maxlength=\"%u\" />"
+                         " size=\"25\" maxlength=\"%u\" autocomplete=\"off\" />"
                          "</td>"
                          "</tr>",
                The_ClassFormul[Gbl.Prefs.Theme],
                Txt_Current_password,
                Pwd_MAX_LENGTH_PLAIN_PASSWORD);
+
+   /* Help message */
+   fprintf (Gbl.F.Out,"<tr>"
+		      "<td colspan=\"2\">");
+   sprintf (Gbl.Message,Txt_Your_password_must_be_at_least_X_characters_and_can_not_contain_spaces_,
+            Pwd_MIN_LENGTH_PLAIN_PASSWORD);
+   Lay_ShowAlert (Lay_INFO,Gbl.Message);
+   fprintf (Gbl.F.Out,"</td>"
+		      "</tr>");
+
+   /* New password */
    Pwd_PutFormToGetNewPasswordTwice ();
 
    /***** Send button and end form *****/
    fprintf (Gbl.F.Out,"<tr>"
 		      "<td colspan=\"2\" style=\"text-align:center;\">");
-   Lay_PutConfirmButton (Txt_Save);
+   Lay_PutConfirmButton (IHaveAPasswordInDB ? Txt_Change_password :
+	                                      Txt_Set_password);
    fprintf (Gbl.F.Out,"</td>"
 		      "</tr>");
    Lay_EndRoundFrameTable10 ();
diff --git a/swad_photo.c b/swad_photo.c
index 9df370be4..3560e9848 100644
--- a/swad_photo.c
+++ b/swad_photo.c
@@ -276,7 +276,7 @@ void Pho_ReqPhoto (const struct UsrData *UsrDat,bool PhotoExists,const char *Pho
 
    /***** Show current photo and help message *****/
    fprintf (Gbl.F.Out,"<tr>"
-                      "<td colspan=\"2\" style=\"text-align:center;\">");
+                      "<td colspan=\"2\">");
    Pho_ShowUsrPhoto (UsrDat,PhotoURL,"PHOTO150x200",Pho_NO_ZOOM);
    Lay_ShowAlert (Lay_INFO,Txt_You_can_send_a_file_with_an_image_in_jpg_format_);
    fprintf (Gbl.F.Out,"</td>"
diff --git a/swad_text.c b/swad_text.c
index d30daeb92..f1082b618 100644
--- a/swad_text.c
+++ b/swad_text.c
@@ -4075,7 +4075,7 @@ const char *Txt_Change_password =
 #elif L==3
 	"Cambiar contrase&ntilde;a";
 #elif L==4
-	"Changer le mot de passe";
+	"Changer mot de passe";
 #elif L==5
 	"Cambiar contrase&ntilde;a";	// Okoteve traducción
 #elif L==6
@@ -33807,6 +33807,27 @@ const char *Txt_Send =
 	"Enviar";
 #endif
 
+const char *Txt_Set_password =
+#if   L==0
+	"Establir contrasenya";
+#elif L==1
+	"Passwort festlegen";
+#elif L==2
+	"Set password";
+#elif L==3
+	"Establecer contrase&ntilde;a";
+#elif L==4
+	"D&eacute;finir mot de passe";
+#elif L==5
+	"Establecer contrase&ntilde;a";	// Okoteve traducción
+#elif L==6
+	"Impostare password";
+#elif L==7
+	"Ustaw has&lstrok;o";
+#elif L==8
+	"Definir senha";
+#endif
+
 const char *Txt_Publish_announcement_OF_EXAM =
 #if   L==0
 	"Publicar convocat&ograve;ria";