Upgrade to GCB v1.4

VERSION

@@ -0,0 +1 @@
+Release: 20130507_203946

app.yaml

@@ -5,7 +5,7 @@ api_version: 1
 threadsafe: false
 
 env_variables:
-  GCB_PRODUCT_VERSION: '1.3.1'
+  GCB_PRODUCT_VERSION: '1.4.0'
 
 inbound_services:
 - warmup
@@ -15,19 +15,19 @@ builtins:
 - deferred: on
 
 libraries:
-- name: webapp2
-  version: latest
 - name: jinja2
-  version: latest
+  version: "2.6"
+- name: webapp2
+  version: "2.5.2"
+- name: webob
+  version: "1.2.3"
 
 handlers:
 - url: /remote_api
   script: $PYTHON_LIB/google/appengine/ext/remote_api/handler.py
   login: admin
-- url: /_ah/dev_admin(/.*)?  # provides interactive console
-  script: $PYTHON_LIB/google/appengine/ext/admin
+- url: /cron/expire_old_assigned_reviews
+  script: main.app
   login: admin
-  secure: always
 - url: /.*
   script: main.app
-

appengine_config.py

@@ -25,7 +25,7 @@
     'SERVER_SOFTWARE', 'Development').startswith('Development')
 
 # Set this flag to true to enable bulk downloads of Javascript/CSS files in lib
-BUNDLE_LIB_FILES = False
+BUNDLE_LIB_FILES = True
 
 # this is the official location of this app for computing of all relative paths
 BUNDLE_ROOT = os.path.dirname(__file__)
@@ -37,7 +37,9 @@
 DEFAULT_NAMESPACE_NAME = ''
 
 # Third-party library zip files.
-THIRD_PARTY_LIBS = ['babel-0.9.6.zip', 'gaepytz-2011h.zip']
+THIRD_PARTY_LIBS = [
+    'babel-0.9.6.zip', 'gaepytz-2011h.zip', 'pyparsing-1.5.7.zip',
+    'html5lib-0.95.zip']
 
 
 def gcb_force_default_encoding(encoding):
@@ -59,29 +61,8 @@ def gcb_init_third_party():
         sys.path.insert(0, thirdparty_lib)
 
 
-def gcb_configure_dev_server_if_running():
-    """Configure various aspects of development server if not production."""
-    if not PRODUCTION_MODE:
-        # pylint: disable-msg=g-import-not-at-top
-        from google.appengine.api import apiproxy_stub_map
-        from google.appengine.datastore import datastore_stub_util
-
-        # Make dev_appserver run with PseudoRandomHRConsistencyPolicy, which we
-        # believe is the best for localhost manual testing; normally
-        # dev_appserver runs either under MasterSlave policy, which does not
-        # allow XG transactions, or under TimeBasedHR policy, which serves
-        # counter-intuitive dirty query results; this also matches policy for
-        # the functional tests
-        # stub = apiproxy_stub_map.apiproxy.GetStub(
-        #     'datastore_v3')
-        # if stub:
-        #     policy = datastore_stub_util.PseudoRandomHRConsistencyPolicy(
-        #         probability=1)
-        #     stub.SetConsistencyPolicy(policy)
-
-
 gcb_init_third_party()
-gcb_configure_dev_server_if_running()
+
 
 #########################################
 # Remote_API Authentication configuration.
@@ -91,4 +72,4 @@ def gcb_configure_dev_server_if_running():
 # value.  'HTTP_X_APPENGINE_INBOUND_APPID', ['trusted source appid here']
 #
 remoteapi_CUSTOM_ENVIRONMENT_AUTHENTICATION = (
-    'HTTP_X_APPENGINE_INBOUND_APPID', ['ami-mooc-pilot'])
+    'HTTP_X_APPENGINE_INBOUND_APPID', ['amc-mooc-pilot'])

assets/css/main.css

@@ -452,11 +452,11 @@ a.gcb-button-action {
   text-shadow: 0 -1px 1px #555d72;
 }
 
