Merge branch 'master' of https://github.com/unaio/una

unacms · Feb 23, 2022 · 37f2566 · 37f2566
2 parents 6665689 + 3b376de
commit 37f2566
Show file tree

Hide file tree

Showing 12 changed files with 113 additions and 101 deletions.
diff --git a/modules/base/general/template/css/main.css b/modules/base/general/template/css/main.css
@@ -220,6 +220,7 @@ div.bx-base-general-comments div.bx-base-general-comments-counter-holder {
     margin-left: 0;
     margin-right: 0;
 }
+
 .sys-author ul.bx-menu-custom li:first-child .bx-base-general-unit-meta-div,
 .bx-base-general-unit-meta ul.bx-menu-custom li:first-child .bx-base-general-unit-meta-div {
     display: none;

diff --git a/modules/boonex/artificer/data/template/bx_forum/unit.html b/modules/boonex/artificer/data/template/bx_forum/unit.html
@@ -1,7 +1,7 @@
 <div class="__class__ bx-base-text-unit bx-forum-unit bx-def-gal-unit-size flex flex-col w-full box-border relative border-b border-gray-200 pb-1 mb-2">
     <div class="bx-base-text-unit-text box-border max-w-full">
             <div class="bx-base-text-unit-title flex items-center text-left mb-1">
-                <a href="__content_url__" class="text-ellipsis whitespace-nowrap overflow-hidden text-base font-semibold text-gray-700 dark:text-gray-200 hover:text-gray-900 dark:hover:text-white">__title__</a>
+                <a href="__content_url__" class="overflow-hidden text-base font-semibold text-gray-700 dark:text-gray-200 hover:text-gray-900 dark:hover:text-white">__title__</a>
             </div>
             <div class="bx-base-text-unit-info text-xs">
                  <bx_if:meta><div class="bx-base-general-unit-meta pb-2">__meta__</div></bx_if:meta>

diff --git a/modules/boonex/artificer/data/template/bx_forum/unit_gallery.html b/modules/boonex/artificer/data/template/bx_forum/unit_gallery.html
@@ -1,29 +1,32 @@
 <div class="__class__ bx-base-text-unit bx-forum-unit bx-base-text-unit-gallery bx-def-gal-unit-size flex flex-col w-full p-2 box-border relative">
-    <div class="bx-forum-category rounded-lg bg-gray-100 absolute py-1 px-2 ml-3 mt-3" >
-        <div class="bx-forum-icon bx-def-margin-sec-right ">__category_icon__</div>
-        <div>__category__</div>
-    </div>
-    <div class="bx-base-text-unit-text p-3 md:p-2 lg:p-2 pt-2 md:pt-3 lg:pt-5 box-border absolute bottom-0 max-w-full">
-            <div class="bx-base-text-unit-title flex items-center text-left mb-2">
-                <a href="__content_url__" class="text-ellipsis whitespace-nowrap overflow-hidden text-xl font-bold text-white group-hover:text-gray-900 dark:group-hover:text-white">__title__</a>
-            </div>
-            <div class="bx-base-text-unit-info">
-                __author__
-            </div>
+    <div class="grid grid-cols-1">
+        <div class="bx-base-text-unit-cnt rounded-lg ring-1 ring-gray-200 dark:ring-gray-700 overflow-hidden bg-white dark:bg-gray-800 row-start-1 col-start-1" >
+            <bx_if:thumb>
+                <a href="__content_url__" title="__summary_attr__">
+                    <div class="flex-shrink-0">
+                        <img class="h-48 w-full object-cover rounded-lg" src="__gallery_url__" alt="">
+                    </div>
+                </a>
+            </bx_if:thumb>
+            <bx_if:no_thumb>
+                <div class="bx-def-gal-img-column flex-shrink-0">
+                    <div class="bx-base-text-unit-no-thumb flex flex-col items-center justify-center h-48 p-4 bg-gradient-to-b box-border rounded-lg"></div>
+                </div>
+            </bx_if:no_thumb>
         </div>
-    <div class="bx-base-text-unit-cnt rounded-lg ring-1 ring-gray-200 dark:ring-gray-700 overflow-hidden bg-white dark:bg-gray-800">
-        <bx_if:thumb>
-            <a href="__content_url__" title="__summary_attr__">
-                <div class="flex-shrink-0">
-                    <img class="h-48 w-full object-cover rounded-lg" src="__gallery_url__" alt="">
+        <div class="flex flex-col m-4 justify-between row-start-1 col-start-1 items-start">
+            <div class="bx-forum-category rounded-lg bg-gray-100 py-1 px-2 ">
+                <div class="bx-forum-icon bx-def-margin-sec-right ">__category_icon__</div>
+                <div>__category__</div>
+            </div>
+            <div class="bx-base-text-unit-text box-border bottom-0 max-w-full">
+                <div class="bx-base-text-unit-title flex items-center text-left mb-2">
+                    <a href="__content_url__" class="text-ellipsis whitespace-nowrap overflow-hidden text-xl font-bold text-white group-hover:text-gray-900 dark:group-hover:text-white">__title__</a>
+                </div>
+                <div class="bx-base-text-unit-info">
+                    __author__
                 </div>
-            </a>
-        </bx_if:thumb>
-        <bx_if:no_thumb>
-            <div class="bx-def-gal-img-column flex-shrink-0">
-                <div class="bx-base-text-unit-no-thumb flex flex-col items-center justify-center h-48 p-4 bg-gradient-to-b box-border rounded-lg"></div>
             </div>
-        </bx_if:no_thumb>
-
+        </div>
     </div>
 </div>
diff --git a/modules/boonex/artificer/data/template/system/css/menu.css b/modules/boonex/artificer/data/template/system/css/menu.css
@@ -158,6 +158,10 @@ div.bx-popup-menu-main.sys-add-content ul {
     width: 1.5rem;
     height: 1.5rem;
 }
+p.bx-base-pofile-unit-thumb.bx-def-icon-size{
+    border:1px solid #fff;    
+}
+
 .sys-action-counter-iconset .bx-base-pofile-unit-wo-info,
 .sys-action-counter-iconset .sys-action-counter-icon
 {

diff --git a/modules/boonex/forum/classes/BxForumMenuSnippetMeta.php b/modules/boonex/forum/classes/BxForumMenuSnippetMeta.php
@@ -123,7 +123,7 @@ protected function _getMenuItemComments($aItem)
     protected function _getMenuItemBadges($aItem)
     {
         $CNF = &$this->_oModule->_oConfig->CNF;
-        return $this->getUnitMetaItemExtended($this->_oModule->serviceGetBadges($this->_aContentInfo[$CNF['FIELD_ID']], false, true)); 
+        return $this->getUnitMetaItemExtended($this->_oModule->serviceGetBadges($this->_aContentInfo[$CNF['FIELD_ID']], false, true), '', '', true); 
     }
 
     protected function _getMenuItemStatus($aItem)
@@ -139,7 +139,7 @@ protected function _getMenuItemStatus($aItem)
                 $sStatus .= _t('_bx_forum_grid_filter_resolved_unresolved');
             }  
 
-            return $this->getUnitMetaItemExtended($this->_oModule->_oTemplate->parseHtmlByName('status.html', ['status' => $sStatus, 'status_class' => $this->_aContentInfo['resolved']])); 
+            return $this->getUnitMetaItemExtended($this->_oModule->_oTemplate->parseHtmlByName('status.html', ['status' => $sStatus, 'status_class' => $this->_aContentInfo['resolved']]), '' ,'', true); 
         }
         return '';
     }

