diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-03-14 10:34:23 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-03-14 10:34:23 +0200 |
| commit | 9d04bbb2b4a2eb2eb14cc813103c856b7bde975a (patch) | |
| tree | 093b1cdcd808e600f44fd8ccd5465978c572822e /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml | |
| parent | 5652ed578179a7221b443d11855d555dc6ae05cd (diff) | |
| parent | 37b740c1d128d694b9dcbc3669808435b5d88fec (diff) | |
| download | Tango-9d04bbb2b4a2eb2eb14cc813103c856b7bde975a.tar.gz Tango-9d04bbb2b4a2eb2eb14cc813103c856b7bde975a.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml | 9 |
1 files changed, 6 insertions, 3 deletions
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> |