Merge pull request #8 from JarvusInnovations/develop

Release: slate-spark 2.0.2

html-templates/app/spark-ext.tpl

@@ -1,14 +1,19 @@
 {extends app/ext.tpl}
 
 {block css-loader}
-    <style>
-        #ext-viewport {
-            padding-top: 2.75em;
-        }
-    </style>
+    {if !$.get.iframe}
+        <style>
+            #ext-viewport {
+                padding-top: 2.75em;
+            }
+        </style>
+    {/if}
+
     {include includes/site.css.tpl}
 {/block}
 
 {block body}
-    {include includes/site.user-tools.tpl}
+    {if !$.get.iframe}
+        {include includes/site.user-tools.tpl}
+    {/if}
 {/block}

php-config/Git.config.d/slate-connector-illuminate.php

@@ -0,0 +1,13 @@
+<?php
+
+Git::$repositories['slate-connector-illuminate'] = [
+    'remote' => '[email protected]:SlateFoundation/slate-connector-illuminate.git',
+    'originBranch' => 'master',
+    'workingBranch' => 'master',
+    'trees' => [
+        'html-templates/connectors/illuminate/connector.tpl',
+        'php-classes/Slate/Connectors/Illuminate/Connector.php',
+        'php-config/Slate/Connectors/Illuminate/Connector.config.php',
+        'site-root/connectors/illuminate.php'
+    ]
+];

php-config/Git.config.d/slate-spark.php

@@ -0,0 +1,22 @@
+<?php
+
+Git::$repositories['slate-spark'] = [
+    'remote' => '[email protected]:JarvusInnovations/slate-spark.git',
+    'originBranch' => 'master',
+    'workingBranch' => 'master',
+    'trees' => [
+        'site-root/sass',
+        'site-root/img',
+        'site-root/spark',
+        'php-classes/Spark/Classroom',
+        'php-config/Git.config.d',
+        'php-config/Slate/DashboardRequestHandler.config.d',
+        'php-config/Slate/UI/Navigation.config.php',
+        'php-config/Slate/UI/Omnibar.config.php',
+        'php-config/Slate/UI/Adapters/Courses.config.d/matchbook.php',
+        'html-templates/app/spark-ext.tpl',
+        'html-templates/app/SparkClassroomTeacher',
+        'html-templates/app/SparkClassroomStudent',
+        'html-templates/sections/courseSection.tpl'
+    ]
+];

php-config/Git.config.d/spark-classroom.php

@@ -0,0 +1,14 @@
+<?php
+
+Git::$repositories['spark-classroom'] = [
+    'remote' => '[email protected]:JarvusInnovations/spark-classroom.git',
+    'originBranch' => 'releases/v2',
+    'workingBranch' => 'releases/v2',
+    'trees' => [
+        'sencha-workspace/packages/spark-classroom',
+        'sencha-workspace/SparkClassroomStudent',
+        'sencha-workspace/SparkClassroomTeacher',
+        'sencha-workspace/SparkDashboardStudent',
+        'sencha-workspace/SparkDashboardTeacher'
+    ]
+];

php-config/Git.config.d/spark-narratives.php

@@ -0,0 +1,11 @@
+<?php
+
+Git::$repositories['spark-narratives'] = [
+    'remote' => '[email protected]:JarvusInnovations/spark-narratives.git',
+    'originBranch' => 'builds/v1',
+    'workingBranch' => 'builds/v1',
+    'trees' => [
+        'php-config/Slate/Progress/Narratives/Report.config.d/spark.php',
+        'sencha-workspace/packages/spark-narratives'
+    ]
+];

php-config/Git.config.d/spark-theme.php

@@ -0,0 +1,10 @@
+<?php
+
+Git::$repositories['spark-theme'] = [
+    'remote' => '[email protected]:JarvusInnovations/spark-theme.git',
+    'originBranch' => 'develop',
+    'workingBranch' => 'develop',
+    'trees' => [
+        'sencha-workspace/packages/spark-theme' => '.'
+    ]
+];

php-config/Slate/DashboardRequestHandler.config.d/100_courses.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Slate;
+
+if (!empty($_SESSION['User'])) {
+    $sparkCourseLinks = [];
+
+    foreach ($_SESSION['User']->CurrentCourseSections AS $Section) {
+        $sparkCourseLinks[] = [
+            '_id' => $Section->Code,
+            '_label' => $Section->getTitle(),
+            '_shortLabel' => $Section->Code,
+            '_icon' => UI\Adapters\Courses::getIcon($Section),
+            '_href' => $GLOBALS['Session']->hasAccountLevel('Teacher') ?
+                "/spark/classroom/teacher#$Section->Code:gps" :
+                "/spark/classroom/student#$Section->Code::"
+        ];
+    }
+
+    DashboardRequestHandler::$sources[] = [
+        'My Courses' => [
+            '_icon' => 'courses',
+            '_children' => $sparkCourseLinks
+        ]
+    ];
+}

site-root/spark/exports/sparkpoint-progress/courses.csv.php

@@ -48,7 +48,7 @@
     }
 
     $where[] = implode(' OR ', array_map(function($timeField) use ($time) {
-        return sprintf('assess_finish_time >= to_timestamp(%u)', $time);
+        return sprintf('%s >= to_timestamp(%u)', $timeField, $time);
     }, $timeFields));
 }
 
@@ -58,7 +58,7 @@
     }
 
     $where[] = implode(' OR ', array_map(function($timeField) use ($time) {
-        return sprintf('assess_finish_time <= to_timestamp(%u)', $time);
+        return sprintf('%s <= to_timestamp(%u)', $timeField, $time);
     }, $timeFields));
 }
 

site-root/spark/exports/sparkpoint-progress/sections.csv.php

@@ -47,7 +47,7 @@
     }
 
     $where[] = implode(' OR ', array_map(function($timeField) use ($time) {
-        return sprintf('assess_finish_time >= to_timestamp(%u)', $time);
+        return sprintf('%s >= to_timestamp(%u)', $timeField, $time);
     }, $timeFields));
 }
 
@@ -57,7 +57,7 @@
     }
 
     $where[] = implode(' OR ', array_map(function($timeField) use ($time) {
-        return sprintf('assess_finish_time <= to_timestamp(%u)', $time);
+        return sprintf('%s <= to_timestamp(%u)', $timeField, $time);
     }, $timeFields));
 }
 

site-root/spark/exports/sparkpoint-progress/students.csv.php

@@ -47,7 +47,7 @@
     }
 
     $where[] = implode(' OR ', array_map(function($timeField) use ($time) {
-        return sprintf('assess_finish_time >= to_timestamp(%u)', $time);
+        return sprintf('%s >= to_timestamp(%u)', $timeField, $time);
     }, $timeFields));
 }
 
@@ -57,7 +57,7 @@
     }
 
     $where[] = implode(' OR ', array_map(function($timeField) use ($time) {
-        return sprintf('assess_finish_time <= to_timestamp(%u)', $time);
+        return sprintf('%s <= to_timestamp(%u)', $timeField, $time);
     }, $timeFields));
 }