RomanL vor 4 Jahren
Ursprung
Commit
411c27c013

+ 1 - 1
inc/classes/BxDolFeature.php

@@ -209,7 +209,7 @@ class BxDolFeature extends BxDolObject
         $aContentInfo = BxDolRequest::serviceExists($sModule, 'get_all') ? BxDolService::call($sModule, 'get_all', array(array('type' => 'id', 'id' => $this->getId()))) : array();
         
         $AuditParams = array(
-            'content_title' => isset($CNF['FIELD_TITLE'])  ? $aContentInfo[$CNF['FIELD_TITLE']] : '',
+            'content_title' => isset($CNF['FIELD_TITLE']) && isset($aContentInfo[$CNF['FIELD_TITLE']])  ? $aContentInfo[$CNF['FIELD_TITLE']] : '',
             'content_info_object' =>  isset($CNF['OBJECT_CONTENT_INFO']) ? $CNF['OBJECT_CONTENT_INFO'] : '',
         );
         

+ 1 - 1
modules/base/groups/classes/BxBaseModGroupsPageEntry.php

@@ -25,7 +25,7 @@ class BxBaseModGroupsPageEntry extends BxBaseModProfilePageEntry
         $bLoggedOwner = isset($this->_aContentInfo[$CNF['FIELD_AUTHOR']]) && $this->_aContentInfo[$CNF['FIELD_AUTHOR']] == bx_get_logged_profile_id();
         $bLoggedModerator = $this->_oModule->checkAllowedEditAnyEntry() === CHECK_ACTION_RESULT_ALLOWED;
 
