Merge branch 'master' into builds/v1

SlateFoundation · Jun 2, 2017 · ddeb304 · ddeb304
2 parents 30dccf4 + 1937ec0
commit ddeb304
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/html-templates/scienceleadership-interims/_body.tpl b/html-templates/scienceleadership-interims/_body.tpl
@@ -0,0 +1,10 @@
+{extends "progress/section-interim-reports/_body.tpl"}
+
+{block fields}
+    {if $Report->Grade}
+        <div class="dli">
+            <dt class="grade">Current Grade</dt>
+            <dd class="grade">{$Report->Grade}</dd>
+        </div>
+    {/if}
+{/block}
diff --git a/php-config/Slate/Progress/SectionInterimReport.config.d/scienceleadership-interims.php b/php-config/Slate/Progress/SectionInterimReport.config.d/scienceleadership-interims.php
@@ -6,4 +6,6 @@
     'type' => 'enum',
     'values' => ['A', 'B', 'C', 'D', 'F', 'N/A'],
     'default' => null
-];
+];
+
+SectionInterimReport::$bodyTpl = 'scienceleadership-interims/_body';
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.0.6",
+    "version": "1.1.0",
 
     /**
      * The version that users can transparently update from without requiring code changes.