From cb1332d31566014ae349625526ca166235d2d851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= <acanas@ugr.es>
Date: Fri, 29 Jan 2016 00:41:52 +0100
Subject: [PATCH] Version 15.133.8

---
 css/swad15.131.2.css |  20 ++++++++
 icon/usr64x64.gif    | Bin 578 -> 371 bytes
 swad_changelog.h     |   3 +-
 swad_follow.c        | 108 +++++++++++++++++++++++--------------------
 swad_profile.c       |  15 ++++++
 swad_profile.h       |   1 +
 6 files changed, 96 insertions(+), 51 deletions(-)

diff --git a/css/swad15.131.2.css b/css/swad15.131.2.css
index 011bc052..d675ddb3 100644
--- a/css/swad15.131.2.css
+++ b/css/swad15.131.2.css
@@ -2100,6 +2100,26 @@ a:hover img.CENTRE_PHOTO_SHOW
 	font-size:30pt;
 	font-weight:bold;
 	}
+.FOLLOW_USR_PHOTO
+	{
+	box-sizing:border-box;
+	width:72px;
+	height:90px;
+	text-align:left;
+	vertical-align:bottom;
+	}
+.FOLLOW_USR_NAME
+	{
+	box-sizing:border-box;
+	min-width:106px;
+	height:90px;
+	text-align:left;
+	vertical-align:bottom;
+	}
+.FOLLOW_USR_ICON
+	{
+	padding:4px;
+	}
 
 .CON			{color:#B8D070; font-size:11pt; line-height:110%; white-space:nowrap;}
 .CON_CRS		{color:#398000; font-size:11pt; line-height:110%; white-space:nowrap;}
diff --git a/icon/usr64x64.gif b/icon/usr64x64.gif
index e6f962072a3032b0712d96c560bc8a57d7bf2a9d..85442a18844b8d403fcd111992228eedbbbe78cc 100644
GIT binary patch
delta 344
zcmV-e0jK`L1oHwqM@dFFIblEmKmfA<06;)MOG`^qQc_!6TVrEmYHDh9baZ=rdxC<3
zii(Pnk&&93nxmtmt*x!Hva*pnCV!r2s;+G7zA(oa0RRNW5|@bW|A4|SR0A3Tj3LKy
zYyuQYjnkQoT8h)7wUWp>g<FYt8h$j!&P2F}J`Tc!b~7xHYqxbf5U$^E*?j<STW5g)
zYGH-|We;6_U}acxj1zhdloAe-Sx}f0n@yKt4m3d&j!gy>2R8*(FL^&Y6Mr*#IJ23X
z0k0|yPJ<i;P6#Ys1Gp6paaqVFpiVdj2L-WXDGG{mswdCcPA7%lXow^R;%x%X=WQnI
zZ4M+%?qlR3*z;bHA*}dWz#+o=Wg#&@;J^{p3>qPkP~i`T4(E&r7}1Z2dlh}?3z6{$
qJQ5-NGX5J;uwsA|Aq^5>kriN>y8*;J$(%{Erp=o;bLxB%0RTJ1=8Fmd

delta 552
zcmV+@0@wZX0>T73M@dFFIblEmKmfA<06;)MN=iynQc_%8Tx4WqYinzCbaZ-pdV+$2
zi;IhslarjBoTQ|rs;a8CwziQvCVzT}004t>Ug_GB$7<WlD;f8lgM(i0@CpiTL=W%i
zGu4<l542~R-a1Pw;3s-&xtV}=RUnPYoHNUO9;D9%i=v<c2n-C1+PzU5C<Rjq6n-3D
zRzD460TYK)U>Ro;3Tglj5|UV2c?^{+5{^fZ8U#~Go+|<pModW`p({V7sDA*153pM#
z2u3p#v^EsGGA<qo00<q%zm^>Y0eKb+H?A10w8$9_fi{;FM*;{94h{?{n9BfV4+9C}
z<OX6raTE?`j1TB*_?Z)wi|5PusOctQ+Zceq)TtpRq0Yf|=#bSrgAJjUOUiy-l6FR&
zMJw>wmff>vW!}dr_hzB8Rey=k$wx1(sCtlP%*>cf?kV!*t0e`8Qwl)qSBap61teQh
z=rqNpg`HOJU2p*Oh=q(oY&~F5KukrNf&keuK+vENqrs}$Y7oyx0HX`&q{2gi<BgkU
zSug~Fwa1@kP|%vN3#EWy2@H}7(ScKlfC2{$$USq@M9qANUSL)um1RWV%~KA4s0tbi
zH4&xlm6(`XONq~|kBH`wH};XeKx~6#qq{Kg-bYM^01m||2;xjCA4e|4_y^`fJcg)^
q9QOyP&;giG-21eMw#1!}P}!Za1YxZSSU1nUz5Dm@<I67*0RTHv+3ubI

diff --git a/swad_changelog.h b/swad_changelog.h
index 3e4a9a0d..35f69bc8 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -121,13 +121,14 @@
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 15.133.7 (2016-01-28)"
+#define Log_PLATFORM_VERSION	"SWAD 15.133.8 (2016-01-29)"
 #define CSS_FILE		"swad15.131.2.css"
 #define JS_FILE			"swad15.131.3.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 15.133.8: Jan 29, 2016	Link to request a user's profile. (195328 lines)
         Version 15.133.7: Jan 28, 2016	Changes in layout of followed/followers. (195288 lines)
         Version 15.133.6: Jan 28, 2016	Changes in layout of "Who to follow". (195287 lines)
         Version 15.133.5: Jan 28, 2016	Unlogged users can not view "Who to follow". (195276 lines)
diff --git a/swad_follow.c b/swad_follow.c
index ed85b43f..ede7d1ad 100644
--- a/swad_follow.c
+++ b/swad_follow.c
@@ -105,6 +105,9 @@ void Fol_SuggestWhoToFollow (void)
    unsigned NumUsr;
    struct UsrData UsrDat;
 
+   /***** Put link to request user's profile *****/
+   Prf_PutLinkRequestUserProfile ();
+
    /***** First try: build query to get users to follow *****/
    sprintf (Query,"SELECT DISTINCT UsrCod FROM"
                   " ("
@@ -206,7 +209,7 @@ void Fol_SuggestWhoToFollow (void)
    if (NumUsrs)
      {
       /***** Start frame *****/
-      Lay_StartRoundFrame (NULL,Txt_Who_to_follow);
+      Lay_StartRoundFrame ("560px",Txt_Who_to_follow);
 
       /***** Put form to update connected users *****/
       fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
@@ -221,7 +224,7 @@ void Fol_SuggestWhoToFollow (void)
 
       /***** Start listing *****/
       fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\""
-			 " style=\"margin:12px auto;\">");
+			 " style=\"margin:0 auto;\">");
 
       for (NumUsr = 0;
 	   NumUsr < NumUsrs;
@@ -494,7 +497,7 @@ void Fol_ListFollowing (void)
 	    Usr_UsrDataConstructor (&UsrDat);
 
 	    /***** Start listing *****/
-            Lay_StartRoundFrameTable (NULL,2,Txt_Following);
+            Lay_StartRoundFrameTable ("560px",2,Txt_Following);
 
 	    for (NumUsr = 0;
 		 NumUsr < NumUsrs;
@@ -570,7 +573,7 @@ void Fol_ListFollowers (void)
 	    Usr_UsrDataConstructor (&UsrDat);
 
 	    /***** Start listing *****/
-            Lay_StartRoundFrameTable (NULL,2,Txt_Followers);
+            Lay_StartRoundFrameTable ("560px",2,Txt_Followers);
 
 	    for (NumUsr = 0;
 		 NumUsr < NumUsrs;
@@ -629,49 +632,8 @@ static void Fol_ShowFollowedOrFollower (const struct UsrData *UsrDat)
    char PhotoURL[PATH_MAX+1];
    bool Visible = Pri_ShowIsAllowed (UsrDat->ProfileVisibility,UsrDat->UsrCod);
 
-   /***** Put form to follow / unfollow *****/
-   fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\""
-	              " style=\"width:25px; height:62px;\">");
-   if (Visible &&
-       Gbl.Usrs.Me.Logged &&
-       Gbl.Usrs.Me.UsrDat.UsrCod != UsrDat->UsrCod)
-     {
-      if (Fol_CheckUsrIsFollowerOf (Gbl.Usrs.Me.UsrDat.UsrCod,UsrDat->UsrCod))	// I follow user
-	{
-	 Act_FormStart (ActUnfUsr);
-	 Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
-	 Act_LinkFormSubmit (Txt_Following_unfollow,NULL);
-	 fprintf (Gbl.F.Out,"<div class=\"ICON_HIGHLIGHT\">"
-			    "<img src=\"%s/following64x64.png\""
-			    " alt=\"%s\" title=\"%s\""
-	                    " class=\"ICON20x20\" />"
-			    "</div>"
-			    "</a>",
-		  Gbl.Prefs.IconsURL,
-		  Txt_Unfollow,Txt_Following_unfollow);
-	 Act_FormEnd ();
-	}
-      else	// I do not follow this user
-	{
-	 Act_FormStart (ActFolUsr);
-	 Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
-	 Act_LinkFormSubmit (Txt_Follow,NULL);
-	 fprintf (Gbl.F.Out,"<div class=\"ICON_HIGHLIGHT\">"
-			    "<img src=\"%s/follow64x64.png\""
-			    " alt=\"%s\" title=\"%s\""
-	                    " class=\"ICON20x20\" />"
-			    "</div>"
-			    "</a>",
-		  Gbl.Prefs.IconsURL,
-		  Txt_Follow,Txt_Follow);
-	 Act_FormEnd ();
-	}
-     }
-   fprintf (Gbl.F.Out,"</td>");
-
    /***** Check if I can see the public profile *****/
-   fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\""
-	              " style=\"width:64px; height:84px;\">");
+   fprintf (Gbl.F.Out,"<td class=\"FOLLOW_USR_PHOTO\">");
    if (Visible)
      {
       /***** User's photo *****/
@@ -680,21 +642,67 @@ static void Fol_ShowFollowedOrFollower (const struct UsrData *UsrDat)
 					   NULL,
 			"PHOTO60x80",Pho_ZOOM,false);
      }
-   fprintf (Gbl.F.Out,"</td>");
+   fprintf (Gbl.F.Out,"</td>"
+                      "<td class=\"FOLLOW_USR_NAME\">");
 
    /***** Put form to go to public profile *****/
-   fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\""
-	              " style=\"min-width:87px; height:84px;\">");
    if (Visible &&
        UsrDat->Nickname[0])
      {
       Act_FormStart (ActSeePubPrf);
       Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
       Act_LinkFormSubmit (Txt_View_public_profile,"DAT");
-      Usr_RestrictLengthAndWriteName (UsrDat,8);
+      Usr_RestrictLengthAndWriteName (UsrDat,10);
       fprintf (Gbl.F.Out,"</a>");
       Act_FormEnd ();
      }
+
+   /***** Put form to follow / unfollow *****/
+   if (Visible && Gbl.Usrs.Me.Logged)
+     {
+      if (Gbl.Usrs.Me.UsrDat.UsrCod == UsrDat->UsrCod)
+	 fprintf (Gbl.F.Out,"<div class=\"FOLLOW_USR_ICON ICON_HIDDEN\">"
+			    "<img src=\"%s/usr64x64.gif\""
+			    " alt=\"\""
+			    " class=\"ICON25x25\" />"
+			    "</div>"
+			    "</a>",
+		  Gbl.Prefs.IconsURL);
+      else
+	{
+	 if (Fol_CheckUsrIsFollowerOf (Gbl.Usrs.Me.UsrDat.UsrCod,UsrDat->UsrCod))	// I follow user
+	   {
+	    Act_FormStart (ActUnfUsr);
+	    Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
+	    Act_LinkFormSubmit (Txt_Following_unfollow,NULL);
+	    fprintf (Gbl.F.Out,"<div class=\"FOLLOW_USR_ICON ICON_HIGHLIGHT\">"
+			       "<img src=\"%s/following64x64.png\""
+			       " alt=\"%s\" title=\"%s\""
+			       " class=\"ICON25x25\" />"
+			       "</div>"
+			       "</a>",
+		     Gbl.Prefs.IconsURL,
+		     Txt_Unfollow,Txt_Following_unfollow);
+	    Act_FormEnd ();
+	   }
+	 else	// I do not follow this user
+	   {
+	    Act_FormStart (ActFolUsr);
+	    Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
+	    Act_LinkFormSubmit (Txt_Follow,NULL);
+	    fprintf (Gbl.F.Out,"<div class=\"FOLLOW_USR_ICON ICON_HIGHLIGHT\">"
+			       "<img src=\"%s/follow64x64.png\""
+			       " alt=\"%s\" title=\"%s\""
+			       " class=\"ICON25x25\" />"
+			       "</div>"
+			       "</a>",
+		     Gbl.Prefs.IconsURL,
+		     Txt_Follow,Txt_Follow);
+	    Act_FormEnd ();
+	   }
+	}
+     }
+
    fprintf (Gbl.F.Out,"</td>");
   }
 
diff --git a/swad_profile.c b/swad_profile.c
index b3b38f7b..cfb1536f 100644
--- a/swad_profile.c
+++ b/swad_profile.c
@@ -121,6 +121,21 @@ char *Prf_GetURLPublicProfile (char *URL,const char *NicknameWithoutArroba)
    return URL;
   }
 
+/*****************************************************************************/
+/******************* Put link to request a user's profile ********************/
+/*****************************************************************************/
+
+void Prf_PutLinkRequestUserProfile (void)
+  {
+   extern const char *Txt_View_public_profile;
+
+   fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
+   Lay_PutContextualLink (ActReqPubPrf,NULL,
+                          "usr64x64.gif",
+                          Txt_View_public_profile,Txt_View_public_profile);
+   fprintf (Gbl.F.Out,"</div>");
+  }
+
 /*****************************************************************************/
 /************************** Request a user's profile *************************/
 /*****************************************************************************/
diff --git a/swad_profile.h b/swad_profile.h
index 68248c1d..bfdab988 100644
--- a/swad_profile.h
+++ b/swad_profile.h
@@ -40,6 +40,7 @@
 /*****************************************************************************/
 
 char *Prf_GetURLPublicProfile (char *URL,const char *NicknameWithoutArroba);
+void Prf_PutLinkRequestUserProfile (void);
 void Prf_RequestUserProfile (void);
 void Prf_GetUsrDatAndShowUserProfile (void);