Merge branch 'master' into builds/v1

SlateFoundation · Jun 4, 2017 · 4cb8918 · 4cb8918
2 parents ddeb304 + 9705bcb
commit 4cb8918
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/html-templates/scienceleadership-interims/_body.email.tpl b/html-templates/scienceleadership-interims/_body.email.tpl
@@ -0,0 +1,15 @@
+{extends "progress/section-interim-reports/_body.email.tpl"}
+
+{block fields}
+    {if $Report->Grade}
+        <div style="margin: 1em 0;">
+            <span style="color: #5e6366; font-size: smaller; font-style: italic;">Current Grade</span>
+            <br />
+            <span style="display: block; margin-left: 1.5em;">
+                <strong>{$Report->Grade}</strong>
+            </span>
+        </div>
+    {/if}
+
+    {$dwoo.parent}
+{/block}
diff --git a/html-templates/scienceleadership-interims/_body.tpl b/html-templates/scienceleadership-interims/_body.tpl
@@ -7,4 +7,6 @@
             <dd class="grade">{$Report->Grade}</dd>
         </div>
     {/if}
+
+    {$dwoo.parent}
 {/block}
diff --git a/php-config/Git.config.d/scienceleadership-interims.php b/php-config/Git.config.d/scienceleadership-interims.php
@@ -5,6 +5,9 @@
     'originBranch' => 'builds/v1',
     'workingBranch' => 'builds/v1',
     'trees' => [
+        'html-templates/scienceleadership-interims/_body.tpl',
+        'html-templates/scienceleadership-interims/_body.email.tpl',
+        'php-config/Git.config.d/scienceleadership-interims.php',
         'php-config/Slate/Progress/SectionInterimReport.config.d/scienceleadership-interims.php',
         'php-migrations/ScienceLeadership/Interims',
         'sencha-workspace/packages/scienceleadership-interims'

diff --git a/sencha-workspace/packages/scienceleadership-interims/package.json b/sencha-workspace/packages/scienceleadership-interims/package.json
@@ -62,7 +62,7 @@
      * Typically, changes to the package should come along with changes to the version.
      * This number should be in this format: d+(.d+)*
      */
-    "version": "1.1.0",
+    "version": "1.1.1",
 
     /**
      * The version that users can transparently update from without requiring code changes.