Merge branch 'hotfix'

NETivism · Apr 12, 2024 · ccd5061 · ccd5061
2 parents 1339207 + 8b20af8
commit ccd5061
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/CRM/Contribute/Form/Contribution/Main.php b/CRM/Contribute/Form/Contribution/Main.php
@@ -575,7 +575,6 @@ public function buildQuickForm() {
     if ($this->_ppType) {
       return CRM_Core_Payment_ProcessorForm::buildQuickForm($this);
     }
-
     $config = CRM_Core_Config::singleton();
 
     $this->applyFilter('__ALL__', 'trim');
@@ -790,7 +789,6 @@ public function buildQuickForm() {
     $achievement = CRM_Contribute_BAO_ContributionPage::goalAchieved($this->_id);
     $this->assign('achievement', $achievement);
 
-    $template = CRM_Core_Smarty::singleton();
     $progress = array(
       'type' => $achievement['type'],
       'label' => $achievement['label'],
@@ -800,12 +798,8 @@ public function buildQuickForm() {
       'achieved_status' => $achievement['achieved'],
       'fullwidth' => FALSE,
       'display' => $achievement['goal'] ? TRUE : FALSE,
+      'link_display' => FALSE
     );
-
-    $introTextAssigned = $template->get_template_vars('intro_text') !== null;
-    if ($introTextAssigned) {
-      $progress['link_display'] = TRUE;
-    }
     $this->assign('progress', $progress);
 
     // hidden track id

diff --git a/css/civicrm.css b/css/civicrm.css
@@ -7254,7 +7254,7 @@ input.crm-form-textfield,
 .crm-container .progress-block {
   margin: 0 0 30px 0;
 }
-.crm-container .progress-block .inner {
+.page-civicrm-contribute-pcp .crm-container .progress-block .inner {
   padding: 20px 12px;
 }
 .crm-container .progress-wrapper {
@@ -7266,6 +7266,9 @@ input.crm-form-textfield,
   vertical-align: middle;
 }
 .crm-container .progress-cell.progress-bar-wrapper {
+  width: 100%;
+}
+.crm-container .progressbar-with-link .progress-cell.progress-bar-wrapper {
   width: 80%;
 }
 .crm-container .progress-cell.progress-buttons {
@@ -7384,7 +7387,7 @@ input.crm-form-textfield,
   }
 }
 @media (min-width: 992px) {
-  .crm-container .progress-block .inner {
+  .page-civicrm-contribute-pcp .crm-container .progress-block .inner {
     padding: 20px;
   }
   .crm-container .pcp-page-text {

diff --git a/templates/CRM/common/progressbar.tpl b/templates/CRM/common/progressbar.tpl
@@ -18,7 +18,7 @@
         {/if}
       </div>
     </div>
-    <div class="progress-wrapper">
+    <div class="progress-wrapper {if $progress.link_display}progressbar-with-link{/if}">
       <div class="progress-cell progress-bar-wrapper">
         <div class="progress-bar" style="width:0px;" data-current="{$percent_css}"></div>
         <div class="progress-pointer" style="left:0px;margin-left:0;opacity:0">{ts 1="`$progress.achieved_percent`%"}%1 achieved{/ts}</div>