Skip to content

Commit

Permalink
Merge branch 'main' into task/no-undervotes
Browse files Browse the repository at this point in the history
  • Loading branch information
@SteveMaier-IRT
SteveMaier-IRT committed Aug 8, 2023
2 parents 610be27 + 0f169dc commit f4b00bc
Show file tree
Hide file tree
Showing 6 changed files with 227 additions and 230 deletions.
7 changes: 6 additions & 1 deletion src/electionguard-ui/ElectionGuard.UI/Resources/Styles/EgStyles.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,12 @@
</Grid>
</VerticalStackLayout>
</Grid>
<ContentPresenter Grid.Row="1" />
<ScrollView Grid.Row="1">
<VerticalStackLayout>
<ContentPresenter />
<Grid HeightRequest="100" />
</VerticalStackLayout>
</ScrollView>
<Grid
Grid.Row="2"
Padding="10"
Expand Down
108 changes: 53 additions & 55 deletions src/electionguard-ui/ElectionGuard.UI/Views/AdminHomePage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,61 +31,59 @@
Command="{Binding CreateMultipleTalliesCommand}"
Style="{StaticResource FullWidth}"
Text="{helper:Translate CreateMultipleTalliesText}" />
<ScrollView Grid.Row="4">
<VerticalStackLayout Style="{StaticResource NarrowCenteredPage}">
<Label Style="{StaticResource H2}" Text="{helper:Translate KeyCeremoniesText}" />
<CollectionView
ItemsSource="{Binding KeyCeremonies}"
SelectedItem="{Binding CurrentKeyCeremony}"
SelectionChangedCommand="{Binding GoToKeyCeremonyCommand}"
SelectionMode="Single">
<CollectionView.EmptyView>
<controls:NoContentView Text="{helper:Translate NoKeyCeremonies}" />
</CollectionView.EmptyView>
<CollectionView.ItemTemplate>
<DataTemplate x:DataType="model:Election">
<Frame Style="{StaticResource ButtonishFrame}">
<Label Style="{StaticResource ButtonishLabel}" Text="{Binding Name}" />
</Frame>
</DataTemplate>
</CollectionView.ItemTemplate>
</CollectionView>
<VerticalStackLayout Grid.Row="4" Style="{StaticResource NarrowCenteredPage}">
<Label Style="{StaticResource H2}" Text="{helper:Translate KeyCeremoniesText}" />
<CollectionView
ItemsSource="{Binding KeyCeremonies}"
SelectedItem="{Binding CurrentKeyCeremony}"
SelectionChangedCommand="{Binding GoToKeyCeremonyCommand}"
SelectionMode="Single">
<CollectionView.EmptyView>
<controls:NoContentView Text="{helper:Translate NoKeyCeremonies}" />
</CollectionView.EmptyView>
<CollectionView.ItemTemplate>
<DataTemplate x:DataType="model:Election">
<Frame Style="{StaticResource ButtonishFrame}">
<Label Style="{StaticResource ButtonishLabel}" Text="{Binding Name}" />
</Frame>
</DataTemplate>
</CollectionView.ItemTemplate>
</CollectionView>

<Label
Grid.Row="0"
Style="{StaticResource H2}"
Text="{helper:Translate TalliesText}" />
<CollectionView
ItemsSource="{Binding MultiTallies}"
SelectedItem="{Binding CurrentMultiTally}"
SelectionMode="Single">
<CollectionView.ItemTemplate>
<DataTemplate x:DataType="model:MultiTallyRecord">
<Frame Style="{StaticResource MultiTallyFrame}">
<Label Style="{StaticResource ButtonishLabel}" Text="{Binding Name, StringFormat='[{0}]'}" />
</Frame>
</DataTemplate>
</CollectionView.ItemTemplate>
</CollectionView>

<Label Style="{StaticResource H2}" Text="{helper:Translate ElectionsText}" />
<CollectionView
ItemsSource="{Binding Elections}"
SelectedItem="{Binding CurrentElection}"
SelectionChangedCommand="{Binding SelectionChangedCommand}"
SelectionMode="Single">
<CollectionView.EmptyView>
<controls:NoContentView Text="{helper:Translate NoElections}" />
</CollectionView.EmptyView>
<CollectionView.ItemTemplate>
<DataTemplate x:DataType="model:Election">
<Frame Style="{StaticResource ButtonishFrame}">
<Label Style="{StaticResource ButtonishLabel}" Text="{Binding Name}" />
</Frame>
</DataTemplate>
</CollectionView.ItemTemplate>
</CollectionView>
</VerticalStackLayout>
</ScrollView>
<Label
Grid.Row="0"
Style="{StaticResource H2}"
Text="{helper:Translate TalliesText}" />
<CollectionView
ItemsSource="{Binding MultiTallies}"
SelectedItem="{Binding CurrentMultiTally}"
SelectionMode="Single">
<CollectionView.ItemTemplate>
<DataTemplate x:DataType="model:MultiTallyRecord">
<Frame Style="{StaticResource MultiTallyFrame}">
<Label Style="{StaticResource ButtonishLabel}" Text="{Binding Name, StringFormat='[{0}]'}" />
</Frame>
</DataTemplate>
</CollectionView.ItemTemplate>
</CollectionView>

