#1 - Comments.

install/sql/v70.sql

@@ -2946,8 +2946,8 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- comment actions menu
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
 ('sys_cmts_item_actions', 'system', 'item-reply', '_sys_menu_item_title_system_cmts_item_reply', '_sys_menu_item_title_cmts_item_reply', 'javascript:void(0)', 'javascript:{js_object}.toggleReply(this, {content_id})', '_self', 'reply', '', 2147483647, 1, 0, 0),
-('sys_cmts_item_actions', 'system', 'item-rate-plus', '_sys_menu_item_title_system_cmts_item_rate_plus', '_sys_menu_item_title_cmts_item_rate_plus', 'javascript:void(0)', 'javascript:{js_object}.cmtRate(this, {content_id}, 1)', '_self', 'plus-circle', '', 2147483647, 1, 0, 0),
-('sys_cmts_item_actions', 'system', 'item-rate-minus', '_sys_menu_item_title_system_cmts_item_rate_minus', '_sys_menu_item_title_cmts_item_rate_minus', 'javascript:void(0)', 'javascript:{js_object}.cmtRate(this, {content_id}, -1)', '_self', 'minus-circle', '', 2147483647, 1, 0, 0);
+('sys_cmts_item_actions', 'system', 'item-rate-plus', '_sys_menu_item_title_system_cmts_item_rate_plus', '_sys_menu_item_title_cmts_item_rate_plus', 'javascript:void(0)', 'javascript:{js_object}.cmtRate(this, {content_id}, 1)', '_self', 'plus', '', 2147483647, 1, 0, 0),
+('sys_cmts_item_actions', 'system', 'item-rate-minus', '_sys_menu_item_title_system_cmts_item_rate_minus', '_sys_menu_item_title_cmts_item_rate_minus', 'javascript:void(0)', 'javascript:{js_object}.cmtRate(this, {content_id}, -1)', '_self', 'minus', '', 2147483647, 1, 0, 0);
 
 -- --------------------------------------------------------
 

modules/boonex/english/data/langs/system.xml

@@ -1196,7 +1196,7 @@ Please click "Continue" below to navigate to the home page of the site.]]></stri
 	<string name="_load_more_replies_tail"><![CDATA[See Older Replies...]]></string>
 	<string name="_load_more_replies_popular"><![CDATA[See More Replies...]]></string>
 	<string name="_load_more_replies_connection"><![CDATA[See More Replies...]]></string>	
-	<string name="_in_reply_to"><![CDATA[replied to]]></string>
+	<string name="_in_reply_to"><![CDATA[to]]></string>
 	<string name="_Can not delete comments with replies"><![CDATA[Cannot delete comments with replies]]></string>
 	<string name="_Access denied"><![CDATA[Access denied]]></string>
 	<string name="_Save"><![CDATA[Save]]></string>

modules/boonex/timeline/install/langs/en.xml

@@ -99,6 +99,8 @@
     <string name="_bx_timeline_menu_item_title_item_comment"><![CDATA[Comment]]></string>
     <string name="_bx_timeline_menu_item_title_system_item_vote"><![CDATA[Vote]]></string>
     <string name="_bx_timeline_menu_item_title_item_vote"><![CDATA[Vote]]></string>
+    <string name="_bx_timeline_menu_item_title_system_item_share"><![CDATA[Share]]></string>
+    <string name="_bx_timeline_menu_item_title_item_share"><![CDATA[Share]]></string>
 
     <string name="_bx_timeline_menu_item_title_system_timeline"><![CDATA[Timeline]]></string>
     <string name="_bx_timeline_menu_item_title_timeline"><![CDATA[Timeline]]></string>

modules/boonex/timeline/install/sql/enable.sql

@@ -53,7 +53,8 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
 ('bx_timeline_menu_item_actions', 'bx_timeline', 'item-comment', '_bx_timeline_menu_item_title_system_item_comment', '_bx_timeline_menu_item_title_item_comment', 'javascript:void(0)', 'javascript:{js_object_view}.commentItem(this, ''{comments_system}'', {content_id})', '_self', 'comment', '', 2147483647, 1, 0, 0),
-('bx_timeline_menu_item_actions', 'bx_timeline', 'item-vote', '_bx_timeline_menu_item_title_system_item_vote', '_bx_timeline_menu_item_title_item_vote', 'javascript:void(0)', 'javascript:{js_object_view}.voteItem(this, {content_id})', '_self', 'plus', '', 2147483647, 1, 0, 0);
+('bx_timeline_menu_item_actions', 'bx_timeline', 'item-vote', '_bx_timeline_menu_item_title_system_item_vote', '_bx_timeline_menu_item_title_item_vote', 'javascript:void(0)', 'javascript:{js_object_view}.voteItem(this, {content_id})', '_self', 'plus', '', 2147483647, 1, 0, 0),
+('bx_timeline_menu_item_actions', 'bx_timeline', 'item-share', '_bx_timeline_menu_item_title_system_item_share', '_bx_timeline_menu_item_title_item_share', 'javascript:void(0)', 'javascript:{js_object_view}.shareItem(this, {content_id})', '_self', 'fa-share-square-o', '', 2147483647, 1, 0, 0);
 
 -- MENU: Account Settings
 SET @iMIOrder = (SELECT MAX(`order`) FROM `sys_menu_items` WHERE `set_name`='sys_account_settings' LIMIT 1);

