Skip to content

Commit 862c12e

Browse files
esthermiaoknithinc
authored andcommitted
Accessibility Bug fix (#418)
* Test push * Accessibility Bug fix 2201590 2207722 2207730 2212221 2212753 2216147 2216190 2216211 2216373 2216445 2216589 2221631
1 parent dd2489a commit 862c12e

File tree

2 files changed

+34
-31
lines changed

2 files changed

+34
-31
lines changed

Deployment/asdk-installer.ps1

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ $Xaml = @'
315315
<Setter.Value>
316316
<ControlTemplate>
317317
<Border>
318-
<Rectangle Margin="2" StrokeThickness="1" Stroke="#60000000" StrokeDashArray="1 2"/>
318+
<Rectangle Margin="2" StrokeThickness="1" Stroke="#FFFFFFFF" StrokeDashArray="1 2"/>
319319
</Border>
320320
</ControlTemplate>
321321
</Setter.Value>
@@ -547,27 +547,27 @@ $Xaml = @'
547547
<StackPanel Orientation="Horizontal" Margin="0,25,0,0">
548548
<TextBlock FontSize="24" FontFamily="Segoe UI Light" Foreground="#EBEBEB" Text="Microsoft Azure Stack" />
549549
<TextBlock FontSize="11.5" FontFamily="Segoe UI Light" Foreground="#EBEBEB" Margin="210,3,0,0" Text="Installer UI version: " />
550-
<TextBlock x:Name="Control_Header_Tbl_Version" FontSize="11.5" FontFamily="Segoe UI Light" Foreground="#FF4590CE" Margin="0,3,0,0" />
550+
<TextBlock x:Name="Control_Header_Tbl_Version" FontSize="11.5" FontFamily="Segoe UI Light" Foreground="#FF74ACDB" Margin="0,3,0,0" />
551551
</StackPanel>
552552
<TextBlock FontSize="44" FontFamily="Segoe UI Light" Foreground="#EBEBEB" Text="Development Kit" />
553-
<TextBlock x:Name="Control_Header_Tbl_Title" FontSize="20" FontFamily="Segoe UI" Foreground="#EBEBEB" Margin="0,50,0,30" Text="Title" />
553+
<TextBlock x:Name="Control_Header_Tbl_Title" FontSize="20" FontFamily="Segoe UI" Foreground="#EBEBEB" Margin="0,50,0,30" Text="Title" Focusable="True" />
554554
<!--#region Mode-->
555555
<StackPanel x:Name="Control_Mode_Stp" Visibility="Visible">
556556
<StackPanel Orientation="Horizontal">
557-
<Button x:Name="Control_Mode_Btn_Left" Width="250" Height="250" Margin="0,0,50,0">
557+
<Button x:Name="Control_Mode_Btn_Left" Width="250" Height="250" Margin="0,0,50,0" AutomationProperties.LabeledBy="{Binding ElementName=Control_Mode_Tbl_LeftTitle}">
558558
<StackPanel VerticalAlignment="Top">
559559
<TextBlock x:Name="Control_Mode_Tbl_LeftTitle" TextWrapping="Wrap" Padding="15" FontSize="18" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="LeftTitle" />
560560
<TextBlock x:Name="Control_Mode_Tbl_LeftContent" TextWrapping="Wrap" Padding="15,0,15,15" FontSize="14" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="LeftContent"/>
561561
</StackPanel>
562562
</Button>
563-
<Button x:Name="Control_Mode_Btn_Right" Width="250" Height="250" >
563+
<Button x:Name="Control_Mode_Btn_Right" Width="250" Height="250" AutomationProperties.LabeledBy="{Binding ElementName=Control_Mode_Tbl_RightTitle}" >
564564
<StackPanel VerticalAlignment="Top">
565565
<TextBlock x:Name="Control_Mode_Tbl_RightTitle" TextWrapping="Wrap" Padding="15" FontSize="18" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="RightTitle" />
566566
<TextBlock x:Name="Control_Mode_Tbl_RightContent" TextWrapping="Wrap" Padding="15,0,15,15" FontSize="14" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="RightContent"/>
567567
</StackPanel>
568568
</Button>
569569
</StackPanel>
570-
<TextBlock FontSize="11.5" FontFamily="Segoe UI Light" Foreground="#EBEBEB" Padding="0,40,0,0" TextWrapping="Wrap" ><Run Text="The installer UI for the Azure Stack Development Kit is an open sourced script based on WPF and PowerShell. Additions to the toolkit can be submitted as Pull Request to the "/><Run Foreground="#FF4590CE" Text="AzureStack-Tools repository"/><Run Text="."/></TextBlock>
570+
<TextBlock FontSize="11.5" FontFamily="Segoe UI Light" Foreground="#EBEBEB" Padding="0,40,0,0" TextWrapping="Wrap" ><Run Text="The installer UI for the Azure Stack Development Kit is an open sourced script based on WPF and PowerShell. Additions to the toolkit can be submitted as Pull Request to the "/><Run Foreground="#FF74ACDB" Text="AzureStack-Tools repository"/><Run Text="."/></TextBlock>
571571
</StackPanel>
572572
<!--#endregion Mode-->
573573
<!--#region Prepare-->
@@ -634,22 +634,22 @@ $Xaml = @'
634634
635635
636636
<StackPanel Orientation="Horizontal" Margin="0,0,0,10">
637-
<TextBlock FontSize="14" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="Type:" Width="120" HorizontalAlignment="Left"/>
638-
<ComboBox Width="430" x:Name="Control_Creds_Cbx_Idp" Foreground="#EBEBEB" FontFamily="Segoe UI" FontSize="14" >
637+
<TextBlock x:Name="Control_Creds_Tbl_Idp" FontSize="14" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="Type:" Width="120" HorizontalAlignment="Left"/>
638+
<ComboBox Width="430" x:Name="Control_Creds_Cbx_Idp" Foreground="#EBEBEB" FontFamily="Segoe UI" FontSize="14" AutomationProperties.LabeledBy="{Binding ElementName=Control_Creds_Tbl_Idp}" >
639639
</ComboBox>
640640
</StackPanel>
641641
<StackPanel x:Name="Control_Creds_Stp_AAD" Visibility="Visible">
642642
<StackPanel Orientation="Horizontal" Margin="0,0,0,10">
643-
<TextBlock FontSize="14" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="AAD Directory:" Width="120" HorizontalAlignment="Left"/>
644-
<TextBox x:Name="Control_Creds_Tbx_AADTenant" BorderBrush="#ABADB3" Width="430" IsEnabled="False" />
643+
<TextBlock x:Name="Control_Creds_Tbl_AADTenant" FontSize="14" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="AAD Directory:" Width="120" HorizontalAlignment="Left"/>
644+
<TextBox x:Name="Control_Creds_Tbx_AADTenant" BorderBrush="#ABADB3" Width="430" IsEnabled="False" AutomationProperties.LabeledBy="{Binding ElementName=Control_Creds_Tbl_AADTenant}" />
645645
</StackPanel>
646646
</StackPanel>
647647
<StackPanel x:Name="Control_Creds_Stp_LocalPassword" Visibility="Visible">
648-
<TextBlock FontSize="16" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="Local Administrator Password" Margin="0,0,0,10"/>
648+
<TextBlock x:Name="Control_Creds_Tbl_LocalAdminPassword" FontSize="16" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="Local Administrator Password" Margin="0,0,0,10"/>
649649
<StackPanel Orientation="Horizontal" Margin="0,0,0,10">
650650
<TextBlock FontSize="14" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="Password:" Width="120" HorizontalAlignment="Left"/>
651651
<Grid>
652-
<PasswordBox x:Name="Control_Creds_Pwb_LocalPassword" BorderBrush="#ABADB3" Width="430"/>
652+
<PasswordBox x:Name="Control_Creds_Pwb_LocalPassword" BorderBrush="#ABADB3" Width="430" AutomationProperties.LabeledBy="{Binding ElementName=Control_Creds_Tbl_LocalAdminPassword}"/>
653653
<Path x:Name="Control_Creds_Pth_LocalPassword" SnapsToDevicePixels="False" StrokeThickness="3" Data="M2,10 L8,16 L15,5" Stroke="#92D050" Margin="300,0,0,0" Visibility="Hidden"/>
654654
</Grid>
655655
</StackPanel>
@@ -693,7 +693,7 @@ $Xaml = @'
693693
<Ellipse.Stroke>
694694
<LinearGradientBrush EndPoint="0.445,0.997" StartPoint="0.555,0.103">
695695
<GradientStop Color="#343447" Offset="0"/>
696-
<GradientStop Color="#4590CE" Offset="1"/>
696+
<GradientStop Color="#3369B6" Offset="1"/>
697697
</LinearGradientBrush>
698698
</Ellipse.Stroke>
699699
</Ellipse>
@@ -714,37 +714,37 @@ $Xaml = @'
714714
<!--#region NetConfig-->
715715
<StackPanel x:Name="Control_NetConfig_Stp" HorizontalAlignment="Left" Visibility="Collapsed">
716716
<StackPanel Height="320">
717-
<RadioButton x:Name="Control_NetConfig_Rbt_DHCP" GroupName="NetworkConfig" VerticalContentAlignment="Center" Cursor="Hand" Margin="0,0,0,5" IsChecked="True">
717+
<RadioButton x:Name="Control_NetConfig_Rbt_DHCP" GroupName="NetworkConfig" VerticalContentAlignment="Center" Cursor="Hand" Margin="0,0,0,5" IsChecked="True" FocusVisualStyle="{StaticResource ButtonFocusVisual}" >
718718
<TextBlock FontSize="14" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="DHCP" Width="100" HorizontalAlignment="Left" Padding="5,0,0,0"/>
719719
</RadioButton>
720-
<RadioButton x:Name="Control_NetConfig_Rbt_Static" GroupName="NetworkConfig" VerticalContentAlignment="Center" Cursor="Hand" Margin="0,0,0,10" >
720+
<RadioButton x:Name="Control_NetConfig_Rbt_Static" GroupName="NetworkConfig" VerticalContentAlignment="Center" Cursor="Hand" Margin="0,0,0,10" FocusVisualStyle="{StaticResource ButtonFocusVisual}" >
721721
<TextBlock FontSize="14" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="Static" Width="100" HorizontalAlignment="Left" Padding="5,0,0,0"/>
722722
</RadioButton>
723723
<StackPanel Orientation="Horizontal" Margin="0,0,0,10">
724-
<TextBlock FontSize="14" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="Ip Address:" Width="120" HorizontalAlignment="Left"/>
725-
<TextBox x:Name="Control_NetConfig_Tbx_IpAddress" BorderBrush="#ABADB3" Width="430" IsEnabled="False"/>
724+
<TextBlock x:Name="Control_NetConfig_Tbl_IpAddress" FontSize="14" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="Ip Address:" Width="120" HorizontalAlignment="Left"/>
725+
<TextBox x:Name="Control_NetConfig_Tbx_IpAddress" BorderBrush="#ABADB3" Width="430" IsEnabled="False" AutomationProperties.LabeledBy="{Binding ElementName=Control_NetConfig_Tbl_IpAddress}"/>
726726
</StackPanel>
727727
<StackPanel Orientation="Horizontal" Margin="0,0,0,10">
728-
<TextBlock FontSize="14" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="Gateway:" Width="120" HorizontalAlignment="Left"/>
729-
<TextBox x:Name="Control_NetConfig_Tbx_Gateway" BorderBrush="#ABADB3" Width="430" IsEnabled="False"/>
728+
<TextBlock x:Name="Control_NetConfig_Tbl_Gateway" FontSize="14" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="Gateway:" Width="120" HorizontalAlignment="Left"/>
729+
<TextBox x:Name="Control_NetConfig_Tbx_Gateway" BorderBrush="#ABADB3" Width="430" IsEnabled="False" AutomationProperties.LabeledBy="{Binding ElementName=Control_NetConfig_Tbl_Gateway}"/>
730730
</StackPanel>
731731
<StackPanel Orientation="Horizontal" Margin="0,0,0,10" x:Name="Control_NetConfig_Stp_DNS">
732-
<TextBlock FontSize="14" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="DNS:" Width="120" HorizontalAlignment="Left"/>
733-
<TextBox x:Name="Control_NetConfig_Tbx_DNS" BorderBrush="#ABADB3" Width="430" IsEnabled="False"/>
732+
<TextBlock x:Name="Control_NetConfig_Tbl_DNS" FontSize="14" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="DNS:" Width="120" HorizontalAlignment="Left"/>
733+
<TextBox x:Name="Control_NetConfig_Tbx_DNS" BorderBrush="#ABADB3" Width="430" IsEnabled="False" AutomationProperties.LabeledBy="{Binding ElementName=Control_NetConfig_Tbl_DNS}" />
734734
</StackPanel>
735735
<StackPanel Orientation="Horizontal" Margin="0,0,0,10">
736-
<TextBlock FontSize="14" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="Time Server IP:" Width="120" HorizontalAlignment="Left"/>
737-
<TextBox x:Name="Control_NetConfig_Tbx_TimeServer" BorderBrush="#ABADB3" Width="430" />
736+
<TextBlock x:Name="Control_NetConfig_Tbl_TimeServer" FontSize="14" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="Time Server IP:" Width="120" HorizontalAlignment="Left"/>
737+
<TextBox x:Name="Control_NetConfig_Tbx_TimeServer" BorderBrush="#ABADB3" Width="430" AutomationProperties.LabeledBy="{Binding ElementName=Control_NetConfig_Tbl_TimeServer}" />
738738
</StackPanel>
739739
<StackPanel x:Name="Control_NetConfig_Stp_Optional">
740740
<TextBlock FontSize="16" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="Optional Configuration" Margin="0,0,0,10"/>
741741
<StackPanel Orientation="Horizontal" Margin="0,0,0,10">
742-
<TextBlock FontSize="14" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="VLAN ID:" Width="120" HorizontalAlignment="Left"/>
743-
<TextBox x:Name="Control_NetConfig_Tbx_VlanID" BorderBrush="#ABADB3" Width="430" />
742+
<TextBlock x:Name="Control_NetConfig_Tbl_VlanID" FontSize="14" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="VLAN ID:" Width="120" HorizontalAlignment="Left"/>
743+
<TextBox x:Name="Control_NetConfig_Tbx_VlanID" BorderBrush="#ABADB3" Width="430" AutomationProperties.LabeledBy="{Binding ElementName=Control_NetConfig_Tbl_VlanID}" />
744744
</StackPanel>
745745
<StackPanel Orientation="Horizontal" Margin="0,0,0,10">
746-
<TextBlock FontSize="14" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="DNS Forwarder IP:" Width="120" HorizontalAlignment="Left"/>
747-
<TextBox x:Name="Control_NetConfig_Tbx_DnsForwarder" BorderBrush="#ABADB3" Width="430"/>
746+
<TextBlock x:Name="Control_NetConfig_Tbl_DnsForwarder" FontSize="14" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="DNS Forwarder IP:" Width="120" HorizontalAlignment="Left"/>
747+
<TextBox x:Name="Control_NetConfig_Tbx_DnsForwarder" BorderBrush="#ABADB3" Width="430" AutomationProperties.LabeledBy="{Binding ElementName=Control_NetConfig_Tbl_DnsForwarder}"/>
748748
</StackPanel>
749749
</StackPanel>
750750
</StackPanel>
@@ -757,7 +757,7 @@ $Xaml = @'
757757
<!--#region Job-->
758758
<StackPanel x:Name="Control_Job_Stp" HorizontalAlignment="Left" Visibility="Collapsed">
759759
<StackPanel Height="320">
760-
<ProgressBar x:Name="Control_Job_Pgb_Progress" Height="23.5" Width="550" Background="#1B4D72" Minimum="0" Maximum="100" Value="0" Foreground="#4F91CD" BorderThickness="0"/>
760+
<ProgressBar x:Name="Control_Job_Pgb_Progress" Height="23.5" Width="550" Background="#1B4D72" Minimum="0" Maximum="100" Value="0" Foreground="#4F91CD" BorderThickness="0" AutomationProperties.Name="Progress" Focusable="True"/>
761761
<TextBlock x:Name="Control_Job_Tbl_Current" FontSize="12" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="" HorizontalAlignment="Left" Margin="0,10,0,0" />
762762
<TextBlock x:Name="Control_Job_Tbl_Details" FontSize="12" FontFamily="Segoe UI" Foreground="#EBEBEB" Text="" TextWrapping="Wrap" HorizontalAlignment="Left" Margin="0,10,0,0" />
763763
<StackPanel x:Name="Control_Job_Stp_Netbxnda" Visibility="Collapsed">
@@ -784,7 +784,7 @@ $Xaml = @'
784784
<StackPanel x:Name="Control_Summary_Stp" HorizontalAlignment="Left" Visibility="Collapsed">
785785
<StackPanel Height="320">
786786
<TextBlock x:Name="Control_Summary_Tbl_Header1" TextWrapping="Wrap" FontSize="16" FontFamily="Segoe UI" Foreground="#EBEBEB" HorizontalAlignment="Left" Margin="0,0,0,10" />
787-
<TextBox x:Name="Control_Summary_Tbx_Content1" TextWrapping="Wrap" FontSize="14" FontFamily="Segoe UI" Foreground="#A0A0A0" HorizontalAlignment="Left" Margin="0,0,0,10" Padding="5" Width="550" IsReadOnly="True" Visibility="Collapsed" BorderBrush="#ABADB3" />
787+
<TextBox x:Name="Control_Summary_Tbx_Content1" TextWrapping="Wrap" FontSize="14" FontFamily="Segoe UI" Foreground="#A0A0A0" HorizontalAlignment="Left" Margin="0,0,0,10" Padding="5" Width="550" IsReadOnly="True" Visibility="Collapsed" BorderBrush="#ABADB3" AutomationProperties.LabeledBy="{Binding ElementName=Control_Summary_Tbl_Header1}" />
788788
<StackPanel Orientation="Horizontal">
789789
<Path x:Name="Control_Summary_Pth_Content1" SnapsToDevicePixels="False" StrokeThickness="1" Data="M13,10H11V6H13M13,14H11V12H13M20,2H4A2,2 0 0,0 2,4V22L6,18H20A2,2 0 0,0 22,16V4C22,2.89 21.1,2 20,2Z" Fill="Orange" Margin="0,3,10,0" Visibility="Collapsed"/>
790790
<TextBlock x:Name="Control_Summary_Tbl_Content1" TextWrapping="Wrap" FontSize="14" FontFamily="Segoe UI" Foreground="#EBEBEB" HorizontalAlignment="Left" Margin="0,0,0,10" Width="550" />
@@ -921,7 +921,7 @@ $S_NetInterfaces = {
921921

922922

923923
$syncHash.Control_NetInterface_Stp_Wait.Dispatcher.Invoke([action]{$syncHash.Control_NetInterface_Stp_Wait.Visibility="Collapsed"},"Normal")
924-
$NetInterfaces | Sort-Object ConnectionState, IPv4DefaultGateway, InterfaceMetric, Ipv4Address -Descending | ForEach-Object {
924+
$NetInterfaces | Sort-Object ConnectionState, IPv4DefaultGateway, InterfaceMetric, Ipv4Address -Descending | ForEach-Object {
925925
$syncHash.Control_NetInterface_Lvw_Nics.Dispatcher.Invoke([action]{$syncHash.Control_NetInterface_Lvw_Nics.AddChild($_)},"Normal")
926926
}
927927
}
@@ -2051,6 +2051,9 @@ $syncHash.Control_Creds_Btn_Next.Add_Click({
20512051
$Runspace_Jobs.Runspace = $Runspace_Jobs_Properties
20522052
$Runspace_Jobs_Output = $Runspace_Jobs.BeginInvoke()
20532053
}
2054+
Else {
2055+
$syncHash.Control_Creds_Pwb_LocalPassword.Focus()
2056+
}
20542057
})
20552058

20562059
$syncHash.Control_Creds_Cbx_Idp.Add_SelectionChanged({

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
# Azure Stack Development Kit Version
2+
# Azure Stack Development Kit Version
33

44
These tools are meant for use with **Azure Stack Development Kit**.
55

0 commit comments

Comments
 (0)