<Label Style="{StaticResource H2}" Text="{helper:Translate ElectionsText}" />
<CollectionView
ItemsSource="{Binding Elections}"
SelectedItem="{Binding CurrentElection}"
SelectionChangedCommand="{Binding SelectionChangedCommand}"
SelectionMode="Single">
<CollectionView.EmptyView>
<controls:NoContentView Text="{helper:Translate NoElections}" />
</CollectionView.EmptyView>
<CollectionView.ItemTemplate>
<DataTemplate x:DataType="model:Election">
<Frame Style="{StaticResource ButtonishFrame}">
<Label Style="{StaticResource ButtonishLabel}" Text="{Binding Name}" />
</Frame>
</DataTemplate>
</CollectionView.ItemTemplate>
</CollectionView>
</VerticalStackLayout>
</Grid>
</views:ContentPageBase>
4 changes: 1 addition & 3 deletions src/electionguard-ui/ElectionGuard.UI/Views/ElectionPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,7 @@
Text="{helper:Translate AddBallots}" />
</HorizontalStackLayout>
</Grid>
<ScrollView>
<controls:UploadsControl BindingContext="{Binding .}" />
</ScrollView>
<controls:UploadsControl BindingContext="{Binding .}" />
</VerticalStackLayout>

<VerticalStackLayout
Expand Down
89 changes: 43 additions & 46 deletions src/electionguard-ui/ElectionGuard.UI/Views/GuardianHomePage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,62 +22,59 @@
Grid.Row="0"
Style="{StaticResource H1}"
Text="{helper:Translate ElectionsText}" />
<ScrollView Grid.Row="1">
<CollectionView
Grid.Row="1"
ItemsSource="{Binding KeyCeremonies}"
SelectedItem="{Binding CurrentKeyCeremony}"
SelectionMode="Single">
<CollectionView.EmptyView>
<controls:NoContentView Text="{helper:Translate NoKeyCeremonies}" />
</CollectionView.EmptyView>
<CollectionView.ItemTemplate>
<DataTemplate x:DataType="model:KeyCeremonyRecord">
<Frame Style="{StaticResource ButtonishFrame}">
<Label Style="{StaticResource ButtonishLabel}" Text="{Binding Name}" />
</Frame>
</DataTemplate>
</CollectionView.ItemTemplate>
</CollectionView>
</Grid>
<Grid Grid.Column="1" RowDefinitions="auto, *">
<Label
Grid.Row="0"
Style="{StaticResource H1}"
Text="{helper:Translate TalliesText}" />
<Grid Grid.Row="1" RowDefinitions="auto, *">
<CollectionView
ItemsSource="{Binding KeyCeremonies}"
SelectedItem="{Binding CurrentKeyCeremony}"
Grid.Row="0"
ItemsSource="{Binding MultiTallies}"
SelectedItem="{Binding CurrentMultiTally}"
SelectionMode="Single">
<CollectionView.ItemTemplate>
<DataTemplate x:DataType="model:MultiTallyRecord">
<Frame Style="{StaticResource MultiTallyFrame}">
<Label Style="{StaticResource ButtonishLabel}" Text="{Binding Name, StringFormat='[{0}]'}" />
</Frame>
</DataTemplate>
</CollectionView.ItemTemplate>
</CollectionView>
<CollectionView
Grid.Row="1"
ItemsSource="{Binding Tallies}"
SelectedItem="{Binding CurrentTally}"
SelectionMode="Single">
<CollectionView.EmptyView>
<controls:NoContentView Text="{helper:Translate NoKeyCeremonies}" />
<controls:NoContentView Text="{helper:Translate NoTallies}" />
</CollectionView.EmptyView>
<CollectionView.ItemTemplate>
<DataTemplate x:DataType="model:KeyCeremonyRecord">
<Frame Style="{StaticResource ButtonishFrame}">
<DataTemplate x:DataType="model:TallyRecord">
<Frame BackgroundColor="{Binding MultiTally, Converter={StaticResource MultiBackgroundColorConverter}}" Style="{StaticResource ButtonishFrame}">
<Label Style="{StaticResource ButtonishLabel}" Text="{Binding Name}" />
</Frame>
</DataTemplate>
</CollectionView.ItemTemplate>
</CollectionView>
</ScrollView>
</Grid>
<Grid Grid.Column="1" RowDefinitions="auto, *">
<Label
Grid.Row="0"
Style="{StaticResource H1}"
Text="{helper:Translate TalliesText}" />
<ScrollView Grid.Row="1">
<Grid RowDefinitions="auto, *">
<CollectionView
Grid.Row="0"
ItemsSource="{Binding MultiTallies}"
SelectedItem="{Binding CurrentMultiTally}"
SelectionMode="Single">
<CollectionView.ItemTemplate>
<DataTemplate x:DataType="model:MultiTallyRecord">
<Frame Style="{StaticResource MultiTallyFrame}">
<Label Style="{StaticResource ButtonishLabel}" Text="{Binding Name, StringFormat='[{0}]'}" />
</Frame>
</DataTemplate>
</CollectionView.ItemTemplate>
</CollectionView>
<CollectionView
Grid.Row="1"
ItemsSource="{Binding Tallies}"
SelectedItem="{Binding CurrentTally}"
SelectionMode="Single">
<CollectionView.EmptyView>
<controls:NoContentView Text="{helper:Translate NoTallies}" />
</CollectionView.EmptyView>
<CollectionView.ItemTemplate>
<DataTemplate x:DataType="model:TallyRecord">
<Frame Style="{StaticResource ButtonishFrame}" BackgroundColor="{Binding MultiTally, Converter={StaticResource MultiBackgroundColorConverter}}">
<Label Style="{StaticResource ButtonishLabel}" Text="{Binding Name}" />
</Frame>
</DataTemplate>
</CollectionView.ItemTemplate>
</CollectionView>
</Grid>
</ScrollView>
</Grid>
</Grid>
</Grid>
</VerticalStackLayout>
Expand Down
95 changes: 48 additions & 47 deletions src/electionguard-ui/ElectionGuard.UI/Views/ViewKeyCeremonyPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,52 +51,53 @@
<Label Style="{StaticResource H2}" Text="{helper:Translate GuardiansText}" />
</VerticalStackLayout>

