This is an automated email from the ASF dual-hosted git repository. gstein pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/steve.git
commit 1959e31f64165170a72d5f2c433d735b179fa423 Author: Greg Stein <[email protected]> AuthorDate: Mon Oct 6 11:03:20 2025 -0500 Revise admin page; tweak template data setup. * pages.py: adjust postprocess_election() to add missin field values * admin.ezt: fix card width. tweak URL target to manage an election. adjust card footer and tweak card content. * voter.ezt: fix card width. adjust card footer and card content. --- v3/server/pages.py | 13 ++++++++----- v3/server/templates/admin.ezt | 16 ++++++++-------- v3/server/templates/voter.ezt | 20 ++++++++++---------- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/v3/server/pages.py b/v3/server/pages.py index eecf61a..c36483d 100644 --- a/v3/server/pages.py +++ b/v3/server/pages.py @@ -131,11 +131,6 @@ async def admin_page(): election = steve.election.Election.open_to_pid(DB_FNAME, result.uid) owned = steve.election.Election.owned_elections(DB_FNAME, result.uid) - ### for now. future: adjust query - for e in owned: - e.issue_count = 5 - e.owner_pid = result.uid - result.owned = [ postprocess_election(e) for e in owned ] result.len_election = len(election) @@ -223,6 +218,14 @@ def postprocess_election(e): e.fmt_close_at = format_datetime(dt_close) e.fmt_close_at_full = dt_close and dt_close.strftime(FMT_DATE_FULL) + ### temporary. need to adjust input query. + if 'owner_pid' not in e: + e.owner_pid = 'gstein' ### fix query. for now, could be result.uid + if 'issue_count' not in e: + e.issue_count = 5 ### arbitrary. just provide a value + if 'owner_name' not in e: + e.owner_name = 'Jane Doe' + return e diff --git a/v3/server/templates/admin.ezt b/v3/server/templates/admin.ezt index a4dada5..cfd4dca 100644 --- a/v3/server/templates/admin.ezt +++ b/v3/server/templates/admin.ezt @@ -4,8 +4,8 @@ [for owned] - <div class="col-md-5 mb-4"> - <a href="/vote-on/[owned.eid]" class="text-decoration-none"> + <div class="w-auto mb-4"> + <a href="/manage/[owned.eid]" class="text-decoration-none"> <div class="card h-100"> <div class="card-body"> <h5 class="card-title">[owned.title][# @@ -16,14 +16,8 @@ <br/> eid: [owned.eid] <br/> - created by: [owned.owner_pid] - <br/> - authz: [owned.authz] - <br/> closed: [owned.closed] </p> - </div> - <div class="card-footer text-muted"> [if-any owned.closed] Closed <span title="[owned.fmt_close_at_full]" @@ -52,6 +46,12 @@ [end] [end] </div> + <div class="card-footer text-muted small"> + Created by [owned.owner_name] ([owned.owner_pid]) + [if-any owned.authz] + (authz: [owned.authz]) + [end] + </div> </div> </a> </div> diff --git a/v3/server/templates/voter.ezt b/v3/server/templates/voter.ezt index a19db62..b6e57a5 100644 --- a/v3/server/templates/voter.ezt +++ b/v3/server/templates/voter.ezt @@ -3,7 +3,7 @@ <h1>[title]</h1> [for election] - <div class="col-md-5 mb-4"> + <div class="w-auto mb-4"> <a href="/vote-on/[election.eid]" class="text-decoration-none"> <div class="card h-100"> <div class="card-body"> @@ -14,15 +14,7 @@ You have [election.issue_count] issues to vote upon. <br/> eid: [election.eid] - <br/> - created by: [election.owner_pid] - <br/> - authz: [election.authz] - <br/> - closed: [election.closed] - </p> - </div> - <div class="card-footer text-muted"> + [if-any election.closed] Closed <span title="[election.fmt_close_at_full]" @@ -50,6 +42,14 @@ </div> [end] [end] + + </p> + </div> + <div class="card-footer text-muted small"> + Created by [election.owner_name] ([election.owner_pid]) + [if-any election.authz] + (authz: [election.authz]) + [end] </div> </div> </a>
