Version 5.0.13

2025-12-19 19:04:57 -08:00
1 parent b89858b2ff
commit 5efe744c5f
@@ -5,7 +5,7 @@ class class_gallery_front_global extends \IPS\Theme\Template
 		$return = '';
 		$return .= <<<IPSCONTENT

-<div id="elApprovePanel" class='ipsBox'>
+<div id="elApprovePanel" class='ipsBox ipsBox--galleryApprovalQueue'>
 	<article class="">
 		<div class='i-padding_3'>
 			<div class="ipsPhotoPanel"> 
@@ -16,31 +16,33 @@ $return .= \IPS\Theme::i()->getTemplate( "global", \IPS\Request::i()->app )->use
 $return .= <<<IPSCONTENT

 				<div class='ipsPhotoPanel__text'>
-					<a href="#user
+					<button type="button" id="user
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $item->author()->member_id, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
-_menu" id="user
+" popovertarget="user
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $item->author()->member_id, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
-" class="ipsTitle ipsTitle--h3" data-ipsmenu="">
+_menu" class="ipsTitle ipsTitle--h3">
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $item->author()->name, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
- &nbsp;<i class="fa-solid fa-caret-down"></i></a>
-					<ul class="ipsMenu ipsMenu_auto ipsMenu_withStem ipsHide" id="user
+<i class="fa-solid fa-caret-down"></i></button>
+					<i-dropdown popover id="user
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $item->author()->member_id, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
 _menu">
-						
+						<div class="iDropdown">
+							<ul class="iDropdown__items">
+								
 IPSCONTENT;

 if ( \IPS\Member::loggedIn()->modPermission('mod_can_warn') ):
 $return .= <<<IPSCONTENT

-							<li class='ipsMenu_item'><a href='
+									<li><a href='
 IPSCONTENT;

 $return .= htmlspecialchars( \IPS\Http\Url::internal( "app=core&module=system&controller=warnings&do=warn&id={$item->author()->member_id}&ref={$ref}", null, "warn_add", array( $item->author()->members_seo_name ), 0 ), ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', TRUE );
@@ -61,25 +63,25 @@ IPSCONTENT;
 $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'warn_user', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array(  ) );
 $return .= <<<IPSCONTENT
 </a></li>
-						
+								
 IPSCONTENT;

 endif;
 $return .= <<<IPSCONTENT

-						
+								
 IPSCONTENT;

 if ( $item->author()->member_id != \IPS\Member::loggedIn()->member_id ):
 $return .= <<<IPSCONTENT

-							
+									
 IPSCONTENT;

 if ( $item->author()->members_bitoptions['bw_is_spammer'] ):
 $return .= <<<IPSCONTENT

-								<li class='ipsMenu_item' data-ipsMenuValue='spamFlagButton'><a href='
+										<li><a href='
 IPSCONTENT;

 $return .= htmlspecialchars( \IPS\Http\Url::internal( "app=core&module=system&controller=moderation&do=flagAsSpammer&id={$item->author()->member_id}&s=0" . "&csrfKey=" . \IPS\Session::i()->csrfKey, null, "flag_as_spammer", array( $item->author()->members_seo_name ), 0 ), ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', TRUE );
@@ -89,42 +91,42 @@ IPSCONTENT;

 $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'spam_unflag_confirm', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array(  ) );
 $return .= <<<IPSCONTENT
-">
+" data-ipsMenuValue='spamFlagButton'>
 IPSCONTENT;

 $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'spam_unflag', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array(  ) );
 $return .= <<<IPSCONTENT
 </a></li>
-							
+									
 IPSCONTENT;

 else:
 $return .= <<<IPSCONTENT

-								<li class='ipsMenu_item' data-ipsMenuValue='spamFlagButton'><a href='
+										<li><a href='
 IPSCONTENT;

 $return .= htmlspecialchars( \IPS\Http\Url::internal( "app=core&module=system&controller=moderation&do=flagAsSpammer&id={$item->author()->member_id}&s=1" . "&csrfKey=" . \IPS\Session::i()->csrfKey, null, "flag_as_spammer", array( $item->author()->members_seo_name ), 0 ), ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', TRUE );
 $return .= <<<IPSCONTENT
-' data-confirm>
+' data-confirm data-ipsMenuValue='spamFlagButton'>
 IPSCONTENT;

 $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'spam_flag', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array(  ) );
 $return .= <<<IPSCONTENT
 </a></li>
