Merge lp:~mandel/ubuntuone-windows-installer/make_login_atractive into lp:ubuntuone-windows-installer/beta

[Manuel de la Peña]

Added decorations to the login screen.

[John Lenton (chipaca)]

review: Approve

=== modified file 'src/Canonical.Ubuntu.SSO.Views/Canonical.Ubuntu.SSO.Views.csproj'
--- src/Canonical.Ubuntu.SSO.Views/Canonical.Ubuntu.SSO.Views.csproj	2010-10-21 11:06:01 +0000
+++ src/Canonical.Ubuntu.SSO.Views/Canonical.Ubuntu.SSO.Views.csproj	2010-11-15 02:08:49 +0000
@@ -151,6 +151,9 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\cloud.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
 
=== modified file 'src/Canonical.Ubuntu.SSO.Views/LoginDialog.xaml'
--- src/Canonical.Ubuntu.SSO.Views/LoginDialog.xaml	2010-10-05 15:20:36 +0000
+++ src/Canonical.Ubuntu.SSO.Views/LoginDialog.xaml	2010-11-15 02:08:49 +0000
@@ -3,11 +3,14 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
     xmlns:controls="clr-namespace:Canonical.Ubuntu.SSO.Views" 
     xmlns:resx="clr-namespace:Canonical.Ubuntu.SSO.Views.Resources"
-    Title="Login" Height="350" Width="550">
-    <Grid Margin="10">
+    Title="Login" Height="350" Width="550" Background="#f2f5fa" ResizeMode="NoResize">
+    <Grid Margin="0" >
+        <Grid.Background>
+            <ImageBrush ImageSource="/Canonical.Ubuntu.SSO.Views;component/Resources/cloud.png" Opacity="1" Stretch="None" AlignmentX="Left" AlignmentY="Top"/>
+        </Grid.Background>
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
-            <RowDefinition Height="28" />
+            <RowDefinition Height="50" />
         </Grid.RowDefinitions>
         <Grid Grid.Row="0">
             <Grid.RowDefinitions>
@@ -58,14 +61,14 @@
                 <TextBlock Name="ForgottenLink" Grid.Column="1" Margin="3" TextAlignment="Center"><Hyperlink >I've forgotten my password.</Hyperlink></TextBlock>
             </Grid>
         </Grid>
-        <Grid Grid.Row="1">
+        <Grid Grid.Row="1" Background="White">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="85"/>
                 <ColumnDefinition Width="85"/>
             </Grid.ColumnDefinitions>
-            <Button Name="LoginButton" Grid.Column="1" Margin="3" Click="ConnectButtonClick">Connect</Button>
-            <Button Name="CancelButton" Grid.Column="2" Margin="3" Click="CancelButtonClick">Cancel</Button>
+            <Button Name="LoginButton" Grid.Column="1" Margin="3" Height="28" Click="ConnectButtonClick">Connect</Button>
+            <Button Name="CancelButton" Grid.Column="2" Margin="3" Height="28" Click="CancelButtonClick">Cancel</Button>
         </Grid>
     </Grid>
 </Window>
 
=== added file 'src/Canonical.Ubuntu.SSO.Views/Resources/cloud.png'
 Binary files src/Canonical.Ubuntu.SSO.Views/Resources/cloud.png	1970-01-01 00:00:00 +0000 and src/Canonical.Ubuntu.SSO.Views/Resources/cloud.png	2010-11-15 02:08:49 +0000 differ