# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1486767617 -3600
# Node ID c9939a4ea74c1a25a512c42a8c94ed87dac1617f
# Parent  0dfc02021c9287050b829f3721e8b9424e797ab3
Small fixes

diff -r 0dfc02021c92 -r c9939a4ea74c data/tazbug-web.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/data/tazbug-web.desktop	Sat Feb 11 00:00:17 2017 +0100
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=SliTaz bug report (Web)
+Name[fr]=Rapport de bug SliTaz (Web)
+Name[ru]=Баг-репорт SliTaz (Web)
+Exec=tazweb --notoolbar http://bugs.slitaz.org/
+Icon=slitaz-icon
+Type=Application
+Categories=Application;Network;
diff -r 0dfc02021c92 -r c9939a4ea74c web/bugs.cgi
--- a/web/bugs.cgi	Fri Feb 10 23:43:16 2017 +0100
+++ b/web/bugs.cgi	Sat Feb 11 00:00:17 2017 +0100
@@ -217,22 +217,6 @@
 EOT
 }
 
-# Display user public profile.
-public_people() {
-	cat << EOT
-</pre>
-EOT
-}
-
-# Display authenticated user profile. TODO: change password
-auth_people() {
-	cat << EOT
-Email      : $MAIL
-Secure key : $KEY
-</pre>
-EOT
-}
-
 # Usage: list_bug ID
 list_bug() {
 	id="$1"
@@ -706,7 +690,7 @@
 			js_redirection_to "$script"
 		fi ;;
 	*\ user\ *)
-		# User profile
+		# User profile. Use the users plugin for more functions
 		last="$(cat $PEOPLE/"$(GET user)"/last)"
 		header
 		html_header
@@ -718,14 +702,8 @@
 <pre>
 $(gettext "User name  :") $USER
 $(gettext "Last login :") $last
+</pre>
 EOT
-		if check_auth && [ "$(GET user)" == "$user" ]; then
-			auth_people
-		else
-			# check_auth will set VARS to current logged user: re-source
-			. $PEOPLE/"$(GET user)"/account.conf
-			public_people
-		fi
 		html_footer ;;
 	*\ newbug\ *)
 		# Create a bug from web interface.
diff -r 0dfc02021c92 -r c9939a4ea74c web/plugins/users/users.cgi
--- a/web/plugins/users/users.cgi	Fri Feb 10 23:43:16 2017 +0100
+++ b/web/plugins/users/users.cgi	Sat Feb 11 00:00:17 2017 +0100
@@ -6,10 +6,6 @@
 # Display user public profile.
 public_people() {
 	echo "</pre>"
-	# Display personal user profile
-	if [ -f "$PEOPLE/$USER/profile.txt" ]; then
-		cat $PEOPLE/$USER/profile.txt | wiki_parser
-	fi
 }
 
 # Display authenticated user profile. TODO: change password
@@ -20,7 +16,6 @@
 EOT
 	# Each user can have personal profile page
 	if [ -f "$PEOPLE/$USER/profile.txt" ]; then
-		cat $PEOPLE/$USER/profile.txt | wiki_parser
 		cat << EOT
 <div id="tools">
 	<a href="$script?modprofile">$(gettext "Modify profile")</a>
@@ -123,6 +118,11 @@
 			. $PEOPLE/"$(GET user)"/account.conf
 			public_people
 		fi
+		# Display personal user profile
+		if [ -f "$PEOPLE/$USER/profile.txt" ]; then
+			echo "<h2>$(gettext "About me")</h2>"
+			cat $PEOPLE/$USER/profile.txt | wiki_parser
+		fi
 		html_footer && exit 0 ;;
 		
 	*\ modprofile\ *)