-							
+									
 IPSCONTENT;

 endif;
 $return .= <<<IPSCONTENT

-						
+								
 IPSCONTENT;

 endif;
 $return .= <<<IPSCONTENT

-						<li class="ipsMenu_item"><a href='
+								<li><a href='
 IPSCONTENT;

 $return .= htmlspecialchars( \IPS\Http\Url::internal( "app=core&module=messaging&controller=messenger&do=compose&to={$item->author()->member_id}", null, "messenger_compose", array(), 0 ), ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', TRUE );
@@ -145,7 +147,9 @@ IPSCONTENT;
 $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'message_send', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array(  ) );
 $return .= <<<IPSCONTENT
 </a></li>
-					</ul>
+							</ul>
+						</div>
+					</i-dropdown>
 					
 IPSCONTENT;

@@ -200,7 +204,7 @@ $return .= <<<IPSCONTENT
 			</div>
 		</div>
 		<div class='i-background_2 i-padding_3'>
-			<div class='ipsBox'>
+			<div class='ipsBox ipsBox--galleryApprovalQueueItem'>
 				<h2 class="ipsBox__header"><a href="
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $item->url(), ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
@@ -261,7 +265,7 @@ IPSCONTENT;
 if ( $reason = $item->approvalQueueReason() ):
 $return .= <<<IPSCONTENT

-	<div class='ipsBox'>
+	<div class='ipsBox ipsBox--galleryApprovalQueueReason'>
 		<div class='ipsBox__header'>
 IPSCONTENT;

@@ -964,42 +968,40 @@ if ( $comment->canEdit() || $comment->canSplit() || $comment->canHide() ):
 $return .= <<<IPSCONTENT

 						<li>
-							<a href="#elControlsCommentsSub_
+							<button type="button" id="elControlsCommentsSub_
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $comment->$idField, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
-_menu" id="elControlsCommentsSub_
+" popovertarget="elControlsCommentsSub_
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $comment->$idField, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
-" data-ipsmenu data-ipsmenu-appendto="#comment-
-IPSCONTENT;
-$return .= \IPS\Theme\Template::htmlspecialchars( $comment->$idField, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
-$return .= <<<IPSCONTENT
-_wrap"><span>
+_menu"><span>
 IPSCONTENT;

 $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'moderator_tools', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array(  ) );
 $return .= <<<IPSCONTENT
-</span><i class="fa-solid fa-caret-down"></i></a>
-							<ul id="elControlsCommentsSub_
+</span><i class="fa-solid fa-caret-down"></i></button>
+							<i-dropdown popover id="elControlsCommentsSub_
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $comment->$idField, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
-_menu" class="ipsMenu ipsMenu_auto ipsHide">
-								
+_menu">
+								<div class="iDropdown">
+									<ul class="iDropdown__items">
+										
 IPSCONTENT;

 if ( $comment->canEdit() ):
 $return .= <<<IPSCONTENT

-									
+											
 IPSCONTENT;

 if ( $comment->mapped('first') and $comment->item()->canEdit() ):
 $return .= <<<IPSCONTENT

-										<li class="ipsMenu_item"><a href="
+												<li><a href="
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $comment->item()->url()->setQueryString( 'do', 'edit' ), ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
@@ -1009,13 +1011,13 @@ IPSCONTENT;
 $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'edit', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array(  ) );
 $return .= <<<IPSCONTENT
 </a></li>
-									
+											
 IPSCONTENT;

 else:
 $return .= <<<IPSCONTENT

-										<li class="ipsMenu_item"><a href="
+												<li><a href="
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $comment->url('edit'), ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
@@ -1025,25 +1027,25 @@ IPSCONTENT;
 $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'edit', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array(  ) );
 $return .= <<<IPSCONTENT
 </a></li>
