Ticket #438 - Some usability improvements.

inc/classes/BxDolFavorite.php

@@ -203,8 +203,7 @@ class BxDolFavorite extends BxDolObject
         if($bPerformed && !$bUndo)
         	return array('code' => 3, 'msg' => _t('_favorite_err_duplicate_favorite'));
 
-        $iId = (int)$this->_oQuery->{($bPerformUndo ? 'un' : '') . 'doFavorite'}($iObjectId, $iAuthorId);
-        if($iId == 0)
+        if(!$this->_oQuery->{($bPerformUndo ? 'un' : '') . 'doFavorite'}($iObjectId, $iAuthorId))
             return array('code' => 4, 'msg' => _t('_favorite_err_cannot_perform_action'));
 
         if(!$bPerformUndo)
@@ -212,14 +211,13 @@ class BxDolFavorite extends BxDolObject
 
         $this->_triggerValue($bPerformUndo ? -1 : 1);
 
-        bx_alert($this->_sSystem, ($bPerformUndo ? 'un' : '') . 'favorite', $iObjectId, $iAuthorId, array('favorite_id' => $iId, 'favorite_author_id' => $iAuthorId, 'object_author_id' => $iObjectAuthorId));
-        bx_alert('favorite', ($bPerformUndo ? 'un' : '') . 'do', $iId, $iAuthorId, array('object_system' => $this->_sSystem, 'object_id' => $iObjectId, 'object_author_id' => $iObjectAuthorId));
+        bx_alert($this->_sSystem, ($bPerformUndo ? 'un' : '') . 'favorite', $iObjectId, $iAuthorId, array('favorite_author_id' => $iAuthorId, 'object_author_id' => $iObjectAuthorId));
+        bx_alert('favorite', ($bPerformUndo ? 'un' : '') . 'do', 0, $iAuthorId, array('object_system' => $this->_sSystem, 'object_id' => $iObjectId, 'object_author_id' => $iObjectAuthorId));
 
         $aFavorite = $this->_oQuery->getFavorite($iObjectId);
         return array(
         	'eval' => $this->getJsObjectName() . '.onFavorite(oData, oElement)',
         	'code' => 0, 
-        	'id' => $iId,
         	'count' => $aFavorite['count'],
         	'countf' => (int)$aFavorite['count'] > 0 ? $this->_getLabelCounter($aFavorite['count']) : '',
             'label_icon' => $this->_getIconDoFavorite(!$bPerformed),
@@ -230,7 +228,7 @@ class BxDolFavorite extends BxDolObject
 
     protected function _getIconDoFavorite($bPerformed)
     {
-    	return $bPerformed && $this->isUndo() ?  'star-o' : 'star';
+    	return $bPerformed && $this->isUndo() ?  'heart-o' : 'heart';
     }
 
     protected function _getTitleDoFavorite($bPerformed)

template/css/favorite.css

@@ -1,11 +1,3 @@
-/*--- Do Form ---*/
-div.bx-favorite-do-form {}
-div.bx-favorite-do-form-cnt {
-	min-width: 220px;
-	min-width: 13.75rem;
-	overflow: hidden;
-}
-
 /*--- Favorited By List ---*/
 div.bx-favorite-by-list {}
 div.bx-favorite-by-list-cnt {

template/favorite_do_favorite.html

@@ -1 +1 @@
-<a id="__html_id__" class="__style_prefix__-do-favorite __class__" href="javascript:void(0)" <bx_if:show_onclick>onclick="javascript:__js_object__.favorite(this)"</bx_if:show_onclick> title="__title__">__do_favorite__</a>
+<a id="__html_id__" class="__style_prefix__-do-favorite __class__" href="javascript:void(0)" <bx_if:show_onclick>onclick="javascript:__onclick__"</bx_if:show_onclick> title="__title__">__do_favorite__</a>

template/scripts/BxBaseFavorite.php

@@ -199,7 +199,7 @@ class BxBaseFavorite extends BxDolFavorite
         	'bx_if:show_onclick' => array(
         		'condition' => !$bDisabled,
         		'content' => array(
-        			'js_object' => $this->getJsObjectName()
+        			'onclick' => $this->getJsClick()
         		)
         	),
             'do_favorite' => $this->_getLabelDoFavorite($aParams),