diff --git a/app/assets/images/animals/cat.svg b/app/assets/images/animals/cat.svg
deleted file mode 100644
index 1ea0ad3..0000000
--- a/app/assets/images/animals/cat.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app/assets/images/animals/cat2.svg b/app/assets/images/animals/cat2.svg
deleted file mode 100644
index 739e1e1..0000000
--- a/app/assets/images/animals/cat2.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app/assets/images/animals/cat3.svg b/app/assets/images/animals/cat3.svg
deleted file mode 100644
index 1c3f5c9..0000000
--- a/app/assets/images/animals/cat3.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app/assets/images/animals/cat4.svg b/app/assets/images/animals/cat4.svg
deleted file mode 100644
index da1305c..0000000
--- a/app/assets/images/animals/cat4.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app/assets/images/animals/cock.svg b/app/assets/images/animals/cock.svg
deleted file mode 100644
index a53e63c..0000000
--- a/app/assets/images/animals/cock.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app/assets/images/animals/deer.svg b/app/assets/images/animals/deer.svg
deleted file mode 100644
index 7d19c29..0000000
--- a/app/assets/images/animals/deer.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app/assets/images/animals/dog.svg b/app/assets/images/animals/dog.svg
deleted file mode 100644
index 79d71bb..0000000
--- a/app/assets/images/animals/dog.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app/assets/images/animals/fox-white.svg b/app/assets/images/animals/fox-white.svg
deleted file mode 100644
index e1d2af4..0000000
--- a/app/assets/images/animals/fox-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app/assets/images/animals/fox.svg b/app/assets/images/animals/fox.svg
deleted file mode 100644
index a87a1a6..0000000
--- a/app/assets/images/animals/fox.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app/assets/images/animals/goat.svg b/app/assets/images/animals/goat.svg
deleted file mode 100644
index 985a3aa..0000000
--- a/app/assets/images/animals/goat.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app/assets/images/animals/koala.svg b/app/assets/images/animals/koala.svg
deleted file mode 100644
index b6c9cb2..0000000
--- a/app/assets/images/animals/koala.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app/assets/images/animals/lion.svg b/app/assets/images/animals/lion.svg
deleted file mode 100644
index aae894b..0000000
--- a/app/assets/images/animals/lion.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app/assets/images/animals/monkey.svg b/app/assets/images/animals/monkey.svg
deleted file mode 100644
index 56a6f9f..0000000
--- a/app/assets/images/animals/monkey.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app/assets/images/animals/owl.svg b/app/assets/images/animals/owl.svg
deleted file mode 100644
index 649a2b6..0000000
--- a/app/assets/images/animals/owl.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app/assets/images/animals/panda.svg b/app/assets/images/animals/panda.svg
deleted file mode 100644
index debb550..0000000
--- a/app/assets/images/animals/panda.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app/assets/images/animals/penguin.svg b/app/assets/images/animals/penguin.svg
deleted file mode 100644
index 60ca46d..0000000
--- a/app/assets/images/animals/penguin.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app/assets/images/animals/wolf.svg b/app/assets/images/animals/wolf.svg
deleted file mode 100644
index 74b34fd..0000000
--- a/app/assets/images/animals/wolf.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app/assets/stylesheets/application/components/_no_data.scss b/app/assets/stylesheets/application/components/_no_data.scss
index 3670b0d..550250f 100644
--- a/app/assets/stylesheets/application/components/_no_data.scss
+++ b/app/assets/stylesheets/application/components/_no_data.scss
@@ -2,9 +2,8 @@
text-align:center;
border-radius:4px;
padding:30px;
- padding-top:100px;
+ padding-top:50px;
box-shadow:0 0 10px rgba(0,0,0,0.15);
- background:image-url('animals/panda.svg') #fff no-repeat center 25px / 50px;
}
.noData--clean {
@@ -35,80 +34,3 @@
width:70%;
color:$subBlue;
}
-
-.noData--fox {
- background-image:image-url('animals/fox.svg');
- background-size:65px;
-}
-
-.noData--cat {
- background-image:image-url('animals/cat.svg');
- background-position:center 15px;
- background-size:50px;
-}
-
-.noData--cat2 {
- background-image:image-url('animals/cat2.svg');
- background-size:55px;
-}
-
-.noData--cat3 {
- background-image:image-url('animals/cat3.svg');
- background-size:48px;
-}
-
-.noData--cat4 {
- background-image:image-url('animals/cat4.svg');
- background-size:50px;
-}
-
-.noData--cock {
- background-image:image-url('animals/cock.svg');
- background-size:50px;
- background-position:center 15px;
-}
-
-.noData--deer {
- background-image:image-url('animals/deer.svg');
- background-position:center 15px;
- background-size:65px;
-}
-
-.noData--dog {
- background-image:image-url('animals/dog.svg');
-}
-
-.noData--monkey {
- background-image:image-url('animals/monkey.svg');
-}
-
-.noData--owl {
- background-image:image-url('animals/owl.svg');
-}
-
-.noData--penguin {
- background-image:image-url('animals/penguin.svg');
-}
-
-.noData--panda {
- background-image:image-url('animals/panda.svg');
-}
-
-.noData--goat {
- background-image:image-url('animals/goat.svg');
-}
-
-.noData--koala {
- background-image:image-url('animals/koala.svg');
- background-size:65px;
-}
-
-.noData--wolf {
- background-image:image-url('animals/wolf.svg');
- background-size:45px;
-}
-
-.noData--lion {
- background-image:image-url('animals/lion.svg');
- background-size:45px;
-}
diff --git a/app/views/address_endpoints/index.html.haml b/app/views/address_endpoints/index.html.haml
index d1b8981..e43bbb5 100644
--- a/app/views/address_endpoints/index.html.haml
+++ b/app/views/address_endpoints/index.html.haml
@@ -8,7 +8,7 @@
.pageContent.pageContent--compact
- if @address_endpoints.empty?
- .noData.noData--koala.noData--clean
+ .noData.noData--clean
%h2.noData__title There aren't any address endpoints yet.
%p.noData__text
Address endpoints are e-mail addresses hosted on other platforms that you'd
diff --git a/app/views/credentials/index.html.haml b/app/views/credentials/index.html.haml
index 0da3afb..7f6646c 100644
--- a/app/views/credentials/index.html.haml
+++ b/app/views/credentials/index.html.haml
@@ -5,8 +5,8 @@
= render 'servers/header', :active_nav => :credentials
.pageContent.pageContent--compact
- if @credentials.empty?
- .noData.noData--goat.noData--clean
- %h2.noData__title This is goating out of hand. You have no credentials!
+ .noData..noData--clean
+ %h2.noData__title There are no credentials for this server.
%p.noData__text
In order to authenticate to your mail server, you use credentials. Once
you've added a credential, you'll have a unique token which you can use to
diff --git a/app/views/domains/index.html.haml b/app/views/domains/index.html.haml
index bbc9888..eafd3a3 100644
--- a/app/views/domains/index.html.haml
+++ b/app/views/domains/index.html.haml
@@ -18,8 +18,8 @@
.pageContent.pageContent--compact
- if @domains.empty?
- .noData.noData--penguin.noData--clean
- %h2.noData__title Brrrr. It's chilly in here without any domains.
+ .noData.noData--clean
+ %h2.noData__title There are no domains for this server.
%p.noData__text
To send & receive messages you need to add & verify the domain you wish to send/receive
messages to/from. Add your domain below to get started.
diff --git a/app/views/http_endpoints/index.html.haml b/app/views/http_endpoints/index.html.haml
index 406939d..ce0d831 100644
--- a/app/views/http_endpoints/index.html.haml
+++ b/app/views/http_endpoints/index.html.haml
@@ -8,8 +8,8 @@
.pageContent.pageContent--compact
- if @http_endpoints.empty?
- .noData.noData--cock.noData--clean
- %h2.noData__title Oh cock! There aren't any HTTP endpoints yet.
+ .noData.noData--clean
+ %h2.noData__title There aren't any HTTP endpoints yet.
%p.noData__text
HTTP endpoints are essentially URLs that you'd like incoming e-mails
to be delivered to. Once you've added some endpoints, you can route messages
diff --git a/app/views/ip_pool_rules/index.html.haml b/app/views/ip_pool_rules/index.html.haml
index 7c6772e..2a4601a 100644
--- a/app/views/ip_pool_rules/index.html.haml
+++ b/app/views/ip_pool_rules/index.html.haml
@@ -21,7 +21,7 @@
.pageContent.pageContent--compact
- if @ip_pool_rules.empty?
- .noData.noData--panda.noData--clean
+ .noData.noData--clean
- if @server.nil?
%h2.noData__title No global rules have been configured yet.
%p.noData__text
diff --git a/app/views/ip_pools/index.html.haml b/app/views/ip_pools/index.html.haml
index 3806fd2..82eedb5 100644
--- a/app/views/ip_pools/index.html.haml
+++ b/app/views/ip_pools/index.html.haml
@@ -6,7 +6,7 @@
.pageContent.pageContent--compact
- if @ip_pools.empty?
- .noData.noData--cat2.noData--clean
+ .noData.noData--clean
%p.noData__title There are no IP pools configured.
%p.noData__text
All messages sent from your mail server can be sent from certain pools of
diff --git a/app/views/messages/_deliveries.html.haml b/app/views/messages/_deliveries.html.haml
index f555157..12d4b26 100644
--- a/app/views/messages/_deliveries.html.haml
+++ b/app/views/messages/_deliveries.html.haml
@@ -22,7 +22,7 @@
- if message.deliveries.empty?
%li.deliveryList__item
- .noData.noData--fox.noData--clean
+ .noData.noData--clean
%h2.noData__text No delivery attempts yet.
- else
- for delivery in message.deliveries.reverse
diff --git a/app/views/messages/_index.html.haml b/app/views/messages/_index.html.haml
index 447bc9d..36c3795 100644
--- a/app/views/messages/_index.html.haml
+++ b/app/views/messages/_index.html.haml
@@ -3,8 +3,8 @@
= render 'search'
- if @messages[:records].empty?
- .noData.noData--clean.noData--koala
- %h2.noData__title No koalified messages found matching your filter.
+ .noData
+ %h2.noData__title No messages found matching your filter.
%p.noData__text
There were no messages which matched the query that you entered. Sorry about that.
- else
diff --git a/app/views/messages/attachments.html.haml b/app/views/messages/attachments.html.haml
index f7de973..1b0bbe6 100644
--- a/app/views/messages/attachments.html.haml
+++ b/app/views/messages/attachments.html.haml
@@ -8,7 +8,7 @@
= render 'message_header', :active_nav => :attachments
.pageContent.pageContent--compact
- if @message.attachments.empty?
- .noData.noData--clean.noData--wolf
+ .noData.noData--clean
%h2.noData__title There are no attachments for this message.
%p.noData__text
This means that we no longer store the raw data for this e-mail
diff --git a/app/views/messages/headers.html.haml b/app/views/messages/headers.html.haml
index 58bd349..bd5518d 100644
--- a/app/views/messages/headers.html.haml
+++ b/app/views/messages/headers.html.haml
@@ -9,7 +9,7 @@
- if @message.headers.empty?
.pageContent.pageContent--compact
- .noData.noData--clean.noData--cat2
+ .noData.noData--clean
%h2.noData__title There are no headers for this message.
%p.noData__text
This means that we no longer store the raw data for this e-mail.
diff --git a/app/views/messages/held.html.haml b/app/views/messages/held.html.haml
index d973c82..8da63ee 100644
--- a/app/views/messages/held.html.haml
+++ b/app/views/messages/held.html.haml
@@ -6,7 +6,7 @@
= render 'header', :active_nav => :held
- if @messages.empty? && !@queried
.pageContent--compact
- .noData.noData--deer.noData--clean
+ .noData.noData--clean
%h2.noData__title You haven't got any held messages.
%p.noData__text
You haven't sent any messages through this mail server yet. Not to worry though
diff --git a/app/views/messages/html.html.haml b/app/views/messages/html.html.haml
index a3ccd88..357f2cb 100644
--- a/app/views/messages/html.html.haml
+++ b/app/views/messages/html.html.haml
@@ -8,7 +8,7 @@
= render 'message_header', :active_nav => :html
- if @message.html_body.blank?
.pageContent.pageContent--compact
- .noData.noData--clean.noData--panda
+ .noData.noData--clean
%h2.noData__title There's no HTML body for this message.
%p.noData__text
This means that we no longer store the raw data for this e-mail
diff --git a/app/views/messages/incoming.html.haml b/app/views/messages/incoming.html.haml
index 3c60cb5..0726cea 100644
--- a/app/views/messages/incoming.html.haml
+++ b/app/views/messages/incoming.html.haml
@@ -6,8 +6,8 @@
= render 'header', :active_nav => :incoming
- if @messages[:records].empty? && !@queried
.pageContent--compact
- .noData.noData--deer.noData--clean
- %h2.noData__title Oh deer! You haven't received any messages yet.
+ .noData.noData--clean
+ %h2.noData__title No messages have been received yet.
%p.noData__text
You haven't received any messages through this mail server yet. Not to worry though
they'll start appearing here as soon as you start receiving them.
diff --git a/app/views/messages/outgoing.html.haml b/app/views/messages/outgoing.html.haml
index 10e98a1..dacf6d6 100644
--- a/app/views/messages/outgoing.html.haml
+++ b/app/views/messages/outgoing.html.haml
@@ -6,8 +6,8 @@
= render 'header', :active_nav => :outgoing
- if @messages[:records].empty? && !@queried
.pageContent--compact
- .noData.noData--deer.noData--clean
- %h2.noData__title Oh deer! You haven't sent any messages yet.
+ .noData.noData--clean
+ %h2.noData__title No messages have been sent yet.
%p.noData__text
You haven't sent any messages through this mail server yet. Not to worry though
they'll start appearing here as soon as you start sending them.
diff --git a/app/views/messages/plain.html.haml b/app/views/messages/plain.html.haml
index 035724b..2546bad 100644
--- a/app/views/messages/plain.html.haml
+++ b/app/views/messages/plain.html.haml
@@ -8,7 +8,7 @@
= render 'message_header', :active_nav => :plain
.pageContent.pageContent--compact
- if @message.plain_body.blank?
- .noData.noData--clean.noData--owl
+ .noData.noData--clean
%h2.noData__title There's no plain text body for this message.
%p.noData__text
This means that we no longer store the raw data for this e-mail
diff --git a/app/views/messages/suppressions.html.haml b/app/views/messages/suppressions.html.haml
index 9bdb465..39846ff 100644
--- a/app/views/messages/suppressions.html.haml
+++ b/app/views/messages/suppressions.html.haml
@@ -6,7 +6,7 @@
= render 'header', :active_nav => :suppressions
.pageContent.pageContent--compact
- if @suppressions[:records].empty?
- .noData.noData--clean.noData--owl
+ .noData.noData--clean
%h2.noData__title No addresses on the suppression list.
%p.noData__text
When messages cannot be delivered, addresses are added to the suppression list which stops
diff --git a/app/views/organization_ip_pools/index.html.haml b/app/views/organization_ip_pools/index.html.haml
index 4974575..9819057 100644
--- a/app/views/organization_ip_pools/index.html.haml
+++ b/app/views/organization_ip_pools/index.html.haml
@@ -27,12 +27,12 @@
%p= submit_tag "Save IP pool assignment", :class => 'button button--positive'
- else
- if @ip_pools.empty?
- .noData.noData--koala.noData--clean
+ .noData.noData--clean
- if @server.nil?
- %h2.noData__title You don't have any dedicated IP addresses.
+ %h2.noData__title You don't have any assigned IP addresses.
%p.noData__text
- Once you've been assigned dedicated IP addresses they will appear here. You can then use them in rules and
- for servers. To request dedicated IP addresses please contact our team.
+ Once you've been assigned IP addresses they will appear here. You can then use them in rules and
+ for servers.
- else
.ipList
- for ip_pool in @ip_pools
diff --git a/app/views/organizations/index.html.haml b/app/views/organizations/index.html.haml
index 6752612..e383c10 100644
--- a/app/views/organizations/index.html.haml
+++ b/app/views/organizations/index.html.haml
@@ -6,11 +6,11 @@
.pageContent.pageContent--compact
- if @organizations.empty?
- .noData.noData--panda.noData--clean
+ .noData.noData--clean
%p.noData__title There are no organizations.
- if current_user.admin?
%p.noData__text
- That's not on. You need an organization otherwise you can't do much here. Hit
+ You need an organization otherwise you can't do much here. Hit
the button below to create the first organization.
%p.noData__button= link_to "Create the first organization", :new_organization, :class => 'button button--positive'
- else
diff --git a/app/views/routes/index.html.haml b/app/views/routes/index.html.haml
index 7eee7a0..20f4316 100644
--- a/app/views/routes/index.html.haml
+++ b/app/views/routes/index.html.haml
@@ -7,8 +7,8 @@
.pageContent.pageContent--compact
- if @routes.empty?
- .noData.noData--monkey.noData--clean
- %h2.noData__title We heard on the ape vine, you've got no routes yet.
+ .noData.noData--clean
+ %h2.noData__title No routes have been configured for this server.
%p.noData__text
To receive incoming mail, you need to add routes so where we should send
messages we receive for your domain. You can send incoming e-mail to
diff --git a/app/views/servers/index.html.haml b/app/views/servers/index.html.haml
index df4ca6a..01fecb2 100644
--- a/app/views/servers/index.html.haml
+++ b/app/views/servers/index.html.haml
@@ -9,8 +9,8 @@
.pageContent.pageContent--compact
- if @servers.empty?
- .noData.noData--owl.noData--clean
- %p.noData__title Well owls about that, you've no mail servers yet.
+ .noData.noData--clean
+ %p.noData__title There are no mail servers for this organization yet.
%p.noData__text
Great - you've got an organization, now you need to provision a mail server.
Once you've got a mail server, you can start sending & receiving messages.
@@ -28,8 +28,8 @@
%p= server.name
%p.largeList__subText #{number_with_precision server.message_rate, :precision => 2} messages/minute
.js-searchable__empty.is-hidden
- .noData.noData--owl.noData--clean
- %p.noData__title Well owls about that, no servers found.
+ .noData.noData--clean
+ %p.noData__title No servers were found...
%p.noData__text
There were no servers found matching what you've typed it.
%p.u-center= link_to "Build a new mail server", [:new, organization, :server], :class => 'button button--positive'
diff --git a/app/views/servers/queue.html.haml b/app/views/servers/queue.html.haml
index 50cb375..1d3d17b 100644
--- a/app/views/servers/queue.html.haml
+++ b/app/views/servers/queue.html.haml
@@ -7,8 +7,8 @@
- if @messages.empty?
.pageContent--compact
- .noData.noData--cat2.noData--clean
- %h2.noData__title Your queue is empty. It won't stay like that fur-ever.
+ .noData.noData--clean
+ %h2.noData__title Your queue is current empty.
%p.noData__text
Messages which haven't yet been delivered successfully will appear in your queue until
we've delivered them or we've given up trying.
diff --git a/app/views/servers/show.html.haml b/app/views/servers/show.html.haml
index 711eae1..3f6558c 100644
--- a/app/views/servers/show.html.haml
+++ b/app/views/servers/show.html.haml
@@ -4,12 +4,10 @@
- if @messages.empty?
.pageContent--compact
- .noData.noData--cat.noData--clean
- %h2.noData__title Stop pro-cat-inating! Your new mail server is ready.
+ .noData.noData--clean
+ %h2.noData__title Your new mail server is ready to go.
%p.noData__text
- We can't wait to help you get up and running. The first thing you need
- to do is add & verify your domain so you can send & receive e-mail to/from it.
- It'll only take a few seconds.
+ Check out the information below to get started sending & receiving e-mail through your new mail server.
%p.noData__button.buttonSet.buttonSet--center
= link_to "Read about sending e-mail", [organization, @server, :help_outgoing], :class => "button"
= link_to "Read about receiving e-mail", [organization, @server, :help_incoming], :class => "button"
diff --git a/app/views/smtp_endpoints/index.html.haml b/app/views/smtp_endpoints/index.html.haml
index ace91a2..948d46d 100644
--- a/app/views/smtp_endpoints/index.html.haml
+++ b/app/views/smtp_endpoints/index.html.haml
@@ -8,8 +8,8 @@
.pageContent.pageContent--compact
- if @smtp_endpoints.empty?
- .noData.noData--dog.noData--clean
- %h2.noData__title Im-paws-ible! You've got no SMTP endpoints.
+ .noData.noData--clean
+ %h2.noData__title There are no SMTP endpoints for this server.
%p.noData__text
SMTP endpoints are other mail servers that you'd like incoming e-mails
to be passed onto. Once you've added some endpoints, you can route messages
diff --git a/app/views/track_domains/index.html.haml b/app/views/track_domains/index.html.haml
index c22b1f5..81d0f3c 100644
--- a/app/views/track_domains/index.html.haml
+++ b/app/views/track_domains/index.html.haml
@@ -8,8 +8,8 @@
.pageContent.pageContent--compact
- if @track_domains.empty?
- .noData.noData--fox.noData--clean
- %h2.noData__title You haven't set up any tracking domains yet.
+ .noData.noData--clean
+ %h2.noData__title There are no tracking domains for this server.
%p.noData__text
To use Postal's open & click tracking, you need to configure a domain that links will be re-written to use. Enable
message tracking by adding a sutiable tracking domain for your outbound e-mails.
diff --git a/app/views/users/index.html.haml b/app/views/users/index.html.haml
index f611f7d..8507a4a 100644
--- a/app/views/users/index.html.haml
+++ b/app/views/users/index.html.haml
@@ -9,7 +9,7 @@
= render 'organizations/nav', :active_nav => :users
.pageContent.pageContent--compact
- if @users.empty? && @pending_users.empty?
- .noData.noData--penguin.noData--clean
+ .noData.noData--clean
%p.noData__title There are no users assigned to this organization.
%p.noData__text
You add additional users that will be permitted to access this organization.
diff --git a/app/views/webhooks/history.html.haml b/app/views/webhooks/history.html.haml
index 07300bc..064ee96 100644
--- a/app/views/webhooks/history.html.haml
+++ b/app/views/webhooks/history.html.haml
@@ -8,7 +8,7 @@
.pageContent.pageContent--compact
- if @requests[:records].empty?
- .noData.noData--clean.noData--cat3
+ .noData.noData--clean
%h2.noData__title No webhook requests recorded.
%p.noData__text
This page shows the last 10 days worth of webhook requests that have been sent by Postal. This page will
diff --git a/app/views/webhooks/index.html.haml b/app/views/webhooks/index.html.haml
index 6801279..0df057d 100644
--- a/app/views/webhooks/index.html.haml
+++ b/app/views/webhooks/index.html.haml
@@ -6,8 +6,8 @@
= render 'header', :active_nav => :webhooks
.pageContent.pageContent--compact
- if @webhooks.empty?
- .noData.noData--clean.noData--lion
- %h2.noData__title You've got no webhooks. We're not lion.
+ .noData.noData--clean
+ %h2.noData__title No webhooks have been configured for this server.
%p.noData__text
You haven't added any webhooks for this server yet. A webhook enables your web
application to be notified when certain events occur in the lifecycle of the mail server.