(Partially) Fix oppia#2100: add cache slugs. (oppia#2208)

* Added cache slugs for images and modified all references to the images. * Added interpolation service to get static image url, modified non-page level html files and corresponding directives/controllers to use it, addressed review comments * Modified /script tags * Added cache slugs for i18n * Fixed failing test and added i18n/prod to git ignore. * Cache slugs new approach POC * Modified references for images, scripts and i18n. Added methods to return static resource url. Modified app.yaml. * Modified gulp file and references to oppia.css and third_party css and js files. * Added slugs to extensions * Fixed test for get_cache_slug * Modified build.py and deploy.py * Addressed review comments * Modify imports * Modified src to ng-src and other review comments fixed. * Modified build.py * Minor change * Removed feconf.CACHE_SLUG_DEV and refactored * Added random cache slug * Refactored code. * Modified references for extensions, added extensions to build process and refactored methods in UrlInterpolationService * Fixed bug * Addressed review comments. * Fix failing tests * Fixed bug. * Added tests for urlinterpolationservice. * Added interpolation for interactions and logic_proof.html * Addressed review comments * Addressed review comments * Removed unnecessary include from templates * Modified precommit linter script to fix endless waiting * Commented script and added assets/scripts to exclusions.
shashaBot · Aug 8, 2016 · a13c5c3 · a13c5c3
1 parent ad46f52
commit a13c5c3
Show file tree

Hide file tree

