فهرست منبع

Ticket #3941 - Artificer template (part 4): Connections, Reviews, etc.

AntonLV 4 سال پیش
والد
کامیت
3dceed61e6

+ 0 - 12
modules/base/groups/template/css/main.css

@@ -5,18 +5,6 @@
     -webkit-border-radius:0.1875rem;
     -webkit-border-radius:0.1875rem;
 }
 }
 
 
-.bx-base-group-unit .bx-def-unit-img img,
-.bx-base-group-unit .bx-def-unit-img p.bx-base-pofile-unit-thumb,
-.bx-base-groups-unit-wo-info .bx-def-unit-img img,
-.bx-base-groups-unit-wo-info .bx-def-unit-img p.bx-base-pofile-unit-thumb,
-.bx-base-groups-unit-with-cover .bx-def-unit-img img,
-.bx-base-groups-unit-with-cover .bx-def-unit-img p.bx-base-pofile-unit-thumb {
-    border-width:0.0625rem;
-    border-radius:0.1875rem;
-    -moz-border-radius:0.1875rem;
-    -webkit-border-radius:0.1875rem;
-}
-
 .bx-search-result-block {
 .bx-search-result-block {
     text-align:center;
     text-align:center;
 }
 }

+ 0 - 10
modules/base/profile/template/css/main.css

@@ -111,12 +111,6 @@
     -o-background-size:cover;
     -o-background-size:cover;
     background-size:cover;
     background-size:cover;
 }
 }
