Version 18.3.1

swad_changelog.h

@@ -355,10 +355,11 @@ En OpenSWAD:
 ps2pdf source.ps destination.pdf
 */
 
-#define Log_PLATFORM_VERSION	"SWAD 18.3 (2018-10-09)"
+#define Log_PLATFORM_VERSION	"SWAD 18.3.1 (2018-10-09)"
 #define CSS_FILE		"swad18.3.css"
 #define JS_FILE			"swad17.17.1.js"
 /*
+        Version 18.3.1:   Oct 09, 2018  Changes in layout of session option. (234904 lines)
         Version 18.3:     Oct 09, 2018  New icon in breadcrumb to go to user's courses. (234874 lines)
 Copy the following icons to icon public directory:
 sudo cp icon/theme/white/hierarchy64x64.png /var/www/html/swad/icon/theme/white/

swad_role.c

@@ -435,14 +435,17 @@ unsigned Rol_ConvertUnsignedStrToRoles (const char *UnsignedStr)
 /*********************** Put a form to change my role ************************/
 /*****************************************************************************/
 
-void Rol_PutFormToChangeMyRole (void)
+void Rol_PutFormToChangeMyRole (const char *ClassSelect)
   {
    extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
    Rol_Role_t Role;
 
    Act_FormStart (ActChgMyRol);
-   fprintf (Gbl.F.Out,"<select name=\"MyRole\" class=\"SEL_ROLE\""
+   fprintf (Gbl.F.Out,"<select name=\"MyRole\"");
-                      " onchange=\"document.getElementById('%s').submit();\">",
+   if (ClassSelect)
+      if (ClassSelect[0])
+         fprintf (Gbl.F.Out," class=\"%s\"",ClassSelect);
+   fprintf (Gbl.F.Out," onchange=\"document.getElementById('%s').submit();\">",
             Gbl.Form.Id);
    for (Role = Rol_GST;
         Role < Rol_NUM_ROLES;

swad_role.h

@@ -52,7 +52,7 @@ void Rol_GetRolesInAllCrssIfNotYetGot (struct UsrData *UsrDat);
 Rol_Role_t Rol_ConvertUnsignedStrToRole (const char *UnsignedStr);
 unsigned Rol_ConvertUnsignedStrToRoles (const char *UnsignedStr);
 
-void Rol_PutFormToChangeMyRole (void);
+void Rol_PutFormToChangeMyRole (const char *ClassSelect);
 void Rol_ChangeMyRole (void);
 
 void Rol_WriteSelectorRoles (unsigned RolesAllowed,unsigned RolesSelected,

swad_text.c

@@ -39051,9 +39051,30 @@ const char *Txt_Sender_permitted_click_to_ban_him =
 	"Sender permitted; click to ban her/him";		// Necessita de tradução
 #endif
 
+const char *Txt_Session =
+#if   L==1
+	"Sessió";
+#elif L==2
+	"Sitzung";
+#elif L==3
+	"Session";
+#elif L==4
+	"Sesión";
+#elif L==5
+	"Session";
+#elif L==6
+	"Sesión";	// Okoteve traducción
+#elif L==7
+	"Sessione";
+#elif L==8
+	"Sesja";
+#elif L==9
+	"Sessão";
+#endif
+
 const char *Txt_session =
 #if   L==1
-	"sesión";	// Necessita traduccio
+	"sessió";
 #elif L==2
 	"Sitzung";
 #elif L==3

swad_user.c

@@ -166,6 +166,8 @@ static void Usr_ShowAlertThereAreMoreThanOneUsr (void);
 
 static void Usr_SetMyPrefsAndRoles (void);
 
+static void Usr_PutLinkToLogOut (void);
+
 static void Usr_InsertMyLastData (void);
 
 static void Usr_WriteRowGstAllData (struct UsrData *UsrDat);
@@ -2576,7 +2578,7 @@ void Usr_WriteLoggedUsrHead (void)
      }
    else
      {
-      Rol_PutFormToChangeMyRole ();
+      Rol_PutFormToChangeMyRole ("SEL_ROLE");
       fprintf (Gbl.F.Out," ");
      }
 
@@ -3230,21 +3232,13 @@ void Usr_ShowFormsLogoutAndRole (void)
   {
    extern const char *Hlp_PROFILE_Session_role;
    extern const char *The_ClassForm[The_NUM_THEMES];
-   extern const char *Txt_Log_out;
+   extern const char *Txt_Session;
    extern const char *Txt_Role;
    extern const char *Txt_You_are_now_LOGGED_IN_as_X;
    extern const char *Txt_logged[Usr_NUM_SEXS];
    extern const char *Txt_ROLES_SINGUL_abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
    extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
 
-   /***** Link to log out *****/
-   fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
-   Lay_PutContextualLink (ActLogOut,NULL,NULL,
-                          "logout-red64x64.png",
-                          Txt_Log_out,Txt_Log_out,
-		          NULL);
-   fprintf (Gbl.F.Out,"</div>");
-
    /***** Write message with my new logged role *****/
    if (Gbl.Usrs.Me.Role.HasChanged)
      {
@@ -3255,7 +3249,7 @@ void Usr_ShowFormsLogoutAndRole (void)
      }
 
    /***** Start box *****/
-   Box_StartBox (NULL,Txt_Role,NULL,
+   Box_StartBox (NULL,Txt_Session,Usr_PutLinkToLogOut,
                  Hlp_PROFILE_Session_role,Box_NOT_CLOSABLE);
 
    /***** Put a form to change my role *****/
@@ -3268,7 +3262,7 @@ void Usr_ShowFormsLogoutAndRole (void)
      {
       fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;",
                The_ClassForm[Gbl.Prefs.Theme],Txt_Role);
-      Rol_PutFormToChangeMyRole ();
+      Rol_PutFormToChangeMyRole (NULL);
       fprintf (Gbl.F.Out,"</label>");
      }
 
@@ -3276,6 +3270,21 @@ void Usr_ShowFormsLogoutAndRole (void)
    Box_EndBox ();
   }
 
+/*****************************************************************************/
+/************** Put an icon (form) to close the current session **************/
+/*****************************************************************************/
+
+static void Usr_PutLinkToLogOut (void)
+  {
+   extern const char *Txt_Log_out;
+
+   /***** Put form to log out *****/
+   Lay_PutContextualLink (ActLogOut,NULL,NULL,
+                          "logout-red64x64.png",
+                          Txt_Log_out,NULL,
+		          NULL);
+  }
+
 /*****************************************************************************/
 /******* Check a user's code and get all user's data from user's code ********/
 /*****************************************************************************/