|
@@ -188,7 +188,7 @@
|
|
<TextBlock Classes="TextColumns">МЕСТОПОЛОЖЕНИЕ</TextBlock>
|
|
<TextBlock Classes="TextColumns">МЕСТОПОЛОЖЕНИЕ</TextBlock>
|
|
</StackPanel>
|
|
</StackPanel>
|
|
</Border>
|
|
</Border>
|
|
- <ScrollViewer Height="600">
|
|
|
|
|
|
+ <ScrollViewer Height="550">
|
|
<StackPanel Orientation="Vertical">
|
|
<StackPanel Orientation="Vertical">
|
|
<ListBox Classes="filters" ItemsSource="{Binding ListOutlets}" Background="Transparent" IsTabStop="False">
|
|
<ListBox Classes="filters" ItemsSource="{Binding ListOutlets}" Background="Transparent" IsTabStop="False">
|
|
<ListBox.ItemTemplate>
|
|
<ListBox.ItemTemplate>
|
|
@@ -203,19 +203,24 @@
|
|
<Border Classes="Data" CornerRadius="13" Width="150" Height="40" Margin="0 0 120 0">
|
|
<Border Classes="Data" CornerRadius="13" Width="150" Height="40" Margin="0 0 120 0">
|
|
<TextBlock Text="{Binding Outletid}" Classes="Data">Типа id</TextBlock>
|
|
<TextBlock Text="{Binding Outletid}" Classes="Data">Типа id</TextBlock>
|
|
</Border>
|
|
</Border>
|
|
- <Border Classes="Data" CornerRadius="13" Width="240" Height="40" Margin="0 0 160 0">
|
|
|
|
|
|
+ <Border Classes="Data" CornerRadius="13" Width="280" Height="40" Margin="0 0 130 0">
|
|
<TextBlock Text="{Binding TradeNetworksNavigation.Title}" Classes="Data">Типа название торговой сети</TextBlock>
|
|
<TextBlock Text="{Binding TradeNetworksNavigation.Title}" Classes="Data">Типа название торговой сети</TextBlock>
|
|
</Border>
|
|
</Border>
|
|
<!--<Border Classes="Data" CornerRadius="13" Width="310" Height="40" Margin="0 0 140 0">
|
|
<!--<Border Classes="Data" CornerRadius="13" Width="310" Height="40" Margin="0 0 140 0">
|
|
<TextBlock Classes="Data">Типа название торговой сети</TextBlock>
|
|
<TextBlock Classes="Data">Типа название торговой сети</TextBlock>
|
|
</Border>-->
|
|
</Border>-->
|
|
- <Border Classes="Data" CornerRadius="13" Width="220" Height="40" Margin="0 0 120 0">
|
|
|
|
|
|
+ <Border Classes="Data" CornerRadius="13" Width="220" Height="40" Margin="0 0 110 0">
|
|
<TextBlock Text="{Binding Address}" Classes="Data">Типа адрес</TextBlock>
|
|
<TextBlock Text="{Binding Address}" Classes="Data">Типа адрес</TextBlock>
|
|
</Border>
|
|
</Border>
|
|
- <Border Classes="Data" CornerRadius="13" Width="280" Height="40">
|
|
|
|
- <TextBlock Text="{Binding Location}" Classes="Data">Типа местоположение </TextBlock>
|
|
|
|
|
|
+ <Border Classes="Data" CornerRadius="13" Width="350" Height="40" Margin="0 0 20 0">
|
|
|
|
+ <TextBlock Text="{Binding Location}" Classes="Data">Типа местоположение</TextBlock>
|
|
</Border>
|
|
</Border>
|
|
- <Button Content="Изменить" Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).EditOutlet}" CommandParameter ="{Binding Outletid}"/>
|
|
|
|
|
|
+ <!--<Button Classes="BtEdit" Content="Изменить" Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).EditOutlet}" CommandParameter ="{Binding Outletid}"/>-->
|
|
|
|
+ <StackPanel Orientation="Horizontal">
|
|
|
|
+ <Button Classes="BtEdit" Width="40" Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).EditOutlet}" CommandParameter ="{Binding Outletid}">
|
|
|
|
+ <Image Source="avares://Acosta/Assets/change.png" Width="25"></Image>
|
|
|
|
+ </Button>
|
|
|
|
+ </StackPanel>
|
|
</StackPanel>
|
|
</StackPanel>
|
|
</DataTemplate>
|
|
</DataTemplate>
|
|
</ListBox.ItemTemplate>
|
|
</ListBox.ItemTemplate>
|