Merge branch 'development' of https://github.com/cu-sage/sage-frontend …

…into development

public/js/controllers/instructor/InstructorGamesController.js

@@ -6,7 +6,7 @@ angular.module('instructorApp')
             movie: '@'
             },
             link: function(scope, element) {
-                var object = '<object style="position: absolute" width="99%" height="100%">' +
+                var object = '<object style="position: absolute" width="99%" height="800px">' +
                 '<param name="movie" width="100%" height="100%" value="' + scope.movie + '" />' +
                 '</object>';
                 element.replaceWith(object);

public/views/index.html

@@ -87,8 +87,11 @@
         <div class="row">
           <div class="col-lg-12 text-center">
             <h2 class="section-heading text-uppercase">About</h2>
-            <h3 class="section-subheading text-muted">SAGE is short for Social Addictive Gameful Engineering, a project under Columbia University's Programming Systems Lab. The project team is building a collaborative game-based learning and assessment system that infuses computational thinking in grade 6-8 curricula.  </h3>
+              <img src="/public/images/programming-systems-lab.png">
+            <h3 class="section-subheading text-muted">Social Addictive Gameful Engineering (SAGE) is a collaborative game-based learning and assessment system  which infuses computational thinking in grade 6-8 curricula  </h3>
+
           </div>
+
         </div>
        <!-- <div class="row">
           <div class="col-lg-12">

public/views/instructor/instructor_VAE.html

@@ -2,7 +2,7 @@
     <div><img src="/public/images/logo.png" height="60">
     </div>
     <div class="head1">
-        <h2>Objective Editor</h2>
+        <h2>Objective Design</h2>
     </div><!--<h2 class="sub-header">{{course.courseName}}</h2>
 -->
     <h4>Game {{aid}}</h4>

public/views/instructor/instructor_scratchdesign.html

@@ -2,7 +2,7 @@
     <div><img src="/public/images/logo.png" height="60">
     </div>
     <div class="head1">
-        <h2>Scratch Editor</h2>
+        <h2>Game Design</h2>
     </div>
 
     <p>Instructor Id : {{iid}}</p>

public/views/student/student_assessment.html

@@ -168,7 +168,7 @@ <h2></h2>
     </div>
 </div>
 <div class="starter-template ng-scope">
-    <div style="position: relative; height: 100%" class="col-xs-10">
+    <div style="position: relative; height: 800px;" class="col-xs-10">
         <scratch movie="{{ movie.url }}" ng-if="dataLoaded"/>
         <!-- <object style="position: absolute; left:-40px" width="99%" height="100%">
             <param name="movie" width="100%" height="100%" value="http://dev.cu-sage.org/public/sampleSWF/scratch.swf?sid=sm4241&assignmentID=123&mode=PLAY">

public/views/student/student_home.html

@@ -2,20 +2,20 @@
     <div><img src="/public/images/logo.png" height="60">
     </div>
     <div class="head1">
-        <h1>Games</h1>
+        <h1>Quests</h1>
     </div>
 
     <div class="starter-template ng-scope">
-<!--
-    <div class="col-md-12">
-        <h3> Recommended Courses </h3>
-        <div ng-repeat="course in recommendedCourses" >
-            <div 
-            ng-click='changeView("/courses/"+ course.courseID +"/"+ sid)'
-            class="course-box"> <h3>{{course.courseName}} </h3> </div>
-        </div>
-        <div class="clearfix"> </div>
--->
+        <!--
+        <div class="col-md-12">
+            <h3> Recommended Courses </h3>
+            <div ng-repeat="course in recommendedCourses" >
+                <div
+                ng-click='changeView("/courses/"+ course.courseID +"/"+ sid)'
+                class="course-box"> <h3>{{course.courseName}} </h3> </div>
+            </div>
+            <div class="clearfix"> </div>
+    -->
 
         <div class="container" style="width:100%">
             <div class="row">
@@ -33,22 +33,23 @@ <h3> Recommended Courses </h3>
             </div>
         </div>
 
-<!--        <h3> Recent Courses </h3>
-        <div ng-repeat="course in recentCourses" >
-            <div
-            ng-click='changeView("/courses/"+ course.courseID +"/"+ sid)'
-            class="course-box"> <h3> {{course.courseName}} </h3> </div>
-        </div>
-        <div class="clearfix"> </div>-->
-        
+        <!--        <h3> Recent Courses </h3>
+            <div ng-repeat="course in recentCourses" >
+                <div
+                ng-click='changeView("/courses/"+ course.courseID +"/"+ sid)'
+                class="course-box"> <h3> {{course.courseName}} </h3> </div>
+            </div>
+            <div class="clearfix"> </div>-->
+
         <h3> Metrics Overview </h3>
-        <div>Some metrics will be displayed here.</div>
-
-
+        <div><img src="/public/images/stats/progress_spider_stats.png" /></div>
+        <div><img src="/public/images/stats/pect_stats.png" /></div>
+
+
 
         <h3> Badges Earned </h3>
-        <div>Badges earned will be displayed here.</div>
-        
+        <div><img src="/public/images/badges/badges.png" /></div>
+
     </div>
 </div>