Ticket #255 - Clean up: Posts snippets.

modules/base/general/classes/BxBaseModGeneralModule.php

@@ -349,11 +349,6 @@ class BxBaseModGeneralModule extends BxDolModule
 
         $CNF = &$this->_oConfig->CNF;
 
-        $sUrl = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aContentInfo[$CNF['FIELD_ID']]);
-
-        //--- Image(s)
-        $aImages = $this->_getImagesForTimelinePost($aEvent, $aContentInfo, $sUrl);
-
         //--- Votes
         $oVotes = isset($CNF['OBJECT_VOTES']) ? BxDolVote::getObjectInstance($CNF['OBJECT_VOTES'], $aEvent['object_id']) : null;
 
@@ -389,14 +384,7 @@ class BxBaseModGeneralModule extends BxDolModule
 
         return array(
             'owner_id' => $aContentInfo[$CNF['FIELD_AUTHOR']],
-            'content' => array(
-                'sample' => _t($CNF['T']['txt_sample_single']),
-                'url' => $sUrl,
-                'title' => isset($CNF['FIELD_TITLE']) && isset($aContentInfo[$CNF['FIELD_TITLE']]) ? $aContentInfo[$CNF['FIELD_TITLE']] : 
-                    (isset($CNF['FIELD_TEXT']) && isset($aContentInfo[$CNF['FIELD_TEXT']]) ? strmaxtextlen($aContentInfo[$CNF['FIELD_TEXT']], 20, '...') : ''),
-                'text' => isset($CNF['FIELD_TEXT']) && isset($aContentInfo[$CNF['FIELD_TEXT']]) ? $aContentInfo[$CNF['FIELD_TEXT']] : '',
-                'images' => $aImages,
-            ), //a string to display or array to parse default template before displaying.
+            'content' => $this->_getContentForTimelinePost($aEvent, $aContentInfo), //a string to display or array to parse default template before displaying.
             'date' => $aContentInfo[$CNF['FIELD_ADDED']],
             'votes' => $aVotes,
             'reports' => $aReports,
@@ -591,6 +579,25 @@ class BxBaseModGeneralModule extends BxDolModule
         exit;
     }
 
+    protected function _getContentForTimelinePost($aEvent, $aContentInfo)
+    {
+    	$CNF = &$this->_oConfig->CNF;
+
+    	$sUrl = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aContentInfo[$CNF['FIELD_ID']]);
+
+    	//--- Image(s)
+        $aImages = $this->_getImagesForTimelinePost($aEvent, $aContentInfo, $sUrl);
+
+    	return array(
+			'sample' => _t($CNF['T']['txt_sample_single']),
+			'url' => $sUrl,
+			'title' => isset($CNF['FIELD_TITLE']) && isset($aContentInfo[$CNF['FIELD_TITLE']]) ? $aContentInfo[$CNF['FIELD_TITLE']] : 
+			(isset($CNF['FIELD_TEXT']) && isset($aContentInfo[$CNF['FIELD_TEXT']]) ? strmaxtextlen($aContentInfo[$CNF['FIELD_TEXT']], 20, '...') : ''),
+			'text' => isset($CNF['FIELD_TEXT']) && isset($aContentInfo[$CNF['FIELD_TEXT']]) ? $aContentInfo[$CNF['FIELD_TEXT']] : '',
+			'images' => $aImages,
+		);
+    }
+
     protected function _getImagesForTimelinePost($aEvent, $aContentInfo, $sUrl)
     {
         $CNF = &$this->_oConfig->CNF;

modules/base/text/template/css/main.css

@@ -11,6 +11,10 @@
     vertical-align:middle;
 }
 