-									
+											
 IPSCONTENT;

 endif;
 $return .= <<<IPSCONTENT

-								
+										
 IPSCONTENT;

 endif;
 $return .= <<<IPSCONTENT

-								
+										
 IPSCONTENT;

 if ( $comment->canSplit() ):
 $return .= <<<IPSCONTENT

-									<li class="ipsMenu_item"><a href="
+											<li><a href="
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $comment->url('split'), ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
@@ -1058,19 +1060,19 @@ IPSCONTENT;
 $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'split', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array(  ) );
 $return .= <<<IPSCONTENT
 </a></li>
-								
+										
 IPSCONTENT;

 endif;
 $return .= <<<IPSCONTENT

-								
+										
 IPSCONTENT;

 if ( \IPS\IPS::classUsesTrait( $comment, 'IPS\Content\Hideable' ) and $comment->canHide() ):
 $return .= <<<IPSCONTENT

-									<li class="ipsMenu_item"><a href="
+											<li><a href="
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $comment->url('hide')->csrf(), ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
@@ -1085,13 +1087,15 @@ IPSCONTENT;
 $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'hide', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array(  ) );
 $return .= <<<IPSCONTENT
 </a></li>
-								
+										
 IPSCONTENT;

 endif;
 $return .= <<<IPSCONTENT

-							</ul>
+									</ul>
+								</div>
+							</i-dropdown>
 						</li>
 					
 IPSCONTENT;
@@ -1300,19 +1304,15 @@ IPSCONTENT;

 $sprintf = array($comment->author()->name); $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'ignoring_content', ENT_DISALLOWED, 'UTF-8', FALSE ), FALSE, array( 'sprintf' => $sprintf ) );
 $return .= <<<IPSCONTENT
- <a href='#elIgnoreComment_
+ <button type="button" id="elIgnoreComment_
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $comment->$idField, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
-_menu' data-ipsMenu data-ipsMenu-menuID='elIgnoreComment_
+" popovertarget="elIgnoreComment_
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $comment->$idField, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
-_menu' data-ipsMenu-appendTo='#elIgnoreComment_
-IPSCONTENT;
-$return .= \IPS\Theme\Template::htmlspecialchars( $comment->$idField, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
-$return .= <<<IPSCONTENT
-' data-action="ignoreOptions" title='
+_menu" data-action="ignoreOptions" title='
 IPSCONTENT;

 $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'see_post_ignore_options', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array(  ) );
@@ -1322,31 +1322,33 @@ IPSCONTENT;

 $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'options', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array(  ) );
 $return .= <<<IPSCONTENT
- <i class='fa-solid fa-caret-down'></i></a>
-		<ul class='ipsMenu ipsHide' id='elIgnoreComment_
+ <i class='fa-solid fa-caret-down'></i></button>
+		<i-dropdown popover id="elIgnoreComment_
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $comment->$idField, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
-_menu'>
-			<li class='ipsMenu_item' data-ipsMenuValue='showPost'><a href='#'>
+_menu">
+			<div class="iDropdown">
+				<ul class="iDropdown__items">
+					<li><button type="button" data-ipsMenuValue='showPost'>
 IPSCONTENT;

 $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'show_this_comment', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array(  ) );
 $return .= <<<IPSCONTENT
-</a></li>
-			<li class='ipsMenu_sep'><hr></li>
-			<li class='ipsMenu_item' data-ipsMenuValue='stopIgnoring'><a href='
+</button></li>
+					<li><hr></li>
+					<li><a href='
 IPSCONTENT;

 $return .= htmlspecialchars( \IPS\Http\Url::internal( "app=core&module=system&controller=ignore&do=remove&id={$comment->author()->member_id}", null, "ignore", array(), 0 ), ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', TRUE );
 $return .= <<<IPSCONTENT
-'>
+' data-ipsMenuValue='stopIgnoring'>
 IPSCONTENT;

 $sprintf = array($comment->author()->name); $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'stop_ignoring_posts_by', ENT_DISALLOWED, 'UTF-8', FALSE ), FALSE, array( 'sprintf' => $sprintf ) );
 $return .= <<<IPSCONTENT
 </a></li>
