From 00fd19b33ead56842daeb6f6a24735a8687f7744 Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Thu, 9 Apr 2015 20:58:32 -0400
Subject: Implement flash messaging for admin success/error stuff

---
 themes/okadmin/templates/index.liquid           |  2 ++
 themes/okadmin/templates/partials/errors.liquid | 10 ----------
 themes/okadmin/templates/partials/flash.liquid  | 14 ++++++++++++++
 themes/okadmin/templates/resource.liquid        |  2 +-
 themes/okadmin/templates/resource_new.liquid    |  2 +-
 5 files changed, 18 insertions(+), 12 deletions(-)
 delete mode 100644 themes/okadmin/templates/partials/errors.liquid
 create mode 100644 themes/okadmin/templates/partials/flash.liquid

(limited to 'themes')

diff --git a/themes/okadmin/templates/index.liquid b/themes/okadmin/templates/index.liquid
index 95c64dd..a5b27e5 100644
--- a/themes/okadmin/templates/index.liquid
+++ b/themes/okadmin/templates/index.liquid
@@ -1,5 +1,7 @@
 {% include 'partials/head' %}
 
+{% include 'partials/flash' %}
+
 <section class="index main">
   {% for pair in resources %}
   {% assign name = pair[0] %}
diff --git a/themes/okadmin/templates/partials/errors.liquid b/themes/okadmin/templates/partials/errors.liquid
deleted file mode 100644
index cdb0b25..0000000
--- a/themes/okadmin/templates/partials/errors.liquid
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="errors">
-  {% for error in errors %}
-    <div class="error">
-      <div class="message">{{error.message}}</div>
-      <div class="assertion">
-        Expected {{error.expected}} but got {{error.actual}}
-      </div>
-    </div>
-  {% endfor %}
-</div>
diff --git a/themes/okadmin/templates/partials/flash.liquid b/themes/okadmin/templates/partials/flash.liquid
new file mode 100644
index 0000000..33b621b
--- /dev/null
+++ b/themes/okadmin/templates/partials/flash.liquid
@@ -0,0 +1,14 @@
+{% if success %}
+  <div class="success">
+    {{success}}
+  </div>
+{% elsif errors %}
+  <div class="errors">
+    {% for error in errors %}
+      <div class="error">
+        <div class="message">{{error.message}}</div>
+      </div>
+    {% endfor %}
+  </div>
+{% endif %}
+
diff --git a/themes/okadmin/templates/resource.liquid b/themes/okadmin/templates/resource.liquid
index c321e8a..53cd83e 100644
--- a/themes/okadmin/templates/resource.liquid
+++ b/themes/okadmin/templates/resource.liquid
@@ -1,6 +1,6 @@
 {% include 'partials/head' %}
 
-{% include 'partials/errors' %}
+{% include 'partials/flash' %}
 
 <nav>
   <a href="../..">Back</a>
diff --git a/themes/okadmin/templates/resource_new.liquid b/themes/okadmin/templates/resource_new.liquid
index c57dd83..8e80171 100644
--- a/themes/okadmin/templates/resource_new.liquid
+++ b/themes/okadmin/templates/resource_new.liquid
@@ -1,6 +1,6 @@
 {% include 'partials/head' %}
 
-{% include 'partials/errors' %}
+{% include 'partials/flash' %}
 
 <nav>
   <a href="../..">Back</a>
-- 
cgit v1.2.3-70-g09d2