diff --git a/modules/boonex/forum/classes/BxForumModule.php b/modules/boonex/forum/classes/BxForumModule.php
@@ -210,7 +210,7 @@ public function serviceCategoriesList($aParams = array())
 
         $CNF = &$this->_oConfig->CNF;
 
-        $aCategories['bx_repeat:cats'] = array_merge(['all' => [
+        $aCategories['bx_repeat:cats'] = array_merge([[
             'icon' => $this->_oTemplate->parseImage($this->_oTemplate->getIconUrl('all-cat.svg'), ['class' => 'sys-icon sys-colored gray']),
             'class' => bx_get('category') == '' ? 'bx-forum-category-list-item-selected' : '',
             'url' => BxDolPermalinks::getInstance()->permalink($CNF['URL_HOME']),

diff --git a/modules/boonex/forum/template/css/main.css b/modules/boonex/forum/template/css/main.css
@@ -240,7 +240,6 @@
 .bx-forum-grid-preview .bx-menu-item-date .text-sm{
     font-size: 12px;
     font-weight: 500;
-    color:#374151;
 }
 
 .bx-forum-grid-preview .bx-forum-gp-meta.bx-forum-gpm-bottom .bx-forum-gpm-reply .bx-menu-item-reply-author .bx-def-icon-size-min-height {
@@ -357,6 +356,9 @@
 #bx-grid-table-bx_forum tr{
     border-bottom: 1px solid #F4F4F5
 }
+.dark #bx-grid-table-bx_forum tr{
+    border-bottom: 1px solid rgb(55 65 81);
+}
 .bx-grid-table-cell-participants .cmt-counter{
     float: right;
 }
@@ -388,17 +390,20 @@
 .bx-media-phone .bx-forum-grid tr{
     display: grid;
 	grid-template-areas:
-    "rating text"
-	"rating participants";
+    "text text"
+	"participants rating";
 
     grid-template-rows: auto auto;
-	grid-template-columns: 34px 1fr;
-    margin-bottom: 1rem;
+	grid-template-columns: auto auto;
+    margin-bottom: 0.5rem;
 }
 
 .bx-media-phone .bx-forum-grid table{
     width: 100% !important;
     min-width: inherit !important;
+    max-width: 100% !important;
+    overflow: hidden;
+    display: block;
 }
 .bx-media-phone .bx-forum-grid td{
     width: auto !important;
@@ -411,11 +416,31 @@
 .bx-media-phone .bx-forum-grid .bx-grid-table-cell-text{
     grid-area: text;
     padding-bottom: 0px;
+    overflow: hidden;
+    padding-top: 0px;
 }
 .bx-media-phone .bx-forum-grid .bx-grid-table-cell-participants{
     grid-area: participants;
     padding-top: 0px;
-
+    display: flex;
+    align-items: center;
+}
+.bx-media-phone .bx-forum-grid .bx-grid-table-cell-rating{
+    grid-area: rating;
+    text-align: right;
+    margin-right: 1rem;
+    padding-top: 0px;
+}
+.bx-media-phone .bx-forum-gpm-main{
+    margin-bottom: 0.5rem;
+    width: 100%;
+}
+.bx-media-phone .bx-forum-gpm-main UL{
+    width: 100%;
+    justify-content: space-between;
+}
+.bx-media-phone .bx-forum-gpm-main UL LI:nth-child(n+4){
+    display: none;
 }
 
 .bx-media-phone .bx-grid-table-cell-participants .cmt-counter{
@@ -438,31 +463,9 @@
     color:#fff;
     border-radius: 7px 7px 0 0;
 }
-/*
-#bx-grid-table-bx_forum .bx-score-element-holder,
-#bx-grid-table-bx_forum .bx-score-counter-holder{
-    border:1px solid rgba(209,213,219, 1) !important;
-    border-width: 1px !important;
-    margin: 0px !important;
-    padding: 0px 5px;
-    border-collapse: collapse;
-}
-#bx-grid-table-bx_forum .bx-score-counter-holder{
-    border-left: none !important;
-    border-right: none !important;
-    padding: 2px 10px;
-    padding-top: 1px;
-}
-#bx-grid-table-bx_forum .bx-score-cnt .bx-score-element-holder:first-child{
-    border-top-left-radius: 0.375rem;
-    border-bottom-left-radius: 0.375rem;
-}
-
-#bx-grid-table-bx_forum .bx-score-cnt .bx-score-element-holder:last-child{
-    border-top-right-radius: 0.375rem;
-    border-bottom-right-radius: 0.375rem;
+.bx-forum-unit .bx-base-text-unit-title{
+    white-space: normal;
 }
-*/
 .bx-forum-grid .bx-grid-header-controls-counter{
     display: none;
 }
@@ -478,31 +481,17 @@
     display: flex;
     flex-wrap: nowrap;
 }
-/*.bx-forum-unit .bx-base-text-unit-info .bx-base-pofile-unit .bx-base-pofile-unit-thumb{
-    height: 1.5rem;
-    width: 1.5rem !important;
-}
-.bx-forum-unit .bx-base-text-unit-info .bx-base-pofile-unit .bx-def-thumb-size{
-    height: 1.5rem;
-    font-size: 1rem;
-    width: 1.5rem !important;
-}
-
-.bx-forum-unit .bx-base-text-unit-info .bx-base-pofile-unit .bx-def-unit-info{
-    margin-left: 2rem;
-    min-height: inherit !important;
-    text-align: left;
-}*/
 .bx-forum-unit.bx-base-text-unit-gallery .bx-base-text-unit-info .bx-base-pofile-unit A,
 .bx-forum-unit.bx-base-text-unit-gallery .bx-base-text-unit-title A{
     color:#fff !important;
 }
-.bx-forum-unit .bx-base-text-unit-info .bx-base-pofile-unit{
-    zoom:0.75;
-}
 .bx-forum-unit .bx-base-text-unit-info .bx-base-pofile-unit .bx-def-unit-info{
     text-align: left;
 }
+.bx-forum-unit .bx-base-pofile-unit{
+    margin-bottom: 0px;
+    margin-right: 0px;
+}
 /* ---------------new meta menu need to move incore*/
 
 .bx-menu-meta-icon img,
@@ -525,5 +514,8 @@
     height: 1rem !important;
     display: block;
 }
+.bx-menu-meta-item-ex.bx-menu-meta-item-ex-no-bg{
+    background: none !important;
+}
 
 
diff --git a/modules/boonex/forum/template/unit.html b/modules/boonex/forum/template/unit.html
@@ -1,7 +1,7 @@
 <div class="__class__ bx-base-text-unit bx-forum-unit bx-def-gal-unit-size flex flex-col w-full box-border relative border-b border-gray-200 pb-1 mb-2">
     <div class="bx-base-text-unit-text box-border max-w-full">
             <div class="bx-base-text-unit-title flex items-center text-left mb-1">
-                <a href="__content_url__" class="text-ellipsis whitespace-nowrap overflow-hidden text-base font-semibold text-gray-700 dark:text-gray-200 hover:text-gray-900 dark:hover:text-white">__title__</a>
+                <a href="__content_url__" class="overflow-hidden text-base font-semibold text-gray-700 dark:text-gray-200 hover:text-gray-900 dark:hover:text-white">__title__</a>
             </div>
             <div class="bx-base-text-unit-info text-xs">
                  <bx_if:meta><div class="bx-base-general-unit-meta pb-2">__meta__</div></bx_if:meta>

diff --git a/modules/boonex/forum/template/unit_gallery.html b/modules/boonex/forum/template/unit_gallery.html
@@ -1,29 +1,32 @@
 <div class="__class__ bx-base-text-unit bx-forum-unit bx-base-text-unit-gallery bx-def-gal-unit-size flex flex-col w-full p-2 box-border relative">
-    <div class="bx-forum-category rounded-lg bg-gray-100 absolute py-1 px-2 ml-3 mt-3" >
-        <div class="bx-forum-icon bx-def-margin-sec-right ">__category_icon__</div>
-        <div>__category__</div>
-    </div>
-    <div class="bx-base-text-unit-text p-3 md:p-2 lg:p-2 pt-2 md:pt-3 lg:pt-5 box-border absolute bottom-0 max-w-full">
-            <div class="bx-base-text-unit-title flex items-center text-left mb-2">
-                <a href="__content_url__" class="text-ellipsis whitespace-nowrap overflow-hidden text-xl font-bold text-white group-hover:text-gray-900 dark:group-hover:text-white">__title__</a>
-            </div>
-            <div class="bx-base-text-unit-info">
-                __author__
-            </div>
+    <div class="grid grid-cols-1">
+        <div class="bx-base-text-unit-cnt rounded-lg ring-1 ring-gray-200 dark:ring-gray-700 overflow-hidden bg-white dark:bg-gray-800 row-start-1 col-start-1" >
+            <bx_if:thumb>
+                <a href="__content_url__" title="__summary_attr__">
+                    <div class="flex-shrink-0">
+                        <img class="h-48 w-full object-cover rounded-lg" src="__gallery_url__" alt="">
+                    </div>
+                </a>
+            </bx_if:thumb>
+            <bx_if:no_thumb>
+                <div class="bx-def-gal-img-column flex-shrink-0">
+                    <div class="bx-base-text-unit-no-thumb flex flex-col items-center justify-center h-48 p-4 bg-gradient-to-b box-border rounded-lg"></div>
+                </div>
+            </bx_if:no_thumb>
         </div>
-    <div class="bx-base-text-unit-cnt rounded-lg ring-1 ring-gray-200 dark:ring-gray-700 overflow-hidden bg-white dark:bg-gray-800">
-        <bx_if:thumb>
-            <a href="__content_url__" title="__summary_attr__">
-                <div class="flex-shrink-0">
-                    <img class="h-48 w-full object-cover rounded-lg" src="__gallery_url__" alt="">
+        <div class="flex flex-col m-4 justify-between row-start-1 col-start-1 items-start">
+            <div class="bx-forum-category rounded-lg bg-gray-100 py-1 px-2 ">
+                <div class="bx-forum-icon bx-def-margin-sec-right ">__category_icon__</div>
+                <div>__category__</div>
+            </div>
+            <div class="bx-base-text-unit-text box-border bottom-0 max-w-full">
+                <div class="bx-base-text-unit-title flex items-center text-left mb-2">
+                    <a href="__content_url__" class="text-ellipsis whitespace-nowrap overflow-hidden text-xl font-bold text-white group-hover:text-gray-900 dark:group-hover:text-white">__title__</a>
+                </div>
+                <div class="bx-base-text-unit-info">
+                    __author__
                 </div>
-            </a>
-        </bx_if:thumb>
-        <bx_if:no_thumb>
-            <div class="bx-def-gal-img-column flex-shrink-0">
-                <div class="bx-base-text-unit-no-thumb flex flex-col items-center justify-center h-48 p-4 bg-gradient-to-b box-border rounded-lg"></div>
             </div>
-        </bx_if:no_thumb>
-
+        </div>
     </div>
 </div>
diff --git a/plugins_public/tailwind/js/tailwind.config.js b/plugins_public/tailwind/js/tailwind.config.js
@@ -20,6 +20,10 @@ module.exports = {
     // Messenger
     './modules/boonex/messenger/js/*.js',
     './modules/boonex/messenger/template/*.html',
+
+    // Forum
+    './modules/boonex/forum/js/*.js',
+    './modules/boonex/forum/template/*.html',  
 
     './template/*.html',
   ],

diff --git a/template/css/cmts.css b/template/css/cmts.css
@@ -440,7 +440,6 @@ span.cmt span.cmt-counter-holder {
 .cmt-counter .bx-def-icon-size {
     width: 2.0rem;
     height: 2.0rem;
-
     font-size: 1.0rem;
 }
 .cmt-counter p.bx-base-pofile-unit-thumb.bx-def-icon-size {

diff --git a/template/scripts/BxBaseMenuUnitMeta.php b/template/scripts/BxBaseMenuUnitMeta.php
@@ -52,10 +52,13 @@ public function getUnitMetaItemCustom($sContent)
         return $this->getUnitMetaItem('custom', $sContent);
     }
 
-    public function getUnitMetaItemExtended($sContent = '', $sIcon = '', $sUrl = '')
+    public function getUnitMetaItemExtended($sContent = '', $sIcon = '', $sUrl = '', $bIsNoBg = false )
     {
         $aTmplVarsEx = [];
 
+        if ($sContent == '' && $sIcon == '')
+            return ;
+
         $aTmplVarsEx['bx_if:icon'] = [
             'condition' => ($sIcon != ''),
             'content' => ['icon' => $this->getMenuIconHtml($sIcon)]
@@ -94,6 +97,9 @@ public function getUnitMetaItemExtended($sContent = '', $sIcon = '', $sUrl = '')
                 'content' => []
             );
         }
+
+        $aTmplVars['class'] = $bIsNoBg ? 'bx-menu-meta-item-ex-no-bg' : '';
+
         return $this->_oTemplate->parseHtmlByName('unit_meta_item_ex.html', $aTmplVars);
     }