<ScrollView Grid.Row="1">
<CollectionView ItemsSource="{Binding GuardianList}" SelectionMode="None">
<CollectionView.EmptyView>
<controls:NoContentView Text="{helper:Translate NoGuardians}" />
</CollectionView.EmptyView>
<CollectionView.ItemTemplate>
<DataTemplate x:DataType="models:GuardianItem">
<Grid
Margin="15,5,0,5"
Padding="10"
BackgroundColor="{Binding IsSelf, Converter={StaticResource GuardianBackgroundConverter}}"
ColumnDefinitions="*, 50, 50, 50">
<Label
Grid.Column="0"
FontSize="Medium"
Text="{Binding Name}"
VerticalOptions="Center" />
<Image
Grid.Column="1"
Margin="10,0,10,0"
Source="key.png"
ToolTipProperties.Text="{helper:Translate JoinedText}"
WidthRequest="32" />
<Image
Grid.Column="2"
Margin="10,0,10,0"
Source="{Binding HasBackup, Converter={StaticResource BackupConverter}}"
ToolTipProperties.Text="{helper:Translate BackupText}"
WidthRequest="32" />
<Image
Grid.Column="3"
Margin="10,0,10,0"
Source="notverify.png"
ToolTipProperties.Text="{helper:Translate Verified}"
WidthRequest="32" />
<Image
Grid.Column="3"
Margin="10,0,10,0"
IsVisible="{Binding HasVerified}"
Source="{Binding BadVerified, Converter={StaticResource BadVerifyConverter}}"
ToolTipProperties.Text="{Binding BadVerified, Converter={StaticResource BadVerifyTooltipConverter}}"
WidthRequest="32" />
</Grid>
</DataTemplate>
</CollectionView.ItemTemplate>
</CollectionView>
</ScrollView>
<CollectionView
Grid.Row="1"
ItemsSource="{Binding GuardianList}"
SelectionMode="None">
<CollectionView.EmptyView>
<controls:NoContentView Text="{helper:Translate NoGuardians}" />
</CollectionView.EmptyView>
<CollectionView.ItemTemplate>
<DataTemplate x:DataType="models:GuardianItem">
<Grid
Margin="15,5,0,5"
Padding="10"
BackgroundColor="{Binding IsSelf, Converter={StaticResource GuardianBackgroundConverter}}"
ColumnDefinitions="*, 50, 50, 50">
<Label
Grid.Column="0"
FontSize="Medium"
Text="{Binding Name}"
VerticalOptions="Center" />
<Image
Grid.Column="1"
Margin="10,0,10,0"
Source="key.png"
ToolTipProperties.Text="{helper:Translate JoinedText}"
WidthRequest="32" />
<Image
Grid.Column="2"
Margin="10,0,10,0"
Source="{Binding HasBackup, Converter={StaticResource BackupConverter}}"
ToolTipProperties.Text="{helper:Translate BackupText}"
WidthRequest="32" />
<Image
Grid.Column="3"
Margin="10,0,10,0"
Source="notverify.png"
ToolTipProperties.Text="{helper:Translate Verified}"
WidthRequest="32" />
<Image
Grid.Column="3"
Margin="10,0,10,0"
IsVisible="{Binding HasVerified}"
Source="{Binding BadVerified, Converter={StaticResource BadVerifyConverter}}"
ToolTipProperties.Text="{Binding BadVerified, Converter={StaticResource BadVerifyTooltipConverter}}"
WidthRequest="32" />
</Grid>
</DataTemplate>
</CollectionView.ItemTemplate>
</CollectionView>
</Grid>
</views:ContentPageBase>
Loading

0 comments on commit f4b00bc

Please sign in to comment.