Parcourir la source

#1339 - Embeds for all content types

RomanL il y a 4 ans
Parent
commit
680e0abcd7

+ 7 - 0
inc/js/embed.js

@@ -0,0 +1,7 @@
+$(document).ready(function() {
+    $( "a" ).each(function(index) {
+        if ($(this).attr('href') == 'javascript:void(0)' || $(this).attr('href') == 'javascript:'){
+            $(this).attr('target', '_self');
+        }
+    });
+})

+ 2 - 2
modules/base/general/classes/BxBaseModGeneralModule.php

@@ -98,7 +98,7 @@ class BxBaseModGeneralModule extends BxDolModule
         $this->$sMethodName();
     }
     
-    public function actionEmbed($iContentId, $sUnitTemplate = '')
+    public function actionEmbed($iContentId, $sUnitTemplate = '', $sAddCode = '')
     {
         $oTemplate = BxDolTemplate::getInstance();
         
@@ -109,7 +109,7 @@ class BxBaseModGeneralModule extends BxDolModule
         if(empty($sUnitTemplate))
             $sUnitTemplate = 'unit_gallery.html';
 
-        $oTemplate->getEmbed($this->_oTemplate->unit($aContentInfo, true, $sUnitTemplate));
+        $oTemplate->getEmbed($this->_oTemplate->unit($aContentInfo, true, $sUnitTemplate) . $sAddCode);
     }
    
 	public function subactionDelete()

+ 1 - 1
modules/base/profile/classes/BxBaseModProfileModule.php

@@ -89,7 +89,7 @@ class BxBaseModProfileModule extends BxBaseModGeneralModule implements iBxDolCon
         echo json_encode($aEntries);
     }
     
-    public function actionEmbed($iContentId, $sUnitTemplate = '')
+    public function actionEmbed($iContentId, $sUnitTemplate = '', $sAddCode = '')
     {
         return parent::actionEmbed($iContentId, 'unit_with_cover.html');
     }

+ 1 - 1
modules/boonex/albums/classes/BxAlbumsModule.php

@@ -37,7 +37,7 @@ class BxAlbumsModule extends BxBaseModTextModule
         ));
     }
     
-    public function actionEmbed($iContentId, $sUnitTemplate = '')
+    public function actionEmbed($iContentId, $sUnitTemplate = '', $sAddCode = '')
     {
         return $this->_oTemplate->getJsCode('main') . parent::actionEmbed($iContentId);
     }

+ 5 - 3
modules/boonex/polls/classes/BxPollsModule.php

@@ -46,9 +46,11 @@ class BxPollsModule extends BxBaseModTextModule
         ));
     }
     
-    public function actionEmbed($iContentId, $sUnitTemplate = '')
+    public function actionEmbed($iContentId, $sUnitTemplate = '', $sAddCode = '')
     {
-        return parent::actionEmbed($iContentId, 'unit_embed_common.html');
+        $this->_oTemplate->addJs(array('entry.js'));
+        $this->_oTemplate->addCss(array('entry.css'));
+        return parent::actionEmbed($iContentId, 'unit_embed_common.html', $this->_oTemplate->getJsCode('entry'));
     }
 
     public function actionEmbedEntry($iId = 0)
@@ -61,7 +63,7 @@ class BxPollsModule extends BxBaseModTextModule
         array_walk($aParams, function(&$sValue) {
             $sValue = bx_process_input($sValue);
         });
-
+        
         $this->_oTemplate->embedEntry($aContentInfo, $aParams);
     }
 

+ 1 - 1
modules/boonex/videos/classes/BxVideosModule.php

@@ -25,7 +25,7 @@ class BxVideosModule extends BxBaseModTextModule
         if ($aRes) echo $aRes['embed'];
     }
     
-    public function actionEmbed($iContentId, $sUnitTemplate = '')
+    public function actionEmbed($iContentId, $sUnitTemplate = '', $sAddCode = '')
     {
         return parent::actionEmbed($iContentId, 'unit_gallery_embed.html');
     }