Răsfoiți Sursa

#24 - Share feature improvements

AntonLV 13 ani în urmă
părinte
comite
2169dc5c49

+ 1 - 0
modules/boonex/timeline/classes/BxTimelineConfig.php

@@ -106,6 +106,7 @@ class BxTimelineConfig extends BxDolModuleConfig
 
         $this->_aShareDefaults = array(
 			'show_do_share_as_button' => false,
+        	'show_do_share_as_button_small' => false,
 			'show_do_share_icon' => true,
 			'show_do_share_label' => false,
 			'show_counter' => true

+ 1 - 1
modules/boonex/timeline/classes/BxTimelineModule.php

@@ -374,7 +374,7 @@ class BxTimelineModule extends BxDolModule
 
     public function serviceGetShareElementBlock($iOwnerId, $sType, $sAction, $iObjectId, $aParams = array())
     {
-    	$aParams = array_merge($aParams, $this->_oConfig->getShareDefaults());
+    	$aParams = array_merge($this->_oConfig->getShareDefaults(), $aParams);
 
     	return $this->_oTemplate->getShareElement($iOwnerId, $sType, $sAction, $iObjectId, $aParams);
     }

+ 6 - 2
modules/boonex/timeline/classes/BxTimelineTemplate.php

@@ -299,7 +299,9 @@ class BxTimelineTemplate extends BxDolModuleTemplate
     	if(empty($aShared) || !is_array($aShared))
     		return '';
 
-		$bShowDoShareAsButton = isset($aParams['show_do_share_as_button']) && $aParams['show_do_share_as_button'] == true;
+		$bShowDoShareAsButtonSmall = isset($aParams['show_do_share_as_button_small']) && $aParams['show_do_share_as_button_small'] == true;
+		$bShowDoShareAsButton = !$bShowDoShareAsButtonSmall && isset($aParams['show_do_share_as_button']) && $aParams['show_do_share_as_button'] == true;
+
 		$bShowDoShareIcon = isset($aParams['show_do_share_icon']) && $aParams['show_do_share_icon'] == true;
 		$bShowDoShareLabel = isset($aParams['show_do_share_label']) && $aParams['show_do_share_label'] == true;
 		$bShowCounter = isset($aParams['show_counter']) && $aParams['show_counter'] === true;
@@ -315,16 +317,18 @@ class BxTimelineTemplate extends BxDolModuleTemplate
     		'href' => 'javascript:void(0)',
     		'title' => _t('_bx_timeline_txt_do_share'),
     		'bx_repeat:attrs' => array(
-    			array('key' => 'class', 'value' => ($bShowDoShareAsButton ? 'bx-btn' : '')),
+    			array('key' => 'class', 'value' => ($bShowDoShareAsButton ? 'bx-btn' : '') . ($bShowDoShareAsButtonSmall ? 'bx-btn bx-btn-small' : '')),
     			array('key' => 'onclick', 'value' => $this->getShareJsClick($iOwnerId, $sType, $sAction, $iObjectId))
     		),
     		'content' => $sDoShare
     	));
 
     	$sStylePrefix = $this->_oConfig->getPrefix('style');
+    	$sStylePrefixShare = $sStylePrefix . '-share-';
     	return $this->parseHtmlByName('share_element_block.html', array(
     		'style_prefix' => $sStylePrefix,
     		'html_id' => $this->_oConfig->getHtmlIds('share', 'main') . $aShared['id'],
+    		'class' => ($bShowDoShareAsButton ? $sStylePrefixShare . 'button' : '') . ($bShowDoShareAsButtonSmall ? $sStylePrefixShare . 'button-small' : ''),
     		'count' => $aShared['shares'],
     		'do_share' => $sDoShare,
     		'bx_if:show_counter' => array(

+ 20 - 1
modules/boonex/timeline/template/css/share.css

@@ -1,10 +1,29 @@
 .bx-tl-share .bx-tl-share-element-holder,
 .bx-tl-share .bx-tl-share-counter-holder {
+	line-height: 20px;
+	line-height: 1.25rem;
+}
+
+.bx-tl-share-button .bx-tl-share-element-holder,
+.bx-tl-share-button .bx-tl-share-counter-holder {
 	line-height: 36px;
 	line-height: 2.2rem;
 }
+
+.bx-tl-share-button-small .bx-tl-share-element-holder,
+.bx-tl-share-button-small .bx-tl-share-counter-holder {
+	line-height: 24px;
+	line-height: 1.6rem;
+}
+
+.bx-tl-share-button .bx-tl-share-counter-holder,
+.bx-tl-share-button-small .bx-tl-share-counter-holder {
+	font-size: 1.5rem;
+}
+
 div.bx-tl-share div.bx-tl-share-element-holder,
 div.bx-tl-share div.bx-tl-share-counter-holder {
 	position: relative;
 	float: left;
-}
+}
+

+ 1 - 1
modules/boonex/timeline/template/share_element_block.html

@@ -1,4 +1,4 @@
-<div id="__html_id__" class="__style_prefix__-share bx-clearfix" bx_share_data_count="__count__">
+<div id="__html_id__" class="__style_prefix__-share __class__ bx-clearfix" bx_share_data_count="__count__">
 	<div class="__style_prefix__-share-element-holder">__do_share__</div>
 	<bx_if:show_counter>
 		<div class="__style_prefix__-share-counter-holder bx-def-margin-sec-left">__counter__</div>