Register appName as global view variable

Minor mail template improvements
wintercms · Jul 23, 2017 · a78aab1 · a78aab1
1 parent ec71498
commit a78aab1
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 5 deletions.
diff --git a/ServiceProvider.php b/ServiceProvider.php
@@ -2,6 +2,7 @@
 
 use App;
 use Lang;
+use View;
 use Event;
 use Config;
 use Backend;
@@ -54,6 +55,7 @@ public function register()
  $this->registerMarkupTags();
  $this->registerAssetBundles();
  $this->registerValidator();
+ $this->registerGlobalViewVars();
 
  /*
  * Register other module providers
@@ -518,4 +520,9 @@ protected function registerValidator()
  });
  });
  }
+
+ protected function registerGlobalViewVars()
+ {
+ View::share('appName', Config::get('app.name'));
+ }
 }
diff --git a/classes/MailManager.php b/classes/MailManager.php
@@ -1,7 +1,6 @@
 <?php namespace System\Classes;
 
 use Twig;
-use Config;
 use Markdown;
 use System\Models\MailPartial;
 use System\Models\MailTemplate;
@@ -94,8 +93,7 @@ public function addContentToMailer($message, $code, $data)
  }
 
  $data += [
- 'subject' => $swiftMessage->getSubject(),
- 'appName' => Config::get('app.name')
+ 'subject' => $swiftMessage->getSubject()
  ];
 
  /*

diff --git a/helpers/View.php b/helpers/View.php
@@ -2,6 +2,16 @@
 
 use View as ViewFacade;
 
+/**
+ * This helper class is used to extract basic variables
+ * (scalar or array) from the global `View` Facade.
+ *
+ * You can register these global variables with `View::share`.
+ *
+ * View::share('siteName', 'OctoberCMS');
+ *
+ * Then available globally for use in the front-end and mail templates.
+ */
 class View
 {
  /**

diff --git a/models/mailbrandsetting/custom.less b/models/mailbrandsetting/custom.less
@@ -201,6 +201,10 @@ img {
  padding: 35px;
 }
 
+.wrapper.layout-system .content-cell {
+ padding: 35px 0;
+}
+
 /* Buttons */
 
 .action {

diff --git a/views/mail/layout-default.htm b/views/mail/layout-default.htm
@@ -14,7 +14,7 @@
  {{ css|raw }}
  </style>
 
- <table class="wrapper" width="100%" cellpadding="0" cellspacing="0">
+ <table class="wrapper layout-default" width="100%" cellpadding="0" cellspacing="0">
 
  <!-- Header -->
  {% component 'header' %}

diff --git a/views/mail/layout-system.htm b/views/mail/layout-system.htm
@@ -18,7 +18,7 @@
  {{ css|raw }}
  </style>
 
- <table class="wrapper" width="100%" cellpadding="0" cellspacing="0">
+ <table class="wrapper layout-system" width="100%" cellpadding="0" cellspacing="0">
  <tr>
  <td align="center">
  <table class="content" width="100%" cellpadding="0" cellspacing="0">