-#gcb-nav-x li, #gcb-nav-x li.active a {
+#gcb-nav-x li.active a {
   font-weight: bold;
 }
-
-#gcb-nav-x li.active {
+#gcb-nav-x li.active a:hover {
+  test-decoration: none !important;
 }
 
 #gcb-nav-x li {
@@ -839,30 +839,21 @@ span.progress-empty {
   font-weight: bold;
 }
 
+.border-box {
+  border: 1px solid black;
+  margin: 20px;
+  padding: 10px;
+}
+
 /* Customizations */
 
 #gcb-header {
     background-image: none;
     background: none;
 }
 
-
-/*#gcb-header img {*/
-
-    /*padding: 4px;*/
-    /*padding-left: 0.5em;*/
-    /*padding-right: 0.5em;*/
-    /*background-color: white;*/
-
-/*}*/
-
 #gcb-nav-x {
 
     background-image: -webkit-linear-gradient(top, #97000B 0,#4B0507 45px,#e5e5e5 46px,#f7f7f7 47px,#fff 48px)
 
 }
-
-/*.is-wrapper {*/
-
-     /*margin-top: 1em;*/
-/*}*/

assets/js/assessment-ReviewAssessmentExample.js

@@ -0,0 +1,46 @@
+// Copyright 2012 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS-IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+// When the assessment page loads, activity-generic.js will render the contents
+// of the 'assessment' variable into the enclosing HTML webpage.
+
+// For information on modifying this page, see
+// https://code.google.com/p/course-builder/wiki/CreateAssessments.
+
+
+var assessment = {
+  // HTML to display at the start of the page
+  preamble: 'Solve the problem below by using concepts from at least three Power Search lessons. Record your experience in a Google doc.<br><br><strong>Problem</strong>: Plan a 3-day trip to a destination you have never visited. Where will you go? Why?',
+
+  questionsList: [
+    {questionHTML: 'Please write your response in a Google doc, and paste the link to the doc in the answer box below. You will need to ensure that your doc can be viewed by reviewers; please see this <a href="https://support.google.com/drive/bin/answer.py?hl=en&answer=2494822&topic=2816927&rd=1">help page</a> for instructions on how to do this.',
+     correctAnswerRegex: /.*/i
+    },
+
+    {questionHTML: 'How many Power Search concepts did you use in your writeup?',
+     choices: ['0 - 2', '3', '4 -- 5', 'More than 5']},
+
+    {questionHTML: 'List the Power Search concepts you used.',
+     multiLine: true,
+     correctAnswerRegex: /.*/i
+    },
+  ],
+
+  // The assessmentName key is deprecated in v1.3 of Course Builder, and no
+  // longer used. The assessment name should be set in the unit.csv file or via
+  // the course editor interface.
+  assessmentName: 'ReviewAssessmentExample',
+  checkAnswers: false
+}

assets/js/review-ReviewAssessmentExample.js

@@ -0,0 +1,42 @@
+// Copyright 2012 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS-IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+// When the assessment page loads, activity-generic.js will render the contents
+// of the 'assessment' variable into the enclosing HTML webpage.
+
+// For information on modifying this page, see
+// https://code.google.com/p/course-builder/wiki/CreateAssessments.
+
+
+var assessment = {
+  // HTML to display at the start of the page
+  preamble: 'When you write your review, please check that the student\'s response is relevant to the question asked. If not, answer \'No\' to the first question below.',
+
+  questionsList: [
+    {questionHTML: 'Did the student answer all parts of the question?',
+     choices: ['Yes', 'No']},
+
+    {questionHTML: 'Please provide feedback for the assignment author.',
+     multiLine: true,
+     correctAnswerRegex: /.*/i
+    }
+  ],
+
+  // The assessmentName key is deprecated in v1.3 of Course Builder, and no
+  // longer used. The assessment name should be set in the unit.csv file or via
+  // the course editor interface.
+  assessmentName: 'ReviewAssessmentExample',
+  checkAnswers: false
+}