From 8c0680a18a1be0ce8b18239c48eed53b799a8121 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Sun, 28 Feb 2016 20:50:09 -0800
Subject: [PATCH] Corrected frontend modal markup. Corrected page registry
 identifier.

---
 e107_core/templates/header_default.php     | 27 ++++++++------
 e107_handlers/e107_class.php               |  5 +++
 e107_plugins/page/e_shortcode.php          |  2 +-
 e107_plugins/page/page_navigation_menu.php |  2 +-
 e107_web/js/core/front.jquery.js           | 42 +++++++++++++++++++++-
 page.php                                   |  2 +-
 6 files changed, 66 insertions(+), 14 deletions(-)

diff --git a/e107_core/templates/header_default.php b/e107_core/templates/header_default.php
index 16a6df2a6..c26de85d0 100644
--- a/e107_core/templates/header_default.php
+++ b/e107_core/templates/header_default.php
@@ -685,19 +685,26 @@ if(deftrue('BOOTSTRAP'))
 {
 //	if(empty($LAYOUT['_modal_'])) // leave it set for now.
 	{
-		$LAYOUT['_modal_'] = '<div id="uiModal" style="display:none" class="modal hide fade" tabindex="-1" role="dialog"  aria-hidden="true">
-		            <div class="modal-header">
-		                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-		                <h4 class="modal-caption">&nbsp;</h4>
-		             </div>
-		             <div class="modal-body">
-		             <p>Loading…</p>
-		             </div>
-		             <div class="modal-footer">
-		                <a href="#" data-dismiss="modal" class="btn btn-primary">Close</a>
+		$LAYOUT['_modal_'] = '<div id="uiModal" class="modal fade" tabindex="-1" role="dialog"  aria-hidden="true">
+					<div class="modal-dialog modal-lg">
+						<div class="modal-content">
+				            <div class="modal-header">
+				                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+				                <h4 class="modal-caption">&nbsp;</h4>
+				             </div>
+				             <div class="modal-body">
+				             <p>Loading…</p>
+				             </div>
+				             <div class="modal-footer">
+				                <a href="#" data-dismiss="modal" class="btn btn-primary">Close</a>
+				            </div>
+			            </div>
 		            </div>
 		        </div>
 		';
+
+
+
 	}
 
 	echo $LAYOUT['_modal_'];
diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index 8bbfef3c3..59cf5deab 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -532,6 +532,11 @@ class e107
 			return self::$_registry[$id];
 		}
 
+		if($id == '_all_')
+		{
+			return self::$_registry;
+		}
+
 		return $default;
 	}
 
diff --git a/e107_plugins/page/e_shortcode.php b/e107_plugins/page/e_shortcode.php
index 3b9e99c47..1ba0c8cbb 100644
--- a/e107_plugins/page/e_shortcode.php
+++ b/e107_plugins/page/e_shortcode.php
@@ -17,7 +17,7 @@ class page_shortcodes extends e_shortcode
 		function __construct()
 		{
 			
-			$this->request = e107::getRegistry('core/pages/request');
+			$this->request = e107::getRegistry('core/page/request');
 			
 			$action = varset($this->request['action']);
 			
diff --git a/e107_plugins/page/page_navigation_menu.php b/e107_plugins/page/page_navigation_menu.php
index afd9c6b0a..b21bee63b 100644
--- a/e107_plugins/page/page_navigation_menu.php
+++ b/e107_plugins/page/page_navigation_menu.php
@@ -21,7 +21,7 @@ $tmpl = e107::getCoreTemplate('chapter','nav',true,true); // always merge and al
 
 $template = $tmpl['showPage'];
 
-$request = e107::getRegistry('core/pages/request');
+$request = e107::getRegistry('core/page/request');
 if($request && is_array($request))
 {
 	switch ($request['action']) 
diff --git a/e107_web/js/core/front.jquery.js b/e107_web/js/core/front.jquery.js
index 56eabe630..03e9efe4b 100644
--- a/e107_web/js/core/front.jquery.js
+++ b/e107_web/js/core/front.jquery.js
@@ -396,6 +396,46 @@ $(document).ready(function()
             return true;
 		});
 	
-	
+
+
+
+		/*  Bootstrap Modal window within an iFrame for frontend */
+		$('.e-modal').on('click', function(e)
+		{
+
+			e.preventDefault();
+
+            if($(this).attr('data-cache') == 'false')
+            {
+                $('#uiModal').on('shown.bs.modal', function () {
+                    $(this).removeData('bs.modal');
+                });
+            }
+
+			var url 		= $(this).attr('href');
+			var caption  	= $(this).attr('data-modal-caption');
+			var height 		= ($(window).height() * 0.7) - 120;
+
+            if(caption === undefined)
+            {
+                caption = '';
+            }
+
+            if($(this).attr('data-modal-height') !== undefined)
+            {
+            	height = $(this).attr('data-modal-height');
+			}
+
+    		$('.modal-body').html('<div><iframe id="e-modal-iframe" width="100%" height="'+height+'px" frameborder="0" scrolling="auto" style="display:block;" allowtransparency="true" src="' + url + '"></iframe></div>');
+    		$('.modal-caption').html(caption + ' <i id="e-modal-loading" class="fa fa-spin fa-spinner"></i>');
+    		$('.modal').modal('show');
+
+    		$("#e-modal-iframe").on("load", function () {
+				 $('#e-modal-loading').hide();
+			});
+    	});
+
+
+
 	
 });
\ No newline at end of file
diff --git a/page.php b/page.php
index 7c68d54ca..b1328aff4 100644
--- a/page.php
+++ b/page.php
@@ -181,7 +181,7 @@ class pageClass
 				$id = 0;
 			break;
 		}
-		e107::setRegistry('core/pages/request', array('action' => $request, 'id' => $id));
+		e107::setRegistry('core/page/request', array('action' => $request, 'id' => $id));
 	}