-			<li class='ipsMenu_item'><a href='
+					<li><a href='
 IPSCONTENT;

 $return .= htmlspecialchars( \IPS\Http\Url::internal( "app=core&module=system&controller=ignore", null, "ignore", array(), 0 ), ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', TRUE );
@@ -1357,7 +1359,9 @@ IPSCONTENT;
 $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'change_ignore_preferences', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array(  ) );
 $return .= <<<IPSCONTENT
 </a></li>
-		</ul>
+				</ul>
+			</div>
+		</i-dropdown>
 	</div>

 IPSCONTENT;
@@ -3118,7 +3122,7 @@ IPSCONTENT;
 endif;
 $return .= <<<IPSCONTENT
 >
-		<figure class='ipsData__image'>
+		<div class="ipsData__image" aria-hidden="true">
 			
 IPSCONTENT;

@@ -3147,7 +3151,7 @@ IPSCONTENT;
 endif;
 $return .= <<<IPSCONTENT

-		</figure>
+		</div>
 		<div class='ipsData__content'>
 			<div class='ipsData__main'>
 				<div class='ipsData__title'>
@@ -4335,24 +4339,17 @@ IPSCONTENT;
 if ( $review->canEditResponse() OR $review->canDeleteResponse() ):
 $return .= <<<IPSCONTENT

-						<a href="#elControlsReviews_
+						<button type="button" id="elControlsReviews_
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $review->id, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
-_response_menu" class="ipsEntry__topButton ipsEntry__topButton--ellipsis" id="elControlsReviews_
+_response" popovertarget="elControlsReviews_
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $review->id, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
-_response" title="
-IPSCONTENT;
-
-$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'more_options', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array(  ) );
-$return .= <<<IPSCONTENT
-" data-ipsmenu data-ipsmenu-appendto="#review-
-IPSCONTENT;
-$return .= \IPS\Theme\Template::htmlspecialchars( $review->id, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
-$return .= <<<IPSCONTENT
-_wrap"><i class="fa-solid fa-ellipsis"></i></a>
+_response_menu" class="ipsEntry__topButton ipsEntry__topButton--ellipsis">
+							<i class="fa-solid fa-ellipsis"></i>
+						</button>
 					
 IPSCONTENT;

@@ -4368,18 +4365,20 @@ IPSCONTENT;
 if ( $review->canEditResponse() OR $review->canDeleteResponse() ):
 $return .= <<<IPSCONTENT

-					<ul class="ipsMenu ipsMenu_narrow ipsHide" id="elControlsReviews_
+					<i-dropdown id="elControlsReviews_
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $review->id, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
-_response_menu">
-						
+_response_menu" popover>
+						<div class="iDropdown">
+							<ul class="iDropdown__items">
+								
 IPSCONTENT;

 if ( $review->canEditResponse() ):
 $return .= <<<IPSCONTENT

-							<li class="ipsMenu_item"><a href="
+									<li><a href="
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $review->url('editResponse'), ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
@@ -4394,19 +4393,19 @@ IPSCONTENT;
 $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'edit', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array(  ) );
 $return .= <<<IPSCONTENT
 </a></li>
-						
+								
 IPSCONTENT;

 endif;
 $return .= <<<IPSCONTENT

-						
+								
 IPSCONTENT;

 if ( $review->canDeleteResponse() ):
 $return .= <<<IPSCONTENT

-							<li class="ipsMenu_item"><a href="
+									<li><a href="
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $review->url('deleteResponse')->csrf(), ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
@@ -4416,13 +4415,15 @@ IPSCONTENT;
 $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'delete', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array(  ) );
 $return .= <<<IPSCONTENT
 </a></li>
-						
+								
 IPSCONTENT;

 endif;
 $return .= <<<IPSCONTENT

-					</ul>
+							</ul>
+						</div>
+					</i-dropdown>
 				
 IPSCONTENT;

@@ -4584,42 +4585,40 @@ if ( $review->canEdit() || $review->canSplit() ):
 $return .= <<<IPSCONTENT

 							<li>
