Subversion Repository Public Repository

Nextrek

Diff Revisions 798 vs 799 for /Android/SmartCharging/SmartCharging_WP/SmartCharging/LoginPage.xaml

Diff revisions: vs.
  @@ -6,6 +6,7 @@
6 6 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
7 7 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
8 8 mc:Ignorable="d"
9 + xmlns:facebookControls="using:Facebook.Client.Controls"
9 10 Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
10 11
11 12
  @@ -48,20 +49,23 @@
48 49 <Button x:Name="LoginButton" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" BorderBrush="#FF564966" Content="Login" x:Uid="LoginButton" Foreground="#FF564966" Margin="0" Height="64" Style="{StaticResource ButtonStyleFlat}" Tapped="LoginButton_Tapped" />
49 50 <!--<toolkit:WatermarkTextBox Watermark="Username" />
50 51 <toolkit:WatermarkPasswordBox Watermark="Password" x:Name="PasswordInput" Grid.Row="1" Grid.ColumnSpan="2" Grid.Column="1" VerticalAlignment="Center" Background="#d1d1d1" Margin="0,3" FontSize="16" UseLayoutRounding="True" BorderThickness="0" BorderBrush="#FFFAFAFA" Padding="0,0,0,0" VerticalContentAlignment="Top" Height="100" />-->
51 - <Button x:Name="FacebookLoginButton" Grid.Row="3" Grid.Column="1" Style="{StaticResource ButtonStyleFlat}" Content="Google login" FontSize="14" HorizontalContentAlignment="Right" Padding="0,0,10,0" BorderThickness="0" Margin="0,3,3,3">
52 - <Button.Background>
53 - <ImageBrush Stretch="Fill" ImageSource="Assets/g_login_bg.jpg"/>
54 - </Button.Background>
55 - </Button>
56 - <Button x:Name="TwitterLoginButton" Grid.Row="3" Grid.Column="2" Style="{StaticResource ButtonStyleFlat}" Content="Facebook login" FontSize="14" HorizontalContentAlignment="Right" Padding="0,0,10,0" BorderThickness="0" Margin="3,3,0,3">
52 +
53 + <!--<Button x:Name="FacebookLoginButton" Grid.Row="3" Grid.Column="2" Style="{StaticResource ButtonStyleFlat}" Content="Facebook login" FontSize="14" HorizontalContentAlignment="Right" Padding="0,0,10,0" BorderThickness="0" Margin="3,3,0,3" Tapped="FacebookLoginButton_Tapped">
57 54 <Button.Background>
58 55 <ImageBrush Stretch="Fill" ImageSource="Assets/fb_login_bg.jpg"/>
59 56 </Button.Background>
60 - </Button>
61 - <StackPanel Orientation="Horizontal" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" VerticalAlignment="Stretch" HorizontalAlignment="Center" Margin="0,10,0,0">
57 + </Button>-->
58 +
59 + <facebookControls:LoginButton
60 + MinWidth="150"
61 + Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Margin="3,3,0,3"
62 + x:Name="loginButton"
63 + HorizontalAlignment="Stretch" SessionStateChanged="loginButton_SessionStateChanged" />
64 +
65 + <StackPanel Orientation="Horizontal" Grid.Row="4" Grid.RowSpan="2" Grid.Column="1" Grid.ColumnSpan="2" VerticalAlignment="Stretch" HorizontalAlignment="Center" Margin="0,0,0,0">
62 66
63 67 <TextBlock Text="" x:Uid="NoAccountTextBlock" Foreground="#666666" FontWeight="SemiBold" FontSize="13" VerticalAlignment="Center" Padding="0,0,5,0" ></TextBlock>
64 - <TextBlock x:Name="RegisterLink" Foreground="#666666" FontWeight="Bold" FontSize="15" Tapped="RegisterLink_Tapped" VerticalAlignment="Center" Margin="3,0,0,0">
68 + <TextBlock x:Name="RegisterLink" Foreground="#666666" FontWeight="Bold" FontSize="19" Tapped="RegisterLink_Tapped" VerticalAlignment="Center" Margin="3,0,0,0">
65 69 <Underline> Registrati</Underline>
66 70 </TextBlock>
67 71