From bf74fcc44f1c0b90d69ce046413546845d9c2735 Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Fri, 29 Sep 2017 15:52:34 +0100 Subject: [PATCH] Redo all admin pages for bootstrap 4 beta --- templates/admin/feedback/index.html.ep | 2 +- templates/admin/feedback/read.html.ep | 8 +- templates/admin/home.html.ep | 24 +-- .../admin/organisations/valid_read.html.ep | 42 ++--- .../admin/reports/transaction_data.html.ep | 72 +++++--- templates/admin/tokens/index.html.ep | 10 +- templates/admin/transactions/index.html.ep | 12 +- templates/admin/transactions/read.html.ep | 12 +- templates/admin/users/read.html.ep | 158 +++++++++--------- templates/layouts/admin.html.ep | 47 ++++-- 10 files changed, 210 insertions(+), 177 deletions(-) diff --git a/templates/admin/feedback/index.html.ep b/templates/admin/feedback/index.html.ep index 9c1e6c7..049449c 100644 --- a/templates/admin/feedback/index.html.ep +++ b/templates/admin/feedback/index.html.ep @@ -18,7 +18,7 @@
%= $feedback->user->email;
-
+
%= format_human_datetime $feedback->submitted_at;
diff --git a/templates/admin/feedback/read.html.ep b/templates/admin/feedback/read.html.ep index 36ec73b..840a35b 100644 --- a/templates/admin/feedback/read.html.ep +++ b/templates/admin/feedback/read.html.ep @@ -24,7 +24,7 @@
  • Submitted At: - <%= format_human_datetime$feedback->submitted_at %> + <%= format_human_datetime $feedback->submitted_at %>
  • @@ -34,8 +34,10 @@

    Feedback Message

    -
    -
    <%= $feedback->feedbacktext %>
    +
    +
    +
    <%= $feedback->feedbacktext %>
    +
    diff --git a/templates/admin/home.html.ep b/templates/admin/home.html.ep index ebc749b..3f1aa45 100644 --- a/templates/admin/home.html.ep +++ b/templates/admin/home.html.ep @@ -3,41 +3,41 @@ % content_for javascript => begin % end
    -
    -
    +
    +
    User Count
    -
    +

    %= $user_count

    -
    -
    +
    +
    Unused Tokens
    -
    +

    <%= $tokens->{unused} %> / <%= $tokens->{total} %>

    -
    -
    +
    +
    Pending Organisations
    -
    +

    %= $pending_orgs

    -
    -
    +
    +
    Pending Transactions
    -
    +

    %= $pending_trans

    diff --git a/templates/admin/organisations/valid_read.html.ep b/templates/admin/organisations/valid_read.html.ep index 8a0f0e2..ce24858 100644 --- a/templates/admin/organisations/valid_read.html.ep +++ b/templates/admin/organisations/valid_read.html.ep @@ -36,7 +36,7 @@ function initMap() {

    %= $valid_org->name

    -
    +
    @@ -93,11 +93,7 @@ function initMap() {
    -
    - - -
    -
    +
    @@ -106,28 +102,22 @@ function initMap() {

    Transactions

    - +
    + %= bootstrap_pagination( $c->param('page') || 1, $transactions->pager->last_page, { class => 'justify-content-center' } ); +
    +
    diff --git a/templates/admin/reports/transaction_data.html.ep b/templates/admin/reports/transaction_data.html.ep index a3457b9..04fee8d 100644 --- a/templates/admin/reports/transaction_data.html.ep +++ b/templates/admin/reports/transaction_data.html.ep @@ -1,27 +1,27 @@ % layout 'admin'; -% title 'Tokens'; +% title 'Transaction Report'; % content_for javascript => begin - - %= stylesheet '/static/admin/css/main.css'; -