-        if(!empty($CNF['FIELD_CF'])) {
+        if(!empty($CNF['FIELD_CF']) && isset($this->_aContentInfo[$CNF['FIELD_CF']])) {
             $oCf = BxDolContentFilter::getInstance();
             if($oCf->isEnabled() && !$oCf->isAllowed($this->_aContentInfo[$CNF['FIELD_CF']])) {
                 $this->setPageCover(false);

+ 3 - 3
modules/boonex/acl/template/pm_actions.html

@@ -1,6 +1,6 @@
-<p class="acl-dbd-membership-actions bx-def-font-align-center">
-	<a class="bx-btn bx-btn-small" href="__url_upgrade__"><bx_text:_bx_acl_txt_upgrade /></a>
-	<!--
+<p class="acl-dbd-membership-actions mt-2 text-center">
+    <a class="bx-btn bx-btn-small" href="__url_upgrade__"><bx_text:_bx_acl_txt_upgrade /></a>
+    <!--
 	TODO: A link to our own Manage tool or some manager from Payment Provider should be here.   
 	<a class="bx-btn bx-btn-small" href="javascript:void(0)"><bx_text:_bx_acl_txt_manage /></a>
 	-->

+ 0 - 3
modules/boonex/artificer/data/template/bx_acl/pm_actions.html

@@ -1,3 +0,0 @@
-<p class="acl-dbd-membership-actions mt-2 text-center">
-    <a class="bx-btn bx-btn-small" href="__url_upgrade__"><bx_text:_bx_acl_txt_upgrade /></a>
-</p>

+ 0 - 7
modules/boonex/artificer/data/template/system/acl_membership.html

@@ -1,7 +0,0 @@
-<div id="__html_id__" class="bx-acl-membeship text-center">
-    <div class="bx-acl-m-title text-2xl">__level__</div>
-    <div class="bx-acl-m-thumbnail mt-2">__thumbnail__</div>
-    <bx_if:show_private_info>
-        <div class="bx-acl-m-info mt-2 text-xs"><bx_text:_sys_acl_start /> <b>__date_start__</b> <bx_text:_sys_acl_expire /> <b>__date_expire__</b><bx_if:show_state><br /><bx_text:_sys_acl_state /> <b>__state__</b></bx_if:show_state></div>
-    </bx_if:show_private_info>
-</div>

+ 4 - 0
modules/boonex/decorous/data/template/system/css/auth.css

@@ -2,4 +2,8 @@
 
 .sys-auth .bx-btn {
     width: auto;
+    border:none !important;
+}
+.sys-auth .bx-btn .sys-icon{
+    font-size: 1.25rem !important;
 }

+ 0 - 1
modules/boonex/decorous/data/template/system/css/menu.less

@@ -214,7 +214,6 @@
     }
     .bx-popup ul.bx-menu-ver li a > div > span,
     .bx-popup ul.bx-menu-custom.bx-menu-custom-ver li a > span:not(.sys-action-do-icon) {
-        margin-left: 1.0rem;
         line-height: 1.5rem;
         .bx-decorous.font-size(@bx-font-size-middle);
     }

+ 1 - 1
modules/boonex/protean/data/template/system/css/default.less

@@ -1042,7 +1042,7 @@
         .box-sizing(@base-input-box-sizing);
 
         height: @bx-height-button-small;
-        line-height: (@bx-height-button-small - 0.125 * @bx-border-width-button-small - 0.5rem);
+        line-height: (@bx-height-button-small - 0.125 * @bx-border-width-button-small);
 
         .background-color (@bx-color-button-small);
 

+ 1 - 1
modules/boonex/protean/data/template/system/css/menu.less

@@ -91,7 +91,7 @@
     .bx-popup ul.bx-menu-ver li a > div > span,
     .bx-popup ul.bx-menu-custom.bx-menu-custom-ver li a > span:not(.sys-action-do),
     .bx-popup ul.bx-menu-custom.bx-menu-custom-ver li a span.sys-action-do-text {
-        margin-left: 1.0rem;
+        /*margin-left: 1.0rem;*/
         line-height: 1.5rem;
     }
     .bx-popup ul.bx-menu-custom.bx-menu-custom-ver.bx-menu-submenu-more-auto li.bx-menu-item a {

+ 3 - 3
template/acl_membership.html

@@ -1,7 +1,7 @@
-<div id="__html_id__" class="bx-acl-membeship bx-def-font-align-center">
+<div id="__html_id__" class="bx-acl-membeship text-center">
     <div class="bx-acl-m-title bx-def-font-h3">__level__</div>
-    <div class="bx-acl-m-thumbnail bx-def-margin-sec-top">__thumbnail__</div>
+    <div class="bx-acl-m-thumbnail mt-2">__thumbnail__</div>
     <bx_if:show_private_info>
-        <div class="bx-acl-m-info bx-def-margin-sec-top bx-def-font-small"><bx_text:_sys_acl_start /> <b>__date_start__</b> <bx_text:_sys_acl_expire /> <b>__date_expire__</b><bx_if:show_state><br /><bx_text:_sys_acl_state /> <b>__state__</b></bx_if:show_state></div>
+        <div class="bx-acl-m-info mt-2 bx-def-font-small"><bx_text:_sys_acl_start /> <b>__date_start__</b> <bx_text:_sys_acl_expire /> <b>__date_expire__</b><bx_if:show_state><br /><bx_text:_sys_acl_state /> <b>__state__</b></bx_if:show_state></div>
     </bx_if:show_private_info>
 </div>

+ 0 - 2
template/css/common.css

@@ -123,8 +123,6 @@ blockquote {
 
 .bx-anchor-invisible,
 .bx-anchor {
-    padding-top:60px;
-    margin-top:-60px;
     -webkit-background-clip:content-box;
     background-clip:content-box;
 }

+ 2 - 2
template/css/default.less

@@ -93,9 +93,9 @@
 }
 .bx-def-margin-right-auto {
     .margin-right(@bx-margin);
-    &:last-child {
+   /* &:last-child {
         .margin-right(0);
-    }
+    }*/
 }
 
 .bx-def-margin-sec {

+ 1 - 1
template/scripts/BxBaseReport.php

@@ -193,7 +193,7 @@ class BxBaseReport extends BxDolReport
         }
 
         if(empty($aTmplReports))
-            $aTmplReports = MsgBox(_t('_Empty'));
+            return '';
 
         return $this->_oTemplate->parseHtmlByName('report_by_list_with_comments.html', array(
             'style_prefix' => $this->_sStylePrefix,