-.bx-base-pofile-unit-cover:not(.bx-def-align-center) {
-    display:block;
-
-    line-height:10.0rem;
-    text-align:center;
-}
 
 
 .bx-base-pofile-unit-with-cover .sys-author ul.bx-menu-custom.bx-menu-custom-hor,
 .bx-base-pofile-unit-with-cover .sys-author ul.bx-menu-custom.bx-menu-custom-hor,
 .bx-base-pofile-unit-with-cover .bx-base-general-unit-meta ul.bx-menu-custom.bx-menu-custom-hor {
 .bx-base-pofile-unit-with-cover .bx-base-general-unit-meta ul.bx-menu-custom.bx-menu-custom-hor {
@@ -175,10 +169,6 @@ p.bx-base-pofile-unit-thumb.bx-def-ava-size {
 .bx-base-pofile-unit-with-cover .bx-base-pofile-unit-cnt {
 .bx-base-pofile-unit-with-cover .bx-base-pofile-unit-cnt {
     height: 100%;
     height: 100%;
 }
 }
-.bx-base-pofile-unit-with-cover div.bx-def-unit-img {
-    display: inline-block;
-    vertical-align: middle;
-}
 .bx-base-pofile-unit-with-cover .bx-base-pofile-unit-online {
 .bx-base-pofile-unit-with-cover .bx-base-pofile-unit-online {
     right: 9px;
     right: 9px;
     bottom: 9px;
     bottom: 9px;

+ 0 - 19
modules/boonex/artificer/data/template/system/connected_by_list.html

@@ -1,19 +0,0 @@
-<div class="__style_prefix__-by-list">
-    <div class="__style_prefix__-by-list-cnt">
-        <div class="__style_prefix__-by-items">
-            <bx_repeat:list>
-                <div class="__style_prefix__-by-item p-2">
-                    <div class="__style_prefix__-user flex items-center">
-                        <div class="__style_prefix__-user-avatar h-10 w-10">__user_unit__</div>
-                        <div class="__style_prefix__-user-info ml-4">
-                            <div class="__style_prefix__-user-name text-sm text-gray-500 dark:text-gray-400">
-                                <a href="__user_url__" class="__style_prefix__-user-name" title="__user_title__">__user_name__</a>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </bx_repeat:list>
-        </div>
-        <div class="__style_prefix__-by-paginate">__paginate__</div>
-    </div>
-</div>

+ 0 - 2
modules/boonex/artificer/data/template/system/connection_counter.html

@@ -1,2 +0,0 @@
-<bx_if:show_text><span class="__class__" <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</span></bx_if:show_text><bx_if:show_link><a class="__class__ group flex items-center p-1 border-none rounded-full text-gray-500 hover:text-gray-700 dark:text-gray-500 dark:hover:text-gray-300 hover:bg-gray-200 dark:hover:bg-gray-700 text-sm font-normal" <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</a></bx_if:show_link>
-__script__

+ 0 - 17
modules/boonex/artificer/data/template/system/connection_counter_label.html

@@ -1,17 +0,0 @@
-<span class="__style_prefix__-counter-label flex items-center">
-    <bx_if:show_icon>
-        <span class="sys-action-counter-icon __style_prefix__-counter-icon relative flex items-center justify-center ring-1  h-6 w-6 rounded-full ring-white dark:ring-gray-800 h-6 w-6 bg-gray-200 dark:bg-gray-800">
-            __name__
-        </span>
-    </bx_if:show_icon>
-    <bx_if:show_profiles>
-        <span class="sys-action-counter-profiles __style_prefix__-counter-profiles flex">
-            <bx_repeat:profiles>
-                <span class="sys-action-counter-profile __style_prefix__-counter-profile block -ml-2 first:ml-0">__unit__</span>
-            </bx_repeat:profiles>
-        </span>
-    </bx_if:show_profiles>
-    <bx_if:show_text>
-        <span class="sys-action-counter-text __style_prefix__-counter-text ml-1">__text__</span>
-    </bx_if:show_text>
-</span>

+ 0 - 14
modules/boonex/artificer/data/template/system/css/connection.css

@@ -1,14 +0,0 @@
-/*--
-import url(../../../../../../../template/css/connection.css);
---*/
-
-
-/*-- Counter --*/
-.sys-action-counter-profile .bx-def-icon-size {
-    width: 1.5rem;
-    height: 1.5rem;
-}
-
-.sys-action-counter-profile .bx-base-pofile-unit-online {
-    display: none;
-}

+ 0 - 19
modules/boonex/artificer/data/template/system/review_mood_form_field.html

@@ -1,19 +0,0 @@
-<div class="__style_prefix__-rating __style_prefix__-rating-element" __style_prefix__-rating-data="__value__">
-    <div class="__style_prefix__-mood relative inline-block">
-        <div class="__style_prefix__-mood-underlay">
-            <bx_repeat:stars><i class="__style_prefix__-mood-star sys-icon far star text-yellow-500"></i></bx_repeat:stars>
-        </div>
-        <div class="__style_prefix__-mood-slider absolute z-1 top-0 left-0 whitespace-nowrap overflow-hidden">
-            <bx_repeat:slider><i class="__style_prefix__-mood-star sys-icon star text-yellow-500"></i></bx_repeat:slider>
-        </div>
-        <div class="__style_prefix__-mood-buttons absolute z-2 top-0 left-0">
-            <bx_repeat:buttons><a class="__style_prefix__-mood-button" href="javascript:void(0);" onmouseover="__js_object__.over(this);" onmouseout="__js_object__.out(this);" onclick="__js_object__.vote(this, __value__)"><i class="__style_prefix__-mood-star sys-icon star text-transparent hover:text-yellow-600"></i></a></bx_repeat:buttons>
-        </div>
-    </div>
-    <input class="__style_prefix__-mood-value" type="hidden" name="__name__" value="__value__" />
-</div>
-<bx_if:show_init>
-    <script language="javascript">
-        __js_object__.cmtInitRating($('#__form_id__ .__style_prefix__-rating-element'));
-    </script>
-</bx_if:show_init>

+ 0 - 15
modules/boonex/artificer/data/template/system/review_mood_legend.html

@@ -1,15 +0,0 @@
-<div class="__style_prefix__-rating __style_prefix__-rating-legend" id="__html_id__" __style_prefix__-rating-data="__value__">
-    <div class="__style_prefix__-mood relative inline-block">
-        <div class="__style_prefix__-mood-underlay">
-            <bx_repeat:stars><i class="__style_prefix__-mood-star sys-icon far star text-yellow-500"></i></bx_repeat:stars>
-        </div>
-        <div class="__style_prefix__-mood-slider absolute z-1 top-0 left-0 whitespace-nowrap overflow-hidden">
-            <bx_repeat:slider><i class="__style_prefix__-mood-star sys-icon star text-yellow-500"></i></bx_repeat:slider>
-        </div>
-    </div>
-</div>
-<bx_if:show_init>
-    <script language="javascript">
-        __js_object__.cmtInitRating($('#__html_id__'));
-    </script>
-</bx_if:show_init>

+ 5 - 7
template/connected_by_list.html

@@ -2,13 +2,11 @@
     <div class="__style_prefix__-by-list-cnt">
     <div class="__style_prefix__-by-list-cnt">
         <div class="__style_prefix__-by-items">
         <div class="__style_prefix__-by-items">
             <bx_repeat:list>
             <bx_repeat:list>
-                <div class="__style_prefix__-by-item bx-def-padding-sec">
-                    <div class="__style_prefix__-user bx-clearfix">
-                        <div class="__style_prefix__-user-avatar bx-def-thumb-size">
-                            __user_unit__
-                        </div>
-                        <div class="__style_prefix__-user-info bx-def-thumb-size-min-height bx-def-thumb-size-left-indent bx-def-valign-center">
-                            <div class="__style_prefix__-user-name bx-def-font-middle bx-def-font-light bx-def-font-grayed">
+                <div class="__style_prefix__-by-item p-2">
+                    <div class="__style_prefix__-user flex items-center">
+                        <div class="__style_prefix__-user-avatar h-10 w-10">__user_unit__</div>
+                        <div class="__style_prefix__-user-info ml-4">
+                            <div class="__style_prefix__-user-name text-sm text-gray-500 dark:text-gray-400">
                                 <a href="__user_url__" class="__style_prefix__-user-name" title="__user_title__">__user_name__</a>
                                 <a href="__user_url__" class="__style_prefix__-user-name" title="__user_title__">__user_name__</a>
                             </div>
                             </div>
                         </div>
                         </div>

+ 1 - 1
template/connection_counter.html

@@ -2,6 +2,6 @@
     <span class="__class__" <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</span>
     <span class="__class__" <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</span>
 </bx_if:show_text>
 </bx_if:show_text>
 <bx_if:show_link>
 <bx_if:show_link>
-    <a class="__class__" <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</a>
+    <a class="__class__ group flex items-center p-1 border-none rounded-full text-gray-500 hover:text-gray-700 dark:text-gray-500 dark:hover:text-gray-300 hover:bg-gray-200 dark:hover:bg-gray-700 text-sm font-normal" <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</a>
 </bx_if:show_link>
 </bx_if:show_link>
 __script__
 __script__

+ 5 - 5
template/connection_counter_label.html

@@ -1,17 +1,17 @@
-<span class="__style_prefix__-counter-label bx-def-valign-center">
+<span class="__style_prefix__-counter-label flex items-center">
     <bx_if:show_icon>
     <bx_if:show_icon>
-        <span class="sys-action-counter-icon __style_prefix__-counter-icon bx-def-align-center">
+        <span class="sys-action-counter-icon __style_prefix__-counter-icon relative flex items-center justify-center ring-1  h-6 w-6 rounded-full ring-white dark:ring-gray-800 h-6 w-6 bg-gray-200 dark:bg-gray-800">
             __name__
             __name__
         </span>
         </span>
     </bx_if:show_icon>
     </bx_if:show_icon>
     <bx_if:show_profiles>
     <bx_if:show_profiles>
-        <span class="sys-action-counter-profiles __style_prefix__-counter-profiles">
+        <span class="sys-action-counter-profiles __style_prefix__-counter-profiles flex">
             <bx_repeat:profiles>
             <bx_repeat:profiles>
-                <span class="sys-action-counter-profile __style_prefix__-counter-profile">__unit__</span>
+                <span class="sys-action-counter-profile __style_prefix__-counter-profile block -ml-2 first:ml-0">__unit__</span>
             </bx_repeat:profiles>
             </bx_repeat:profiles>
         </span>
         </span>
     </bx_if:show_profiles>
     </bx_if:show_profiles>
     <bx_if:show_text>
     <bx_if:show_text>
-        <span class="sys-action-counter-text __style_prefix__-counter-text bx-def-margin-sec-left-auto">__text__</span>
+        <span class="sys-action-counter-text __style_prefix__-counter-text ml-1">__text__</span>
     </bx_if:show_text>
     </bx_if:show_text>
 </span>
 </span>

+ 3 - 40
template/css/connection.css

@@ -1,46 +1,9 @@
 /*-- Counter --*/
 /*-- Counter --*/
-.sys-action-counter-profiles {
-    display: flex;
-}
-.sys-action-counter-profile {
-    display: block;
-    margin-left: -0.25rem;
-}
-.sys-action-counter-profile:first-child {
-    margin-left: 0;
-}
 .sys-action-counter-profile .bx-def-icon-size {
 .sys-action-counter-profile .bx-def-icon-size {
-    width: 1rem;
-    height: 1rem;
-}
-.sys-action-counter-profiles .sys-action-counter-profile div.bx-def-unit-img, 
-.sys-action-counter-profiles .sys-action-counter-profile div.bx-def-unit-img img {
-    display: block;
-}
-.sys-action-counter-profile div.bx-def-unit-img .bx-base-pofile-unit-thumb {
-    border-radius: 1rem;
-    line-height: normal;
-    font-size: 0.6rem;
+    width: 1.5rem;
+    height: 1.5rem;
 }
 }
+
 .sys-action-counter-profile .bx-base-pofile-unit-online {
 .sys-action-counter-profile .bx-base-pofile-unit-online {
     display: none;
     display: none;
-}
-
-/*--- Connected By ---*/
-div.bx-conn-by-list {}
-div.bx-conn-by-list-cnt {}
-div.bx-conn-by-items {
-    max-height: 200px;
-    max-height: 12.5rem;
-    min-width: 220px;
-    min-width: 13.75rem;
-    overflow: auto;
-}
-div.bx-conn-user {
-    position: relative;
-}
-div.bx-conn-user-avatar {
-    position: absolute;
-    top: 0px;
-    left: 0px;
 }
 }

+ 0 - 1
template/css/default.less

@@ -510,7 +510,6 @@ h3,
 .bx-def-thumb,
 .bx-def-thumb,
 .bx-def-ava,
 .bx-def-ava,
 .bx-def-ava-big {
 .bx-def-ava-big {
-    .radius(200px);
     overflow:hidden;
     overflow:hidden;
 }
 }
 
 

+ 1 - 1
template/review_content.html

@@ -5,4 +5,4 @@
 <bx_if:show_attached>
 <bx_if:show_attached>
     <div class="__style_prefix__-attached bx-def-margin-thd-leftright-neg bx-clearfix">__attached__</div>
     <div class="__style_prefix__-attached bx-def-margin-thd-leftright-neg bx-clearfix">__attached__</div>
 </bx_if:show_attached>
 </bx_if:show_attached>
-<div class="__style_prefix__-reactions">__reactions__</div>
+<div class="__style_prefix__-counters -mx-1 mt-1">__counters__</div>

+ 6 - 6
template/review_mood_form_field.html

@@ -1,13 +1,13 @@
 <div class="__style_prefix__-rating __style_prefix__-rating-element" __style_prefix__-rating-data="__value__">
 <div class="__style_prefix__-rating __style_prefix__-rating-element" __style_prefix__-rating-data="__value__">
-    <div class="__style_prefix__-mood">
+    <div class="__style_prefix__-mood relative inline-block">
         <div class="__style_prefix__-mood-underlay">
         <div class="__style_prefix__-mood-underlay">
-            <bx_repeat:stars><i class="__style_prefix__-mood-star sys-icon far star"></i></bx_repeat:stars>
+            <bx_repeat:stars><i class="__style_prefix__-mood-star sys-icon far star text-yellow-500"></i></bx_repeat:stars>
         </div>
         </div>
-        <div class="__style_prefix__-mood-slider">
-            <bx_repeat:slider><i class="__style_prefix__-mood-star sys-icon star"></i></bx_repeat:slider>
+        <div class="__style_prefix__-mood-slider absolute z-1 top-0 left-0 whitespace-nowrap overflow-hidden">
+            <bx_repeat:slider><i class="__style_prefix__-mood-star sys-icon star text-yellow-500"></i></bx_repeat:slider>
         </div>
         </div>
-        <div class="__style_prefix__-mood-buttons">
-            <bx_repeat:buttons><a class="__style_prefix__-mood-button" href="javascript:void(0);" onmouseover="__js_object__.over(this);" onmouseout="__js_object__.out(this);" onclick="__js_object__.vote(this, __value__)"><i class="__style_prefix__-mood-star sys-icon star"></i></a></bx_repeat:buttons>
+        <div class="__style_prefix__-mood-buttons absolute z-2 top-0 left-0">
+            <bx_repeat:buttons><a class="__style_prefix__-mood-button" href="javascript:void(0);" onmouseover="__js_object__.over(this);" onmouseout="__js_object__.out(this);" onclick="__js_object__.vote(this, __value__)"><i class="__style_prefix__-mood-star sys-icon star text-transparent hover:text-yellow-600"></i></a></bx_repeat:buttons>
         </div>
         </div>
     </div>
     </div>
     <input class="__style_prefix__-mood-value" type="hidden" name="__name__" value="__value__" />
     <input class="__style_prefix__-mood-value" type="hidden" name="__name__" value="__value__" />

+ 4 - 4
template/review_mood_legend.html

@@ -1,10 +1,10 @@
 <div class="__style_prefix__-rating __style_prefix__-rating-legend" id="__html_id__" __style_prefix__-rating-data="__value__">
 <div class="__style_prefix__-rating __style_prefix__-rating-legend" id="__html_id__" __style_prefix__-rating-data="__value__">
-    <div class="__style_prefix__-mood">
+    <div class="__style_prefix__-mood relative inline-block">
         <div class="__style_prefix__-mood-underlay">
         <div class="__style_prefix__-mood-underlay">
-            <bx_repeat:stars><i class="__style_prefix__-mood-star sys-icon far star"></i></bx_repeat:stars>
+            <bx_repeat:stars><i class="__style_prefix__-mood-star sys-icon far star text-yellow-500"></i></bx_repeat:stars>
         </div>
         </div>
-        <div class="__style_prefix__-mood-slider">
-            <bx_repeat:slider><i class="__style_prefix__-mood-star sys-icon star"></i></bx_repeat:slider>
+        <div class="__style_prefix__-mood-slider absolute z-1 top-0 left-0 whitespace-nowrap overflow-hidden">
+            <bx_repeat:slider><i class="__style_prefix__-mood-star sys-icon star text-yellow-500"></i></bx_repeat:slider>
         </div>
         </div>
     </div>
     </div>
 </div>
 </div>

+ 4 - 5
template/scripts/BxBaseConnection.php

@@ -74,12 +74,11 @@ class BxBaseConnection extends BxDolConnection
         
         
         $aParamsDefault = [
         $aParamsDefault = [
             'dynamic_mode' => true,
             'dynamic_mode' => true,
-            'show_do_as_button_small' => true,
-            'show_do_as_button' => true,
+            'show_do_as_button_small' => false,
+            'show_do_as_button' => false,
             'show_counter_label_with_profiles' => true,
             'show_counter_label_with_profiles' => true,
             'show_script' => true,
             'show_script' => true,
         ];
         ];
-        
         $aParams = array_merge($aParams, $aParamsDefault);
         $aParams = array_merge($aParams, $aParamsDefault);
 
 
         $iCount = $sContentType == BX_CONNECTIONS_CONTENT_TYPE_INITIATORS ? $this->getConnectedInitiatorsCount($iProfileId, $bIsMutual) : $this->getConnectedContentCount($iProfileId, $bIsMutual);
         $iCount = $sContentType == BX_CONNECTIONS_CONTENT_TYPE_INITIATORS ? $this->getConnectedInitiatorsCount($iProfileId, $bIsMutual) : $this->getConnectedContentCount($iProfileId, $bIsMutual);
@@ -88,8 +87,8 @@ class BxBaseConnection extends BxDolConnection
             $sJsObject = $this->getJsObjectName($iProfileId);
             $sJsObject = $this->getJsObjectName($iProfileId);
 
 
             $bDynamicMode = isset($aParams['dynamic_mode']) && $aParams['dynamic_mode'] === true;
             $bDynamicMode = isset($aParams['dynamic_mode']) && $aParams['dynamic_mode'] === true;
-            $bShowDoAsButtonSmall = isset($aParams['show_do_as_button_small']) && $aParams['show_do_as_button_small'] == false;
-            $bShowDoAsButton = !$bShowDoAsButtonSmall && isset($aParams['show_do_as_button']) && $aParams['show_do_as_button'] == true;
+            $bShowDoAsButtonSmall = isset($aParams['show_do_as_button_small']) && $aParams['show_do_as_button_small'] === true;
+            $bShowDoAsButton = !$bShowDoAsButtonSmall && isset($aParams['show_do_as_button']) && $aParams['show_do_as_button'] === true;
             $bShowScript = !isset($aParams['show_script']) || $aParams['show_script'] == true;
             $bShowScript = !isset($aParams['show_script']) || $aParams['show_script'] == true;
 
 
             $sClass = $this->_sStylePrefix . '-counter';
             $sClass = $this->_sStylePrefix . '-counter';