Skip to content

Commit d48d8fb

Browse files
committed
Improve "Welcome" page with button to continue and fine-tuned text
1 parent c7dc517 commit d48d8fb

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/MainPage.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<Border.RenderTransform>
4242
<TranslateTransform/>
4343
</Border.RenderTransform>
44-
<Button Click="ButtonToHideOrShowMenu_Click" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Background="Transparent" Padding="0">
44+
<Button Click="ButtonToHideOrShowMenu_Click" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Background="Transparent" Style="{StaticResource FlatButtonStyle}" Padding="0">
4545
<Image Source="other/MenuIcon.png" Width="50" Height="50" Stretch="Fill"/>
4646
</Button>
4747
</Border>
@@ -72,7 +72,7 @@
7272
<Grid Grid.Row="3" x:Name="SourceCodePane" Visibility="Collapsed" Background="#FF4A4A4A">
7373
<TextBlock Text="Loading source code..." Foreground="DarkGray" FontSize="14" Margin="20" HorizontalAlignment="Center" VerticalAlignment="Center" TextWrapping="Wrap"/>
7474
<Border x:Name="PlaceWhereSourceCodeWillBeDisplayed" Margin="0,10,0,0"/>
75-
<Button x:Name="ButtonToCloseSourceCode" Content="X" FontSize="18" FontWeight="Bold" Foreground="LightGray" Background="#FF6C6C6C" HorizontalAlignment="Right" HorizontalContentAlignment="Center" VerticalAlignment="Top" VerticalContentAlignment="Center" Padding="8,2,8,2" Margin="5" Click="ButtonToCloseSourceCode_Click" />
75+
<Button x:Name="ButtonToCloseSourceCode" Content="X" FontSize="18" FontWeight="Bold" Foreground="LightGray" Background="#FF6C6C6C" HorizontalAlignment="Right" HorizontalContentAlignment="Center" VerticalAlignment="Top" VerticalContentAlignment="Center" Padding="8,2,8,2" Margin="5" Style="{StaticResource FlatButtonStyle}" Click="ButtonToCloseSourceCode_Click" />
7676
</Grid>
7777
</Grid>
7878
</Page>

OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/MainPage.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void ButtonHome_Click(object sender, RoutedEventArgs e)
4545
NavigateToPage("/Welcome");
4646
}
4747

48-
void NavigateToPage(string targetUri)
48+
public void NavigateToPage(string targetUri)
4949
{
5050
//Hide the menu:
5151
if (_currentState == CurrentState.SmallResolution_ShowMenu)

OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Welcome.xaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</Border.Effect>
1111
<StackPanel Margin="0,0,20,20">
1212
<TextBlock Text="Welcome!" Foreground="#FF2299A1" Style="{StaticResource PageHeader_Style}"/>
13-
<TextBlock x:Name="IntroductionTextBlock" Text="This app demonstrates the current status of the Userware work to compile the 'Telerik UI for Silverlight' source code using OpenSilver, so that it can run on modern browsers, where Silveright is not supported. It also provides sample code to show how to use the Telerik UI controls in an OpenSilver application." FontSize="16" Foreground="#FF333333" TextWrapping="Wrap" Margin="22,10,0,0"/>
13+
<TextBlock x:Name="IntroductionTextBlock" Text="This app demonstrates the current state of the 'Telerik UI for Silverlight' source code recompiled with OpenSilver, so that it can run on modern browsers without plugins, where Silveright is not supported. It also provides sample code to show how to use those Telerik UI controls in an OpenSilver application." FontSize="16" Foreground="#FF333333" TextWrapping="Wrap" Margin="22,10,0,0"/>
1414
<TextBlock Text="To use these controls in your own OpenSilver application, you need:" FontSize="16" Foreground="#FF333333" TextWrapping="Wrap" Margin="22,10,0,0"/>
1515

1616
<TextBlock FontSize="16" Foreground="#FF333333" TextWrapping="Wrap" Margin="22,10,0,0">
@@ -29,15 +29,16 @@
2929
</Span>
3030
</TextBlock>
3131

32-
<TextBlock Text="Legal note: Telerik UI is the property of Progress, not Userware (OpenSilver). Userware is not affiliated with Telerik. Userware will provide the tools that allow you to compile the source code of Telerik UI using OpenSilver. " FontSize="16" Foreground="#FF333333" TextWrapping="Wrap" Margin="22,10,0,0"/>
33-
<TextBlock FontSize="16" Foreground="#FF333333" TextWrapping="Wrap" Margin="22,10,0,0">
34-
<Span xml:space="preserve"><Run>Userware does not provide the source code itself. The source code of Telerik UI is provided to you by Progress as part of your license for Telerik UI for Silverlight. For support and further information, please contact Userware at: </Run>
35-
<Hyperlink FontSize="16" Foreground="Blue" NavigateUri="https://www.opensilver.net/contact.aspx" Cursor="Hand">
32+
<TextBlock FontSize="12" FontStyle="Italic" Foreground="#FF888888" TextWrapping="Wrap" Margin="22,14,0,0">
33+
<Span xml:space="preserve"><Run>Legal notice: Telerik UI is the property of Progress, not Userware. Userware is not affiliated with Telerik. Userware will provide the tools that allow you to compile the source code of Telerik UI using OpenSilver. Userware does not provide the source code itself. The source code of Telerik UI is provided to you by Progress as part of your license for Telerik UI for Silverlight. For support and further information, please contact Userware at: </Run>
34+
<Hyperlink FontSize="12" Foreground="Blue" NavigateUri="https://www.opensilver.net/contact.aspx" Cursor="Hand">
3635
https://www.opensilver.net/contact.aspx
3736
</Hyperlink>
3837
</Span>
3938
</TextBlock>
4039

40+
<Button Content="Continue to the demos" FontSize="16" FontWeight="Bold" Background="#FF2299A1" Padding="10,6" Foreground="White" Style="{StaticResource FlatButtonStyle}" HorizontalAlignment="Left" Margin="25,30,0,0" Click="ButtonToContinue_Click"/>
41+
4142
</StackPanel>
4243
</Border>
4344
</UserControl>

OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Samples/Welcome.xaml.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,10 @@ public Welcome()
1818
{
1919
this.InitializeComponent();
2020
}
21+
22+
private void ButtonToContinue_Click(object sender, RoutedEventArgs e)
23+
{
24+
MainPage.Current.NavigateToPage("/Controls");
25+
}
2126
}
2227
}

0 commit comments

Comments
 (0)