From c59662758caaf9f60a3899bedf06fc6c0975a4a1 Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Wed, 15 Oct 2014 15:46:21 +1100 Subject: [PATCH] Add alerts for unconfirmed enterprises to overview page --- app/assets/stylesheets/admin/alert.css.sass | 10 +++++++++ .../admin/overview/_unconfirmed.html.haml | 4 ++++ .../spree/admin/overview/index.html.haml | 21 ++++++++++--------- 3 files changed, 25 insertions(+), 10 deletions(-) create mode 100644 app/assets/stylesheets/admin/alert.css.sass create mode 100644 app/views/spree/admin/overview/_unconfirmed.html.haml diff --git a/app/assets/stylesheets/admin/alert.css.sass b/app/assets/stylesheets/admin/alert.css.sass new file mode 100644 index 0000000000..5404e1a0e2 --- /dev/null +++ b/app/assets/stylesheets/admin/alert.css.sass @@ -0,0 +1,10 @@ +.alert + border: 3px solid #DA5354 + border-radius: 6px + margin-bottom: 20px + color: #DA5354 + padding: 5px 10px + h6 + color: #DA5354 + .message + font-weight: bold diff --git a/app/views/spree/admin/overview/_unconfirmed.html.haml b/app/views/spree/admin/overview/_unconfirmed.html.haml new file mode 100644 index 0000000000..05c4df2a0d --- /dev/null +++ b/app/views/spree/admin/overview/_unconfirmed.html.haml @@ -0,0 +1,4 @@ +- @enterprises.unconfirmed.each do |enterprise| + .alert + %h6= "Action Required: Please confirm the email address for #{enterprise.name}." + %span.message= "We've sent a confirmation email to #{enterprise.email}, so please check there for further instructions. Thanks!" \ No newline at end of file diff --git a/app/views/spree/admin/overview/index.html.haml b/app/views/spree/admin/overview/index.html.haml index a46a31b404..0709ceb54f 100644 --- a/app/views/spree/admin/overview/index.html.haml +++ b/app/views/spree/admin/overview/index.html.haml @@ -1,17 +1,18 @@ %h1{ :style => 'margin-bottom: 30px'} Dashboard -- if @enterprises.empty? +- if @enterprises.unconfirmed.any? - = render partial: "spree/admin/overview/enterprises" + = render partial: "spree/admin/overview/unconfirmed" -- else - - if can? :admin, Spree::Product - = render partial: "spree/admin/overview/products" + %hr - %div.two.columns -   +- if can? :admin, Spree::Product + = render partial: "spree/admin/overview/products" - - if can? :admin, OrderCycle - = render partial: "spree/admin/overview/order_cycles" + %div.two.columns +   - = render partial: "spree/admin/overview/enterprises" +- if can? :admin, OrderCycle + = render partial: "spree/admin/overview/order_cycles" + += render partial: "spree/admin/overview/enterprises"