diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-08-20 14:54:08 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-08-20 14:54:08 +0300 |
| commit | 37ac8fbec05d6980e94cb682d42edbd3ef6aa15e (patch) | |
| tree | 052732264349ff6c40bdafc83163be71cca8b572 /Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml | |
| parent | 53d2c81ebf6a98b4a0c46559abd6a636a4517314 (diff) | |
| parent | 884fce5075ca6a53cb5687feb0b01c6db0802f06 (diff) | |
| download | Tango-37ac8fbec05d6980e94cb682d42edbd3ef6aa15e.tar.gz Tango-37ac8fbec05d6980e94cb682d42edbd3ef6aa15e.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml index a0e7223c7..902b9c769 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml @@ -36,13 +36,30 @@ HorizontalAlignment="Right" IsChecked="{Binding ElementName=menu,Path=IsOpened}" Foreground="{StaticResource TangoPrimaryAccentBrush}" /> - <TextBlock Foreground="{StaticResource TangoGrayTextBrush}" FontSize="{StaticResource TangoSmallFontSize}" Margin="40 20 20 50" VerticalAlignment="Bottom" HorizontalAlignment="Left"> + <StackPanel Orientation="Horizontal" Margin="40 20 20 50" VerticalAlignment="Bottom" HorizontalAlignment="Left"> + <TextBlock Foreground="{StaticResource TangoGrayTextBrush}" FontSize="{StaticResource TangoSmallFontSize}"> <Run>Machine S/N:</Run> <Run FontStyle="Italic" Text="{Binding MachineProvider.Machine.SerialNumber,Mode=OneWay,IsAsync=True,FallbackValue='0000'}"></Run> <Run>|</Run> <Run>Version:</Run> <Run FontStyle="Italic" Text="{Binding ApplicationManager.Version,FallbackValue='1.0.0.0',Mode=OneWay,IsAsync=True}"></Run> - </TextBlock> + </TextBlock> + + <TextBlock Margin="5 0 0 0" Foreground="{StaticResource TangoGrayTextBrush}" FontSize="{StaticResource TangoSmallFontSize}"> + <TextBlock.Style> + <Style TargetType="TextBlock"> + <Setter Property="Visibility" Value="Visible"></Setter> + <Style.Triggers> + <DataTrigger Binding="{Binding Settings.DeploymentSlot}" Value="PROD"> + <Setter Property="Visibility" Value="Collapsed"></Setter> + </DataTrigger> + </Style.Triggers> + </Style> + </TextBlock.Style> + <Run>|</Run> + <Run Text="{Binding Settings.DeploymentSlot}"></Run> + </TextBlock> + </StackPanel> </Grid> </Border> <!--<StackPanel Margin="0 5 0 0"> @@ -108,7 +125,7 @@ </ItemsControl.ItemTemplate> </ItemsControl>--> - + <Border Background="{StaticResource TangoPowerMenuOpenedBackgroundBrush}" Height="350" Padding="20" RenderTransformOrigin="0.5,1" VerticalAlignment="Bottom"> <Border.Style> <Style TargetType="Border"> @@ -287,7 +304,7 @@ <!--MODULES GOES HERE--> </controls:NavigationControl> </Grid> - + </DockPanel> </touch:TouchSideMenu> |