From e317a7943e47c34e731729eacc46f8ce48905927 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 7 Mar 2018 16:28:54 +0200
Subject: Working on Users & Roles Module.

---
 .../MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
index a4256436c..8e6fa36f5 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
@@ -48,16 +48,19 @@
                             <StackPanel Margin="5 0 0 0" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center">
                                 <Image Source="/Images/account.png" RenderOptions.BitmapScalingMode="Fant" VerticalAlignment="Center" Width="50" Height="50"></Image>
                                 <StackPanel Margin="0 5 0 0">
-                                <TextBlock FontSize="16" TextTrimming="CharacterEllipsis" MaxWidth="170" FontStyle="Italic" FontWeight="Bold" Margin="10 0 0 0" VerticalAlignment="Center" Text="{Binding AuthenticationProvider.CurrentUser.Contact.FullName}"></TextBlock>
+                                    <TextBlock FontSize="16" TextTrimming="CharacterEllipsis" MaxWidth="170" FontStyle="Italic" FontWeight="Bold" Margin="10 0 0 0" VerticalAlignment="Center" Text="{Binding AuthenticationProvider.CurrentUser.Contact.FullName}"></TextBlock>
                                     <TextBlock FontSize="12" TextTrimming="CharacterEllipsis" MaxWidth="170" FontStyle="Italic" Margin="10 5 0 0" VerticalAlignment="Center">
                                         <Run Text="{Binding AuthenticationProvider.CurrentUser.Organization.Name}"></Run>
                                         ,
-                                        <Run Text="{Binding AuthenticationProvider.CurrentUser.Roles[0]}">
+                                        <Run Text="{Binding AuthenticationProvider.CurrentUser.Roles[0].Name}">
                                             <Run.ToolTip>
                                                 <ItemsControl ItemsSource="{Binding AuthenticationProvider.CurrentUser.Roles}">
                                                     <ItemsControl.ItemTemplate>
                                                         <DataTemplate>
-                                                            <TextBlock Text="{Binding Name}"></TextBlock>
+                                                            <StackPanel Orientation="Horizontal" Margin="2">
+                                                                <materialDesign:PackIcon Kind="AccountKey" Width="16" Height="16" />
+                                                                <TextBlock Margin="5 0 0 0" Text="{Binding Name}"></TextBlock>
+                                                             </StackPanel>
                                                         </DataTemplate>
                                                     </ItemsControl.ItemTemplate>
                                                 </ItemsControl>
-- 
cgit v1.3.1