Merge pull request #485 from colemanw/removeCrmStar

Remove crmStar styling, require Bootstrap3
veda-consulting-company · Feb 23, 2022 · 1178afb · 1178afb
2 parents cde5359 + ae6ffce
commit 1178afb
Show file tree

Hide file tree

Showing 20 changed files with 8 additions and 256 deletions.
diff --git a/CRM/Mosaico/Utils.php b/CRM/Mosaico/Utils.php
@@ -17,10 +17,6 @@ class CRM_Mosaico_Utils {
    */
   const MAX_IMAGE_PIXELS = 36000000;
 
-  public static function isBootstrap() {
-    return strpos(CRM_Mosaico_Utils::getLayoutPath(), '/crmstar-') === FALSE;
-  }
-
   /**
    * Get a list of layout options.
    *
@@ -30,7 +26,6 @@ public static function isBootstrap() {
   public static function getLayoutOptions() {
     return [
       'auto' => E::ts('Automatically select a layout'),
-      'crmstar-single' => E::ts('Single Page (crm-*)'),
       'bootstrap-single' => E::ts('Single Page (Bootstrap CSS)'),
       'bootstrap-wizard' => E::ts('Wizard (Bootstrap CSS)'),
     ];
@@ -136,15 +131,13 @@ public static function getLayoutPath() {
     $prefix = '~/crmMosaico/EditMailingCtrl';
 
     $paths = [
-      'crmstar-single' => "$prefix/crmstar-single.html",
       'bootstrap-single' => "$prefix/bootstrap-single.html",
       'bootstrap-wizard' => "$prefix/bootstrap-wizard.html",
     ];
 
-    if (empty($layout) || $layout === 'auto') {
-      $themes = Civi::service('themes');
-      return $themes->getActiveThemeKey() === 'shoreditch'
-        ? $paths['bootstrap-wizard'] : $paths['crmstar-single'];
+    // Legacy handling for 'crmstar-single' - treat as 'auto'
+    if (empty($layout) || $layout === 'auto' || $layout === 'crmstar-single') {
+      return $paths['bootstrap-wizard'];
     }
     elseif (isset($paths[$layout])) {
       return $paths[$layout];

diff --git a/ang/crmMosaico.ang.php b/ang/crmMosaico.ang.php
@@ -11,11 +11,10 @@
     1 => 'ang/crmMosaico/*.js',
     2 => 'ang/crmMosaico/*/*.js',
   ],
-  'css' => [],
-  'partials' =>
-  [
+  'css' => ['css/mosaico-bootstrap.css'],
+  'bundles' => ['bootstrap3'],
+  'partials' => [
     'ang/crmMosaico',
-    CRM_Mosaico_Utils::isBootstrap() ? 'ang/crmMosaico.bootstrap' : 'ang/crmMosaico.crmstar',
   ],
   'settings' =>
   [
@@ -26,12 +25,7 @@
     'drupalNav' => '#toolbar',
     'joomlaNav' => '.com_civicrm > .navbar',
     'leftNav' => '.wp-admin #adminmenu',
-    'useBootstrap' => CRM_Mosaico_Utils::isBootstrap(),
     'variantsPct' => CRM_Mosaico_AbDemux::DEFAULT_AB_PERCENTAGE,
   ],
 ];
-
-$result['css'][]= ($result['settings']['useBootstrap']) ? 'css/mosaico-bootstrap.css' : 'css/mosaico-crmstar.css';
-$result['bundles']= ($result['settings']['useBootstrap']) ? ['bootstrap3'] : [];
-
 return $result;
diff --git a/ang/crmMosaico.crmstar/BlockDesign.html b/ang/crmMosaico.crmstar/BlockDesign.html
diff --git a/ang/crmMosaico.crmstar/BlockPreview.html b/ang/crmMosaico.crmstar/BlockPreview.html
diff --git a/ang/crmMosaico.crmstar/Distribution.html b/ang/crmMosaico.crmstar/Distribution.html
diff --git a/ang/crmMosaico.crmstar/EditMailingCtrl/crmstar-single.html b/ang/crmMosaico.crmstar/EditMailingCtrl/crmstar-single.html
diff --git a/ang/crmMosaico.crmstar/PreviewDialogCtrl.html b/ang/crmMosaico.crmstar/PreviewDialogCtrl.html
diff --git a/ang/crmMosaico.crmstar/SubjectList.html b/ang/crmMosaico.crmstar/SubjectList.html
diff --git a/ang/crmMosaico.crmstar/TemplateItem.html b/ang/crmMosaico.crmstar/TemplateItem.html
diff --git a/ang/crmMosaico.bootstrap/BlockDesign.html → ang/crmMosaico/BlockDesign.html b/ang/crmMosaico.bootstrap/BlockDesign.html → ang/crmMosaico/BlockDesign.html
diff --git a/ang/crmMosaico.bootstrap/BlockPreview.html → ang/crmMosaico/BlockPreview.html b/ang/crmMosaico.bootstrap/BlockPreview.html → ang/crmMosaico/BlockPreview.html
diff --git a/ang/crmMosaico.bootstrap/Distribution.html → ang/crmMosaico/Distribution.html b/ang/crmMosaico.bootstrap/Distribution.html → ang/crmMosaico/Distribution.html
diff --git a/...rap/EditMailingCtrl/bootstrap-single.html → ...ico/EditMailingCtrl/bootstrap-single.html b/...rap/EditMailingCtrl/bootstrap-single.html → ...ico/EditMailingCtrl/bootstrap-single.html
diff --git a/...rap/EditMailingCtrl/bootstrap-wizard.html → ...ico/EditMailingCtrl/bootstrap-wizard.html b/...rap/EditMailingCtrl/bootstrap-wizard.html → ...ico/EditMailingCtrl/bootstrap-wizard.html
diff --git a/...mMosaico.bootstrap/PreviewDialogCtrl.html → ang/crmMosaico/PreviewDialogCtrl.html b/...mMosaico.bootstrap/PreviewDialogCtrl.html → ang/crmMosaico/PreviewDialogCtrl.html
diff --git a/ang/crmMosaico.bootstrap/SubjectList.html → ang/crmMosaico/SubjectList.html b/ang/crmMosaico.bootstrap/SubjectList.html → ang/crmMosaico/SubjectList.html
diff --git a/ang/crmMosaico.bootstrap/TemplateItem.html → ang/crmMosaico/TemplateItem.html b/ang/crmMosaico.bootstrap/TemplateItem.html → ang/crmMosaico/TemplateItem.html
diff --git a/ang/crmbWizard.ang.php b/ang/crmbWizard.ang.php
@@ -11,13 +11,10 @@
     2 => 'ang/crmbWizard/*/*.js',
   ],
   // Hmm, shouldn't high-level components have separate CSS files?
-  'css' => CRM_Mosaico_Utils::isBootstrap() ? ['css/mosaico-bootstrap.css'] : [],
-  'bundles' => CRM_Mosaico_Utils::isBootstrap() ? ['bootstrap3'] : [],
+  'css' => ['css/mosaico-bootstrap.css'],
+  'bundles' => ['bootstrap3'],
   'partials' =>
   [
     0 => 'ang/crmbWizard',
   ],
-  'settings' =>
-  [
-  ],
 ];
diff --git a/css/mosaico-crmstar.css b/css/mosaico-crmstar.css
diff --git a/sass/mosaico-crmstar.scss b/sass/mosaico-crmstar.scss