diff --git a/app/resources/locales/en_US/information.po b/app/resources/locales/en_US/information.po
index fa0fe170c..9ae8226af 100644
--- a/app/resources/locales/en_US/information.po
+++ b/app/resources/locales/en_US/information.po
@@ -36,18 +36,6 @@ msgstr "You are not an active member in any collaboration. If your request for e
msgid "cos.select"
msgstr "Please select the collaboration (CO) you wish to manage."
-msgid "flash.default"
-msgstr "Notice: "
-
-msgid "flash.error"
-msgstr "Error: "
-
-msgid "flash.information"
-msgstr "Information: "
-
-msgid "flash.success"
-msgstr "Success: "
-
msgid "entity.id"
msgstr "ID: {0}"
diff --git a/app/templates/Standard/add-edit-view.php b/app/templates/Standard/add-edit-view.php
index cce8353c9..09020cc13 100644
--- a/app/templates/Standard/add-edit-view.php
+++ b/app/templates/Standard/add-edit-view.php
@@ -52,6 +52,15 @@
if(!empty($vv_primary_link) && !empty($this->request->getQuery($vv_primary_link))) {
$linkFilter = [$vv_primary_link => $this->request->getQuery($vv_primary_link)];
}
+
+// $flashArgs pass banner messages to the flash element container
+$flashArgs = [];
+if(!empty($banners)) {
+ // XXX this doesn't work yet because we don't include fields.inc until later
+ // either create a second file to include earlier, or use a function to emit
+ // the fields (which would be more consistent with how Views render...)
+ $flashArgs['vv_banners'] = $banners;
+}
?>
@@ -65,6 +74,10 @@
+
+
+ = $this->element('flash', $flashArgs); ?>
+
= $this->element('subnavigation', $subnav); ?>
@@ -142,21 +155,10 @@
?>
-
-
- = $this->Flash->render() ?>
-
- Alert->alert($b, 'warning');
- }
- }
- ?>
-
+
+
+ = $this->element('flash', $flashArgs); ?>
+
request->getQuery($vv_primary_link))) {
$linkFilter = [$vv_primary_link => $this->request->getQuery($vv_primary_link)];
}
+
+// $flashArgs pass banner messages to the flash element container
+$flashArgs = [];
+if(!empty($indexBanners)) {
+ $flashArgs['vv_index_banners'] = $indexBanners;
+}
+if(!empty($banners)) {
+ $flashArgs['vv_banners'] = $banners;
+}
?>
@@ -71,6 +80,10 @@
+
+
+ = $this->element('flash', $flashArgs); ?>
+
= $this->element('subnavigation', $subnav); ?>
@@ -147,23 +160,11 @@
-
-
- = $this->Flash->render() ?>
-
-
-
- = $this->Alert->alert($b, 'warning') ?>
-
-
-
-
-
- = $this->Alert->alert($b, 'warning') ?>
-
-
-
-
+
+
+ = $this->element('flash', $flashArgs); ?>
+
+
= $this->element('filter'); ?>
diff --git a/app/templates/element/flash.php b/app/templates/element/flash.php
new file mode 100644
index 000000000..5c6a91f26
--- /dev/null
+++ b/app/templates/element/flash.php
@@ -0,0 +1,44 @@
+
+
+
+
+ = $this->Flash->render() ?>
+
+
+
+ = $this->Alert->alert($b, 'warning') ?>
+
+
+
+
+
+ = $this->Alert->alert($b, 'warning') ?>
+
+
+
\ No newline at end of file
diff --git a/app/templates/element/flash/default.php b/app/templates/element/flash/default.php
index 5c05e86a8..325e35513 100644
--- a/app/templates/element/flash/default.php
+++ b/app/templates/element/flash/default.php
@@ -1,15 +1,13 @@
- = $this->Alert->alert($message, 'warning', true, __d('information','flash.default')) ?>
+
+ = $this->Alert->alert($message, 'warning', true) ?>
diff --git a/app/templates/element/flash/error.php b/app/templates/element/flash/error.php
index 04fd0e19a..8069a15da 100644
--- a/app/templates/element/flash/error.php
+++ b/app/templates/element/flash/error.php
@@ -3,10 +3,10 @@
$message = h($message);
}
?>
-= $message ?>
-*/ ?>
- = $this->Alert->alert($message, 'danger', true, __d('information','flash.error')) ?>
+
+ = $this->Alert->alert($message, 'danger', true) ?>
diff --git a/app/templates/element/flash/information.php b/app/templates/element/flash/information.php
index 1df1a9641..26dc52329 100644
--- a/app/templates/element/flash/information.php
+++ b/app/templates/element/flash/information.php
@@ -1,11 +1,12 @@
-
+
= $this->Alert->alert($message, 'information', true) ?>
\ No newline at end of file
diff --git a/app/templates/element/flash/success.php b/app/templates/element/flash/success.php
index f71124cfa..6f0671bb0 100644
--- a/app/templates/element/flash/success.php
+++ b/app/templates/element/flash/success.php
@@ -1,9 +1,12 @@
- = $this->Alert->alert($message, 'success', true, __d('information','flash.success')) ?>
+
+ = $this->Alert->alert($message, 'success', true) ?>
\ No newline at end of file