Showing 213 changed files with 1,590 additions and 897 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,8 @@ venv/
 .DS_Store
 .idea
 .vagrant/*
+
+# Oppia uses cache slugs for various resources and we need separate resource
+# directories for dev and prod. Resource directories for prod are generated
+# via build.py and should not be committed to the repo.
+build/*
diff --git a/.jscsrc b/.jscsrc
@@ -11,8 +11,10 @@
         "extensions/interactions/LogicProof/static/js/generatedParser.js",
         "integrations/**",
         "integrations_dev/**",
-        "static/scripts/**",
-        "third_party/**"
+        "assets/scripts/**",
+        "third_party/**",
+        "build/**",
+        "**.min.js"
     ],
     "fileExtensions": [".js"],
     "extract": ["*.html"],

diff --git a/app.yaml b/app.yaml
@@ -15,34 +15,36 @@ inbound_services:
 
 handlers:
 - url: /favicon.ico
-  static_files: static/images/favicon.ico
-  upload: static/images/favicon.ico
+  static_files: assets/common/favicon.ico
+  upload: assets/common/favicon.ico
   secure: always
   http_headers:
     Cache-Control: 'public, max-age=2592000'
     Vary: Accept-Encoding
-- url: /images
-  static_dir: static/images
+- url: /robots.txt
+  static_files: assets/common/robots.txt
+  upload: assets/common/robots.txt
   secure: always
   http_headers:
-    Cache-Control: 'public, max-age=600'
-- url: /static/pages
-  static_dir: static/pages
+    Cache-Control: 'public, max-age=2592000'
+    Vary: Accept-Encoding
+- url: /build
+  static_dir: build
   secure: always
   http_headers:
-    Cache-Control: 'public, max-age=600'
-- url: /robots.txt
-  static_files: static/pages/robots.txt
-  upload: static/pages/robots.txt
+    Cache-Control: 'public, max-age=2592000'
+- url: /assets/common
+  static_dir: assets/common
   secure: always
   http_headers:
-    Cache-Control: 'public, max-age=2592000'
-    Vary: Accept-Encoding
-- url: /scripts
-  static_dir: static/scripts
+    # WARNING TO DEVELOPERS: Files in this folder may be stale for
+    # up to 10 mins after a code release.
+    Cache-Control: 'public, max-age=600'
+- url: /assets
+  static_dir: assets
   secure: always
   http_headers:
-    Cache-Control: 'no-cache'
+    Cache-Control: 'public, max-age=60'
 - url: /css
   # NB: not minified. TODO(sll): fix.
   static_dir: core/templates/dev/head/css
@@ -53,11 +55,6 @@ handlers:
   http_headers:
     Cache-Control: 'public, max-age=2592000'
     Vary: Accept-Encoding
-- url: /i18n
-  static_dir: i18n
-  secure: always
-  http_headers:
-    Cache-Control: 'no-cache'
 - url: /third_party/generated
   static_dir: third_party/generated
   secure: always

diff --git a/static/images/favicon.ico → assets/common/favicon.ico b/static/images/favicon.ico → assets/common/favicon.ico
diff --git a/static/images/general/background.jpg → assets/common/images/general/background.jpg b/static/images/general/background.jpg → assets/common/images/general/background.jpg
diff --git a/static/images/general/icons-bg.png → assets/common/images/general/icons-bg.png b/static/images/general/icons-bg.png → assets/common/images/general/icons-bg.png
diff --git a/static/images/general/warning.png → assets/common/images/general/warning.png b/static/images/general/warning.png → assets/common/images/general/warning.png
diff --git a/static/pages/robots.txt → assets/common/robots.txt b/static/pages/robots.txt → assets/common/robots.txt
diff --git a/i18n/en.json → assets/i18n/en.json b/i18n/en.json → assets/i18n/en.json
diff --git a/i18n/es.json → assets/i18n/es.json b/i18n/es.json → assets/i18n/es.json
diff --git a/i18n/id.json → assets/i18n/id.json b/i18n/id.json → assets/i18n/id.json
diff --git a/i18n/pt.json → assets/i18n/pt.json b/i18n/pt.json → assets/i18n/pt.json
diff --git a/i18n/qqq.json → assets/i18n/qqq.json b/i18n/qqq.json → assets/i18n/qqq.json
diff --git a/static/images/activity/collection.svg → assets/images/activity/collection.svg b/static/images/activity/collection.svg → assets/images/activity/collection.svg
diff --git a/static/images/activity/exploration.svg → assets/images/activity/exploration.svg b/static/images/activity/exploration.svg → assets/images/activity/exploration.svg
diff --git a/static/images/avatar/fa_globe_72px.png → assets/images/avatar/fa_globe_72px.png b/static/images/avatar/fa_globe_72px.png → assets/images/avatar/fa_globe_72px.png
diff --git a/static/images/avatar/gravatar_example.png → assets/images/avatar/gravatar_example.png b/static/images/avatar/gravatar_example.png → assets/images/avatar/gravatar_example.png
diff --git a/static/images/avatar/oppia_black_72px.png → assets/images/avatar/oppia_black_72px.png b/static/images/avatar/oppia_black_72px.png → assets/images/avatar/oppia_black_72px.png
diff --git a/static/images/avatar/user_blue_72px.png → assets/images/avatar/user_blue_72px.png b/static/images/avatar/user_blue_72px.png → assets/images/avatar/user_blue_72px.png
diff --git a/static/images/avatar/user_blue_72px.svg → assets/images/avatar/user_blue_72px.svg b/static/images/avatar/user_blue_72px.svg → assets/images/avatar/user_blue_72px.svg
diff --git a/static/images/general/about_page_mascot.png → assets/images/general/about_page_mascot.png b/static/images/general/about_page_mascot.png → assets/images/general/about_page_mascot.png
diff --git a/assets/images/general/background.jpg b/assets/images/general/background.jpg
diff --git a/static/images/general/congrats.svg → assets/images/general/congrats.svg b/static/images/general/congrats.svg → assets/images/general/congrats.svg
diff --git a/static/images/general/creator-create-exp.png → assets/images/general/creator-create-exp.png b/static/images/general/creator-create-exp.png → assets/images/general/creator-create-exp.png
diff --git a/static/images/general/creator-feedback.png → assets/images/general/creator-feedback.png b/static/images/general/creator-feedback.png → assets/images/general/creator-feedback.png
diff --git a/static/images/general/creator-pub-share.png → assets/images/general/creator-pub-share.png b/static/images/general/creator-pub-share.png → assets/images/general/creator-pub-share.png
diff --git a/static/images/general/donate.png → assets/images/general/donate.png b/static/images/general/donate.png → assets/images/general/donate.png
diff --git a/static/images/general/drag_dots.png → assets/images/general/drag_dots.png b/static/images/general/drag_dots.png → assets/images/general/drag_dots.png
diff --git a/static/images/general/editor_welcome.svg → assets/images/general/editor_welcome.svg b/static/images/general/editor_welcome.svg → assets/images/general/editor_welcome.svg
diff --git a/static/images/general/empty_dashboard.svg → assets/images/general/empty_dashboard.svg b/static/images/general/empty_dashboard.svg → assets/images/general/empty_dashboard.svg
diff --git a/static/images/general/fb.png → assets/images/general/fb.png b/static/images/general/fb.png → assets/images/general/fb.png
diff --git a/static/images/general/gplus.png → assets/images/general/gplus.png b/static/images/general/gplus.png → assets/images/general/gplus.png
diff --git a/assets/images/general/icons-bg.png b/assets/images/general/icons-bg.png
diff --git a/.../images/general/no_explorations_found.png → .../images/general/no_explorations_found.png b/.../images/general/no_explorations_found.png → .../images/general/no_explorations_found.png
diff --git a/static/images/general/no_profile_picture.png → assets/images/general/no_profile_picture.png b/static/images/general/no_profile_picture.png → assets/images/general/no_profile_picture.png
diff --git a/static/images/general/oops_mint.png → assets/images/general/oops_mint.png b/static/images/general/oops_mint.png → assets/images/general/oops_mint.png
diff --git a/static/images/general/twitter.png → assets/images/general/twitter.png b/static/images/general/twitter.png → assets/images/general/twitter.png
diff --git a/assets/images/general/warning.png b/assets/images/general/warning.png
diff --git a/static/images/general/youtube.png → assets/images/general/youtube.png b/static/images/general/youtube.png → assets/images/general/youtube.png
diff --git a/static/images/library/banner1.svg → assets/images/library/banner1.svg b/static/images/library/banner1.svg → assets/images/library/banner1.svg
diff --git a/static/images/library/banner2.svg → assets/images/library/banner2.svg b/static/images/library/banner2.svg → assets/images/library/banner2.svg
diff --git a/static/images/library/banner3.svg → assets/images/library/banner3.svg b/static/images/library/banner3.svg → assets/images/library/banner3.svg
diff --git a/static/images/library/banner4.svg → assets/images/library/banner4.svg b/static/images/library/banner4.svg → assets/images/library/banner4.svg
diff --git a/static/images/logo/288x128_logo_mint.png → assets/images/logo/288x128_logo_mint.png b/static/images/logo/288x128_logo_mint.png → assets/images/logo/288x128_logo_mint.png
diff --git a/static/images/logo/288x128_logo_white.png → assets/images/logo/288x128_logo_white.png b/static/images/logo/288x128_logo_white.png → assets/images/logo/288x128_logo_white.png
diff --git a/static/images/logo/288x288_logo_mint.png → assets/images/logo/288x288_logo_mint.png b/static/images/logo/288x288_logo_mint.png → assets/images/logo/288x288_logo_mint.png
diff --git a/static/images/logo/favicon.png → assets/images/logo/favicon.png b/static/images/logo/favicon.png → assets/images/logo/favicon.png
diff --git a/static/images/sidebar/blogger.png → assets/images/sidebar/blogger.png b/static/images/sidebar/blogger.png → assets/images/sidebar/blogger.png
diff --git a/static/images/sidebar/comment.png → assets/images/sidebar/comment.png b/static/images/sidebar/comment.png → assets/images/sidebar/comment.png
diff --git a/...ages/signin/Red-signin-Long-base-44dp.png → ...ages/signin/Red-signin-Long-base-44dp.png b/...ages/signin/Red-signin-Long-base-44dp.png → ...ages/signin/Red-signin-Long-base-44dp.png
diff --git a/...ges/signin/Red-signin-Long-hover-44dp.png → ...ges/signin/Red-signin-Long-hover-44dp.png b/...ges/signin/Red-signin-Long-hover-44dp.png → ...ges/signin/Red-signin-Long-hover-44dp.png
diff --git a/...ges/signin/Red-signin-Long-press-44dp.png → ...ges/signin/Red-signin-Long-press-44dp.png b/...ges/signin/Red-signin-Long-press-44dp.png → ...ges/signin/Red-signin-Long-press-44dp.png
diff --git a/static/images/social/fb.png → assets/images/social/fb.png b/static/images/social/fb.png → assets/images/social/fb.png
diff --git a/static/images/social/gplus.png → assets/images/social/gplus.png b/static/images/social/gplus.png → assets/images/social/gplus.png
diff --git a/static/images/social/twitter.png → assets/images/social/twitter.png b/static/images/social/twitter.png → assets/images/social/twitter.png
diff --git a/static/images/social/youtube.png → assets/images/social/youtube.png b/static/images/social/youtube.png → assets/images/social/youtube.png
diff --git a/static/images/splash/books.svg → assets/images/splash/books.svg b/static/images/splash/books.svg → assets/images/splash/books.svg
diff --git a/static/images/splash/bullet1icon.svg → assets/images/splash/bullet1icon.svg b/static/images/splash/bullet1icon.svg → assets/images/splash/bullet1icon.svg
diff --git a/static/images/splash/bullet2icon.svg → assets/images/splash/bullet2icon.svg b/static/images/splash/bullet2icon.svg → assets/images/splash/bullet2icon.svg
diff --git a/static/images/splash/bullet3icon.svg → assets/images/splash/bullet3icon.svg b/static/images/splash/bullet3icon.svg → assets/images/splash/bullet3icon.svg
diff --git a/static/images/subjects/Algebra.svg → assets/images/subjects/Algebra.svg b/static/images/subjects/Algebra.svg → assets/images/subjects/Algebra.svg
diff --git a/static/images/subjects/Algorithms.svg → assets/images/subjects/Algorithms.svg b/static/images/subjects/Algorithms.svg → assets/images/subjects/Algorithms.svg
diff --git a/static/images/subjects/Architecture.svg → assets/images/subjects/Architecture.svg b/static/images/subjects/Architecture.svg → assets/images/subjects/Architecture.svg
diff --git a/static/images/subjects/Arithmetic.svg → assets/images/subjects/Arithmetic.svg b/static/images/subjects/Arithmetic.svg → assets/images/subjects/Arithmetic.svg
diff --git a/static/images/subjects/Art.svg → assets/images/subjects/Art.svg b/static/images/subjects/Art.svg → assets/images/subjects/Art.svg
diff --git a/static/images/subjects/Astronomy.svg → assets/images/subjects/Astronomy.svg b/static/images/subjects/Astronomy.svg → assets/images/subjects/Astronomy.svg
diff --git a/static/images/subjects/Biology.svg → assets/images/subjects/Biology.svg b/static/images/subjects/Biology.svg → assets/images/subjects/Biology.svg
diff --git a/static/images/subjects/Business.svg → assets/images/subjects/Business.svg b/static/images/subjects/Business.svg → assets/images/subjects/Business.svg
diff --git a/static/images/subjects/Calculus.svg → assets/images/subjects/Calculus.svg b/static/images/subjects/Calculus.svg → assets/images/subjects/Calculus.svg
diff --git a/static/images/subjects/Chemistry.svg → assets/images/subjects/Chemistry.svg b/static/images/subjects/Chemistry.svg → assets/images/subjects/Chemistry.svg
diff --git a/static/images/subjects/Chess.svg → assets/images/subjects/Chess.svg b/static/images/subjects/Chess.svg → assets/images/subjects/Chess.svg
diff --git a/static/images/subjects/Combinatorics.svg → assets/images/subjects/Combinatorics.svg b/static/images/subjects/Combinatorics.svg → assets/images/subjects/Combinatorics.svg
diff --git a/static/images/subjects/Computing.svg → assets/images/subjects/Computing.svg b/static/images/subjects/Computing.svg → assets/images/subjects/Computing.svg
diff --git a/static/images/subjects/Cooking.svg → assets/images/subjects/Cooking.svg b/static/images/subjects/Cooking.svg → assets/images/subjects/Cooking.svg
diff --git a/static/images/subjects/Creativity.svg → assets/images/subjects/Creativity.svg b/static/images/subjects/Creativity.svg → assets/images/subjects/Creativity.svg
diff --git a/static/images/subjects/Economics.svg → assets/images/subjects/Economics.svg b/static/images/subjects/Economics.svg → assets/images/subjects/Economics.svg
diff --git a/static/images/subjects/Education.svg → assets/images/subjects/Education.svg b/static/images/subjects/Education.svg → assets/images/subjects/Education.svg
diff --git a/static/images/subjects/Engineering.svg → assets/images/subjects/Engineering.svg b/static/images/subjects/Engineering.svg → assets/images/subjects/Engineering.svg
diff --git a/static/images/subjects/English.svg → assets/images/subjects/English.svg b/static/images/subjects/English.svg → assets/images/subjects/English.svg
diff --git a/static/images/subjects/Environment.svg → assets/images/subjects/Environment.svg b/static/images/subjects/Environment.svg → assets/images/subjects/Environment.svg
diff --git a/static/images/subjects/Gaulish.svg → assets/images/subjects/Gaulish.svg b/static/images/subjects/Gaulish.svg → assets/images/subjects/Gaulish.svg
diff --git a/static/images/subjects/Genetics.svg → assets/images/subjects/Genetics.svg b/static/images/subjects/Genetics.svg → assets/images/subjects/Genetics.svg
diff --git a/static/images/subjects/Geography.svg → assets/images/subjects/Geography.svg b/static/images/subjects/Geography.svg → assets/images/subjects/Geography.svg
diff --git a/static/images/subjects/Geometry.svg → assets/images/subjects/Geometry.svg b/static/images/subjects/Geometry.svg → assets/images/subjects/Geometry.svg
diff --git a/static/images/subjects/Government.svg → assets/images/subjects/Government.svg b/static/images/subjects/Government.svg → assets/images/subjects/Government.svg
diff --git a/static/images/subjects/GraphTheory.svg → assets/images/subjects/GraphTheory.svg b/static/images/subjects/GraphTheory.svg → assets/images/subjects/GraphTheory.svg
diff --git a/static/images/subjects/History.svg → assets/images/subjects/History.svg b/static/images/subjects/History.svg → assets/images/subjects/History.svg
diff --git a/static/images/subjects/Humor.svg → assets/images/subjects/Humor.svg b/static/images/subjects/Humor.svg → assets/images/subjects/Humor.svg
diff --git a/static/images/subjects/Language.svg → assets/images/subjects/Language.svg b/static/images/subjects/Language.svg → assets/images/subjects/Language.svg
diff --git a/static/images/subjects/Languages.svg → assets/images/subjects/Languages.svg b/static/images/subjects/Languages.svg → assets/images/subjects/Languages.svg
diff --git a/static/images/subjects/Latin.svg → assets/images/subjects/Latin.svg b/static/images/subjects/Latin.svg → assets/images/subjects/Latin.svg
diff --git a/static/images/subjects/Law.svg → assets/images/subjects/Law.svg b/static/images/subjects/Law.svg → assets/images/subjects/Law.svg
diff --git a/static/images/subjects/Lightbulb.svg → assets/images/subjects/Lightbulb.svg b/static/images/subjects/Lightbulb.svg → assets/images/subjects/Lightbulb.svg
diff --git a/static/images/subjects/Logic.svg → assets/images/subjects/Logic.svg b/static/images/subjects/Logic.svg → assets/images/subjects/Logic.svg
diff --git a/static/images/subjects/Mathematics.svg → assets/images/subjects/Mathematics.svg b/static/images/subjects/Mathematics.svg → assets/images/subjects/Mathematics.svg
diff --git a/static/images/subjects/Medicine.svg → assets/images/subjects/Medicine.svg b/static/images/subjects/Medicine.svg → assets/images/subjects/Medicine.svg
diff --git a/static/images/subjects/Microbiology.svg → assets/images/subjects/Microbiology.svg b/static/images/subjects/Microbiology.svg → assets/images/subjects/Microbiology.svg
diff --git a/static/images/subjects/Music.svg → assets/images/subjects/Music.svg b/static/images/subjects/Music.svg → assets/images/subjects/Music.svg
diff --git a/static/images/subjects/Philosophy.svg → assets/images/subjects/Philosophy.svg b/static/images/subjects/Philosophy.svg → assets/images/subjects/Philosophy.svg
diff --git a/static/images/subjects/Physics.svg → assets/images/subjects/Physics.svg b/static/images/subjects/Physics.svg → assets/images/subjects/Physics.svg
diff --git a/static/images/subjects/Poetry.svg → assets/images/subjects/Poetry.svg b/static/images/subjects/Poetry.svg → assets/images/subjects/Poetry.svg
diff --git a/static/images/subjects/Probability.svg → assets/images/subjects/Probability.svg b/static/images/subjects/Probability.svg → assets/images/subjects/Probability.svg
diff --git a/static/images/subjects/Programming.svg → assets/images/subjects/Programming.svg b/static/images/subjects/Programming.svg → assets/images/subjects/Programming.svg
diff --git a/static/images/subjects/Puzzles.svg → assets/images/subjects/Puzzles.svg b/static/images/subjects/Puzzles.svg → assets/images/subjects/Puzzles.svg
diff --git a/static/images/subjects/Reading.svg → assets/images/subjects/Reading.svg b/static/images/subjects/Reading.svg → assets/images/subjects/Reading.svg
diff --git a/static/images/subjects/Religion.svg → assets/images/subjects/Religion.svg b/static/images/subjects/Religion.svg → assets/images/subjects/Religion.svg
diff --git a/static/images/subjects/Space.svg → assets/images/subjects/Space.svg b/static/images/subjects/Space.svg → assets/images/subjects/Space.svg
diff --git a/static/images/subjects/Spanish.svg → assets/images/subjects/Spanish.svg b/static/images/subjects/Spanish.svg → assets/images/subjects/Spanish.svg
diff --git a/static/images/subjects/Sport.svg → assets/images/subjects/Sport.svg b/static/images/subjects/Sport.svg → assets/images/subjects/Sport.svg
diff --git a/static/images/subjects/Statistics.svg → assets/images/subjects/Statistics.svg b/static/images/subjects/Statistics.svg → assets/images/subjects/Statistics.svg
diff --git a/static/images/subjects/Trigonometry.svg → assets/images/subjects/Trigonometry.svg b/static/images/subjects/Trigonometry.svg → assets/images/subjects/Trigonometry.svg
diff --git a/static/images/subjects/Welcome.svg → assets/images/subjects/Welcome.svg b/static/images/subjects/Welcome.svg → assets/images/subjects/Welcome.svg
diff --git a/static/pages/attribution.txt → assets/pages/attribution.txt b/static/pages/attribution.txt → assets/pages/attribution.txt
diff --git a/static/scripts/README → assets/scripts/README b/static/scripts/README → assets/scripts/README
@@ -13,7 +13,7 @@ them. To load the examples manually you need to:
 - In a browser window, open each of the HTML files in this folder, and ensure
   that they do the correct thing. Use URLs of the following form:
 
-      http://localhost:8181/scripts/embedding_tests_dev_0.0.1.html
+      http://localhost:8181/assets/scripts/embedding_tests_dev_0.0.1.html
 
 
 The features supported in each version of the embedding script are as follows:

diff --git a/static/scripts/embedding_tests.js → assets/scripts/embedding_tests.js b/static/scripts/embedding_tests.js → assets/scripts/embedding_tests.js
diff --git a/assets/scripts/embedding_tests_dev_0.0.0.html b/assets/scripts/embedding_tests_dev_0.0.0.html
@@ -0,0 +1,18 @@
+<h2>v0.0.0</h2>
+<p>For instructions: see the README file in /static/dev/scripts.</p>
+
+<h3>Standard embedding of the latest version</h3>
+<oppia oppia-id="0"></oppia>
+<script src="http://localhost:8181/assets/scripts/oppia-player-0.0.0.js"></script>
+
+<h3>Standard embedding of version 1 of the exploration</h3>
+<oppia oppia-id="0" exploration-version="1"></oppia>
+<script src="http://localhost:8181/assets/scripts/oppia-player-0.0.1.js"></script>
+
+<h3>ERROR: No oppia id specified</h3>
+<oppia></oppia>
+<script src="http://localhost:8181/assets/scripts/oppia-player-0.0.0.js"></script>
+
+<h3>ERROR: 404 error</h3>
+<oppia oppia-id="fake_id"></oppia>
+<script src="http://localhost:8181/assets/scripts/oppia-player-0.0.0.js"></script>
diff --git a/...ic/scripts/embedding_tests_dev_0.0.1.html → ...ts/scripts/embedding_tests_dev_0.0.1.html b/...ic/scripts/embedding_tests_dev_0.0.1.html → ...ts/scripts/embedding_tests_dev_0.0.1.html
@@ -1,13 +1,13 @@
 <h2>v0.0.1 (unminified)</h2>
-<p>For instructions: see the README file in /static/scripts.</p>
+<p>For instructions: see the README file in /assets/scripts.</p>
 <p>
   NB: When you complete an exploration the text "Exploration completed" should
   appear in the paragraph below it. This checks that events are being sent from
   the Oppia iframe to the containing page.
 </p>
 
-<script src="/scripts/oppia-player-0.0.1.js"></script>
-<script src="/scripts/embedding_tests.js"></script>
+<script src="/assets/scripts/oppia-player-0.0.1.js"></script>
+<script src="/assets/scripts/embedding_tests.js"></script>
 
 <div class="protractor-test-standard">
   <h3>Standard embedding of the latest version</h3>
@@ -32,4 +32,4 @@ <h3>ERROR: 404 error</h3>
 <div class="protractor-test-invalid-id-deferred">
   <h3>ERROR: 404 error with deferred loading</h3>
   <oppia oppia-id="fake_id" autoload="false"></oppia>
-</div>
+</div>
diff --git a/...cripts/embedding_tests_dev_0.0.1.min.html → ...cripts/embedding_tests_dev_0.0.1.min.html b/...cripts/embedding_tests_dev_0.0.1.min.html → ...cripts/embedding_tests_dev_0.0.1.min.html
@@ -1,13 +1,13 @@
 <h2>v0.0.1 (minified)</h2>
-<p>For instructions: see the README file in /static/scripts.</p>
+<p>For instructions: see the README file in /assets/scripts.</p>
 <p>
   NB: When you complete an exploration the text "Exploration completed" should
   appear in the paragraph below it. This checks that events are being sent from
   the Oppia iframe to the containing page.
 </p>
 
-<script src="/scripts/oppia-player-0.0.1.js"></script>
-<script src="/scripts/embedding_tests.js"></script>
+<script src="/assets/scripts/oppia-player-0.0.1.js"></script>
+<script src="/assets/scripts/embedding_tests.js"></script>
 
 <div class="protractor-test-standard">
   <h3>Standard embedding of the latest version</h3>

diff --git a/assets/scripts/embedding_tests_dev_i18n_0.0.1.html b/assets/scripts/embedding_tests_dev_i18n_0.0.1.html
@@ -0,0 +1,10 @@
+<h2>v0.0.1 (unminified)</h2>
+<p>For instructions: see the README file in /assets/scripts.</p>
+
+<script src="/assets/scripts/oppia-player-0.0.1.js"></script>
+<script src="/assets/scripts/embedding_tests.js"></script>
+
+<div class="protractor-test-embedded-exploration">
+  <h3>Standard embedding of the latest version</h3>
+  <oppia oppia-id="12"></oppia>
+</div>
diff --git a/...s/embedding_tests_jsdelivr_0.0.1.min.html → ...s/embedding_tests_jsdelivr_0.0.1.min.html b/...s/embedding_tests_jsdelivr_0.0.1.min.html → ...s/embedding_tests_jsdelivr_0.0.1.min.html
@@ -1,5 +1,5 @@
 <h2>v0.0.1 (minified) from the JSDelivr CDN</h2>
-<p>For instructions: see the README file in /static/scripts.</p>
+<p>For instructions: see the README file in /assets/scripts.</p>
 <p>
   NB: This set of tests depends on an external file hosted on the JSDelivr CDN.
   They will not work if you are offline.
@@ -10,8 +10,8 @@ <h2>v0.0.1 (minified) from the JSDelivr CDN</h2>
   the Oppia iframe to the containing page.
 </p>
 
-<script src="/scripts/oppia-player-0.0.1.js"></script>
-<script src="/scripts/embedding_tests.js"></script>
+<script src="/assets/scripts/oppia-player-0.0.1.js"></script>
+<script src="/assets/scripts/embedding_tests.js"></script>
 
 <div class="protractor-test-standard">
   <h3>Standard embedding of the latest version</h3>
@@ -36,4 +36,4 @@ <h3>ERROR: 404 error</h3>
 <div class="protractor-test-invalid-id-deferred">
   <h3>ERROR: 404 error with deferred loading</h3>
   <oppia oppia-id="fake_id" autoload="false"></oppia>
-</div>
+</div>
diff --git a/static/scripts/oppia-player-0.0.0.js → assets/scripts/oppia-player-0.0.0.js b/static/scripts/oppia-player-0.0.0.js → assets/scripts/oppia-player-0.0.0.js
diff --git a/static/scripts/oppia-player-0.0.1.js → assets/scripts/oppia-player-0.0.1.js b/static/scripts/oppia-player-0.0.1.js → assets/scripts/oppia-player-0.0.1.js
diff --git a/static/scripts/oppia-player-0.0.1.min.js → assets/scripts/oppia-player-0.0.1.min.js b/static/scripts/oppia-player-0.0.1.min.js → assets/scripts/oppia-player-0.0.1.min.js
diff --git a/cache_slug.yaml b/cache_slug.yaml
@@ -0,0 +1,5 @@
+# Cache slug is a prefix that is attached to static resource paths such as
+# images, scripts and css. It should only contain alphanumeric characters.
+# It will be automatically updated when deploy.py is run.
+cache_slug:
+  default
diff --git a/core/controllers/base.py b/core/controllers/base.py
@@ -300,6 +300,7 @@ def render_template(
         values.update({
             'ALL_CATEGORIES': feconf.ALL_CATEGORIES,
             'ALL_LANGUAGE_CODES': feconf.ALL_LANGUAGE_CODES,
+            'ASSET_DIR_PREFIX': utils.get_asset_dir_prefix(),
             'BEFORE_END_HEAD_TAG_HOOK': jinja2.utils.Markup(
                 BEFORE_END_HEAD_TAG_HOOK.value),
             'CAN_SEND_ANALYTICS_EVENTS': feconf.CAN_SEND_ANALYTICS_EVENTS,
@@ -313,7 +314,8 @@ def render_template(
                 rights_manager.ACTIVITY_STATUS_PUBLIC),
             'ACTIVITY_STATUS_PUBLICIZED': (
                 rights_manager.ACTIVITY_STATUS_PUBLICIZED),
-            'FULL_URL': '%s://%s/%s' % (scheme, netloc, path),
+            # The 'path' variable starts with a forward slash.
+            'FULL_URL': '%s://%s%s' % (scheme, netloc, path),
             'INVALID_NAME_CHARS': feconf.INVALID_NAME_CHARS,
             # TODO(sll): Consider including the obj_editor html directly as
             # part of the base HTML template?
@@ -375,6 +377,7 @@ def render_template(
 
         self.response.expires = 'Mon, 01 Jan 1990 00:00:00 GMT'
         self.response.pragma = 'no-cache'
+
         self.response.write(self.jinja2_env.get_template(
             filename).render(**values))
 

diff --git a/core/controllers/base_test.py b/core/controllers/base_test.py
@@ -237,15 +237,18 @@ class I18nDictsTest(test_utils.GenericTestBase):
 
     def _extract_keys_from_json_file(self, filename):
         return sorted(json.loads(utils.get_file_contents(
-            os.path.join(os.getcwd(), 'i18n', filename)
+            os.path.join(os.getcwd(), self.get_static_asset_filepath(),
+                         'assets', 'i18n', filename)
         )).keys())
 
     def test_i18n_keys(self):
         """Tests that all JSON files in i18n.js have the same set of keys."""
         master_key_list = self._extract_keys_from_json_file('en.json')
         self.assertGreater(len(master_key_list), 0)
 
-        filenames = os.listdir(os.path.join(os.getcwd(), 'i18n'))
+        filenames = os.listdir(
+            os.path.join(os.getcwd(), self.get_static_asset_filepath(),
+                         'assets', 'i18n'))
         for filename in filenames:
             if filename == 'en.json':
                 continue

diff --git a/core/controllers/library_test.py b/core/controllers/library_test.py
@@ -195,12 +195,12 @@ def test_thumbnail_icons_exist_for_each_category(self):
         # Test that an icon exists for each default category.
         for category in all_categories:
             utils.get_file_contents(os.path.join(
-                'static', 'images', 'subjects',
-                '%s.svg' % category.replace(' ', '')))
+                self.get_static_asset_filepath(), 'assets', 'images',
+                'subjects', '%s.svg' % category.replace(' ', '')))
 
         # Test that the default icon exists.
         utils.get_file_contents(os.path.join(
-            'static', 'images', 'subjects',
+            self.get_static_asset_filepath(), 'assets', 'images', 'subjects',
             '%s.svg' % feconf.DEFAULT_THUMBNAIL_ICON))
 
 

diff --git a/core/domain/dependency_registry.py b/core/domain/dependency_registry.py
@@ -21,6 +21,7 @@
 
 from extensions.dependencies import dependencies_config
 import feconf
+import jinja_utils
 import utils
 
 
@@ -54,6 +55,12 @@ def get_deps_html_and_angular_modules(cls, dependency_ids):
         """
         html = '\n'.join([
             cls.get_dependency_html(dep) for dep in set(dependency_ids)])
+        # Html content for interactions is loaded using get_dependency_html
+        # method. This content is then interpolated using Jinja. Interactions
+        # such as logicproof contain jinja like variables that need to be
+        # interpolated. LogicProof contains a cache slug variable that is
+        # interpolated using interpolate_cache_slug method.
+        html = jinja_utils.interpolate_cache_slug(html)
         angular_modules_for_each_dep = [
             cls.get_angular_modules(dep) for dep in set(dependency_ids)]
         deduplicated_angular_modules = list(set(list(

diff --git a/core/domain/summary_services_test.py b/core/domain/summary_services_test.py
@@ -196,7 +196,8 @@ def test_get_displayable_exp_summary_dicts_matching_ids(self):
             'status': 'public',
             'tags': [],
             'thumbnail_bg_color': '#a33f40',
-            'thumbnail_icon_url': '/images/subjects/Lightbulb.svg',
+            'thumbnail_icon_url': self.get_static_asset_url(
+                '/images/subjects/Lightbulb.svg'),
             'title': u'Exploration 2 Albert title',
         }
         self.assertIn('last_updated_msec', displayable_summaries[0])
@@ -278,7 +279,8 @@ def test_get_library_groups(self):
             'tags': [],
             'title':  u'The Lazy Magician',
             'thumbnail_bg_color': '#d0982a',
-            'thumbnail_icon_url': '/images/subjects/Algorithms.svg',
+            'thumbnail_icon_url': self.get_static_asset_url(
+                '/images/subjects/Algorithms.svg'),
         }
         expected_group = {
             'categories': ['Algorithms', 'Computing', 'Programming'],
@@ -354,7 +356,8 @@ def test_for_featured_explorations(self):
             'thumbnail_bg_color': '#a33f40',
             'community_owned': False,
             'tags': [],
-            'thumbnail_icon_url': '/images/subjects/Lightbulb.svg',
+            'thumbnail_icon_url': self.get_static_asset_url(
+                '/images/subjects/Lightbulb.svg'),
             'language_code': feconf.DEFAULT_LANGUAGE_CODE,
             'id': self.EXP_ID_2,
             'category': 'A category',
@@ -640,7 +643,8 @@ def test_at_most_eight_top_rated_explorations(self):
             'thumbnail_bg_color': '#a33f40',
             'community_owned': False,
             'tags': [],
-            'thumbnail_icon_url': '/images/subjects/Lightbulb.svg',
+            'thumbnail_icon_url': self.get_static_asset_url(
+                '/images/subjects/Lightbulb.svg'),
             'language_code': feconf.DEFAULT_LANGUAGE_CODE,
             'id': self.EXP_ID_3,
             'category': u'A category',
@@ -677,7 +681,8 @@ def test_only_explorations_with_ratings_are_returned(self):
             'thumbnail_bg_color': '#a33f40',
             'community_owned': False,
             'tags': [],
-            'thumbnail_icon_url': '/images/subjects/Lightbulb.svg',
+            'thumbnail_icon_url': self.get_static_asset_url(
+                '/images/subjects/Lightbulb.svg'),
             'language_code': feconf.DEFAULT_LANGUAGE_CODE,
             'id': self.EXP_ID_2,
             'category': u'A category',
@@ -758,7 +763,8 @@ def test_for_recently_published_explorations(self):
             'thumbnail_bg_color': '#a33f40',
             'community_owned': False,
             'tags': [],
-            'thumbnail_icon_url': '/images/subjects/Lightbulb.svg',
+            'thumbnail_icon_url': self.get_static_asset_url(
+                '/images/subjects/Lightbulb.svg'),
             'language_code': feconf.DEFAULT_LANGUAGE_CODE,
             'id': self.EXP_ID_1,
             'category': u'A category',
@@ -772,7 +778,8 @@ def test_for_recently_published_explorations(self):
             'thumbnail_bg_color': '#a33f40',
             'community_owned': False,
             'tags': [],
-            'thumbnail_icon_url': '/images/subjects/Lightbulb.svg',
+            'thumbnail_icon_url': self.get_static_asset_url(
+                '/images/subjects/Lightbulb.svg'),
             'language_code': feconf.DEFAULT_LANGUAGE_CODE,
             'id': self.EXP_ID_2,
             'category': u'A category',
@@ -786,7 +793,8 @@ def test_for_recently_published_explorations(self):
             'thumbnail_bg_color': '#a33f40',
             'community_owned': False,
             'tags': [],
-            'thumbnail_icon_url': '/images/subjects/Lightbulb.svg',
+            'thumbnail_icon_url': self.get_static_asset_url(
+                '/images/subjects/Lightbulb.svg'),
             'language_code': feconf.DEFAULT_LANGUAGE_CODE,
             'id': self.EXP_ID_3,
             'category': u'A category',

diff --git a/core/domain/user_services_test.py b/core/domain/user_services_test.py
@@ -143,7 +143,8 @@ def test_get_user_id_from_username(self):
     def test_fetch_gravatar_success(self):
         user_email = 'user@example.com'
         expected_gravatar_filepath = os.path.join(
-            'static', 'images', 'avatar', 'gravatar_example.png')
+            self.get_static_asset_filepath(), 'assets', 'images', 'avatar',
+            'gravatar_example.png')
         with open(expected_gravatar_filepath, 'r') as f:
             gravatar = f.read()
         with self.urlfetch_mock(content=gravatar):
@@ -198,7 +199,8 @@ def log_mock(message):
 
     def test_default_identicon_data_url(self):
         identicon_filepath = os.path.join(
-            'static', 'images', 'avatar', 'user_blue_72px.png')
+            self.get_static_asset_filepath(), 'assets', 'images', 'avatar',
+            'user_blue_72px.png')
         identicon_data_url = utils.convert_png_to_data_url(
             identicon_filepath)
         self.assertEqual(