Merge branch 'master' of github.com:boonex/dolphin

inc/classes/BxDolCmts.php

@@ -911,9 +911,9 @@ class BxDolCmts extends BxDol
 
     protected function _getUserChoice()
     {
-    	$mixedBp = $mixedDp = false;
+    	$mixedDp = $mixedBpType = $mixedBpFilter = false;
     	if(!isLogged())
-    		return array($mixedBp, $mixedDp);
+    		return array($mixedDp, $mixedBpType, $mixedBpFilter);
 
     	$iUserId = $this->_getAuthorId();
 

template/comment.html

@@ -32,9 +32,9 @@
 						__text__<bx_if:show_more><span class="__style_prefix__-body-see-more">... <a class="bx-def-font-small" href="javascript:void(0)" onclick="__js_object__.showMore(this);"><bx_text:_see_more /></a></span><span style="display:none;"> __text_more__</span></bx_if:show_more>
 					</div>
 					<bx_if:show_attached>
-						<div class="__style_prefix__-attached bx-def-margin-thd-topbottom bx-clearfix">
+						<div class="__style_prefix__-attached bx-clearfix">
 							<bx_repeat:attached>
-								<div class="__style_prefix__-attached-preview bx-def-thumb bx-def-margin-sec-left-auto">
+								<div class="__style_prefix__-attached-preview bx-def-thumb bx-def-margin-thd">
 									<a href="javascript:void(0)" onclick="__js_object__.showImage(this, __id__); return false;" title="<bx_text_attribute:_cmt_view_attached_image />">
 										<img src="<bx_image_url:spacer.gif />" style="background-image:url(__image__)" />
 									</a>

template/css/cmts.css

@@ -137,7 +137,11 @@
     span.cmt-body-see-more a {
 		font-weight: bold;
     }
-
+    
+    div.cmt-attached {
+		margin-left: -5px;
+    	margin-right: -5px;
+    }
     div.cmt-attached-preview,
     div.cmt-attached-preview img {
     	width: 100px;