template/comment.html

@@ -1,54 +1,51 @@
 <li id="cmt__id__" class="__style_prefix____class__ bx-def-margin-top-auto">
-	<div class="__style_prefix__-cnt bx-def-padding-sec bx-def-color-bg-box bx-def-border bx-def-round-corners bx-def-shadow">
+	<div class="__style_prefix__-cnt">
 		<a id="__system____id__" class="__style_prefix__-anchor bx-anchor-invisible">&nbsp;</a>
-		<div class="__style_prefix__-author">
-			<div class="__style_prefix__-icon bx-def-icon bx-def-icon-size">
-				<bx_if:show_icon>
-					<img src="__author_icon__" />
-				</bx_if:show_icon>
-				<bx_if:show_icon_empty>
-					<i class="sys-icon user"></i>
-				</bx_if:show_icon_empty>
-			</div>
-			<div class="cmt-username bx-def-icon-size-min-height">
-				<div class="cmt-username-l1">
-					<span class="__style_prefix__-username bx-def-font-h3">
-						<bx_if:show_author_link><a href="__author_link__">__author_name__</a> </bx_if:show_author_link>
-						<bx_if:show_author_text>__author_name__ </bx_if:show_author_text>
-					</span>
-					<span class="__style_prefix__-reply-to bx-def-font-small">
-						<bx_if:show_reply_to>
-							<span class="bx-def-font-grayed"><bx_text:_in_reply_to />&nbsp;</span><a href="__par_cmt_link__">__par_cmt_author__</a>
-						</bx_if:show_reply_to>
-					</span>
+		<div class="__style_prefix__-icon bx-def-icon bx-def-icon-size">
+			<bx_if:show_icon>
+				<img src="__author_icon__" />
+			</bx_if:show_icon>
+			<bx_if:show_icon_empty>
+				<i class="sys-icon user"></i>
+			</bx_if:show_icon_empty>
+		</div>
+		<div class="__style_prefix__-info bx-def-icon-size-min-height">
+			<div class="__style_prefix__-head bx-clearfix">
+				<div class="__style_prefix__-username bx-def-font-large">
+					<bx_if:show_author_link><a href="__author_link__">__author_name__</a> </bx_if:show_author_link>
+					<bx_if:show_author_text>__author_name__ </bx_if:show_author_text>
 				</div>
-				<div class="cmt-username-l2 bx-def-font-middle">
+				<div class="bullet">&#183;</div>
+				<div class="__style_prefix__-ago">
 					<a class="__style_prefix__-ago" href="__view_link__" rel="nofollow">__ago__</a>
-					<span class="__style_prefix__-points-wrp" <bx_if:hide_rate_count>style="display:none;"</bx_if:hide_rate_count>>
-						<span class="bullet">&#183;</span><a class="__style_prefix__-points" href="javascript:void(0)" onclick="__js_object__.togglePlusedByPopup(this, __id__); return false;" title="<bx_text_attribute:_Plused_by_popup />">__points__</a>
-					</span>
 				</div>
+				<bx_if:show_reply_to>
+					<div class="bullet">&#183;</div>
+					<div class="__style_prefix__-reply-to">
+						<span class="bx-def-font-grayed"><bx_text:_in_reply_to />&nbsp;</span><a href="__par_cmt_link__">__par_cmt_author__</a>
+					</div>
+				</bx_if:show_reply_to>
 			</div>
-		</div>
-		<div class="__style_prefix__-cont bx-def-margin-sec-top">
-			<div class="__style_prefix__-cont-cnt">
-				<div class="__style_prefix__-body bx-def-font-middle col-gray-dark">
-					__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">
-						<bx_repeat:attached>
-							<div class="__style_prefix__-attached-preview bx-def-thumb bx-def-margin-sec-left-auto">
-								<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>
-							</div>
-						</bx_repeat:attached>
+			<div class="__style_prefix__-cont bx-def-margin-sec-top">
+				<div class="__style_prefix__-cont-cnt">
+					<div class="__style_prefix__-body bx-def-font-middle col-gray-dark">
+						__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>
+					<bx_if:show_attached>
+						<div class="__style_prefix__-attached bx-def-margin-thd-topbottom bx-clearfix">
+							<bx_repeat:attached>
+								<div class="__style_prefix__-attached-preview bx-def-thumb bx-def-margin-sec-left-auto">
+									<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>
+								</div>
+							</bx_repeat:attached>
+						</div>
+					</bx_if:show_attached>
+				</div>
 			</div>
+			__actions__
 		</div>
-		__actions__
 	</div>
 	<ul class="cmts cmts-margin">__replies__</ul>
 </li>

template/comment_actions.html