-								<a href="#elControlsReviewsSub_
+								<button type="button" id="elControlsReviewsSub_
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $review->id, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
-_menu" id="elControlsReviewsSub_
+" popovertarget="elControlsReviewsSub_
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $review->id, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
-" data-ipsmenu data-ipsmenu-appendto="#review-
-IPSCONTENT;
-$return .= \IPS\Theme\Template::htmlspecialchars( $review->id, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
-$return .= <<<IPSCONTENT
-_wrap"><span>
+_menu"><span>
 IPSCONTENT;

 $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'options', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array(  ) );
 $return .= <<<IPSCONTENT
-</span><i class="fa-solid fa-caret-down"></i></a>
-								<ul id="elControlsReviewsSub_
+</span><i class="fa-solid fa-caret-down"></i></button>
+								<i-dropdown popover id="elControlsReviewsSub_
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $review->id, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
-_menu" class="ipsMenu ipsMenu_narrow ipsHide">
-									
+_menu">
+									<div class="iDropdown">
+										<ul class="iDropdown__items">
+											
 IPSCONTENT;

 if ( $review->canEdit() ):
 $return .= <<<IPSCONTENT

-										
+												
 IPSCONTENT;

 if ( $review->mapped('first') and $review->item()->canEdit() ):
 $return .= <<<IPSCONTENT

-											<li class="ipsMenu_item"><a href="
+													<li><a href="
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $review->item()->url()->setQueryString( 'do', 'edit' ), ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
@@ -4629,13 +4628,13 @@ IPSCONTENT;
 $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'edit', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array(  ) );
 $return .= <<<IPSCONTENT
 </a></li>
-										
+												
 IPSCONTENT;

 else:
 $return .= <<<IPSCONTENT

-											<li class="ipsMenu_item"><a href="
+													<li><a href="
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $review->url('edit'), ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
@@ -4645,25 +4644,25 @@ IPSCONTENT;
 $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'edit', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array(  ) );
 $return .= <<<IPSCONTENT
 </a></li>
-										
+												
 IPSCONTENT;

 endif;
 $return .= <<<IPSCONTENT

-									
+											
 IPSCONTENT;

 endif;
 $return .= <<<IPSCONTENT

-									
+											
 IPSCONTENT;

 if ( $review->canSplit() ):
 $return .= <<<IPSCONTENT

-										<li class="ipsMenu_item"><a href="
+												<li><a href="
 IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $review->url('split'), ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
@@ -4678,13 +4677,15 @@ IPSCONTENT;
 $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'split', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array(  ) );
 $return .= <<<IPSCONTENT
 </a></li>
-									
+											
 IPSCONTENT;

 endif;
 $return .= <<<IPSCONTENT

-								</ul>
+										</ul>
+									</div>
+								</i-dropdown>
 							</li>
 						
 IPSCONTENT;
@@ -5706,7 +5707,7 @@ IPSCONTENT;

 IPSCONTENT;

-if ( $image ):
+if ( $image or $itemData['image_media'] ):
 $return .= <<<IPSCONTENT


@@ -5730,7 +5731,7 @@ $return .= <<<IPSCONTENT
 	
 IPSCONTENT;

-if ( $image ):
+if ( $image or $itemData['image_media'] ):
 $return .= <<<IPSCONTENT

 		<div class='ipsStreamItem__content-thumb ipsStreamItem__content-thumb--gallery'>
@@ -5745,7 +5746,62 @@ IPSCONTENT;
 $sprintf = array($indexData['index_title']); $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'view_this_image', ENT_DISALLOWED, 'UTF-8', FALSE ), FALSE, array( 'sprintf' => $sprintf ) );
 $return .= <<<IPSCONTENT
 ' class='ipsFigure__main'>
