Верстка начальных страниц

PP_Ven_MosS/Pages/ApplicationsListAdmin.xaml

@@ -9,6 +9,19 @@
       Title="ApplicationsListAdmin">
 
     <Grid>
-        
+        <Grid.RowDefinitions>
+            <RowDefinition Height="70"></RowDefinition>
+            <RowDefinition></RowDefinition>
+            <RowDefinition Height="70"></RowDefinition>
+        </Grid.RowDefinitions>
+        <StackPanel Orientation="Horizontal" Grid.Row="0" Margin="10,0,0,0" >
+            <Button Name="BackBtn" Content="←" Height="30" Width="30" VerticalAlignment="Center" FontSize="20" VerticalContentAlignment="Center"></Button>
+            <GroupBox Height="60" Header="Введите текст для поиска" BorderThickness="2" BorderBrush="#FF0000" Margin="10,0,0,0">
+                <TextBox Name="TB_Search" Width="300" Height="30"/>
+            </GroupBox>
+            <ComboBox Name="CB_Sort" Width="200" Height="30" Margin="10,10,0,0"></ComboBox>
+            <ComboBox Name="CB_Filter" Width="200" Height="30" Margin="10,10,0,0"></ComboBox>
+            
+        </StackPanel>
     </Grid>
 </Page>

PP_Ven_MosS/Pages/Avtorization.xaml

@@ -11,12 +11,12 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="150"></RowDefinition>
-            <RowDefinition Height="2*"></RowDefinition>
+            <RowDefinition Height="3*"></RowDefinition>
             <RowDefinition Height="50"></RowDefinition>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="150"></ColumnDefinition>
-            <ColumnDefinition Width="2*"></ColumnDefinition>
+            <ColumnDefinition Width="3*"></ColumnDefinition>
             <ColumnDefinition Width="150"></ColumnDefinition>
         </Grid.ColumnDefinitions>
         <StackPanel Grid.Column="1" Grid.Row="0">
@@ -24,15 +24,15 @@
         </StackPanel>
         <Border Grid.Column="1" Grid.Row="1" BorderBrush="#FF0000" BorderThickness="4" CornerRadius="10">
             <StackPanel Orientation="Vertical">
-                <TextBlock Text="Авторизация" Width="80" HorizontalAlignment="Center" FontWeight="Bold" Margin="0,30,0,0"></TextBlock>
-                <GroupBox Header="Логин" FontWeight="Bold" Style="{StaticResource GBSt}">
+                <TextBlock Text="Авторизация" Width="200" HorizontalAlignment="Center" FontWeight="Bold" FontSize="30" Margin="0,30,0,0"></TextBlock>
+                <GroupBox Header="Логин" FontSize="20" FontWeight="Bold" Style="{StaticResource GBSt}">
                     <TextBox Name="TBLog"></TextBox>
                 </GroupBox>
-                <GroupBox Header="Пароль" FontWeight="Bold" Style="{StaticResource GBSt}">
+                <GroupBox Header="Пароль" FontSize="20" FontWeight="Bold" Style="{StaticResource GBSt}">
                     <PasswordBox Name="PBPass"></PasswordBox>
                 </GroupBox>
-                <Button Name="Sign" Content="Войти" Style="{StaticResource BtnSt}" Click="Sign_Click" Margin="0,20,0,0"></Button>
-                <Button Name="Registration" Content="Зарегистрироваться" Margin="0,20,0,0" Style="{StaticResource BtnSt}" Click="Registration_Click"></Button>
+                <Button Name="Sign" Content="Войти" FontSize="20" Style="{StaticResource BtnSt}" Click="Sign_Click" Margin="0,20,0,0"></Button>
+                <Button Name="Registration" Content="Зарегистрироваться" FontSize="20" Margin="0,20,0,0" Style="{StaticResource BtnSt}" Click="Registration_Click"></Button>
             </StackPanel>
         </Border>
     </Grid>

PP_Ven_MosS/Pages/Registration.xaml