@@ -1,6 +1,11 @@
-<div class="__style_prefix__-actions bx-def-margin-sec-top bx-def-font-middle">__menu_actions__</div>
+<div class="__style_prefix__-actions bx-def-margin-sec-top bx-clearfix">
+	__menu_actions__
+	<div class="__style_prefix__-points-wrp bx-def-margin-left" <bx_if:hide_rate_count>style="display:none;"</bx_if:hide_rate_count>>
+		<a class="__style_prefix__-points" href="javascript:void(0)" onclick="__js_object__.togglePlusedByPopup(this, __id__); return false;" title="<bx_text_attribute:_Plused_by_popup />">__points__</a>
+	</div>
+</div>
 <bx_if:show_menu_manage>
-	<div class="__style_prefix__-comment-manage-link">
+	<div class="__style_prefix__-comment-manage-link bx-def-font-large">
 		<a class="__style_prefix__-comment-manage bx-def-margin-sec-left-auto" href="javascript:void(0)" onclick="__js_object__.toggleManagePopup(this, __id__); return false;" title="<bx_text_attribute:_Manage />"><i class="sys-icon chevron-down"></i></a>
 	</div>
 	<div id="__popup_id__" class="__style_prefix__-comment-manage" style="display:none;">__popup_text__</div>

template/css/cmts.css

@@ -13,7 +13,7 @@
     }
     ul.cmts-margin,
     div.cmt-reply-margin {
-		padding-left: 30px;
+		padding-left: 42px;
     }
     li.cmt,
     ul.cmts-margin li.cmt {
@@ -81,9 +81,6 @@
     }    
 
     /*--- Comment Author ---*/
-    div.cmt-author {
-		position: relative;
-    }
 	div.cmt-icon {
 		position: absolute;
 		top: 0px;
@@ -93,23 +90,26 @@
     div.cmt-icon .sys-icon {
 		font-size: 2.125em;
     }
-    div.cmt-username {
+    div.cmt-info {
     	position: realtive;
     	padding-left: 42px;
 	}
-    span.cmt-username a {
-        text-decoration: none;
-    }
-	span.cmt-reply-to {
+	div.cmt-head div.cmt-username,
+	div.cmt-head div.cmt-username,
+	div.cmt-head div.cmt-ago,
+	div.cmt-head div.cmt-reply-to,
+	div.cmt-head div.bullet {
 		display: inline-block;
+	}
+	div.cmt-head div.bullet {
+		padding: 0px;
+	}
+
+    div.cmt-username a {
+        text-decoration: none;
     }
-	span.cmt-reply-to a,
-    span.cmt-reply-to span {
-		display: block;
-    	float: left;
-    	line-height: 0.8em;
-    }
-    span.cmt-reply-to a.cmt-points span {
+
+    div.cmt-reply-to a.cmt-points span {
 		display: inline;
     	float: none;
     }
@@ -125,8 +125,7 @@
     div.cmt-cont {
         position: relative;
     }
-	div.cmt-cont .bullet,
-	div.cmt-author .bullet {
+	div.cmt-cont .bullet {
 		padding: 0px 5px;
     }
     div.cmt-cont .cmt-post-reply .bx-form-element-wrapper {
@@ -164,13 +163,15 @@
 	div.cmt-actions {
 		position: relative;
 	}
-	div.cmt-actions a {
-		text-decoration: none;
-    }
+	div.cmt-actions ul.bx-menu-hor,
+	div.cmt-points-wrp {
+		position: relative;
+		float: left;
+	}
     div.cmt-comment-manage-link {
 		position: absolute;
-    	top: 10px;
-    	right: 10px;
+    	top: 0px;
+    	right: 0px;
     }
     div.cmt-comment-manage-link a {
 		color: rgba(0, 102, 153, 0.5);

template/scripts/BxBaseCmtsView.php

@@ -257,11 +257,6 @@ class BxBaseCmtsView extends BxDolCmts {
         		'cmt_id' => $aCmt['cmt_id']
         	)),
         	'ago' => bx_time_js($aCmt['cmt_time']),
-        	'bx_if:hide_rate_count' => array(
-        		'condition' => (int)$aCmt['cmt_rate'] <= 0,
-        		'content' => array()
-        	),
-        	'points' => _t(in_array($aCmt['cmt_rate'], array(-1, 0, 1)) ? '_N_point' : '_N_points', $aCmt['cmt_rate']),
         	'text' => $sText,
         	'bx_if:show_more' => array(
         		'condition' => !empty($sTextMore),
@@ -456,6 +451,11 @@ class BxBaseCmtsView extends BxDolCmts {
         	'id' => $aCmt['cmt_id'],
         	'style_prefix' => $this->_sStylePrefix,
         	'menu_actions' => $oMenuActions->getCode(),
+        	'bx_if:hide_rate_count' => array(
+        		'condition' => (int)$aCmt['cmt_rate'] <= 0,
+        		'content' => array()
+        	),
+        	'points' => _t(in_array($aCmt['cmt_rate'], array(-1, 0, 1)) ? '_N_point' : '_N_points', $aCmt['cmt_rate']),
         	'bx_if:show_menu_manage' => array(
         		'condition' => $bMenuManage,
         		'content' => array(