Fix Notice display to renderJSON method and add missing notice view (…

…by default Bootstrap theme)
RetinaInc · Jan 24, 2015 · f45c5d5 · f45c5d5
1 parent e247cbf
commit f45c5d5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/application/views/notice.php b/application/views/notice.php
@@ -0,0 +1,11 @@
+<?php if (isset($notice) && ! empty($notice)) : ?>
+    <div class="alert alert-<?= $notice['type'] ?> alert-dismissible" id="notice" role="alert">
+        <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+        <?= $notice['message'] ?>
+    </div>
+
+<?php else: ?>
+
+    <div id="notice"></div>
+
+<?php endif; ?>
diff --git a/myth/Controllers/BaseController.php b/myth/Controllers/BaseController.php
@@ -267,11 +267,11 @@ public function renderJSON($json)
                 if ($this->ajax_notices === true) {
 	                if ( ! empty( $this->themer ) && ! empty( $this->theme ) )
 	                {
-		                $json['fragments']['#notices'] = $this->themer->display( "{$this->theme}:notice", array( 'notice' => $this->message() ) );
+		                $json['fragments']['#notice'] = $this->themer->display( "{$this->theme}:notice", array( 'notice' => $this->message() ) );
 	                }
 	                else if (file_exists(APPPATH .'views/notice.php'))
 	                {
-		                $json['fragments']['#notices'] = $this->load->view_path( "notice", array( 'notice' => $this->message() ), TRUE );
+		                $json['fragments']['#notice'] = $this->load->view_path( "notice", array( 'notice' => $this->message() ), TRUE );
 	                }
                 }
             }

diff --git a/themes/bootstrap3/notice.php b/themes/bootstrap3/notice.php
@@ -6,6 +6,6 @@
 
 <?php else: ?>
 
-    <div id="notices"></div>
+    <div id="notice"></div>
 
 <?php endif; ?>
diff --git a/themes/foundation5/notice.php b/themes/foundation5/notice.php
@@ -1,6 +1,11 @@
 <?php if (isset($notice) && ! empty($notice)) : ?>
-    <div class="alert-box <?= $notice['type'] ?>" data-alert role="alert">
+    <div class="alert-box <?= $notice['type'] ?>" data-alert id="notice" role="alert">
         <?= $notice['message'] ?>
         <a href="#" class="close">&times;</a>
     </div>
+
+<?php else: ?>
+
+    <div id="notice"></div>
+
 <?php endif; ?>