v1.0.4.0e all pv done RC??

rogercreagh · Feb 17, 2023 · 14cd4b7 · 14cd4b7
1 parent 0cdf049
commit 14cd4b7
Show file tree

Hide file tree

Showing 25 changed files with 309 additions and 388 deletions.
diff --git a/src/com_xbbooks/admin/models/books.php b/src/com_xbbooks/admin/models/books.php
@@ -2,7 +2,7 @@
 /*******
  * @package xbBooks
  * @filesource admin/models/books.php
- * @version 1.0.4.0d 14th February 2023
+ * @version 1.0.4.0e 17th February 2023
  * @author Roger C-O
  * @copyright Copyright (c) Roger Creagh-Osborne, 2021
  * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
@@ -201,19 +201,19 @@ public function getItems() {
             $item->mencnt = count(array_keys($roles, 'mention'));
             $item->othercnt = count($item->people) - $item->authcnt - $item->editcnt - $item->mencnt;
 
-            $item->authlist = $item->authcnt==0 ? '' : XbcultureHelper::makeItemLists($item->people,'author','t',4,'ppvmodal');
-            $item->editlist = $item->editcnt==0 ? '' : XbcultureHelper::makeItemLists($item->people,'editor','t',3,'ppvmodal');
-            $item->menlist = $item->mencnt==0 ? '' : XbcultureHelper::makeItemLists($item->people,'mention','tn',3,'ppvmodal');
-            $item->otherlist = $item->othercnt==0 ? '' : XbcultureHelper::makeItemLists($item->people,'other','rt',3,'ppvmodal');
+            $item->authlist = $item->authcnt==0 ? '' : XbcultureHelper::makeItemLists($item->people,'author','t',4,'person');
+            $item->editlist = $item->editcnt==0 ? '' : XbcultureHelper::makeItemLists($item->people,'editor','t',3,'person');
+            $item->menlist = $item->mencnt==0 ? '' : XbcultureHelper::makeItemLists($item->people,'mention','tn',3,'person');
+            $item->otherlist = $item->othercnt==0 ? '' : XbcultureHelper::makeItemLists($item->people,'other','rt',3,'person');
 
             if ($item->gcnt > 0) {
                 $item->groups = XbbooksGeneral::getBookGroups($item->id);
-                $item->grplist = $item->gcnt==0 ? '' : XbcultureHelper::makeItemLists($item->groups,'','t',3,'gpvmodal');
+                $item->grplist = $item->gcnt==0 ? '' : XbcultureHelper::makeItemLists($item->groups,'','t',3,'group');
             }
 
             if ($item->chcnt > 0) {
                 $item->chars = XbbooksGeneral::getBookChars($item->id);
-                $item->charlist = $item->chcnt==0 ? '' : XbcultureHelper::makeItemLists($item->chars,'char','t',3,'cpvmodal');
+                $item->charlist = $item->chcnt==0 ? '' : XbcultureHelper::makeItemLists($item->chars,'char','t',3,'character');
             }
 
             $item->reviews = XbbooksGeneral::getBookReviews($item->id);

diff --git a/src/com_xbbooks/admin/models/characters.php b/src/com_xbbooks/admin/models/characters.php
@@ -2,7 +2,7 @@
 /*******
  * @package xbBooks
  * @filesource admin/models/characters.php
- * @version 1.0.1.3 5th January 2023
+ * @version 1.0.4.0e 17th February 2023
  * @author Roger C-O
  * @copyright Copyright (c) Roger Creagh-Osborne, 2021
  * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
@@ -169,7 +169,7 @@ public function getItems() {
             if ($item->bcnt>0) {
                 $item->books = XbcultureHelper::getCharBooks($item->id);
                 $item->bookcnt = count($item->books);
-                $item->booklist = $item->bookcnt==0 ? '' : XbcultureHelper::makeItemLists($item->books,'','t',4,'bpvmodal');
+                $item->booklist = $item->bookcnt==0 ? '' : XbcultureHelper::makeItemLists($item->books,'','t',4,'book');
             } //bcnt is the number of books, bookcnt is the number of roles (maybe 2 roles in a book)
 
 	        $item->tags = $tagsHelper->getItemTags('com_xbpeople.character' , $item->id);

diff --git a/src/com_xbbooks/admin/models/groups.php b/src/com_xbbooks/admin/models/groups.php
@@ -2,7 +2,7 @@
 /*******
  * @package xbBooks
  * @filesource admin/models/groups.php
- * @version 1.0.4.0 3rd February 2023
+ * @version 1.0.4.0e 17th February 2023
  * @author Roger C-O
  * @copyright Copyright (c) Roger Creagh-Osborne, 2021
  * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
@@ -164,10 +164,10 @@ public function getItems() {
 
             if ($item->pcnt>0) {
                 $item->members = XbcultureHelper::getGroupMembers($item->id);
-                $item->memberlist = XbcultureHelper::makeItemLists($item->members,'','tr',4,'ppvmodal');
+                $item->memberlist = XbcultureHelper::makeItemLists($item->members,'','tr',4,'person');
             }
             $item->books = XbcultureHelper::getGroupBooks($item->id);
-            $item->booklist = XbcultureHelper::makeItemLists($item->books,'','t',4, 'bpvmodal');
+            $item->booklist = XbcultureHelper::makeItemLists($item->books,'','t',4, 'book');
 
             $item->ext_links = json_decode($item->ext_links);
             $item->ext_links_list ='';

diff --git a/src/com_xbbooks/admin/models/persons.php b/src/com_xbbooks/admin/models/persons.php
@@ -2,7 +2,7 @@
 /*******
  * @package xbBooks
  * @filesource admin/models/persons.php
- * @version 1.0.4.0 4th February 2023
+ * @version 1.0.4.0e 17th February 2023
  * @author Roger C-O
  * @copyright Copyright (c) Roger Creagh-Osborne, 2021
  * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
@@ -200,10 +200,10 @@ public function getItems() {
             $item->ocnt = count(array_keys($roles, 'other'));
 
             $rfmt = ($item->brcnt <3) ? 1 : 4;
-            $item->alist = $item->acnt==0 ? '' : XbcultureHelper::makeItemLists($item->books,'author','t',3,'ppvmodal');
-            $item->elist = $item->ecnt==0 ? '' : XbcultureHelper::makeItemLists($item->books,'editor','t',3,'ppvmodal');
-            $item->mlist = $item->mcnt==0 ? '' : XbcultureHelper::makeItemLists($item->books,'mention','tn',3,'ppvmodal');
-            $item->olist = $item->ocnt==0 ? '' : XbcultureHelper::makeItemLists($item->books,'other','rt',3,'ppvmodal');
+            $item->alist = $item->acnt==0 ? '' : XbcultureHelper::makeItemLists($item->books,'author','t',3,'book');
+            $item->elist = $item->ecnt==0 ? '' : XbcultureHelper::makeItemLists($item->books,'editor','t',3,'book');
+            $item->mlist = $item->mcnt==0 ? '' : XbcultureHelper::makeItemLists($item->books,'mention','tn',3,'book');
+            $item->olist = $item->ocnt==0 ? '' : XbcultureHelper::makeItemLists($item->books,'other','rt',3,'book');
 
             $item->ext_links = json_decode($item->ext_links);
             $item->ext_links_list ='';

diff --git a/src/com_xbbooks/admin/models/reviews.php b/src/com_xbbooks/admin/models/reviews.php
@@ -2,7 +2,7 @@
 /*******
  * @package xbBooks
  * @filesource admin/models/reviews.php
- * @version 1.0.3.7 24th January 2023
+ * @version 1.0.4.0e 17th February 2023
  * @author Roger C-O
  * @copyright Copyright (c) Roger Creagh-Osborne, 2021
  * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html

diff --git a/src/com_xbbooks/admin/views/books/tmpl/default.php b/src/com_xbbooks/admin/views/books/tmpl/default.php
@@ -2,7 +2,7 @@
 /*******
  * @package xbBooks
  * @filesource admin/views/books/tmpl/default.php
- * @version 1.0.4.0d 14th February 2023
+ * @version 1.0.4.0e 17th February 2023
  * @author Roger C-O
  * @copyright Copyright (c) Roger Creagh-Osborne, 2021
  * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
@@ -54,7 +54,8 @@
 
 ?>
 <style type="text/css" media="screen">
-	.xbpvmodal .modal-content {padding:15px;max-height:calc(100vh - 190px); overflow:scroll; }
+    .xbpvmodal .modal-body iframe { max-height:calc(100vh - 190px);}
+    .xbpvmodal .modal-body { max-height:none; height:auto;}
 </style>
 <form action="<?php echo Route::_('index.php?option=com_xbbooks&view=books'); ?>" method="post" name="adminForm" id="adminForm">
 	<?php if (!empty( $this->sidebar)) : ?>
@@ -223,8 +224,9 @@
 							<a href="<?php echo Route::_($belink.$item->id);?>" <?php echo ($item->published<>1) ? 'class="xbhlt"' : ''; ?>
 								title="<?php echo Text::_('XBCULTURE_EDIT'); ?>" >
 								<b><?php echo $this->escape($item->title); ?></b>
-							</a>&nbsp;<a href="" 
-								data-toggle="modal" data-target="#ajax-bpvmodal" data-backdrop="static" onclick="window.pvid=<?php echo $item->id; ?>;"><i class="far fa-eye"></i></a>
+							</a>&nbsp;<a href="#ajax-xbmodal" 
+								data-toggle="modal" data-target="#ajax-xbmodal" data-backdrop="static" 
+								onclick="window.com='books';window.view='book';window.pvid=<?php echo $item->id; ?>;"><i class="far fa-eye"></i></a>
 						<?php else : ?>
 							<?php echo $this->escape($item->title); ?>
 						<?php endif; ?>
@@ -349,8 +351,8 @@
     	    								} ?>
 	    								</span>
 	    								<span class="xb09"> <?php echo HtmlHelper::date($rev->rev_date , 'd M Y'); ?></span>
-									</a>&nbsp;
-									<a href="" data-toggle="modal" data-target="#ajax-rpvmodal" data-backdrop="static" onclick="window.pvid=<?php echo $rev->id; ?>;">
+									</a>&nbsp;<a href="#ajax-xbmodal" data-toggle="modal" data-target="#ajax-xbmodal" data-backdrop="static" 
+										onclick="window.com='books';window.view='bookreview';window.pvid=<?php echo $rev->id; ?>;">
 										<i class="far fa-eye"></i>
 									</a>
 								</div>
@@ -412,5 +414,5 @@ class="btn btn-mini btn-success">
 <div class="clearfix"></div>
 <p><?php echo XbcultureHelper::credit('xbBooks');?></p>
 
-<?php echo LayoutHelper::render('xbculture.modalpvlayout', array('show' => 'pgcbo'), JPATH_ROOT .'/components/com_xbpeople/layouts');   ?>
+<?php echo LayoutHelper::render('xbculture.layoutpvmodal', array(), JPATH_ROOT .'/components/com_xbpeople/layouts');   ?>
 
diff --git a/src/com_xbbooks/admin/views/characters/tmpl/default.php b/src/com_xbbooks/admin/views/characters/tmpl/default.php
@@ -2,7 +2,7 @@
 /*******
  * @package xbBooks
  * @filesource admin/views/characters/tmpl/default.php
- * @version 1.0.4.0d 12th February 2023
+ * @version 1.0.4.0e 17th February 2023
  * @author Roger C-O
  * @copyright Copyright (c) Roger Creagh-Osborne, 2021
  * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
@@ -48,7 +48,8 @@
 
 ?>
 <style type="text/css" media="screen">
-	.xbpvmodal .modal-content {padding:15px;max-height:calc(100vh - 190px); overflow:scroll; }
+    .xbpvmodal .modal-body iframe { max-height:calc(100vh - 190px);}
+    .xbpvmodal .modal-body { max-height:none; height:auto;}
 </style>
 <form action="index.php?option=com_xbbooks&view=characters" method="post" id="adminForm" name="adminForm">
 	<?php if (!empty( $this->sidebar)) : ?>
@@ -199,8 +200,8 @@
 
 							<a href="<?php echo $chelink.$item->id; ?>" title="<?php echo Text::_('XBBOOKS_EDIT_PERSON'); ?>">
 								<?php echo ' '.$item->name; ?> 
-							</a>&nbsp;
-    						<a href="" data-toggle="modal" class="xbpv" data-target="#ajax-cpvmodal" data-backdrop="static" onclick="window.pvid= <?php echo $item->id; ?>;">
+							</a>&nbsp;<a href="#ajax-xbmodal" data-toggle="modal" class="xbpv" data-target="#ajax-xbmodal" data-backdrop="static" 
+								onclick="window.com='people';window.view='character';window.pvid= <?php echo $item->id; ?>;">
                 				<i class="far fa-eye"></i>
                 			</a>					
 							<br />
@@ -281,5 +282,5 @@
 <div class="clearfix"></div>
 <p><?php echo XbcultureHelper::credit('xbBooks');?></p>
 
-<?php echo LayoutHelper::render('xbculture.modalpvlayout', array('show' => 'cb'), JPATH_ROOT .'/components/com_xbpeople/layouts');   ?>
-  
+<?php echo LayoutHelper::render('xbculture.layoutpvmodal', array(), JPATH_ROOT .'/components/com_xbpeople/layouts');   ?>
+
diff --git a/src/com_xbbooks/admin/views/groups/tmpl/default.php b/src/com_xbbooks/admin/views/groups/tmpl/default.php
@@ -2,7 +2,7 @@
 /*******
  * @package xbBooks
  * @filesource admin/views/groups/tmpl/default.php
- * @version 1.0.4.0d 12th February 2023
+ * @version 1.0.4.0e 17th February 2023
  * @author Roger C-O
  * @copyright Copyright (c) Roger Creagh-Osborne, 2021
  * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
@@ -51,7 +51,8 @@
 
 ?>
 <style type="text/css" media="screen">
-	.xbpvmodal .modal-content {padding:15px;max-height:calc(100vh - 190px); overflow:scroll; }
+    .xbpvmodal .modal-body iframe { max-height:calc(100vh - 190px);}
+    .xbpvmodal .modal-body { max-height:none; height:auto;}
 </style>
 <form action="index.php?option=com_xbbooks&view=groups" method="post" id="adminForm" name="adminForm">
 	<?php if (!empty( $this->sidebar)) : ?>
@@ -201,8 +202,8 @@
 
 							<a href="<?php echo $gelink.$item->id; ?>" title="<?php echo Text::_('XBPEOPLE_EDIT_GROUP'); ?>">
 								<?php echo ' '.$item->title; ?> 
-							</a>&nbsp;
-    						<a href="" data-toggle="modal"  class="xbpv" data-target="#ajax-gpvmodal" data-backdrop="static" onclick="window.pvid= <?php echo $item->id; ?>;">
+							</a>&nbsp;<a href="#ajax-xbmodal" data-toggle="modal"  class="xbpv" data-target="#ajax-xbmodal" data-backdrop="static" 
+    							onclick="window.com='people';window.view='group';window.pvid= <?php echo $item->id; ?>;">
                 				<i class="far fa-eye"></i>
                 			</a>					
 							<br />
@@ -309,5 +310,5 @@
 <div class="clearfix"></div>
 <p><?php echo XbcultureHelper::credit('xbbooks');?></p>
 
-<?php echo LayoutHelper::render('xbculture.modalpvlayout', array('show' => 'pgb'), JPATH_ROOT .'/components/com_xbpeople/layouts');   ?>
-  
+<?php echo LayoutHelper::render('xbculture.layoutpvmodal', array(), JPATH_ROOT .'/components/com_xbpeople/layouts');   ?>
+
diff --git a/src/com_xbbooks/admin/views/persons/tmpl/default.php b/src/com_xbbooks/admin/views/persons/tmpl/default.php
@@ -2,7 +2,7 @@
 /*******
  * @package xbBooks
  * @filesource admin/views/people/tmpl/default.php
- * @version 1.0.4.0d 12th February 2023
+ * @version 1.0.4.0e 17th February 2023
  * @author Roger C-O
  * @copyright Copyright (c) Roger Creagh-Osborne, 2021
  * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
@@ -46,6 +46,10 @@
 $tvlink = 'index.php?option=com_xbbooks&view=tag&id=';
 
 ?>
+<style type="text/css" media="screen">
+    .xbpvmodal .modal-body iframe { max-height:calc(100vh - 190px);}
+    .xbpvmodal .modal-body { max-height:none; height:auto;}
+</style>
 <form action="index.php?option=com_xbbooks&view=persons" method="post" id="adminForm" name="adminForm">
 	<?php if (!empty( $this->sidebar)) : ?>
         <div id="j-sidebar-container" class="span2">
@@ -120,8 +124,7 @@
     			<th class="hidden-tablet hidden-phone" style="width:15%;">
 						<?php echo HTMLHelper::_('searchtools.sort','XBCULTURE_CATS','category_title',$listDirn,$listOrder ).' &amp; '.
 						Text::_( 'XBCULTURE_TAGS_U' ); ?>
-					</th>
-
+				</th>    			
     			<th class="nowrap hidden-phone" style="width:45px;">
 					<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'id', $listDirn, $listOrder); ?>
     			</th>
@@ -198,7 +201,10 @@
 							<a href="<?php echo $pelink.$item->id; ?>" title="<?php echo Text::_('XBBOOKS_EDIT_PERSON'); ?>">
 								<?php echo ($item->firstname=='')? '... ' : $item->firstname; ?>
 								<?php echo ' '.$item->lastname; ?> 
-							</a>
+							</a>&nbsp;<a href="#ajax-xbmodal" data-toggle="modal"  class="xbpv" data-target="#ajax-xbmodal" data-backdrop="static" 
+    							onclick="window.com='people';window.view='person';window.pvid= <?php echo $item->id; ?>;">
+                				<i class="far fa-eye"></i>
+                			</a>					
 							<br />
 							<span class="xb08 xbnorm"><i><?php echo Text::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias));?></i></span>
 						</p>
@@ -245,14 +251,14 @@
 					<td>
 						<?php if ($item->acnt>0) : ?>						
         					<?php if (($item->brcnt == 1) && ($item->acnt < 3)) : ?>
-        						<?php echo $item->alist; ?>
+        						<?php echo $item->alist['ullist']; ?>
 							<?php else : ?>
                                 <details>
                                 <summary><span class="xbnit">
                                 	<?php echo Text::_('XBCULTURE_AUTHOR_OF').' '.$item->acnt.' ';
                                     echo ($item->acnt==1)?Text ::_('XBCULTURE_BOOK') : Text::_('XBCULTURE_BOOKS');   ?>
                                 </span></summary>
-                                <?php echo $item->alist; ?>
+                                <?php echo $item->alist['ullist']; ?>
                                 </details>
         					<?php endif; ?>
 						<?php endif; ?> 
@@ -265,33 +271,33 @@
          								<?php echo Text::_('XBCULTURE_EDITOR_OF').' '.$item->ecnt.' ';
                                         echo ($item->ecnt==1)?Text ::_('XBCULTURE_BOOK') : Text::_('XBCULTURE_BOOKS');   ?>
                                     </span></summary>
-         							<?php echo $item->elist; ?>
+         							<?php echo $item->elist['ullist']; ?>
                                   </details>
 							<?php endif; ?> 
 						<?php endif; ?> 
 						<?php if ($item->ocnt>0) : ?>
         					<?php if (($item->brcnt == 1) && ($item->ocnt < 3)) : ?>
-        						<?php echo $item->olist; ?>
+        						<?php echo $item->olist['ullist']; ?>
 							<?php else : ?>
                                   <details>
                                   	<summary><span class="xbnit">
          								<?php echo Text::_('XBCULTURE_OTHER_ROLE_ON').' '.$item->ocnt.' '; 
                                         echo ($item->ocnt==1)?Text ::_('XBCULTURE_BOOK') : Text::_('XBCULTURE_BOOKS');   ?>
                                     </span></summary>
-         							<?php echo $item->olist; ?>
+         							<?php echo $item->olist['ullist']; ?>
                                   </details>
 							<?php endif; ?> 
 						<?php endif; ?> 
 						<?php if ($item->mcnt>0) : ?>
         					<?php if (($item->brcnt == 1) && ($item->mcnt < 3)) : ?>
-        						<?php echo $item->mlist; ?>
+        						<?php echo $item->mlist['ullist']; ?>
 							<?php else : ?>
                                   <details>
                                   	<summary><span class="xbnit">
          								<?php echo Text::_('XBBOOKS_MENTION_IN').' '.$item->mcnt.' ';
                                         echo ($item->mcnt==1)?Text ::_('XBCULTURE_BOOK') : Text::_('XBCULTURE_BOOKS');   ?>
                                     </span></summary>
-         							<?php echo $item->mlist; ?>
+         							<?php echo $item->mlist['ullist']; ?>
                                   </details>
 							<?php endif; ?> 
 						<?php endif; ?> 
@@ -336,6 +342,6 @@
 <div class="clearfix"></div>
 <p><?php echo XbcultureHelper::credit('xbBooks');?></p>
 
-<?php echo LayoutHelper::render('xbculture.modalpvlayout', array('show' => 'pgcfi'), JPATH_ROOT .'/components/com_xbpeople/layouts');   ?>
-  
+<?php echo LayoutHelper::render('xbculture.layoutpvmodal', array(), JPATH_ROOT .'/components/com_xbpeople/layouts');   ?>
+
 
diff --git a/src/com_xbbooks/admin/views/reviews/tmpl/default.php b/src/com_xbbooks/admin/views/reviews/tmpl/default.php
@@ -193,7 +193,8 @@
     						<a href="<?php echo Route::_($relink . $item->id); ?>" title="<?php echo Text::_('XBBOOKS_EDIT_REVIEW'); ?>">
     							<?php echo $item->title; ?>
     						</a>
-							<a href="" data-toggle="modal" data-target="#ajax-opvmodal" data-backdrop="static" onclick="window.pvid= <?php echo $item->id; ?>;">
+							<a href="" data-toggle="modal" data-target="#ajax-opvmodal" data-backdrop="static" 
+							onclick="window.com='books';window.view='bookreview';window.pvid= <?php echo $item->id; ?>;">
             					<i class="far fa-eye"></i>
             				</a>					
     						<br /><span class="xb08 xbnorm"><i><?php echo Text::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias));?></i></span>