Explorar el Código

Ticket #5282 - Group picture and Cover block.

AntonLV hace 5 meses
padre
commit
fda82a349f

+ 19 - 15
inc/classes/BxDolEmbed.php

@@ -99,25 +99,29 @@ class BxDolEmbed extends BxDolFactoryObject
         // override this function in particular embed provider class
         // override this function in particular embed provider class
     }
     }
 
 
-    public function getData ($sUrl, $sTheme)
+    public function getData ($sUrl, $sTheme, $bForcedly = false)
     {
     {
         $sUrl = $this->cleanYoutubeUrl($sUrl);
         $sUrl = $this->cleanYoutubeUrl($sUrl);
 
 
-        $aLocal = $this->_oDb->getLocalInfo($sUrl, $sTheme);
-        
-        $bRevalidate = false;
-        if($this->_iLifetime && (int)$aLocal['added'] + $this->_iLifetime < time()) {
-            $this->_oDb->deleteLocal([
-                'url' => $sUrl,
-                'theme' => $sTheme
-            ]);
-
-            $bRevalidate = true;
-        }
+        if($this->_sTableData) {
+            $aLocal = $this->_oDb->getLocalInfo($sUrl, $sTheme);
+
+            $bRevalidate = false;
+            if($this->_iLifetime && (int)$aLocal['added'] + $this->_iLifetime < time()) {
+                $this->_oDb->deleteLocal([
+                    'url' => $sUrl,
+                    'theme' => $sTheme
+                ]);
 
 
-        $sData = false;
-        if($bRevalidate || (($sKey = 'data') && !($sData = $aLocal[$sKey] ?? false)))
-            $sData = $this->{'_getData' . ($sData !== false ? 'Empty' : ($this->_bAsync ? 'Async' : ''))}($sUrl, $sTheme);
+                $bRevalidate = true;
+            }
+
+            $sData = false;
+            if($bRevalidate || (($sKey = 'data') && !($sData = $aLocal[$sKey] ?? false)))
+                $sData = $this->{'_getData' . ($sData !== false ? 'Empty' : ($this->_bAsync && !$bForcedly ? 'Async' : ''))}($sUrl, $sTheme);
+        }
+        else
+            $sData = $this->_getData($sUrl, $sTheme);
 
 
         return json_decode($sData, true);
         return json_decode($sData, true);
     }
     }

+ 14 - 0
modules/base/groups/template/cover_block.html

@@ -15,6 +15,20 @@
                 </div>
                 </div>
             </bx_if:show_cover>
             </bx_if:show_cover>
             <div class="bx-base-pofile-cover-info relative mx-auto px-6 ">
             <div class="bx-base-pofile-cover-info relative mx-auto px-6 ">
+                <div class="bx-base-pofile-ci-cnt bx-def-padding-leftright">
+                    <bx_if:show_avatar>
+                        <div class="bx-base-pofile-cover-thumb __add_class__">
+                            <a class="bx-base-pofile-cover-thumb" href="javascript:" <bx_if:is_avatar>onclick="$('#__picture_popup_id__').dolPopupImage('__picture_url__', $(this).parent()); event.stopPropagation();"</bx_if:is_avatar>>
+                                <img class="bx-base-pofile-unit-thumb bx-def-ava-big bx-def-ava-big-size rounded-full ring-4 mx-auto ring-white dark:ring-gray-900 __img_class__ bx-image-edit-source-__unique_id__" src="__ava_url__" <bx_if:show_ava_letter> style="display:none" </bx_if:show_ava_letter> />
+                                <p class="bx-base-pofile-unit-thumb bx-def-ava-big bx-def-ava-big-size flex items-center justify-center box-border m-0 rounded-full ring-4 mx-auto ring-white dark:ring-gray-900 text-white font-bold text-5xl __img_class__-placeholder" style="background-color:rgba(__color__);<bx_if:show_ava_image>display:none</bx_if:show_ava_image>" >__letter__</p>
+                            </a>
+                            <bx_if:show_online>
+                                <div class="bx-base-pofile-unit-online"></div>
+                            </bx_if:show_online>
+                            __picture_tweak__
+                        </div>
+                    </bx_if:show_avatar>
+                </div>
                 <div class="bx-base-pofile-cover-user relative flex flex-col flex-colmt-6 pt-6 sm:pb-1">
                 <div class="bx-base-pofile-cover-user relative flex flex-col flex-colmt-6 pt-6 sm:pb-1">
                     <div class="bx-base-profile-cover-title-bages min-w-0 flex-1 mb-4">
                     <div class="bx-base-profile-cover-title-bages min-w-0 flex-1 mb-4">
                         <bx_if:show_title_as_tag>
                         <bx_if:show_title_as_tag>

+ 17 - 0
modules/boonex/artificer/data/template/mod_groups/cover_block.html

@@ -12,6 +12,23 @@
                 </div>
                 </div>
             </bx_if:show_cover>
             </bx_if:show_cover>
             <div class="bx-base-pofile-cover-info relative mx-auto px-6">
             <div class="bx-base-pofile-cover-info relative mx-auto px-6">
+                <div class="bx-base-pofile-ci-cnt relative flex flex-col items-center -mt-24">
+                    <bx_if:show_avatar>
+                        <div class="bx-base-pofile-cover-thumb relative inline-flex justify-center __add_class__">
+                            <a class="bx-base-pofile-cover-thumb" href="__picture_href__" href="javascript:" <bx_if:is_avatar>onclick="$('#__picture_popup_id__').dolPopupImage('__picture_url__', $(this).parent()); event.stopPropagation();"</bx_if:is_avatar>>
+                                <img class="bx-base-pofile-unit-thumb bx-def-ava-big bx-def-ava-big-size rounded-full ring-4 mx-auto ring-white dark:ring-gray-900 h-48 w-48 lg:h-32 lg:w-32 __img_class__ bx-image-edit-source-__unique_id__" src="__ava_url__"  <bx_if:show_ava_letter> style="display:none" </bx_if:show_ava_letter> />
+                                <p class="bx-base-pofile-unit-thumb bx-def-ava-big bx-def-ava-big-size flex items-center justify-center box-border m-0 rounded-full ring-4 mx-auto ring-white dark:ring-gray-900 h-48 w-48 lg:h-32 lg:w-32 text-white font-bold text-5xl __img_class__-placeholder" style="background-color:rgba(__color__);<bx_if:show_ava_image>display:none</bx_if:show_ava_image>" >__letter__</p>
+                            </a>
+                            <bx_if:show_online>
+                                <div class="bx-base-pofile-unit-online"></div>
+                            </bx_if:show_online>
+                            __picture_tweak__
+                        </div>
+                    </bx_if:show_avatar>
+                    <bx_if:show_avatar_placeholder>
+                        <div class="bx-base-pofile-cover-thumb-placeholder h-24 lg:h-36"></div>
+                    </bx_if:show_avatar_placeholder>
+                </div>
                 <div class="bx-base-pofile-cover-user relative flex flex-col flex-colmt-6 pt-6 sm:pb-1">
                 <div class="bx-base-pofile-cover-user relative flex flex-col flex-colmt-6 pt-6 sm:pb-1">
                     <div class="bx-base-profile-cover-title-bages min-w-0 flex-1 mb-4">
                     <div class="bx-base-profile-cover-title-bages min-w-0 flex-1 mb-4">
                         <bx_if:show_title_as_tag>
                         <bx_if:show_title_as_tag>