From c26c7f906ba47a272c29d272a6d1201c2ec92b9f Mon Sep 17 00:00:00 2001
From: rogercreagh <44980188+rogercreagh@users.noreply.github.com>
Date: Mon, 30 Jan 2023 22:23:44 +0000
Subject: [PATCH] 1.0.4.0 file tidying

---
 .../site/views/book/tmpl/default.php          | 10 ++----
 .../site/views/book/tmpl/modalcpv.php         | 31 -------------------
 .../site/views/book/tmpl/modalgpv.php         | 31 -------------------
 .../site/views/book/tmpl/modalppv.php         | 31 -------------------
 src/com_xbbooks/xbbooks.xml                   |  2 +-
 5 files changed, 3 insertions(+), 102 deletions(-)
 delete mode 100755 src/com_xbbooks/site/views/book/tmpl/modalcpv.php
 delete mode 100755 src/com_xbbooks/site/views/book/tmpl/modalgpv.php
 delete mode 100755 src/com_xbbooks/site/views/book/tmpl/modalppv.php

diff --git a/src/com_xbbooks/site/views/book/tmpl/default.php b/src/com_xbbooks/site/views/book/tmpl/default.php
index 043f1ac..68d9843 100644
--- a/src/com_xbbooks/site/views/book/tmpl/default.php
+++ b/src/com_xbbooks/site/views/book/tmpl/default.php
@@ -2,7 +2,7 @@
 /*******
  * @package xbBooks
  * @filesource site/views/book/tmpl/default.php
- * @version 1.0.3.9 28th January 2023
+ * @version 1.0.4.0 30th January 2023
  * @author Roger C-O
  * @copyright Copyright (c) Roger Creagh-Osborne, 2021
  * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
@@ -389,21 +389,15 @@
         // Load view vith AJAX
       jQuery(this).find('.modal-content').load('/index.php?option=com_xbpeople&view=person&layout=default&tmpl=component&id='+window.pvid);
     })
-    jQuery('#ajax-ppvmodal').on('hidden', function () {
-       document.location.reload(true);
-    })    
     jQuery('#ajax-gpvmodal').on('show', function () {
         // Load view vith AJAX
        jQuery(this).find('.modal-content').load('/index.php?option=com_xbpeople&view=group&layout=default&tmpl=component&id='+window.pvid);
     })
-    jQuery('#ajax-gpvmodal').on('hidden', function () {
-       document.location.reload(true);
-    })    
     jQuery('#ajax-cpvmodal').on('show', function () {
         // Load view vith AJAX
        jQuery(this).find('.modal-content').load('/index.php?option=com_xbpeople&view=character&layout=default&tmpl=component&id='+window.pvid);
     })
-    jQuery('#ajax-cpvmodal').on('hidden', function () {
+    jQuery('#ajax-ppvmodal,#ajax-gpvmodal,#ajax-cpvmodal').on('hidden', function () {
        document.location.reload(true);
     })    
 });
diff --git a/src/com_xbbooks/site/views/book/tmpl/modalcpv.php b/src/com_xbbooks/site/views/book/tmpl/modalcpv.php
deleted file mode 100755
index 0597d76..0000000
--- a/src/com_xbbooks/site/views/book/tmpl/modalcpv.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/*******
- * @package xbBooks
- * @filesource site/views/book/tmpl/modalcpv.php
- * @version 1.0.3.8 27th January 2023
- * @author Roger C-O
- * @copyright Copyright (c) Roger Creagh-Osborne, 2022
- * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
- ******/
-defined( '_JEXEC' ) or die( 'Restricted access' );
-?>
-<script>
-jQuery(document).ready(function(){
-  jQuery('#pv').attr('src',function(i, origValue){return origValue + window.pvid;});
-});
-  jQuery('.iframe-full-height').on('load', function(){
-    this.style.height=this.contentDocument.body.scrollHeight+20 +'px';
-});
-</script>
-<div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true" 
-    	style="opacity:unset;line-height:unset;border:none;">&times;</button>
-     <h4 class="modal-title">Preview Character</h4>
-</div>
-<div class="modal-body">
-    <div style="margin:0 30px;">
-		<iframe src="<?php echo JURI::root(); ?>/index.php?option=com_xbpeople&view=character&layout=default&tmpl=component&id="
-			title="Preview Character" id="pv" class="iframe-full-height"></iframe>   
-	</div>
-</div>
-
diff --git a/src/com_xbbooks/site/views/book/tmpl/modalgpv.php b/src/com_xbbooks/site/views/book/tmpl/modalgpv.php
deleted file mode 100755
index df203df..0000000
--- a/src/com_xbbooks/site/views/book/tmpl/modalgpv.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/*******
- * @package xbBooks
- * @filesource site/views/book/tmpl/modalgpv.php
- * @version 1.0.3.8 27th January 2023
- * @author Roger C-O
- * @copyright Copyright (c) Roger Creagh-Osborne, 2022
- * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
- ******/
-defined( '_JEXEC' ) or die( 'Restricted access' );
-?>
-<script>
-jQuery(document).ready(function(){
-  jQuery('#pv').attr('src',function(i, origValue){return origValue + window.pvid;});
-});
-  jQuery('.iframe-full-height').on('load', function(){
-    this.style.height=this.contentDocument.body.scrollHeight+20 +'px';
-});
-</script>
-<div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true" 
-    	style="opacity:unset;line-height:unset;border:none;">&times;</button>
-     <h4 class="modal-title">Preview Group</h4>
-</div>
-<div class="modal-body">
-    <div style="margin:0 30px;">
-		<iframe src="<?php echo JURI::root(); ?>/index.php?option=com_xbpeople&view=group&layout=default&tmpl=component&id="
-			title="Preview Group" id="pv" class="iframe-full-height"></iframe>   
-	</div>
-</div>
-
diff --git a/src/com_xbbooks/site/views/book/tmpl/modalppv.php b/src/com_xbbooks/site/views/book/tmpl/modalppv.php
deleted file mode 100755
index e719c6a..0000000
--- a/src/com_xbbooks/site/views/book/tmpl/modalppv.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/*******
- * @package xbBooks
- * @filesource site/views/book/tmpl/modalppv.php
- * @version 1.0.3.8 27th January 2023
- * @author Roger C-O
- * @copyright Copyright (c) Roger Creagh-Osborne, 2022
- * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
- ******/
-defined( '_JEXEC' ) or die( 'Restricted access' );
-?>
-<script>
-jQuery(document).ready(function(){
-  jQuery('#pv').attr('src',function(i, origValue){return origValue + window.pvid;});
-});
-  jQuery('.iframe-full-height').on('load', function(){
-    this.style.height=this.contentDocument.body.scrollHeight+20 +'px';
-});
-</script>
-<div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true" 
-    	style="opacity:unset;line-height:unset;border:none;">&times;</button>
-     <h4 class="modal-title">Preview Person</h4>
-</div>
-<div class="modal-body">
-    <div style="margin:0 30px;">
-		<iframe src="<?php echo JURI::root(); ?>/index.php?option=com_xbpeople&view=person&layout=default&tmpl=component&id="
-			title="Preview Person" id="pv" class="iframe-full-height"></iframe>   
-	</div>
-</div>
-
diff --git a/src/com_xbbooks/xbbooks.xml b/src/com_xbbooks/xbbooks.xml
index 6c12e0e..b005390 100644
--- a/src/com_xbbooks/xbbooks.xml
+++ b/src/com_xbbooks/xbbooks.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.1" method="upgrade">
 	<name>xbbooks</name>
-	<creationDate>29th January 2023</creationDate>
+	<creationDate>30th January 2023</creationDate>
 	<version>1.0.4.0</version>
 	<author>Roger C-O</author>
 	<authorEmail>roger@crosborne.uk</authorEmail>