+.bx-base-text-unit-cnt {
+	width: 100%;
+}
+
 .bx-base-text-unit-no-thumb,
 .bx-base-text-unit-thumb {
     display:block;
@@ -28,6 +32,12 @@
 .bx-base-text-unit-cover {
 	position: relative;
 }
+.bx-base-text-unit-text {
+	width: 100%;
+}
+.bx-base-text-unit-ext .bx-base-text-unit-text {
+	text-align: left;
+}
 
 .bx-base-text-unit-cover img {
 	position: relative;
@@ -56,10 +66,12 @@
 }
 
 .bx-base-text-unit-gallery h2 {
-    line-height:1.25em;
-    max-height:3.75em;
-    overflow:hidden; 
-    margin-bottom:0;
+	margin-bottom: 0;
+	max-height: 3.75em;
+    line-height: 1.25em;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
 }
 
 .bx-base-text-wrapper {

modules/base/text/template/unit.html

@@ -1,18 +1,18 @@
-
-<div class="bx-base-text-unit bx-base-text-unit-ext bx-def-margin-bottom">
+<div class="bx-base-text-unit bx-base-text-unit-ext bx-def-box bx-def-round-corners bx-def-color-bg-box bx-def-margin-bottom">
 	<bx_if:thumb>
 		<div class="bx-base-text-unit-cover">
 			<img class="bx-base-text-unit-cover bx-def-round-corners" alt="__title__" src="__thumb_url__" />
 		</div>
 	</bx_if:thumb>
-    <h2 class="bx-def-padding-sec-top"><a href="__content_url__">__title__</a></h2>
-    <div class="bx-base-text-unit-info bx-def-margin-sec-top bx-def-font-small">
-        <span class="bx-def-font-grayed">__entry_posting_date__</span>
-        <span class="bx-base-text-unit-info-div bx-def-font-grayed">&#183;</span>
-        <a class="bx-base-text-unit-author" href="__author_url__">__author__</a>
-    </div>
-    <div class="bx-base-text-unit-summary bx-def-margin-sec-top bx-def-margin-sec-bottom bx-clearfix">
-        __summary__
-    </div> 
-</div>
-
+	<div class="bx-base-text-unit-text bx-def-padding">
+	    <h2><a href="__content_url__">__title__</a></h2>
+	    <div class="bx-base-text-unit-info bx-def-margin-sec-top bx-def-font-small">
+	        <span class="bx-def-font-grayed">__entry_posting_date__</span>
+	        <span class="bx-base-text-unit-info-div bx-def-font-grayed">&#183;</span>
+	        <a class="bx-base-text-unit-author" href="__author_url__">__author__</a>
+	    </div>
+	    <div class="bx-base-text-unit-summary bx-def-margin-sec-top bx-clearfix">
+	        __summary__
+	    </div> 
+	</div>
+</div>

modules/base/text/template/unit_gallery.html

@@ -1,32 +1,27 @@
 <div class="bx-base-text-unit bx-base-text-unit-gallery bx-def-gal-unit-size bx-def-padding-sec bx-def-margin-sec-bottom">
-<div>
-
-    <bx_if:thumb>
-        <a href="__content_url__" title="__summary_attr__">
-            <div class="bx-base-text-unit-thumb bx-def-gal-div-size bx-def-round-corners bx-def-box bx-def-color-bg-box bx-def-font-middle" style="background-image:url(__gallery_url__)">
-                <div class="bx-base-text-unit-strecher">__strecher__</div>
-            </div>
-        </a>
-    </bx_if:thumb>
-
-    <bx_if:no_thumb>
-        <div class="bx-def-gal-img-column">
-            <div class="bx-base-text-unit-no-thumb bx-def-gal-div-size bx-def-round-corners bx-def-box bx-def-color-bg-box bx-def-font-middle bx-def-font-grayed bx-def-padding bx-def-box-sizing">
-                __summary_plain__
-                <div class="bx-base-text-unit-strecher">__strecher__</div>
-            </div>
-        </div>
-    </bx_if:no_thumb>
-
-    <div class="bx-def-gal-unit-column">
-        <h2 class="bx-def-margin-sec-topbottom"><a href="__content_url__">__title__</a></h2>
-    </div>
-
-    <div class="bx-base-text-unit-info">
-        <span class="bx-def-font-grayed">__entry_posting_date__</span>
-        <span class="bx-base-text-unit-info-div bx-def-font-grayed">&#183;</span>
-        <a class="bx-base-text-unit-author" href="__author_url__">__author__</a>
-    </div>
-
-</div>
-</div>
+	<div class="bx-base-text-unit-cnt bx-def-box bx-def-round-corners bx-def-color-bg-box bx-def-box-sizing">
+		<div class="bx-base-text-unit-text bx-def-padding-leftright bx-def-padding-sec-topbottom bx-def-font-align-center bx-def-box-sizing">
+			<h2><a href="__content_url__">__title__</a></h2>
+		    <div class="bx-base-text-unit-info">
+		        <span class="bx-def-font-grayed">__entry_posting_date__</span>
+		        <span class="bx-base-text-unit-info-div bx-def-font-grayed">&#183;</span>
+		        <a class="bx-base-text-unit-author" href="__author_url__">__author__</a>
+		    </div>
+		</div>
+	    <bx_if:thumb>
+	        <a href="__content_url__" title="__summary_attr__">
+	            <div class="bx-base-text-unit-thumb bx-def-gal-div-size bx-def-round-corners bx-def-font-middle" style="background-image:url(__gallery_url__)">
+	                <div class="bx-base-text-unit-strecher">__strecher__</div>
+	            </div>
+	        </a>
+	    </bx_if:thumb>
+	    <bx_if:no_thumb>
+	        <div class="bx-def-gal-img-column">
+	            <div class="bx-base-text-unit-no-thumb bx-def-gal-div-size bx-def-font-middle bx-def-font-grayed bx-def-padding bx-def-box-sizing">
+	                __summary_plain__
+	                <div class="bx-base-text-unit-strecher">__strecher__</div>
+	            </div>
+	        </div>
+	    </bx_if:no_thumb>
+	</div>
+</div>