-					<img src='
+				    
+IPSCONTENT;
+
+if ( $imageObj->media ):
+$return .= <<<IPSCONTENT
+
+				        <video loading="lazy"
+IPSCONTENT;
+
+if ( $imageObj->masked_file_name  ):
+$return .= <<<IPSCONTENT
+ poster="
+IPSCONTENT;
+
+$return .= \IPS\File::get( "gallery_Images", $imageObj->masked_file_name )->url;
+$return .= <<<IPSCONTENT
+"
+IPSCONTENT;
+
+else:
+$return .= <<<IPSCONTENT
+ preload="metadata"
+IPSCONTENT;
+
+endif;
+$return .= <<<IPSCONTENT
+>
+				            <source src="
+IPSCONTENT;
+
+$return .= \IPS\File::get( "gallery_Images", $imageObj->original_file_name )->url;
+$return .= <<<IPSCONTENT
+
+IPSCONTENT;
+
+if ( !$imageObj->masked_file_name  ):
+$return .= <<<IPSCONTENT
+#t=1
+IPSCONTENT;
+
+endif;
+$return .= <<<IPSCONTENT
+" type='
+IPSCONTENT;
+$return .= \IPS\Theme\Template::htmlspecialchars( $imageObj->file_type, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
+$return .= <<<IPSCONTENT
+' />
+				        </video>
+				        <i class="ipsFigure__play"></i>
+				    
+IPSCONTENT;
+
+else:
+$return .= <<<IPSCONTENT
+
+					    <img src='
 IPSCONTENT;

 $return .= \IPS\File::get( "gallery_Images", $image )->url;
@@ -5755,6 +5811,12 @@ IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $itemData['image_caption'], ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
 " loading="lazy">
+					
+IPSCONTENT;
+
+endif;
+$return .= <<<IPSCONTENT
+
 				</a>
 				
 IPSCONTENT;
@@ -5779,7 +5841,7 @@ $return .= <<<IPSCONTENT
 	
 IPSCONTENT;

-if ( $image ):
+if ( $image or $itemData['image_media'] ):
 $return .= <<<IPSCONTENT

 		<div class='ipsStreamItem__content-thumb ipsStreamItem__content-thumb--gallery' 
@@ -5804,7 +5866,62 @@ IPSCONTENT;
 $sprintf = array($indexData['index_title']); $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'view_this_image', ENT_DISALLOWED, 'UTF-8', FALSE ), FALSE, array( 'sprintf' => $sprintf ) );
 $return .= <<<IPSCONTENT
 ' class='ipsFigure__main'>
-					<img src='
+				    
+IPSCONTENT;
+
+if ( $imageObj->media ):
+$return .= <<<IPSCONTENT
+
+				        <video loading="lazy"
+IPSCONTENT;
+
+if ( $imageObj->masked_file_name  ):
+$return .= <<<IPSCONTENT
+ poster="
+IPSCONTENT;
+
+$return .= \IPS\File::get( "gallery_Images", $imageObj->masked_file_name )->url;
+$return .= <<<IPSCONTENT
+"
+IPSCONTENT;
+
+else:
+$return .= <<<IPSCONTENT
+ preload="metadata"
+IPSCONTENT;
+
+endif;
+$return .= <<<IPSCONTENT
+>
+				            <source src="
+IPSCONTENT;
+
+$return .= \IPS\File::get( "gallery_Images", $imageObj->original_file_name )->url;
+$return .= <<<IPSCONTENT
+
+IPSCONTENT;
+
+if ( !$imageObj->masked_file_name  ):
+$return .= <<<IPSCONTENT
+#t=1
+IPSCONTENT;
+
+endif;
+$return .= <<<IPSCONTENT
+" type='
+IPSCONTENT;
+$return .= \IPS\Theme\Template::htmlspecialchars( $imageObj->file_type, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
+$return .= <<<IPSCONTENT
+' />
+				        </video>
+				        <i class="ipsFigure__play"></i>
+				    
+IPSCONTENT;
+
+else:
+$return .= <<<IPSCONTENT
+
+					    <img src='
 IPSCONTENT;

 $return .= \IPS\File::get( "gallery_Images", $image )->url;
@@ -5814,6 +5931,12 @@ IPSCONTENT;
 $return .= \IPS\Theme\Template::htmlspecialchars( $indexData['index_title'], ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
 $return .= <<<IPSCONTENT
 " loading="lazy">
+					
+IPSCONTENT;
+
+endif;
+$return .= <<<IPSCONTENT
+
 				</a>
 				
 IPSCONTENT;