Version 16.136

acanas · Feb 16, 2017 · 3092652 · 3092652
1 parent 81da1fd
commit 3092652
Show file tree

Hide file tree

Showing 8 changed files with 239 additions and 78 deletions.
diff --git a/css/swad16.135.css → css/swad16.136.css b/css/swad16.135.css → css/swad16.136.css
@@ -1074,6 +1074,11 @@ a:hover						/* Default ==> underlined */
 	white-space:nowrap;
 	overflow:hidden;
 	}
+.CONNECTED_TXT
+	{
+	color:#398000;
+	font-size:12pt;
+	}
 
 /*************************** Most frequent actions ***************************/
 #MFU_actions
@@ -1712,11 +1717,6 @@ a:hover img.CENTRE_PHOTO_SHOW
 .BLUE_USR		{color:white;   font-size:15pt; font-weight:bold; white-space:nowrap;}
 .YELLOW_USR		{color:#B3B0B3; font-size:15pt; font-weight:bold; white-space:nowrap;}
 
-.WHITE_CONNECTED	{color:#398000; font-size:12pt;}
-.GREY_CONNECTED		{color:#398000; font-size:12pt;}
-.BLUE_CONNECTED		{color:#398000; font-size:12pt;}
-.YELLOW_CONNECTED	{color:#398000; font-size:12pt;}
-
 .WHITE_TITLE		{color:#505050; font-size:18pt;}
 .GREY_TITLE		{color:#505050; font-size:18pt;}
 .BLUE_TITLE		{color:#4D88A1; font-size:18pt;}

diff --git a/swad_changelog.h b/swad_changelog.h
@@ -192,21 +192,21 @@
 // TODO: En los detalles de asistencia deber�a salir la fecha de cada sesi�n
 // TODO: System admin should view link "Visits to course"
 
-// TODO: En "A quien seguir" poner el pa�s de cada usuario.
-// TODO: Sugerir un usuario al que seguir debajo del banner de la derecha, para aumentar n�mero de seguidores.
+// TODO: Bajo la foto de cada usuario el pa�s
 // TODO: Permitir elegir entre "Ver actividad de quienes sigo" o "Ver actividad de todos"
 
 /*****************************************************************************/
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 16.135.7 (2017-02-16)"
-#define CSS_FILE		"swad16.135.css"
+#define Log_PLATFORM_VERSION	"SWAD 16.136 (2017-02-16)"
+#define CSS_FILE		"swad16.136.css"
 #define JS_FILE			"swad16.123.js"
 
 // 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 16.136:   Feb 16, 2017	Sggested users to follow on right column. (212646 lines)
         Version 16.135.7: Feb 16, 2017	Code refactoring in users to follow. (212512 lines)
         Version 16.135.6: Feb 13, 2017	Changes in contextual help after changes in tabs. (212501 lines)
         Version 16.135.5: Feb 11, 2017	Change in button to register teacher when no teachers found.

diff --git a/swad_connected.c b/swad_connected.c
@@ -342,7 +342,6 @@ void Con_GetAndShowLastClicks (void)
 
 void Con_ShowGlobalConnectedUsrs (void)
   {
-   extern const char *The_ClassConnected[The_NUM_THEMES];
    extern const char *Txt_Connected_users;
    extern const char *Txt_session;
    extern const char *Txt_sessions;
@@ -369,7 +368,7 @@ void Con_ShowGlobalConnectedUsrs (void)
    Act_FormStartUnique (ActLstCon);	// Must be unique because
 					// the list of connected users
 					// is dynamically updated via AJAX
-   Act_LinkFormSubmitUnique (Txt_Connected_users,The_ClassConnected[Gbl.Prefs.Theme]);
+   Act_LinkFormSubmitUnique (Txt_Connected_users,"CONNECTED_TXT");
 
    /* Write total number of sessions */
    fprintf (Gbl.F.Out,"%u %s",
@@ -458,7 +457,6 @@ static void Con_ComputeConnectedUsrsWithARoleBelongingToCurrentCrs (Rol_Role_t R
 
 static void Con_ShowConnectedUsrsBelongingToLocation (void)
   {
-   extern const char *The_ClassConnected[The_NUM_THEMES];
    extern const char *Txt_from;
    char LocationName[Hie_MAX_LENGTH_LOCATION_SHORT_NAME_SPEC_CHAR + 1];
    struct ConnectedUsrs Usrs;
@@ -515,8 +513,7 @@ static void Con_ShowConnectedUsrsBelongingToLocation (void)
 
    /***** Number of connected users who belong to scope *****/
    Con_GetNumConnectedUsrsWithARoleBelongingCurrentLocation (Rol_UNKNOWN,&Usrs);
-   fprintf (Gbl.F.Out,"<div class=\"%s\">%u %s ",
-	    The_ClassConnected[Gbl.Prefs.Theme],
+   fprintf (Gbl.F.Out,"<div class=\"CONNECTED_TXT\">%u %s ",
 	    Usrs.NumUsrs,
 	    Txt_from);
    if (Gbl.Usrs.Me.LoggedRole >= Rol_DEG_ADM)
@@ -552,7 +549,6 @@ static void Con_ShowConnectedUsrsBelongingToLocation (void)
 
 void Con_ShowConnectedUsrsBelongingToCurrentCrs (void)
   {
-   extern const char *The_ClassConnected[The_NUM_THEMES];
    extern const char *Txt_Connected_users;
    extern const char *Txt_from;
    char CourseName[Crs_MAX_LENGTH_COURSE_SHRT_NAME + 1];
@@ -569,7 +565,7 @@ void Con_ShowConnectedUsrsBelongingToCurrentCrs (void)
    Act_FormStartUnique (ActLstCon);	// Must be unique because
 					// the list of connected users
 					// is dynamically updated via AJAX
-   Act_LinkFormSubmitUnique (Txt_Connected_users,The_ClassConnected[Gbl.Prefs.Theme]);
+   Act_LinkFormSubmitUnique (Txt_Connected_users,"CONNECTED_TXT");
 
    /* Write total number of connected users belonging to the current course */
    Str_Copy (CourseName,Gbl.CurrentCrs.Crs.ShrtName,
@@ -659,7 +655,6 @@ static void Con_ShowConnectedUsrsWithARoleBelongingToCurrentLocationOnMainZone (
 
 static void Con_ShowConnectedUsrsWithARoleBelongingToCurrentCrsOnRightColumn (Rol_Role_t Role)
   {
-   extern const char *The_ClassConnected[The_NUM_THEMES];
    extern const char *Txt_ROLES_SINGUL_abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
    extern const char *Txt_ROLES_PLURAL_abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
    extern const char *Txt_Connected_users;
@@ -695,7 +690,7 @@ static void Con_ShowConnectedUsrsWithARoleBelongingToCurrentCrsOnRightColumn (Ro
 						// the list of connected users
 						// is dynamically updated via AJAX
 	 Sco_PutParamScope ("ScopeCon",Sco_SCOPE_CRS);
-	 Act_LinkFormSubmitUnique (Txt_Connected_users,The_ClassConnected[Gbl.Prefs.Theme]);
+	 Act_LinkFormSubmitUnique (Txt_Connected_users,"CONNECTED_TXT");
 	 fprintf (Gbl.F.Out,"<img src=\"%s/ellipsis32x32.gif\""
 			    " alt=\"%s\" title=\"%s\" class=\"ICO40x40\" />"
 			    "</a>",