rebase with master & reverted some stuff back

mozilla · Feb 26, 2015 · c1c5555 · c1c5555
1 parent a2f517c
commit c1c5555
Show file tree

Hide file tree

Showing 31 changed files with 1,431 additions and 1 deletion.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -98,7 +98,9 @@ module.exports = function (grunt) {
     gettext_finder: {
       files: ["views/*.html", "views/**/*.html"],
       options: {
-        pathToJSON: ["locale/en_US/webmaker.org.json"],
+        pathToJSON: ["locale/en_US/webmaker.org.json",
+                     "locale/en_US/localweb.json"
+                    ],
         ignoreKeys: grunt.file.readJSON("gtf-ignored-keys.json")
       },
     },

diff --git a/app.js b/app.js
@@ -415,6 +415,9 @@ app.post("/api/submit-resource", routes.api.submitResource);
 app.get("/mentor", routes.angular);
 app.get("/search", routes.search);
 
+// MOI splash page
+app.get("/localweb", routes.page("localweb"));
+
 // Old route - turned into a 301 (perm. redirect) on 2014-02-11.
 // This route should not be removed until sufficient time
 // has passed for search engines to index the new URL.

diff --git a/bower.json b/bower.json
@@ -8,10 +8,12 @@
     "angular-route": "1.2.10",
     "angular-sanitize": "1.2.14",
     "cookie-js": "0.0.1",
+    "flag-icon-css": "0.6.4",
     "font-awesome": "3.2.1",
     "intl-tel-input": "^5.1.7",
     "jquery": "2.0.3",
     "jquery-ui": "1.10.3",
+    "magnific-popup": "1.0.0",
     "makeapi-client": "0.5.28",
     "makerstrap": "0.2.3",
     "masonry": "~3.1.5",