From 56c0b0b37d0ffe5d085321ea2ed523a6fd8d1e38 Mon Sep 17 00:00:00 2001
From: Polonkai Gergely <polesz@w00d5t0ck.info>
Date: Thu, 30 Aug 2012 11:53:05 +0200
Subject: [PATCH] Fixed user data boxes

Signed-off-by: Gergely Polonkai <polesz@w00d5t0ck.info>
---
 .../Resources/views/Default/main_template.html.twig  |  2 +-
 .../Resources/views/Default/ajaxUserdata.html.twig   | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/KekRozsak/FrontBundle/Resources/views/Default/main_template.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Default/main_template.html.twig
index bf4ddd2..4b53414 100644
--- a/src/KekRozsak/FrontBundle/Resources/views/Default/main_template.html.twig
+++ b/src/KekRozsak/FrontBundle/Resources/views/Default/main_template.html.twig
@@ -116,7 +116,7 @@
             });
             $('#jog-lista').cluetip({
                 splitTitle: '|',
-                showTitle:  false
+                showTitle:  true
             });
             $('.program').cluetip({
                 cluezIndex: 1000
diff --git a/src/KekRozsak/SecurityBundle/Resources/views/Default/ajaxUserdata.html.twig b/src/KekRozsak/SecurityBundle/Resources/views/Default/ajaxUserdata.html.twig
index 4e87060..9e1e217 100644
--- a/src/KekRozsak/SecurityBundle/Resources/views/Default/ajaxUserdata.html.twig
+++ b/src/KekRozsak/SecurityBundle/Resources/views/Default/ajaxUserdata.html.twig
@@ -19,16 +19,17 @@
         <strong>MSN cím</strong>: {{ user.userData.msnAddress }}<br />
 {% endif %}
 {% if user.userData and user.userData.googleTalk != '' and (is_granted('ROLE_ADMIN') or user.userData.googleTalkPublic) %}
-        <strong>Google Talk cím</strong>: {{ user.userData.googleTalk }}
+        <strong>Google Talk cím</strong>: {{ user.userData.googleTalk }}<br />
 {% endif %}
 {% if user.userData and user.userData.skype != '' and (is_granted('ROLE_ADMIN') or user.userData.skypePublic) %}
-        <strong>Skype név</strong>: {{ user.userData.skypePublic }}
+        <strong>Skype név</strong>: {{ user.userData.skype}}<br />
 {% endif %}
 {% if user.userData and user.userData.phoneNumber != '' and (is_granted('ROLE_ADMIN') or user.userData.phoneNumberPublic) %}
         <strong>Telefonszám</strong>: {{ user.userData.phoneNumber }}<br />
 {% endif %}
 {% if user.userData and user.userData.selfDescription != '' %}
-        <strong>Leírás</strong>: {{ user.userData.selfDescription }}<br />
+        <strong>Leírás</strong>:<br />
+	{{ user.userData.selfDescription }}<br />
 {% endif %}
         <strong>Csoportok</strong>:<br />
 {% set groupCount = 0 %}
@@ -44,7 +45,10 @@ Egy csoportnak sem tagja.<br />
 {% if is_granted('ROLE_ADMIN') %}
         <strong>Jóváhagyta</strong>: {{ user.acceptedBy.displayName }}<br />
         <strong>Utolsó bejelentkezés</strong>: {{ user.lastLoginAt|date('Y-m-d H:i') }}<br />
-        <strong>Jogok</strong>:
+        <strong>Jogok</strong>:<br />
+{% for role in user.roles %}
+	{{ role.shortDescription }}<br />
+{% endfor %}
 {% endif %}
     </body>
 </html>