@@ -10,36 +10,47 @@
 
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition></RowDefinition>
-            <RowDefinition Height="75"></RowDefinition>
+            <RowDefinition Height="150"></RowDefinition>
+            <RowDefinition Height="3*"></RowDefinition>
+            <RowDefinition Height="50"></RowDefinition>
         </Grid.RowDefinitions>
-        <Border Grid.Row="0" BorderBrush="#FF0000" BorderThickness="5" CornerRadius="25">
-        <StackPanel Orientation="Vertical"  HorizontalAlignment="Center">
-                <GroupBox Header="Фамилия" Style="{StaticResource GBSt}">
-                <TextBox Name="Surn"/>
-                </GroupBox>
-                <GroupBox Style="{StaticResource GBSt}" Header="Имя">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="150"></ColumnDefinition>
+            <ColumnDefinition Width="3*"></ColumnDefinition>
+            <ColumnDefinition Width="150"></ColumnDefinition>
+        </Grid.ColumnDefinitions>
+        <StackPanel Grid.Column="1" Grid.Row="0">
+            <Image Source="/Images/minin.png" Width="800" Height="150"></Image>
+        </StackPanel>
+        <Border Grid.Column="1" Grid.Row="1" BorderBrush="#FF0000" BorderThickness="4" CornerRadius="10">
+            <StackPanel Orientation="Vertical"  HorizontalAlignment="Center" VerticalAlignment="Center">
+                <TextBlock Text="Пройдите этап регистрации" FontSize="30" FontWeight="Bold" Margin="15"></TextBlock>
+                <GroupBox Header="Фамилия" FontSize="20" Style="{StaticResource GBSt}">
+                    <TextBox Name="Surn"/>
+                </GroupBox>
+                <GroupBox Header="Имя" FontSize="20" Style="{StaticResource GBSt}">
                     <TextBox Name="Nam"/>
                 </GroupBox>
-                <GroupBox Header="Отчество" Style="{StaticResource GBSt}">
+                <GroupBox Header="Отчество" FontSize="20" Style="{StaticResource GBSt}">
                     <TextBox Name="Patron"/>
                 </GroupBox>
-                <GroupBox Header="Должность" Style="{StaticResource GBSt}">
+                <GroupBox Header="Должность" FontSize="20" Style="{StaticResource GBSt}">
                     <TextBox Name="Dolg" />
                 </GroupBox>
-                <GroupBox Header="Номер телефона" Style="{StaticResource GBSt}">
+                <GroupBox Header="Номер телефона" FontSize="20" Style="{StaticResource GBSt}">
                     <TextBox Name="PhNum" />
                 </GroupBox>
-                <GroupBox Header="Логин" Style="{StaticResource GBSt}">
+                <GroupBox Header="Логин" FontSize="20" Style="{StaticResource GBSt}">
                     <TextBox Name="login" />
                 </GroupBox>
-                <GroupBox Header="Пароль" Style="{StaticResource GBSt}">
+                <GroupBox Header="Пароль" FontSize="20" Style="{StaticResource GBSt}">
                     <PasswordBox Name="password" />
                 </GroupBox>
-                <GroupBox Header="Выберите роль" Style="{StaticResource GBSt}">
+                <GroupBox Header="Выберите роль" FontSize="20" Style="{StaticResource GBSt}">
                     <ComboBox Name="CBRole"/>
                 </GroupBox>
-                <Button Margin="0,10,0,0" Name="Registr" Click="reg_Click" Content="Завершить регистрацию" Style="{StaticResource BtnSt}"></Button>
+                <Button Margin="15" Name="Registr" FontSize="20" Click="reg_Click" Content="Завершить" Style="{StaticResource BtnSt}"></Button>
+                <Button Margin="15" Name="Back" FontSize="20" Click="Back_Click" Content="Выйти" Style="{StaticResource BtnSt}"></Button>
             </StackPanel>
         </Border>
     </Grid>

PP_Ven_MosS/Pages/Registration.xaml.cs

@@ -119,5 +119,10 @@ namespace PP_Ven_MosS.Pages
                 }
             }
         }
+
+        private void Back_Click(object sender, RoutedEventArgs e)
+        {
+            FrameClass.MainFrame.Navigate(new Avtorization());
+        }
     }
 }